Merge pull request #752 from bcgov/SRS-597

feat: SRS-597 - Manage People Search Page

Author: midhun-aot

backend/applications/package-lock.json

@@ -23,7 +23,7 @@
     "typeorm:run-migrations": "npm run typeorm migration:run -- -d ./typeOrm.config.ts",
     "typeorm:generate-migration": "npm run typeorm -- -d ./typeOrm.config.ts migration:generate ./src/migrations/master-script",
     "typeorm:create-migration": "npm run typeorm -- migration:create ./src/migrations/master-script",
-    "typeorm:revert-migration": "npm run typeorm -- -d ./typeOrm.config.ts migration:revert"  
+    "typeorm:revert-migration": "npm run typeorm -- -d ./typeOrm.config.ts migration:revert"
   },
   "dependencies": {
     "@apollo/federation": "^0.37.1",
@@ -35,15 +35,19 @@
     "@nestjs/platform-express": "^9.0.0",
     "@nestjs/typeorm": "^9.0.1",
     "apollo-server-express": "^3.10.2",
+    "axios": "^1.7.9",
     "class-transformer": "^0.5.1",
+    "cls-rtracer": "^2.6.3",
     "graphql": "^16.6.0",
     "keycloak-connect": "^18.0.2",
     "nest-keycloak-connect": "^1.9.0",
     "pg": "^8.8.0",
     "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.2",
     "rxjs": "^7.2.0",
-    "typeorm": "^0.3.10"
+    "typeorm": "^0.3.10",
+    "winston": "^3.17.0",
+    "winston-daily-rotate-file": "^5.0.0"
   },
   "devDependencies": {
     "@nestjs/cli": "^9.0.0",

backend/users/package-lock.json

@@ -7,7 +7,7 @@ import { GraphQLModule } from '@nestjs/graphql';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { AppController } from './app.controller';
 import { AppService } from './app.service';
-import { UsersModule } from './app/users.module';
+import { CatsModule } from './app/cats.module';
 import {
   AuthGuard,
   KeycloakConnectModule,
@@ -33,7 +33,7 @@ import { ConfigModule, ConfigService } from '@nestjs/config';
       }),
       // Secret key of the client taken from keycloak server
     }),
-    UsersModule,
+    CatsModule,
     TypeOrmModule.forRootAsync({
       inject: [ConfigService],
       useFactory: (config: ConfigService) => ({

backend/users/package.json

@@ -0,0 +1,111 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { UserController } from './controllers/user.controller';
+import { KeycloakService } from './services/keycloak.service';
+import { LoggerService } from './logger/logger.service';
+import { Person } from './entities/person.entity';
+import { PersonResolver } from './resolvers/people.resolver';
+import { PersonService } from './services/people.service';
+import { Timesheet } from './entities/timesheet.entity';
+import { AppParticipant } from './entities/appParticipant.entity';
+import { Application } from './entities/application.entity';
+import { TimesheetWeek } from './entities/timesheetWeek.entity';
+import { TimesheetDetail } from './entities/timesheetDetail.entity';
+import { AppExpense } from './entities/appExpense.entity';
+import { AppLandUse } from './entities/appLandUse.entity';
+import { LandUse } from './entities/landUse.entity';
+import { AppNote } from './entities/appNote.entity';
+import { AppPriority } from './entities/appPriority.entity';
+import { Priority } from './entities/priority.entity';
+import { AppSedimentUse } from './entities/appSedimentUse.entity';
+import { SedimentUse } from './entities/sedimentUse.entity';
+import { AppService } from './entities/appService.entity';
+import { Service } from './entities/service.entity';
+import { AppTypeDefaultService } from './entities/appTypeDefaultService.entity';
+import { ServiceFeeSchedule } from './entities/serviceFeeSchedule.entity';
+import { AppType } from './entities/appType.entity';
+import { ServiceServiceCategory } from './entities/serviceServiceCategory.entity';
+import { ServiceCategory } from './entities/serviceCategory.entity';
+import { ServiceCategoryType } from './entities/serviceCategoryType.entity';
+import { AppStatus } from './entities/appStatus.entity';
+import { StatusType } from './entities/statusType.entity';
+import { AppVapourUse } from './entities/appVapourUse.entity';
+import { VapourUse } from './entities/vapourUse.entity';
+import { AppWaterUse } from './entities/appWaterUse.entity';
+import { WaterUse } from './entities/waterUse.entity';
+import { Media } from './entities/media.entity';
+import { Oceans } from './entities/oceans.entity';
+import { Outcome } from './entities/outcome.entity';
+import { ReviewProcess } from './entities/reviewProcess.entity';
+import { Risk } from './entities/risk.entity';
+import { Site } from './entities/site.entity';
+import { Region } from './entities/region.entity';
+import { SiteType } from './entities/siteType.entity';
+import { HousingApplicationXref } from './entities/housingApplicationXref.entity';
+import { HousingSiteXref } from './entities/housingSiteXref.entity';
+import { HousingType } from './entities/housingType.entity';
+import { Housing } from './entities/housing.entity';
+import { YesNoCode } from './entities/yesNoCode.entity';
+import { Invoice } from './entities/invoice.entity';
+import { Payment } from './entities/payment.entity';
+import { PaymentMethod } from './entities/paymentMethod.entity';
+import { Organization } from './entities/organization.entity';
+import { ParticipantRole } from './entities/participantRole.entity';
+/**
+ * Module for wrapping all functionalities in user microserivce
+ */
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([
+      Person,
+      Timesheet,
+      AppParticipant,
+      Application,
+      TimesheetWeek,
+      TimesheetDetail,
+      AppExpense,
+      AppLandUse,
+      LandUse,
+      AppNote,
+      AppPriority,
+      Priority,
+      AppSedimentUse,
+      SedimentUse,
+      Service,
+      AppTypeDefaultService,
+      ServiceFeeSchedule,
+      AppType,
+      AppService,
+      ServiceServiceCategory,
+      ServiceCategory,
+      ServiceCategoryType,
+      AppStatus,
+      StatusType,
+      AppVapourUse,
+      VapourUse,
+      AppWaterUse,
+      WaterUse,
+      Media,
+      Oceans,
+      Outcome,
+      ReviewProcess,
+      Risk,
+      Site,
+      Region,
+      SiteType,
+      HousingApplicationXref,
+      HousingSiteXref,
+      HousingType,
+      Housing,
+      YesNoCode,
+      Invoice,
+      Payment,
+      PaymentMethod,
+      Organization,
+      ParticipantRole,
+    ]),
+  ],
+  providers: [PersonResolver, PersonService, KeycloakService, LoggerService],
+  controllers: [UserController],
+})
+export class CatsModule { }

backend/users/src/app.module.ts

@@ -11,74 +11,74 @@ import {
   Roles,
   Unprotected,
 } from 'nest-keycloak-connect';
-import { KeycloakService } from 'src/app/services/keycloak.service';
-import { AddUserToGroupDto } from 'src/app/dto/addUserToGroup';
+// import { KeycloakService } from 'src/app/services/keycloak.service';
+// import { AddUserToGroupDto } from 'src/app/dto/addUserToGroup';
 
 @Controller('users')
 @Resource('user-service')
 export class UserController {
-  constructor(private readonly keyCloakService: KeycloakService) {}
+  constructor() {}
 
   /**
    * Add user to a group in Keycloak.
    * @param addUserToGroupDto - Object containing userId.
    * @returns Object indicating success status and message.
    */
-  @Post('/addGroup')
-  @Roles({ roles: ['user-admin'], mode: RoleMatchingMode.ANY })
-  async addUserToGroup(
-    @Body() addUserToGroupDto: AddUserToGroupDto,
-  ): Promise<any> {
-    try {
-      const { userId } = addUserToGroupDto;
+  // @Post('/addGroup')
+  // @Roles({ roles: ['user-admin'], mode: RoleMatchingMode.ANY })
+  // async addUserToGroup(
+  //   @Body() addUserToGroupDto: AddUserToGroupDto,
+  // ): Promise<any> {
+  //   try {
+  //     const { userId } = addUserToGroupDto;
 
-      // Get access token from Keycloak
-      const accessToken = await this.keyCloakService.getToken();
-      if (!accessToken) {
-        throw new HttpException(
-          'Failed to get access token',
-          HttpStatus.INTERNAL_SERVER_ERROR,
-        );
-      }
+  //     // Get access token from Keycloak
+  //     const accessToken = await this.keyCloakService.getToken();
+  //     if (!accessToken) {
+  //       throw new HttpException(
+  //         'Failed to get access token',
+  //         HttpStatus.INTERNAL_SERVER_ERROR,
+  //       );
+  //     }
 
-      // Find group ID by name
-      const groupName = 'formsflow-client'; // Assuming 'formflow-client' is the group name
-      const groupId = await this.keyCloakService.getGroupIdByName(
-        groupName,
-        accessToken,
-      );
-      if (!groupId) {
-        throw new HttpException(
-          `Group '${groupName}' not found`,
-          HttpStatus.NOT_FOUND,
-        );
-      }
+  //     // Find group ID by name
+  //     const groupName = 'formsflow-client'; // Assuming 'formflow-client' is the group name
+  //     const groupId = await this.keyCloakService.getGroupIdByName(
+  //       groupName,
+  //       accessToken,
+  //     );
+  //     if (!groupId) {
+  //       throw new HttpException(
+  //         `Group '${groupName}' not found`,
+  //         HttpStatus.NOT_FOUND,
+  //       );
+  //     }
 
-      // Add user to group
-      const result = await this.keyCloakService.addUserToGroup(
-        userId,
-        groupId,
-        accessToken,
-      );
-      if (result.success) {
-        return result;
-      }
-    } catch (error) {
-      console.log('addUserToGroup error', error);
-      // Handle errors
-      if (error.response && error.response.data && error.response.data.error) {
-        // If Keycloak returns an error message, throw a Bad Request exception with the error message
-        throw new HttpException(
-          error.response.data.error,
-          HttpStatus.BAD_REQUEST,
-        );
-      } else {
-        // If any other error occurs, throw an Internal Server Error exception
-        throw new HttpException(
-          'Internal server error',
-          HttpStatus.INTERNAL_SERVER_ERROR,
-        );
-      }
-    }
-  }
+  //     // Add user to group
+  //     const result = await this.keyCloakService.addUserToGroup(
+  //       userId,
+  //       groupId,
+  //       accessToken,
+  //     );
+  //     if (result.success) {
+  //       return result;
+  //     }
+  //   } catch (error) {
+  //     console.log('addUserToGroup error', error);
+  //     // Handle errors
+  //     if (error.response && error.response.data && error.response.data.error) {
+  //       // If Keycloak returns an error message, throw a Bad Request exception with the error message
+  //       throw new HttpException(
+  //         error.response.data.error,
+  //         HttpStatus.BAD_REQUEST,
+  //       );
+  //     } else {
+  //       // If any other error occurs, throw an Internal Server Error exception
+  //       throw new HttpException(
+  //         'Internal server error',
+  //         HttpStatus.INTERNAL_SERVER_ERROR,
+  //       );
+  //     }
+  //   }
+  // }
 }

backend/users/src/app/cats.module.ts

@@ -0,0 +1,76 @@
+import { Field, InputType } from '@nestjs/graphql';
+
+@InputType('CreatePersonInput')
+export class CreatePersonInput {
+  @Field(() => Number)
+  id: number;
+
+  @Field(() => String)
+  firstName: string;
+
+  @Field(() => String)
+  middleName: string | null;
+
+  @Field(() => String)
+  lastName: string;
+
+  @Field(() => Boolean)
+  isTaxExempt: boolean;
+
+  @Field(() => Boolean)
+  isEnvConsultant: boolean;
+
+  @Field(() => String)
+  loginUserName: string | null;
+
+  @Field(() => String)
+  address_1: string | null;
+
+  @Field(() => String)
+  address_2: string | null;
+
+  @Field(() => String)
+  city: string | null;
+
+  @Field(() => String)
+  prov: string | null;
+
+  @Field(() => String)
+  country: string | null;
+
+  @Field(() => String)
+  postal: string | null;
+
+  @Field(() => String)
+  phone: string | null;
+
+  @Field(() => String)
+  mobile: string | null;
+
+  @Field(() => String)
+  fax: string | null;
+
+  @Field(() => String)
+  email: string | null;
+
+  @Field(() => Boolean)
+  isActive: boolean;
+
+  @Field(() => Number)
+  rowVersionCount: number;
+
+  @Field(() => String)
+  createdBy: string;
+
+  @Field(() => Date)
+  createdDatetime: Date;
+
+  @Field(() => String)
+  updatedBy: string;
+
+  @Field(() => Date)
+  updatedDatetime: Date;
+
+  @Field(() => Boolean, { nullable: true })
+  isDeleted?: boolean;
+}

backend/users/src/app/controllers/user.controller.ts

@@ -1,10 +1,27 @@
 import { Field, Int, ObjectType } from '@nestjs/graphql';
+import { format } from 'date-fns';
 
 /**
  * Base class for returing response from graphql services
  */
 @ObjectType()
 export class BaseHttpResponse {
-  @Field(() => Int)
-  httpStatusCode: number;
+  @Field(() => String, { nullable: true })
+  message?: string;
+
+  @Field(() => Int, { nullable: true })
+  httpStatusCode?: number;
+
+  @Field(() => Boolean, { nullable: true })
+  success?: boolean;
+
+  @Field(() => String, { nullable: true })
+  timestamp?: string;
+
+  constructor(message?: string, httpStatusCode?: number, success?: boolean) {
+    this.message = message;
+    this.httpStatusCode = httpStatusCode;
+    this.success = success;
+    this.timestamp = format(new Date(), 'MMMM do, yyyy');
+  }
 }