Merge pull request #222 from loathers/fix-clan-issues

don't break the loop upon finding a new player
loathers · Sep 3, 2024 · ec4fa33 · ec4fa33
2 parents e462b54 + 7c3c732
commit ec4fa33
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/packages/oaf/prisma/migrations/20240903162304_wipe_clan_kills_and_skills/migration.sql b/packages/oaf/prisma/migrations/20240903162304_wipe_clan_kills_and_skills/migration.sql
@@ -0,0 +1,3 @@
+-- Force oaf to recalculate all raid stats.
+TRUNCATE TABLE "Raid";
+UPDATE "Player" SET "kills" = 0, "skills" = 0;
diff --git a/packages/oaf/src/commands/clan/skills.ts b/packages/oaf/src/commands/clan/skills.ts
@@ -119,31 +119,27 @@ async function parseOldLogs() {
 
     for (const [playerId, { kills, skills }] of participation.entries()) {
       const player = await tx.player.findUnique({ where: { playerId } });
+      const playerName =
+        player?.playerName ?? (await kolClient.players.fetch(playerId))?.name;
 
-      if (!player) {
-        const playerName = (await kolClient.players.fetch(playerId))?.name;
-        if (!playerName) return;
-        tx.player.create({
-          data: {
-            playerId,
-            playerName,
-            kills,
-            skills,
-          },
-        });
-        return;
-      }
+      if (!playerName) continue;
 
-      tx.player.update({
+      await tx.player.upsert({
         where: { playerId },
-        data: {
+        update: {
           kills: {
             increment: kills,
           },
           skills: {
             increment: skills,
           },
         },
+        create: {
+          playerId,
+          playerName,
+          kills,
+          skills,
+        },
       });
     }
   });