Merge pull request #794 from bcgov/yj

feat(dss-939)

Author: ychung-mot

server/StrDss.Api/Controllers/BizLicencesController.cs

@@ -54,7 +54,7 @@ public async Task<ActionResult> UploadBizLicences([FromForm] PlatformDataUploadD
 
             using var stream = dto.File.OpenReadStream();
 
-            errors = await _uploadService.UploadPlatformData(UploadDeliveryTypes.LicenceData, dto.ReportPeriod, dto.OrganizationId, stream);
+            errors = await _uploadService.UploadData(UploadDeliveryTypes.LicenceData, dto.ReportPeriod, dto.OrganizationId, stream);
 
             if (errors.Count > 0)
             {

server/StrDss.Api/Controllers/RentalListingReportsController.cs

@@ -58,7 +58,7 @@ public async Task<ActionResult> CreateRentalLisingReport([FromForm] PlatformData
 
             using var stream = dto.File.OpenReadStream();
 
-            errors = await _uploadService.UploadPlatformData(UploadDeliveryTypes.ListingData, dto.ReportPeriod, dto.OrganizationId, stream);
+            errors = await _uploadService.UploadData(UploadDeliveryTypes.ListingData, dto.ReportPeriod, dto.OrganizationId, stream);
 
             if (errors.Count > 0)
             {
@@ -82,7 +82,7 @@ public async Task<ActionResult> GetRentalListingHistory(long? platformId, int pa
         [HttpGet("uploads/{uploadId}/errorfile")]
         public async Task<ActionResult> GetRentalListingErrorFile(long uploadId)
         {
-            var (bytes, hasPermission) = await _uploadService.GetRentalListingErrorFile(uploadId);
+            var (bytes, hasPermission) = await _uploadService.GetErrorFile(uploadId);
 
             if (!hasPermission)
                 return Unauthorized();

server/StrDss.Api/Controllers/RentalListingsController.cs

@@ -202,7 +202,7 @@ public async Task<ActionResult> UploadTakedownConfrimation([FromForm] PlatformDa
 
             using var stream = dto.File.OpenReadStream();
 
-            errors = await _uploadService.UploadPlatformData(UploadDeliveryTypes.TakedownData, dto.ReportPeriod, dto.OrganizationId, stream);
+            errors = await _uploadService.UploadData(UploadDeliveryTypes.TakedownData, dto.ReportPeriod, dto.OrganizationId, stream);
 
             if (errors.Count > 0)
             {

server/StrDss.Service/UploadDeliveryService.cs

@@ -16,10 +16,10 @@ namespace StrDss.Service
 {
     public interface IUploadDeliveryService
     {
-        Task<Dictionary<string, List<string>>> UploadPlatformData(string reportType, string reportPeriod, long orgId, Stream stream);
+        Task<Dictionary<string, List<string>>> UploadData(string reportType, string reportPeriod, long orgId, Stream stream);
         Task<(Dictionary<string, List<string>>, string header)> ValidateAndParseUploadAsync(string reportPeriod, long orgId, string reportType, string hashValue, string[] mandatoryFields, TextReader textReader, List<DssUploadLine> uploadLines);
         Task<PagedDto<UploadHistoryViewDto>> GetUploadHistory(long? orgId, int pageSize, int pageNumber, string orderBy, string direction, string[] reportTypes);
-        Task<(byte[]?, bool hasAccess)> GetRentalListingErrorFile(long uploadId);
+        Task<(byte[]?, bool hasAccess)> GetErrorFile(long uploadId);
         Task<DssUploadDelivery?> GetNonTakedownUploadToProcessAsync();
         Task<DssUploadDelivery?> GetUploadToProcessAsync(string reportType);
     }
@@ -37,7 +37,7 @@ public UploadDeliveryService(
             _orgRepo = orgRepo;
         }
 
-        public async Task<Dictionary<string, List<string>>> UploadPlatformData(string reportType, string reportPeriod, long orgId, Stream stream)
+        public async Task<Dictionary<string, List<string>>> UploadData(string reportType, string reportPeriod, long orgId, Stream stream)
         {
             if (_currentUser.OrganizationType != OrganizationTypes.BCGov && _currentUser.OrganizationId != orgId)
             {
@@ -501,7 +501,7 @@ public async Task<PagedDto<UploadHistoryViewDto>> GetUploadHistory(long? orgId,
             return await _uploadRepo.GetUploadHistory(orgId, pageSize, pageNumber, orderBy, direction, reportTypes);
         }
 
-        public async Task<(byte[]?, bool hasAccess)> GetRentalListingErrorFile(long uploadId)
+        public async Task<(byte[]?, bool hasAccess)> GetErrorFile(long uploadId)
         {
             var upload = await _uploadRepo.GetRentalListingUploadWithErrors(uploadId);
 
@@ -532,14 +532,14 @@ public async Task<PagedDto<UploadHistoryViewDto>> GetUploadHistory(long? orgId,
             var contents = new StringBuilder();
 
             csv.Read();
-            var header = csv.Parser.RawRecord.TrimEndNewLine() + ",errors";
+            var header = "errors," + csv.Parser.RawRecord.TrimEndNewLine();
 
             contents.AppendLine(header);
 
             foreach (var lineId in linesWithError)
             {
                 var line = await _uploadRepo.GetUploadLineWithError(lineId);
-                contents.AppendLine(line.LineText.TrimEndNewLine() + $",\"{line.ErrorText ?? ""}\"");
+                contents.AppendLine($"\"{line.ErrorText ?? ""}\"," + line.LineText.TrimEndNewLine());
             }
 
             return (Encoding.UTF8.GetBytes(contents.ToString()), hasPermission);