feat: fixing ts

backend/src/services/membership-group/membership-group-service.ts

@@ -217,8 +217,8 @@ export const membershipGroupServiceFactory = ({
         },
         tx
       );
-      await membershipRoleDAL.insertMany(roleDocs, tx);
-      return doc;
+      const roles = await membershipRoleDAL.insertMany(roleDocs, tx);
+      return { ...doc, roles };
     });
 
     return { membership: membershipDoc };
@@ -276,7 +276,7 @@ export const membershipGroupServiceFactory = ({
           : undefined
       }
     });
-    return memberships;
+    return { memberships: memberships.data, totalCount: memberships.totalCount };
   };
 
   const getMembershipByGroupId = async (dto: TGetMembershipGroupByGroupIdDTO) => {
@@ -290,7 +290,7 @@ export const membershipGroupServiceFactory = ({
     });
     if (!membership) throw new NotFoundError({ message: `Group membership not found` });
 
-    return membership;
+    return { membership };
   };
 
   return {

backend/src/services/membership-group/membership-group-types.ts

@@ -54,14 +54,11 @@ export type TUpdateMembershipGroupDTO = {
 export type TListMembershipGroupDTO = {
   permission: OrgServiceActor;
   scopeData: AccessScopeData;
-  selector: {
-    groupId: string;
-  };
   data: {
     limit?: number;
     offset?: number;
     groupName?: string;
-    roles: string[];
+    roles?: string[];
   };
 };
 

backend/src/services/membership-group/project/project-membership-group-factory.ts

@@ -23,6 +23,7 @@ type TProjectMembershipGroupScopeFactoryDep = {
   membershipGroupDAL: Pick<TMembershipGroupDALFactory, "findOne">;
 };
 
+// TODO(simp): check for group in org
 export const newProjectMembershipGroupFactory = ({
   permissionService,
   orgDAL,