fix: use new schema for getUserGameCompletionStats

achievements-app · Jan 10, 2023 · 69ee154 · 69ee154
1 parent 883bba4
commit 69ee154
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 34 deletions.
diff --git a/src/models/php-responses/api-user-game-completion.model.ts b/src/models/php-responses/api-user-game-completion.model.ts
@@ -1,10 +1,13 @@
 export interface ApiUserGameCompletion {
   GameID: string;
   ConsoleName: string;
+  ConsoleID: string;
   ImageIcon: string;
   Title: string;
-  NumAwarded: string;
   MaxPossible: string;
+  'MAX(aw.HardcoreMode)': string;
+  NumAwarded: string;
+  NumAwardedHC: string;
   PctWon: string;
-  HardcoreMode: string;
+  PctWonHC: string;
 }
diff --git a/src/models/sanitized/user-game-completion.model.ts b/src/models/sanitized/user-game-completion.model.ts
@@ -1,10 +1,13 @@
 export interface UserGameCompletion {
   gameId: number;
   consoleName: string;
+  consoleId: number;
   imageIcon: string;
   title: string;
-  numAwarded: number;
   maxPossible: number;
+  'max(awHardcoreMode)': number;
+  numAwarded: number;
+  numAwardedHc: number;
   pctWon: number;
-  hardcoreMode: number;
+  pctWonHc: number;
 }
diff --git a/test/retro-achievements-client.test.ts b/test/retro-achievements-client.test.ts
@@ -634,24 +634,30 @@ describe('RetroAchievementsClient', () => {
       // ARRANGE
       const mockUserGameCompletions: fromModels.ApiUserGameCompletion[] = [
         {
-          GameID: '1465',
-          ConsoleName: 'NES',
-          ImageIcon: '/Images/024531.png',
-          Title: 'Donkey Kong Jr.',
-          NumAwarded: '13',
-          MaxPossible: '13',
+          GameID: '11406',
+          ConsoleName: 'PlayStation',
+          ConsoleID: '12',
+          ImageIcon: '/Images/042133.png',
+          Title: 'Mortal Kombat 4',
+          MaxPossible: '131',
+          'MAX(aw.HardcoreMode)': '1',
+          NumAwarded: '131',
+          NumAwardedHC: '131',
           PctWon: '1.0000',
-          HardcoreMode: '0'
+          PctWonHC: '1.0000'
         },
         {
-          GameID: '1446',
-          ConsoleName: 'NES',
-          ImageIcon: '/Images/036035.png',
-          Title: 'Super Mario Bros.',
-          NumAwarded: '72',
-          MaxPossible: '78',
-          PctWon: '0.9231',
-          HardcoreMode: '0'
+          GameID: '10116',
+          ConsoleName: 'Nintendo 64',
+          ConsoleID: '2',
+          ImageIcon: '/Images/042459.png',
+          Title: 'Mortal Kombat 4',
+          MaxPossible: '130',
+          'MAX(aw.HardcoreMode)': '1',
+          NumAwarded: '130',
+          NumAwardedHC: '130',
+          PctWon: '1.0000',
+          PctWonHC: '1.0000'
         }
       ];
 
@@ -675,24 +681,30 @@ describe('RetroAchievementsClient', () => {
       expect(userGameCompletions).toHaveLength(2);
       expect(userGameCompletions).toEqual([
         {
-          consoleName: 'NES',
-          gameId: 1465,
-          hardcoreMode: 0,
-          imageIcon: '/Images/024531.png',
-          maxPossible: 13,
-          numAwarded: 13,
+          gameId: 11406,
+          consoleName: 'PlayStation',
+          consoleId: 12,
+          imageIcon: '/Images/042133.png',
+          title: 'Mortal Kombat 4',
+          maxPossible: 131,
+          'max(awHardcoreMode)': 1,
+          numAwarded: 131,
+          numAwardedHc: 131,
           pctWon: 1,
-          title: 'Donkey Kong Jr.'
+          pctWonHc: 1
         },
         {
-          consoleName: 'NES',
-          gameId: 1446,
-          hardcoreMode: 0,
-          imageIcon: '/Images/036035.png',
-          maxPossible: 78,
-          numAwarded: 72,
-          pctWon: 0.9231,
-          title: 'Super Mario Bros.'
+          gameId: 10116,
+          consoleName: 'Nintendo 64',
+          consoleId: 2,
+          imageIcon: '/Images/042459.png',
+          title: 'Mortal Kombat 4',
+          maxPossible: 130,
+          'max(awHardcoreMode)': 1,
+          numAwarded: 130,
+          numAwardedHc: 130,
+          pctWon: 1,
+          pctWonHc: 1
         }
       ]);
     });