From 163ab8baf5b952def1b5c67e8efc84b6278a99ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marl=C3=A8ne=20SIMONDANT?= <msimondant@grandlyon.com>
Date: Thu, 2 Feb 2023 15:22:52 +0000
Subject: [PATCH] fix(registry): alphabetical sorting
---
src/users/services/userRegistry.service.spec.ts | 1 +
src/users/services/userRegistry.service.ts | 4 ++++
src/users/services/users.service.ts | 3 +++
3 files changed, 8 insertions(+)
diff --git a/src/users/services/userRegistry.service.spec.ts b/src/users/services/userRegistry.service.spec.ts
index f2b30d5b1..ba6bec672 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 9e5f80ba0..d96f4ae6f 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 48456e301..2f43e6543 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')
--
GitLab