Fix: ORV2-1986 Company name search will search both legal and altern…

…ate name (#1208)
bcgov · Feb 15, 2024 · 2567f39 · 2567f39
1 parent f3bc536
commit 2567f39
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 13 deletions.
diff --git a/frontend/src/features/idir/search/api/idirSearch.ts b/frontend/src/features/idir/search/api/idirSearch.ts
@@ -38,7 +38,7 @@ export const getCompanyDataBySearch = (
 ): Promise<PaginatedResponse<CompanyProfile>> => {
   const searchURL = new URL(`${VEHICLES_URL}/${searchEntity}`);
   if (searchByFilter === "companyName") {
-    searchURL.searchParams.set("legalName", searchString);
+    searchURL.searchParams.set("companyName", searchString);
   } else {
     searchURL.searchParams.set("clientNumber", searchString);
   }

diff --git a/vehicles/src/modules/company-user-management/company/company.controller.ts b/vehicles/src/modules/company-user-management/company/company.controller.ts
@@ -110,7 +110,7 @@ export class CompanyController {
         page: getCompanyQueryParamsDto.page,
         take: getCompanyQueryParamsDto.take,
         orderBy: getCompanyQueryParamsDto.orderBy,
-        legalName: getCompanyQueryParamsDto.legalName,
+        companyName: getCompanyQueryParamsDto.companyName,
         clientNumber: getCompanyQueryParamsDto.clientNumber,
       });
 

diff --git a/vehicles/src/modules/company-user-management/company/company.service.ts b/vehicles/src/modules/company-user-management/company/company.service.ts
@@ -387,7 +387,7 @@ export class CompanyService {
     page: number;
     take: number;
     orderBy?: string;
-    legalName?: string;
+    companyName?: string;
     clientNumber?: string;
   }): Promise<PaginationDto<ReadCompanyDto>> {
     const companiesQB = this.companyRepository
@@ -402,11 +402,17 @@ export class CompanyService {
     // Apply mandatory condition to ensure at least one filter is applied
     companiesQB.where('company.companyId IS NOT NULL');
 
-    if (findCompanyPaginatedOptions.legalName) {
-      // Add condition for filtering by legal name if provided
-      companiesQB.andWhere('company.legalName LIKE :legalName', {
-        legalName: `%${findCompanyPaginatedOptions.legalName}%`,
-      });
+    if (findCompanyPaginatedOptions.companyName) {
+      // Add condition for filtering by legal name or alternate name if provided
+      companiesQB.andWhere(
+        new Brackets((qb) => {
+          qb.where('company.legalName LIKE :legalName', {
+            legalName: `%${findCompanyPaginatedOptions.companyName}%`,
+          }).orWhere('company.alternateName LIKE :legalName', {
+            legalName: `%${findCompanyPaginatedOptions.companyName}%`,
+          });
+        }),
+      );
     }
 
     if (findCompanyPaginatedOptions.clientNumber) {

diff --git a/...les/company-user-management/company/dto/request/queryParam/getCompany.query-params.dto.ts b/...les/company-user-management/company/dto/request/queryParam/getCompany.query-params.dto.ts
@@ -8,12 +8,12 @@ export class GetCompanyQueryParamsDto extends PageOptionsDto {
   @ApiProperty({
     example: 'Parisian LLC Trucking',
     description:
-      'Filters the results with the legal name of the company. This field is optional.',
+      'Filters the results with the legal/DBA name of the company. This field is optional.',
     required: false,
   })
   @IsOptional()
   @IsString()
-  legalName?: string;
+  companyName?: string;
 
   @ApiProperty({
     example: 'B3-000005-722',

diff --git a/vehicles/test/unit/company/company.controller.spec.ts b/vehicles/test/unit/company/company.controller.spec.ts
@@ -170,7 +170,7 @@ describe('CompanyController', () => {
         take: 10,
         orderBy: 'companyId:DESC',
         clientNumber: 'Red Truck Inc',
-        legalName: 'B3-000005-722',
+        companyName: 'B3-000005-722',
       };
       const retCompanyData = await controller.getCompanyPaginated(
         request,

diff --git a/vehicles/test/unit/company/company.service.spec.ts b/vehicles/test/unit/company/company.service.spec.ts
@@ -245,14 +245,14 @@ describe('CompanyService', () => {
         take: 10,
         orderBy: 'companyId:DESC',
         clientNumber: 'Red Truck Inc',
-        legalName: 'B3-000005-722',
+        companyName: 'B3-000005-722',
       };
 
       const retCompanies = await service.findCompanyPaginated({
         page: getCompanyQueryParamsDto.page,
         take: getCompanyQueryParamsDto.take,
         orderBy: getCompanyQueryParamsDto.orderBy,
-        legalName: getCompanyQueryParamsDto.legalName,
+        companyName: getCompanyQueryParamsDto.companyName,
         clientNumber: getCompanyQueryParamsDto.clientNumber,
       });