Mongoose: solving more of depreciation warnings

async-labs · Oct 12, 2018 · 6bbe205 · 6bbe205
1 parent 22e4b9f
commit 6bbe205
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/api/server/app.ts b/api/server/app.ts
@@ -25,11 +25,16 @@ const ROOT_URL = dev ? `http://localhost:${port}` : PRODUCTION_URL_API;
 
 const MONGO_URL = dev ? process.env.MONGO_URL_TEST : process.env.MONGO_URL;
 
+const options = {
+  useNewUrlParser: true,
+  useCreateIndex: true,
+  useFindAndModify: false,
+};
+
 mongoose.connect(
   MONGO_URL,
-  { useNewUrlParser: true, useFindAndModify: false },
+  options,
 );
-mongoose.set('useCreateIndex', true);
 
 const server = express();
 

diff --git a/api/server/models/Discussion.ts b/api/server/models/Discussion.ts
@@ -177,9 +177,9 @@ class DiscussionClass extends mongoose.Model {
         .lean(),
     );
 
-    await Post.remove({ discussionId: id });
+    await Post.deleteMany({ discussionId: id });
 
-    await this.remove({ _id: id });
+    await this.deleteOne({ _id: id });
 
     return { teamId: discussion.teamId };
   }

diff --git a/api/server/models/Invitation.ts b/api/server/models/Invitation.ts
@@ -89,7 +89,7 @@ class InvitationClass extends mongoose.Model {
       if (team.memberIds.includes(registeredUser._id.toString())) {
         throw new Error('This user is already Team Member.');
       } else {
-        await Team.update({ _id: team._id }, { $addToSet: { memberIds: registeredUser._id } });
+        await Team.updateOne({ _id: team._id }, { $addToSet: { memberIds: registeredUser._id } });
 
         if (registeredUser._id !== team.teamLeaderId && !registeredUser.defaultTeamSlug) {
           await User.findByIdAndUpdate(registeredUser._id, {
@@ -188,7 +188,7 @@ class InvitationClass extends mongoose.Model {
       .lean();
 
     if (team && team.memberIds.includes(userId)) {
-      this.remove({ token }).exec();
+      this.deleteOne({ token }).exec();
     }
   }
 
@@ -203,14 +203,14 @@ class InvitationClass extends mongoose.Model {
       throw new Error('Invitation not found');
     }
 
-    await this.remove({ token });
+    await this.deleteOne({ token });
 
     const team = await Team.findById(invitation.teamId)
       .select('memberIds slug teamLeaderId')
       .lean();
 
     if (team && !team.memberIds.includes(user._id)) {
-      await Team.update({ _id: team._id }, { $addToSet: { memberIds: user._id } });
+      await Team.updateOne({ _id: team._id }, { $addToSet: { memberIds: user._id } });
 
       if (user._id !== team.teamLeaderId && !user.defaultTeamSlug) {
         await User.findByIdAndUpdate(user._id, { $set: { defaultTeamSlug: team.slug } });

diff --git a/api/server/models/Post.ts b/api/server/models/Post.ts
@@ -218,7 +218,7 @@ class PostClass extends mongoose.Model {
 
     deletePostFiles([post]);
 
-    await this.remove({ _id: id });
+    await this.deleteOne({ _id: id });
   }
 
   public static async checkPermission({ userId, discussionId, post = null }) {