chore: effective biz lic no

Author: ychung-mot

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.Data/Mappings/ModelToEntityProfile.cs

@@ -21,8 +21,6 @@ public ModelToEntityProfile()
                 .ForMember(dest => dest.PlatformListingNo, opt => opt.MapFrom(src => src.ListingId))
                 .ForMember(dest => dest.PlatformListingUrl, opt => opt.MapFrom(src => src.ListingUrl))
                 .ForMember(dest => dest.BusinessLicenceNo, opt => opt.MapFrom(src => src.BusLicNo))
-                .ForMember(dest => dest.EffectiveBusinessLicenceNo, opt => opt.MapFrom(src => src.EffectiveBusinessLicenceNo))
-                .ForMember(dest => dest.EffectiveHostNm, opt => opt.MapFrom(src => src.EffectiveHostNm))
                 .ForMember(dest => dest.BcRegistryNo, opt => opt.MapFrom(src => src.BcRegNo))
                 .ForMember(dest => dest.IsEntireUnit, opt => opt.MapFrom(src => src.IsEntireUnit == "Y"))
                 .ForMember(dest => dest.AvailableBedroomsQty, opt => opt.MapFrom(src => CommonUtils.StringToShort(src.BedroomsQty)))

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,7 +15,7 @@ public interface IBizLicenseRepository
         Task CreateBizLicTempTable();
         Task InsertRowToBizLicTempTable(BizLicenseRowUntyped row, long providingOrganizationId);
         Task ProcessBizLicTempTable();
-        Task<long?> GetMatchingBusinessLicenseId(long orgId, string effectiveBizLicNo);
+        Task<(long?, string?)> GetMatchingBusinessLicenseIdAndNo(long orgId, string effectiveBizLicNo);
     }
 
     public class BizLicenseRepository : RepositoryBase<DssBusinessLicence>, IBizLicenseRepository
@@ -143,13 +144,32 @@ public async Task ProcessBizLicTempTable()
             await _dbContext.Database.ExecuteSqlRawAsync("CALL dss_process_biz_lic_table();");
         }
 
-        public async Task<long?> GetMatchingBusinessLicenseId(long orgId, string effectiveBizLicNo)
-        {
-            //todo: need to use effectiveBizLicNo from the table
-            var bizLic = await _dbSet.AsNoTracking()
-                .FirstOrDefaultAsync(x => x.ProvidingOrganizationId == orgId && x.BusinessLicenceNo == effectiveBizLicNo);
+        //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));
+        //}
 
-            return bizLic == null ? null : bizLic.BusinessLicenceId;
+        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.Model/RentalReportDtos/RentalListingRowUntyped.cs

@@ -142,7 +142,5 @@ public class RentalListingRowUntyped
 
         [Name("supplier_host_5_id")]
         public string SupplierHost5Id { get; set; } = "";
-        public string EffectiveBusinessLicenceNo { get; set; }
-        public string EffectiveHostNm { get; set; }
     }
 }

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
     {
@@ -159,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

@@ -224,9 +224,6 @@ private async Task<bool> ProcessUploadLine(DssRentalListingReport report, DssUpl
                 return false;
             }
 
-            row.EffectiveHostNm = CommonUtils.SanitizeAndUppercaseString(row.PropertyHostNm);
-            row.EffectiveBusinessLicenceNo = CommonUtils.SanitizeAndUppercaseString(row.BusLicNo);
-
             var offeringOrg = await _orgRepo.GetOrganizationByOrgCdAsync(row.OrgCd); //already validated in the file upload
 
             using var tran = _unitOfWork.BeginTransaction();
@@ -417,10 +414,28 @@ private async Task<DssRentalListing> CreateOrUpdateRentalListing(DssRentalListin
             masterListing.DerivedFromRentalListingId = listing.RentalListingId;
             masterListing.LocatingPhysicalAddressId = physicalAddress.PhysicalAddressId;
 
-            if (physicalAddress.ContainingOrganizationId != null && (masterListing.IsChangedBusinessLicence == null || masterListing.IsChangedBusinessLicence.Value == false))
+            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 
-                    = await _bizLicRepo.GetMatchingBusinessLicenseId(physicalAddress.ContainingOrganizationId.Value, row.EffectiveBusinessLicenceNo);
+                masterListing.GoverningBusinessLicenceId = null;
+                masterListing.EffectiveBusinessLicenceNo = string.Empty;
             }
 
             (masterListing.NightsBookedQty, masterListing.SeparateReservationsQty) =