From 43df20c25dc9cd1ab2b15a15531b2b77210a243a Mon Sep 17 00:00:00 2001 From: Romain LE JEUNE Date: Tue, 2 Jan 2024 15:24:01 +0100 Subject: [PATCH] fix(GODT-3187): Fix numberOfDay computation when changing date. --- .../configstatus/configuration_progress.go | 5 +--- .../configuration_progress_test.go | 29 ------------------- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/internal/configstatus/configuration_progress.go b/internal/configstatus/configuration_progress.go index 5599e2e5..e8d15bf0 100644 --- a/internal/configstatus/configuration_progress.go +++ b/internal/configstatus/configuration_progress.go @@ -52,10 +52,7 @@ func numberOfDay(now, prev time.Time) int { return 1 } if now.Year() > prev.Year() { - if now.YearDay() > prev.YearDay() { - return 365 + (now.YearDay() - prev.YearDay()) + (365 * (now.Year() - prev.Year() - 1)) - } - return (365 - prev.YearDay()) + now.YearDay() + (365 * (now.Year() - prev.Year() - 1)) + return (365 * (now.Year() - prev.Year())) + now.YearDay() - prev.YearDay() } else if now.YearDay() > prev.YearDay() { return now.YearDay() - prev.YearDay() } diff --git a/internal/configstatus/configuration_progress_test.go b/internal/configstatus/configuration_progress_test.go index 496a5e48..540232cc 100644 --- a/internal/configstatus/configuration_progress_test.go +++ b/internal/configstatus/configuration_progress_test.go @@ -98,32 +98,3 @@ func TestConfigurationProgress_fed_year_change(t *testing.T) { require.Equal(t, 370, req.Values.NbDay) require.Equal(t, 2, req.Values.NbDaySinceLast) } - -func TestConfigurationProgress_fed_day_higher(t *testing.T) { - dir := t.TempDir() - file := filepath.Join(dir, "dummy.json") - var data = configstatus.ConfigurationStatusData{ - Metadata: configstatus.Metadata{Version: "1.0.0"}, - DataV1: configstatus.DataV1{ - PendingSince: time.Now().AddDate(-1, 0, -5), - LastProgress: time.Now().AddDate(0, 0, -2), - Autoconf: "Mr TBird", - ClickedLink: 42, - ReportSent: false, - ReportClick: true, - FailureDetails: "Not an error", - }, - } - require.NoError(t, dumpConfigStatusInFile(&data, file)) - - config, err := configstatus.LoadConfigurationStatus(file) - require.NoError(t, err) - - var builder = configstatus.ConfigProgressBuilder{} - req := builder.New(config) - - require.Equal(t, "bridge.any.configuration", req.MeasurementGroup) - require.Equal(t, "bridge_config_progress", req.Event) - require.Equal(t, 370, req.Values.NbDay) - require.Equal(t, 2, req.Values.NbDaySinceLast) -}