Merge pull request #604 from bcgov/yj

Yj

Author: ychung-mot

server/StrDss.Data/Repositories/BizLicenceRepository.cs

@@ -159,6 +159,8 @@ public async Task ProcessBizLicTempTable(long lgId)
         {
             var processStopwatch = Stopwatch.StartNew();
 
+            _dbContext.Database.SetCommandTimeout(300);
+
             await _dbContext.Database.ExecuteSqlRawAsync($"CALL dss_process_biz_lic_table({lgId});");
 
             processStopwatch.Stop();

server/StrDss.Service/RentalListingService.cs

@@ -469,6 +469,16 @@ public async Task<Dictionary<string, List<string>>> UpdateAddressAsync(UpdateLis
             if (addressEntity.ContainingOrganizationId != originalOrgId)
             {
                 listingEntity.IsLgTransferred = true;
+
+                listingEntity.IsChangedBusinessLicence = false;
+                listingEntity.EffectiveBusinessLicenceNo = CommonUtils.SanitizeAndUppercaseString(listingEntity.BusinessLicenceNo);
+                listingEntity.GoverningBusinessLicenceId = null;
+
+                if (addressEntity.ContainingOrganizationId != null && listingEntity.EffectiveBusinessLicenceNo.IsNotEmpty())
+                {
+                    var (bizLicId, _) = await _bizLicenceRepo.GetMatchingBusinessLicenceIdAndNo(addressEntity.ContainingOrganizationId.Value, listingEntity.BusinessLicenceNo);
+                    listingEntity.GoverningBusinessLicenceId = bizLicId;
+                }
             }
 
             listingEntity.IsChangedAddress = true;