[TM-3071] Migrate User CRUD Operations to v3 BE

apps/user-service/src/app.module.ts

@@ -10,6 +10,7 @@ import { ResetPasswordService } from "./auth/reset-password.service";
 import { VerificationUserController } from "./auth/verification-user.controller";
 import { VerificationUserService } from "./auth/verification-user.service";
 import { UserCreationService } from "./users/user-creation.service";
+import { UsersService } from "./users/users.service";
 import { HealthModule } from "@terramatch-microservices/common/health/health.module";
 import { OrganisationsController } from "./organisations/organisations.controller";
 import { OrganisationsService } from "./organisations/organisations.service";
@@ -44,6 +45,7 @@ import { UserAssociationService } from "./user-association/user-association.serv
     ResetPasswordService,
     VerificationUserService,
     UserCreationService,
+    UsersService,
     OrganisationsService,
     OrganisationCreationService,
     ActionsService,

apps/user-service/src/organisations/organisations.controller.ts

@@ -215,7 +215,10 @@ export class OrganisationsController {
     const document = buildJsonApi(OrganisationLightDto);
     const orgResource = document.addData(organisation.uuid, new OrganisationLightDto(organisation));
     if (user != null) {
-      const userResource = document.addData(user.uuid ?? "no-uuid", new UserDto(user, await user.myFrameworks()));
+      const userResource = document.addData(
+        user.uuid ?? "no-uuid",
+        new UserDto(user, user.frameworks, await user.myFrameworks())
+      );
       userResource.relateTo("org", orgResource, { meta: { userStatus: "na" } });
     }
     return document;

apps/user-service/src/user-association/user-association.controller.spec.ts

@@ -155,6 +155,56 @@ describe("UserAssociationController", () => {
     });
   });
 
+  describe("inviteOrganisationUser", () => {
+    it("should authorize and invite an organisation user", async () => {
+      const organisation = await OrganisationFactory.create();
+      const invite = {
+        uuid: "invite-uuid",
+        emailAddress: "invitee@example.com",
+        callbackUrl: "https://example.com/invite",
+        organisationUuid: organisation.uuid
+      };
+      (stubProcessor.getEntity as jest.Mock).mockResolvedValue(organisation);
+      userAssociationService.inviteOrganisationUser.mockResolvedValue(invite as never);
+
+      const result = serialize(
+        await controller.inviteOrganisationUser(
+          { uuid: organisation.uuid as string, model: "organisations" },
+          {
+            emailAddress: "invitee@example.com",
+            callbackUrl: "https://example.com/invite"
+          }
+        )
+      );
+
+      expect(userAssociationService.createProcessor).toHaveBeenCalledWith("organisations", organisation.uuid);
+      expect(policyService.authorize).toHaveBeenCalledWith("update", organisation);
+      expect(userAssociationService.inviteOrganisationUser).toHaveBeenCalledWith(
+        organisation,
+        "invitee@example.com",
+        "https://example.com/invite"
+      );
+      expect(result.data).toBeDefined();
+      expect((result.data as Resource).id).toBe("invite-uuid");
+    });
+
+    it("should propagate UnauthorizedException when policy denies", async () => {
+      const organisation = await OrganisationFactory.create();
+      (stubProcessor.getEntity as jest.Mock).mockResolvedValue(organisation);
+      policyService.authorize.mockRejectedValue(new UnauthorizedException());
+
+      await expect(
+        controller.inviteOrganisationUser(
+          { uuid: organisation.uuid as string, model: "organisations" },
+          {
+            emailAddress: "invitee@example.com",
+            callbackUrl: "https://example.com/invite"
+          }
+        )
+      ).rejects.toThrow(UnauthorizedException);
+    });
+  });
+
   describe("deleteUserAssociations", () => {
     it("should call handleDelete and return deleted response", async () => {
       const project = await ProjectFactory.create();

apps/user-service/src/users/dto/admin-user-create.dto.ts

@@ -0,0 +1,23 @@
+import { CreateDataDto, JsonApiBodyDto } from "@terramatch-microservices/common/util/json-api-update-dto";
+import { IsArray, IsNotEmpty, IsString } from "class-validator";
+import { ApiProperty } from "@nestjs/swagger";
+import { UserCreateBaseAttributes } from "./user-create.dto";
+
+export class AdminUserCreateAttributes extends UserCreateBaseAttributes {
+  @IsNotEmpty()
+  @ApiProperty()
+  role: string;
+
+  @IsNotEmpty()
+  @ApiProperty()
+  organisationUuid: string;
+
+  @ApiProperty({ isArray: true, type: String })
+  @IsArray()
+  @IsString({ each: true })
+  directFrameworks: string[];
+}
+
+export class AdminUserCreateBody extends JsonApiBodyDto(
+  class AdminUserCreateData extends CreateDataDto("users", AdminUserCreateAttributes) {}
+) {}

apps/user-service/src/users/dto/user-create.dto.ts

@@ -2,7 +2,7 @@ import { IsEmail, IsIn, IsNotEmpty, IsOptional } from "class-validator";
 import { ApiProperty } from "@nestjs/swagger";
 import { CreateDataDto, JsonApiBodyDto } from "@terramatch-microservices/common/util/json-api-update-dto";
 
-export class UserCreateAttributes {
+export class UserCreateBaseAttributes {
   @IsNotEmpty()
   @ApiProperty()
   firstName: string;
@@ -11,10 +11,6 @@ export class UserCreateAttributes {
   @ApiProperty()
   lastName: string;
 
-  @IsNotEmpty()
-  @ApiProperty()
-  password: string;
-
   @IsEmail()
   @ApiProperty()
   emailAddress: string;
@@ -27,18 +23,28 @@ export class UserCreateAttributes {
   @ApiProperty()
   jobRole: string;
 
-  @IsNotEmpty()
-  @IsIn(["project-developer", "funder", "government"])
-  @ApiProperty()
-  role: string;
-
   @IsOptional()
   @ApiProperty()
   country: string;
 
   @IsOptional()
   @ApiProperty()
   program: string;
+}
+
+export class UserCreateBaseBody extends JsonApiBodyDto(
+  class UserCreateBaseData extends CreateDataDto("users", UserCreateBaseAttributes) {}
+) {}
+
+export class UserCreateAttributes extends UserCreateBaseAttributes {
+  @IsNotEmpty()
+  @ApiProperty()
+  password: string;
+
+  @IsNotEmpty()
+  @IsIn(["project-developer", "funder", "government"])
+  @ApiProperty()
+  role: string;
 
   @IsNotEmpty()
   @ApiProperty()

apps/user-service/src/users/dto/user-query.dto.ts

@@ -0,0 +1,15 @@
+import { IsOptional } from "class-validator";
+import { ApiProperty } from "@nestjs/swagger";
+import { IndexQueryDto } from "@terramatch-microservices/common/dto/index-query.dto";
+import { TransformBooleanString } from "@terramatch-microservices/common/decorators/transform-boolean-string.decorator";
+
+export class UserQueryDto extends IndexQueryDto {
+  @ApiProperty({ required: false })
+  @IsOptional()
+  search?: string;
+
+  @ApiProperty({ required: false, description: "Filter users by email address verification status" })
+  @IsOptional()
+  @TransformBooleanString()
+  isVerified?: boolean;
+}

apps/user-service/src/users/dto/user-update.dto.ts

@@ -1,12 +1,44 @@
-import { IsEnum } from "class-validator";
+import { IsArray, IsEnum, IsString } from "class-validator";
 import { ApiProperty } from "@nestjs/swagger";
 import { JsonApiBodyDto, JsonApiDataDto } from "@terramatch-microservices/common/util/json-api-update-dto";
 import { VALID_LOCALES, ValidLocale } from "@terramatch-microservices/database/constants/locale";
 
-class UserUpdateAttributes {
+export class UserUpdateAttributes {
+  @ApiProperty({ description: "Organisation UUID", nullable: true, required: false, format: "uuid" })
+  organisationUuid?: string | null;
+
+  @ApiProperty({ description: "First name", nullable: true, required: false })
+  firstName?: string | null;
+
+  @ApiProperty({ description: "Last name", nullable: true, required: false })
+  lastName?: string | null;
+
+  @ApiProperty({ description: "Email address", nullable: true, required: false, format: "email" })
+  emailAddress?: string | null;
+
+  @ApiProperty({ description: "Job role", nullable: true, required: false })
+  jobRole?: string | null;
+
+  @ApiProperty({ description: "Phone number", nullable: true, required: false })
+  phoneNumber?: string | null;
+
+  @ApiProperty({ description: "Country", nullable: true, required: false })
+  country?: string | null;
+
+  @ApiProperty({ description: "Program", nullable: true, required: false })
+  program?: string | null;
+
   @IsEnum(VALID_LOCALES)
   @ApiProperty({ description: "New default locale for the given user", nullable: true, enum: VALID_LOCALES })
   locale?: ValidLocale | null;
+
+  @ApiProperty()
+  primaryRole?: string | null;
+
+  @ApiProperty({ isArray: true, type: String })
+  @IsArray()
+  @IsString({ each: true })
+  directFrameworks?: string[] | null;
 }
 
 export class UserUpdateBody extends JsonApiBodyDto(