src/users/services/jobs.service.ts

@@ -23,9 +23,9 @@ export class JobsService {
   public async findAll(filterValidatedJobs = true): Promise<IJob[]> {
     this.logger.debug(`findAll with filterValidetedJobs: ${filterValidatedJobs}`);
     if (!filterValidatedJobs) {
-      return this.jobModel.find();
+      return this.jobModel.find().collation({ locale: 'fr' }).sort({ name: 1 }).exec();
     } else {
-      return this.jobModel.find({ validated: true });
+      return this.jobModel.find({ validated: true }).collation({ locale: 'fr' }).sort({ name: 1 }).exec();
     }
   }
 

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),

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) => {

src/users/services/users.service.ts

@@ -53,7 +53,13 @@ export class UsersService {
       );
     }
     let createUser = new this.userModel(createUserDto);
-    createUser.structuresLink = createUser.structuresLink.map((id) => new Types.ObjectId(id));
+    createUser.surname = createUser.surname.toUpperCase();
+    createUser.structuresLink = [];
+    if (createUserDto.structuresLink) {
+      createUserDto.structuresLink.forEach((structureId) => {
+        createUser.structuresLink.push(new Types.ObjectId(structureId));
+      });
+    }
     createUser.password = await this.hashPassword(createUser.password);
     createUser.unattachedSince = DateTime.local();
     // Send verification email
@@ -112,6 +118,7 @@ export class UsersService {
       .equals(true)
       .where('structuresLink')
       .size(0)
+      .collation({ locale: 'fr' })
       .sort({ surname: 1 })
       .populate('employer')
       .populate('job')
@@ -124,6 +131,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 +144,7 @@ export class UsersService {
       .find()
       .where('emailVerified')
       .equals(false)
+      .collation({ locale: 'fr' })
       .sort({ surname: 1 })
       .populate('employer')
       .populate('job')

test/mock/data/structures.mock.data.ts

@@ -19,6 +19,7 @@ export const structuresDocumentDataMock: StructureDocument[] = [
       street: 'Rue Alphonse Daudet',
       commune: 'Lyon 7ème Arrondissement',
       postcode: '69007',
+      inseeCode: '69387',
     },
     contactMail: '',
     contactPhone: '',
@@ -95,6 +96,7 @@ export const structuresDocumentDataMock: StructureDocument[] = [
       street: 'Rue Alphonse Daudet',
       commune: 'Lyon 7ème Arrondissement',
       postcode: '69007',
+      inseeCode: '69387',
     },
     contactMail: '',
     contactPhone: '',
@@ -179,6 +181,7 @@ export const structureMockDto: StructureDto = {
     street: 'Rue Alphonse Daudet',
     commune: 'Lyon 7ème Arrondissement',
     postcode: '69007',
+    inseeCode: '69387',
   },
   contactMail: '',
   contactPhone: '',

test/mock/services/structures-for-search.mock.service.ts

@@ -10,6 +10,7 @@ export class StructuresForSearchServiceMock {
           street: 'Avenue Edouard Aynard',
           commune: 'Écully',
           postcode: '69130',
+          inseeCode: '69081',
         },
         nbPrinters: 1,
         description:
@@ -24,6 +25,7 @@ export class StructuresForSearchServiceMock {
           street: " Place de l'Abbe Launay",
           commune: 'Grézieu-la-Varenne',
           postcode: '69290',
+          inseeCode: '69094',
         },
         nbPrinters: 1,
         description: null,
@@ -37,6 +39,7 @@ export class StructuresForSearchServiceMock {
           street: 'Place de la Mairie',
           commune: 'La Tour-de-Salvagny',
           postcode: '69890',
+          inseeCode: '69250',
         },
         nbPrinters: 1,
         description: null,
@@ -50,6 +53,7 @@ export class StructuresForSearchServiceMock {
           street: 'Chemin Jean-Marie Vianney',
           commune: 'Écully',
           postcode: '69130',
+          inseeCode: '69081',
         },
         nbPrinters: 1,
         description: null,
@@ -63,6 +67,7 @@ export class StructuresForSearchServiceMock {
           street: 'Rue Tupin',
           commune: 'Oullins',
           postcode: '69600',
+          inseeCode: '69149',
         },
         description: null,
         nbPrinters: 1,
@@ -76,7 +81,8 @@ export class StructuresForSearchServiceMock {
           numero: '7',
           street: 'Rue Robert et Reynier ',
           commune: 'Saint-Fons',
-          postcode: '69199',
+          postcode: '69190',
+          inseeCode: '69199',
         },
         nbScanners: 1,
         description:
@@ -91,6 +97,7 @@ export class StructuresForSearchServiceMock {
           street: 'a Rue du Mai 1945',
           commune: 'Villeurbanne',
           postcode: '69100',
+          inseeCode: '69266',
         },
         nbScanners: 1,
         description: "Notre rôle est de faciliter l'accès des personnes aux services nécessaires à la vie quotidienne",

test/mock/services/structures.mock.service.ts

@@ -58,6 +58,7 @@ export class StructuresServiceMock {
           street: 'Rue Alphonse Daudet',
           commune: 'Lyon 7ème Arrondissement',
           postcode: '69007',
+          inseeCode: '69387',
         },
         contactMail: '',
         contactPhone: '',
@@ -249,7 +250,8 @@ export class StructuresServiceMock {
           numero: '30 bis',
           street: 'Avenue Leclerc',
           commune: 'Rillieux-la-Pape',
-          postcode: '69286',
+          postcode: '69140',
+          inseeCode: '69286',
         },
         coord: [4.9036773, 45.8142196],
         accountVerified: true,
@@ -403,7 +405,8 @@ export class StructuresServiceMock {
           numero: '30 bis',
           street: 'Avenue Leclerc',
           commune: 'Rillieux-la-Pape',
-          postcode: '69286',
+          postcode: '69140',
+          inseeCode: '69286',
         },
         coord: [4.9036773, 45.8142196],
         accountVerified: true,
@@ -470,6 +473,7 @@ export class StructuresServiceMock {
           street: 'Rue Alphonse Daudet',
           commune: 'Lyon 7ème Arrondissement',
           postcode: '69007',
+          inseeCode: '69387',
         },
         contactMail: '',
         contactPhone: '',
@@ -571,6 +575,7 @@ export class StructuresServiceMock {
           street: 'Rue Alphonse Daudet',
           commune: 'Lyon 7ème Arrondissement',
           postcode: '69007',
+          inseeCode: '69387',
         },
         contactMail: '',
         contactPhone: '',
@@ -677,6 +682,7 @@ export class StructuresServiceMock {
           street: 'Rue Alphonse Daudet',
           commune: 'Lyon 7ème Arrondissement',
           postcode: '69007',
+          inseeCode: '69387',
         },
         contactMail: '',
         contactPhone: '',
@@ -778,6 +784,7 @@ export class StructuresServiceMock {
           street: 'Rue Alphonse Daudet',
           commune: 'Lyon 7ème Arrondissement',
           postcode: '69007',
+          inseeCode: '69387',
         },
         contactMail: '',
         contactPhone: '',
@@ -884,6 +891,7 @@ export class StructuresServiceMock {
           street: 'Rue Alphonse Daudet',
           commune: 'Lyon 7ème Arrondissement',
           postcode: '69007',
+          inseeCode: '69387',
         },
         contactMail: '',
         contactPhone: '',
@@ -986,8 +994,9 @@ export class StructuresServiceMock {
           numero: null,
           street: 'Rue Alphonse Daudet',
           commune: 'Lyon 7ème Arrondissement',
+          postcode: '69007',
+          inseeCode: '69387',
         },
-        postcode: '69007',
         contactMail: '',
         contactPhone: '',
         website: '',
@@ -1065,6 +1074,7 @@ export class StructuresServiceMock {
         street: 'Rue Alphonse Daudet',
         commune: 'Lyon 7ème Arrondissement',
         postcode: '69007',
+        inseeCode: '69387',
       },
       contactMail: '',
       contactPhone: '',
@@ -1178,6 +1188,7 @@ export class StructuresServiceMock {
           street: 'Rue Alphonse Daudet',
           commune: 'Lyon 7ème Arrondissement',
           postcode: '69007',
+          inseeCode: '69387',
         },
         contactMail: '',
         contactPhone: '',
@@ -1222,7 +1233,7 @@ export class StructuresServiceMock {
         nbComputers: 1,
         nbPrinters: 1,
         nbScanners: 1,
-        freeWorkShop: false,
+        freeWorkShop: 'Non',
         accountVerified: true,
         personalOffers: [personalOfferDocument],
         createdAt: new Date('2021-05-06T09:42:38.000Z'),
@@ -1386,6 +1397,7 @@ export const mockResinStructures: Array<Structure> = [
       street: 'Rue Alphonse Daudet',
       commune: 'Lyon 7ème Arrondissement',
       postcode: '69007',
+      inseeCode: '69387',
     },
     website: '',
     facebook: null,
@@ -1428,7 +1440,7 @@ export const mockResinStructures: Array<Structure> = [
     nbComputers: 1,
     nbPrinters: 1,
     nbScanners: 1,
-    freeWorkShop: false,
+    freeWorkShop: 'Non',
     accountVerified: true,
     createdAt: new Date('2021-05-06T09:42:38.000Z'),
     updatedAt: new Date('2021-05-06T09:42:50.000Z'),
@@ -1490,6 +1502,7 @@ export const mockResinStructures: Array<Structure> = [
       street: 'Rue Alphonse Daudet',
       commune: 'Lyon 7ème Arrondissement',
       postcode: '69007',
+      inseeCode: '69387',
     },
     website: '',
     facebook: null,
@@ -1532,7 +1545,7 @@ export const mockResinStructures: Array<Structure> = [
     nbComputers: 1,
     nbPrinters: 1,
     nbScanners: 1,
-    freeWorkShop: false,
+    freeWorkShop: 'Non',
     accountVerified: true,
     personalOffers: [],
     createdAt: new Date('2021-05-06T09:42:38.000Z'),
@@ -1594,6 +1607,7 @@ export const mockResinStructures: Array<Structure> = [
       street: 'Rue Alphonse Daudet',
       commune: 'Lyon 7ème Arrondissement',
       postcode: '69007',
+      inseeCode: '69387',
     },
     website: '',
     facebook: null,
@@ -1636,7 +1650,7 @@ export const mockResinStructures: Array<Structure> = [
     nbComputers: 1,
     nbPrinters: 1,
     nbScanners: 1,
-    freeWorkShop: false,
+    freeWorkShop: 'Non',
     accountVerified: true,
     personalOffers: [],
     createdAt: new Date('2021-05-06T09:42:38.000Z'),