Change way of checking if user is active or not

AntoineSmagghe · AntoineSmagghe · commit 60937328af84 · 2026-01-09T17:13:19.000+01:00
diff --git a/src/Application/HumanResource/User/Query/GetUserAdministrativeByIdQueryHandler.ts b/src/Application/HumanResource/User/Query/GetUserAdministrativeByIdQueryHandler.ts
@@ -48,6 +48,7 @@ export class GetUserAdministrativeByIdQueryHandler {
       user.getEmail(),
       user.getRole(),
       user.isAdministrativeEditable(),
+      user.isActive(),
       userAdministrativeView
     );
   }
diff --git a/src/Application/HumanResource/User/Query/GetUserByIdQueryHandler.ts b/src/Application/HumanResource/User/Query/GetUserByIdQueryHandler.ts
@@ -24,7 +24,7 @@ export class GetUserByIdQueryHandler {
       user.getLastName(),
       user.getEmail(),
       user.getRole(),
-      user.isAdministrativeEditable()
+      user.isAdministrativeEditable(),
     );
   }
 }
diff --git a/src/Application/HumanResource/User/Query/GetUsersQuery.ts b/src/Application/HumanResource/User/Query/GetUsersQuery.ts
@@ -3,7 +3,5 @@ import { IQuery } from 'src/Application/IQuery';
 export class GetUsersQuery implements IQuery {
   constructor(
     public readonly withAccountant: boolean = false,
-    public readonly activeOnly: boolean = false,
-    public readonly inactiveOnly: boolean = false
   ) {}
 }
diff --git a/src/Application/HumanResource/User/Query/GetUsersQueryHandler.spec.ts b/src/Application/HumanResource/User/Query/GetUsersQueryHandler.spec.ts
@@ -25,7 +25,7 @@ describe('GetUsersQueryHandler', () => {
     when(user2.getRole()).thenReturn(UserRole.COOPERATOR);
     when(user2.isAdministrativeEditable()).thenReturn(true);
 
-    when(userRepository.findUsers(true, false, false)).thenResolve([
+    when(userRepository.findUsers(true)).thenResolve([
       instance(user1),
       instance(user2)
     ]);
@@ -38,6 +38,7 @@ describe('GetUsersQueryHandler', () => {
         'MARCHOIS',
         'mathieu@fairness.coop',
         UserRole.COOPERATOR,
+        true,
         true
       ),
       new UserView(
@@ -46,54 +47,55 @@ describe('GetUsersQueryHandler', () => {
         'MARCHOIS',
         'helene@fairness.coop',
         UserRole.COOPERATOR,
-        true
+        true,
+        false
       )
     ];
 
-    expect(await handler.execute(new GetUsersQuery(true, false))).toMatchObject(
+    expect(await handler.execute(new GetUsersQuery(true))).toMatchObject(
       expectedResult
     );
-    verify(userRepository.findUsers(true, false, false)).once();
+    verify(userRepository.findUsers(true)).once();
   });
 
   it('testGetEmptyUsers', async () => {
     const userRepository = mock(UserRepository);
 
-    when(userRepository.findUsers(false, false, false)).thenResolve([]);
+    when(userRepository.findUsers(false)).thenResolve([]);
 
     const handler = new GetUsersQueryHandler(instance(userRepository));
 
     expect(
-      await handler.execute(new GetUsersQuery(false, false))
+      await handler.execute(new GetUsersQuery(false))
     ).toMatchObject([]);
-    verify(userRepository.findUsers(false, false, false)).once();
+    verify(userRepository.findUsers(false)).once();
   });
 
   it('testGetActiveUsers', async () => {
     const userRepository = mock(UserRepository);
 
-    when(userRepository.findUsers(true, true, false)).thenResolve([]);
+    when(userRepository.findUsers(true)).thenResolve([]);
 
     const handler = new GetUsersQueryHandler(instance(userRepository));
     const expectedResult = [];
 
-    expect(await handler.execute(new GetUsersQuery(true, true))).toMatchObject(
+    expect(await handler.execute(new GetUsersQuery(true))).toMatchObject(
       expectedResult
     );
-    verify(userRepository.findUsers(true, true, false)).once();
+    verify(userRepository.findUsers(true)).once();
   });
 
   it('testGetInactiveUsers', async () => {
     const userRepository = mock(UserRepository);
 
-    when(userRepository.findUsers(true, false, true)).thenResolve([]);
+    when(userRepository.findUsers(true)).thenResolve([]);
 
     const handler = new GetUsersQueryHandler(instance(userRepository));
     const expectedResult = [];
 
     expect(
-      await handler.execute(new GetUsersQuery(true, false, true))
+      await handler.execute(new GetUsersQuery(true))
     ).toMatchObject(expectedResult);
-    verify(userRepository.findUsers(true, false, true)).once();
+    verify(userRepository.findUsers(true)).once();
   });
 });
diff --git a/src/Application/HumanResource/User/Query/GetUsersQueryHandler.ts b/src/Application/HumanResource/User/Query/GetUsersQueryHandler.ts
@@ -12,13 +12,8 @@ export class GetUsersQueryHandler {
   ) {}
 
   public async execute(query: GetUsersQuery): Promise<UserView[]> {
-    const noLeavingDate = query.activeOnly;
-    const withLeavingDate = query.inactiveOnly;
-
     const users = await this.userRepository.findUsers(
       query.withAccountant,
-      noLeavingDate,
-      withLeavingDate
     );
     const userViews: UserView[] = [];
 
@@ -30,7 +25,8 @@ export class GetUsersQueryHandler {
           user.getLastName(),
           user.getEmail(),
           user.getRole(),
-          user.isAdministrativeEditable()
+          user.isAdministrativeEditable(),
+          user.isActive(),
         )
       );
     }
diff --git a/src/Application/HumanResource/User/View/UserView.ts b/src/Application/HumanResource/User/View/UserView.ts
@@ -9,6 +9,7 @@ export class UserView {
     public readonly email: string,
     public readonly role: UserRole,
     public readonly isAdministrativeEditable: boolean,
+    public readonly isActive: boolean = null,
     public readonly administrativeView: UserAdministrativeView = null
   ) {}
 }
diff --git a/src/Domain/HumanResource/User/Repository/IUserRepository.ts b/src/Domain/HumanResource/User/Repository/IUserRepository.ts
@@ -5,10 +5,6 @@ export interface IUserRepository {
   findOneByEmail(email: string): Promise<User | undefined>;
   findOneById(id: string): Promise<User | undefined>;
   save(user: User): Promise<User>;
-  findUsers(
-    withAccountant: boolean,
-    noLeavingDate: boolean,
-    withLeavingDate: boolean
-  ): Promise<User[]>;
+  findUsers(withAccountant: boolean): Promise<User[]>;
   findUsersWithPayslipInfo(): Promise<User[]>;
 }
diff --git a/src/Domain/HumanResource/User/User.entity.spec.ts b/src/Domain/HumanResource/User/User.entity.spec.ts
@@ -23,6 +23,7 @@ describe('User.entity', () => {
     expect(user.getPassword()).toBe('hashPassword');
     expect(user.getApiToken()).toBe('hashToken');
     expect(user.getRole()).toBe(UserRole.COOPERATOR);
+    expect(user.isActive()).toBe(true);
     expect(user.getUserAdministrative()).toBe(instance(admin));
     expect(user.isAdministrativeEditable()).toBe(true);
   });
diff --git a/src/Domain/HumanResource/User/User.entity.ts b/src/Domain/HumanResource/User/User.entity.ts
@@ -99,6 +99,10 @@ export class User {
     return this.role !== UserRole.ACCOUNTANT;
   }
 
+  public isActive(): boolean {
+    return this.userAdministrative.getLeavingDate() === null;
+  }
+
   public getFullName(): string {
     return `${this.firstName} ${this.lastName}`;
   }
diff --git a/src/Infrastructure/HumanResource/Leave/Controller/ListLeaveRequestsController.ts b/src/Infrastructure/HumanResource/Leave/Controller/ListLeaveRequestsController.ts
@@ -17,8 +17,6 @@ import { LoggedUser } from '../../User/Decorator/LoggedUser';
 import { LeaveRequestTableFactory } from '../Table/LeaveRequestTableFactory';
 import { LeaveRequestsOverviewTableFactory } from '../Table/LeaveRequestOverviewTableFactory';
 import { GetLeaveRequestsOverviewQuery } from 'src/Application/HumanResource/Leave/Query/GetLeaveRequestsOverviewQuery';
-import { UserView } from 'src/Application/HumanResource/User/View/UserView';
-import { GetUsersQuery } from 'src/Application/HumanResource/User/Query/GetUsersQuery';
 import { ListLeaveRequestsControllerDTO } from '../DTO/ListLeaveRequestsControllerDTO';
 
 @Controller('app/people/leave_requests')
diff --git a/src/Infrastructure/HumanResource/User/Controller/EditProfileController.ts b/src/Infrastructure/HumanResource/User/Controller/EditProfileController.ts
@@ -39,7 +39,7 @@ export class EditProfileController {
       user.getLastName(),
       user.getEmail(),
       user.getRole(),
-      false
+      false,
     );
 
     return { user: me };
diff --git a/src/Infrastructure/HumanResource/User/Controller/ListUsersController.ts b/src/Infrastructure/HumanResource/User/Controller/ListUsersController.ts
@@ -18,15 +18,10 @@ export class ListUsersController {
   @WithName('people_users_list')
   @Render('pages/users/list.njk')
   public async get() {
-    const activeUsers = await this.queryBus.execute(
-      new GetUsersQuery(false, true, false)
+    const users = await this.queryBus.execute(
+      new GetUsersQuery(false)
     );
-    const activeUsersTable = this.tableFactory.create(activeUsers);
-
-    const inactiveUsers = await this.queryBus.execute(
-      new GetUsersQuery(false, false, true)
-    );
-    const inactiveUsersTable = this.tableFactory.create(inactiveUsers);
+    const [ activeUsersTable, inactiveUsersTable ] = this.tableFactory.create(users);
 
     return { activeUsersTable, inactiveUsersTable };
   }
diff --git a/src/Infrastructure/HumanResource/User/Repository/UserRepository.ts b/src/Infrastructure/HumanResource/User/Repository/UserRepository.ts
@@ -57,8 +57,6 @@ export class UserRepository implements IUserRepository {
 
   public findUsers(
     withAccountant: boolean,
-    noLeavingDate: boolean = false,
-    withLeavingDate: boolean = false
   ): Promise<User[]> {
     const query = this.repository
       .createQueryBuilder('user')
@@ -67,7 +65,8 @@ export class UserRepository implements IUserRepository {
         'user.firstName',
         'user.lastName',
         'user.email',
-        'user.role'
+        'user.role',
+        'userAdministrative'
       ])
       .innerJoin('user.userAdministrative', 'userAdministrative')
       .orderBy('user.lastName', 'ASC')
@@ -77,14 +76,6 @@ export class UserRepository implements IUserRepository {
       query.andWhere('user.role <> :role', { role: UserRole.ACCOUNTANT });
     }
 
-    if (noLeavingDate) {
-      query.andWhere('userAdministrative.leavingDate IS NULL');
-    }
-
-    if (withLeavingDate) {
-      query.andWhere('userAdministrative.leavingDate IS NOT NULL');
-    }
-
     return query.getMany();
   }
 
diff --git a/src/Infrastructure/HumanResource/User/Table/UserTableFactory.ts b/src/Infrastructure/HumanResource/User/Table/UserTableFactory.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 import { UserView } from 'src/Application/HumanResource/User/View/UserView';
 import { RouteNameResolver } from 'src/Infrastructure/Common/ExtendedRouting/RouteNameResolver';
 import { RowFactory } from 'src/Infrastructure/Tables/RowFactory';
-import { Table } from 'src/Infrastructure/Tables';
+import { ICell, Row, Table } from 'src/Infrastructure/Tables';
 
 @Injectable()
 export class UserTableFactory {
@@ -11,7 +11,7 @@ export class UserTableFactory {
     private readonly rowFactory: RowFactory
   ) {}
 
-  public create(users: UserView[]): Table {
+  public create(users: UserView[]): Table[] {
     const columns = [
       'users-lastName',
       'users-firstName',
@@ -20,8 +20,8 @@ export class UserTableFactory {
       'common-actions'
     ];
 
-    const rows = users.map(user =>
-      this.rowFactory
+    const rows = users.reduce((carry, user) => {
+      const row = this.rowFactory
         .createBuilder()
         .value(user.lastName)
         .value(user.firstName)
@@ -34,9 +34,17 @@ export class UserTableFactory {
             })
           }
         })
-        .build()
-    );
+        .build();
 
-    return new Table(columns, rows);
+      if (user.isActive) {
+        carry[0].push(row);
+      } else {
+        carry[1].push(row);
+      }
+
+      return carry;
+    }, [[], []] as Array<Row[]>);
+
+    return [new Table(columns, rows[0]), new Table(columns, rows[1])];
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ export class GetUserAdministrativeByIdQueryHandler {`
`48`	`48`	`user.getEmail(),`
`49`	`49`	`user.getRole(),`
`50`	`50`	`user.isAdministrativeEditable(),`
	`51`	`+ user.isActive(),`
`51`	`52`	`userAdministrativeView`
`52`	`53`	`);`
`53`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ export class GetUserByIdQueryHandler {`
`24`	`24`	`user.getLastName(),`
`25`	`25`	`user.getEmail(),`
`26`	`26`	`user.getRole(),`
`27`		`- user.isAdministrativeEditable()`
	`27`	`+ user.isAdministrativeEditable(),`
`28`	`28`	`);`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,5 @@ import { IQuery } from 'src/Application/IQuery';`
`3`	`3`	`export class GetUsersQuery implements IQuery {`
`4`	`4`	`constructor(`
`5`	`5`	`public readonly withAccountant: boolean = false,`
`6`		`- public readonly activeOnly: boolean = false,`
`7`		`- public readonly inactiveOnly: boolean = false`
`8`	`6`	`) {}`
`9`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ export class UserView {`
`9`	`9`	`public readonly email: string,`
`10`	`10`	`public readonly role: UserRole,`
`11`	`11`	`public readonly isAdministrativeEditable: boolean,`
	`12`	`+ public readonly isActive: boolean = null,`
`12`	`13`	`public readonly administrativeView: UserAdministrativeView = null`
`13`	`14`	`) {}`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,10 @@ export class User {`
`99`	`99`	`return this.role !== UserRole.ACCOUNTANT;`
`100`	`100`	`}`
`101`	`101`
	`102`	`+ public isActive(): boolean {`
	`103`	`+ return this.userAdministrative.getLeavingDate() === null;`
	`104`	`+ }`
	`105`	`+`
`102`	`106`	`public getFullName(): string {`
`103`	`107`	return `${this.firstName} ${this.lastName}`;
`104`	`108`	`}`