fix: merge fix

encryptedge · Jan 22, 2024 · ef9bb4b · ef9bb4b
1 parent bb6dbbe
commit ef9bb4b
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 25 deletions.
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -31,6 +31,7 @@
     "@graphql-codegen/typescript-operations": "^4.0.1",
     "@hono/node-server": "^1.3.2",
     "@upstash/redis": "^1.28.1",
+    "axios": "^1.6.2",
     "dotenv": "^16.3.1",
     "eslint": "^8.53.0",
     "graphql-request": "^6.1.0",

diff --git a/packages/api/services/challenges.service.ts b/packages/api/services/challenges.service.ts
@@ -404,10 +404,8 @@ export class ChallengeService {
                     for (const machine of challengeCollection) {
                         if(machine.depends_on) {
                             const depends_on_machine = challengeCollection.find(challenge => challenge.id === machine.depends_on);
-                            if(depends_on_machine) {
-                                if(depends_on_machine.challenges?.length !== depends_on_machine.total_challenges) {
-                                    challengeCollection.splice(challengeCollection.indexOf(machine), 1);
-                                }
+                            if(depends_on_machine && depends_on_machine.challenges?.length !== depends_on_machine.total_challenges) {
+                                challengeCollection.splice(challengeCollection.indexOf(machine), 1);
                             }
                         }
                     }

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml