feat: SRS 1051 - CATS Application Search Enhancements (#1220)

* changes for implementing column preferences

* changes for implementing column preferences

* changes for CATS application search enhancements

* changes to search config

* uploading SearchApplications.generated file

* running prettier format on frontend

* fixed css issue in ColumnSelect.css

* Fixed ColumnSelect.css

Author: midhun-aot

backend/applications/src/app/constants/applicationType.ts

@@ -5,6 +5,7 @@ enum ApplicationType {
   SRCR = 'SRCR',
   NIR = 'NIR',
   SoSC = 'SOSC',
+  CSSA = 'CSR',
 }
 
 export default ApplicationType;

backend/applications/src/app/services/cats.service.ts

@@ -7,7 +7,7 @@ import ApplicationType from '../constants/applicationType';
 
 @Injectable()
 export class CatsService {
-  constructor() { }
+  constructor() {}
 
   getSiteIdsFromFormData = (formData: any) => {
     switch (formData.hdnAppType) {
@@ -68,7 +68,8 @@ export class CatsService {
 
       case ApplicationType.SoSC:
         const soscSiteIds: number[] =
-          formData.dataGrid?.map((item: any) => Number(item.siteId))
+          formData.dataGrid
+            ?.map((item: any) => Number(item.siteId))
             .filter((id: number) => !isNaN(id)) || [];
 
         return soscSiteIds;
@@ -87,6 +88,41 @@ export class CatsService {
     }
   };
 
+  getApplicationSpecificData = (formData: any): Record<string, any> | null => {
+    switch (formData.hdnAppType) {
+      case ApplicationType.CSSA:
+        return {
+          serviceType: formData.Servicetype,
+          siteRiskClassification:
+            formData.siteRiskClassificationAtTimeOfApplication,
+        };
+      case ApplicationType.DERA:
+        return {
+          siteIdNumber: formData.siteRiskClassificationAtTimeOfApplication,
+        };
+
+      case ApplicationType.NOM:
+        return {
+          siteRiskClassification:
+            formData.siteRiskClassificationAtTimeOfApplication,
+        };
+
+      case ApplicationType.NIR:
+        return {
+          siteRiskClassification:
+            formData.siteRiskClassificationAtTimeOfApplication,
+        };
+
+      case ApplicationType.SRCR:
+        return {
+          siteRiskClassification: formData.siteRiskClassification,
+        };
+
+      default:
+        return null;
+    }
+  };
+
   /**
    * To create a new application in CATS once a submission is received
    * @param formData
@@ -100,6 +136,9 @@ export class CatsService {
     // Parse and split comma-separated site IDs
     const siteIds = this.getSiteIdsFromFormData(formData);
 
+    // Get application-specific data
+    const applicationSpecificData = this.getApplicationSpecificData(formData);
+
     const createApplicationMutation = {
       query: `
     mutation CreateNewApplication($application: CreateApplication!) {
@@ -119,6 +158,9 @@ export class CatsService {
           siteIds: siteIds, // array of site id's
           appTypeAbbrev: formData.hdnAppType, // String!
           receivedDate: new Date(),
+          applicationSpecificData: applicationSpecificData
+            ? JSON.stringify(applicationSpecificData)
+            : null, // JSON string
           applicationStatus: [
             {
               statusTypeAbbrev: 'New',

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

@@ -91,6 +91,7 @@ import { DashboardService } from './services/dashboard/dashboard.service';
 import { DashboardResolver } from './resolvers/dashboard/dashboard.resolver';
 import { RecentViewedApplication } from './entities/recentViewedApplication.entity';
 import { StatusTypeService } from './services/statusType/statusType.service';
+import { StatusTypeResolver } from './resolvers/statusType/statusType.resolver';
 import { ServiceAssignmentFactor } from './entities/serviceAssignmentFactor';
 import { PermissionServiceType } from './entities/permissionServiceType';
 import { ApplicationSite } from './entities/applicationSite.entity';
@@ -99,6 +100,9 @@ import { EmailController } from './controllers/email.controller';
 import { ComsService } from './services/coms/coms.service';
 import { ComsResolver } from './resolvers/coms/coms.resolver';
 import { UploadController } from './controllers/upload.controller';
+import { ColumnPreferencesResolver } from './resolvers/application/columnPreferences.resolver';
+import { ColumnPreferencesService } from './services/application/columnPreferences.service';
+import { UserColumnPreferences } from './entities/userColumnPreferences.entity';
 
 /**
  * Module for wrapping all functionalities in user microserivce
@@ -164,6 +168,7 @@ import { UploadController } from './controllers/upload.controller';
       ServiceAssignmentFactor,
       PermissionServiceType,
       ApplicationSite,
+      UserColumnPreferences,
     ]),
     HttpModule,
   ],
@@ -186,6 +191,7 @@ import { UploadController } from './controllers/upload.controller';
     ApplicationDetailsResolver,
     AppTypeService,
     StatusTypeService,
+    StatusTypeResolver,
     SiteResolver,
     SiteService,
     InvoiceResolver,
@@ -204,8 +210,10 @@ import { UploadController } from './controllers/upload.controller';
     DashboardService,
     DashboardResolver,
     ComsService,
-    ComsResolver
+    ComsResolver,
+    ColumnPreferencesResolver,
+    ColumnPreferencesService,
   ],
   controllers: [UserController, EmailController, UploadController],
 })
-export class CatsModule { }
+export class CatsModule {}

backend/cats/src/app/dto/application/columnConfig.dto.spec.ts

@@ -0,0 +1,32 @@
+import { validate } from 'class-validator';
+import { ColumnConfigDto } from './columnConfig.dto';
+
+describe('ColumnConfigDto', () => {
+  it('should pass validation with valid data', async () => {
+    const dto = new ColumnConfigDto();
+    dto.id = 1;
+    dto.displayName = 'Application ID';
+    dto.active = true;
+    dto.sortOrder = 1;
+
+    const errors = await validate(dto);
+    expect(errors).toHaveLength(0);
+  });
+
+  it('should fail validation when required fields are missing', async () => {
+    const dto = new ColumnConfigDto();
+
+    const errors = await validate(dto);
+    expect(errors.length).toBeGreaterThan(0);
+  });
+
+  it('should pass validation without optional sortOrder', async () => {
+    const dto = new ColumnConfigDto();
+    dto.id = 1;
+    dto.displayName = 'Application ID';
+    dto.active = true;
+
+    const errors = await validate(dto);
+    expect(errors).toHaveLength(0);
+  });
+});

backend/cats/src/app/dto/application/columnConfig.dto.ts

@@ -0,0 +1,28 @@
+import { InputType, ObjectType, Field, Int } from '@nestjs/graphql';
+import { IsNumber, IsString, IsBoolean, IsOptional } from 'class-validator';
+
+@InputType('ColumnConfigInput')
+@ObjectType('ColumnConfig')
+export class ColumnConfigDto {
+  @Field(() => Int)
+  @IsNumber()
+  id: number;
+
+  @Field()
+  @IsString()
+  displayName: string;
+
+  @Field()
+  @IsBoolean()
+  active: boolean;
+
+  @Field(() => Int, { nullable: true })
+  @IsOptional()
+  @IsNumber()
+  sortOrder?: number;
+
+  @Field(() => Int, { nullable: true })
+  @IsOptional()
+  @IsNumber()
+  selectionOrder?: number;
+}

backend/cats/src/app/dto/application/createApplication.dto.ts

@@ -1,19 +1,23 @@
 import { Field, InputType } from '@nestjs/graphql';
 import { ApplicationStatusDto } from './applicationStatus.dto';
+import { IsOptional } from 'class-validator';
 
 // DTO for creating a person
 @InputType()
 export class CreateApplication {
-    @Field(() => [Number])
-    siteIds: number[]; // multiple sites for which the application is created
+  @Field(() => [Number])
+  siteIds: number[]; // multiple sites for which the application is created
 
-    @Field()
-    appTypeAbbrev: string; // the application type eg: SDS, SoSC etc
+  @Field()
+  appTypeAbbrev: string; // the application type eg: SDS, SoSC etc
 
-    @Field()
-    receivedDate: Date; // date when application was submitted in SRS
+  @Field()
+  receivedDate: Date; // date when application was submitted in SRS
 
-    @Field(() => [ApplicationStatusDto])
-    applicationStatus: ApplicationStatusDto[];
+  @Field(() => [ApplicationStatusDto])
+  applicationStatus: ApplicationStatusDto[];
 
+  @Field(() => String, { nullable: true })
+  @IsOptional()
+  applicationSpecificData?: string; // JSON string for application-specific fields
 }

backend/cats/src/app/dto/application/saveColumnPreferences.dto.spec.ts

@@ -0,0 +1,36 @@
+import { validate } from 'class-validator';
+import { SaveColumnPreferencesDto } from './saveColumnPreferences.dto';
+import { ColumnConfigDto } from './columnConfig.dto';
+
+describe('SaveColumnPreferencesDto', () => {
+  it('should pass validation with valid data', async () => {
+    const columnConfig = new ColumnConfigDto();
+    columnConfig.id = 1;
+    columnConfig.displayName = 'Application ID';
+    columnConfig.active = true;
+    columnConfig.sortOrder = 1;
+
+    const dto = new SaveColumnPreferencesDto();
+    dto.page = 'applications';
+    dto.columns = [columnConfig];
+
+    const errors = await validate(dto);
+    expect(errors).toHaveLength(0);
+  });
+
+  it('should fail validation when required fields are missing', async () => {
+    const dto = new SaveColumnPreferencesDto();
+
+    const errors = await validate(dto);
+    expect(errors.length).toBeGreaterThan(0);
+  });
+
+  it('should pass validation with empty columns array', async () => {
+    const dto = new SaveColumnPreferencesDto();
+    dto.page = 'applications';
+    dto.columns = [];
+
+    const errors = await validate(dto);
+    expect(errors).toHaveLength(0);
+  });
+});

backend/cats/src/app/dto/application/saveColumnPreferences.dto.ts

@@ -0,0 +1,17 @@
+import { InputType, Field } from '@nestjs/graphql';
+import { IsString, IsArray, ValidateNested } from 'class-validator';
+import { Type } from 'class-transformer';
+import { ColumnConfigDto } from './columnConfig.dto';
+
+@InputType()
+export class SaveColumnPreferencesDto {
+  @Field()
+  @IsString()
+  page: string;
+
+  @Field(() => [ColumnConfigDto])
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => ColumnConfigDto)
+  columns: ColumnConfigDto[];
+}

backend/cats/src/app/dto/application/viewColumnPreferences.dto.ts

@@ -0,0 +1,20 @@
+import { ObjectType, Field } from '@nestjs/graphql';
+import { ColumnConfigDto } from './columnConfig.dto';
+
+@ObjectType()
+export class ViewColumnPreferences {
+  @Field()
+  userId: string;
+
+  @Field()
+  page: string;
+
+  @Field(() => [ColumnConfigDto])
+  columns: ColumnConfigDto[];
+
+  @Field()
+  createdAt: Date;
+
+  @Field()
+  updatedAt: Date;
+}

backend/cats/src/app/dto/applicationResultDto.ts

@@ -42,4 +42,16 @@ export class ApplicationResultDto {
 
   @Field()
   url: string;
+
+  @Field()
+  siteRiskClassification: string;
+
+  @Field()
+  csapReference: string;
+
+  @Field()
+  serviceType: string;
+
+  @Field()
+  commonName: string;
 }