Get rid of null score and result

Drarig29 · Mar 27, 2021 · 5a94aec · 5a94aec
1 parent bf971db
commit 5a94aec
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 29 deletions.
diff --git a/db.json b/db.json
@@ -71,13 +71,13 @@
                 "id": 2,
                 "score": 16,
                 "forfeit": false,
-                "result": null
+                "result": "loss"
             },
             "opponent2": {
                 "id": 3,
                 "score": 12,
                 "forfeit": false,
-                "result": null
+                "result": "loss"
             }
         },
         {
@@ -266,7 +266,7 @@
                 "id": 6,
                 "score": 8,
                 "forfeit": true,
-                "result": null
+                "result": "loss"
             }
         },
         {
@@ -428,13 +428,13 @@
                 "id": 12,
                 "score": 16,
                 "forfeit": false,
-                "result": null
+                "result": "loss"
             },
             "opponent2": {
                 "id": 13,
                 "score": 4,
                 "forfeit": false,
-                "result": null
+                "result": "loss"
             }
         },
         {
@@ -827,13 +827,13 @@
                 "id": 26,
                 "score": 16,
                 "forfeit": false,
-                "result": null
+                "result": "loss"
             },
             "opponent2": {
                 "id": 27,
                 "score": 7,
                 "forfeit": false,
-                "result": null
+                "result": "loss"
             }
         },
         {
@@ -1833,13 +1833,11 @@
             "status": 4,
             "opponent1": {
                 "id": 19,
-                "score": null,
                 "forfeit": true,
-                "result": null
+                "result": "loss"
             },
             "opponent2": {
                 "id": 13,
-                "score": null,
                 "forfeit": false,
                 "result": "win"
             }
@@ -1938,13 +1936,11 @@
             "status": 4,
             "opponent1": {
                 "id": 3,
-                "score": null,
                 "forfeit": true,
-                "result": null
+                "result": "loss"
             },
             "opponent2": {
                 "id": 15,
-                "score": null,
                 "forfeit": false,
                 "result": "win"
             }
@@ -2001,13 +1997,11 @@
             "status": 4,
             "opponent1": {
                 "id": 19,
-                "score": null,
                 "forfeit": true,
-                "result": null
+                "result": "loss"
             },
             "opponent2": {
                 "id": 21,
-                "score": null,
                 "forfeit": false,
                 "result": "win"
             }
@@ -2043,15 +2037,13 @@
             "status": 4,
             "opponent1": {
                 "id": 23,
-                "score": null,
                 "forfeit": false,
                 "result": "win"
             },
             "opponent2": {
                 "id": 17,
-                "score": null,
                 "forfeit": true,
-                "result": null
+                "result": "loss"
             }
         },
         {
@@ -2169,13 +2161,11 @@
             "status": 4,
             "opponent1": {
                 "id": 21,
-                "score": null,
                 "forfeit": true,
-                "result": null
+                "result": "loss"
             },
             "opponent2": {
                 "id": 1,
-                "score": null,
                 "forfeit": false,
                 "result": "win"
             }
@@ -2232,13 +2222,11 @@
             "status": 4,
             "opponent1": {
                 "id": 3,
-                "score": null,
                 "forfeit": true,
-                "result": null
+                "result": "loss"
             },
             "opponent2": {
                 "id": 7,
-                "score": null,
                 "forfeit": false,
                 "result": "win"
             }

diff --git a/src/convert.ts b/src/convert.ts
@@ -69,9 +69,9 @@ export function convertParticipant(id: number, participant: toornament.Participa
 export function convertParticipantResult(id: number, result: toornament.Opponent): ParticipantResult {
     return {
         id,
-        score: result.score,
+        score: result.score !== null ? result.score : undefined,
         forfeit: result.forfeit,
-        result: result.result,
+        result: result.result || 'loss',
     }
 }
 

diff --git a/src/types.ts b/src/types.ts
@@ -67,9 +67,9 @@ export namespace toornament {
         position: number;
         participant: Participant;
         rank?: number;
-        result: Result;
+        result: Result | null;
         forfeit: boolean;
-        score?: number;
+        score?: number | null;
     }
 
     export type Status = 'pending' | 'running' | 'completed';