Commit c4f612bd authored by =sankoju Ravi's avatar =sankoju Ravi

getActivities changes

parent 28d6db83
...@@ -251,7 +251,7 @@ const calculateAverage = async(query) => { ...@@ -251,7 +251,7 @@ const calculateAverage = async(query) => {
*/ */
app.post("/getActivities", async(req, res) => { app.post("/getActivities", async(req, res) => {
let { empId,today } = req.body; let { empId,today,types } = req.body;
if (!empId || typeof empId == "string") { if (!empId || typeof empId == "string") {
res.status(401).json({ message: "Employee id is missing / EmpId should be string only" }); res.status(401).json({ message: "Employee id is missing / EmpId should be string only" });
return; return;
...@@ -262,6 +262,8 @@ app.post("/getActivities", async(req, res) => { ...@@ -262,6 +262,8 @@ app.post("/getActivities", async(req, res) => {
//let query = { empId: empId}; //let query = { empId: empId};
let aggreGate = [ { $match:{empId: empId} } ]; let aggreGate = [ { $match:{empId: empId} } ];
let fromDate = moment().subtract(90, "days").toDate(); let fromDate = moment().subtract(90, "days").toDate();
let toDate = moment().toDate() let toDate = moment().toDate()
...@@ -274,9 +276,13 @@ app.post("/getActivities", async(req, res) => { ...@@ -274,9 +276,13 @@ app.post("/getActivities", async(req, res) => {
toDate.setMinutes(59); toDate.setMinutes(59);
toDate.setSeconds(59); toDate.setSeconds(59);
// query["activities.recorded_date"] = {$gte: new Date(fromDate),$lte: new Date(toDate) }; // query["activities.recorded_date"] = {$gte: new Date(fromDate),$lte: new Date(toDate) };
aggreGate.push({$match:{"activities.recorded_date": {$gte: new Date(fromDate),$lte: new Date(toDate) } } }); aggreGate.push({$match:{"activities.recorded_date": {$gte: new Date(fromDate),$lte: new Date(toDate) } } });
aggreGate.push({$unwind:"$activities" }); aggreGate.push({$unwind:"$activities" });
aggreGate.push({ $sort: { "activities.recorded_date": -1 } }); aggreGate.push({ $sort: { "activities.recorded_date": -1 } });
if(types && types?.length)
aggreGate.push({$match:{"activities.type": {"$in":types} } });
console.log(JSON.stringify(aggreGate));
let facet = { let facet = {
data: [{ $skip: skip }, { $limit: limit }], data: [{ $skip: skip }, { $limit: limit }],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment