Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/RDMP-188 Attempt fix for 2am UTC issue #1869

Merged
merged 13 commits into from
Jul 10, 2024
Merged

Bugfix/RDMP-188 Attempt fix for 2am UTC issue #1869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8c51a28
add cron test
JFriel Jul 3, 2024
03ea71f
fix yaml
JFriel Jul 3, 2024
5a69530
fix yaml
JFriel Jul 3, 2024
dfd8435
update spacing
JFriel Jul 3, 2024
1eeb269
use example
JFriel Jul 3, 2024
dae3b76
update cron
JFriel Jul 3, 2024
1b74e4b
update to push
JFriel Jul 3, 2024
35582bd
add 2am cron
JFriel Jul 4, 2024
8135158
update yaml
JFriel Jul 4, 2024
3efba50
use utc
JFriel Jul 4, 2024
77cd11f
Merge branch 'develop' of https://github.com/HicServices/RDMP into bu…
JFriel Jul 4, 2024
79f87ec
Merge branch 'develop' of https://github.com/HicServices/RDMP into bu…
JFriel Jul 9, 2024
d0df892
Merge branch 'develop' into bugfix/RDMP-188
bpeacock001 Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ name: Build

# Run this workflow every time a new commit pushed to your repository

on: push
on:
push:
schedule:
- cron: '0 1 * * *'

env:
DOTNET_NOLOGO: 1
Expand Down Expand Up @@ -72,7 +75,6 @@ jobs:
files: ./db-ui.lcov ./db-core.lcov
flag-name: unit tests


tests_file_system:
name: Run File System Tests
runs-on: windows-latest
Expand Down
8 changes: 4 additions & 4 deletions Rdmp.Core.Tests/DataLoad/Engine/Integration/RemoteDatabaseAttacherTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,13 +213,13 @@ public void TestRemoteDatabaseAttacherWithDateFilter(DatabaseType dbType, Scenar

if (duration == AttacherHistoricalDurations.Custom)
{
attacher.CustomFetchDurationStartDate = DateTime.Now.AddDays(-7);
attacher.CustomFetchDurationEndDate = DateTime.Now;
attacher.CustomFetchDurationStartDate = DateTime.UtcNow.AddDays(-7);
attacher.CustomFetchDurationEndDate = DateTime.UtcNow;
}

if (duration == AttacherHistoricalDurations.DeltaReading)
{
attacher.DeltaReadingStartDate = DateTime.Now.AddDays(-7);
attacher.DeltaReadingStartDate = DateTime.UtcNow.AddDays(-7);
attacher.DeltaReadingLookBackDays = 0;
attacher.DeltaReadingLookForwardDays = 5;
}
Expand All @@ -236,7 +236,7 @@ public void TestRemoteDatabaseAttacherWithDateFilter(DatabaseType dbType, Scenar

if (duration == AttacherHistoricalDurations.SinceLastUse)
{
job.LoadMetadata.LastLoadTime = DateTime.Now.AddDays(-1);// last used yesterday
job.LoadMetadata.LastLoadTime = DateTime.UtcNow.AddDays(-1);// last used yesterday
job.LoadMetadata.SaveToDatabase();
}
if (scenario == Scenario.MissingPreLoadDiscardedColumn)
Expand Down
36 changes: 18 additions & 18 deletions Rdmp.Core.Tests/DataLoad/Modules/Attachers/RemoteTableAttacherTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,19 +269,19 @@ private static string Within(AttacherHistoricalDurations duration)
switch (duration)
{
case AttacherHistoricalDurations.Past24Hours:
return DateTime.Now.AddHours(-1).ToString();
return DateTime.UtcNow.AddHours(-1).ToString();
case AttacherHistoricalDurations.Past7Days:
return DateTime.Now.AddHours(-1).ToString();
return DateTime.UtcNow.AddHours(-1).ToString();
case AttacherHistoricalDurations.PastMonth:
return DateTime.Now.AddHours(-1).ToString();
return DateTime.UtcNow.AddHours(-1).ToString();
case AttacherHistoricalDurations.PastYear:
return DateTime.Now.AddHours(-1).ToString();
return DateTime.UtcNow.AddHours(-1).ToString();
case AttacherHistoricalDurations.SinceLastUse:
return DateTime.Now.AddHours(-1).ToString();
return DateTime.UtcNow.AddHours(-1).ToString();
case AttacherHistoricalDurations.Custom:
return DateTime.Now.AddDays(-1).ToString();
return DateTime.UtcNow.AddDays(-1).ToString();
case AttacherHistoricalDurations.DeltaReading:
return DateTime.Now.AddDays(-4).ToString();
return DateTime.UtcNow.AddDays(-4).ToString();
default:
return "fail";
}
Expand All @@ -292,19 +292,19 @@ private static string Outwith(AttacherHistoricalDurations duration)
switch (duration)
{
case AttacherHistoricalDurations.Past24Hours:
return DateTime.Now.AddDays(-2).ToString();
return DateTime.UtcNow.AddDays(-2).ToString();
case AttacherHistoricalDurations.Past7Days:
return DateTime.Now.AddDays(-8).ToString();
return DateTime.UtcNow.AddDays(-8).ToString();
case AttacherHistoricalDurations.PastMonth:
return DateTime.Now.AddMonths(-2).ToString();
return DateTime.UtcNow.AddMonths(-2).ToString();
case AttacherHistoricalDurations.PastYear:
return DateTime.Now.AddYears(-2).ToString();
return DateTime.UtcNow.AddYears(-2).ToString();
case AttacherHistoricalDurations.SinceLastUse:
return DateTime.Now.AddDays(-2).ToString();
return DateTime.UtcNow.AddDays(-2).ToString();
case AttacherHistoricalDurations.Custom:
return DateTime.Now.AddDays(-14).ToString();
return DateTime.UtcNow.AddDays(-14).ToString();
case AttacherHistoricalDurations.DeltaReading:
return DateTime.Now.AddDays(-10).ToString();
return DateTime.UtcNow.AddDays(-10).ToString();
default:
return "fail";
}
Expand Down Expand Up @@ -351,17 +351,17 @@ private void RunAttachStageWithFilterJob(RemoteTableAttacher attacher, Discovere
job.StartLogging();
if (duration == AttacherHistoricalDurations.SinceLastUse)
{
job.LoadMetadata.LastLoadTime = DateTime.Now.AddDays(-1);// last used yesterday
job.LoadMetadata.LastLoadTime = DateTime.UtcNow.AddDays(-1);// last used yesterday
job.LoadMetadata.SaveToDatabase();
}
if (duration == AttacherHistoricalDurations.Custom)
{
attacher.CustomFetchDurationStartDate = DateTime.Now.AddDays(-7);
attacher.CustomFetchDurationEndDate = DateTime.Now;
attacher.CustomFetchDurationStartDate = DateTime.UtcNow.AddDays(-7);
attacher.CustomFetchDurationEndDate = DateTime.UtcNow;
}
if (duration == AttacherHistoricalDurations.DeltaReading)
{
attacher.DeltaReadingStartDate = DateTime.Now.AddDays(-7);
attacher.DeltaReadingStartDate = DateTime.UtcNow.AddDays(-7);
attacher.DeltaReadingLookBackDays = 0;
attacher.DeltaReadingLookForwardDays = 5;
}
Expand Down