Merge pull request #922 from bcgov/feature/DSS-1183

saikrishnametpalli-nttdata · web-flow · commit 99a2c2411908 · 2025-07-18T09:27:44.000-07:00
DSS-1183
diff --git a/server/StrDss.Api/Controllers/RentalListingsController.cs b/server/StrDss.Api/Controllers/RentalListingsController.cs
@@ -29,13 +29,13 @@ public RentalListingsController(ICurrentUser currentUser, IMapper mapper, IConfi
 
         [ApiAuthorize(Permissions.ListingRead)]
         [HttpGet]
-        public async Task<ActionResult> GetRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence,
+        public async Task<ActionResult> GetRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, string? registrationNumber,
             bool? prRequirement, bool? blRequirement, long? lgId, string? statuses, bool? reassigned, bool? takedownComplete,
             int pageSize = 10, int pageNumber = 1, string orderBy = "ListingStatusSortNo", string direction = "asc")
         {
             var statusArray = statuses == null ? Array.Empty<string>() : statuses!.Split(',');
 
-            var listings = await _listingService.GetRentalListings(all, address, url, listingId, hostName, businessLicence, 
+            var listings = await _listingService.GetRentalListings(all, address, url, listingId, hostName, businessLicence, registrationNumber,
                 prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete,
                 pageSize, pageNumber, orderBy, direction);
 
@@ -44,13 +44,13 @@ public async Task<ActionResult> GetRentalListings(string? all, string? address,
 
         [ApiAuthorize(Permissions.ListingRead)]
         [HttpGet("grouped")]
-        public async Task<ActionResult> GetGroupedRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence,
+        public async Task<ActionResult> GetGroupedRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, string? registrationNumber,
             bool? prRequirement, bool? blRequirement, long? lgId, string? statuses, bool? reassigned, bool? takedownComplete,
             int pageSize = 10, int pageNumber = 1, string orderBy = "matchAddressTxt", string direction = "asc")
         {
             var statusArray = statuses == null ? Array.Empty<string>() : statuses!.Split(',');
 
-            var listings = await _listingService.GetGroupedRentalListings(all, address, url, listingId, hostName, businessLicence,
+            var listings = await _listingService.GetGroupedRentalListings(all, address, url, listingId, hostName, businessLicence, registrationNumber,
                 prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete,
                 pageSize, pageNumber, orderBy, direction);
 
@@ -59,12 +59,12 @@ public async Task<ActionResult> GetGroupedRentalListings(string? all, string? ad
 
         [ApiAuthorize(Permissions.ListingRead)]
         [HttpGet("grouped/count")]
-        public async Task<ActionResult> GetGroupedRentalListingsCount(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence,
+        public async Task<ActionResult> GetGroupedRentalListingsCount(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, string? registrationNumber,
             bool? prRequirement, bool? blRequirement, long? lgId, string? statuses, bool? reassigned, bool? takedownComplete)
         {
             var statusArray = statuses == null ? Array.Empty<string>() : statuses!.Split(',');
 
-            var count = await _listingService.GetGroupedRentalListingsCount(all, address, url, listingId, hostName, businessLicence,
+            var count = await _listingService.GetGroupedRentalListingsCount(all, address, url, listingId, hostName, businessLicence, registrationNumber,
                 prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete);
 
             return Ok(count);
diff --git a/server/StrDss.Data/Repositories/RentalListingRepository.cs b/server/StrDss.Data/Repositories/RentalListingRepository.cs
@@ -13,11 +13,11 @@ namespace StrDss.Data.Repositories
 {
     public interface IRentalListingRepository
     {
-        Task<PagedDto<RentalListingViewDto>> GetRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence,
+        Task<PagedDto<RentalListingViewDto>> GetRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, string? registrationNumber,
             bool? prRequirement, bool? blRequirement, long? lgId, string[] statusArray, bool? reassigned, bool? takedownComplete, int pageSize, int pageNumber, string orderBy, string direction);
-        Task<PagedDto<RentalListingGroupDto>> GetGroupedRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence,
+        Task<PagedDto<RentalListingGroupDto>> GetGroupedRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, string? registrationNumber,
             bool? prRequirement, bool? blRequirement, long? lgId, string[] statusArray, bool? reassigned, bool? takedownComplete, int pageSize, int pageNumber, string orderBy, string direction);
-        Task<int> GetGroupedRentalListingsCount(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence,
+        Task<int> GetGroupedRentalListingsCount(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, string? registrationNumber,
             bool? prRequirement, bool? blRequirement, long? lgId, string[] statusArray, bool? reassigned, bool? takedownComplete);
         Task<int> CountHostListingsAsync(string hostName);
         Task<RentalListingViewDto?> GetRentalListing(long rentaListingId, bool loadHistory = true);
@@ -47,7 +47,7 @@ public RentalListingRepository(DssDbContext dbContext, IMapper mapper, ICurrentU
         {
             _userRepo = userRepo;
         }
-        public async Task<PagedDto<RentalListingViewDto>> GetRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence,
+        public async Task<PagedDto<RentalListingViewDto>> GetRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, string? registrationNumber,
             bool? prRequirement, bool? blRequirement, long? lgId, string[] statusArray, bool? reassigned, bool? takedownComplete, int pageSize, int pageNumber, string orderBy, string direction)
         {
             var query = _dbSet.AsNoTracking();
@@ -57,7 +57,7 @@ public async Task<PagedDto<RentalListingViewDto>> GetRentalListings(string? all,
                 query = query.Where(x => x.ManagingOrganizationId == _currentUser.OrganizationId);
             }
 
-            ApplyFilters(all, address, url, listingId, hostName, businessLicence, prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete, ref query);
+            ApplyFilters(all, address, url, listingId, hostName, businessLicence, registrationNumber, prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete, ref query);
 
             var extraSort
                 = "AddressSort1ProvinceCd asc, AddressSort2LocalityNm asc, AddressSort3LocalityTypeDsc asc, AddressSort4StreetNm asc, AddressSort5StreetTypeDsc asc, AddressSort6StreetDirectionDsc asc, AddressSort7CivicNo asc, AddressSort8UnitNo asc";
@@ -98,7 +98,7 @@ var extraSort
             return listings;
         }
 
-        public async Task<PagedDto<RentalListingGroupDto>> GetGroupedRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence,
+        public async Task<PagedDto<RentalListingGroupDto>> GetGroupedRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, string? registrationNumber,
             bool? prRequirement, bool? blRequirement, long? lgId, string[] statusArray, bool? reassigned, bool? takedownComplete, int pageSize, int pageNumber, string orderBy, string direction)
         {
             var stopwatch = Stopwatch.StartNew();
@@ -110,7 +110,7 @@ public async Task<PagedDto<RentalListingGroupDto>> GetGroupedRentalListings(stri
                 query = query.Where(x => x.ManagingOrganizationId == _currentUser.OrganizationId);
             }
 
-            ApplyFilters(all, address, url, listingId, hostName, businessLicence, prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete, ref query);
+            ApplyFilters(all, address, url, listingId, hostName, businessLicence, registrationNumber, prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete, ref query);
 
             if (orderBy == "effectiveBusinessLicenceNo")
             {
@@ -136,7 +136,7 @@ public async Task<PagedDto<RentalListingGroupDto>> GetGroupedRentalListings(stri
                 group.Listings 
                     = await GetRentalListings(
                         group.MatchAddressTxt, group.EffectiveHostNm, group.EffectiveBusinessLicenceNo, all, address, url, listingId, 
-                        hostName, businessLicence, prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete, group);
+                        hostName, businessLicence, registrationNumber, prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete, group);
             }
 
             stopwatch.Stop();
@@ -146,7 +146,7 @@ public async Task<PagedDto<RentalListingGroupDto>> GetGroupedRentalListings(stri
             return groupedListings;
         }
 
-        public async Task<int> GetGroupedRentalListingsCount(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence,
+        public async Task<int> GetGroupedRentalListingsCount(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, string? registrationNumber,
             bool? prRequirement, bool? blRequirement, long? lgId, string[] statusArray, bool? reassigned, bool? takedownComplete)
         {
             var stopwatch = Stopwatch.StartNew();
@@ -158,7 +158,7 @@ public async Task<int> GetGroupedRentalListingsCount(string? all, string? addres
                 query = query.Where(x => x.ManagingOrganizationId == _currentUser.OrganizationId);
             }
 
-            ApplyFilters(all, address, url, listingId, hostName, businessLicence, prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete, ref query);
+            ApplyFilters(all, address, url, listingId, hostName, businessLicence, registrationNumber, prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete, ref query);
 
             var count = await query
                 .Select(x => new { x.EffectiveBusinessLicenceNo, x.EffectiveHostNm, x.MatchAddressTxt })
@@ -188,7 +188,7 @@ public async Task<int> CountHostListingsAsync(string hostName)
                 .CountAsync(); 
         }
 
-        private static void ApplyFilters(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, 
+        private static void ApplyFilters(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, string? registrationNumber,
             bool? prRequirement, bool? blRequirement, long? lgId, string[] statusArray, bool? reassigned, bool? takedownComplete, ref IQueryable<DssRentalListingVw> query)
         {
             if (all != null && all.IsNotEmpty())
@@ -198,7 +198,8 @@ private static void ApplyFilters(string? all, string? address, string? url, stri
                                          (x.PlatformListingUrl != null && x.PlatformListingUrl.ToLower().Contains(allLower)) ||
                                          (x.PlatformListingNo != null && x.PlatformListingNo.ToLower().Contains(allLower)) ||
                                          (x.ListingContactNamesTxt != null && x.ListingContactNamesTxt.ToLower().Contains(allLower)) ||
-                                         (x.EffectiveBusinessLicenceNo != null && x.EffectiveBusinessLicenceNo.StartsWith(CommonUtils.SanitizeAndUppercaseString(all))));
+                                         (x.EffectiveBusinessLicenceNo != null && x.EffectiveBusinessLicenceNo.StartsWith(CommonUtils.SanitizeAndUppercaseString(all))) ||
+                                         (x.BcRegistryNo != null && EF.Functions.ILike(x.BcRegistryNo, $"%{all}%")));
             }
 
             if (address != null && address.IsNotEmpty())
@@ -231,6 +232,11 @@ private static void ApplyFilters(string? all, string? address, string? url, stri
                 query = query.Where(x => x.EffectiveBusinessLicenceNo != null && x.EffectiveBusinessLicenceNo.StartsWith(effectiveBusinessLicenceNo));
             }
 
+            if (registrationNumber != null && registrationNumber.IsNotEmpty())
+            {
+                query = query.Where(x => x.BcRegistryNo != null && EF.Functions.ILike(x.BcRegistryNo, $"%{registrationNumber}%"));
+            }
+
             if (prRequirement != null)
             {
                 query = query.Where(x => prRequirement.Value
@@ -280,15 +286,15 @@ private static void ApplyFilters(string? all, string? address, string? url, stri
         }
 
         private async Task<List<RentalListingViewDto>> GetRentalListings(string? effectiveAddress, string? effectiveHostName, string? effectiveBusinessLicenceNo,
-            string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, bool? prRequirement, bool? blRequirement, 
+            string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, string? registrationNumber, bool? prRequirement, bool? blRequirement, 
             long? lgId, string[] statusArray, bool? reassigned, bool? takedownComplete, RentalListingGroupDto group)
         {
             var stopwatch = Stopwatch.StartNew();
 
             var query = _dbSet.AsNoTracking()
                 .Where(x => x.MatchAddressTxt == effectiveAddress && x.EffectiveHostNm == effectiveHostName && x.EffectiveBusinessLicenceNo == effectiveBusinessLicenceNo);
 
-            ApplyFilters(all, address, url, listingId, hostName, businessLicence, prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete, ref query);
+            ApplyFilters(all, address, url, listingId, hostName, businessLicence, registrationNumber, prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete, ref query);
 
             var filteredIds = await query.Select(x => x.RentalListingId ?? 0).ToListAsync();
 
diff --git a/server/StrDss.Service/RentalListingService.cs b/server/StrDss.Service/RentalListingService.cs
@@ -15,11 +15,11 @@ namespace StrDss.Service
 {
     public interface IRentalListingService
     {
-        Task<PagedDto<RentalListingViewDto>> GetRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, 
+        Task<PagedDto<RentalListingViewDto>> GetRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, string? registrationNumber,
             bool? prRequirement, bool? blRequirement, long? lgId, string[] statusArray, bool? reassigned, bool? takedownComplete, int pageSize, int pageNumber, string orderBy, string direction);
-        Task<PagedDto<RentalListingGroupDto>> GetGroupedRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence,
+        Task<PagedDto<RentalListingGroupDto>> GetGroupedRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, string? registrationNumber,
             bool? prRequirement, bool? blRequirement, long? lgId, string[] statusArray, bool? reassigned, bool? takedownComplete, int pageSize, int pageNumber, string orderBy, string direction);
-        Task<int> GetGroupedRentalListingsCount(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence,
+        Task<int> GetGroupedRentalListingsCount(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, string? registrationNumber,
             bool? prRequirement, bool? blRequirement, long? lgId, string[] statusArray, bool? reassigned, bool? takedownComplete);
         Task<int> CountHostListingsAsync(string hostName);
         Task<RentalListingViewDto?> GetRentalListing(long rentalListingId);
@@ -51,10 +51,10 @@ public RentalListingService(ICurrentUser currentUser, IFieldValidatorService val
             _orgRepo = orgRepo;
             _bizLicenceRepo = bizLicenceRepo;
         }
-        public async Task<PagedDto<RentalListingViewDto>> GetRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence,
+        public async Task<PagedDto<RentalListingViewDto>> GetRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, string? registrationNumber,
             bool? prRequirement, bool? blRequirement, long? lgId, string[] statusArray, bool? reassigned, bool? takedownComplete, int pageSize, int pageNumber, string orderBy, string direction)
         {
-            var listings = await _listingRepo.GetRentalListings(all, address, url, listingId, hostName, businessLicence,
+            var listings = await _listingRepo.GetRentalListings(all, address, url, listingId, hostName, businessLicence, registrationNumber,
                 prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete,
                 pageSize, pageNumber, orderBy, direction);
 
@@ -66,10 +66,10 @@ public async Task<PagedDto<RentalListingViewDto>> GetRentalListings(string? all,
             return listings;
         }
 
-        public async Task<PagedDto<RentalListingGroupDto>> GetGroupedRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence,
+        public async Task<PagedDto<RentalListingGroupDto>> GetGroupedRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, string? registrationNumber,
             bool? prRequirement, bool? blRequirement, long? lgId, string[] statusArray, bool? reassigned, bool? takedownComplete, int pageSize, int pageNumber, string orderBy, string direction)
         {
-            var listings = await _listingRepo.GetGroupedRentalListings(all, address, url, listingId, hostName, businessLicence,
+            var listings = await _listingRepo.GetGroupedRentalListings(all, address, url, listingId, hostName, businessLicence, registrationNumber,
                 prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete,
                 pageSize, pageNumber, orderBy, direction);
 
@@ -84,10 +84,10 @@ public async Task<PagedDto<RentalListingGroupDto>> GetGroupedRentalListings(stri
             return listings;
         }
 
-        public async Task<int> GetGroupedRentalListingsCount(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence,
+        public async Task<int> GetGroupedRentalListingsCount(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, string? registrationNumber,
             bool? prRequirement, bool? blRequirement, long? lgId, string[] statusArray, bool? reassigned, bool? takedownComplete)
         {
-            var count = await _listingRepo.GetGroupedRentalListingsCount(all, address, url, listingId, hostName, businessLicence,
+            var count = await _listingRepo.GetGroupedRentalListingsCount(all, address, url, listingId, hostName, businessLicence, registrationNumber,
                 prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete);
 
             return count;

Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,11 @@ namespace StrDss.Data.Repositories`
`13`	`13`	`{`
`14`	`14`	`public interface IRentalListingRepository`
`15`	`15`	`{`
`16`		`- Task<PagedDto<RentalListingViewDto>> GetRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence,`
	`16`	`+ Task<PagedDto<RentalListingViewDto>> GetRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, string? registrationNumber,`
`17`	`17`	`bool? prRequirement, bool? blRequirement, long? lgId, string[] statusArray, bool? reassigned, bool? takedownComplete, int pageSize, int pageNumber, string orderBy, string direction);`
`18`		`- Task<PagedDto<RentalListingGroupDto>> GetGroupedRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence,`
	`18`	`+ Task<PagedDto<RentalListingGroupDto>> GetGroupedRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, string? registrationNumber,`
`19`	`19`	`bool? prRequirement, bool? blRequirement, long? lgId, string[] statusArray, bool? reassigned, bool? takedownComplete, int pageSize, int pageNumber, string orderBy, string direction);`
`20`		`- Task<int> GetGroupedRentalListingsCount(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence,`
	`20`	`+ Task<int> GetGroupedRentalListingsCount(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, string? registrationNumber,`
`21`	`21`	`bool? prRequirement, bool? blRequirement, long? lgId, string[] statusArray, bool? reassigned, bool? takedownComplete);`
`22`	`22`	`Task<int> CountHostListingsAsync(string hostName);`
`23`	`23`	`Task<RentalListingViewDto?> GetRentalListing(long rentaListingId, bool loadHistory = true);`
`@@ -47,7 +47,7 @@ public RentalListingRepository(DssDbContext dbContext, IMapper mapper, ICurrentU`
`47`	`47`	`{`
`48`	`48`	`_userRepo = userRepo;`
`49`	`49`	`}`
`50`		`- public async Task<PagedDto<RentalListingViewDto>> GetRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence,`
	`50`	`+ public async Task<PagedDto<RentalListingViewDto>> GetRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, string? registrationNumber,`
`51`	`51`	`bool? prRequirement, bool? blRequirement, long? lgId, string[] statusArray, bool? reassigned, bool? takedownComplete, int pageSize, int pageNumber, string orderBy, string direction)`
`52`	`52`	`{`
`53`	`53`	`var query = _dbSet.AsNoTracking();`
`@@ -57,7 +57,7 @@ public async Task<PagedDto<RentalListingViewDto>> GetRentalListings(string? all,`
`57`	`57`	`query = query.Where(x => x.ManagingOrganizationId == _currentUser.OrganizationId);`
`58`	`58`	`}`
`59`	`59`
`60`		`- ApplyFilters(all, address, url, listingId, hostName, businessLicence, prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete, ref query);`
	`60`	`+ ApplyFilters(all, address, url, listingId, hostName, businessLicence, registrationNumber, prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete, ref query);`
`61`	`61`
`62`	`62`	`var extraSort`
`63`	`63`	`= "AddressSort1ProvinceCd asc, AddressSort2LocalityNm asc, AddressSort3LocalityTypeDsc asc, AddressSort4StreetNm asc, AddressSort5StreetTypeDsc asc, AddressSort6StreetDirectionDsc asc, AddressSort7CivicNo asc, AddressSort8UnitNo asc";`
`@@ -98,7 +98,7 @@ var extraSort`
`98`	`98`	`return listings;`
`99`	`99`	`}`
`100`	`100`
`101`		`- public async Task<PagedDto<RentalListingGroupDto>> GetGroupedRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence,`
	`101`	`+ public async Task<PagedDto<RentalListingGroupDto>> GetGroupedRentalListings(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, string? registrationNumber,`
`102`	`102`	`bool? prRequirement, bool? blRequirement, long? lgId, string[] statusArray, bool? reassigned, bool? takedownComplete, int pageSize, int pageNumber, string orderBy, string direction)`
`103`	`103`	`{`
`104`	`104`	`var stopwatch = Stopwatch.StartNew();`
`@@ -110,7 +110,7 @@ public async Task<PagedDto<RentalListingGroupDto>> GetGroupedRentalListings(stri`
`110`	`110`	`query = query.Where(x => x.ManagingOrganizationId == _currentUser.OrganizationId);`
`111`	`111`	`}`
`112`	`112`
`113`		`- ApplyFilters(all, address, url, listingId, hostName, businessLicence, prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete, ref query);`
	`113`	`+ ApplyFilters(all, address, url, listingId, hostName, businessLicence, registrationNumber, prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete, ref query);`
`114`	`114`
`115`	`115`	`if (orderBy == "effectiveBusinessLicenceNo")`
`116`	`116`	`{`
`@@ -136,7 +136,7 @@ public async Task<PagedDto<RentalListingGroupDto>> GetGroupedRentalListings(stri`
`136`	`136`	`group.Listings`
`137`	`137`	`= await GetRentalListings(`
`138`	`138`	`group.MatchAddressTxt, group.EffectiveHostNm, group.EffectiveBusinessLicenceNo, all, address, url, listingId,`
`139`		`- hostName, businessLicence, prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete, group);`
	`139`	`+ hostName, businessLicence, registrationNumber, prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete, group);`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`stopwatch.Stop();`
`@@ -146,7 +146,7 @@ public async Task<PagedDto<RentalListingGroupDto>> GetGroupedRentalListings(stri`
`146`	`146`	`return groupedListings;`
`147`	`147`	`}`
`148`	`148`
`149`		`- public async Task<int> GetGroupedRentalListingsCount(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence,`
	`149`	`+ public async Task<int> GetGroupedRentalListingsCount(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, string? registrationNumber,`
`150`	`150`	`bool? prRequirement, bool? blRequirement, long? lgId, string[] statusArray, bool? reassigned, bool? takedownComplete)`
`151`	`151`	`{`
`152`	`152`	`var stopwatch = Stopwatch.StartNew();`
`@@ -158,7 +158,7 @@ public async Task<int> GetGroupedRentalListingsCount(string? all, string? addres`
`158`	`158`	`query = query.Where(x => x.ManagingOrganizationId == _currentUser.OrganizationId);`
`159`	`159`	`}`
`160`	`160`
`161`		`- ApplyFilters(all, address, url, listingId, hostName, businessLicence, prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete, ref query);`
	`161`	`+ ApplyFilters(all, address, url, listingId, hostName, businessLicence, registrationNumber, prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete, ref query);`
`162`	`162`
`163`	`163`	`var count = await query`
`164`	`164`	`.Select(x => new { x.EffectiveBusinessLicenceNo, x.EffectiveHostNm, x.MatchAddressTxt })`
`@@ -188,7 +188,7 @@ public async Task<int> CountHostListingsAsync(string hostName)`
`188`	`188`	`.CountAsync();`
`189`	`189`	`}`
`190`	`190`
`191`		`- private static void ApplyFilters(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence,`
	`191`	`+ private static void ApplyFilters(string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, string? registrationNumber,`
`192`	`192`	`bool? prRequirement, bool? blRequirement, long? lgId, string[] statusArray, bool? reassigned, bool? takedownComplete, ref IQueryable<DssRentalListingVw> query)`
`193`	`193`	`{`
`194`	`194`	`if (all != null && all.IsNotEmpty())`
`@@ -198,7 +198,8 @@ private static void ApplyFilters(string? all, string? address, string? url, stri`
`198`	`198`	`(x.PlatformListingUrl != null && x.PlatformListingUrl.ToLower().Contains(allLower)) \|\|`
`199`	`199`	`(x.PlatformListingNo != null && x.PlatformListingNo.ToLower().Contains(allLower)) \|\|`
`200`	`200`	`(x.ListingContactNamesTxt != null && x.ListingContactNamesTxt.ToLower().Contains(allLower)) \|\|`
`201`		`- (x.EffectiveBusinessLicenceNo != null && x.EffectiveBusinessLicenceNo.StartsWith(CommonUtils.SanitizeAndUppercaseString(all))));`
	`201`	`+ (x.EffectiveBusinessLicenceNo != null && x.EffectiveBusinessLicenceNo.StartsWith(CommonUtils.SanitizeAndUppercaseString(all))) \|\|`
	`202`	`+ (x.BcRegistryNo != null && EF.Functions.ILike(x.BcRegistryNo, $"%{all}%")));`
`202`	`203`	`}`
`203`	`204`
`204`	`205`	`if (address != null && address.IsNotEmpty())`
`@@ -231,6 +232,11 @@ private static void ApplyFilters(string? all, string? address, string? url, stri`
`231`	`232`	`query = query.Where(x => x.EffectiveBusinessLicenceNo != null && x.EffectiveBusinessLicenceNo.StartsWith(effectiveBusinessLicenceNo));`
`232`	`233`	`}`
`233`	`234`
	`235`	`+ if (registrationNumber != null && registrationNumber.IsNotEmpty())`
	`236`	`+ {`
	`237`	`+ query = query.Where(x => x.BcRegistryNo != null && EF.Functions.ILike(x.BcRegistryNo, $"%{registrationNumber}%"));`
	`238`	`+ }`
	`239`	`+`
`234`	`240`	`if (prRequirement != null)`
`235`	`241`	`{`
`236`	`242`	`query = query.Where(x => prRequirement.Value`
`@@ -280,15 +286,15 @@ private static void ApplyFilters(string? all, string? address, string? url, stri`
`280`	`286`	`}`
`281`	`287`
`282`	`288`	`private async Task<List<RentalListingViewDto>> GetRentalListings(string? effectiveAddress, string? effectiveHostName, string? effectiveBusinessLicenceNo,`
`283`		`- string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, bool? prRequirement, bool? blRequirement,`
	`289`	`+ string? all, string? address, string? url, string? listingId, string? hostName, string? businessLicence, string? registrationNumber, bool? prRequirement, bool? blRequirement,`
`284`	`290`	`long? lgId, string[] statusArray, bool? reassigned, bool? takedownComplete, RentalListingGroupDto group)`
`285`	`291`	`{`
`286`	`292`	`var stopwatch = Stopwatch.StartNew();`
`287`	`293`
`288`	`294`	`var query = _dbSet.AsNoTracking()`
`289`	`295`	`.Where(x => x.MatchAddressTxt == effectiveAddress && x.EffectiveHostNm == effectiveHostName && x.EffectiveBusinessLicenceNo == effectiveBusinessLicenceNo);`
`290`	`296`
`291`		`- ApplyFilters(all, address, url, listingId, hostName, businessLicence, prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete, ref query);`
	`297`	`+ ApplyFilters(all, address, url, listingId, hostName, businessLicence, registrationNumber, prRequirement, blRequirement, lgId, statusArray, reassigned, takedownComplete, ref query);`
`292`	`298`
`293`	`299`	`var filteredIds = await query.Select(x => x.RentalListingId ?? 0).ToListAsync();`
`294`	`300`