fixed test

opencrvs · Oct 25, 2024 · cdcff4e · cdcff4e
1 parent 5d99dce
commit cdcff4e
Show file tree

Hide file tree

Showing 13 changed files with 239 additions and 189 deletions.
diff --git a/packages/client/src/declarations/index.ts b/packages/client/src/declarations/index.ts
@@ -272,6 +272,7 @@ export type ICertificate = {
   corrector?: Partial<{ type: RelationForCertificateCorrection | string }>
   hasShowedVerifiedDocument?: boolean
   payments?: Payment
+  certificateTemplateId?: string
   templateConfig?: ICertificateConfigData
 }
 

diff --git a/packages/client/src/declarations/submissionMiddleware.test.ts b/packages/client/src/declarations/submissionMiddleware.test.ts
@@ -143,26 +143,31 @@ describe('Submission middleware', () => {
         mockDeclarationData.registration.certificates[0] = {
           collector: {
             relationship: 'OTHER',
-            affidavit: {
+            affidavitFile: {
               contentType: 'image/jpg',
               data: 'data:image/png;base64,2324256'
             },
-            individual: {
-              name: [{ firstNames: 'Doe', familyName: 'Jane', use: 'en' }],
-              identifier: [{ id: '123456', type: 'PASSPORT' }]
-            }
+            name: [{ firstNames: 'Doe', familyName: 'Jane', use: 'en' }],
+            identifier: [{ id: '123456', type: 'PASSPORT' }]
           },
           hasShowedVerifiedDocument: true,
-          payments: [
-            {
-              paymentId: '1234',
-              type: 'MANUAL',
-              amount: 50,
-              outcome: 'COMPLETED',
-              date: '2018-10-22'
-            }
-          ],
-          data: 'data:image/png;base64,2324256'
+          certificateTemplateId: 'certified-birth-certificate',
+          templateConfig: {
+            id: 'certified-birth-certificate',
+            event: 'birth',
+            label: {
+              id: 'certificates.birth.certificate.copy',
+              defaultMessage: 'birth Certificate certified copy',
+              description: 'The label for a birth certificate'
+            },
+            fee: {
+              onTime: 0,
+              late: 5.5,
+              delayed: 15
+            },
+            svgUrl:
+              '/api/countryconfig/certificates/birth-certificate-certified-copy.svg'
+          }
         }
         const action = declarationReadyForStatusChange({
           id: 'mockDeclaration',

diff --git a/...orms/register/mappings/event-specific-fields/birth/mutation/registration-mappings.test.ts b/...orms/register/mappings/event-specific-fields/birth/mutation/registration-mappings.test.ts
@@ -32,46 +32,46 @@ describe('Birth registration mutation mapping related tests', () => {
     expect(transformedData.registration.trackingId).toEqual('BDSS0SE')
     expect(transformedData.registration.certificates).toEqual([
       {
+        hasShowedVerifiedDocument: true,
+        certificateTemplateId: 'certified-birth-certificate',
+        payments: [
+          {
+            paymentId: '1234',
+            type: 'MANUAL',
+            amount: 50,
+            outcome: 'COMPLETED',
+            date: '2018-10-22'
+          }
+        ],
         collector: {
-          relationship: 'OTHER',
-          otherRelationship: 'Uncle',
-          name: [
-            {
-              use: 'en',
-              firstNames: 'Mushraful',
-              familyName: 'Hoque'
-            }
-          ],
-          identifier: [
-            {
-              id: '123456789',
-              type: 'PASSPORT'
-            }
-          ],
-          affidavit: [
-            {
-              contentType: 'abc',
-              data: 'BASE64 data'
-            }
-          ]
-        },
-        hasShowedVerifiedDocument: true
+          otherRelationship: 'OTHER',
+          name: [{ use: 'en' }],
+          identifier: [{}],
+          affidavit: [{ data: 'data:image/png;base64,2324256' }]
+        }
       }
     ])
   })
-  it('Test certificate mapping without any data', () => {
+  it('Test certificate mapping template config data', () => {
     const transformedData: TransformedData = {
       registration: {}
     }
+    const mockBirthDeclaration = cloneDeep({
+      ...mockDeclarationData,
+      registration: {
+        ...mockDeclarationData.registration,
+        certificates: [{}]
+      }
+    })
     setBirthRegistrationSectionTransformer(
       transformedData,
-      mockDeclarationData,
+      mockBirthDeclaration,
       'registration'
     )
     expect(transformedData.registration).toBeDefined()
     expect(transformedData.registration.registrationNumber).toEqual(
       '201908122365BDSS0SE1'
     )
-    expect(transformedData.registration.certificates).toEqual([{}])
+    expect(transformedData.registration.certificates).toEqual([])
   })
 })
diff --git a/...src/forms/register/mappings/event-specific-fields/birth/mutation/registration-mappings.ts b/...src/forms/register/mappings/event-specific-fields/birth/mutation/registration-mappings.ts
@@ -48,13 +48,10 @@ export function setBirthRegistrationSectionTransformer(
     })
   }
 
-  if (
-    Array.isArray(draftData[sectionId].certificates) &&
-    draftData[sectionId].certificates.length
-  ) {
-    const updatedCertificates = transformCertificateData(
-      (draftData[sectionId].certificates as ICertificate[]).slice(-1)
-    )
+  const certificates: ICertificate[] = draftData[sectionId]
+    .certificates as ICertificate[]
+  if (Array.isArray(certificates) && certificates.length) {
+    const updatedCertificates = transformCertificateData(certificates.slice(-1))
     transformedData[sectionId].certificates =
       updatedCertificates.length > 0 &&
       Object.keys(updatedCertificates[0]).length > 0 // making sure we are not sending empty object as certificate

diff --git a/...rc/forms/register/mappings/event-specific-fields/death/mutation/deceased-mappings.test.ts b/...rc/forms/register/mappings/event-specific-fields/death/mutation/deceased-mappings.test.ts
@@ -32,10 +32,13 @@ describe('Death registration mutation mapping related tests', () => {
     )
     expect(transformedData.registration.certificates).toEqual([
       {
+        hasShowedVerifiedDocument: true,
         collector: {
-          relationship: 'MOTHER'
+          otherRelationship: 'MOTHER',
+          name: [{ use: 'en' }],
+          identifier: [{}]
         },
-        hasShowedVerifiedDocument: true
+        certificateTemplateId: 'certified-death-certificate'
       }
     ])
   })
@@ -54,24 +57,14 @@ describe('Death registration mutation mapping related tests', () => {
     expect(transformedData.registration.trackingId).toEqual('DDSS0SE')
     expect(transformedData.registration.certificates).toEqual([
       {
+        hasShowedVerifiedDocument: true,
+        certificateTemplateId: 'certified-death-certificate',
         collector: {
           relationship: 'OTHER',
           otherRelationship: 'Uncle',
-          name: [
-            {
-              use: 'en',
-              firstNames: 'Mushraful',
-              familyName: 'Hoque'
-            }
-          ],
-          identifier: [
-            {
-              id: '123456789',
-              type: 'PASSPORT'
-            }
-          ]
-        },
-        hasShowedVerifiedDocument: true
+          name: [{ use: 'en', firstNames: 'Mushraful', familyName: 'Hoque' }],
+          identifier: [{ id: '123456789', type: 'PASSPORT' }]
+        }
       }
     ])
   })

diff --git a/...src/forms/register/mappings/event-specific-fields/death/mutation/registration-mappings.ts b/...src/forms/register/mappings/event-specific-fields/death/mutation/registration-mappings.ts
@@ -51,12 +51,11 @@ export function setDeathRegistrationSectionTransformer(
       })
     }
 
-    if (
-      Array.isArray(draftData[sectionId].certificates) &&
-      draftData[sectionId].certificates.length
-    ) {
+    const certificates: ICertificate[] = draftData[sectionId]
+      .certificates as ICertificate[]
+    if (Array.isArray(certificates) && certificates.length) {
       const updatedCertificates = transformCertificateData(
-        (draftData[sectionId].certificates as ICertificate[]).slice(-1)
+        certificates.slice(-1)
       )
       transformedData[sectionId].certificates =
         updatedCertificates.length > 0 &&

diff --git a/.../forms/register/mappings/event-specific-fields/marriage/mutation/registration-mappings.ts b/.../forms/register/mappings/event-specific-fields/marriage/mutation/registration-mappings.ts
@@ -50,20 +50,11 @@ export function setMarriageRegistrationSectionTransformer(
       })
     }
 
-    if (
-      Array.isArray(draftData[sectionId].certificates) &&
-      draftData[sectionId].certificates.length > 0
-    ) {
-      transformedData[sectionId].certificates =
-        draftData[sectionId].certificates.slice(-1)
-    }
-
-    if (
-      Array.isArray(draftData[sectionId].certificates) &&
-      draftData[sectionId].certificates.length
-    ) {
+    const certificates: ICertificate[] = draftData[sectionId]
+      .certificates as ICertificate[]
+    if (Array.isArray(certificates) && certificates.length) {
       const updatedCertificates = transformCertificateData(
-        (draftData[sectionId].certificates as ICertificate[]).slice(-1)
+        certificates.slice(-1)
       )
       transformedData[sectionId].certificates =
         updatedCertificates.length > 0 &&