Merge pull request #1958 from bcgov/feature/ALCS-1874-qa-fixes

ALCS-1874 QA fixes
bcgov · Nov 6, 2024 · e2a99b8 · e2a99b8
2 parents 877f8e2 + 84852e8
commit e2a99b8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/alcs-frontend/src/app/features/search/search.component.ts b/alcs-frontend/src/app/features/search/search.component.ts
@@ -446,7 +446,7 @@ export class SearchComponent implements OnInit, OnDestroy {
 
     if (!this.tags.find((tag) => tag.uuid === selectedTag.uuid)) {
       this.tags.push(selectedTag);
-      this.tagInput!.nativeElement.value = ' ';
+      this.tagInput!.nativeElement.value = '';
       this.tagControl.setValue('');
       this.searchForm.controls.tag.setValue(this.tags.map((t) => t.uuid));
     }

diff --git a/services/apps/alcs/src/utils/search/application-search-filters.ts b/services/apps/alcs/src/utils/search/application-search-filters.ts
@@ -48,6 +48,11 @@ export const APP_SEARCH_FILTERS = {
       .where('application_tag.tag_uuid IN (:...tagIds)', {
         tagIds: searchDto.tagIds,
       })
+      .groupBy('app.fileNumber')
+      .addGroupBy('app.uuid')
+      .having('count(distinct tag_uuid) = :countCategories', {
+        countCategories: searchDto.tagIds?.length,
+      })
       .getMany();
   },
   addTagCategoryResults: (searchDto: SearchRequestDto | InboxRequestDto, appRepository: Repository<Application>) => {

diff --git a/services/apps/alcs/src/utils/search/notice-of-intent-search-filters.ts b/services/apps/alcs/src/utils/search/notice-of-intent-search-filters.ts
@@ -42,6 +42,11 @@ export const NOI_SEARCH_FILTERS = {
       .where('notice_of_intent_tag.tag_uuid IN (:...tagIds)', {
         tagIds: searchDto.tagIds,
       })
+      .groupBy('noi.fileNumber')
+      .addGroupBy('noi.uuid')
+      .having('count(distinct tag_uuid) = :countCategories', {
+        countCategories: searchDto.tagIds?.length,
+      })
       .getMany();
   },
   addTagCategoryResults: (searchDto: SearchRequestDto | InboxRequestDto, noiRepository: Repository<NoticeOfIntent>) => {