Merge pull request #1019 from ajay-beehyv/DIV-8374

Added additional vaccine details and certificate raw to controller DIV-8374
egovernments · Mar 25, 2022 · 178ad4e · 178ad4e
2 parents f24430c + c1fcfe5
commit 178ad4e
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/backend/certificate_api/src/services/certificate_service.js b/backend/certificate_api/src/services/certificate_service.js
@@ -53,7 +53,12 @@ const prepareDataForVaccineCertificateTemplate = (certificateRaw, dataURL, doseT
     beneficiaryId: credentialSubject.refId,
     recipientAddress: formatRecipientAddress(credentialSubject.address),
     vaccine: evidence[0].vaccine,
-    vaccinationDate: formatDate(evidence[0].date) + ` (Batch no. ${evidence[0].batch} )`,
+    vaccinationDate: formatDate(evidence[0].date),
+    vaccineBatch: evidence[0].batch,
+    vaccineICD11Code: evidence[0].icd11Code || "",
+    vaccineProphylaxis: evidence[0].prophylaxis || "",
+    vaccineType: getVaxType(evidence[0].icd11Code, evidence[0].prophylaxis),
+    vaccineManufacturer: evidence[0].manufacturer,
     vaccineValidDays: `after ${getVaccineValidDays(evidence[0].effectiveStart, evidence[0].effectiveUntil)} days`,
     vaccinatedBy: evidence[0].verifier.name,
     vaccinatedAt: formatFacilityAddress(evidence[0]),
@@ -64,8 +69,9 @@ const prepareDataForVaccineCertificateTemplate = (certificateRaw, dataURL, doseT
     isBoosterDose: evidence[0].dose > evidence[0].totalDoses,
     isBoosterOrFinalDose: evidence[0].dose >= evidence[0].totalDoses,
     currentDoseText: `(${getNumberWithOrdinal(evidence[0].dose)} Dose)`,
+    certificateId: certificateRaw.certificateId,
     meta: certificateRaw.meta,
-    certificateId: certificateRaw.certificateId
+    raw: certificateRaw
   };
   certificateData["vaxEvents"] = getVaccineDetails(doseToVaccinationDetailsMap);
   return certificateData;
@@ -80,6 +86,7 @@ function getVaccineDetails(doseToVaccinationDetailsMap) {
         ("Booster Dose " + (value.dose - value.totalDoses)),
       vaxName: value.name || "",
       vaxBatch: value.batch || "",
+      vaxManufacturer : value.manufacturer || "",
       dateOfVax: formatDate(value.date || ""),
       countryOfVax: value.vaccinatedCountry || "",
       validity: value.validity || "",
@@ -98,6 +105,7 @@ function fetchVaccinationDetailsFromCert(evidence) {
     name: evidence.vaccine,
     vaxType: getVaxType(evidence.icd11Code, evidence.prophylaxis),
     batch: evidence.batch,
+    manufacturer: evidence.manufacturer,
     vaccinatedCountry: evidence.facility.address.addressCountry,
   };
   return vaccineDetails;