2562 name merging handle name merge sync messages

server/repository/src/db_diesel/name_link_row.rs

@@ -87,10 +87,21 @@ impl<'a> NameLinkRowRepository<'a> {
         Ok(())
     }
 
-    pub async fn find_one_by_id(&self, name_link_id: &str) -> Result<NameLinkRow, RepositoryError> {
+    pub fn find_one_by_id(
+        &self,
+        name_link_id: &str,
+    ) -> Result<Option<NameLinkRow>, RepositoryError> {
         let result = name_link
             .filter(name_link::id.eq(name_link_id))
-            .first::<NameLinkRow>(&self.connection.connection)?;
+            .first::<NameLinkRow>(&self.connection.connection)
+            .optional()?;
+        Ok(result)
+    }
+
+    pub fn find_many_by_name_id(&self, name: &str) -> Result<Vec<NameLinkRow>, RepositoryError> {
+        let result = name_link
+            .filter(name_id.eq(name))
+            .load::<NameLinkRow>(&self.connection.connection)?;
         Ok(result)
     }
 }

server/service/src/sync/test/mod.rs

@@ -330,6 +330,7 @@ pub(crate) async fn check_records_against_database(
                 "DocumentRegistry"
             ),
             ItemLink(_) => todo!(),
+            NameLink(_) => todo!(),
         }
     }
 

server/service/src/sync/translation_and_integration.rs

@@ -225,6 +225,7 @@ impl PullUpsertRecord {
             DocumentRegistry(record) => DocumentRegistryRowRepository::new(con).upsert_one(record),
             Document(record) => sync_upsert_document(con, record),
             ItemLink(record) => ItemLinkRowRepository::new(con).upsert_one(record),
+            NameLink(record) => NameLinkRowRepository::new(con).upsert_one(record),
         }
     }
 }

server/service/src/sync/translations/mod.rs

@@ -88,6 +88,7 @@ pub(crate) fn all_translators() -> SyncTranslators {
         // Special translations
         Box::new(special::NameToNameStoreJoinTranslation {}),
         Box::new(special::ItemMergeTranslation {}),
+        Box::new(special::NameMergeTranslation {}),
     ]
 }
 
@@ -206,6 +207,7 @@ pub(crate) enum PullUpsertRecord {
     Document(Document),
     DocumentRegistry(DocumentRegistryRow),
     ItemLink(ItemLinkRow),
+    NameLink(NameLinkRow),
 }
 
 #[derive(Debug, PartialEq, Clone)]

server/service/src/sync/translations/special/item_merge.rs

@@ -42,7 +42,10 @@ impl SyncTranslation for ItemMergeTranslation {
         }
         let indirect_link = item_link_repo
             .find_one_by_id(&data.merge_id_to_keep)?
-            .unwrap();
+            .ok_or(anyhow::anyhow!(
+                "Could not find item link with id {}",
+                data.merge_id_to_keep
+            ))?;
 
         let upsert_records: Vec<PullUpsertRecord> = item_links
             .into_iter()

server/service/src/sync/translations/special/mod.rs

@@ -2,3 +2,5 @@ mod name_to_name_store_join;
 pub(crate) use name_to_name_store_join::*;
 mod item_merge;
 pub(crate) use item_merge::*;
+mod name_merge;
+pub(crate) use name_merge::*;

server/service/src/sync/translations/special/name_merge.rs

@@ -0,0 +1,155 @@
+use repository::{NameLinkRow, NameLinkRowRepository, StorageConnection, SyncBufferRow};
+
+use serde::Deserialize;
+
+use crate::sync::translations::{
+    IntegrationRecords, LegacyTableName, PullDependency, PullUpsertRecord, SyncTranslation,
+};
+
+#[derive(Deserialize)]
+pub struct NameMergeMessage {
+    #[serde(rename = "mergeIdToKeep")]
+    pub merge_id_to_keep: String,
+    #[serde(rename = "mergeIdToDelete")]
+    pub merge_id_to_delete: String,
+}
+
+pub(crate) struct NameMergeTranslation {}
+impl SyncTranslation for NameMergeTranslation {
+    fn pull_dependencies(&self) -> PullDependency {
+        PullDependency {
+            table: LegacyTableName::NAME,
+            dependencies: vec![],
+        }
+    }
+
+    fn try_translate_pull_merge(
+        &self,
+        connection: &StorageConnection,
+        sync_record: &SyncBufferRow,
+    ) -> Result<Option<IntegrationRecords>, anyhow::Error> {
+        if sync_record.table_name != LegacyTableName::NAME {
+            return Ok(None);
+        }
+
+        let data = serde_json::from_str::<NameMergeMessage>(&sync_record.data)?;
+
+        let name_link_repo = NameLinkRowRepository::new(connection);
+        let name_links = name_link_repo.find_many_by_name_id(&data.merge_id_to_delete)?;
+        if name_links.len() == 0 {
+            return Ok(None);
+        }
+        let indirect_link = name_link_repo
+            .find_one_by_id(&data.merge_id_to_keep)?
+            .ok_or(anyhow::anyhow!(
+                "Could not find name link with id {}",
+                data.merge_id_to_keep
+            ))?;
+
+        let upsert_records: Vec<PullUpsertRecord> = name_links
+            .into_iter()
+            .map(|NameLinkRow { id, .. }| {
+                PullUpsertRecord::NameLink(NameLinkRow {
+                    id,
+                    name_id: indirect_link.name_id.clone(),
+                })
+            })
+            .collect();
+
+        Ok(Some(IntegrationRecords::from_upserts(upsert_records)))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::sync::synchroniser::integrate_and_translate_sync_buffer;
+
+    use super::*;
+    use repository::{
+        mock::MockDataInserts, test_db::setup_all, NameLinkRowRepository, SyncBufferAction,
+        SyncBufferRow, SyncBufferRowRepository,
+    };
+
+    #[actix_rt::test]
+    async fn test_name_merge() {
+        let mut sync_records = vec![
+            SyncBufferRow {
+                record_id: "name_b_merge".to_string(),
+                table_name: LegacyTableName::NAME.to_string(),
+                action: SyncBufferAction::Merge,
+                data: r#"{
+                        "mergeIdToKeep": "name_b",
+                        "mergeIdToDelete": "name_a"
+                    }"#
+                .to_string(),
+                ..SyncBufferRow::default()
+            },
+            SyncBufferRow {
+                record_id: "name_c_merge".to_string(),
+                table_name: LegacyTableName::NAME.to_string(),
+                action: SyncBufferAction::Merge,
+                data: r#"{
+                      "mergeIdToKeep": "name_c",
+                      "mergeIdToDelete": "name_b"
+                    }"#
+                .to_string(),
+                ..SyncBufferRow::default()
+            },
+        ];
+
+        let expected_name_links = vec![
+            NameLinkRow {
+                id: "name_a".to_string(),
+                name_id: "name_c".to_string(),
+            },
+            NameLinkRow {
+                id: "name_b".to_string(),
+                name_id: "name_c".to_string(),
+            },
+            NameLinkRow {
+                id: "name_c".to_string(),
+                name_id: "name_c".to_string(),
+            },
+        ];
+
+        let (_, connection, _, _) = setup_all(
+            "test_name_merge_message_translation_in_order",
+            MockDataInserts::none().units().names(),
+        )
+        .await;
+
+        SyncBufferRowRepository::new(&connection)
+            .upsert_many(&sync_records)
+            .unwrap();
+        integrate_and_translate_sync_buffer(&connection, true).unwrap();
+
+        let name_link_repo = NameLinkRowRepository::new(&connection);
+        let mut name_links = name_link_repo
+            .find_many_by_name_id(&"name_c".to_string())
+            .unwrap();
+
+        name_links.sort_by_key(|i| i.id.to_owned());
+        assert_eq!(name_links, expected_name_links);
+
+        let (_, connection, _, _) = setup_all(
+            "test_name_merge_message_translation_in_reverse_order",
+            MockDataInserts::none().units().names(),
+        )
+        .await;
+
+        sync_records.reverse();
+        SyncBufferRowRepository::new(&connection)
+            .upsert_many(&sync_records)
+            .unwrap();
+
+        integrate_and_translate_sync_buffer(&connection, true).unwrap();
+
+        let name_link_repo = NameLinkRowRepository::new(&connection);
+        let mut name_links = name_link_repo
+            .find_many_by_name_id(&"name_c".to_string())
+            .unwrap();
+
+        name_links.sort_by_key(|i| i.id.to_owned());
+        assert_eq!(name_links, expected_name_links);
+    }
+}