Merge pull request #331 from bcgov/yj

fix: bug fix for file upload
bcgov · May 30, 2024 · 8bf7396 · 8bf7396
2 parents 3718a2b + ca73b50
commit 8bf7396
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/server/StrDss.Data/Repositories/UploadDeliveryRepository.cs b/server/StrDss.Data/Repositories/UploadDeliveryRepository.cs
@@ -13,6 +13,7 @@ public interface IUploadDeliveryRepository
         Task AddUploadDeliveryAsync(DssUploadDelivery upload);
         Task<List<DssUploadDelivery>> GetRentalReportUploadsToProcessAsync();
         Task<DssUploadDelivery?> GetRentalListingErrorLines(long uploadId);
+        Task<DssUploadLine?> GetUploadLineAsync(long uploadId, string orgCd, string listingId);
     }
 
     public class UploadDeliveryRepository : RepositoryBase<DssUploadDelivery>, IUploadDeliveryRepository
@@ -36,7 +37,7 @@ public async Task<bool> IsDuplicateRentalReportUploadAsnyc(DateOnly periodYm, lo
         public async Task<List<DssUploadDelivery>> GetRentalReportUploadsToProcessAsync()
         {
             return await _dbSet
-                .Include(x => x.DssUploadLines.Where(line => !line.IsProcessed))
+                //.Include(x => x.DssUploadLines.Where(line => !line.IsProcessed))
                 .Include(x => x.ProvidingOrganization)
                 .Where(x => x.DssUploadLines.Any(line => !line.IsProcessed))
                 .OrderBy(x => x.ProvidingOrganizationId) 
@@ -45,6 +46,14 @@ public async Task<List<DssUploadDelivery>> GetRentalReportUploadsToProcessAsync(
                 .ToListAsync();
         }
 
+        public async Task<DssUploadLine?> GetUploadLineAsync(long uploadId, string orgCd, string listingId)
+        {
+            return await _dbContext.DssUploadLines.FirstOrDefaultAsync(x => 
+                x.IncludingUploadDeliveryId ==  uploadId && 
+                x.SourceOrganizationCd == orgCd && 
+                x.SourceRecordNo == listingId);
+        }
+
         public async Task<DssUploadDelivery?> GetRentalListingErrorLines(long uploadId)
         {
             //todo: data control

diff --git a/server/StrDss.Service/RentalListingReportService.cs b/server/StrDss.Service/RentalListingReportService.cs
@@ -334,7 +334,7 @@ private async Task ProcessRentalReportUploadAsync(DssUploadDelivery upload)
             while (csv.Read())
             {
                 var row = csv.GetRecord<RentalListingRowUntyped>(); //it has been parsed once, so no exception expected.
-                var uploadLine = upload.DssUploadLines.FirstOrDefault(x => x.SourceOrganizationCd == row.OrgCd && x.SourceRecordNo == row.ListingId);
+                var uploadLine = await _uploadRepo.GetUploadLineAsync(upload.UploadDeliveryId, row.OrgCd, row.ListingId);
 
                 if (uploadLine == null)
                 {

diff --git a/server/StrDss.Service/RentalListingReportValidationRule.cs b/server/StrDss.Service/RentalListingReportValidationRule.cs
@@ -82,24 +82,27 @@ public static void LoadReportValidationRules(List<FieldValidationRule> rules)
             {
                 EntityName = Entities.RentalListingRowUntyped,
                 FieldName = RentalListingReportFields.BedroomsQty,
-                FieldType = FieldTypes.Decimal,
+                FieldType = FieldTypes.String,
                 Required = false,
+                RegexInfo = RegexDefs.GetRegexInfo(RegexDefs.Quantity)
             });
 
             rules.Add(new FieldValidationRule
             {
                 EntityName = Entities.RentalListingRowUntyped,
                 FieldName = RentalListingReportFields.NightsBookedQty,
-                FieldType = FieldTypes.Decimal,
+                FieldType = FieldTypes.String,
                 Required = false,
+                RegexInfo = RegexDefs.GetRegexInfo(RegexDefs.Quantity)
             });
 
             rules.Add(new FieldValidationRule
             {
                 EntityName = Entities.RentalListingRowUntyped,
                 FieldName = RentalListingReportFields.ReservationsQty,
-                FieldType = FieldTypes.Decimal,
+                FieldType = FieldTypes.String,
                 Required = false,
+                RegexInfo = RegexDefs.GetRegexInfo(RegexDefs.Quantity)
             });
 
             rules.Add(new FieldValidationRule