Merge pull request #244 from companieshouse/NCS-689-amend-trading-status-model

NCS-689 Amend trading status model

Author: kheseyongya

src/services/confirmation-statement/service.ts

@@ -608,13 +608,13 @@ export default class {
 
     private mapToTradingStatusDataResource (tradingStatusData: TradingStatusData): TradingStatusDataResource {
         return {
-            section_status: tradingStatusData.sectionStatus
+            trading_status_answer: tradingStatusData.tradingStatusAnswer
         }
     }
 
     private mapToTradingStatusData (tradingStatusDataResource: TradingStatusDataResource): TradingStatusData {
         return {
-            sectionStatus: tradingStatusDataResource.section_status
+            tradingStatusAnswer: tradingStatusDataResource.trading_status_answer
         }
     }
 

src/services/confirmation-statement/types.ts

@@ -94,12 +94,6 @@ 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",
@@ -311,3 +305,11 @@ export interface NextMadeUpToDate {
     isDue?: boolean,
     newNextMadeUpToDate?: string
 }
+
+export interface TradingStatusDataResource {
+    trading_status_answer: boolean
+}
+
+export interface TradingStatusData {
+    tradingStatusAnswer: boolean
+}

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

@@ -81,7 +81,7 @@ export const mockConfirmationStatementSubmission: ConfirmationStatementSubmissio
             }
         },
         shareholderData: { sectionStatus: SectionStatus.CONFIRMED },
-        tradingStatusData: { sectionStatus: SectionStatus.CONFIRMED }
+        tradingStatusData: { tradingStatusAnswer: true }
     },
     links: {
         self: "self/link"
@@ -234,7 +234,7 @@ export const mockConfirmationStatementSubmissionResource: ConfirmationStatementS
             }
         },
         shareholder_data: { section_status: SectionStatus.CONFIRMED },
-        trading_status_data: { section_status: SectionStatus.CONFIRMED }
+        trading_status_data: { trading_status_answer: true }
     },
     links: {
         self: "self/link"

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

@@ -160,7 +160,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);
+        expect(updatedConfirmationStatement.data.tradingStatusData.tradingStatusAnswer).to.equal(mockSubmission.data.trading_status_data.trading_status_answer);
     });
 
     it("should return error 404 - not found", async () => {