Feature/fix usergroup update

src/data/user-monitoring/permission-fixer/PermissionFixerUserGroupD2Repository.ts

@@ -1,9 +1,10 @@
-import { D2Api } from "@eyeseetea/d2-api/2.36";
+import { D2Api, Stats } from "@eyeseetea/d2-api/2.36";
 import log from "utils/log";
 import { PermissionFixerUserGroupExtended } from "domain/entities/user-monitoring/permission-fixer/PermissionFixerUserGroupExtended";
 import { PermissionFixerUserGroupRepository } from "domain/repositories/user-monitoring/permission-fixer/PermissionFixerUserGroupRepository";
 import { Async } from "domain/entities/Async";
 import { UserGroupNotFoundException } from "./exception/UserGroupNotFoundException";
+import { Id, Ref } from "domain/entities/Base";
 
 export class PermissionFixerUserGroupD2Repository implements PermissionFixerUserGroupRepository {
     constructor(private api: D2Api) {}
@@ -23,21 +24,45 @@ export class PermissionFixerUserGroupD2Repository implements PermissionFixerUser
             throw new UserGroupNotFoundException("Error getting user group: " + groupsIds);
         }
     }
-    async save(userGroup: PermissionFixerUserGroupExtended): Async<string> {
+    async save(userGroup: PermissionFixerUserGroupExtended, users: Ref[]): Async<string> {
         try {
-            const response = await this.api.models.userGroups.put(userGroup).getData();
-            if (response.status == "OK") {
+            const response = await this.appendUsersInUsergroup(userGroup, users);
+            if (response == "OK") {
                 log.info("Users added to minimal group");
             } else {
                 log.error("Error adding users to minimal group");
             }
 
-            log.info(JSON.stringify(response.response));
+            log.info(JSON.stringify(response));
 
-            return response.status;
+            return response;
         } catch (error) {
             console.debug(error);
             return "ERROR";
         }
     }
+
+    private async appendUsersInUsergroup(
+        userGroup: PermissionFixerUserGroupExtended,
+        users: Ref[]
+    ): Async<string> {
+        const usersIds = users.map(({ id }) => ({ id: id }));
+        const response = await this.api
+            .post<UserGroupResponse>(
+                `/userGroups/${userGroup.id}/users/`,
+                { async: false },
+                {
+                    additions: usersIds,
+                }
+            )
+            .getData();
+        log.info(response.status);
+        return response.status;
+    }
 }
+
+type UserGroupResponse = {
+    status: string;
+    typeReports: object[];
+    stats: Stats;
+};

src/domain/repositories/user-monitoring/permission-fixer/PermissionFixerUserGroupRepository.ts

@@ -1,8 +1,8 @@
 import { Async } from "domain/entities/Async";
-import { Id } from "domain/entities/Base";
+import { Id, Ref } from "domain/entities/Base";
 import { PermissionFixerUserGroupExtended } from "domain/entities/user-monitoring/permission-fixer/PermissionFixerUserGroupExtended";
 
 export interface PermissionFixerUserGroupRepository {
     get(ids: Id): Async<PermissionFixerUserGroupExtended>;
-    save(userGroup: PermissionFixerUserGroupExtended): Async<string>;
+    save(userGroup: PermissionFixerUserGroupExtended, users: Ref[]): Async<string>;
 }

src/domain/usecases/user-monitoring/permission-fixer/RunUserPermissionUseCase.ts

@@ -466,7 +466,6 @@ export class RunUserPermissionUseCase {
             const userIds = userIdWithoutGroups.map(item => {
                 return { id: item.id };
             });
-            minimalUserGroup.users.push(...userIds);
 
             log.info("Pushing fixed users without groups");
             if (!pushFixedUserGroups) {
@@ -477,7 +476,7 @@ export class RunUserPermissionUseCase {
                 );
             }
 
-            const response = await this.userGroupRepository.save(minimalUserGroup);
+            const response = await this.userGroupRepository.save(minimalUserGroup, userIds);
             return this.getResponse(response, userIdWithoutGroups.length, userIdWithoutGroups);
         } else {
             return this.getResponse("No users without groups found.", 0, []);