From 449342dab94df7ed157833564d9e7eefedd109f7 Mon Sep 17 00:00:00 2001
From: Cameron Clough <cameronjclough@gmail.com>
Date: Thu, 24 Mar 2022 23:34:13 +0000
Subject: [PATCH] refactor: delete old getDrive method

---
 src/server/controllers/devices.js | 9 ---------
 src/server/router/legacy.js       | 2 +-
 src/server/router/useradmin.js    | 9 ++++++---
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/server/controllers/devices.js b/src/server/controllers/devices.js
index 48884ee..2bc7f53 100644
--- a/src/server/controllers/devices.js
+++ b/src/server/controllers/devices.js
@@ -209,14 +209,6 @@ async function getDrives(dongleId, includeDeleted, includeMeta) {
   return Drives.findAll(query);
 }
 
-async function getDrive(identifier) {
-  const drive = await Drives.findOne({ where: { identifier } });
-  if (!drive) {
-    return null;
-  }
-  return drive.dataValues;
-}
-
 async function getDriveFromIdentifier(dongleId, identifier) {
   return Drives.findOne({ where: { dongle_id: dongleId, identifier } });
 }
@@ -364,7 +356,6 @@ export default {
 
   // drive stuff, move maybe?
   getDrives,
-  getDrive,
   getBootlogs,
   getCrashlogs,
   getDriveFromIdentifier,
diff --git a/src/server/router/legacy.js b/src/server/router/legacy.js
index 6e079df..d6e74e6 100644
--- a/src/server/router/legacy.js
+++ b/src/server/router/legacy.js
@@ -457,7 +457,7 @@ router.get('/useradmin/cabana_drive/:extendedRouteIdentifier', runAsyncWrapper(a
   const { extendedRouteIdentifier } = req.params;
   const [dongleId, dongleIdHashReq, driveIdentifier, driveIdentifierHashReq] = extendedRouteIdentifier.split('|');
 
-  const drive = await deviceController.getDrive(dongleId, driveIdentifier);
+  const drive = await deviceController.getDriveFromIdentifier(dongleId, driveIdentifier);
   if (!drive) {
     return res.status(404).json({ status: 'drive not found' });
   }
diff --git a/src/server/router/useradmin.js b/src/server/router/useradmin.js
index 3e025aa..d13a93f 100644
--- a/src/server/router/useradmin.js
+++ b/src/server/router/useradmin.js
@@ -399,17 +399,20 @@ router.get('/drive/:dongleId/:driveIdentifier', requireAuthenticated, runAsyncWr
   const { dongleId } = req.params;
   const device = await deviceController.getDeviceFromDongleId(dongleId);
   if (!device) {
+    logger.debug('HTTP.DRIVE Device not found, dongleId:', dongleId);
     return res.status(404).send('Not Found.');
   }
 
   const { account_id: accountId } = device;
   if (accountId !== req.account.id) {
+    logger.debug('HTTP.DRIVE Account mismatch');
     return res.status(403).send('Forbidden.');
   }
 
   const { driveIdentifier } = req.params;
-  const drive = await deviceController.getDrive(dongleId, driveIdentifier);
-  if (drive == null) {
+  const drive = await deviceController.getDriveFromIdentifier(dongleId, driveIdentifier);
+  if (!drive) {
+    logger.debug('HTTP.DRIVE Drive not found, dongleId:', dongleId, 'driveIdentifier:', driveIdentifier);
     return res.status(404).send('Not Found.');
   }
 
@@ -621,7 +624,7 @@ router.get('/drive/:dongleId/:driveIdentifier/:action', requireAuthenticated, ru
     dongleId,
     driveIdentifier,
   } = req.params;
-  const drive = await deviceController.getDrive(dongleId, driveIdentifier);
+  const drive = await deviceController.getDriveFromIdentifier(dongleId, driveIdentifier);
   if (!drive) {
     return res.status(404).send('Not Found.');
   }