(ajustements) : Fix des champs sélectionne lors de l'agréation dans l…

…e single pour les personnes, org et équipement.
Avantage-Numerique · Sep 9, 2024 · 24dac3f · 24dac3f
1 parent 15172ec
commit 24dac3f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/src/Equipment/Controllers/EquipmentController.ts b/src/Equipment/Controllers/EquipmentController.ts
@@ -81,7 +81,8 @@ class EquipmentController extends AbstractController {
         const results:any = await aggregateService.lookupMultiple({slug: slug}, query);
 
         //agregation inter bd don't work (that I red).
-        const users:mongoose.Model<any> = User.getInstance().mongooseModel;
+        const userAppModel:User = User.getInstance();
+        const users:mongoose.Model<any> = userAppModel.mongooseModel;
         const taxonomies:mongoose.Model<any> = Taxonomy.getInstance().mongooseModel;
         const media:mongoose.Model<any> = Media.getInstance().mongooseModel;
 
@@ -92,8 +93,8 @@ class EquipmentController extends AbstractController {
         await media.populate(results, {path: "organisations.mainImage"});
         await media.populate(results, {path: "projects.mainImage"});
 
-        await users.populate(results, {path: "meta.requestedBy", select: "name username avatar"});
-        await users.populate(results, {path: "meta.lastModifiedBy", select: "name username avatar"});
+        await users.populate(results, {path: "meta.requestedBy", select: userAppModel.publicFields()});
+        await users.populate(results, {path: "meta.lastModifiedBy", select: userAppModel.publicFields()});
 
         if (results.length > 0) {
             return SuccessResponse.create(

diff --git a/src/Organisations/Controllers/OrganisationsController.ts b/src/Organisations/Controllers/OrganisationsController.ts
@@ -190,7 +190,8 @@ class OrganisationsController extends AbstractController {
         const results:any = await aggregateService.lookupMultiple({slug: slug}, query);
 
         //aggregation inter bd don't work (that I red).
-        const users:mongoose.Model<any> = User.getInstance().mongooseModel;
+        const userAppModel:User = User.getInstance();
+        const users:mongoose.Model<any> = userAppModel.mongooseModel;
         const taxonomies:mongoose.Model<any> = Taxonomy.getInstance().mongooseModel;
         const media:mongoose.Model<any> = Media.getInstance().mongooseModel;
         //const equipment:mongoose.Model<any> = Equipment.getInstance().mongooseModel;
@@ -209,8 +210,8 @@ class OrganisationsController extends AbstractController {
         await media.populate(results, {path: "creatorOfEvents.mainImage"});
         await media.populate(results, {path: "projectsPartner.mainImage"});
 
-        await users.populate(results, {path: "meta.requestedBy", select: "name firstName avatar"});
-        await users.populate(results, {path: "meta.lastModifiedBy", select: "name firstName avatar"});
+        await users.populate(results, {path: "meta.requestedBy", select: userAppModel.publicFields()});
+        await users.populate(results, {path: "meta.lastModifiedBy", select: userAppModel.publicFields()});
 
 
         if (results.length > 0) {

diff --git a/src/Persons/Controllers/PersonsController.ts b/src/Persons/Controllers/PersonsController.ts
@@ -88,7 +88,8 @@ class PersonsController extends AbstractController {
         const results:any = await aggregateService.lookupMultiple({slug: slug}, query);
 
         //agregation inter bd don't work (that I red).
-        const users:mongoose.Model<any> = User.getInstance().mongooseModel;
+        const userAppModel:User = User.getInstance();
+        const users:mongoose.Model<any> = userAppModel.mongooseModel;
 
         //I'm doing it with populate because of the $lookup is just really fetching, and we need data to stay the same.
         // All the things I found and tests where not working
@@ -103,8 +104,8 @@ class PersonsController extends AbstractController {
         await media.populate(results, {path: "mainImage"});
         await media.populate(results, {path: "events.mainImage"});
 
-        await users.populate(results, {path: "meta.requestedBy", select: "name username avatar"});
-        await users.populate(results, {path: "meta.lastModifiedBy", select: "name username avatar"});
+        await users.populate(results, {path: "meta.requestedBy", select: userAppModel.publicFields()});
+        await users.populate(results, {path: "meta.lastModifiedBy", select: userAppModel.publicFields()});
 
         if (results.length > 0) {
             return SuccessResponse.create(

diff --git a/src/Users/Models/User.ts b/src/Users/Models/User.ts
@@ -174,6 +174,10 @@ export class User extends AbstractModel {
         return ["To be completed"];
     }
 
+    public publicFields():string {
+        return "name firstName lastname avatar"
+    }
+
     /**
      * @public @method dataTransfertObject Format the document for the public return.
      * @param document