Merge branch 'master' into feature/#3

Author: rkdgml3577

index.js

@@ -23,9 +23,8 @@ app.use(bodyParser.urlencoded({ extended: true }));
 
 mongoose
   .connect(
-    // "mongodb+srv://parkracoon:[email protected]/?retryWrites=true&w=majority"
-     "mongodb+srv://rkdgml:[email protected]/?retryWrites=true&w=majority"
-
+    "mongodb+srv://parkracoon:[email protected]/?retryWrites=true&w=majority"
+    //  "mongodb+srv://rkdgml:[email protected]/?retryWrites=true&w=majority"
   )
   .then(() => console.log("MongoDB Connected..."))
   .catch((err) => console.log(err));

models/Marker.js

@@ -15,9 +15,14 @@ const MarkerSchema = mongoose.Schema(
     latitude: {
       type: String,
     },
+
     type : {
 
     }
+    // isSmoking: {
+    //   type: Boolean,
+    // },
+
   },
 );
 

models/User.js

@@ -20,6 +20,9 @@ const userSchema = mongoose.Schema({
     tokenExp :{
         type: Number
     },
+    isAdmin: {
+        type: Boolean
+    },
     // user token 생성
     isAdmin : {
         type : Number,

routes/marker.js

@@ -13,4 +13,29 @@ const data = JSON.parse(fs.readFileSync("data\\non-smoking.json", "utf8"));
 // }
 // addMarker();
 
+router.get("/map/MarkerList", (req, res) => {
+  Marker.find({})
+    .exec((err, marker) => {
+      if (err) return res.json(err);
+      return res.status(200).send({ marker: marker });
+    });
+});
+
+//마커 삭제
+router.delete("/map/:id", (req, res)=>{
+  Marker.deleteOne({_id: req.params.id}, (req, res)=>{
+    if(err) return res.json(err);
+  })
+})
+
+//마커 수정
+router.patch("/map/:id", (req, res) => {
+  req.body.updateAt = Date.now();
+  Marker.findOneAndUpdate({ _id: req.params.id }, req.body, (err, comment) => {
+    if (err) return res.json(err);
+
+    return res.status(200).send({ comment: comment });
+  });
+});
+
 module.exports = router;