Fix currentDate time zone issue

__tests__/main.test.ts

@@ -1,36 +1,36 @@
-import {isInDowntime} from '../src/check'
+import {isInDowntime, getUTCAdjustments} from '../src/check'
 
 describe('isInDowntime should', () => {
   const currentDate = new Date(Date.UTC(2021, 1, 13, 12, 53))
-  const tz = 3.5
+  const utcAdjustments = getUTCAdjustments(3.5)
 
   test('return false when no downtime is provided', () => {
-    expect(isInDowntime(currentDate, tz)).toBe(false)
+    expect(isInDowntime(currentDate, utcAdjustments)).toBe(false)
   })
 
   test('throw error when downtime does not match pattern', () => {
-    expect(() => isInDowntime(currentDate, tz, '6:00-7:00')).toThrow(
-      'Invalid downtime'
-    )
+    expect(() =>
+      isInDowntime(currentDate, utcAdjustments, '6:00-7:00')
+    ).toThrow('Invalid downtime')
   })
 
   test('throw error when downtime is not valid time', () => {
-    expect(() => isInDowntime(currentDate, tz, '17:00-24:00')).toThrow(
-      'Invalid downtime'
-    )
+    expect(() =>
+      isInDowntime(currentDate, utcAdjustments, '17:00-24:00')
+    ).toThrow('Invalid downtime')
   })
 
   test('throw error when downtime start time is after end time', () => {
-    expect(() => isInDowntime(currentDate, tz, '16:30-07:00')).toThrow(
-      'Invalid downtime'
-    )
+    expect(() =>
+      isInDowntime(currentDate, utcAdjustments, '16:30-07:00')
+    ).toThrow('Invalid downtime')
   })
 
   test('return true when in downtime', () => {
-    expect(isInDowntime(currentDate, tz, '16:00-23:59')).toBe(true)
+    expect(isInDowntime(currentDate, utcAdjustments, '16:00-23:59')).toBe(true)
   })
 
   test('return false when not in downtime', () => {
-    expect(isInDowntime(currentDate, tz, '16:30-23:59')).toBe(false)
+    expect(isInDowntime(currentDate, utcAdjustments, '16:30-23:59')).toBe(false)
   })
 })

package.json

@@ -1,6 +1,6 @@
 {
   "name": "no-weekend-merge",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "An action to prevent merges on weekends, or whenever that a merge should not happend",
   "main": "lib/main.js",
   "scripts": {

src/check.ts

@@ -1,3 +1,8 @@
+interface UTCAdjustments {
+  hours: number
+  minutes: number
+}
+
 interface DowntimePattern {
   [k: string]: string
   fromHour: string
@@ -6,9 +11,18 @@ interface DowntimePattern {
   toMinute: string
 }
 
+export const getUTCAdjustments = (tz: number): UTCAdjustments => {
+  const hours = parseInt(tz.toString(), 10)
+  const minutes = (tz % hours) * 60
+  return {
+    hours,
+    minutes
+  }
+}
+
 export const isInDowntime = (
   date: Date,
-  tz: number,
+  utcAdjustments: UTCAdjustments,
   downtime?: string
 ): boolean => {
   if (!downtime) {
@@ -52,23 +66,20 @@ export const isInDowntime = (
     throw new Error('Invalid downtime')
   }
 
-  const hourAdjustment = parseInt(tz.toString(), 10)
-  const minuteAdjustment = (tz % hourAdjustment) * 60
-
   const start = Date.UTC(
     date.getUTCFullYear(),
     date.getUTCMonth(),
     date.getUTCDate(),
-    fromHour - hourAdjustment,
-    fromMinute - minuteAdjustment
+    fromHour - utcAdjustments.hours,
+    fromMinute - utcAdjustments.minutes
   )
 
   const end = Date.UTC(
     date.getUTCFullYear(),
     date.getUTCMonth(),
     date.getUTCDate(),
-    toHour - hourAdjustment,
-    toMinute - minuteAdjustment
+    toHour - utcAdjustments.hours,
+    toMinute - utcAdjustments.minutes
   )
 
   return date.getTime() >= start && date.getTime() <= end

src/main.ts

@@ -1,5 +1,5 @@
 import * as core from '@actions/core'
-import {isInDowntime} from './check'
+import {isInDowntime, getUTCAdjustments} from './check'
 
 const days = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat']
 
@@ -8,13 +8,20 @@ async function run(): Promise<void> {
 
   try {
     const tz = parseFloat(core.getInput('tz'))
+    const utcAdjustments = getUTCAdjustments(tz)
+
+    currentDate.setUTCHours(currentDate.getUTCHours() + utcAdjustments.hours)
+    currentDate.setUTCMinutes(
+      currentDate.getUTCMinutes() + utcAdjustments.minutes
+    )
+
     core.debug(`TZ: ${tz} - Day: ${currentDate.getUTCDay()}`)
 
     const downtimes = core.getInput(days[currentDate.getUTCDay()]) || ''
     core.debug(`Downtimes: ${downtimes}`)
 
     for (const downtime of downtimes.split(',')) {
-      if (isInDowntime(currentDate, tz, downtime)) {
+      if (isInDowntime(currentDate, utcAdjustments, downtime)) {
         core.setFailed(
           `The PR cannot be merged at this time (${currentDate}) with the current settings (${downtime}).`
         )