Merge pull request #242 from companieshouse/feature/ncs-652-shareholder-class-of-shares

NCS-652 change shareholder currency and share-type from IDs to description.

Author: AlfredBwomezi

src/services/confirmation-statement/service.ts

@@ -551,8 +551,8 @@ export default class {
                 foreName2: shareholderResource.fore_name_2,
                 surname: shareholderResource.surname,
                 shares: shareholderResource.shares,
-                shareClassTypeId: shareholderResource.share_class_type_id,
-                currencyTypeId: shareholderResource.currency_type_id
+                classOfShares: shareholderResource.class_of_shares,
+                currency: shareholderResource.currency
             }
         }
         return shareholderList;
@@ -567,8 +567,8 @@ export default class {
                 fore_name_2: shareholder.foreName2,
                 surname: shareholder.surname,
                 shares: shareholder.shares,
-                share_class_type_id: shareholder.shareClassTypeId,
-                currency_type_id: shareholder.currencyTypeId
+                class_of_shares: shareholder.classOfShares,
+                currency: shareholder.currency
             }
         }
         return shareholderResourceList;

src/services/confirmation-statement/types.ts

@@ -287,17 +287,17 @@ export interface Shareholder {
     foreName2?: string;
     surname: string;
     shares: string;
-    shareClassTypeId: string;
-    currencyTypeId: string;
+    classOfShares: string;
+    currency: string;
 }
 
 export interface ShareholderResource {
     fore_name_1: string;
     fore_name_2?: string;
     surname: string;
     shares: string;
-    share_class_type_id: string;
-    currency_type_id: string;
+    class_of_shares: string;
+    currency: string;
 }
 
 export interface NextMadeUpToDateResource {

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

@@ -178,16 +178,16 @@ export const mockShareholderList: ShareholderResource[] = [
         fore_name_1: "John",
         surname: "Lewis",
         shares: "123",
-        share_class_type_id: "123",
-        currency_type_id: "123"
+        class_of_shares: "ORDINARY",
+        currency: "GBP"
     },
     {
         fore_name_1: "James",
         fore_name_2: "R",
         surname: "Bond",
         shares: "456",
-        share_class_type_id: "456",
-        currency_type_id: "456"
+        class_of_shares: "ORDINARY A",
+        currency: "USD"
     }
 ]