feat: Implementing SR checkbox functionality

backend/src/app/dto/changeAuditEntity.dto.ts

@@ -9,6 +9,9 @@ export class ChangeAuditEntityDTO {
 
   @Field()
   srAction: string;
+
+  @Field(() => Boolean, { nullable: true })
+  srValue: boolean;
 }
 
 @ObjectType()
@@ -18,4 +21,7 @@ export class ChangeAuditObjectTypeDTO {
 
   @Field()
   srAction: string;
+
+  @Field()
+  srValue: string;
 }

backend/src/app/dto/landHistory.dto.ts

@@ -1,9 +1,56 @@
 import { Field, ObjectType } from '@nestjs/graphql';
 import { ResponseDto } from './response/response.dto';
-import { LandHistories } from '../entities/landHistories.entity';
+import { ChangeAuditObjectTypeDTO } from './changeAuditEntity.dto';
+import { LandUseCd } from '../entities/landUseCd.entity';
+import { Sites } from '../entities/sites.entity';
 
 @ObjectType()
 export class LandHistoryResponse extends ResponseDto {
-  @Field(() => [LandHistories], { defaultValue: [] })
-  data: LandHistories[];
+  @Field(() => [LandHistoriesDTO], { defaultValue: [] })
+  data: LandHistoriesDTO[];
+}
+
+@ObjectType()
+class LandHistoriesDTO extends ChangeAuditObjectTypeDTO {
+  @Field()
+  siteId: string;
+
+  @Field()
+  guid: string;
+
+  @Field()
+  lutCode: string;
+
+  @Field({ nullable: true })
+  note: string | null;
+
+  @Field()
+  whoCreated: string;
+
+  @Field({ nullable: true })
+  whoUpdated: string | null;
+
+  @Field()
+  whenCreated: Date;
+
+  @Field({ nullable: true })
+  whenUpdated: Date | null;
+
+  @Field()
+  rwmFlag: number;
+
+  @Field()
+  rwmNoteFlag: number;
+
+  @Field({ nullable: true })
+  siteProfile: string | null;
+
+  @Field({ nullable: true })
+  profileDateReceived: Date | null;
+
+  @Field(() => LandUseCd)
+  landUse: LandUseCd;
+
+  @Field(() => Sites)
+  site: Sites;
 }

backend/src/app/resolvers/associatedSite/associatedSite.resolver.spec.ts

@@ -65,6 +65,7 @@ describe('AssociatedSiteResolver', () => {
           note: 'Note 1',
           srAction: 'pending',
           userAction: 'pending',
+          srValue: 'true'
         },
       ];
 

backend/src/app/resolvers/document/document.respolver.spec.ts

@@ -74,6 +74,7 @@ describe('DocumentResolver', () => {
         filePath: '',
         srAction: 'pending',
         userAction: 'pending',
+        srValue: 'false'
       },
     ];
     const expectedResult: DocumentResponse = {

backend/src/app/resolvers/landHistory/landHistory.resolver.spec.ts

@@ -62,7 +62,7 @@ describe('LandHistoryResolver', () => {
 
   describe('getLandHistoriesForSite', () => {
     it('should return land histories when found', async () => {
-      const mockLandHistories = [new LandHistories()];
+      const mockLandHistories = [{...new LandHistories(), srValue: 'true'}];
 
       const showPending = false;
 

backend/src/app/resolvers/notation/notation.resolver.spec.ts

@@ -75,6 +75,7 @@ describe('NotationResolver', () => {
         requirementReceivedDate: new Date('2024-07-10'),
         srAction: 'pending',
         userAction: 'pending',
+        srValue: 'false',
         notationParticipant: [
           {
             eventParticId: 'GUID001',
@@ -84,6 +85,7 @@ describe('NotationResolver', () => {
             srAction: 'pending',
             userAction: 'pending',
             eventId: '',
+            srValue: 'false',
           },
           {
             eventParticId: 'GUID002',
@@ -93,6 +95,7 @@ describe('NotationResolver', () => {
             srAction: 'pending',
             userAction: 'pending',
             eventId: '',
+            srValue: 'false',
           },
         ],
       },

backend/src/app/resolvers/participant/participant.resolver.spec.ts

@@ -67,6 +67,7 @@ describe('ParticipantResolver', () => {
           siteId: '1',
           srAction: 'pending',
           userAction: 'pending',
+          srValue: 'false',
         },
       ];
       (

backend/src/app/services/associatedSite/associatedSite.service.ts

@@ -57,8 +57,8 @@ export class AssociatedSiteService {
         siteIdAssociatedWith: assocs.siteIdAssociatedWith,
         effectiveDate: assocs.effectiveDate.toISOString(),
         note: assocs.note ? assocs.note.trim() : null, // Ensure note is trimmed
-        srAction:
-          assocs.srAction === SRApprovalStatusEnum.PUBLIC ? true : false,
+        srValue: assocs.srAction === SRApprovalStatusEnum.PUBLIC ? true : false,
+        srAction: assocs.srAction,
       }));
 
       // Convert the transformed objects into DTOs

backend/src/app/services/landHistory/landHistory.service.spec.ts

@@ -102,6 +102,7 @@ describe('LandHistoryService', () => {
           srAction: '',
           userAction: '',
           apiAction: '',
+          srValue: true,
         },
       ];
 
@@ -139,6 +140,7 @@ describe('LandHistoryService', () => {
           srAction: '',
           userAction: '',
           apiAction: '',
+          srValue: true,
         },
       ];
 
@@ -172,6 +174,7 @@ describe('LandHistoryService', () => {
           srAction: '',
           userAction: '',
           apiAction: '',
+          srValue: true,
         },
       ];
 

backend/src/app/services/landHistory/landHistory.service.ts

@@ -9,6 +9,7 @@ import { LoggerService } from '../../logger/logger.service';
 
 import { UserActionEnum } from '../../common/userActionEnum';
 import { HttpException, HttpStatus } from '@nestjs/common';
+import { SRApprovalStatusEnum } from '../../common/srApprovalStatusEnum';
 
 export class LandHistoryService {
   constructor(
@@ -67,6 +68,8 @@ export class LandHistoryService {
       const result = (await query.getMany()).map((landHistory) => ({
         ...landHistory,
         guid: v4(),
+        srValue:
+          landHistory.srAction === SRApprovalStatusEnum.PUBLIC ? true : false,
       }));
       this.sitesLogger.log('LandHistoryService.getLandHistoriesForSite() end');
       this.sitesLogger.debug(

backend/src/app/services/notation/notation.service.ts

@@ -98,8 +98,9 @@ export class NotationService {
               psnorgId: partic.psnorgId,
               displayName: partic.psnorg.displayName,
               userAction: partic.userAction ?? UserActionEnum.DEFAULT,
-              srAction:
+              srValue:
                 partic.srAction === SRApprovalStatusEnum.PUBLIC ? true : false,
+              srAction: partic.srAction,
             })),
           };
         });

backend/src/app/services/parcelDescriptions/parcelDescriptions.service.spec.ts

@@ -552,6 +552,7 @@ describe('ParcelDescriptionsService', () => {
         srAction: 'approved',
         userAction: 'approved',
         apiAction: 'updated',
+        srValue: false
       };
       parcelDescriptionToAdd = {
         id: idForAddedParcelDescription,
@@ -562,6 +563,7 @@ describe('ParcelDescriptionsService', () => {
         srAction: 'pending',
         userAction: 'pending',
         apiAction: 'added',
+        srValue: false
       };
       parcelDescriptionToDelete = {
         id: idForDeletedParcelDescription,
@@ -572,6 +574,7 @@ describe('ParcelDescriptionsService', () => {
         srAction: 'pending',
         userAction: 'pending',
         apiAction: 'deleted',
+        srValue: false
       };
 
       siteId = '100';
@@ -781,6 +784,7 @@ describe('ParcelDescriptionsService', () => {
           srAction: 'pending',
           userAction: 'pending',
           apiAction: 'added',
+          srValue: false
         },
       ];
       userInfo = { givenName: 'test' };
@@ -1012,6 +1016,7 @@ describe('ParcelDescriptionsService', () => {
           srAction: 'approved',
           userAction: 'approved',
           apiAction: 'updated',
+          srValue: true
         },
       ];
       userInfo = { givenName: 'test' };
@@ -1307,6 +1312,7 @@ describe('ParcelDescriptionsService', () => {
           srAction: 'approved',
           userAction: 'approved',
           apiAction: 'deleted',
+          srValue: true
         },
       ];
 

backend/src/app/services/participant/participant.service.ts

@@ -65,11 +65,12 @@ export class ParticipantService {
             displayName: item.psnorg?.displayName?.trim() || '', // Safely access displayName with default value
             prCode: role.prCode.trim(),
             description: role.prCode2?.description?.trim() || '', // Safely access description with default value
-            srAction:
+            srValue:
               item.srAction === SRApprovalStatusEnum.PUBLIC ||
               role.srAction === SRApprovalStatusEnum.PUBLIC
                 ? true
                 : false,
+            srAction: role.srAction,
           })),
         );
 

backend/src/app/services/site/site.service.spec.ts

@@ -503,6 +503,7 @@ describe('SiteService', () => {
               apiAction: 'pending',
               srAction: 'pending',
               notationParticipant: null,
+              srValue: true
             },
           ],
         };

backend/src/app/services/site/site.service.ts

@@ -155,6 +155,8 @@ export class SiteService {
       }),
     );
 
+    query.andWhere('sites.srStatus != :srStatus', { srStatus: 'private' });
+
     if (id) {
       query.andWhere('sites.id = :id', { id: id });
     }
@@ -769,6 +771,7 @@ export class SiteService {
               apiAction,
               particRoleId,
               srAction,
+              srValue,
               ...siteParticsData
             } = participant;
 
@@ -962,8 +965,13 @@ export class SiteService {
           participants: any[],
         ) => {
           const participantPromises = participants.map(async (partic) => {
-            const { eventParticId, displayName, apiAction, ...particData } =
-              partic;
+            const {
+              eventParticId,
+              displayName,
+              apiAction,
+              srValue,
+              ...particData
+            } = partic;
             switch (apiAction) {
               case UserActionEnum.ADDED:
                 return {
@@ -1150,7 +1158,7 @@ export class SiteService {
         const deleteSiteAssociates: { id: string }[] = [];
 
         const siteAssociatePromises = siteAccociated.map(async (asscos) => {
-          const { id, apiAction, ...siteAssocsData } = asscos;
+          const { id, apiAction, srValue, ...siteAssocsData } = asscos;
           const siteAssoc = { ...new SiteAssocs(), ...siteAssocsData };
           switch (apiAction) {
             case UserActionEnum.ADDED:

frontend/codegen.ts

@@ -2,7 +2,7 @@ import { CodegenConfig } from '@graphql-codegen/cli';
 
 const config: CodegenConfig = {
   overwrite: true,
-  schema: 'http://host.docker.internal:4007/graphql',
+  schema: 'http://localhost:4007/graphql',
   documents: ['src/**/*.graphql'],
   generates: {
     './src/graphql/generated.ts': {