src/structures/services/structures.service.ts

@@ -104,13 +104,7 @@ export class StructuresService {
         .exec();
     }
 
-    await structures.sort((a, b) => ids.indexOf(a.id) - ids.indexOf(b.id));
-    if (!(await this.parametersService.getParameters()).lockdownInfoDisplay) {
-      structures.map((structure: StructureDocument) => {
-        structure.lockdownActivity = '';
-      });
-    }
-    return structures;
+    return structures.sort((a, b) => ids.indexOf(a.id) - ids.indexOf(b.id));
   }
 
   public async create(idUser: string, structure: StructureDto): Promise<Structure> {
@@ -214,7 +208,7 @@ export class StructuresService {
 
   public async findAll(): Promise<StructureDocument[]> {
     this.logger.debug('findAll');
-    let structures = await this.structureModel.find({ deletedAt: { $exists: false } }).exec();
+    const structures = await this.structureModel.find({ deletedAt: { $exists: false } }).exec();
     // Update structures coord and address before sending them
     await Promise.all(
       structures.map((structure: StructureDocument) => {
@@ -228,13 +222,7 @@ export class StructuresService {
         }
       })
     );
-    structures = await this.structureModel.find({ deletedAt: { $exists: false }, accountVerified: true }).exec();
-    if (!(await this.parametersService.getParameters()).lockdownInfoDisplay) {
-      await structures.map((structure: StructureDocument) => {
-        structure.lockdownActivity = '';
-      });
-    }
-    return structures;
+    return this.structureModel.find({ deletedAt: { $exists: false }, accountVerified: true }).exec();
   }
 
   public async findAllUnclaimed(): Promise<UnclaimedStructureDto[]> {