Fix possible duplicates for signatories

Author: zupzup

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.5.0
+
+* Stabilise Identity Proof Implementation
+
 # 0.4.13
 
 * Document versioning scheme

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace.package]
-version = "0.4.13"
+version = "0.5.0"
 edition = "2024"
 license = "MIT"
 

crates/bcr-ebill-api/src/service/company_service.rs

@@ -992,15 +992,28 @@ impl CompanyServiceApi for CompanyService {
                     .into(),
             ));
         }
-        // Add signatory as invited
-        company.signatories.push(CompanySignatory {
-            node_id: signatory_node_id.clone(),
-            t: SignatoryType::Solo,
-            status: CompanySignatoryStatus::Invited {
+        // If the signatory already exists - set to invited
+        if let Some(signatory) = company
+            .signatories
+            .iter_mut()
+            .find(|s| s.node_id == signatory_node_id)
+        {
+            signatory.status = CompanySignatoryStatus::Invited {
                 ts: timestamp,
                 inviter: full_identity.identity.node_id.clone(),
-            },
-        });
+            };
+        } else {
+            // Otherwise, add as invited
+            company.signatories.push(CompanySignatory {
+                node_id: signatory_node_id.clone(),
+                t: SignatoryType::Solo,
+                status: CompanySignatoryStatus::Invited {
+                    ts: timestamp,
+                    inviter: full_identity.identity.node_id.clone(),
+                },
+            });
+        }
+
         self.store.update(id, &company).await?;
 
         let mut company_chain = self.company_blockchain_store.get_chain(id).await?;

crates/bcr-ebill-core/src/application/company.rs

@@ -5,6 +5,7 @@ use crate::protocol::{
 };
 use bcr_common::core::NodeId;
 
+use log::warn;
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
@@ -180,7 +181,13 @@ impl Company {
                                 inviter: payload.inviter.clone(),
                             }
                         }
-                        _ => (), // already invited / accepted - ignore,
+                        _ => {
+                            // already invited / accepted - ignore,
+                            warn!(
+                                "Trying to invite {}, although they're already invited/accepted",
+                                payload.invitee
+                            );
+                        }
                     }
                 } else {
                     // if the signatory wasn't in the list before - add as invited