Merge pull request #564 from bcgov/yj

Yj

Author: ychung-mot

server/StrDss.Api/Controllers/BizLicencesController.cs

@@ -68,7 +68,7 @@ public async Task<ActionResult> UploadBizLicences([FromForm] PlatformDataUploadD
         [HttpGet("uploadhistory")]
         public async Task<ActionResult> GetUploadHistory(long? orgId, int pageSize, int pageNumber, string orderBy = "UpdDtm", string direction = "desc")
         {
-            var history = await _uploadService.GetUploadHistory(orgId, pageSize, pageNumber, orderBy, direction, UploadDeliveryTypes.LicenceData);
+            var history = await _uploadService.GetUploadHistory(orgId, pageSize, pageNumber, orderBy, direction, new string[] { UploadDeliveryTypes.LicenceData });
 
             return Ok(history);
         }

server/StrDss.Api/Controllers/RentalListingReportsController.cs

@@ -72,7 +72,8 @@ public async Task<ActionResult> CreateRentalLisingReport([FromForm] PlatformData
         [HttpGet("rentallistinghistory")]
         public async Task<ActionResult> GetRentalListingHistory(long? platformId, int pageSize, int pageNumber, string orderBy = "UpdDtm", string direction = "desc")
         {
-            var history = await _uploadService.GetUploadHistory(platformId, pageSize, pageNumber, orderBy, direction);
+            var history = await _uploadService.GetUploadHistory(platformId, pageSize, pageNumber, orderBy, direction, 
+                new string[] { UploadDeliveryTypes.ListingData, UploadDeliveryTypes.TakedownData });
 
             return Ok(history);
         }

server/StrDss.Common/CommonUtils.cs

@@ -87,7 +87,7 @@ public static bool IsValidEmailAddress(string email)
 
             if (!valid) return false;
 
-            if (email.StartsWith(".") || email.EndsWith(".") || email.Contains(".@") || email.Contains("@.")) return false;
+            if (email.StartsWith(".") || email.EndsWith(".") || email.Contains(".@") || email.Contains("@.") || email.Contains("..")) return false;
 
             return true;
         }

server/StrDss.Data/Repositories/UploadDeliveryRepository.cs

@@ -22,7 +22,7 @@ public interface IUploadDeliveryRepository
         Task<UploadLineError> GetUploadLineWithError(long lineId);
         Task<bool> UploadHasErrors(long uploadId);
         Task<int> GetTotalNumberOfUploadLines(long uploadId);
-        Task<PagedDto<UploadHistoryViewDto>> GetUploadHistory(long? orgId, int pageSize, int pageNumber, string orderBy, string direction, string? reportType = null);
+        Task<PagedDto<UploadHistoryViewDto>> GetUploadHistory(long? orgId, int pageSize, int pageNumber, string orderBy, string direction, string[] reportTypes);
         Task<DssRentalUploadHistoryView?> GetRentalListingUpload(long deliveryId);
     }
 
@@ -137,7 +137,7 @@ public async Task<int> GetTotalNumberOfUploadLines(long uploadId)
             return await _dbContext.DssUploadLines.Where(x => x.IncludingUploadDeliveryId == uploadId).CountAsync();
         }
 
-        public async Task<PagedDto<UploadHistoryViewDto>> GetUploadHistory(long? orgId, int pageSize, int pageNumber, string orderBy, string direction, string? reportType = null)
+        public async Task<PagedDto<UploadHistoryViewDto>> GetUploadHistory(long? orgId, int pageSize, int pageNumber, string orderBy, string direction, string[] reportTypes)
         {
             var query = _dbContext.DssRentalUploadHistoryViews.AsNoTracking();
 
@@ -149,9 +149,9 @@ public async Task<PagedDto<UploadHistoryViewDto>> GetUploadHistory(long? orgId,
                 query = query.Where(x => x.ProvidingOrganizationId == orgId);
             }
 
-            if (reportType != null)
+            if (reportTypes.Any())
             {
-                query = query.Where(x => x.UploadDeliveryType == reportType);
+                query = query.Where(x => reportTypes.Contains(x.UploadDeliveryType));
             }
 
             var history = await Page<DssRentalUploadHistoryView, UploadHistoryViewDto>(query, pageSize, pageNumber, orderBy, direction);

server/StrDss.Service/UploadDeliveryService.cs

@@ -18,7 +18,7 @@ public interface IUploadDeliveryService
     {
         Task<Dictionary<string, List<string>>> UploadPlatformData(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? reportType = null);
+        Task<PagedDto<UploadHistoryViewDto>> GetUploadHistory(long? orgId, int pageSize, int pageNumber, string orderBy, string direction, string[] reportTypes);
         Task<byte[]?> GetRentalListingErrorFile(long uploadId);
     }
     public class UploadDeliveryService : ServiceBase, IUploadDeliveryService
@@ -494,9 +494,9 @@ private async Task<Dictionary<string, List<string>>> ParseAndValidate(string rep
             return errors;
         }
 
-        public async Task<PagedDto<UploadHistoryViewDto>> GetUploadHistory(long? orgId, int pageSize, int pageNumber, string orderBy, string direction, string? reportType = null)
+        public async Task<PagedDto<UploadHistoryViewDto>> GetUploadHistory(long? orgId, int pageSize, int pageNumber, string orderBy, string direction, string[] reportTypes)
         {
-            return await _uploadRepo.GetUploadHistory(orgId, pageSize, pageNumber, orderBy, direction, reportType);
+            return await _uploadRepo.GetUploadHistory(orgId, pageSize, pageNumber, orderBy, direction, reportTypes);
         }
 
         public async Task<byte[]?> GetRentalListingErrorFile(long uploadId)