From a68fc99d7275b23b998f50ac09fa85e1eb06fad2 Mon Sep 17 00:00:00 2001
From: Abhishek Dasgupta <abhishek.dasgupta@dtc.ox.ac.uk>
Date: Fri, 21 Oct 2022 16:48:02 +0100
Subject: [PATCH] curator/api: use user.id in logging

The user object passed from the request (req) does not have
the _id field, but has id as string; use that instead of _id
for logging and updating the user document.
---
 .../api/src/controllers/cases.ts              | 28 ++++++-------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/verification/curator-service/api/src/controllers/cases.ts b/verification/curator-service/api/src/controllers/cases.ts
index 4a33865ef..ccb76860b 100644
--- a/verification/curator-service/api/src/controllers/cases.ts
+++ b/verification/curator-service/api/src/controllers/cases.ts
@@ -82,7 +82,7 @@ export default class CasesController {
         try {
             const user = req.user as IUser;
             const result = await users().findOneAndUpdate(
-                { _id: new ObjectId(user._id) },
+                { _id: new ObjectId(user.id) },
                 {
                     $push: {
                         downloads: {
@@ -93,10 +93,7 @@ export default class CasesController {
                     },
                 },
             );
-            this.logOutcomeOfAppendingDownloadToUser(
-                user._id.toHexString(),
-                result,
-            );
+            this.logOutcomeOfAppendingDownloadToUser(user.id, result);
 
             axios({
                 method: 'post',
@@ -152,7 +149,7 @@ export default class CasesController {
             );
             const result = await users().findOneAndUpdate(
                 {
-                    _id: new ObjectId(user._id),
+                    _id: new ObjectId(user.id),
                 },
                 {
                     $push: {
@@ -165,10 +162,7 @@ export default class CasesController {
                 },
             );
 
-            this.logOutcomeOfAppendingDownloadToUser(
-                user._id.toHexString(),
-                result,
-            );
+            this.logOutcomeOfAppendingDownloadToUser(user.id, result);
 
             axios({
                 method: 'post',
@@ -227,7 +221,7 @@ export default class CasesController {
             });
 
             const result = await users().findOneAndUpdate(
-                { _id: new ObjectId(user._id) },
+                { _id: new ObjectId(user.id) },
                 {
                     $push: {
                         downloads: {
@@ -236,10 +230,7 @@ export default class CasesController {
                     },
                 },
             );
-            this.logOutcomeOfAppendingDownloadToUser(
-                user._id.toHexString(),
-                result,
-            );
+            this.logOutcomeOfAppendingDownloadToUser(user.id, result);
 
             res.status(200).send({ signedUrl });
         } catch (err) {
@@ -278,7 +269,7 @@ export default class CasesController {
             });
 
             const result = await users().findOneAndUpdate(
-                { _id: new ObjectId(user._id) },
+                { _id: new ObjectId(user.id) },
                 {
                     $push: {
                         downloads: {
@@ -289,10 +280,7 @@ export default class CasesController {
                     },
                 },
             );
-            this.logOutcomeOfAppendingDownloadToUser(
-                user._id.toHexString(),
-                result,
-            );
+            this.logOutcomeOfAppendingDownloadToUser(user.id, result);
 
             res.status(200).send({ signedUrl });
         } catch (err) {