Merge pull request #238 from companieshouse/ncs-674-add-trading-status-answer

NCS-674 Added save trading status

Author: mattch1

src/services/confirmation-statement/service.ts

@@ -38,7 +38,9 @@ import {
     RegisterLocationsData,
     RegisterLocationsDataResource,
     NextMadeUpToDate,
-    NextMadeUpToDateResource
+    NextMadeUpToDateResource,
+    TradingStatusData,
+    TradingStatusDataResource
 } from "./types";
 import { HttpResponse, IHttpClient } from "../../http";
 import Resource, { ApiErrorResponse } from "../resource";
@@ -283,7 +285,8 @@ export default class {
             ...(dataResource.registered_office_address_data && { registeredOfficeAddressData: this.mapToRegisteredOfficeAddressData(dataResource.registered_office_address_data) }),
             ...(dataResource.active_director_details_data && { activeDirectorDetailsData: this.mapToActiveDirectorDetailsData(dataResource.active_director_details_data) }),
             ...(dataResource.shareholder_data && { shareholderData: this.mapToShareholderData(dataResource.shareholder_data) }),
-            ...(dataResource.register_locations_data && { registerLocationsData: this.mapToRegisterLocationsData(dataResource.register_locations_data) })
+            ...(dataResource.register_locations_data && { registerLocationsData: this.mapToRegisterLocationsData(dataResource.register_locations_data) }),
+            ...(dataResource.trading_status_data && { tradingStatusData: this.mapToTradingStatusData(dataResource.trading_status_data) })
         }
     }
 
@@ -295,7 +298,8 @@ export default class {
             ...(data.registeredOfficeAddressData && { registered_office_address_data: this.mapToRegisteredOfficeAddressDataResource(data.registeredOfficeAddressData) }),
             ...(data.activeDirectorDetailsData && { active_director_details_data: this.mapToActiveDirectorDetailsDataResource(data.activeDirectorDetailsData) }),
             ...(data.shareholderData && { shareholder_data: this.mapToShareholderDataResource(data.shareholderData) }),
-            ...(data.registerLocationsData && { register_locations_data: this.mapToRegisterLocationsDataResource(data.registerLocationsData) })
+            ...(data.registerLocationsData && { register_locations_data: this.mapToRegisterLocationsDataResource(data.registerLocationsData) }),
+            ...(data.tradingStatusData && { trading_status_data: this.mapToTradingStatusDataResource(data.tradingStatusData) })
         }
     }
 
@@ -600,6 +604,18 @@ export default class {
         } as NextMadeUpToDate;
     }
 
+    private mapToTradingStatusDataResource (tradingStatusData: TradingStatusData): TradingStatusDataResource {
+        return {
+            section_status: tradingStatusData.sectionStatus
+        }
+    }
+
+    private mapToTradingStatusData (tradingStatusDataResource: TradingStatusDataResource): TradingStatusData {
+        return {
+            sectionStatus: tradingStatusDataResource.section_status
+        }
+    }
+
     private getConfirmationStatementUrlIncTransactionId (transactionId: string) {
         return `/transactions/${transactionId}/confirmation-statement`;
     }

src/services/confirmation-statement/types.ts

@@ -21,7 +21,8 @@ export interface ConfirmationStatementSubmissionDataResource {
     registered_office_address_data?: RegisteredOfficeAddressDataResource,
     active_director_details_data?: ActiveDirectorDetailsDataResource,
     shareholder_data?: ShareholderDataResource,
-    register_locations_data?: RegisterLocationsDataResource
+    register_locations_data?: RegisterLocationsDataResource,
+    trading_status_data?: TradingStatusDataResource
 }
 
 export interface ConfirmationStatementSubmissionData {
@@ -31,7 +32,8 @@ export interface ConfirmationStatementSubmissionData {
     registeredOfficeAddressData?: RegisteredOfficeAddressData,
     activeDirectorDetailsData?: ActiveDirectorDetailsData,
     shareholderData?: ShareholderData,
-    registerLocationsData?: RegisterLocationsData
+    registerLocationsData?: RegisterLocationsData,
+    tradingStatusData?: TradingStatusData
 }
 
 export interface ConfirmationStatementSubmissionSectionResource {
@@ -90,6 +92,12 @@ export interface RegisterLocationsDataResource extends ConfirmationStatementSubm
 export interface RegisterLocationsData extends ConfirmationStatementSubmissionSection {
 }
 
+export interface TradingStatusDataResource extends ConfirmationStatementSubmissionSectionResource {
+}
+
+export interface TradingStatusData extends ConfirmationStatementSubmissionSection {
+}
+
 export enum SectionStatus {
     CONFIRMED = "CONFIRMED",
     NOT_CONFIRMED = "NOT_CONFIRMED",

test/services/confirmation-statement/confirmation.statement.mock.ts

@@ -79,7 +79,8 @@ export const mockConfirmationStatementSubmission: ConfirmationStatementSubmissio
                 description: "TEST SIC CODE DETAILS"
             }
         },
-        shareholderData: { sectionStatus: SectionStatus.CONFIRMED }
+        shareholderData: { sectionStatus: SectionStatus.CONFIRMED },
+        tradingStatusData: { sectionStatus: SectionStatus.CONFIRMED }
     },
     links: {
         self: "self/link"
@@ -230,7 +231,8 @@ export const mockConfirmationStatementSubmissionResource: ConfirmationStatementS
                 description: "TEST SIC CODE DETAILS"
             }
         },
-        shareholder_data: { section_status: SectionStatus.CONFIRMED }
+        shareholder_data: { section_status: SectionStatus.CONFIRMED },
+        trading_status_data: { section_status: SectionStatus.CONFIRMED }
     },
     links: {
         self: "self/link"

test/services/confirmation-statement/confirmation.statement.spec.ts

@@ -159,6 +159,7 @@ describe("Update confirmation statement POST", () => {
         expect(updatedConfirmationStatement.data.activeDirectorDetailsData.sectionStatus).to.equal(mockSubmission.data.active_director_details_data.section_status);
         expect(updatedConfirmationStatement.data.shareholderData.sectionStatus).to.equal(mockSubmission.data.shareholder_data.section_status);
         expect(updatedConfirmationStatement.data.registerLocationsData.sectionStatus).to.equal(mockSubmission.data.register_locations_data.section_status);
+        expect(updatedConfirmationStatement.data.tradingStatusData.sectionStatus).to.equal(mockSubmission.data.trading_status_data.section_status);
     });
 
     it("should return error 404 - not found", async () => {