Merge pull request #35 from Dmaul0906/dimas

membuat table activity dan juga menambahkan logic

Author: GanXx8

server/Routers/activity.js

@@ -6,7 +6,13 @@ const auth = require("../middlewares/authentication");
 
 // activity.post("/todos", activityController.addTodo);
 // activity.get("/todos", activityController.allTodo);
-activity.post("/subject", auth, activityController.update);
+activity.post("/subject", auth, activityController.subject);
+activity.post("/upcomingexam", auth, activityController.upcomingexam);
+activity.post("/seminar", auth, activityController.seminar);
+activity.post("/workshop", auth, activityController.workshop);
+activity.post("/competition", auth, activityController.competition);
+
+activity.get("/subject", auth, activityController.subjectGet);
 // activity.delete("/todos", activityController.deleteTodo);
 
 module.exports = activity;

server/Routers/user.js

@@ -33,9 +33,8 @@ const upload = multer({
 user.post("/users/register", userController.reg);
 user.post("/users/login", userController.log);
 user.post("/users/update", auth, userController.update);
-user.patch("/users/upload", upload.single("picture"), (req, res) => {
+user.patch("/users/upload", auth, upload.single("picture"), (req, res) => {
   let finalUrlImage = "http://localhost:8888" + "/upload/" + req.file.filename;
-
   res.status(200).json({
     status: "success",
     image: finalUrlImage,

server/controllers/activity.js

@@ -3,7 +3,7 @@
 const userModel = require("../models/user");
 
 class activity {
-  static update = async (req, res, next) => {
+  static subject = async (req, res, next) => {
     try {
       const currentUser = req.currentUser;
       const subject = req.body;
@@ -25,6 +25,115 @@ class activity {
       next(error);
     }
   };
+
+  static subjectGet = async (req, res, next) => {
+    try {
+      const currentUser = req.currentUser;
+
+      const user = await userModel.findOne({ _id: currentUser._id });
+
+      if (!user) {
+        next({ code: 404, message: "User Not Found" });
+        return;
+      }
+
+      res.status(200).json({ data: user.activity.subject });
+    } catch (error) {
+      next(error);
+    }
+  };
+
+  static upcomingexam = async (req, res, next) => {
+    try {
+      const currentUser = req.currentUser;
+      const exams = req.body;
+
+      const user = await userModel.findOne({ _id: currentUser._id });
+
+      if (!user) {
+        next({ code: 404, message: "User Not Found" });
+        return;
+      }
+
+      const update = await userModel.updateOne(
+        { _id: currentUser._id },
+        { $set: { "activity.upcomingexam": exams } }
+      );
+
+      res.status(200).json({ update });
+    } catch (error) {
+      next(error);
+    }
+  };
+
+  static seminar = async (req, res, next) => {
+    try {
+      const currentUser = req.currentUser;
+      const seminars = req.body;
+
+      const user = await userModel.findOne({ _id: currentUser._id });
+
+      if (!user) {
+        next({ code: 404, message: "User Not Found" });
+        return;
+      }
+
+      const update = await userModel.updateOne(
+        { _id: currentUser._id },
+        { $set: { "activity.seminar": seminars } }
+      );
+
+      res.status(200).json({ update });
+    } catch (error) {
+      next(error);
+    }
+  };
+
+  static workshop = async (req, res, next) => {
+    try {
+      const currentUser = req.currentUser;
+      const workshops = req.body;
+
+      const user = await userModel.findOne({ _id: currentUser._id });
+
+      if (!user) {
+        next({ code: 404, message: "User Not Found" });
+        return;
+      }
+
+      const update = await userModel.updateOne(
+        { _id: currentUser._id },
+        { $set: { "activity.workshop": workshops } }
+      );
+
+      res.status(200).json({ update });
+    } catch (error) {
+      next(error);
+    }
+  };
+
+  static competition = async (req, res, next) => {
+    try {
+      const currentUser = req.currentUser;
+      const competitions = req.body;
+
+      const user = await userModel.findOne({ _id: currentUser._id });
+
+      if (!user) {
+        next({ code: 404, message: "User Not Found" });
+        return;
+      }
+
+      const update = await userModel.updateOne(
+        { _id: currentUser._id },
+        { $set: { "activity.competition": competitions } }
+      );
+
+      res.status(200).json({ update });
+    } catch (error) {
+      next(error);
+    }
+  };
 }
 
 module.exports = activity;

server/controllers/user.js

@@ -98,7 +98,6 @@ class userController {
     try {
       const { token } = req.body;
       const data = jwt.verify(token, process.env.SECREAT_KEY);
-      console.log(data);
       const user = await user.findOne({ _id: data.id });
 
       if (!user) {
@@ -119,19 +118,15 @@ class userController {
 
   static update = async (req, res, next) => {
     try {
-      console.log("masuk update controller");
       const currentUser = req.currentUser;
       const { fullName, age, website, intro } = req.body;
 
       const user = await user.findOne({ _id: currentUser._id });
-      console.log("kecari ga??");
 
       if (!user) {
         next({ code: 404, message: "User not found" });
         return;
       }
-
-      console.log("berhasil masuk sini");
     } catch (error) {
       next(error);
     }