Merge pull request #634 from elmadev/metsavir-stats-date-filter

Add time filter to getLevelStatsForPlayer

package.json

@@ -39,9 +39,10 @@
     "sib-api-v3-sdk": "^8.4.2"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.19.1",
+    "@babel/core": "^7.23.3",
+    "@babel/eslint-parser": "^7.23.3",
     "@babel/plugin-syntax-import-assertions": "^7.20.0",
-    "eslint": "latest",
+    "eslint": "^8.54.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
     "nodemon": "^2.0.19",

src/api/level.js

@@ -5,6 +5,7 @@ import { has } from 'lodash-es';
 import { getLevel as getLevelSecure } from '#utils/download';
 import { Level, Time, LevelStats, Battle } from '../data/models';
 import connection from '../data/sequelize';
+import { fromToTime } from '#utils/database';
 
 const router = express.Router();
 
@@ -79,7 +80,7 @@ const getLevelData = async LevelIndex => {
   }
 };
 
-const getLevelStatsForPlayer = async (LevelIndex, KuskiIndex) => {
+const getLevelStatsForPlayer = async (LevelIndex, KuskiIndex, from, to) => {
   const stats = await Time.findAll({
     group: ['Finished'],
     attributes: [
@@ -89,7 +90,7 @@ const getLevelStatsForPlayer = async (LevelIndex, KuskiIndex) => {
       [sequelize.fn('min', sequelize.col('Driven')), 'FirstPlayed'],
       [sequelize.fn('max', sequelize.col('Driven')), 'LastPlayed'],
     ],
-    where: { LevelIndex, KuskiIndex },
+    where: { LevelIndex, KuskiIndex, ...fromToTime(from, to, 'Driven') },
   });
 
   return stats;
@@ -164,7 +165,12 @@ router.get('/timestats/:LevelIndex', async (req, res) => {
     KuskiIndex = auth.userid;
   }
 
-  const data = await getLevelStatsForPlayer(req.params.LevelIndex, KuskiIndex);
+  const data = await getLevelStatsForPlayer(
+    req.params.LevelIndex,
+    KuskiIndex,
+    req.query.from,
+    req.query.to,
+  );
   res.json(data);
 });
 

src/utils/database.js

@@ -107,3 +107,21 @@ export const fromTo = (from, to, column) => {
   }
   return where;
 };
+
+export const fromToTime = (from, to, column) => {
+  const where = {};
+  if (from && to) {
+    where[column] = {
+      [Op.between]: [from, to],
+    };
+  } else if (from) {
+    where[column] = {
+      [Op.gte]: from,
+    };
+  } else if (to) {
+    where[column] = {
+      [Op.lte]: to,
+    };
+  }
+  return where;
+};