Merge pull request #729 from elmadev/feature/cups-start-end

feat(cups): add start and end time to /cups response
elmadev · Jan 4, 2025 · c170bf4 · c170bf4
2 parents c72e2d0 + 9c7cf17
commit c170bf4
Showing 1 changed file with 21 additions and 1 deletion.
diff --git a/src/api/cups.js b/src/api/cups.js
@@ -27,6 +27,22 @@ const router = express.Router();
 const getCups = async (ongoing = false) => {
   const query = {
     where: { Hidden: 0 },
+    attributes: {
+      include: [
+        [
+          sequelize.literal(
+            '(SELECT MIN(StartTime) FROM sitecup WHERE sitecup.CupGroupIndex = sitecupgroup.CupGroupIndex)',
+          ),
+          'StartTime',
+        ],
+        [
+          sequelize.literal(
+            '(SELECT MAX(EndTime) FROM sitecup WHERE sitecup.CupGroupIndex = sitecupgroup.CupGroupIndex)',
+          ),
+          'EndTime',
+        ],
+      ],
+    },
   };
   if (ongoing) {
     query.where.Finished = 0;
@@ -62,7 +78,11 @@ const getCups = async (ongoing = false) => {
     ];
   }
   const data = await SiteCupGroup.findAll(query);
-  return data;
+  return data.map(cup => ({
+    ...cup.dataValues,
+    StartTime: moment(cup.dataValues.StartTime).format('X'),
+    EndTime: moment(cup.dataValues.EndTime).format('X'),
+  }));
 };
 
 const getCupById = async CupGroupIndex => {