More preventive identity set on organization update (#1707)

Author: epipav

backend/src/api/organization/organizationUpdate.ts

@@ -21,7 +21,7 @@ import PermissionChecker from '../../services/user/permissionChecker'
 export default async (req, res) => {
   new PermissionChecker(req).validateHas(Permissions.values.organizationEdit)
 
-  const payload = await new OrganizationService(req).update(req.params.id, req.body)
+  const payload = await new OrganizationService(req).update(req.params.id, req.body, true)
 
   await req.responseHandler.success(req, res, payload)
 }

backend/src/database/repositories/organizationRepository.ts

@@ -562,7 +562,7 @@ class OrganizationRepository {
     })
   }
 
-  static async update(id, data, options: IRepositoryOptions) {
+  static async update(id, data, options: IRepositoryOptions, overrideIdentities = false) {
     const currentUser = SequelizeRepository.getCurrentUser(options)
 
     const transaction = SequelizeRepository.getTransaction(options)
@@ -664,7 +664,13 @@ class OrganizationRepository {
     }
 
     if (data.identities && data.identities.length > 0) {
-      await this.setIdentities(id, data.identities, options)
+      if (overrideIdentities) {
+        await this.setIdentities(id, data.identities, options)
+      } else {
+        for (const identity of data.identities) {
+          await this.addIdentity(id, identity, options)
+        }
+      }
     }
 
     await this._createAuditLog(AuditLogRepository.UPDATE, record, data, options)

backend/src/services/organizationService.ts

@@ -489,7 +489,7 @@ export default class OrganizationService extends LoggerBase {
     return OrganizationRepository.findOrganizationsWithMergeSuggestions(args, this.options)
   }
 
-  async update(id, data) {
+  async update(id, data, overrideIdentities = false) {
     let tx
 
     try {
@@ -531,7 +531,7 @@ export default class OrganizationService extends LoggerBase {
         }
       }
 
-      const record = await OrganizationRepository.update(id, data, repoOptions)
+      const record = await OrganizationRepository.update(id, data, repoOptions, overrideIdentities)
 
       await SequelizeRepository.commitTransaction(tx)