Update awards endpoint data and fix reset pass bug

server/controllers/GPS.Award.js

@@ -2,6 +2,7 @@ const { body, validationResult, param } = require('express-validator');
 const { _sr } = require('../plugins/serverResponses');
 const { checkValidations } = require('../plugins/controllersHelperFunctions');
 const Award = require('../models/GPS.Award');
+const AwardRequest = require('../models/GPS.AwardRequest');
 
 
 module.exports.createAward = [
@@ -28,8 +29,41 @@ module.exports.createAward = [
 
 module.exports.findAllUser = async (req, res) => {
     const toDay = new Date()
-    const data = await Award.find({expireDate: {$gt: toDay}, isDeleted:false})
-    res.status(200).json(data)
+    const awards = await Award.find({expireDate: {$gt: toDay}, isDeleted:false})
+    const awardsReq = await AwardRequest.find({userId:req.user_id}).populate('awardId','-created_at -updated_at')
+    // eslint-disable-next-line array-callback-return
+    const d = awards.map((award) => {
+
+        // eslint-disable-next-line eqeqeq
+        const h = awardsReq.filter(awardReq => awardReq.awardId.id == award.id);
+
+        console.log(award);
+
+        if (h.length) {
+            return {
+                score:award.score,
+                title:award.title,
+                desc:award.desc,
+                expireDate:award.expireDate,
+                req: {
+                    desc: h[0].desc,
+                    metaData: h[0].metaData,
+                    status: h[0].status,
+                },
+                status: 1
+            };
+        } else {
+            return {
+                score:award.score,
+                title:award.title,
+                desc:award.desc,
+                expireDate:award.expireDate,
+                status: 0
+            };
+        }
+    })
+
+    res.status(200).json(d)
 }
 
 module.exports.findAllAdmin = async (req, res) => {