Checkpoint: pouring web into main

back-end/controllers/chartController.js

@@ -0,0 +1,167 @@
+const asyncHandler = require("express-async-handler");
+const UnitM = require("../models/unitModel");
+const Chart = require("../models/chartModel");
+
+//@description     Get organizational chart as array list
+//@route           GET /api/chart
+//@access          Protected
+const getChart = asyncHandler(async (req, res) => {
+  const currentUser = req.user;
+  const currentUnit = await UnitM.findOne({ _id: currentUser.Unit });
+
+  if (!currentUnit) {
+    res.status(400);
+    throw new Error('사용자의 부대가 설정되지 않았습니다.');
+  }
+
+  const unitOrganization = await Chart.find({ Unit: { $eq: currentUnit.Unitname } });
+  if (unitOrganization.length === 0) {
+    await Chart.create({
+      Avatar: currentUser.pic,
+      Name: currentUser.Name,
+      Rank: currentUser.Rank,
+      Unit: currentUnit.Unitname
+    })
+  }
+  res.send(unitOrganization);
+});
+
+//@description     Add organizational chart
+//@route           POST /api/chart/add
+//@access          Protected
+const addChart = asyncHandler(async (req, res) => {
+  const {
+    Avatar,
+    Name,
+    Rank,
+    Unit,
+    Position,
+    DoDID,
+    Number,
+    MilNumber,
+    Email,
+    Parent
+  } = req.body;
+
+  if (!Name || !Rank || !Unit) {
+    res.status(400);
+    throw new Error("모든 정보를 입력하세요.");
+  }
+
+  const newChart = await Chart.create({
+    Avatar,
+    Name,
+    Rank,
+    Unit,
+    Position,
+    DoDID,
+    Number,
+    MilNumber,
+    Email,
+    Parent,
+  });
+
+  if (newChart) {
+    res.status(201).json({
+      _id: newChart._id,
+      Avatar,
+      Name,
+      Rank,
+      Unit,
+      Position,
+      DoDID,
+      Number,
+      MilNumber,
+      Email,
+      Parent: Parent ?? null,
+    })
+  }
+  else {
+    res.send(400);
+    throw new Error('조직도를 추가/수정할 수 없습니다.')
+  }
+});
+
+//@description     Edit organizational chart
+//@route           POST /api/chart/edit
+//@access          Protected
+const editChart = asyncHandler(async (req, res) => {
+  const {
+    _id,
+    Avatar,
+    Name,
+    Rank,
+    Unit,
+    Position,
+    DoDID,
+    Number,
+    MilNumber,
+    Email,
+    Parent
+  } = req.body;
+
+  if (!_id || !Name || !Rank || !Unit) {
+    res.status(400);
+    throw new Error("모든 정보를 입력하세요.");
+  }
+
+  const updatedChart = await Chart.findByIdAndUpdate(_id, {
+    Avatar,
+    Name,
+    Rank,
+    Position,
+    DoDID,
+    Number,
+    MilNumber,
+    Email,
+    Parent,
+    Unit
+  });
+
+  if (updatedChart) {
+    res.status(200).json({
+      Avatar,
+      Name,
+      Rank,
+      Position,
+      DoDID,
+      Number,
+      MilNumber,
+      Email,
+      Parent,
+      Unit
+    })
+  }
+  else {
+    res.send(400);
+    throw new Error('조직도를 추가/수정할 수 없습니다.')
+  }
+});
+
+//@description     Delete organizational chart
+//@route           POST /api/chart/delete
+//@access          Protected
+const deleteChart = asyncHandler(async (req, res) => {
+  const { _id } = req.body;
+
+  if (!_id) {
+    res.status(400);
+    throw new Error("모든 정보를 입력하세요.");
+  }
+
+  const deleteChart = await Chart.findByIdAndDelete(_id);
+  if (deleteChart) {
+    res.send(200);
+  }
+  else {
+    res.send(400);
+    throw new Error('조직도를 추가/수정할 수 없습니다.')
+  }
+});
+
+module.exports = {
+  getChart,
+  addChart,
+  editChart,
+  deleteChart
+};

back-end/controllers/commentControllers.js

@@ -6,11 +6,7 @@ const ReportM = require("../models/reportModel");
 //@route           POST /api/comment
 //@access          Protected
 const addComment = asyncHandler(async (req, res) => {
-  const {
-    Type,
-    Content,
-    Title
-  } = req.body;
+  const { Type, Content, Title } = req.body;
 
   if (!Type || !Content || !Title) {
     res.status(400);
@@ -19,26 +15,30 @@ const addComment = asyncHandler(async (req, res) => {
 
   User = req.user._id;
 
-  report = await Report.find({ Title: { $eq: keyword }}).find({Unit: {$eq: req.user.Unit}});
+  report = await Report.find({ Title: { $eq: keyword } }).find({
+    Unit: { $eq: req.user.Unit },
+  });
 
   Report = report._id;
 
   const comment = await Comment.create({
     User,
     Type,
     Content,
-    report
+    report,
   });
 
   const editReport = await ReportM.findByIdAndUpdate(
-    report._id, {
+    report._id,
+    {
       $push: {
-        Comments: comment
+        Comments: comment,
       },
-    }, {
+    },
+    {
       new: true,
     }
-  )
+  );
 
   if (editReport && editUnit && editUser) {
     res.status(201).send(comment);
@@ -49,5 +49,5 @@ const addComment = asyncHandler(async (req, res) => {
 });
 
 module.exports = {
-  addComment
+  addComment,
 };

back-end/controllers/reportControllers.js

@@ -2,9 +2,17 @@ const asyncHandler = require("express-async-handler");
 const Report = require("../models/reportModel");
 const Reportsys = require("../models/reportModel");
 const UnitM = require("../models/unitModel");
-const UserM = require("../models/unitModel");
+const UserM = require("../models/userModel");
 const getScore = require('../ai/classifier.js')
-var mongoose = require('mongoose');
+
+//@description     Get all report cards
+//@route           GET /api/report
+//@access          Protected
+const getReportCard = asyncHandler(async (req, res) => {
+
+  let reportCards = await Report.find({});
+  res.send(reportCards);
+});
 
 //@description     Create new report card
 //@route           POST /api/report
@@ -15,49 +23,53 @@ const addReportCard = asyncHandler(async (req, res) => {
     ReportingSystem,
     Invited,
     Content,
-    Title
+    Title,
   } = req.body;
 
   if (!Type || !ReportingSystem || !Invited || !Content || !Title) {
     res.status(400);
     throw new Error("모든 정보를 입력하세요.");
   }
 
-  User = req.user._id
-  Unit = req.user.Unit._id;
-  Severity = await getScore(Content)
+  const currentUser = req.user;
+  let currentUnit = currentUser.Unit;
+  let Severity = await getScore(Content);
   const report = await Report.create({
-    User,
+    User: currentUser,
     Type,
     ReportingSystem,
     Invited,
     Content,
     Title,
     Severity,
-    Unit
+    Unit: currentUnit
   });
 
+
+  res.status(201).send(report);
+  return;
+
   const editUnit = await UnitM.findByIdAndUpdate(
-    Unit, {
-      $push: {
-        reportCards: report._id
-      },
-    }, {
-      new: true,
-    }
+    UnitId, {
+    $push: {
+      reportCards: report._id
+    },
+  }, {
+    new: true,
+  }
   )
 
   const editUser = await UserM.findByIdAndUpdate(
-    req.user._id, {
-      $push: {
-        myReportCards: report._id
-      },
-    }, {
-      new: true,
-    }
+    UserId, {
+    $push: {
+      myReportCards: report._id
+    },
+  }, {
+    new: true,
+  }
   )
 
-  if (editReport && editUnit && editUser) {
+  if (editUnit && editUser) {
     res.status(201).send(report);
   } else {
     res.status(400);
@@ -66,5 +78,6 @@ const addReportCard = asyncHandler(async (req, res) => {
 });
 
 module.exports = {
-  addReportCard
+  addReportCard,
+  getReportCard
 };

back-end/controllers/unitControllers.js

@@ -2,6 +2,18 @@ const asyncHandler = require("express-async-handler");
 const User = require("../models/userModel");
 const Unit = require("../models/unitModel");
 
+//@description    GET new unit
+//@route          GET /api/unit/get
+//@access         Protected
+const getUnit = asyncHandler(async (req, res) => {
+  const keyword = req.query.search
+  if (keyword) {
+    res.send(await Unit.find({ _id: { $eq: keyword }})); //.find({ _id: { $ne: req.user._id } }));
+  } else {
+    res.status(400);
+    throw new Error("잘못된 요청입니다.");
+  }
+})
 //@description     Add new unit
 //@route           POST /api/unit
 //@access          Protected
@@ -129,6 +141,7 @@ const updateLogo = asyncHandler(async (req, res) => {
 });
 
 module.exports = {
+  getUnit,
   updateUnit,
   updateLogo,
   addUnit