currency_engineering/ui_data - Change PK7JY27R55PZON4SPFLJBX66IAE47SXBRAGDHXM4SN6TKZXO5LMAC

Integrate date_range with transforms.

Created by CrEcTsRjb1hHQjHuumqRfqdbVV4X58iLEubi4noaDPFa on July 23, 2021

PK7JY27R55PZON4SPFLJBX66IAE47SXBRAGDHXM4SN6TKZXO5LMAC

Dependencies

In channels

main

Change contents

Replacement in src/ts.rs at line 15 [3.7119]

B:BD[3.7908] → [2.23:99]

use crate::{ DataType, MonthlyDate, SeriesId, SeriesMetaData, SeriesSpec };

[3.7908]

[4.1114]

use crate::{ DataType, DateRange, MonthlyDate, SeriesId, SeriesMetaData, SeriesSpec };

Replacement in src/ts.rs at line 65 [3.7119]
B:BD[5.321] → [2.100:130]
```
    class:      GraphicClass,
```
[5.321]
[6.93]
```
    category:   GraphicCategory,
```
Insertion in src/ts.rs at line 78 [3.7119]
[5.467]
[5.467]
```
    series_id:  SeriesId,
```

Insertion in src/ts.rs at line 142 [3.7119]

[2.199]

[7.1308]


                // if m_series.contains_key(series_id) {
                //     println!("Duplicate series_id");
                //     panic!()
                // };

Replacement in src/ts.rs at line 162 [3.7119]

B:BD[5.1134] → [8.0:31]

                    class_opt,

[5.1134]

                    category_opt,

Replacement in src/ts.rs at line 177 [3.7119]

B:BD[6.1330] → [2.200:557]

                let class = match class_opt {
                    None                            => GraphicClass::Source,
                    Some(GraphicClass::Cleaned)     => GraphicClass::Cleaned,
                    Some(GraphicClass::Collated)    => GraphicClass::Collated,
                    Some(GraphicClass::Source)      => GraphicClass::Source,

[6.1330]

[2.557]

                let category = match category_opt {
                    None                               => GraphicCategory::Source,
                    Some(GraphicCategory::Cleaned)     => GraphicCategory::Cleaned,
                    Some(GraphicCategory::Collated)    => GraphicCategory::Collated,
                    Some(GraphicCategory::Source)      => GraphicCategory::Source,

Replacement in src/ts.rs at line 187 [3.7119]

B:BD[2.700] → [2.700:795]

                if let GraphicClass::Source = class { graphic_spec.assert_has_one_series()? };

[2.700]

[2.795]

                if let GraphicCategory::Source = category {
                    if !graphic_spec.assert_has_one_series() {
                        return Err(expected_graphic_has_one_series(
                            file!(),
                            line!(),
                            &country.to_string(),
                            &data_type.to_string(),
                            *index,
                        ))
                    }
                };

Replacement in src/ts.rs at line 199 [3.7119]

∅:D[2.796] → [8.32:308]

B:BD[6.1330] → [8.32:308]

                let text_spec = match graphic_spec.class_opt {
                    Some(GraphicClass::Cleaned)     => TextSpec::Link,
                    Some(GraphicClass::Collated)    => TextSpec::Link,
                    Some(GraphicClass::Source)      => TextSpec::Meta,

[2.796]

[8.308]

                let text_spec = match graphic_spec.category_opt {
                    Some(GraphicCategory::Cleaned)     => TextSpec::Link,
                    Some(GraphicCategory::Collated)    => TextSpec::Link,
                    Some(GraphicCategory::Source)      => TextSpec::Meta,

Replacement in src/ts.rs at line 209 [3.7119]

B:BD[5.1577] → [2.799:838]

                    class:      class,

[5.1577]

                    category:   category,

Deletion in src/ts.rs at line 220 [3.7119]
B:BD[5.1783] → [7.1724:1765]
```
                    // dbg!(&series_id);
```

Insertion in src/ts.rs at line 365 [3.7119]

[5.2947]

                series_id:  series_spec.series_id.clone(),

Replacement in src/ts.rs at line 461 [3.7119]
∅:D[2.867] → [8.552:576]
B:BD[8.552] → [8.552:576]
```
pub enum GraphicClass {
```
[2.867]
[8.576]
```
pub enum GraphicCategory {
```
Replacement in src/ts.rs at line 472 [3.7119]
B:BD[8.826] → [8.826:858]
```
impl FromStr for GraphicClass {
```
[8.826]
[8.858]
```
impl FromStr for GraphicCategory {
```

Replacement in src/ts.rs at line 477 [3.7119]

B:BD[8.949] → [2.868:924]

∅:D[2.924] → [8.1004:1111]

B:BD[8.1004] → [8.1004:1111]

            "collation"  => Ok(GraphicClass::Collated),
            "source"    => Ok(GraphicClass::Source),
            "cleaned"   => Ok(GraphicClass::Cleaned),

[8.949]

[8.1111]

            "collation" => Ok(GraphicCategory::Collated),
            "source"    => Ok(GraphicCategory::Source),
            "cleaned"   => Ok(GraphicCategory::Cleaned),

Replacement in src/ts.rs at line 485 [3.7119]
B:BD[9.1860] → [8.1219:1256]
```
impl fmt::Display for GraphicClass {
```
[9.1860]
[8.1256]
```
impl fmt::Display for GraphicCategory {
```

Replacement in src/ts.rs at line 488 [3.7119]

B:BD[8.1348] → [2.925:977]

∅:D[2.977] → [8.1399:1498]

B:BD[8.1399] → [8.1399:1498]

            GraphicClass::Collated  => "collation",
            GraphicClass::Source    => "source",
            GraphicClass::Cleaned   => "cleaned",

[8.1348]

[8.1498]

            GraphicCategory::Collated  => "collation",
            GraphicCategory::Source    => "source",
            GraphicCategory::Cleaned   => "cleaned",

Replacement in src/ts.rs at line 508 [3.7119]

B:BD[4.9473] → [8.1546:1588]

∅:D[8.1588] → [5.3497:3533]

B:BD[4.9473] → [5.3497:3533]

B:BD[5.3566] → [5.3566:3601]

    pub class_opt:  Option<GraphicClass>,
    pub title_opt:  Option<String>,
    pub series_ids: Vec<SeriesId>,

[4.9473]

[2.978]

    pub category_opt:   Option<GraphicCategory>,
    pub title_opt:      Option<String>,
    pub series_ids:     Vec<SeriesId>,

Replacement in src/ts.rs at line 514 [3.7119]

B:BD[2.1000] → [2.1000:1271]

    pub (crate) fn assert_has_one_series(&self) -> Result<(), Error> {
        if self.series_ids.len() != 1 {
            Err(expected_graphic_has_one_series(
                file!(),
                line!(),
            ))
        } else {
            Ok(())
        }

[2.1000]

[2.1271]

    pub (crate) fn assert_has_one_series(&self) -> bool {
        self.series_ids.len() == 1

Replacement in src/ts.rs at line 525 [3.7119]

B:BD[10.1845] → [8.1589:1656]

                class_opt:      self.opt_value("graphic::class")?,

[10.1845]

[5.3602]

                category_opt:   self.opt_value("graphic::category")?,

Replacement in src/ts.rs at line 538 [3.7119]

B:BD[11.7063] → [8.1657:1704]

        if let Some(class) = &self.class_opt {

[11.7063]

[8.1704]

        if let Some(class) = &self.category_opt {

Insertion in src/ts.rs at line 562 [3.7119]
[10.3358]
[11.8105]
```
    
    DateRange(DateRange),
```

Insertion in src/ts.rs at line 585 [3.7119]

[5.4176]

[10.4252]

            Transform::DateRange(date_range)
                                    => write!(f, "{}", date_range.to_string()),

Replacement in src/lib.rs at line 205 [12.16]
B:BD[9.4283] → [8.1762:1780]
```
    GraphicClass,
```
[9.4283]
[5.4177]
```
    GraphicCategory,
```
Replacement in src/lib.rs at line 249 [12.16]
B:BD[10.4737] → [5.4208:4232]
```
#[derive(Clone, Debug)]
```
[10.4737]
[10.4754]
```
#[derive(Clone, Copy, Debug, Serialize)]
```

Insertion in src/lib.rs at line 275 [12.16]

[10.5413]

    }
}
impl fmt::Display for DateRange {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
        let s = match (self.0.first_date(), self.0.last_date()) {
            (None, None) => {
                format!(
                    "open"
                )
            },
            (Some(d1), None) => {
                format!(
                    "from {}-{}-01",
                    d1.year(),
                    d1.month(),
                )
            },
            (None, Some(d2)) => {
                format!(
                    "to {}-{}-01",
                     d2.year(),
                    d2.month()
                )
            },
            (Some(d1), Some(d2)) => {
                format!(
                    "between {}-{}-01 and {}-{}-01",
                    d1.year(),
                    d1.month(),
                    d2.year(),
                    d2.month(),
                )
            },
        };
        write!(f, "{}", s)

Replacement in src/lib.rs at line 523 [12.16]

B:BD[9.4990] → [8.1781:1839]

∅:D[8.1839] → [5.4917:4951]

B:BD[9.4990] → [5.4917:4951]

B:BD[5.4985] → [5.4985:5025]

                class_opt:  Some(GraphicClass::Collated),
                title_opt:  None,
                series_ids: Vec::new(),

[9.4990]

[9.5182]

                category_opt:   Some(GraphicCategory::Collated),
                title_opt:      None,
                series_ids:     Vec::new(),

Deletion in src/lib.rs at line 536 [12.16]

B:BD[9.5476] → [9.5476:5542]

                    date_range:     DateRange::new(&None, &None),

Replacement in src/lib.rs at line 547 [12.16]

B:BD[9.5840] → [8.1840:1900]

∅:D[8.1900] → [5.5270:5308]

B:BD[9.5840] → [5.5270:5308]

B:BD[5.5346] → [5.5346:5416]

                    class_opt:  Some(GraphicClass::Source),
                    title_opt:  None,
                    series_ids: vec!(series_spec.series_id.clone()),

[9.5840]

[9.6078]

                    category_opt:   Some(GraphicCategory::Source),
                    title_opt:      None,
                    series_ids:     vec!(series_spec.series_id.clone()),

Deletion in src/lib.rs at line 724 [12.16]
B:BD[13.8023] → [5.5891:5926]
```
    pub date_range:     DateRange,
```

Replacement in src/lib.rs at line 808 [12.16]

B:BD[6.5144] → [6.5144:5221]

        let mut rts = self.read_data_without_transform(country, root_path)?;

[6.5144]

[5.6855]

        let rts = self.read_data_without_transform(country, root_path)?;

Replacement in src/lib.rs at line 830 [12.16]

B:BD[5.7629] → [5.7629:7647]

[5.7629]

[5.7647]

                },
                Transform::DateRange(range) => rts.range(&range.0),

Deletion in src/lib.rs at line 834 [12.16]
B:BD[14.2037] → [5.7663:7707]
```
        rts.with_range(&self.date_range.0);
```

Deletion in src/lib.rs at line 1151 [12.16]

B:BD[13.12084] → [5.8469:8729]


        if let Some(first_date) = self.date_range.first_date() {
            kt.push_value(1, "first_date", first_date);
        }
        if let Some(last_date) = self.date_range.last_date() {
            kt.push_value(1, "last_date", last_date);
        };

Insertion in src/lib.rs at line 1172 [12.16]

[5.9056]

[13.12311]

        let date_range = DateRange::new(&first_date, &last_date);
        let mut transforms: Vec<Transform> = self.vec_value("series::transforms")?;
   
        if first_date.is_some() || last_date.is_some() {
            transforms.push(Transform::DateRange(date_range));
        }

Replacement in src/lib.rs at line 1185 [12.16]

B:BD[13.12532] → [5.9122:9258]

                date_range: DateRange::new(&first_date, &last_date),
                transforms: self.vec_value("series::transforms")?,

[13.12532]

                transforms: transforms,

Deletion in src/fred.rs at line 17 [15.6172]
B:BD[15.6396] → [5.9259:9274]
```
    DateRange,
```

Deletion in src/fred.rs at line 116 [15.6172]

B:BD[15.9392] → [5.9340:9406]

                        date_range: DateRange::new(&None, &None),

Deletion in src/fred.rs at line 169 [15.6172]

B:BD[15.11229] → [5.9520:9586]

                        date_range: DateRange::new(&None, &None),

Replacement in src/error.rs at line 31 [15.14566]

B:BD[2.1421] → [2.1421:1450]

    code_line: u32) -> Error

[2.1421]

[2.1450]

    code_line: u32,
    country: &str,
    data_type: &str,
    index: usize) -> Error

Replacement in src/error.rs at line 37 [15.14566]

B:BD[2.1471] → [2.1471:1553]

        "[ui_date:02:{}:{}] Expected source graphic to have exactly one series.",

[2.1471]

[2.1553]

        "[ui_date:02:{}:{}] [{} {} {}] Expected source graphic to have exactly one series.",

Insertion in src/error.rs at line 40 [15.14566]

[2.1591]

[15.15073]

        country,
        data_type,
        index,