diff --git a/src/users/services/userRegistry.service.spec.ts b/src/users/services/userRegistry.service.spec.ts index f2b30d5b12a19ff447b4d5b509030eeada2d276c..ba6bec6724b8b48cd75430cd6615e29b6ee69add 100644 --- a/src/users/services/userRegistry.service.spec.ts +++ b/src/users/services/userRegistry.service.spec.ts @@ -17,6 +17,7 @@ describe('userRegistryService', () => { where: jest.fn(() => mockUserRegistryModel), equals: jest.fn(() => mockUserRegistryModel), populate: jest.fn(() => mockUserRegistryModel), + collation: jest.fn(() => mockUserRegistryModel), sort: jest.fn(() => mockUserRegistryModel), select: jest.fn(() => mockUserRegistryModel), exec: jest.fn(() => mockUserRegistryModel), diff --git a/src/users/services/userRegistry.service.ts b/src/users/services/userRegistry.service.ts index 9e5f80ba01a25d1b58eba6a85d272e09ca946d31..d96f4ae6f7136ed1de6bfb7a7e565192a5b5b2a6 100644 --- a/src/users/services/userRegistry.service.ts +++ b/src/users/services/userRegistry.service.ts @@ -29,6 +29,7 @@ export class UserRegistryService { .equals(true) .select('name surname _id job employer ') .populate('job employer') + .collation({ locale: 'fr' }) .sort({ surname: 1 }) .exec(); } @@ -42,6 +43,7 @@ export class UserRegistryService { .populate('employer') .populate('job') .select('name surname employer job _id ') + .collation({ locale: 'fr' }) .sort({ surname: 1 }) .count() .exec(); @@ -59,6 +61,7 @@ export class UserRegistryService { .populate('job') .select('name surname employer job _id ') .limit(limit) + .collation({ locale: 'fr' }) .sort({ surname: 1 }) .exec(); return { count: count, docs: docs }; @@ -118,6 +121,7 @@ export class UserRegistryService { .equals(true) .select('name surname employer job _id ') .populate('employer job') + .collation({ locale: 'fr' }) .sort({ surname: 1 }) .exec() .then((res) => { diff --git a/src/users/services/users.service.ts b/src/users/services/users.service.ts index 48456e301cfe48896657a2e239457ce7a4ca3c70..2f43e6543f2125319e5342b179c76e57b9ba10ea 100644 --- a/src/users/services/users.service.ts +++ b/src/users/services/users.service.ts @@ -112,6 +112,7 @@ export class UsersService { .equals(true) .where('structuresLink') .size(0) + .collation({ locale: 'fr' }) .sort({ surname: 1 }) .populate('employer') .populate('job') @@ -124,6 +125,7 @@ export class UsersService { .find({ $where: 'this.structuresLink.length>0' }) .where('emailVerified') .equals(true) + .collation({ locale: 'fr' }) .sort({ surname: 1 }) .populate('employer') .populate('job') @@ -136,6 +138,7 @@ export class UsersService { .find() .where('emailVerified') .equals(false) + .collation({ locale: 'fr' }) .sort({ surname: 1 }) .populate('employer') .populate('job')