JessicaH- merged dayUtil into dateUtil and added tests for calculateDays

ucsb-cs156-s23 · Jun 3, 2023 · abfc085 · abfc085
1 parent 92eff30
commit abfc085
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 12 deletions.
diff --git a/frontend/src/main/components/Commons/CommonsOverview.js b/frontend/src/main/components/Commons/CommonsOverview.js
@@ -2,7 +2,7 @@ import React from "react";
 import { Row, Card, Col, Button } from "react-bootstrap";
 import { useNavigate } from "react-router-dom";
 import { hasRole } from "main/utils/currentUser";
-import { calculateDays } from "main/utils/dayUtils";
+import { calculateDays } from "main/utils/dateUtils";
 
 export default function CommonsOverview({ commons, currentUser }) {
 
@@ -11,8 +11,8 @@ export default function CommonsOverview({ commons, currentUser }) {
     const leaderboardButtonClick = () => { navigate("/leaderboard/" + commons.id) };
     const showLeaderboard = (hasRole(currentUser, "ROLE_ADMIN") || commons.showLeaderboard );
 
-    //const startingDate = commons.startingDate;
-    commons.day = calculateDays(commons.startingDate);
+    const today = new Date();
+    commons.day = calculateDays(commons.startingDate,today);
 
     return (
         <Card data-testid="CommonsOverview">

diff --git a/frontend/src/main/utils/dateUtils.js b/frontend/src/main/utils/dateUtils.js
@@ -6,4 +6,13 @@ const timestampToDate = (timestamp) => {
     return (date.getFullYear() + "-" + (padWithZero(date.getMonth()+1)) + "-" + padWithZero(date.getDate()));
 }
 
-export {timestampToDate, padWithZero};
+
+const calculateDays = (startingDate,currentDate) => {
+    const start = new Date(startingDate);
+    const today = new Date(currentDate);
+    const timeDifference = today.getTime() - start.getTime();
+    const days = Math.floor(timeDifference / (1000 * 3600 * 24));
+    return days;
+  }
+
+export {timestampToDate, padWithZero, calculateDays};
diff --git a/frontend/src/main/utils/dayUtils.js b/frontend/src/main/utils/dayUtils.js
diff --git a/frontend/src/tests/utils/dateUtils.test.js b/frontend/src/tests/utils/dateUtils.test.js
@@ -1,4 +1,4 @@
-import { padWithZero, timestampToDate } from "main/utils/dateUtils";
+import { padWithZero, timestampToDate, calculateDays} from "main/utils/dateUtils";
 
 
 describe("dateUtils tests", () => {
@@ -25,4 +25,13 @@ describe("dateUtils tests", () => {
     });
   });
 
+  describe("calculateDays tests", () => {
+    test("with mock current date 2023-06-01T00:00:00", () => {
+      const startingDate = "2023-05-01T00:00:00";
+      const currentDate = "2023-06-01T00:00:00";
+      expect(calculateDays(startingDate,currentDate)).toBe(31);
+
+    });
+  });
+
 });