Merge pull request #11 from Thedevelop3r/dev

Dev

Author: Thedevelop3r

README.md

@@ -42,3 +42,7 @@ docker compose watch
 ## License
 
 [MIT](https://choosealicense.com/licenses/mit/)
+
+## Permission
+You are free to use this code for your own projects, modify it, or publish it anywhere.
+please give me credit if you use it. (@Thedevelop3r), thanks.

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "modern-todo-app",
+  "name": "modern-todo-app-backend",
   "version": "1.0.0",
   "description": "headless backend for todo application",
   "main": "server.js",
@@ -12,7 +12,7 @@
   "developer": "Bilal Amjad",
   "developer-github": "www.github.com/thedevelop3r",
   "username": "@thedevelop3r",
-  "license": "ISC",
+  "license": "MIT",
   "dependencies": {
     "bcrypt": "^5.1.1",
     "cookie-parser": "^1.4.6",

src/controller/Todo.controller.js

@@ -1,4 +1,4 @@
-const { Todo } = require("../models");
+const { Todo, Trash } = require("../models");
 
 class TodoController {
   constructor() {}
@@ -48,11 +48,13 @@ class TodoController {
     if (body.description) parsedBody.description = body.description;
     if (body.status) parsedBody.status = body.status;
     const updatedTodo = await Todo.findOneAndUpdate({ _id: todoId, ownerId: userId }, parsedBody, { new: true });
+   
     return updatedTodo;
   }
 
   async destroy({ todoId, userId }) {
     const deletedTodo = await Todo.findOneAndDelete({ _id: todoId, ownerId: userId });
+    await Trash.create({ ...deletedTodo._doc, todoId: todoId });
     return deletedTodo;
   }
 }

src/controller/Trash.controller.js

@@ -0,0 +1,66 @@
+const { Todo, Trash } = require("../models");
+
+class TrashController {
+  constructor() {}
+
+  async getTodos({ limit = 10, page = 1 }, userId) {
+    try {
+      const todos = await Trash.find({
+        ownerId: userId,
+      })
+        .limit(limit)
+        .skip((page - 1) * limit)
+        .sort({ created_at: -1 });
+      // TODO: 1 Apply sorting and filters
+      // provide additional information
+      const totalPages = Math.ceil((await Trash.countDocuments()) / limit);
+      const meta = {
+        totalRecords: await Trash.countDocuments(),
+        page: page,
+        limit: limit,
+        totalPages: totalPages,
+      };
+      return { data: todos, meta };
+    } catch (err) {
+      return err;
+    }
+  }
+
+  async getTodoById({ todoId, userId }) {
+    const todo = await Trash.findOne({ _id: todoId, ownerId: userId });
+    return todo;
+  }
+
+  async create({ body, userId }) {
+    body.ownerId = userId;
+    const newTodo = await Trash.create(body);
+    return newTodo;
+  }
+
+  async createMany(todos) {
+    const newTodos = await Trash.insertMany(todos);
+    return newTodos;
+  }
+
+  async update({ todoId, body, userId }) {
+    const parsedBody = {};
+    if (body.title) parsedBody.title = body.title;
+    if (body.description) parsedBody.description = body.description;
+    if (body.status) parsedBody.status = body.status;
+    const updatedTodo = await Trash.findOneAndUpdate({ _id: todoId, ownerId: userId }, parsedBody, { new: true });
+   
+    return updatedTodo;
+  }
+  async recover({ todoId, userId }) {
+    const deletedTodo = await Trash.findOneAndDelete({ _id: todoId, ownerId: userId });
+    const recoveredTodo  = await Todo.create({ ...deletedTodo._doc, todoId: todoId });
+    return recoveredTodo;
+  }
+
+  async destroy({ todoId, userId }) {
+    const deletedTodo = await Trash.findOneAndDelete({ _id: todoId, ownerId: userId });
+    return deletedTodo;
+  }
+}
+
+module.exports = { TrashController: new TrashController() };

src/controller/index.js

@@ -1,7 +1,9 @@
-const { TodoController } = require("./Todo.controller");
 const { UserController } = require("./User.controller");
+const { TodoController } = require("./Todo.controller");
+const { TrashController } = require("./Trash.controller");
 
 module.exports = {
-  TodoController,
   UserController,
+  TodoController,
+  TrashController,
 };

src/models/Trash.model.js

@@ -0,0 +1,38 @@
+const { Mongoose } = require("../db.config");
+const { Schema, model } = Mongoose;
+
+const trashSchema = new Schema(
+  {
+    title: {
+      required: true,
+      type: String,
+      maxlength: 100,
+    },
+    todoId: {
+      type: Schema.Types.ObjectId,
+      ref: "Todo",
+      required: true,
+    },
+    description: {
+      type: String,
+      maxlength: 1500,
+    },
+    ownerId: {
+      type: Schema.Types.ObjectId,
+      ref: "User",
+      required: true,
+    },
+    status: {
+      type: String,
+      enum: ["pending", "progress", "completed"],
+      default: "pending",
+    },
+    createdAt: Date,
+    updatedAt: Date,
+  },
+  { timestamps: true }
+);
+
+const Trash = model("Trash", trashSchema);
+
+module.exports = { Trash };

src/models/index.js

@@ -1,7 +1,9 @@
 const { User } = require("./User.model");
 const { Todo } = require("./Todo.model");
+const { Trash } = require("./Trash.model");
 
 module.exports = {
   User,
   Todo,
+  Trash,
 };

src/routes/index.js

@@ -2,11 +2,13 @@
 const router = require("express").Router();
 const { userRouter } = require("./user.route");
 const { todoRouter } = require("./todo.route");
+const { trashRouter } = require("./trash.route");
 
 const { auth } = require("../middleware");
 
 router.use("/user", userRouter);
 router.use("/todo", auth, todoRouter);
+router.use("/trash", auth, trashRouter);
 
 // export
 module.exports = { router: router };

src/routes/todo.route.js

@@ -18,7 +18,6 @@ router.get(
   asyncTryCatchWrapper(async (req, res) => {
     const { id } = req.params;
     const userId = req.user._id;
-    console.log("userId -> ", userId, " get todo -> ", id);
     const todo = await TodoController.getTodoById({ todoId: id, userId });
     if (!todo) {
       res.status(404).json({ message: "Todo not found" });
@@ -34,17 +33,6 @@ router.post(
     const { body } = req;
     const userId = req.user._id;
     const userName = req.user.name;
-    
-    console.log("user -> ", userName, " created todo -> ", body);
-    // console.log("userId -> ", userId, " created todo -> ", req);
-    // const newtodos = [];
-    // for (let i = 0; i < 1000; i++) {
-    //   const newTodo = { ...body };
-    //   newTodo.ownerId = userId;
-    //   newtodos.push(newTodo);
-    // }
-    // await TodoController.createMany(newtodos);
-    // console.log("thousands of todos created");
     const newTodo = await TodoController.create({ body, userId });
     res.status(201).json(newTodo);
   })

src/routes/trash.route.js

@@ -0,0 +1,59 @@
+const router = require("express").Router();
+const { asyncTryCatchWrapper } = require("../wrapper/async-trycatch");
+const { TrashController } = require("../controller");
+// const { Tools } = require("../utils/tools");
+
+router.get(
+  "/",
+  asyncTryCatchWrapper(async (req, res) => {
+    const { page, limit } = req.query;
+    const userId = req.user._id;
+    const { data, meta } = await TrashController.getTodos({ page, limit, limit: limit }, userId);
+    res.status(200).json({ data, meta });
+  })
+);
+
+router.get(
+  "/:id",
+  asyncTryCatchWrapper(async (req, res) => {
+    const { id } = req.params;
+    const userId = req.user._id;
+    const todo = await TrashController.getTodoById({ todoId: id, userId });
+    if (!todo) {
+      res.status(404).json({ message: "Todo not found" });
+      return;
+    }
+    res.status(200).json(todo);
+  })
+);
+
+router.put(
+  "/:id",
+  asyncTryCatchWrapper(async (req, res) => {
+    const { id } = req.params;
+    const { body } = req;
+    const userId = req.user._id;
+    const updatedTodo = await TrashController.recover({ todoId: id, userId });
+    if (!updatedTodo) {
+      res.status(404).json({ message: "Todo not found" });
+      return;
+    }
+    res.status(200).json(updatedTodo);
+  })
+);
+
+router.delete(
+  "/:id",
+  asyncTryCatchWrapper(async (req, res) => {
+    const { id } = req.params;
+    const userId = req.user._id;
+    const deletedTodo = await TrashController.destroy({ todoId: id, userId });
+    if (!deletedTodo) {
+      res.status(404).json({ message: "Todo not found" });
+      return;
+    }
+    res.status(200).json(deletedTodo);
+  })
+);
+
+module.exports = { trashRouter: router };