Merge pull request #12 from Doist/luke/exclude-weekends-when-checking…

…-staleness fix: Exclude Weekends When Checking Deadline
Doist · Feb 3, 2025 · bdd1fa7 · bdd1fa7
2 parents c871d70 + 8b9a4f3
commit bdd1fa7
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 5 deletions.
diff --git a/.github/workflows/check-dist.yml b/.github/workflows/check-dist.yml
@@ -45,8 +45,8 @@ jobs:
           fi
         id: diff
 
-      # If index.js was different than expected, upload the expected version as an artifact
-      - uses: actions/upload-artifact@v2
+      # If index.js was different then expected, upload the expected version as an artifact
+      - uses: actions/upload-artifact@v4
         if: ${{ failure() && steps.diff.conclusion == 'failure' }}
         with:
           name: dist

diff --git a/dist/index.js b/dist/index.js
@@ -9795,6 +9795,8 @@ function getLatestCreatedAtTime(nodes) {
  * based on the time between when the review was requested, and whether
  * there has been any review activity since then.
  *
+ * Only counts weekdays, excludes weekends when checking if 24 hours have passed.
+ *
  * @param reviewRequestTime The latest time the creator requested a person review the PR
  * @param reviewTime The latest time the PR was reviewed
  * @param reviewDeadline The total time in ms before a PR is considered stale
@@ -9806,7 +9808,12 @@ function isAfterReviewDeadline(reviewRequestTime, reviewTime, reviewDeadline) {
         return false;
     }
     const now = new Date().getTime();
-    if (now - reviewRequestTime < reviewDeadline) {
+    let adjustedReviewDeadline = reviewDeadline;
+    if (isWeekend(new Date(reviewRequestTime + reviewDeadline))) {
+        // Push the deadline past the weekend (shift forward by 2 days)
+        adjustedReviewDeadline = reviewDeadline + 172800000;
+    }
+    if (now - reviewRequestTime < adjustedReviewDeadline) {
         // There is still time for review.
         return false;
     }
@@ -9819,6 +9826,9 @@ function isAfterReviewDeadline(reviewRequestTime, reviewTime, reviewDeadline) {
 function splitStringList(input) {
     return input.split(',').map((item) => item.trim());
 }
+function isWeekend(date) {
+    return date.getDay() % 6 === 0;
+}
 
 
 /***/ }),

diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/pullrequest.ts b/src/pullrequest.ts
@@ -174,6 +174,8 @@ function getLatestCreatedAtTime(nodes: GraphQlNode[]): number | undefined {
  * based on the time between when the review was requested, and whether
  * there has been any review activity since then.
  *
+ * Only counts weekdays, excludes weekends when checking if 24 hours have passed.
+ *
  * @param reviewRequestTime The latest time the creator requested a person review the PR
  * @param reviewTime The latest time the PR was reviewed
  * @param reviewDeadline The total time in ms before a PR is considered stale
@@ -189,7 +191,14 @@ function isAfterReviewDeadline(
         return false
     }
     const now = new Date().getTime()
-    if (now - reviewRequestTime < reviewDeadline) {
+
+    let adjustedReviewDeadline = reviewDeadline
+    if (isWeekend(new Date(reviewRequestTime + reviewDeadline))) {
+        // Push the deadline past the weekend (shift forward by 2 days)
+        adjustedReviewDeadline = reviewDeadline + 172800000
+    }
+
+    if (now - reviewRequestTime < adjustedReviewDeadline) {
         // There is still time for review.
         return false
     }
@@ -204,3 +213,7 @@ function isAfterReviewDeadline(
 function splitStringList(input: string): Array<string> {
     return input.split(',').map((item) => item.trim())
 }
+
+function isWeekend(date: Date): boolean {
+    return date.getDay() % 6 === 0
+}