Skip to content
Snippets Groups Projects
Unverified Commit 79c2532a authored by RahulGautamSingh's avatar RahulGautamSingh Committed by GitHub
Browse files

refactor: add new fn getElapsedHours (#19892)

parent 6be73f19
No related merge requests found
import { getElapsedDays, getElapsedHours, getElapsedMinutes } from './date';
const ONE_MINUTE_MS = 60 * 1000;
const ONE_HOUR_MS = 60 * ONE_MINUTE_MS;
const ONE_DAY_MS = 24 * ONE_HOUR_MS;
describe('util/date', () => {
const Jan1 = new Date(new Date().getFullYear(), 0, 1);
it('returns elapsed days', () => {
const elapsedDays = Math.floor(
(new Date().getTime() - new Date(Jan1).getTime()) / ONE_DAY_MS
);
expect(getElapsedDays(Jan1.toDateString())).toBe(elapsedDays);
});
it('returns elapsed minutes', () => {
const elapsedMinutes = Math.floor(
(new Date().getTime() - new Date(Jan1).getTime()) / ONE_MINUTE_MS
);
expect(getElapsedMinutes(new Date(Jan1))).toBe(elapsedMinutes);
});
describe('getElapsedHours', () => {
it('returns elapsed hours', () => {
const elapsedHours = Math.floor(
(new Date().getTime() - new Date(Jan1).getTime()) / ONE_HOUR_MS
);
expect(getElapsedHours(Jan1.toISOString())).toBe(elapsedHours); // ISOstring
expect(getElapsedHours(Jan1)).toBe(elapsedHours); // JS Date
});
it('throws when invalid date is passed', () => {
expect(getElapsedHours(new Date('invalid_date_string'))).toBe(0);
});
});
});
import { DateTime } from 'luxon';
const ONE_MINUTE_MS = 60 * 1000; const ONE_MINUTE_MS = 60 * 1000;
const ONE_DAY_MS = 24 * 60 * ONE_MINUTE_MS; const ONE_DAY_MS = 24 * 60 * ONE_MINUTE_MS;
...@@ -10,3 +12,17 @@ export function getElapsedDays(timestamp: string): number { ...@@ -10,3 +12,17 @@ export function getElapsedDays(timestamp: string): number {
export function getElapsedMinutes(date: Date): number { export function getElapsedMinutes(date: Date): number {
return Math.floor((new Date().getTime() - date.getTime()) / ONE_MINUTE_MS); return Math.floor((new Date().getTime() - date.getTime()) / ONE_MINUTE_MS);
} }
export function getElapsedHours(date: Date | string): number {
const lastDate =
typeof date === 'string'
? DateTime.fromISO(date)
: DateTime.fromJSDate(date);
if (!lastDate.isValid) {
return 0;
}
const diff = DateTime.now().diff(lastDate, 'hours');
return Math.floor(diff.hours);
}
...@@ -17,6 +17,7 @@ import { ...@@ -17,6 +17,7 @@ import {
import { ensureComment } from '../../../../modules/platform/comment'; import { ensureComment } from '../../../../modules/platform/comment';
import { hashBody } from '../../../../modules/platform/pr-body'; import { hashBody } from '../../../../modules/platform/pr-body';
import { ExternalHostError } from '../../../../types/errors/external-host-error'; import { ExternalHostError } from '../../../../types/errors/external-host-error';
import { getElapsedHours } from '../../../../util/date';
import { stripEmojis } from '../../../../util/emoji'; import { stripEmojis } from '../../../../util/emoji';
import { deleteBranch, getBranchLastCommitTime } from '../../../../util/git'; import { deleteBranch, getBranchLastCommitTime } from '../../../../util/git';
import { memoize } from '../../../../util/memoize'; import { memoize } from '../../../../util/memoize';
...@@ -114,12 +115,7 @@ export async function ensurePr( ...@@ -114,12 +115,7 @@ export async function ensurePr(
) { ) {
logger.debug('Checking how long this branch has been pending'); logger.debug('Checking how long this branch has been pending');
const lastCommitTime = await getBranchLastCommitTime(branchName); const lastCommitTime = await getBranchLastCommitTime(branchName);
const currentTime = new Date(); if (getElapsedHours(lastCommitTime) >= config.prNotPendingHours) {
const millisecondsPerHour = 1000 * 60 * 60;
const elapsedHours = Math.round(
(currentTime.getTime() - lastCommitTime.getTime()) / millisecondsPerHour
);
if (elapsedHours >= config.prNotPendingHours) {
logger.debug('Branch exceeds prNotPending hours - forcing PR creation'); logger.debug('Branch exceeds prNotPending hours - forcing PR creation');
config.forcePr = true; config.forcePr = true;
} }
...@@ -153,11 +149,7 @@ export async function ensurePr( ...@@ -153,11 +149,7 @@ export async function ensurePr(
if ((await getBranchStatus()) === 'yellow') { if ((await getBranchStatus()) === 'yellow') {
logger.debug(`Branch status is yellow - checking timeout`); logger.debug(`Branch status is yellow - checking timeout`);
const lastCommitTime = await getBranchLastCommitTime(branchName); const lastCommitTime = await getBranchLastCommitTime(branchName);
const currentTime = new Date(); const elapsedHours = getElapsedHours(lastCommitTime);
const millisecondsPerHour = 1000 * 60 * 60;
const elapsedHours = Math.round(
(currentTime.getTime() - lastCommitTime.getTime()) / millisecondsPerHour
);
if ( if (
!dependencyDashboardCheck && !dependencyDashboardCheck &&
((config.stabilityStatus && config.stabilityStatus !== 'yellow') || ((config.stabilityStatus && config.stabilityStatus !== 'yellow') ||
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment