feature/IO-2282-VSSTA-Integration: - checkpoint

server/media/imgproxy-media.js

@@ -215,9 +215,10 @@ const downloadFiles = async (req, res) => {
       params: { Bucket: imgproxyDestinationBucket, Key: archiveKey, Body: passThrough }
     });
 
-    parallelUploads3.on("httpUploadProgress", (progress) => {
-      console.log(progress);
-    });
+    // Disabled progress logging for upload, uncomment if needed
+    // parallelUploads3.on("httpUploadProgress", (progress) => {
+    //   console.log(progress);
+    // });
 
     await parallelUploads3.done();
 

server/media/media.js

@@ -1,7 +1,8 @@
 const _ = require("lodash");
 const logger = require("../utils/logger");
 const client = require("../graphql-client/graphql-client").client;
-const queries = require("../graphql-client/queries");
+const determineFileType = require("./util/determineFileType");
+const { DELETE_MEDIA_DOCUMENTS } = require("../graphql-client/queries");
 
 const cloudinary = require("cloudinary").v2;
 cloudinary.config(process.env.CLOUDINARY_URL);
@@ -13,22 +14,26 @@ const createSignedUploadURL = (req, res) => {
 
 const downloadFiles = (req, res) => {
   const { ids } = req.body;
+
   logger.log("media-bulk-download", "DEBUG", req.user.email, ids, null);
 
   const url = cloudinary.utils.download_zip_url({
     public_ids: ids,
     flatten_folders: true
   });
+
   res.send(url);
 };
 
 const deleteFiles = async (req, res) => {
   const { ids } = req.body;
-  const types = _.groupBy(ids, (x) => DetermineFileType(x.type));
+
+  const types = _.groupBy(ids, (x) => determineFileType(x.type));
 
   logger.log("media-bulk-delete", "DEBUG", req.user.email, ids, null);
 
   const returns = [];
+
   if (types.image) {
     //delete images
 
@@ -39,8 +44,8 @@ const deleteFiles = async (req, res) => {
       )
     );
   }
+
   if (types.video) {
-    //delete images  returns.push(
     returns.push(
       await cloudinary.api.delete_resources(
         types.video.map((x) => x.key),
@@ -48,8 +53,8 @@ const deleteFiles = async (req, res) => {
       )
     );
   }
+
   if (types.raw) {
-    //delete images  returns.push(
     returns.push(
       await cloudinary.api.delete_resources(
         types.raw.map((x) => `${x.key}.${x.extension}`),
@@ -60,6 +65,7 @@ const deleteFiles = async (req, res) => {
 
   // Delete it on apollo.
   const successfulDeletes = [];
+
   returns.forEach((resType) => {
     Object.keys(resType.deleted).forEach((key) => {
       if (resType.deleted[key] === "deleted" || resType.deleted[key] === "not_found") {
@@ -69,7 +75,7 @@ const deleteFiles = async (req, res) => {
   });
 
   try {
-    const result = await client.request(queries.DELETE_MEDIA_DOCUMENTS, {
+    const result = await client.request(DELETE_MEDIA_DOCUMENTS, {
       ids: ids.filter((i) => successfulDeletes.includes(i.key)).map((i) => i.id)
     });
 
@@ -85,9 +91,11 @@ const deleteFiles = async (req, res) => {
 
 const renameKeys = async (req, res) => {
   const { documents, tojobid } = req.body;
+
   logger.log("media-bulk-rename", "DEBUG", req.user.email, null, documents);
 
   const proms = [];
+
   documents.forEach((d) => {
     proms.push(
       (async () => {
@@ -95,7 +103,7 @@ const renameKeys = async (req, res) => {
           return {
             id: d.id,
             ...(await cloudinary.uploader.rename(d.from, d.to, {
-              resource_type: DetermineFileType(d.type)
+              resource_type: determineFileType(d.type)
             }))
           };
         } catch (error) {
@@ -141,17 +149,6 @@ const renameKeys = async (req, res) => {
   }
 };
 
-//Also needs to be updated in upload utility and mobile app.
-function DetermineFileType(filetype) {
-  if (!filetype) return "auto";
-  else if (filetype.startsWith("image")) return "image";
-  else if (filetype.startsWith("video")) return "video";
-  else if (filetype.startsWith("application/pdf")) return "image";
-  else if (filetype.startsWith("application")) return "raw";
-
-  return "auto";
-}
-
 module.exports = {
   createSignedUploadURL,
   downloadFiles,

server/media/util/determineFileType.js

@@ -0,0 +1,17 @@
+/**
+ * @description Determines the file type based on the filetype string.
+ * @note Also needs to be updated in the mobile app utility.
+ * @param filetype
+ * @returns {string}
+ */
+const determineFileType = (filetype) => {
+  if (!filetype) return "auto";
+  else if (filetype.startsWith("image")) return "image";
+  else if (filetype.startsWith("video")) return "video";
+  else if (filetype.startsWith("application/pdf")) return "image";
+  else if (filetype.startsWith("application")) return "raw";
+
+  return "auto";
+};
+
+module.exports = determineFileType;