remove callbacks and update relevant calls

Author: raclim

server/controllers/collection.controller/removeCollection.js

@@ -21,12 +21,12 @@ export default function createCollection(req, res) {
       return null;
     }
 
-    return collection.remove();
+    return collection.deleteOne();
   }
 
   function findCollection() {
     // Only returned if owner matches current user
-    return Collection.findOne({ _id: collectionId, owner });
+    return Collection.findOne({ _id: collectionId, owner }).exec();
   }
 
   return findCollection()

server/controllers/collection.controller/removeProjectFromCollection.js

@@ -26,7 +26,7 @@ export default function removeProjectFromCollection(req, res) {
     const project = collection.items.find((p) => p.projectId === projectId);
 
     if (project != null) {
-      project.remove();
+      project.deleteOne();
       return collection.save();
     }
 

server/controllers/embed.controller.js

@@ -10,23 +10,35 @@ import { get404Sketch } from '../views/404Page';
 
 export function serveProject(req, res) {
   const projectId = req.params.project_id;
-  Project.findOne(
-    { $or: [{ _id: projectId }, { slug: projectId }] },
-    (err, project) => {
-      if (err || !project) {
+
+  Project.findOne({ $or: [{ _id: projectId }, { slug: projectId }] })
+    .then((project) => {
+      if (!project) {
         get404Sketch((html) => res.send(html));
         return;
       }
-      // TODO this does not parse html
+
       const { files } = project;
       const htmlFile = files.find((file) => file.name.match(/\.html$/i))
-        .content;
+        ?.content;
+
+      if (!htmlFile) {
+        get404Sketch((html) => res.send(html));
+        return;
+      }
+
       const filesToInject = files.filter((file) =>
         file.name.match(/\.(js|css)$/i)
       );
+
       injectMediaUrls(filesToInject, files, req.params.project_id);
 
       jsdom.env(htmlFile, (innerErr, window) => {
+        if (innerErr) {
+          res.status(500).send('Error rendering project');
+          return;
+        }
+
         const sketchDoc = window.document;
 
         const base = sketchDoc.createElement('base');
@@ -42,8 +54,11 @@ export function serveProject(req, res) {
         res.setHeader('Cache-Control', 'public, max-age=0');
         res.send(serializeDocument(sketchDoc));
       });
-    }
-  );
+    })
+    .catch((err) => {
+      console.error(err);
+      get404Sketch((html) => res.send(html));
+    });
 }
 
 export default serveProject;

server/controllers/file.controller.js

@@ -8,50 +8,47 @@ import { deleteObjectsFromS3, getObjectKey } from './aws.controller';
 // Bug -> timestamps don't get created, but it seems like this will
 // be fixed in mongoose soon
 // https://github.com/Automattic/mongoose/issues/4049
-export function createFile(req, res) {
-  Project.findOneAndUpdate(
-    {
-      _id: req.params.project_id,
-      user: req.user._id
-    },
-    {
-      $push: {
-        files: req.body
-      }
-    },
-    {
-      new: true
-    },
-    (err, updatedProject) => {
-      if (err || !updatedProject) {
-        console.log(err);
-        res.status(403).send({
-          success: false,
-          message: 'Project does not exist, or user does not match owner.'
-        });
-        return;
-      }
-      const newFile = updatedProject.files[updatedProject.files.length - 1];
-      updatedProject.files.id(req.body.parentId).children.push(newFile.id);
-      updatedProject.save((innerErr, savedProject) => {
-        if (innerErr) {
-          console.log(innerErr);
-          res.json({ success: false });
-          return;
+export async function createFile(req, res) {
+  try {
+    const updatedProject = await Project.findOneAndUpdate(
+      {
+        _id: req.params.project_id,
+        user: req.user._id
+      },
+      {
+        $push: {
+          files: req.body
         }
-        savedProject.populate(
-          { path: 'user', select: 'username' },
-          (_, populatedProject) => {
-            res.json({
-              updatedFile:
-                updatedProject.files[updatedProject.files.length - 1],
-              project: populatedProject
-            });
-          }
-        );
+      },
+      {
+        new: true
+      }
+    ).exec();
+
+    if (!updatedProject) {
+      return res.status(403).send({
+        success: false,
+        message: 'Project does not exist, or user does not match owner.'
       });
     }
-  );
+
+    const newFile = updatedProject.files[updatedProject.files.length - 1];
+    updatedProject.files.id(req.body.parentId).children.push(newFile.id);
+
+    const savedProject = await updatedProject.save();
+    const populatedProject = await savedProject.populate({
+      path: 'user',
+      select: 'username'
+    });
+
+    return res.json({
+      updatedFile: newFile,
+      project: populatedProject
+    });
+  } catch (err) {
+    console.error(err);
+    return res.status(500).json({ success: false });
+  }
 }
 
 function getAllDescendantIds(files, nodeId) {
@@ -82,7 +79,7 @@ function deleteMany(files, ids) {
           objectKeys.push(objectKey);
         }
       }
-      files.id(id).remove();
+      files.id(id).deleteOne();
       cb();
     },
     (err) => {
@@ -102,69 +99,88 @@ function deleteChild(files, parentId, id) {
 }
 
 export function deleteFile(req, res) {
-  Project.findById(req.params.project_id, (err, project) => {
-    if (!project) {
-      res
-        .status(404)
-        .send({ success: false, message: 'Project does not exist.' });
-    }
-    if (!project.user.equals(req.user._id)) {
-      res.status(403).send({
-        success: false,
-        message: 'Session does not match owner of project.'
-      });
-      return;
-    }
+  Project.findById(req.params.project_id)
+    .then((project) => {
+      if (!project) {
+        return res.status(404).send({
+          success: false,
+          message: 'Project does not exist.'
+        });
+      }
 
-    // make sure file exists for project
-    const fileToDelete = project.files.find(
-      (file) => file.id === req.params.file_id
-    );
-    if (!fileToDelete) {
-      res
-        .status(404)
-        .send({ success: false, message: 'File does not exist in project.' });
-      return;
-    }
+      if (!project.user.equals(req.user._id)) {
+        return res.status(403).send({
+          success: false,
+          message: 'Session does not match owner of project.'
+        });
+      }
+
+      const fileToDelete = project.files.find(
+        (file) => file.id === req.params.file_id
+      );
+
+      if (!fileToDelete) {
+        return res.status(404).send({
+          success: false,
+          message: 'File does not exist in project.'
+        });
+      }
+
+      const idsToDelete = getAllDescendantIds(
+        project.files,
+        req.params.file_id
+      );
+      deleteMany(project.files, [req.params.file_id, ...idsToDelete]);
 
-    const idsToDelete = getAllDescendantIds(project.files, req.params.file_id);
-    deleteMany(project.files, [req.params.file_id, ...idsToDelete]);
-    project.files = deleteChild(
-      project.files,
-      req.query.parentId,
-      req.params.file_id
-    );
-    project.save((innerErr, savedProject) => {
-      res.json({ project: savedProject });
+      project.files = deleteChild(
+        project.files,
+        req.query.parentId,
+        req.params.file_id
+      );
+
+      return project.save().then((savedProject) => {
+        res.json({ project: savedProject });
+      });
+    })
+    .catch((error) => {
+      console.error(error);
+      res.status(500).json({ message: 'Failed to process deletion' });
     });
-  });
 }
 
 export function getFileContent(req, res) {
   const projectId = req.params.project_id;
-  Project.findOne(
-    { $or: [{ _id: projectId }, { slug: projectId }] },
-    (err, project) => {
-      if (err || project === null) {
+
+  Project.findOne({ $or: [{ _id: projectId }, { slug: projectId }] })
+    .then((project) => {
+      if (!project) {
         res.status(404).send({
           success: false,
           message: 'Project with that id does not exist.'
         });
         return;
       }
+
       const filePath = req.params[0];
       const resolvedFile = resolvePathToFile(filePath, project.files);
+
       if (!resolvedFile) {
         res.status(404).send({
           success: false,
           message: 'File with that name and path does not exist.'
         });
         return;
       }
+
       const contentType =
         mime.getType(resolvedFile.name) || 'application/octet-stream';
       res.set('Content-Type', contentType);
       res.send(resolvedFile.content);
-    }
-  );
+    })
+    .catch((err) => {
+      console.error(err);
+      res
+        .status(500)
+        .send({ success: false, message: 'Internal server error' });
+    });
 }

server/controllers/project.controller.js

@@ -68,7 +68,7 @@ export async function updateProject(req, res) {
       const newFileIds = req.body.files.map((file) => file.id);
       const staleIds = oldFileIds.filter((id) => newFileIds.indexOf(id) === -1);
       staleIds.forEach((staleId) => {
-        updatedProject.files.id(staleId).remove();
+        updatedProject.files.id(staleId).deleteOne();
       });
       const savedProject = await updatedProject.save();
       res.json(savedProject);
@@ -101,13 +101,6 @@ export async function getProject(req, res) {
   return res.json(project);
 }
 
-export function getProjectsForUserId(userId) {
-  return Project.find({ user: userId })
-    .sort('-createdAt')
-    .select('name files id createdAt updatedAt')
-    .exec();
-}
-
 export async function getProjectAsset(req, res) {
   const projectId = req.params.project_id;
   const project = await Project.findOne({
@@ -146,7 +139,7 @@ export async function getProjectAsset(req, res) {
 
 export async function getProjects(req, res) {
   if (req.user) {
-    const projects = await getProjectsForUserId(req.user._id);
+    const projects = await Project.getProjectsForUserId(req.user._id);
     res.json(projects);
   } else {
     // could just move this to client side

server/controllers/project.controller/deleteProject.js

@@ -65,7 +65,7 @@ export default async function deleteProject(req, res) {
     }
 
     await deleteFilesFromS3(project.files);
-    await project.remove();
+    await project.deleteOne();
     res.status(200).end();
   } catch (error) {
     if (error.name === 'CastError' && error.kind === 'ObjectId') {