Merge pull request #549 from bcgov/yj

Yj

Author: ychung-mot

database/ddl/STR_dss_process_biz_lic_table_Sprint_12.sql

@@ -22,9 +22,7 @@ BEGIN
         business_owner_nm, business_owner_phone_no, business_owner_email_address_dsc, business_operator_nm, 
         business_operator_phone_no, business_operator_email_address_dsc, infraction_txt, infraction_dt, 
         property_zone_txt, available_bedrooms_qty, max_guests_allowed_qty, 
-        CASE WHEN is_principal_residence = 'Y' THEN TRUE ELSE FALSE END, -- Convert 'Y'/'N' to boolean
-        CASE WHEN is_owner_living_onsite = 'Y' THEN TRUE ELSE FALSE END, -- Convert 'Y'/'N' to boolean
-        CASE WHEN is_owner_property_tenant = 'Y' THEN TRUE ELSE FALSE END, -- Convert 'Y'/'N' to boolean
+        is_principal_residence, is_owner_living_onsite, is_owner_property_tenant,
         property_folio_no, property_parcel_identifier_no, property_legal_description_txt, 
         licence_status_type, providing_organization_id,
         NOW() -- Set the current timestamp for upd_dtm

server/StrDss.Api/Controllers/BizLicensesController.cs

@@ -77,6 +77,7 @@ public async Task<ActionResult> GetUploadHistory(long? orgId, int pageSize, int
         //[HttpGet("process")]
         //public async Task<ActionResult> ProcessUpload()
         //{
+        //    // var info = await _bizLicenseService.GetMatchingBusinessLicenseIdAndNo(256, "X567B");
         //    await _bizLicenseService.ProcessBizLicenseUploadAsync();
         //    return Ok();
         //}

server/StrDss.Common/CommonUtils.cs

@@ -72,7 +72,7 @@ public static byte[] CreateZip(string csvContent, string fileName)
             return memoryStream.ToArray();
         }
 
-        static string SanitizeAndUppercaseString(string input)
+        public static string SanitizeAndUppercaseString(string input)
         {
             if (string.IsNullOrWhiteSpace(input)) return "";
 

server/StrDss.Data/Repositories/BizLicenseRepository.cs

@@ -5,6 +5,7 @@
 using StrDss.Common;
 using StrDss.Data.Entities;
 using StrDss.Model;
+using System.Text.RegularExpressions;
 
 namespace StrDss.Data.Repositories
 {
@@ -14,6 +15,7 @@ public interface IBizLicenseRepository
         Task CreateBizLicTempTable();
         Task InsertRowToBizLicTempTable(BizLicenseRowUntyped row, long providingOrganizationId);
         Task ProcessBizLicTempTable();
+        Task<(long?, string?)> GetMatchingBusinessLicenseIdAndNo(long orgId, string effectiveBizLicNo);
     }
 
     public class BizLicenseRepository : RepositoryBase<DssBusinessLicence>, IBizLicenseRepository
@@ -93,7 +95,7 @@ INSERT INTO biz_lic_table (
 
             var parameters = new List<NpgsqlParameter>
             {
-                new NpgsqlParameter("@businessLicenceNo", row.BusinessLicenceNo.ToUpper()),
+                new NpgsqlParameter("@businessLicenceNo", row.BusinessLicenceNo.Trim().ToUpper()),
 
                 new NpgsqlParameter("@expiryDt", NpgsqlTypes.NpgsqlDbType.Date)
                 {
@@ -141,5 +143,33 @@ public async Task ProcessBizLicTempTable()
         {
             await _dbContext.Database.ExecuteSqlRawAsync("CALL dss_process_biz_lic_table();");
         }
+
+        //public async Task<(long?, string?)> GetMatchingBusinessLicenseIdAndNo(long orgId, string effectiveBizLicNo)
+        //{
+        //    var license = await _dbSet.AsNoTracking()
+        //        .Where(x => x.ProvidingOrganizationId == orgId && x.BusinessLicenceNo == effectiveBizLicNo)
+        //        .Select(x => new { x.BusinessLicenceId, x.BusinessLicenceNo })
+        //        .FirstOrDefaultAsync();
+
+        //    return license == null ? (null, null) : (license.BusinessLicenceId, CommonUtils.SanitizeAndUppercaseString(license.BusinessLicenceNo));
+        //}
+
+        public async Task<(long?, string?)> GetMatchingBusinessLicenseIdAndNo(long orgId, string effectiveBizLicNo)
+        {
+            // Raw SQL query using PostgreSQL regexp_replace to remove non-alphanumeric characters in the database query
+            var sqlQuery = @"
+                SELECT business_licence_id, business_licence_no
+                FROM dss_business_licence
+                WHERE providing_organization_id = @orgId 
+                  AND regexp_replace(business_licence_no, '[^a-zA-Z0-9]', '', 'g') = @sanitizedBizLicNo
+                LIMIT 1";
+
+            var license = await _dbContext.DssBusinessLicences
+                .FromSqlRaw(sqlQuery, new NpgsqlParameter("orgId", orgId), new NpgsqlParameter("sanitizedBizLicNo", effectiveBizLicNo))
+                .Select(x => new { x.BusinessLicenceId, x.BusinessLicenceNo })
+                .FirstOrDefaultAsync();
+
+            return license == null ? (null, null) : (license.BusinessLicenceId, CommonUtils.SanitizeAndUppercaseString(license.BusinessLicenceNo));
+        }
     }
 }

server/StrDss.Service/BizLicenseService.cs

@@ -16,6 +16,7 @@ public interface IBizLicenseService
     {
         Task<BizLicenseDto?> GetBizLicense(long businessLicenceId);
         Task ProcessBizLicenseUploadAsync();
+        Task<(long?, string?)> GetMatchingBusinessLicenseIdAndNo(long orgId, string effectiveBizLicNo);
     }
     public class BizLicenseService : ServiceBase, IBizLicenseService
     {
@@ -137,6 +138,8 @@ private async Task ProcessBizLicenseUploadAsync(DssUploadDelivery upload)
                 return (row.OrgCd, row.BusinessLicenceNo);
             }
 
+            row.LicenceStatusType = row.LicenceStatusType.IsEmpty() ? "ISSUED" : row.LicenceStatusType;
+
             await _bizLicenseRepo.InsertRowToBizLicTempTable(row, org.OrganizationId);
 
             SaveUploadLine(line, errors, false, "");
@@ -157,5 +160,10 @@ private void SaveUploadLine(DssUploadLine uploadLine, Dictionary<string, List<st
 
             uploadLine.IsProcessed = true;
         }
+
+        public async Task<(long?, string?)> GetMatchingBusinessLicenseIdAndNo(long orgId, string effectiveBizLicNo)
+        {
+            return await _bizLicenseRepo.GetMatchingBusinessLicenseIdAndNo(orgId, effectiveBizLicNo);
+        }
     }
 }

server/StrDss.Service/RentalListingReportService.cs

@@ -34,11 +34,12 @@ public class RentalListingReportService : ServiceBase, IRentalListingReportServi
         private IUserRepository _userRepo;
         private IEmailMessageService _emailService;
         private IEmailMessageRepository _emailRepo;
+        private IBizLicenseRepository _bizLicRepo;
         private IConfiguration _config;
 
         public RentalListingReportService(ICurrentUser currentUser, IFieldValidatorService validator, IUnitOfWork unitOfWork, IMapper mapper, IHttpContextAccessor httpContextAccessor,
             IOrganizationRepository orgRepo, IUploadDeliveryRepository uploadRepo, IRentalListingReportRepository reportRepo, IPhysicalAddressRepository addressRepo,
-            IGeocoderApi geocoder, IUserRepository userRepo, IEmailMessageService emailService, IEmailMessageRepository emailRepo,
+            IGeocoderApi geocoder, IUserRepository userRepo, IEmailMessageService emailService, IEmailMessageRepository emailRepo, IBizLicenseRepository bizLicRepo,
             IConfiguration config, ILogger<StrDssLogger> logger)
             : base(currentUser, validator, unitOfWork, mapper, httpContextAccessor, logger)
         {
@@ -50,6 +51,7 @@ public RentalListingReportService(ICurrentUser currentUser, IFieldValidatorServi
             _userRepo = userRepo;
             _emailService = emailService;
             _emailRepo = emailRepo;
+            _bizLicRepo = bizLicRepo;
             _config = config;
         }
         public async Task ProcessRentalReportUploadAsync()
@@ -412,6 +414,30 @@ private async Task<DssRentalListing> CreateOrUpdateRentalListing(DssRentalListin
             masterListing.DerivedFromRentalListingId = listing.RentalListingId;
             masterListing.LocatingPhysicalAddressId = physicalAddress.PhysicalAddressId;
 
+            masterListing.EffectiveHostNm = CommonUtils.SanitizeAndUppercaseString(row.PropertyHostNm);
+
+            if (masterListing.IsChangedBusinessLicence == true)
+            {
+                // keep the original effective business licence no and id
+            }
+            else if (!string.IsNullOrEmpty(masterListing.BusinessLicenceNo) && physicalAddress.ContainingOrganizationId.HasValue)
+            {
+                var sanitizedBizLicNo = CommonUtils.SanitizeAndUppercaseString(masterListing.BusinessLicenceNo);
+
+                var (businessLicenceId, businessLicenceNo) = await _bizLicRepo.GetMatchingBusinessLicenseIdAndNo(
+                    physicalAddress.ContainingOrganizationId.Value,
+                    sanitizedBizLicNo
+                );
+
+                masterListing.GoverningBusinessLicenceId = businessLicenceId;
+                masterListing.EffectiveBusinessLicenceNo = businessLicenceNo ?? sanitizedBizLicNo;
+            }
+            else
+            {
+                masterListing.GoverningBusinessLicenceId = null;
+                masterListing.EffectiveBusinessLicenceNo = string.Empty;
+            }
+
             (masterListing.NightsBookedQty, masterListing.SeparateReservationsQty) = 
                 await _reportRepo.GetYtdValuesOfListingAsync(reportPeriodYm, offeringOrg.OrganizationId, masterListing.PlatformListingNo);