feat: Changes for My Tasks Implementation (#1108)

* changes for my task serach implementation

* Changes for My Tasks

Author: midhun-aot

backend/cats/src/app/services/application/applicationSearch.service.spec.ts

@@ -86,11 +86,68 @@ describe('ApplicationSearchService', () => {
       `ApplicationSearchService: searchParam: ${searchParam}, page: ${page}, pageSize: ${pageSize}, filter: ${filter}, sortBy: ${sortBy}, sortByDir: ${sortByDir}.`,
     );
     expect(loggerService.log).toHaveBeenNthCalledWith(
-      2,
+      3,
       'ApplicationSearchService: 1 applications found.',
     );
   });
 
+  it('should filter applications by MY_ASSIGNED filter with user email', async () => {
+    const searchParam = 'test';
+    const page = 1;
+    const pageSize = 10;
+    const filter = Filter.MY_ASSIGNED;
+    const sortBy = SortByField.ID;
+    const sortByDir = SortByDirection.ASC;
+    const user = { email: 'test@example.com' };
+
+    const mockApplication = new Application();
+    mockApplication.id = 1;
+    mockApplication.siteId = 1;
+    mockApplication.updatedDateTime = new Date();
+    mockApplication.appParticipants = [];
+    mockApplication.appPriorities = [];
+
+    const queryBuilderMock = {
+      leftJoinAndSelect: jest.fn().mockReturnThis(),
+      andWhere: jest.fn().mockReturnThis(),
+      orWhere: jest.fn().mockReturnThis(),
+      skip: jest.fn().mockReturnThis(),
+      take: jest.fn().mockReturnThis(),
+      orderBy: jest.fn().mockReturnThis(),
+      getManyAndCount: jest.fn().mockResolvedValue([[mockApplication], 1]),
+    };
+
+    jest
+      .spyOn(repository, 'createQueryBuilder')
+      .mockReturnValue(queryBuilderMock as any);
+
+    const result = await service.searchApplications(
+      searchParam,
+      page,
+      pageSize,
+      filter,
+      sortBy,
+      sortByDir,
+      user,
+    );
+
+    expect(result).toBeInstanceOf(ApplicationSearchResult);
+    expect(result.applications.length).toBe(1);
+    expect(result.count).toBe(1);
+
+    // Verify that the user email filter was applied
+    expect(queryBuilderMock.andWhere).toHaveBeenCalledWith(
+      'person.email = :email',
+      { email: 'test@example.com' },
+    );
+
+    // Verify the user email log was called
+    expect(loggerService.log).toHaveBeenNthCalledWith(
+      2,
+      'ApplicationSearchService: Logged in user email: test@example.com.',
+    );
+  });
+
   it('should throw an error if search fails', async () => {
     jest.spyOn(repository, 'createQueryBuilder').mockReturnValue({
       leftJoinAndSelect: jest.fn().mockReturnThis(),

backend/cats/src/app/services/application/applicationSearch.service.ts

@@ -30,6 +30,11 @@ export class ApplicationSearchService {
     this.loggerService.log(
       `ApplicationSearchService: searchParam: ${searchParam}, page: ${page}, pageSize: ${pageSize}, filter: ${filter}, sortBy: ${sortBy}, sortByDir: ${sortByDir}.`,
     );
+    this.loggerService.log(
+      `ApplicationSearchService: Logged in user email: ${
+        user?.email || 'No email found'
+      }.`,
+    );
 
     const result = new ApplicationSearchResult();
     if (page <= 0 || pageSize <= 0) {
@@ -86,10 +91,14 @@ export class ApplicationSearchService {
       }),
     );
 
-    if (filter && filter.toLowerCase() === Filter.ASSIGNED) {
+    if (filter && filter.toLowerCase() === Filter.MY_ASSIGNED) {
       query.andWhere('person.email = :email', { email: user.email });
     }
 
+    if (filter && filter.toLowerCase() === Filter.ASSIGNED) {
+      query.andWhere('appParticipant.personId IS NOT NULL');
+    }
+
     if (filter === Filter.UNASSIGNED) {
       query.andWhere('appParticipant.personId IS NULL');
     } else if (filter === Filter.COMPLETED) {

backend/cats/src/app/utilities/enums/application/filter.enum.ts

@@ -6,6 +6,7 @@ export enum Filter {
   COMPLETED = 'completed',
   OVERCAPACITY = 'overcapacity',
   ASSIGNED = 'assigned',
+  MY_ASSIGNED = 'my_assigned',
 }
 
 registerEnumType(Filter, {

cats-frontend/src/app/features/applications/search/Search.tsx

@@ -33,7 +33,7 @@ const Search: React.FC<SearchProps> = ({ filterMyTasks = false }) => {
     applicationResultColumns(filterMyTasks),
   );
   const [filter, setFilter] = useState<Filter>(
-    filterMyTasks === true ? Filter.Assigned : Filter.All,
+    filterMyTasks === true ? Filter.MyAssigned : Filter.All,
   );
   const [page, setPage] = useState<number>(1);
   const [pageSize, setPageSize] = useState<number>(5);
@@ -49,7 +49,7 @@ const Search: React.FC<SearchProps> = ({ filterMyTasks = false }) => {
     searchTerm: '',
     page: 1,
     pageSize: 5,
-    filter: filterMyTasks === true ? Filter.Assigned : Filter.All,
+    filter: filterMyTasks === true ? Filter.MyAssigned : Filter.All,
     sortBy: ApplicationSortByField.Id,
     sortByDir: ApplicationSortByDirection.Asc,
   });
@@ -67,6 +67,7 @@ const Search: React.FC<SearchProps> = ({ filterMyTasks = false }) => {
       sortBy: searchParams.sortBy,
       sortByDir: searchParams.sortByDir,
     },
+    fetchPolicy: 'network-only',
   });
 
   useEffect(() => {
@@ -198,7 +199,7 @@ const Search: React.FC<SearchProps> = ({ filterMyTasks = false }) => {
     {
       label: 'Assigned to Me',
       value: Filter.Assigned,
-      onClick: () => handleFilterChange(Filter.Assigned),
+      onClick: () => handleFilterChange(Filter.MyAssigned),
       isSelected: filter === Filter.Assigned,
     },
   ];