Add updatedAt field to all remaining relevant structs and query strin…

…gs (tested and working)
thoth-pub · Mar 19, 2021 · 9a8f169 · 9a8f169
1 parent 33933cb
commit 9a8f169
Show file tree

Hide file tree

Showing 28 changed files with 78 additions and 0 deletions.
diff --git a/thoth-app/src/models/funder/create_funder_mutation.rs b/thoth-app/src/models/funder/create_funder_mutation.rs
@@ -14,6 +14,7 @@ const CREATE_FUNDER_MUTATION: &str = "
         }){
             funderId
             funderName
+            updatedAt
         }
     }
 ";

diff --git a/thoth-app/src/models/funder/delete_funder_mutation.rs b/thoth-app/src/models/funder/delete_funder_mutation.rs
@@ -12,6 +12,7 @@ const DELETE_FUNDER_MUTATION: &str = "
         ){
             funderId
             funderName
+            updatedAt
         }
     }
 ";

diff --git a/thoth-app/src/models/funder/funder_query.rs b/thoth-app/src/models/funder/funder_query.rs
@@ -9,6 +9,7 @@ pub const FUNDER_QUERY: &str = "
             funderId
             funderName
             funderDoi
+            updatedAt
         }
     }
 ";

diff --git a/thoth-app/src/models/funder/funders_query.rs b/thoth-app/src/models/funder/funders_query.rs
@@ -10,6 +10,7 @@ pub const FUNDERS_QUERY: &str = "
             funderId
             funderName
             funderDoi
+            updatedAt
         }
         funderCount(filter: $filter)
     }

diff --git a/thoth-app/src/models/funder/mod.rs b/thoth-app/src/models/funder/mod.rs
@@ -1,3 +1,4 @@
+use chrono::naive::NaiveDateTime;
 use serde::Deserialize;
 use serde::Serialize;
 use yew::html;
@@ -14,6 +15,7 @@ pub struct Funder {
     pub funder_id: String,
     pub funder_name: String,
     pub funder_doi: Option<String>,
+    pub updated_at: serde_json::Value,
 }
 
 impl Funder {
@@ -44,6 +46,8 @@ impl Funder {
 
     pub fn as_table_row(&self, callback: Callback<MouseEvent>) -> Html {
         let funder_doi = self.funder_doi.clone().unwrap_or_else(|| "".to_string());
+        let updated =
+            NaiveDateTime::from_timestamp(self.updated_at.as_f64().unwrap_or(0.0) as i64, 0);
         html! {
             <tr
                 class="row"
@@ -52,6 +56,7 @@ impl Funder {
                 <td>{&self.funder_id}</td>
                 <td>{&self.funder_name}</td>
                 <td>{funder_doi}</td>
+                <td>{updated}</td>
             </tr>
         }
     }

diff --git a/thoth-app/src/models/funder/update_funder_mutation.rs b/thoth-app/src/models/funder/update_funder_mutation.rs
@@ -16,6 +16,7 @@ const UPDATE_FUNDER_MUTATION: &str = "
         }){
             funderId
             funderName
+            updatedAt
         }
     }
 ";

diff --git a/thoth-app/src/models/funding/create_funding_mutation.rs b/thoth-app/src/models/funding/create_funding_mutation.rs
@@ -33,6 +33,7 @@ const CREATE_FUNDING_MUTATION: &str = "
             funder {
                 funderId
                 funderName
+                updatedAt
             }
         }
     }

diff --git a/thoth-app/src/models/imprint/create_imprint_mutation.rs b/thoth-app/src/models/imprint/create_imprint_mutation.rs
@@ -17,6 +17,7 @@ const CREATE_IMPRINT_MUTATION: &str = "
             imprintId
             imprintName
             imprintUrl
+            updatedAt
             publisher {
                 publisherId
                 publisherName

diff --git a/thoth-app/src/models/imprint/delete_imprint_mutation.rs b/thoth-app/src/models/imprint/delete_imprint_mutation.rs
@@ -13,6 +13,7 @@ const DELETE_IMPRINT_MUTATION: &str = "
             imprintId
             imprintName
             imprintUrl
+            updatedAt
             publisher {
                 publisherId
                 publisherName

diff --git a/thoth-app/src/models/imprint/imprint_query.rs b/thoth-app/src/models/imprint/imprint_query.rs
@@ -9,11 +9,13 @@ pub const IMPRINT_QUERY: &str = "
             imprintId
             imprintName
             imprintUrl
+            updatedAt
             publisher {
                 publisherId
                 publisherName
                 publisherShortname
                 publisherUrl
+                updatedAt
             }
         }
     }

diff --git a/thoth-app/src/models/imprint/imprints_query.rs b/thoth-app/src/models/imprint/imprints_query.rs
@@ -10,11 +10,13 @@ const IMPRINTS_QUERY: &str = "
             imprintId
             imprintName
             imprintUrl
+            updatedAt
             publisher {
                 publisherId
                 publisherName
                 publisherShortname
                 publisherUrl
+                updatedAt
             }
         }
         imprintCount(filter: $filter, publishers: $publishers)

diff --git a/thoth-app/src/models/imprint/mod.rs b/thoth-app/src/models/imprint/mod.rs
@@ -1,3 +1,4 @@
+use chrono::naive::NaiveDateTime;
 use serde::Deserialize;
 use serde::Serialize;
 use yew::html;
@@ -15,6 +16,7 @@ pub struct Imprint {
     pub imprint_id: String,
     pub imprint_name: String,
     pub imprint_url: Option<String>,
+    pub updated_at: serde_json::Value,
     pub publisher: Publisher,
 }
 
@@ -29,6 +31,8 @@ impl Imprint {
 
     pub fn as_table_row(&self, callback: Callback<MouseEvent>) -> Html {
         let imprint_url = self.imprint_url.clone().unwrap_or_else(|| "".to_string());
+        let updated =
+            NaiveDateTime::from_timestamp(self.updated_at.as_f64().unwrap_or(0.0) as i64, 0);
         html! {
             <tr
                 class="row"
@@ -38,6 +42,7 @@ impl Imprint {
                 <td>{&self.imprint_name}</td>
                 <td>{&self.publisher.publisher_name}</td>
                 <td>{imprint_url}</td>
+                <td>{updated}</td>
             </tr>
         }
     }
@@ -49,6 +54,7 @@ impl Default for Imprint {
             imprint_id: "".to_string(),
             imprint_name: "".to_string(),
             imprint_url: None,
+            updated_at: Default::default(),
             publisher: Default::default(),
         }
     }

diff --git a/thoth-app/src/models/imprint/update_imprint_mutation.rs b/thoth-app/src/models/imprint/update_imprint_mutation.rs
@@ -19,11 +19,13 @@ const UPDATE_IMPRINT_MUTATION: &str = "
             imprintId
             imprintName
             imprintUrl
+            updatedAt
             publisher {
                 publisherId
                 publisherName
                 publisherShortname
                 publisherUrl
+                updatedAt
             }
         }
     }

diff --git a/thoth-app/src/models/issue/create_issue_mutation.rs b/thoth-app/src/models/issue/create_issue_mutation.rs
@@ -24,14 +24,17 @@ const CREATE_ISSUE_MUTATION: &str = "
                 issnPrint
                 issnDigital
                 seriesUrl
+                updatedAt
                 imprint {
                     imprintId
                     imprintName
+                    updatedAt
                     publisher {
                         publisherId
                         publisherName
                         publisherShortname
                         publisherUrl
+                        updatedAt
                     }
                 }
             }

diff --git a/thoth-app/src/models/publication/mod.rs b/thoth-app/src/models/publication/mod.rs
@@ -1,3 +1,4 @@
+use chrono::naive::NaiveDateTime;
 use serde::Deserialize;
 use serde::Serialize;
 use thoth_api::publication::model::PublicationType;
@@ -68,6 +69,8 @@ impl crate::models::publication::publications_query::DetailedPublication {
             .publication_url
             .clone()
             .unwrap_or_else(|| "".to_string());
+        let updated =
+            NaiveDateTime::from_timestamp(self.updated_at.as_f64().unwrap_or(0.0) as i64, 0);
         html! {
             <tr
                 class="row"
@@ -80,6 +83,7 @@ impl crate::models::publication::publications_query::DetailedPublication {
                 <td>{&self.publication_type}</td>
                 <td>{isbn}</td>
                 <td>{publication_url}</td>
+                <td>{updated}</td>
             </tr>
         }
     }

diff --git a/thoth-app/src/models/publication/publications_query.rs b/thoth-app/src/models/publication/publications_query.rs
@@ -13,6 +13,7 @@ pub const PUBLICATIONS_QUERY: &str = "
             workId
             isbn
             publicationUrl
+            updatedAt
             work {
                 workId
                 workType
@@ -22,14 +23,17 @@ pub const PUBLICATIONS_QUERY: &str = "
                 title
                 edition
                 copyrightHolder
+                updatedAt
                 imprint {
                     imprintId
                     imprintName
+                    updatedAt
                     publisher {
                         publisherId
                         publisherName
                         publisherShortname
                         publisherUrl
+                        updatedAt
                     }
                 }
             }
@@ -67,6 +71,7 @@ pub struct DetailedPublication {
     pub work_id: String,
     pub isbn: Option<String>,
     pub publication_url: Option<String>,
+    pub updated_at: serde_json::Value,
     pub work: Work,
 }
 

diff --git a/thoth-app/src/models/publisher/create_publisher_mutation.rs b/thoth-app/src/models/publisher/create_publisher_mutation.rs
@@ -16,6 +16,7 @@ const CREATE_PUBLISHER_MUTATION: &str = "
         }){
             publisherId
             publisherName
+            updatedAt
         }
     }
 ";

diff --git a/thoth-app/src/models/publisher/delete_publisher_mutation.rs b/thoth-app/src/models/publisher/delete_publisher_mutation.rs
@@ -12,6 +12,7 @@ const DELETE_PUBLISHER_MUTATION: &str = "
         ){
             publisherId
             publisherName
+            updatedAt
         }
     }
 ";

diff --git a/thoth-app/src/models/publisher/mod.rs b/thoth-app/src/models/publisher/mod.rs
@@ -1,3 +1,4 @@
+use chrono::naive::NaiveDateTime;
 use serde::Deserialize;
 use serde::Serialize;
 use yew::html;
@@ -15,6 +16,7 @@ pub struct Publisher {
     pub publisher_name: String,
     pub publisher_shortname: Option<String>,
     pub publisher_url: Option<String>,
+    pub updated_at: serde_json::Value,
 }
 
 impl Publisher {
@@ -32,6 +34,8 @@ impl Publisher {
             .clone()
             .unwrap_or_else(|| "".to_string());
         let publisher_url = self.publisher_url.clone().unwrap_or_else(|| "".to_string());
+        let updated =
+            NaiveDateTime::from_timestamp(self.updated_at.as_f64().unwrap_or(0.0) as i64, 0);
         html! {
             <tr
                 class="row"
@@ -41,6 +45,7 @@ impl Publisher {
                 <td>{&self.publisher_name}</td>
                 <td>{publisher_shortname}</td>
                 <td>{publisher_url}</td>
+                <td>{updated}</td>
             </tr>
         }
     }
@@ -53,6 +58,7 @@ impl Default for Publisher {
             publisher_name: "".to_string(),
             publisher_shortname: None,
             publisher_url: None,
+            updated_at: Default::default(),
         }
     }
 }

diff --git a/thoth-app/src/models/publisher/publisher_query.rs b/thoth-app/src/models/publisher/publisher_query.rs
@@ -10,6 +10,7 @@ pub const PUBLISHER_QUERY: &str = "
             publisherName
             publisherShortname
             publisherUrl
+            updatedAt
         }
     }
 ";

diff --git a/thoth-app/src/models/publisher/publishers_query.rs b/thoth-app/src/models/publisher/publishers_query.rs
@@ -11,6 +11,7 @@ const PUBLISHERS_QUERY: &str = "
             publisherName
             publisherShortname
             publisherUrl
+            updatedAt
         }
         publisherCount(filter: $filter, publishers: $publishers)
     }

diff --git a/thoth-app/src/models/publisher/update_publisher_mutation.rs b/thoth-app/src/models/publisher/update_publisher_mutation.rs
@@ -18,6 +18,7 @@ const UPDATE_PUBLISHER_MUTATION: &str = "
         }){
             publisherId
             publisherName
+            updatedAt
         }
     }
 ";

diff --git a/thoth-app/src/models/series/mod.rs b/thoth-app/src/models/series/mod.rs
@@ -1,3 +1,4 @@
+use chrono::naive::NaiveDateTime;
 use serde::Deserialize;
 use serde::Serialize;
 use thoth_api::series::model::SeriesType;
@@ -19,6 +20,7 @@ pub struct Series {
     pub issn_print: String,
     pub issn_digital: String,
     pub series_url: Option<String>,
+    pub updated_at: serde_json::Value,
     pub imprint: Imprint,
 }
 
@@ -43,6 +45,7 @@ impl Default for Series {
             issn_print: "".to_string(),
             issn_digital: "".to_string(),
             series_url: None,
+            updated_at: Default::default(),
             imprint: Default::default(),
         }
     }
@@ -69,6 +72,8 @@ impl Series {
     }
 
     pub fn as_table_row(&self, callback: Callback<MouseEvent>) -> Html {
+        let updated =
+            NaiveDateTime::from_timestamp(self.updated_at.as_f64().unwrap_or(0.0) as i64, 0);
         html! {
             <tr
                 class="row"
@@ -79,6 +84,7 @@ impl Series {
                 <td>{&self.series_type}</td>
                 <td>{&self.issn_print}</td>
                 <td>{&self.issn_digital}</td>
+                <td>{updated}</td>
             </tr>
         }
     }

diff --git a/thoth-app/src/models/series/series_query.rs b/thoth-app/src/models/series/series_query.rs
@@ -12,14 +12,17 @@ pub const SERIES_QUERY: &str = "
             issnPrint
             issnDigital
             seriesUrl
+            updatedAt
             imprint {
                 imprintId
                 imprintName
+                updatedAt
                 publisher {
                     publisherId
                     publisherName
                     publisherShortname
                     publisherUrl
+                    updatedAt
                 }
             }
         }

diff --git a/thoth-app/src/models/series/serieses_query.rs b/thoth-app/src/models/series/serieses_query.rs
@@ -13,14 +13,17 @@ pub const SERIESES_QUERY: &str = "
             issnPrint
             issnDigital
             seriesUrl
+            updatedAt
             imprint {
                 imprintId
                 imprintName
+                updatedAt
                 publisher {
                     publisherId
                     publisherName
                     publisherShortname
                     publisherUrl
+                    updatedAt
                 }
             }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,7 @@ const CREATE_FUNDER_MUTATION: &str = " @@
             }){
                 funderId
                 funderName
+                updatedAt
             }
         }
     ";
@@ Expand Down @@