award

server/controllers/GPS.Award.js

@@ -7,8 +7,8 @@ const Award = require('../models/GPS.Award');
 module.exports.createAward = [
     [
         body('score').notEmpty().isInt().withMessage(_sr.fa.required.field),
-        body('title').notEmpty().isString().withMessage(_sr.fa.required.field),
-        body('desc').notEmpty().isString().withMessage(_sr.fa.required.field),
+        body('title').notEmpty().isString().withMessage(_sr.fa.required.title),
+        body('desc').notEmpty().isString().withMessage(_sr.fa.required.description),
         body('expireDate').notEmpty().withMessage(_sr.fa.required.field),
     ],
     checkValidations(validationResult),
@@ -16,12 +16,11 @@ module.exports.createAward = [
         const { score, title, desc, expireDate } = req.body;
         const fixDate = new Date(expireDate)
         const award = await Award.create({ score, title, desc, expireDate:fixDate })
-        // res.status(201).json({
-        //     msg: _sr.fa.response.success_save,
-        //     data: award
-        // })
-        res.status(201).json(award)
-
+        res.status(201).json({
+            msg: _sr.fa.response.success_save,
+            data: award
+        })
+  
 
     }
 ]
@@ -29,12 +28,12 @@ module.exports.createAward = [
 
 module.exports.findAllUser = async (req, res) => {
     const toDay = new Date()
-    const data = await Award.find({expireDate: {$gt: toDay}})
+    const data = await Award.find({expireDate: {$gt: toDay}, isDeleted:false})
     res.status(200).json(data)
 }
 
 module.exports.findAllAdmin = async (req, res) => {
-    const data = await Award.find({})
+    const data = await Award.find({isDeleted:false})
     res.status(200).json(data)
 }
 
@@ -58,8 +57,8 @@ module.exports.update =[
     [
         param('id').notEmpty().isMongoId().withMessage('ایدی را وارد یا تصحیح کنید'),
         body('score').notEmpty().isInt().withMessage(_sr.fa.required.field),
-        body('title').notEmpty().isString().withMessage(_sr.fa.required.field),
-        body('desc').notEmpty().isString().withMessage(_sr.fa.required.field),
+        body('title').notEmpty().isString().withMessage(_sr.fa.required.title),
+        body('desc').notEmpty().isString().withMessage(_sr.fa.required.description),
         body('expireDate').notEmpty().withMessage(_sr.fa.required.field),
     ],
     checkValidations(validationResult),
@@ -74,11 +73,11 @@ module.exports.update =[
             data.desc = desc;
             data.expireDate = new Date(expireDate)
             data.save()
-            // res.status(200).json({
-            //     msg: _sr.fa.response.success_save,
-            //     data
-            // })
-            res.status(200).json(data)
+            res.status(200).json({
+                msg: _sr.fa.response.success_save,
+                data
+            })
+    
 
         }
 
@@ -86,3 +85,26 @@ module.exports.update =[
 ]
 
 
+module.exports.delete=[
+    [
+        param('id').notEmpty().isMongoId().withMessage('ایدی را وارد یا تصحیح کنید'),
+    ],
+    checkValidations(validationResult),
+    async (req, res) => {
+        const data = await Award.findById(req.params.id)
+        if (!data) {
+            res.status(404).json({ msg: _sr.fa.not_found.item_id })
+        } else {
+            data.isDeleted = true;
+            data.expireDate = Date.now()
+            data.save()
+            res.status(200).json({
+                msg: _sr.fa.response.success_remove,
+                
+            })
+    
+
+        }
+
+    }
+]

server/models/GPS.Award.js

@@ -5,7 +5,11 @@ const AwairdSchema = mongoose.Schema({
     score:Number,
     title:String,
     desc:String,
-    expireDate:Date
+    expireDate:Date,
+    isDeleted:{
+        type:Boolean,
+        default:false
+    }
 
 })
 

server/routes/admin.js

@@ -54,6 +54,7 @@ router.post('/gps/award',hasPermission('gps'), award.createAward)
 router.get('/gps/award',hasPermission('gps'), award.findAllAdmin)
 router.get('/gps/award/:id',hasPermission('gps'), award.findOne)
 router.put('/gps/award/:id',hasPermission('gps'), award.update)
+router.delete('/gps/award/:id',hasPermission('gps'), award.delete)
 
 /// ////////////// Award request
 router.get('/gps/award-request',hasPermission('gps'), awardRequest.findAllAdmin)