Fix typecheck

ystv · Dec 26, 2023 · 9c4ef5e · 9c4ef5e
1 parent eb63a55
commit 9c4ef5e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/scores-src/src/server/eventsRoutes.ts b/scores-src/src/server/eventsRoutes.ts
@@ -13,6 +13,7 @@ import { ensure } from "./errs";
 import { BadRequest } from "http-errors";
 import { doUpdate as updateTournamentSummary } from "./updateTournamentSummary.job";
 import { getLogger } from "./loggingSetup";
+import { CouchbaseCas } from "./dbHelpers";
 
 export function createEventsRouter() {
   const router = Router();
@@ -134,7 +135,7 @@ export function createEventsRouter() {
         "league",
       ]).validate(inputData, { abortEarly: false, stripUnknown: true });
       await DB.collection("_default").replace(metaKey(league, type, id), val, {
-        cas: cas,
+        cas: cas ? CouchbaseCas.from(cas) : undefined,
       });
       res.status(200).json(val);
     })

diff --git a/scores-src/src/server/userManagementRoutes.ts b/scores-src/src/server/userManagementRoutes.ts
@@ -93,7 +93,7 @@ export function createUserManagementRouter() {
       };
       const data = await DB.collection("_default").getAndLock(id, 10);
       try {
-        if (payload._cas && data.cas != payload._cas) {
+        if (payload._cas && data.cas.toString() != payload._cas) {
           throw new Conflict("someone else has updated this user");
         }
         newData.passwordHash = data.content.passwordHash;