1 files changed, 96 insertions, 6 deletions

diff --git a/rust/src/database_models.rs b/rust/src/database_models.rs
index 47e00bcf..2d6788eb 100644
--- a/rust/src/database_models.rs
+++ b/rust/src/database_models.rs
@@ -37,7 +37,9 @@ pub trait EntityEditRow {
 
 // Helper for constructing tables
 macro_rules! entity_structs {
-    ($edit_table:expr, $edit_struct:ident, $ident_table:expr, $ident_struct:ident) => {
+    ($edit_table:expr, $edit_struct:ident, $edit_new_struct:ident, $ident_table:expr,
+    $ident_struct:ident, $ident_new_struct:ident) => {
+
         #[derive(Debug, Queryable, Identifiable, Associations, AsChangeset, QueryableByName)]
         #[table_name = $edit_table]
         pub struct $edit_struct {
@@ -51,6 +53,17 @@ macro_rules! entity_structs {
             pub extra_json: Option<serde_json::Value>,
         }
 
+        #[derive(Debug, Associations, AsChangeset, QueryableByName, Insertable)]
+        #[table_name = $edit_table]
+        pub struct $edit_new_struct {
+            pub editgroup_id: Uuid,
+            pub ident_id: Uuid,
+            pub rev_id: Option<Uuid>,
+            pub redirect_id: Option<Uuid>,
+            pub prev_rev: Option<Uuid>,
+            pub extra_json: Option<serde_json::Value>,
+        }
+
         impl EntityEditRow for $edit_struct {
             /// Go from a row (SQL model) to an API model
             fn into_model(self) -> Result<EntityEdit> {
@@ -75,6 +88,14 @@ macro_rules! entity_structs {
             pub redirect_id: Option<Uuid>,
         }
 
+        #[derive(Debug, Associations, AsChangeset, Insertable)]
+        #[table_name = $ident_table]
+        pub struct $ident_new_struct {
+            pub is_live: bool,
+            pub rev_id: Option<Uuid>,
+            pub redirect_id: Option<Uuid>,
+        }
+
         impl EntityIdentRow for $ident_struct {
             fn state(&self) -> Result<EntityState> {
                 if !self.is_live {
@@ -104,11 +125,25 @@ pub struct ContainerRevRow {
     pub coden: Option<String>,
 }
 
+#[derive(Debug, Associations, AsChangeset, Insertable)]
+#[table_name = "container_rev"]
+pub struct ContainerRevNewRow {
+    pub extra_json: Option<serde_json::Value>,
+    pub name: String,
+    pub publisher: Option<String>,
+    pub issnl: Option<String>,
+    pub wikidata_qid: Option<String>,
+    pub abbrev: Option<String>,
+    pub coden: Option<String>,
+}
+
 entity_structs!(
     "container_edit",
     ContainerEditRow,
+    ContainerEditNewRow,
     "container_ident",
-    ContainerIdentRow
+    ContainerIdentRow,
+    ContainerIdentNewRow
 );
 
 #[derive(Debug, Queryable, Identifiable, Associations, AsChangeset)]
@@ -123,11 +158,24 @@ pub struct CreatorRevRow {
     pub wikidata_qid: Option<String>,
 }
 
+#[derive(Debug, Associations, AsChangeset, Insertable)]
+#[table_name = "creator_rev"]
+pub struct CreatorRevNewRow {
+    pub extra_json: Option<serde_json::Value>,
+    pub display_name: String,
+    pub given_name: Option<String>,
+    pub surname: Option<String>,
+    pub orcid: Option<String>,
+    pub wikidata_qid: Option<String>,
+}
+
 entity_structs!(
     "creator_edit",
     CreatorEditRow,
+    CreatorEditNewRow,
     "creator_ident",
-    CreatorIdentRow
+    CreatorIdentRow,
+    CreatorIdentNewRow
 );
 
 #[derive(Debug, Queryable, Identifiable, Associations, AsChangeset)]
@@ -159,7 +207,18 @@ pub struct FileRevRow {
     pub mimetype: Option<String>,
 }
 
-entity_structs!("file_edit", FileEditRow, "file_ident", FileIdentRow);
+#[derive(Debug, Associations, AsChangeset, Insertable)]
+#[table_name = "file_rev"]
+pub struct FileRevNewRow {
+    pub extra_json: Option<serde_json::Value>,
+    pub size: Option<i64>,
+    pub sha1: Option<String>,
+    pub sha256: Option<String>,
+    pub md5: Option<String>,
+    pub mimetype: Option<String>,
+}
+
+entity_structs!("file_edit", FileEditRow, FileEditNewRow, "file_ident", FileIdentRow, FileIdentNewRow);
 
 #[derive(Debug, Queryable, Identifiable, Associations, AsChangeset)]
 #[table_name = "release_rev"]
@@ -185,11 +244,36 @@ pub struct ReleaseRevRow {
     pub language: Option<String>,
 }
 
+#[derive(Debug, Associations, AsChangeset, Insertable)]
+#[table_name = "release_rev"]
+pub struct ReleaseRevNewRow {
+    pub extra_json: Option<serde_json::Value>,
+    pub work_ident_id: Uuid,
+    pub container_ident_id: Option<Uuid>,
+    pub title: String,
+    pub release_type: Option<String>,
+    pub release_status: Option<String>,
+    pub release_date: Option<chrono::NaiveDate>,
+    pub doi: Option<String>,
+    pub pmid: Option<String>,
+    pub pmcid: Option<String>,
+    pub wikidata_qid: Option<String>,
+    pub isbn13: Option<String>,
+    pub core_id: Option<String>,
+    pub volume: Option<String>,
+    pub issue: Option<String>,
+    pub pages: Option<String>,
+    pub publisher: Option<String>,
+    pub language: Option<String>,
+}
+
 entity_structs!(
     "release_edit",
     ReleaseEditRow,
+    ReleaseEditNewRow,
     "release_ident",
-    ReleaseIdentRow
+    ReleaseIdentRow,
+    ReleaseIdentNewRow
 );
 
 #[derive(Debug, Queryable, Identifiable, Associations, AsChangeset)]
@@ -199,7 +283,13 @@ pub struct WorkRevRow {
     pub extra_json: Option<serde_json::Value>,
 }
 
-entity_structs!("work_edit", WorkEditRow, "work_ident", WorkIdentRow);
+#[derive(Debug, Associations, AsChangeset, Insertable)]
+#[table_name = "work_rev"]
+pub struct WorkRevNewRow {
+    pub extra_json: Option<serde_json::Value>,
+}
+
+entity_structs!("work_edit", WorkEditRow, WorkEditNewRow, "work_ident", WorkIdentRow, WorkIdentNewRow);
 
 #[derive(Debug, Queryable, Identifiable, Associations, AsChangeset)]
 #[table_name = "release_rev_abstract"]