Fixing delete user

Author: david-rocca

src/controller/registry-user.controller/registry-user.controller.js

@@ -178,16 +178,13 @@ async function updateUser (req, res, next) {
 
 async function deleteUser (req, res, next) {
   try {
-    const userRepo = req.ctx.repositories.getUserRepository()
-    const orgRepo = req.ctx.repositories.getOrgRepository()
-    const registryUserRepo = req.ctx.repositories.getRegistryUserRepository()
+    const userRepo = req.ctx.repositories.getBaseUserRepository()
+    const orgRepo = req.ctx.repositories.getBaseOrgRepository()
     const userUUID = req.ctx.params.identifier
 
-    const user = await registryUserRepo.findOneByUUID(userUUID)
-
-    // TODO: check permissions
+    const user = await userRepo.findOneByUUID(userUUID)
 
-    await registryUserRepo.deleteByUUID(userUUID)
+    await userRepo.deleteByUUID(userUUID)
 
     const payload = {
       action: 'delete_registry_user',

src/repositories/baseUserRepository.js

@@ -125,6 +125,34 @@ class BaseUserRepository extends BaseRepository {
     return user || null
   }
 
+  /**
+   * Delete a user by UUID from both BaseUser and RegistryUser collections,
+   * and remove the user reference from any organizations.
+   *
+   * @param {string} uuid - The UUID of the user to delete.
+   * @param {object} options - Mongoose options for the delete operations.
+   * @returns {Promise<number>} Number of deleted documents (should be 1 if successful).
+   */
+  async deleteUserByUUID (uuid, options = {}) {
+    // Delete from BaseUser collection
+    const deleteResult = await BaseUser.deleteOne({ UUID: uuid }, options)
+
+    // Delete from RegistryUser collection
+    await RegistryUser.deleteOne({ UUID: uuid }, options)
+
+    // Remove user from any organization’s users and admins arrays
+    const orgs = await BaseOrgModel.find({ $or: [{ users: uuid }, { admins: uuid }] })
+    for (const org of orgs) {
+      org.users = org.users.filter(u => u !== uuid)
+      if (Array.isArray(org.admins)) {
+        org.admins = org.admins.filter(a => a !== uuid)
+      }
+      await org.save({ options })
+    }
+
+    return deleteResult.deletedCount
+  }
+
   async getUserUUID (username, orgShortname, options = {}, isLegacyObject = false) {
     const user = await this.findOneByUsernameAndOrgShortname(username, orgShortname, options, isLegacyObject)
     if (user) {