Merge remote-tracking branch 'origin/main'

Author: KFloodBCGov

database/ddl/STR_DSS_Incremental_DB_Sprint_R15_2026-03-09.sql

@@ -0,0 +1,14 @@
+/* Sprint R15 - Indexes for GetRentalListings / count query performance
+   Targets the base-table listings query and count used by the rental listings table.
+   Partial index on current listings (including_rental_listing_report_id IS NULL) reduces
+   work for the main table and count endpoints. */
+
+-- Partial index on current listings: supports base filter and common join/filter columns
+CREATE INDEX IF NOT EXISTS dss_rental_listing_i12
+ON dss_rental_listing (offering_organization_id, locating_physical_address_id, listing_status_type)
+WHERE including_rental_listing_report_id IS NULL;
+
+-- Partial index for status / reassigned / takedown filters
+CREATE INDEX IF NOT EXISTS dss_rental_listing_i13
+ON dss_rental_listing (listing_status_type, is_taken_down, is_lg_transferred)
+WHERE including_rental_listing_report_id IS NULL;

frontend/src/app/common/models/listing-response-with-counts.ts

@@ -1,14 +1,5 @@
-import { PagingResponse } from './paging-response';
 import { AggregatedListingTableRow } from './listing-table-row';
 
-export interface ListingResponseWithCounts<T> extends PagingResponse<T> {
-    recentCount: number;
-    allCount: number;
-}
-
-export interface AggregatedListingResponseWithCounts {
+export interface AggregatedListingResponse {
     data: AggregatedListingTableRow[];
-    recentCount: number;
-    allCount: number;
 }
-

frontend/src/app/common/models/listing-table-row.ts

@@ -18,6 +18,10 @@ export interface ListingTableRow {
     isActive?: boolean;
     isNew?: boolean;
     isTakenDown?: boolean;
+    isLgTransferred?: boolean;
+    isMatchVerified?: boolean;
+    isMatchCorrected?: boolean;
+    isChangedAddress?: boolean;
     takeDownReason?: string;
     platformListingUrl?: string;
     matchScoreAmt?: number;

frontend/src/app/common/services/listing-data.service.ts

@@ -4,12 +4,11 @@ import { map, Observable } from 'rxjs';
 import { environment } from '../../../environments/environment';
 import { PagingResponse } from '../models/paging-response';
 import { ListingUploadHistoryRecord } from '../models/listing-upload-history-record';
-import { ListingTableRow } from '../models/listing-table-row';
+import { AggregatedListingTableRow, ListingTableRow } from '../models/listing-table-row';
 import { ListingSearchRequest } from '../models/listing-search-request';
 import { ListingAddressCandidate, ListingDetails } from '../models/listing-details';
 import { ExportJurisdiction } from '../models/export-listing';
 import { ListingFilter } from '../models/listing-filter';
-import { ListingResponseWithCounts, AggregatedListingResponseWithCounts } from '../models/listing-response-with-counts';
 
 @Injectable({
     providedIn: 'root',
@@ -73,90 +72,114 @@ export class ListingDataService {
         );
     }
 
-    getListings(
-        pageNumber: number = 1,
-        pageSize: number = 10,
-        orderBy: string = '',
-        direction: 'asc' | 'desc' = 'asc',
-        searchReq: ListingSearchRequest = {},
+    /**
+     * Builds query string for listings filter params (searchReq, filter, recent).
+     * Used by both getListings and getListingsCount.
+     */
+    private buildListingsFilterParams(
+        searchReq: ListingSearchRequest,
         filter?: ListingFilter,
         recent: boolean = false,
-    ): Observable<ListingResponseWithCounts<ListingTableRow>> {
-        let endpointUrl = `${environment.API_HOST}/rentallistings?pageSize=${pageSize}&pageNumber=${pageNumber}`;
-
-        if (orderBy) {
-            endpointUrl += `&orderBy=${orderBy}&direction=${direction}`;
-        }
-
+    ): string {
+        const params: string[] = [];
         if (recent) {
-            endpointUrl += `&recent=${recent}`;
+            params.push(`recent=${recent}`);
         }
-
         if (searchReq.all) {
-            endpointUrl += `&all=${searchReq.all}`;
+            params.push(`all=${encodeURIComponent(searchReq.all)}`);
         }
         if (searchReq.address) {
-            endpointUrl += `&address=${searchReq.address}`;
+            params.push(`address=${encodeURIComponent(searchReq.address)}`);
         }
         if (searchReq.url) {
-            endpointUrl += `&url=${searchReq.url}`;
+            params.push(`url=${encodeURIComponent(searchReq.url)}`);
         }
         if (searchReq.listingId) {
-            endpointUrl += `&listingId=${searchReq.listingId}`;
+            params.push(`listingId=${encodeURIComponent(searchReq.listingId)}`);
         }
         if (searchReq.hostName) {
-            endpointUrl += `&hostName=${searchReq.hostName}`;
+            params.push(`hostName=${encodeURIComponent(searchReq.hostName)}`);
         }
         if (searchReq.businessLicence) {
-            endpointUrl += `&businessLicence=${searchReq.businessLicence}`;
+            params.push(`businessLicence=${encodeURIComponent(searchReq.businessLicence)}`);
         }
         if (searchReq.registrationNumber) {
-            endpointUrl += `&registrationNumber=${searchReq.registrationNumber}`;
+            params.push(`registrationNumber=${encodeURIComponent(searchReq.registrationNumber)}`);
         }
-
         if (filter) {
             if (filter.byLocation) {
                 if (!!filter.byLocation?.isPrincipalResidenceRequired) {
-                    endpointUrl += `&prRequirement=${filter.byLocation.isPrincipalResidenceRequired == 'Yes'
-                        }`;
+                    params.push(`prRequirement=${filter.byLocation.isPrincipalResidenceRequired == 'Yes'}`);
                 }
                 if (!!filter.byLocation?.isBusinessLicenceRequired) {
-                    endpointUrl += `&blRequirement=${filter.byLocation.isBusinessLicenceRequired == 'Yes'
-                        }`;
+                    params.push(`blRequirement=${filter.byLocation.isBusinessLicenceRequired == 'Yes'}`);
                 }
             }
             if (filter.byStatus) {
                 if (
                     filter.byStatus.reassigned !== null &&
                     filter.byStatus.reassigned !== undefined
                 ) {
-                    endpointUrl += `&reassigned=${!!filter.byStatus.reassigned}`;
+                    params.push(`reassigned=${!!filter.byStatus.reassigned}`);
                 }
                 if (
                     filter.byStatus.takedownComplete !== null &&
                     filter.byStatus.takedownComplete !== undefined
                 ) {
-                    endpointUrl += `&takedownComplete=${!!filter.byStatus.takedownComplete}`;
+                    params.push(`takedownComplete=${!!filter.byStatus.takedownComplete}`);
                 }
-
                 const statuses = new Array<string>();
                 if (filter.byStatus.active) {
                     statuses.push('A');
-                    statuses.push('U'); // Include Update when Active is selected
+                    statuses.push('U');
                 }
                 if (filter.byStatus.inactive) statuses.push('I');
                 if (filter.byStatus.new) statuses.push('N');
-
                 if (statuses.length) {
-                    endpointUrl += `&statuses=${statuses.join(',')}`;
+                    params.push(`statuses=${statuses.join(',')}`);
                 }
             }
             if (!!filter.community) {
-                endpointUrl += `&lgId=${filter.community}`;
+                params.push(`lgId=${filter.community}`);
             }
         }
+        return params.length ? '&' + params.join('&') : '';
+    }
+
+    getListingsCount(
+        searchReq: ListingSearchRequest = {},
+        filter?: ListingFilter,
+        recent: boolean = false,
+    ): Observable<number> {
+        const baseUrl = `${environment.API_HOST}/rentallistings/count`;
+        const filterParams = this.buildListingsFilterParams(searchReq, filter, recent);
+        const url = filterParams ? `${baseUrl}?${filterParams.slice(1)}` : baseUrl;
+        return this.httpClient.get<number>(url);
+    }
+
+    getListings(
+        pageNumber: number = 1,
+        pageSize: number = 10,
+        orderBy: string = '',
+        direction: 'asc' | 'desc' = 'asc',
+        searchReq: ListingSearchRequest = {},
+        filter?: ListingFilter,
+        recent: boolean = false,
+        includeTotalCount: boolean = true,
+    ): Observable<PagingResponse<ListingTableRow>> {
+        let endpointUrl = `${environment.API_HOST}/rentallistings?pageSize=${pageSize}&pageNumber=${pageNumber}`;
+
+        if (orderBy) {
+            endpointUrl += `&orderBy=${orderBy}&direction=${direction}`;
+        }
+
+        if (!includeTotalCount) {
+            endpointUrl += '&includeTotalCount=false';
+        }
+
+        endpointUrl += this.buildListingsFilterParams(searchReq, filter, recent);
 
-        return this.httpClient.get<ListingResponseWithCounts<ListingTableRow>>(endpointUrl);
+        return this.httpClient.get<PagingResponse<ListingTableRow>>(endpointUrl);
     }
 
     getHostListingsCount(primaryHostNm: string): Observable<{ primaryHostNm: string, hasMultipleProperties: boolean }> {
@@ -168,7 +191,7 @@ export class ListingDataService {
         searchReq: ListingSearchRequest = {},
         filter?: ListingFilter,
         recent: boolean = false,
-    ): Observable<AggregatedListingResponseWithCounts> {
+    ): Observable<AggregatedListingTableRow[]> {
         let listingsEndpointUrl = `${environment.API_HOST}/rentallistings/grouped`;
         const params: string[] = [];
 
@@ -242,8 +265,7 @@ export class ListingDataService {
             listingsEndpointUrl += `?${params.join('&')}`;
         }
 
-        // API now returns object with data, recentCount, and allCount
-        return this.httpClient.get<AggregatedListingResponseWithCounts>(listingsEndpointUrl);
+        return this.httpClient.get<AggregatedListingTableRow[]>(listingsEndpointUrl);
     }
 
     getListingDetailsById(id: number): Observable<ListingDetails> {

frontend/src/app/common/services/year-month-gen.service.ts

@@ -11,7 +11,7 @@ export class YearMonthGenService {
 
     for (let i = 0; i < numberOfMonths; i++) {
       const prevMonth = today.getMonth() - i - 1;
-      const year = prevMonth < 0 ? today.getFullYear() - 1 : today.getFullYear();
+      const year = today.getFullYear() + Math.floor(prevMonth / 12);
       const month = (prevMonth % 12 + 12) % 12 + 1;
       const monthString = month.toString().padStart(2, '0');
 

frontend/src/app/features/components/listings-table/aggregated-listings-table/aggregated-listings-table.component.html

@@ -48,10 +48,10 @@ <h2 class="title">Aggregated Listings</h2>
             <div class="rows-info-wrapper">
                 <div class="panel-header-left">
                     <div class="toggle-container">
-                        <span class="toggle-label" [class.active]="showRecentOnly">Recently Reported ({{recentCount}})</span>
+                        <span class="toggle-label" [class.active]="showRecentOnly">Recently Reported</span>
                         <p-toggleSwitch [ngModel]="!showRecentOnly" (ngModelChange)="showRecentOnly = !$event; onToggleChange()" 
                             [inputId]="'recent-toggle-aggregated'"></p-toggleSwitch>
-                        <span class="toggle-label" [class.active]="!showRecentOnly">All Listings ({{allCount}})</span>
+                        <span class="toggle-label" [class.active]="!showRecentOnly">All Listings</span>
                     </div>
                     <span class="panel-header-small" [class.hidden]="!listingsSelected">Selected
                         {{listingsSelected}} items. <button pButton class="p-button-link zero-padding small-text"

frontend/src/app/features/components/listings-table/aggregated-listings-table/aggregated-listings-table.component.ts

@@ -27,7 +27,6 @@ import {
     ListingTableRow,
 } from '../../../../common/models/listing-table-row';
 import { ListingDataService } from '../../../../common/services/listing-data.service';
-import { AggregatedListingResponseWithCounts } from '../../../../common/models/listing-response-with-counts';
 import { FilterPersistenceService } from '../../../../common/services/filter-persistence.service';
 import { GlobalLoaderService } from '../../../../common/services/global-loader.service';
 import { SelectedListingsStateService } from '../../../../common/services/selected-listings-state.service';
@@ -88,8 +87,6 @@ export class AggregatedListingsTableComponent implements OnInit {
     currentFilter!: ListingFilter;
     cancelableFilter!: ListingFilter;
     showRecentOnly = true; // Default to "Recently Reported"
-    recentCount = 0;
-    allCount = 0;
     readonly addressLowScore = Number.parseInt(environment.ADDRESS_SCORE);
 
     // Track which rows are currently loading/expanding to prevent multiple clicks
@@ -526,13 +523,8 @@ export class AggregatedListingsTableComponent implements OnInit {
                 this.showRecentOnly,
             )
             .subscribe({
-                next: (response: AggregatedListingResponseWithCounts) => {
-                    // Store counts from API response
-                    this.recentCount = response.recentCount;
-                    this.allCount = response.allCount;
-                    
-                    // Store all data - API now returns object with data array
-                    this.aggregatedListings = response.data.map(
+                next: (response: AggregatedListingTableRow[]) => {
+                    this.aggregatedListings = response.map(
                         (l: AggregatedListingTableRow, index: number) => {
                             return {
                                 ...l,
@@ -546,7 +538,7 @@ export class AggregatedListingsTableComponent implements OnInit {
                     );
 
                     // Calculate host properties after data is loaded
-                    this.calculateIfHostsHaveMoreThanOneProperty(response.data);
+                    this.calculateIfHostsHaveMoreThanOneProperty(response);
 
                     // Initialize currentPage if not exists
                     if (!this.currentPage) {

frontend/src/app/features/components/listings-table/listings-table.component.html

@@ -48,10 +48,10 @@ <h2 class="title">Individual Listings</h2>
             <div class="rows-info-wrapper">
                 <div class="panel-header-left">
                     <div class="toggle-container">
-                        <span class="toggle-label" [class.active]="showRecentOnly">Recently Reported ({{recentCount}})</span>
+                        <span class="toggle-label" [class.active]="showRecentOnly">Recently Reported</span>
                         <p-toggleSwitch [ngModel]="!showRecentOnly" (ngModelChange)="showRecentOnly = !$event; onToggleChange()" 
                             [inputId]="'recent-toggle'"></p-toggleSwitch>
-                        <span class="toggle-label" [class.active]="!showRecentOnly">All Listings ({{allCount}})</span>
+                        <span class="toggle-label" [class.active]="!showRecentOnly">All Listings</span>
                     </div>
                     <span class="panel-header-small"
                         [class.hidden]="!selectedListings.length">Selected

frontend/src/app/features/components/listings-table/listings-table.component.ts

@@ -1,7 +1,6 @@
 import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
 import { ListingDataService } from '../../../common/services/listing-data.service';
-import { PagingResponsePageInfo } from '../../../common/models/paging-response';
-import { ListingResponseWithCounts } from '../../../common/models/listing-response-with-counts';
+import { PagingResponse, PagingResponsePageInfo } from '../../../common/models/paging-response';
 import { ListingTableRow } from '../../../common/models/listing-table-row';
 import { CommonModule } from '@angular/common';
 import { TableModule } from 'primeng/table';
@@ -32,6 +31,7 @@ import { UrlProtocolPipe } from '../../../common/pipes/url-protocol.pipe';
 import { ListingDetails } from '../../../common/models/listing-details';
 import { FormsModule } from '@angular/forms';
 import { ToggleSwitchModule } from 'primeng/toggleswitch';
+import { forkJoin } from 'rxjs';
 
 @Component({
   selector: 'app-listings-table',
@@ -78,8 +78,6 @@ export class ListingsTableComponent implements OnInit {
   currentFilter!: ListingFilter;
   cancelableFilter!: ListingFilter;
   showRecentOnly = true; // Default to "Recently Reported"
-  recentCount = 0;
-  allCount = 0;
 
   readonly addressLowScore = Number.parseInt(environment.ADDRESS_SCORE);
 
@@ -354,8 +352,6 @@ export class ListingsTableComponent implements OnInit {
 
   onToggleChange(): void {
     this.selectedListings = [];
-    this.skipNextPageChange = true;
-    this.paginator.changePage(0);
     this.getListings(1);
   }
 
@@ -365,25 +361,44 @@ export class ListingsTableComponent implements OnInit {
     const searchReq = {} as ListingSearchRequest;
     searchReq[this.searchColumn] = this.searchTerm;
 
-    this.listingService.getListings(
-      selectedPageNumber ?? (this.currentPage?.pageNumber || 0),
-      this.currentPage?.pageSize || 25,
-      this.sort?.prop || '',
-      this.sort?.dir || 'asc',
-      searchReq,
-      this.currentFilter,
-      this.showRecentOnly,
-    ).subscribe({
-      next: (res: ListingResponseWithCounts<ListingTableRow>) => {
-        this.currentPage = res.pageInfo;
-        this.listings = res.sourceList;
-        this.recentCount = res.recentCount;
-        this.allCount = res.allCount;
+    const pageNumber = Math.max(1, selectedPageNumber ?? this.currentPage?.pageNumber ?? 1);
+    const pageSize = this.currentPage?.pageSize || 25;
+    const orderBy = this.sort?.prop || '';
+    const direction = this.sort?.dir || 'asc';
+
+    forkJoin({
+      count: this.listingService.getListingsCount(searchReq, this.currentFilter, this.showRecentOnly),
+      data: this.listingService.getListings(
+        pageNumber,
+        pageSize,
+        orderBy,
+        direction,
+        searchReq,
+        this.currentFilter,
+        this.showRecentOnly,
+        false,
+      ),
+    }).subscribe({
+      next: ({ count, data }: { count: number; data: PagingResponse<ListingTableRow> }) => {
+        this.currentPage = data.pageInfo;
+        this.currentPage.totalCount = count;
+        this.listings = data.sourceList;
+        // Sync paginator to first page after load so subsequent paging works (e.g. after toggle Recent/All)
+        if (this.paginator && data.pageInfo.pageNumber === 1) {
+          this.skipNextPageChange = true;
+          this.paginator.changePage(0);
+          // If paginator was already on page 0 it may not emit; clear flag so next page click works
+          setTimeout(() => { this.skipNextPageChange = false; }, 0);
+        }
+      },
+      error: () => {
+        this.loaderService.loadingEnd();
+        this.cd.detectChanges();
       },
       complete: () => {
         this.loaderService.loadingEnd();
         this.cd.detectChanges();
-      }
+      },
     });
   }