Merge branch 'feature/contact-remove-im' into feature/2.6.0-union

Portkey-Wallet · Nov 30, 2024 · 31ae4a6 · 31ae4a6
2 parents 1204c77 + a8662fb
commit 31ae4a6
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/src/CAServer.Application/Contacts/ContactAppService.cs b/src/CAServer.Application/Contacts/ContactAppService.cs
@@ -73,7 +73,7 @@ public async Task<ContactResultDto> CreateAsync(CreateUpdateContactDto input)
 
         await CheckAddressAsync(userId, input.Addresses, input.RelationId);
         var contactDto = await GetContactDtoAsync(input);
-        
+
         await CheckContactAsync(contactDto);
         var contactGrain = _clusterClient.GetGrain<IContactGrain>(GuidGenerator.Create());
         var result =
@@ -127,13 +127,20 @@ public async Task<ContactResultDto> UpdateAsync(Guid id, CreateUpdateContactDto
         }
 
         var contact = contactResult.Data;
-        if (contact.Addresses != null && contact.Addresses.Count > 1 && input.Addresses != null &&
-            input.Addresses.Count == 1)
+        var isUpdate = false;
+        if (contact.Addresses != null && contact.Addresses.Count > 1 && input.Addresses != null)
         {
-            throw new UserFriendlyException("can not modify address");
+            if (input.Addresses.Count == 1)
+                throw new UserFriendlyException("can not modify address");
+
+            if (!input.Addresses.Select(t => t.Address).Distinct()
+                    .Except(contact.Addresses.Select(t => t.Address).Distinct()).Any()
+               )
+            {
+                isUpdate = true;
+            }
         }
 
-        var isUpdate = false;
         if (contact.Addresses != null && contact.Addresses.Count == 1 && input.Addresses != null &&
             input.Addresses.Count == 1)
         {