From 7487858e4da0ed0c6ecc683d960a5797fc3362e7 Mon Sep 17 00:00:00 2001 From: Sarah Zakarias Date: Mon, 1 Jul 2024 11:26:20 +0000 Subject: [PATCH 1/3] Download counts: fix date formatting in file name --- .../download_counts/sync_download_counts.dart | 9 +++++++-- .../download_counts/download_counts_test.dart | 20 +++++++++---------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/app/lib/service/download_counts/sync_download_counts.dart b/app/lib/service/download_counts/sync_download_counts.dart index 1f7b0a1fa3..e9ab5b732d 100644 --- a/app/lib/service/download_counts/sync_download_counts.dart +++ b/app/lib/service/download_counts/sync_download_counts.dart @@ -123,6 +123,11 @@ Future processDownloadCounts( } const numberOfSyncDays = 5; +String formatDateForFileName(DateTime date) { + final month = date.month > 9 ? date.month : '0${date.month}'; + final day = date.day > 9 ? date.day : '0${date.day}'; + return '${date.year}-$month-${day}T00:00:00Z'; +} /// Synchronizes the download counts backend with download counts data from the /// last [numberOfSyncDays] days. @@ -143,7 +148,7 @@ Future syncDownloadCounts() async { final syncDate = today.addCalendarDays(-i); final fileName = [ 'daily_download_counts', - '${syncDate.year}-${syncDate.month}-${syncDate.day}T00:00:00Z', + formatDateForFileName(syncDate), 'data-000000000000.jsonl', ].join('/'); final success = await processDownloadCounts(fileName, syncDate); @@ -153,7 +158,7 @@ Future syncDownloadCounts() async { } final yesterdayFileName = [ 'daily_download_counts', - '${yesterday.year}-${yesterday.month}-${yesterday.day}T00:00:00Z', + formatDateForFileName(yesterday), 'data-000000000000.jsonl', ].join('/'); diff --git a/app/test/service/download_counts/download_counts_test.dart b/app/test/service/download_counts/download_counts_test.dart index f9bd4350a6..688badb3cf 100644 --- a/app/test/service/download_counts/download_counts_test.dart +++ b/app/test/service/download_counts/download_counts_test.dart @@ -202,7 +202,7 @@ void main() { final date = today.addCalendarDays(-i); final fileName = [ 'daily_download_counts', - '${date.year}-${date.month}-${date.day}T00:00:00Z', + formatDateForFileName(date), 'data-000000000000.jsonl', ].join('/'); await generateFakeDownloadCounts( @@ -235,7 +235,7 @@ void main() { final date = today.addCalendarDays(-i); final fileName = [ 'daily_download_counts', - '${date.year}-${date.month}-${date.day}T00:00:00Z', + formatDateForFileName(date), 'data-000000000000.jsonl', ].join('/'); await generateFakeDownloadCounts( @@ -271,15 +271,15 @@ void main() { messages, contains('Failed to read ' '"daily_download_counts/' - '${yesterday.year}-${yesterday.month}-${yesterday.day}' - 'T00:00:00Z/data-000000000000.jsonl".')); + '${formatDateForFileName(yesterday)}' + '/data-000000000000.jsonl".')); + print(messages); expect( messages, contains( 'Download counts sync was partial. The following files failed:\n' - '[daily_download_counts/' - '${yesterday.year}-${yesterday.month}-${yesterday.day}' - 'T00:00:00Z/data-000000000000.jsonl]')); + '[daily_download_counts/${formatDateForFileName(yesterday)}' + '/data-000000000000.jsonl]')); }); testWithProfile('Sync download counts - fail', fn: () async { @@ -290,7 +290,7 @@ void main() { final date = today.addCalendarDays(-i); final fileName = [ 'daily_download_counts', - '${date.year}-${date.month}-${date.day}T00:00:00Z', + formatDateForFileName(date), 'data-000000000000.jsonl', ].join('/'); await generateFakeDownloadCounts( @@ -310,8 +310,8 @@ void main() { exception, 'Exception: Download counts sync was partial. The following files failed:' '[daily_download_counts/' - '${skippedDate.year}-${skippedDate.month}-${skippedDate.day}' - 'T00:00:00Z/data-000000000000.jsonl]'); + '${formatDateForFileName(skippedDate)}' + '/data-000000000000.jsonl]'); final countData = await downloadCountsBackend.lookupDownloadCountData('neon'); From 73c1d373544a3b2bf5da1289d58da83e907bd6f3 Mon Sep 17 00:00:00 2001 From: Sarah Zakarias Date: Mon, 1 Jul 2024 11:33:19 +0000 Subject: [PATCH 2/3] move method --- .../service/download_counts/sync_download_counts.dart | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/lib/service/download_counts/sync_download_counts.dart b/app/lib/service/download_counts/sync_download_counts.dart index e9ab5b732d..cdfe131726 100644 --- a/app/lib/service/download_counts/sync_download_counts.dart +++ b/app/lib/service/download_counts/sync_download_counts.dart @@ -123,11 +123,6 @@ Future processDownloadCounts( } const numberOfSyncDays = 5; -String formatDateForFileName(DateTime date) { - final month = date.month > 9 ? date.month : '0${date.month}'; - final day = date.day > 9 ? date.day : '0${date.day}'; - return '${date.year}-$month-${day}T00:00:00Z'; -} /// Synchronizes the download counts backend with download counts data from the /// last [numberOfSyncDays] days. @@ -176,3 +171,9 @@ Future syncDownloadCounts() async { } } } + +String formatDateForFileName(DateTime date) { + final month = date.month > 9 ? date.month : '0${date.month}'; + final day = date.day > 9 ? date.day : '0${date.day}'; + return '${date.year}-$month-${day}T00:00:00Z'; +} From 890f825363536b9875e8bb477c3ca306a572df7a Mon Sep 17 00:00:00 2001 From: Sarah Zakarias Date: Mon, 1 Jul 2024 11:47:42 +0000 Subject: [PATCH 3/3] comment --- app/lib/service/download_counts/sync_download_counts.dart | 4 ++-- app/test/service/download_counts/download_counts_test.dart | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/lib/service/download_counts/sync_download_counts.dart b/app/lib/service/download_counts/sync_download_counts.dart index cdfe131726..79751a53e4 100644 --- a/app/lib/service/download_counts/sync_download_counts.dart +++ b/app/lib/service/download_counts/sync_download_counts.dart @@ -173,7 +173,7 @@ Future syncDownloadCounts() async { } String formatDateForFileName(DateTime date) { - final month = date.month > 9 ? date.month : '0${date.month}'; - final day = date.day > 9 ? date.day : '0${date.day}'; + final month = date.month.toString().padLeft(2, '0'); + final day = date.day.toString().padLeft(2, '0'); return '${date.year}-$month-${day}T00:00:00Z'; } diff --git a/app/test/service/download_counts/download_counts_test.dart b/app/test/service/download_counts/download_counts_test.dart index 688badb3cf..45f6df0581 100644 --- a/app/test/service/download_counts/download_counts_test.dart +++ b/app/test/service/download_counts/download_counts_test.dart @@ -273,7 +273,6 @@ void main() { '"daily_download_counts/' '${formatDateForFileName(yesterday)}' '/data-000000000000.jsonl".')); - print(messages); expect( messages, contains(