SCRUM-136 add placeholder img & update tc

FYP-2024-IQMA · Oct 12, 2024 · ee3a977 · ee3a977
1 parent 50a7268
commit ee3a977
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 15 deletions.
diff --git a/backend/__tests__/services/accountsGamificationService.test.js b/backend/__tests__/services/accountsGamificationService.test.js
@@ -281,6 +281,12 @@ describe("getGamificationData", () => {
 
 describe("getBadges", () => {
     const badges = [
+        {
+            publicUrl: "https://badges.com/placeholder.png",
+        },
+        {
+            publicUrl: "https://badges.com/placeholder.png",
+        },
         {
             publicUrl: "https://badges.com/badge2.png",
         },
@@ -291,12 +297,15 @@ describe("getBadges", () => {
 
     const mockData = [
         {
-            badge: "badge1",
+            name: "badge1",
         },
         {
-            badge: "badge2",
-        }
-    ]
+            name: "badge2",
+        },
+        {
+            name: "placeholder",
+        },
+    ];
 
     it("should return an array of badge URLs", async () => {
         resultService.getNoOfCompletedUnit.mockResolvedValue(4);
@@ -305,10 +314,8 @@ describe("getBadges", () => {
         const mockList = jest
             .fn()
             .mockResolvedValue({ data: mockData, error: null });
-        // supabase.storage.from.mockReturnValue({ list: mockList });
 
         // indiv calls to get badges individually
-
         let mockGetPublicURL = jest.fn();
 
         for (let i = 0; i < badges.length; i++) {
@@ -324,11 +331,7 @@ describe("getBadges", () => {
 
         const expectedResult = badges.map((badge) => badge.publicUrl);
 
-        expect(result).toEqual([
-            "Badge Design in Progress!",
-            "Badge Design in Progress!",
-            ...expectedResult,
-        ]);
+        expect(result).toEqual(expectedResult);
     });
 
     it("should return 'Badges Not Found' when there are no badges in storage", async () => {

diff --git a/backend/dist/services/accountsGamificationService.js b/backend/dist/services/accountsGamificationService.js
@@ -123,10 +123,18 @@ function getBadges(userID) {
         if (storageBadges.length === 0) {
             throw new Error("Badge Not Found");
         }
-        const withoutBadge = Math.max(0, completedUnit - storageBadges.length);
+        const designed = storageBadges
+            .map((badge) => badge.name)
+            .filter((badge) => badge.includes("badge"));
+        const withoutBadge = Math.max(0, completedUnit - designed.length);
         const minBadges = completedUnit - withoutBadge;
         for (let i = 0; i < withoutBadge; i++) {
-            badges.push("Badge Design in Progress!");
+            const { data: publicUrlData } = yield supabaseConfig_1.default.storage
+                .from("badges")
+                .getPublicUrl(`placeholder.png`);
+            if (publicUrlData) {
+                badges.push(publicUrlData.publicUrl);
+            }
         }
         for (let i = minBadges; i > 0; i--) {
             const { data: publicUrlData } = yield supabaseConfig_1.default.storage

diff --git a/backend/src/services/accountsGamificationService.ts b/backend/src/services/accountsGamificationService.ts
@@ -91,11 +91,21 @@ export async function getBadges(userID: string) {
         throw new Error("Badge Not Found");
     }
 
-    const withoutBadge = Math.max(0, completedUnit - storageBadges.length);
+    const designed = storageBadges
+        .map((badge) => badge.name)
+        .filter((badge) => badge.includes("badge"));
+
+    const withoutBadge = Math.max(0, completedUnit - designed.length);
     const minBadges = completedUnit - withoutBadge;
 
     for (let i = 0; i < withoutBadge; i++) {
-        badges.push("Badge Design in Progress!");
+        const { data: publicUrlData } = await supabase.storage
+            .from("badges")
+            .getPublicUrl(`placeholder.png`);
+
+        if (publicUrlData) {
+            badges.push(publicUrlData.publicUrl);
+        }
     }
 
     for (let i = minBadges; i > 0; i--) {