From 0dcfd84cf130a1fce06de21b034f022650cb71d8 Mon Sep 17 00:00:00 2001 From: MFrangi Date: Wed, 15 May 2024 08:02:51 +0000 Subject: [PATCH 1/4] maj lib codes postaux --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9b73615..ff3094e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "axios": "^1.6.5", "body-parser": "^1.20.0", "bunyan": "^1.8.15", - "codes-postaux": "^4.0.0", + "codes-postaux": "^4.1.0", "cors": "^2.8.5", "debug": "^4.3.4", "ejs": "^3.1.8", @@ -2962,9 +2962,9 @@ } }, "node_modules/codes-postaux": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/codes-postaux/-/codes-postaux-4.0.0.tgz", - "integrity": "sha512-TolXXq86dMTrsAHzjVbJ/sPZCvN2TUxneV8UJ+50cErgH1zq4j86wKjIetPqLvHCtkLbf+H8Xqy7j6n9+MllUA==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/codes-postaux/-/codes-postaux-4.1.0.tgz", + "integrity": "sha512-RBLXsQatRnmNI+o6SztWarb38tvkWoW3v8kpT3yBlr/J5gMKYZWn4NEa9LdIC7GU3GTqVwLS9foQMJl8CI/fFA==", "dependencies": { "lodash": "^4.17.21" }, diff --git a/package.json b/package.json index 3648fb9..353e273 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "axios": "^1.6.5", "body-parser": "^1.20.0", "bunyan": "^1.8.15", - "codes-postaux": "^4.0.0", + "codes-postaux": "^4.1.0", "cors": "^2.8.5", "debug": "^4.3.4", "ejs": "^3.1.8", From 39ed0c9df46e853130afc237149e4aef60264a6d Mon Sep 17 00:00:00 2001 From: MFrangi Date: Wed, 15 May 2024 08:35:23 +0000 Subject: [PATCH 2/4] .. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c865f3..6f555e0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,4 +29,4 @@ jobs: - name: Publish coverage to coveralls.io run: npm run coveralls env: - COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} + COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} From fe129fb8c55848dd2aaee452b6ca236e7452d88b Mon Sep 17 00:00:00 2001 From: MFrangi Date: Thu, 16 May 2024 08:44:30 +0000 Subject: [PATCH 3/4] recherche par date de depublication sur er/product --- .github/workflows/ci.yml | 2 +- controllers/er/index.js | 20 ++++++++++++++++++-- doc/er.yml | 19 +++++++++++++------ lib/buildErCqlFilter.js | 4 ++++ 4 files changed, 36 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c865f3..6f555e0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,4 +29,4 @@ jobs: - name: Publish coverage to coveralls.io run: npm run coveralls env: - COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} + COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/controllers/er/index.js b/controllers/er/index.js index b29cc5c..31aed7c 100644 --- a/controllers/er/index.js +++ b/controllers/er/index.js @@ -72,6 +72,21 @@ function createErProxy(featureTypeName,typeSearch){ }); } } + + // For params depublication_date select between 2 dates + + if((params.depubli_date_deb) && (params.depubli_date_fin)) { + params.field_depublication_date = params.depubli_date_deb +'T00:00:00Z;'+ params.depubli_date_fin+'T23:59:59Z'; + params = _.omit(params,'depubli_date_deb'); + params = _.omit(params,'depubli_date_fin'); + } else { + if((params.depubli_date_deb) || (params.depubli_date_fin)) { + return res.status(400).send({ + code: 400, + message: 'Utilisation des dates de depublication avec une date de fin et une date de debut avec moins de 6 mois entre les 2 dates.' + }); + } + } } //For _propertyNames, we need to transform the string in Array @@ -171,14 +186,15 @@ var productValidators = erValidators.concat([ check('code_ean').optional().isAlphanumeric(), check('code_article').optional().isString(), check('name').optional().isString(), - check('sale').optional().isNumeric(), check('type').optional().isString(), check('publication_date').optional().isString(), check('date_maj_deb').optional().isString(), // Param ne servant que pour admin check('date_maj_fin').optional().isString(), // Param ne servant que pour admin check('admin').optional().isAlphanumeric().isLength({min:1,max:1}).withMessage('Le champ admin doit être Y ou N'), check('publi_date_deb').optional().isString(), // Param ne servant que pour admin - check('publi_date_fin').optional().isString() // Param ne servant que pour admin + check('publi_date_fin').optional().isString(), // Param ne servant que pour admin + check('depubli_date_deb').optional().isString(), // Param ne servant que pour admin + check('depubli_date_fin').optional().isString() // Param ne servant que pour admin ]); diff --git a/doc/er.yml b/doc/er.yml index c5a153f..9944367 100644 --- a/doc/er.yml +++ b/doc/er.yml @@ -44,11 +44,6 @@ paths: in: query type: string required: false - - - name: sale - in: query - type: string - required: false - name: publication_date in: query @@ -81,7 +76,19 @@ paths: - name: publi_date_fin in: query - description: Date de publication de fin sous la forme AAAA-MM-JJ + description: Date de publication fin sous la forme AAAA-MM-JJ + type: string + require: false + + - name: depubli_date_deb + in: query + description: Date de dépublication début sous la forme AAAA-MM-JJ + type: string + require: false + + - name: depubli_date_fin + in: query + description: Date de dépublication fin sous la forme AAAA-MM-JJ type: string require: false diff --git a/lib/buildErCqlFilter.js b/lib/buildErCqlFilter.js index 9fb97e0..da014eb 100644 --- a/lib/buildErCqlFilter.js +++ b/lib/buildErCqlFilter.js @@ -66,6 +66,10 @@ function buildErCqlFilter(params) { var value_date_publication = params[name].split(';'); parts.push('publication_date AFTER '+ value_date_publication[0]+' AND publication_date BEFORE '+ value_date_publication[1]); + } else if (name == 'field_depublication_date'){ + var value_date_depublication = params[name].split(';'); + parts.push('deleted_at AFTER '+ value_date_depublication[0]+' AND deleted_at BEFORE '+ value_date_depublication[1]); + } else if (name == 'namepr') { //Traiter le cas du produit avec le parametre name parts.push(' name ILIKE \'%'+ params[name] + '%\' OR name_complement ILIKE \'%'+ params[name] + '%\''); From 6ddc3092ee870a9f08aac2a97ad3772f7cffdbf1 Mon Sep 17 00:00:00 2001 From: MFrangi Date: Tue, 21 May 2024 07:01:42 +0000 Subject: [PATCH 4/4] date maj aoc --- doc/aoc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/aoc.yml b/doc/aoc.yml index f23c414..4dd5c1a 100644 --- a/doc/aoc.yml +++ b/doc/aoc.yml @@ -16,7 +16,7 @@ info: Consultez la [documentation utilisateur](https://apicarto.ign.fr/api/doc/pdf/docUser_moduleAoc.pdf) pour plus d’informations sur les paramètres d’appel disponibles et le format des résultats. - Dernière mise à jour des données : 11 Avril 2024 + Dernière mise à jour des données : 16 Mai 2024 ## Géométrie