Merge pull request #227 from bcgov/yj

Yj
bcgov · Apr 25, 2024 · 1f0f90c · 1f0f90c
2 parents fdc8517 + 50acb47
commit 1f0f90c
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 133 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,7 @@ note
 secrets
 .terraform
 docker.env
-backup.sql
+backup.sql
+docker-compose.yml
+note.txt
+Scaffolding.txt
diff --git a/crunchydb/note.txt b/crunchydb/note.txt
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/localdb/note.txt b/localdb/note.txt
diff --git a/postgres/note.txt b/postgres/note.txt
diff --git a/server/StrDss.Data/Scaffolding.txt b/server/StrDss.Data/Scaffolding.txt
diff --git a/server/StrDss.Service/DelistingService.cs b/server/StrDss.Service/DelistingService.cs
@@ -424,7 +424,8 @@ private async Task ProcessTakedownRequestBatchEmailAsync(OrganizationDto platfor
                 .ToList();
 
             var content = CsvHelperUtils.GetBase64CsvString(csvRecords);
-            var date = DateTime.UtcNow.ToString("yyyy-MM-dd-HH-mm");
+            var date = DateUtils.ConvertUtcToPacificTime(DateTime.UtcNow).ToString("yyyy-MM-dd-HH-mm");
+            var fileName = $"{platform.OrganizationNm} - {date}.csv";
 
             var template = new BatchTakedownRequest(_emailService)
             {
@@ -434,15 +435,15 @@ private async Task ProcessTakedownRequestBatchEmailAsync(OrganizationDto platfor
                     Content = content,
                     ContentType = "text/csv",
                     Encoding = "base64",
-                    Filename = $"{platform.OrganizationNm} - {date}.csv"
+                    Filename = fileName
                 }},
             };
 
             var emailEntity = new DssEmailMessage
             {
                 EmailMessageType = template.EmailMessageType,
                 MessageDeliveryDtm = DateTime.UtcNow,
-                MessageTemplateDsc = template.GetContent(),
+                MessageTemplateDsc = template.GetContent() + $" Attachement: {fileName} ({csvRecords.Count})",
                 IsHostContactedExternally = false,
                 IsSubmitterCcRequired = false,
                 MessageReasonId = null,