Merge pull request #251 from sebgroup/develop

next release

Author: eweseong

src/isDateAfter/isDateAfter.test.ts

@@ -22,7 +22,7 @@ describe("Util: isDateAfter", () => {
         },
         {
             statement: "Should return true if date1 is after date2",
-            date1: new Date("2019-12-11"),
+            date1: new Date("2019-12-01"),
             date2: new Date("2019-11-11"),
             result: true,
         },
@@ -39,7 +39,8 @@ describe("Util: isDateAfter", () => {
             result: false,
         },
         {
-            statement: "Should ignore the time and return false if the two dates are equal",
+            statement:
+                "Should ignore the time and return false if the two dates are equal",
             date1: new Date("2019-11-11 23:00:00"),
             date2: new Date("2019-11-11 11:00:00"),
             result: false,

src/isDateAfter/isDateAfter.ts

@@ -7,9 +7,9 @@ import { isValidDate } from "../isValidDate";
  * @returns {boolean} True if date `a` comes after than date `b`
  */
 export function isDateAfter(a: Date, b: Date): boolean {
-    if (!isValidDate(a) || !isValidDate(b)) {
-        return a > b;
-    } else {
+    if (isValidDate(a) && isValidDate(b)) {
         return a.setHours(0, 0, 0).valueOf() > b.setHours(0, 0, 0).valueOf();
     }
+
+    return a > b;
 }

src/isDateBefore/isDateBefore.test.ts

@@ -28,8 +28,8 @@ describe("Util: isDateBefore", () => {
         },
         {
             statement: "Should return false if date1 is not before date2",
-            date1: new Date("2020-12-28"),
-            date2: new Date("2020-12-25"),
+            date1: new Date("2023-03-04"),
+            date2: new Date("2023-02-15"),
             result: false,
         },
         {

src/isDateBefore/isDateBefore.ts

@@ -7,13 +7,9 @@ import { isValidDate } from "../isValidDate";
  * @returns {boolean} True if date `a` comes before date `b`
  */
 export function isDateBefore(a: Date, b: Date): boolean {
-    if (!isValidDate(a) || !isValidDate(b)) {
-        return a < b;
-    } else {
-        return (
-            a.getFullYear() < b.getFullYear() ||
-            a.getMonth() < b.getMonth() ||
-            a.getDate() < b.getDate()
-        );
+    if (isValidDate(a) && isValidDate(b)) {
+        return a.setHours(0, 0, 0).valueOf() < b.setHours(0, 0, 0).valueOf();
     }
+
+    return a < b;
 }