From 67d0061aa129ac4e9299dbdf2129fffebdaa69a2 Mon Sep 17 00:00:00 2001
From: AndreiD049 <andrei.dimitrascu.94@gmail.com>
Date: Thu, 25 Nov 2021 08:37:34 +0200
Subject: [PATCH] fix: getting of fallback issued date for fullstack
 certificate (#43977)

---
 api-server/src/server/boot/certificate.js           | 13 ++++++++++---
 .../src/server/boot_tests/certificate.test.js       |  6 +++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/api-server/src/server/boot/certificate.js b/api-server/src/server/boot/certificate.js
index f412a26912..1d5637ad43 100644
--- a/api-server/src/server/boot/certificate.js
+++ b/api-server/src/server/boot/certificate.js
@@ -58,8 +58,15 @@ export default function bootCertificate(app) {
   app.use(api);
 }
 
-export function getFallbackFrontEndDate(completedChallenges, completedDate) {
-  var chalIds = [...Object.values(certTypeIdMap), oldDataVizId];
+export function getFallbackFullStackDate(completedChallenges, completedDate) {
+  var chalIds = [
+    certTypeIdMap[certTypes.respWebDesign],
+    certTypeIdMap[certTypes.jsAlgoDataStruct],
+    certTypeIdMap[certTypes.frontEndDevLibsId],
+    certTypeIdMap[certTypes.dataVis2018],
+    certTypeIdMap[certTypes.apisMicroservicesId],
+    certTypeIdMap[certTypes.legacyInfosecQaId]
+  ];
 
   const latestCertDate = completedChallenges
     .filter(chal => chalIds.includes(chal.id))
@@ -463,7 +470,7 @@ function createShowCert(app) {
 
         // if fullcert is not found, return the latest completedDate
         if (certType === 'isFullStackCert' && !certChallenge) {
-          completedDate = getFallbackFrontEndDate(
+          completedDate = getFallbackFullStackDate(
             completedChallenges,
             completedDate
           );
diff --git a/api-server/src/server/boot_tests/certificate.test.js b/api-server/src/server/boot_tests/certificate.test.js
index bd403f1958..4c511b6c92 100644
--- a/api-server/src/server/boot_tests/certificate.test.js
+++ b/api-server/src/server/boot_tests/certificate.test.js
@@ -1,10 +1,10 @@
-import { getFallbackFrontEndDate } from '../boot/certificate';
+import { getFallbackFullStackDate } from '../boot/certificate';
 import { fullStackChallenges } from './fixtures';
 
 describe('boot/certificate', () => {
-  describe('getFallbackFrontEndDate', () => {
+  describe('getFallbackFullStackDate', () => {
     it('should return the date of the latest completed challenge', () => {
-      expect(getFallbackFrontEndDate(fullStackChallenges)).toBe(1685210952511);
+      expect(getFallbackFullStackDate(fullStackChallenges)).toBe(1685210952511);
     });
   });
 });