fix tests

Author: virgilchiriac

apps/server/src/modules/user/repo/scope/user.scope.spec.ts

@@ -325,7 +325,9 @@ describe('UserScope', () => {
 			it('should add a query that removes deleted users', () => {
 				scope1.withDeleted(false);
 
-				expect(scope1.query).toEqual({ $or: [{ deletedAt: { $exists: false } }, { deletedAt: null }] });
+				expect(scope1.query).toEqual({
+					$or: [{ deletedAt: { $exists: false } }, { deletedAt: null }, { deletedAt: { $gte: expect.any(Date) } }],
+				});
 			});
 		});
 	});

apps/server/src/modules/user/repo/scope/user.scope.ts

@@ -95,7 +95,9 @@ export class UserScope extends Scope<User> {
 
 	public withDeleted(deleted?: boolean): UserScope {
 		if (!deleted) {
-			this.addQuery({ $or: [{ deletedAt: { $exists: false } }, { deletedAt: null }] });
+			this.addQuery({
+				$or: [{ deletedAt: { $exists: false } }, { deletedAt: null }, { deletedAt: { $gte: new Date() } }],
+			});
 		}
 
 		return this;

apps/server/src/modules/user/repo/user-do.repo.integration.spec.ts

@@ -608,14 +608,19 @@ describe('UserRepo', () => {
 		});
 
 		const setupFind = async () => {
-			const query = {
+			let query = {
 				schoolId: undefined,
 				isOutdated: undefined,
 				lastLoginSystemChangeSmallerThan: undefined,
 				outdatedSince: undefined,
 				lastLoginSystemChangeBetweenEnd: undefined,
 				lastLoginSystemChangeBetweenStart: undefined,
 			};
+			const deletedFilter = {
+				$or: [{ deletedAt: { $exists: false } }, { deletedAt: null }, { deletedAt: { $gte: expect.any(Date) } }],
+			};
+
+			query = { ...query, ...deletedFilter };
 
 			const options: IFindOptions<UserDo> = {};
 
@@ -630,12 +635,12 @@ describe('UserRepo', () => {
 
 			const emFindAndCountSpy = jest.spyOn(em, 'findAndCount');
 
-			return { query, options, users, emFindAndCountSpy };
+			return { query, options, users, emFindAndCountSpy, deletedFilter };
 		};
 
 		describe('sorting', () => {
 			it('should create queryOrderMap with options.order', async () => {
-				const { query, options, emFindAndCountSpy } = await setupFind();
+				const { query, options, emFindAndCountSpy, deletedFilter } = await setupFind();
 				options.order = {
 					id: SortOrder.asc,
 				};
@@ -644,22 +649,22 @@ describe('UserRepo', () => {
 
 				expect(emFindAndCountSpy).toHaveBeenCalledWith(
 					User,
-					{},
+					deletedFilter,
 					expect.objectContaining<FindOptions<User>>({
 						orderBy: expect.objectContaining<QueryOrderMap<User>>({ _id: options.order.id }) as QueryOrderMap<User>,
 					})
 				);
 			});
 
 			it('should create queryOrderMap with an empty object', async () => {
-				const { query, options, emFindAndCountSpy } = await setupFind();
+				const { query, options, emFindAndCountSpy, deletedFilter } = await setupFind();
 				options.order = undefined;
 
 				await repo.find(query, options);
 
 				expect(emFindAndCountSpy).toHaveBeenCalledWith(
 					User,
-					{},
+					deletedFilter,
 					expect.objectContaining<FindOptions<User>>({
 						orderBy: expect.objectContaining<QueryOrderMap<User>>({}) as QueryOrderMap<User>,
 					})
@@ -740,6 +745,9 @@ describe('UserRepo', () => {
 					lastLoginSystemChangeBetweenStart: new Date(),
 					lastLoginSystemChangeBetweenEnd: new Date(),
 				};
+				const deletedFilter = {
+					$or: [{ deletedAt: { $exists: false } }, { deletedAt: null }, { deletedAt: { $gte: expect.any(Date) } }],
+				};
 
 				const options: IFindOptions<UserDo> = {};
 
@@ -799,6 +807,13 @@ describe('UserRepo', () => {
 									$eq: query.outdatedSince,
 								},
 							},
+							{
+								$or: [
+									{ deletedAt: { $exists: false } },
+									{ deletedAt: null },
+									{ deletedAt: { $gte: expect.any(Date) } },
+								],
+							},
 						],
 					},
 					expect.objectContaining<FindOptions<User>>({