diff --git a/src/api/commons/queries/sirene-updates.query.js b/src/api/commons/queries/sirene-updates.query.js index 0952fa71..99ea7ccd 100644 --- a/src/api/commons/queries/sirene-updates.query.js +++ b/src/api/commons/queries/sirene-updates.query.js @@ -18,7 +18,7 @@ const structQuery = [ emails: { $ifNull: ['$emails', []] }, href: { $concat: ['/structures/', '$id'] }, legalcategory: { $ifNull: ['$legalcategory', {}] }, - structureStatus: { $ifNull: ['$structureStatus', null] }, + structureStatus: { $ifNull: ['$structureStatus', 'active'] }, }, }, ]; @@ -26,29 +26,7 @@ export default [ { $group: { _id: "$paysage", - siren: { $first: "$siren" }, - siret: { $first: "$siret" }, - id: { $first: "$paysage" }, - type: { $first: "$type" }, - lastModificationDate: { $max: "$lastChecked" }, - updates: { - $push: { - $cond: { - if: { $eq: ["$changeType", "change"] }, - then: "$$ROOT", - else: "$$REMOVE" - } - } - }, - checks: { - $push: { - $cond: { - if: { $eq: ["$changeType", "check"] }, - then: "$$ROOT", - else: "$$REMOVE" - } - } - } + updates: { $push: "$$ROOT" }, } }, { @@ -63,17 +41,9 @@ export default [ { $project: { _id: 0, - id: 1, - type: 1, - lastModificationDate: 1, - siren: 1, - siret: 1, + id: "$_id", paysageData: { $arrayElemAt: ["$paysageData", 0] }, updates: 1, - checks: 1, } }, - { - $sort: { lastModificationDate: -1 } - } ]; diff --git a/src/api/commons/repositories.js b/src/api/commons/repositories.js index dcb794f1..5e890e61 100644 --- a/src/api/commons/repositories.js +++ b/src/api/commons/repositories.js @@ -48,7 +48,7 @@ export const geographicalCategoriesRepository = new BaseMongoRepository({ db, collection: 'geographicalcategories', }); -export const geographicalCategoriesExceptionsRepository = new BaseMongoRepository({ db, collection: 'geographicalexceptions' }); +export const geographicalCategoriesExceptionsRepository = new BaseMongoRepository({ db, collection: 'geographicalexceptions' }); export const groupsRepository = new BaseMongoRepository({ db, collection: 'groups', @@ -108,7 +108,7 @@ export const relationTypesRepository = new BaseMongoRepository({ }); export const sireneUpdatesRepository = new BaseMongoRepository({ db, - collection: '_siren', + collection: 'sirene_updates', }); export const socialmediasRepository = new BaseMongoRepository({ db,