[UTOPIA-769] [Backend] updated generic section names to specific

bcgov · Feb 15, 2023 · a4a28bc · a4a28bc
1 parent 73cfcf1
commit a4a28bc
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 49 deletions.
diff --git a/...pia-intake/jsonb-classes/security-personal-information/digital-tools-and-systems/index.ts b/...pia-intake/jsonb-classes/security-personal-information/digital-tools-and-systems/index.ts
@@ -4,19 +4,19 @@ import {
   ValidateNested,
 } from '@nestjs/class-validator';
 import { Type } from 'class-transformer';
-import { DigitalToolsAndSystemsSection1 } from './section-1';
-import { DigitalToolsAndSystemsSection2 } from './section-2';
+import { DigitalToolsAndSystemsToolsAndAssessment } from './section-tools-and-assessment';
+import { DigitalToolsAndSystemsStorage } from './section-storage';
 
 export class DigitalToolsAndSystems {
   @IsObject()
   @IsNotEmptyObject()
   @ValidateNested()
-  @Type(() => DigitalToolsAndSystemsSection1)
-  section1: DigitalToolsAndSystemsSection1;
+  @Type(() => DigitalToolsAndSystemsToolsAndAssessment)
+  toolsAndAssessment: DigitalToolsAndSystemsToolsAndAssessment;
 
   @IsObject()
   @IsNotEmptyObject()
   @ValidateNested()
-  @Type(() => DigitalToolsAndSystemsSection2)
-  section2: DigitalToolsAndSystemsSection2;
+  @Type(() => DigitalToolsAndSystemsStorage)
+  storage: DigitalToolsAndSystemsStorage;
 }
diff --git a/...on/digital-tools-and-systems/section-2.ts → ...ital-tools-and-systems/section-storage.ts b/...on/digital-tools-and-systems/section-2.ts → ...ital-tools-and-systems/section-storage.ts
@@ -1,7 +1,7 @@
 import { IsEnum, IsOptional, IsString } from '@nestjs/class-validator';
 import { YesNoInput } from 'src/common/enums/yes-no-input.enum';
 
-export class DigitalToolsAndSystemsSection2 {
+export class DigitalToolsAndSystemsStorage {
   @IsEnum(YesNoInput)
   @IsOptional()
   onGovServers?: YesNoInput;

diff --git a/...on/digital-tools-and-systems/section-1.ts → ...d-systems/section-tools-and-assessment.ts b/...on/digital-tools-and-systems/section-1.ts → ...d-systems/section-tools-and-assessment.ts
@@ -1,7 +1,7 @@
 import { IsEnum, IsOptional } from '@nestjs/class-validator';
 import { YesNoInput } from 'src/common/enums/yes-no-input.enum';
 
-export class DigitalToolsAndSystemsSection1 {
+export class DigitalToolsAndSystemsToolsAndAssessment {
   @IsEnum(YesNoInput)
   @IsOptional()
   involveDigitalToolsAndSystems?: YesNoInput;

diff --git a/.../pia-intake/jsonb-classes/storing-personal-information/disclosures-outside-canda/index.ts b/.../pia-intake/jsonb-classes/storing-personal-information/disclosures-outside-canda/index.ts
@@ -4,40 +4,40 @@ import {
   ValidateNested,
 } from '@nestjs/class-validator';
 import { Type } from 'class-transformer';
-import { DisclosureSection1 } from './section-1';
-import { DisclosureSection2 } from './section-2';
-import { DisclosureSection3 } from './section-3';
-import { DisclosureSection4 } from './section-4';
-import { DisclosureSection5 } from './section-5';
+import { DisclosureStorage } from './section-storage';
+import { DisclosureContract } from './section-contract';
+import { DisclosureControls } from './section-controls';
+import { DisclosureTrackAccess } from './section-track-access';
+import { DisclosureRisks } from './section-risks';
 
 export class DisclosuresOutsideCanada {
   @IsObject()
   @IsNotEmptyObject()
   @ValidateNested()
-  @Type(() => DisclosureSection1)
-  section1: DisclosureSection1;
+  @Type(() => DisclosureStorage)
+  storage: DisclosureStorage;
 
   @IsObject()
   @IsNotEmptyObject()
   @ValidateNested()
-  @Type(() => DisclosureSection2)
-  section2: DisclosureSection2;
+  @Type(() => DisclosureContract)
+  contract: DisclosureContract;
 
   @IsObject()
   @IsNotEmptyObject()
   @ValidateNested()
-  @Type(() => DisclosureSection3)
-  section3: DisclosureSection3;
+  @Type(() => DisclosureControls)
+  controls: DisclosureControls;
 
   @IsObject()
   @IsNotEmptyObject()
   @ValidateNested()
-  @Type(() => DisclosureSection4)
-  section4: DisclosureSection4;
+  @Type(() => DisclosureTrackAccess)
+  trackAccess: DisclosureTrackAccess;
 
   @IsObject()
   @IsNotEmptyObject()
   @ValidateNested()
-  @Type(() => DisclosureSection5)
-  section5: DisclosureSection5;
+  @Type(() => DisclosureRisks)
+  risks: DisclosureRisks;
 }
diff --git a/...on/disclosures-outside-canda/section-2.ts → ...losures-outside-canda/section-contract.ts b/...on/disclosures-outside-canda/section-2.ts → ...losures-outside-canda/section-contract.ts
@@ -1,7 +1,7 @@
 import { IsEnum, IsOptional, IsString } from '@nestjs/class-validator';
 import { YesNoInput } from 'src/common/enums/yes-no-input.enum';
 
-export class DisclosureSection2 {
+export class DisclosureContract {
   @IsEnum(YesNoInput)
   @IsOptional()
   relyOnExistingContract?: YesNoInput;

diff --git a/...on/disclosures-outside-canda/section-3.ts → ...losures-outside-canda/section-controls.ts b/...on/disclosures-outside-canda/section-3.ts → ...losures-outside-canda/section-controls.ts
@@ -1,6 +1,6 @@
 import { IsOptional, IsString } from '@nestjs/class-validator';
 
-export class DisclosureSection3 {
+export class DisclosureControls {
   @IsString()
   @IsOptional()
   unauthorizedAccessMeasures?: string;

diff --git a/...on/disclosures-outside-canda/section-5.ts → ...isclosures-outside-canda/section-risks.ts b/...on/disclosures-outside-canda/section-5.ts → ...isclosures-outside-canda/section-risks.ts
@@ -21,7 +21,7 @@ class PrivacyRisk {
   outstandingRisk: string;
 }
 
-export class DisclosureSection5 {
+export class DisclosureRisks {
   @IsArray()
   @ValidateNested({ each: true })
   @Type(() => PrivacyRisk)

diff --git a/...on/disclosures-outside-canda/section-1.ts → ...closures-outside-canda/section-storage.ts b/...on/disclosures-outside-canda/section-1.ts → ...closures-outside-canda/section-storage.ts
@@ -19,7 +19,7 @@ class ServiceProviderDetails {
   details: string;
 }
 
-export class DisclosureSection1 {
+export class DisclosureStorage {
   @IsEnum(YesNoInput)
   @IsOptional()
   sensitiveInfoStoredByServiceProvider?: YesNoInput;

diff --git a/...on/disclosures-outside-canda/section-4.ts → ...res-outside-canda/section-track-access.ts b/...on/disclosures-outside-canda/section-4.ts → ...res-outside-canda/section-track-access.ts
@@ -1,6 +1,6 @@
 import { IsOptional, IsString } from '@nestjs/class-validator';
 
-export class DisclosureSection4 {
+export class DisclosureTrackAccess {
   @IsString()
   @IsOptional()
   trackAccessDetails?: string;

diff --git a/src/backend/src/modules/pia-intake/mocks/create-pia-intake.mock.ts b/src/backend/src/modules/pia-intake/mocks/create-pia-intake.mock.ts
@@ -61,7 +61,7 @@ export const piaIntakeEntityMock: CreatePiaIntakeDto = {
       disclosedOutsideCanada: YesNoInput.NO,
     },
     disclosuresOutsideCanada: {
-      section1: {
+      storage: {
         sensitiveInfoStoredByServiceProvider: YesNoInput.YES,
         serviceProviderList: [
           {
@@ -73,17 +73,17 @@ export const piaIntakeEntityMock: CreatePiaIntakeDto = {
         disclosureDetails: 'S3 storage in us-east-1: US East (N. Virginia)',
         contractualTerms: 'None',
       },
-      section2: {
+      contract: {
         relyOnExistingContract: YesNoInput.YES,
         enterpriseServiceAccessDetails: 'S3',
       },
-      section3: {
+      controls: {
         unauthorizedAccessMeasures: 'IAM rules are in effect',
       },
-      section4: {
+      trackAccess: {
         trackAccessDetails: 'IAM',
       },
-      section5: {
+      risks: {
         privacyRisks: [
           {
             risk: 'Leak of Creds',
@@ -99,11 +99,11 @@ export const piaIntakeEntityMock: CreatePiaIntakeDto = {
   },
   securityPersonalInformation: {
     digitalToolsAndSystems: {
-      section1: {
+      toolsAndAssessment: {
         involveDigitalToolsAndSystems: YesNoInput.NO,
         haveSecurityAssessment: YesNoInput.NO,
       },
-      section2: {
+      storage: {
         onGovServers: YesNoInput.NO,
         whereDetails: 'on AWS Cloud',
       },

diff --git a/src/backend/test/util/mocks/data/pia-empty-jsonb-values.mock.ts b/src/backend/test/util/mocks/data/pia-empty-jsonb-values.mock.ts
@@ -16,34 +16,34 @@ export const emptyJsonbValues = {
       disclosedOutsideCanada: null,
     },
     disclosuresOutsideCanada: {
-      section1: {
+      storage: {
         sensitiveInfoStoredByServiceProvider: null,
         serviceProviderList: [],
         disclosureDetails: null,
         contractualTerms: null,
       },
-      section2: {
+      contract: {
         relyOnExistingContract: null,
         enterpriseServiceAccessDetails: null,
       },
-      section3: {
+      controls: {
         unauthorizedAccessMeasures: null,
       },
-      section4: {
+      trackAccess: {
         trackAccessDetails: null,
       },
-      section5: {
+      risks: {
         privacyRisks: [],
       },
     },
   },
   securityPersonalInformation: {
     digitalToolsAndSystems: {
-      section1: {
+      toolsAndAssessment: {
         involveDigitalToolsAndSystems: null,
         haveSecurityAssessment: null,
       },
-      section2: {
+      storage: {
         onGovServers: null,
         whereDetails: null,
       },

diff --git a/src/backend/test/util/mocks/data/pia-intake.mock.ts b/src/backend/test/util/mocks/data/pia-intake.mock.ts
@@ -65,7 +65,7 @@ const piaIntakeDataMock = {
       disclosedOutsideCanada: YesNoInput.NO,
     },
     disclosuresOutsideCanada: {
-      section1: {
+      storage: {
         sensitiveInfoStoredByServiceProvider: YesNoInput.YES,
         serviceProviderList: [
           {
@@ -77,17 +77,17 @@ const piaIntakeDataMock = {
         disclosureDetails: 'S3 storage in us-east-1: US East (N. Virginia)',
         contractualTerms: 'None',
       },
-      section2: {
+      contract: {
         relyOnExistingContract: YesNoInput.YES,
         enterpriseServiceAccessDetails: 'S3',
       },
-      section3: {
+      controls: {
         unauthorizedAccessMeasures: 'IAM rules are in effect',
       },
-      section4: {
+      trackAccess: {
         trackAccessDetails: 'IAM',
       },
-      section5: {
+      risks: {
         privacyRisks: [
           {
             risk: 'Leak of Creds',
@@ -103,11 +103,11 @@ const piaIntakeDataMock = {
   },
   securityPersonalInformation: {
     digitalToolsAndSystems: {
-      section1: {
+      toolsAndAssessment: {
         involveDigitalToolsAndSystems: YesNoInput.NO,
         haveSecurityAssessment: YesNoInput.NO,
       },
-      section2: {
+      storage: {
         onGovServers: YesNoInput.NO,
         whereDetails: 'on AWS Cloud',
       },