Merge pull request #53 from bcgov/dev

Dev -> Test
bcgov · Dec 16, 2024 · c7120df · c7120df
2 parents 63adb32 + 03d64c1
commit c7120df
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 66 deletions.
diff --git a/src/configuration/configuration.ts b/src/configuration/configuration.ts
@@ -42,8 +42,8 @@ export default () => ({
   },
   sinceFieldName: {
     supportNetwork: updatedDateFieldName,
-    inPersonVisits: updatedDateFieldName,
-    attachments: updatedDateFieldName,
+    inPersonVisits: 'Updated',
+    attachments: 'Last Updated Date',
     contacts: updatedDateFieldName,
   },
   skipAuthGuard: process.env.SKIP_AUTH_GUARD === 'true',

diff --git a/src/entities/attachments.entity.ts b/src/entities/attachments.entity.ts
@@ -1,13 +1,6 @@
 import { ApiProperty, ApiSchema } from '@nestjs/swagger';
 import { Exclude, Expose, Type } from 'class-transformer';
-import {
-  createdByFieldName,
-  createdByIdFieldName,
-  createdDateFieldName,
-  updatedByFieldName,
-  updatedByIdFieldName,
-  updatedDateFieldName,
-} from '../common/constants/upstream-constants';
+import { createdDateFieldName } from '../common/constants/upstream-constants';
 
 /*
  * Examples
@@ -23,7 +16,6 @@ const AttachmentsSingleResponseCaseExample = {
   'Incident Id': '',
   'Incident No': '',
   Internal: 'N',
-  'Last Updated Date': '01/01/1970 00:00:00',
   'No Intervention': 'Numeric-Case-Id-Here',
   'Portal Visible': 'No',
   'Show on Contact': 'N',
@@ -47,12 +39,10 @@ const AttachmentsSingleResponseCaseExample = {
   MemoNumber: '',
   'SR Id': '',
   Id: 'Attachment-Id-Here',
-  [createdByFieldName]: 'Creator-Idir-Here',
-  [createdByIdFieldName]: 'Creator-Id-Here',
+  CreatedByName: 'Creator-Idir-Here',
   [createdDateFieldName]: '01/01/1970 00:00:00',
-  [updatedByFieldName]: 'Updater-Idir-Here',
-  [updatedByIdFieldName]: 'Updater-Id-Here',
-  [updatedDateFieldName]: '01/01/1970 00:00:00',
+  UpdatedByName: 'Updater-Idir-Here',
+  'Last Updated Date': '01/01/1970 00:00:00',
 };
 
 export const AttachmentDetailsCaseExample = {
@@ -217,12 +207,6 @@ class AttachmentsEntity {
   @Expose()
   Internal: string;
 
-  @ApiProperty({
-    example: AttachmentsSingleResponseCaseExample['Last Updated Date'],
-  })
-  @Expose()
-  'Last Updated Date': string;
-
   @ApiProperty({
     example: AttachmentsSingleResponseCaseExample['No Intervention'],
   })
@@ -366,16 +350,10 @@ class AttachmentsEntity {
   Id: string;
 
   @ApiProperty({
-    example: AttachmentsSingleResponseCaseExample[createdByFieldName],
-  })
-  @Expose()
-  [createdByFieldName]: string;
-
-  @ApiProperty({
-    example: AttachmentsSingleResponseCaseExample[createdByIdFieldName],
+    example: AttachmentsSingleResponseCaseExample['CreatedByName'],
   })
   @Expose()
-  [createdByIdFieldName]: string;
+  'CreatedByName': string;
 
   @ApiProperty({
     example: AttachmentsSingleResponseCaseExample[createdDateFieldName],
@@ -384,22 +362,16 @@ class AttachmentsEntity {
   [createdDateFieldName]: string;
 
   @ApiProperty({
-    example: AttachmentsSingleResponseCaseExample[updatedByFieldName],
+    example: AttachmentsSingleResponseCaseExample['UpdatedByName'],
   })
   @Expose()
-  [updatedByFieldName]: string;
+  'UpdatedByName': string;
 
   @ApiProperty({
-    example: AttachmentsSingleResponseCaseExample[updatedByIdFieldName],
-  })
-  @Expose()
-  [updatedByIdFieldName]: string;
-
-  @ApiProperty({
-    example: AttachmentsSingleResponseCaseExample[updatedDateFieldName],
+    example: AttachmentsSingleResponseCaseExample['Last Updated Date'],
   })
   @Expose()
-  [updatedDateFieldName]: string;
+  'Last Updated Date': string;
 
   constructor(partial: Partial<AttachmentsEntity>) {
     Object.assign(this, partial);

diff --git a/src/entities/in-person-visits.entity.ts b/src/entities/in-person-visits.entity.ts
@@ -2,11 +2,7 @@ import { ApiProperty, ApiSchema } from '@nestjs/swagger';
 import { Exclude, Expose, Type } from 'class-transformer';
 import {
   createdByFieldName,
-  createdByIdFieldName,
-  createdDateFieldName,
   updatedByFieldName,
-  updatedByIdFieldName,
-  updatedDateFieldName,
 } from '../common/constants/upstream-constants';
 
 /*
@@ -21,12 +17,10 @@ const InPersonVisitsSingleResponseCaseExample = {
   'Visit Details Value': 'comment',
   'Parent Id': 'Entity-Id-here',
   'Login Name': 'Idir-here',
-  [createdByFieldName]: 'Creator-Idir-Here',
-  [createdByIdFieldName]: 'Creator-Id-Here',
-  [createdDateFieldName]: '01/01/1970 00:00:00',
-  [updatedByFieldName]: 'Updater-Idir-Here',
-  [updatedByIdFieldName]: 'Updater-Id-Here',
-  [updatedDateFieldName]: '01/01/1970 00:00:00',
+  [createdByFieldName]: 'Creator-Id-Here',
+  Created: '01/01/1970 00:00:00',
+  [updatedByFieldName]: 'Updater-Id-Here',
+  Updated: '01/01/1970 00:00:00',
 };
 
 export const InPersonVisitsListResponseCaseExample = {
@@ -108,16 +102,10 @@ class InPersonVisitsEntity {
   [createdByFieldName]: string;
 
   @ApiProperty({
-    example: InPersonVisitsSingleResponseCaseExample[createdByIdFieldName],
+    example: InPersonVisitsSingleResponseCaseExample['Created'],
   })
   @Expose()
-  [createdByIdFieldName]: string;
-
-  @ApiProperty({
-    example: InPersonVisitsSingleResponseCaseExample[createdDateFieldName],
-  })
-  @Expose()
-  [createdDateFieldName]: string;
+  'Created': string;
 
   @ApiProperty({
     example: InPersonVisitsSingleResponseCaseExample[updatedByFieldName],
@@ -126,16 +114,10 @@ class InPersonVisitsEntity {
   [updatedByFieldName]: string;
 
   @ApiProperty({
-    example: InPersonVisitsSingleResponseCaseExample[updatedByIdFieldName],
-  })
-  @Expose()
-  [updatedByIdFieldName]: string;
-
-  @ApiProperty({
-    example: InPersonVisitsSingleResponseCaseExample[updatedDateFieldName],
+    example: InPersonVisitsSingleResponseCaseExample['Updated'],
   })
   @Expose()
-  [updatedDateFieldName]: string;
+  'Updated': string;
 }
 
 @Exclude()