From b22ed4364078700730184b763e1a985ad6489d95 Mon Sep 17 00:00:00 2001 From: "simone.amadio" Date: Tue, 13 Dec 2022 18:01:16 +0100 Subject: [PATCH 1/2] update: validator version 1.1.0 --- controller/auditController.ts | 36 ++++++++++++------------- database/models/job.ts | 12 ++++----- package-lock.json | 50 ++++++++++++++++++++++++++++++----- package.json | 4 +-- storage/municipalityAudits.ts | 8 +++--- utils/utils.ts | 12 ++++----- 6 files changed, 79 insertions(+), 43 deletions(-) diff --git a/controller/auditController.ts b/controller/auditController.ts index 99bc8b8..f67bc8c 100644 --- a/controller/auditController.ts +++ b/controller/auditController.ts @@ -82,18 +82,18 @@ const cleanMunicipalityJSONReport = async (jsonResult: string) => { informedCitizenStatus = true; } - const activeCitizenAudits = await getAuditByClusterGroup( - parsedResult, - municipalityAudits, - "active-citizen" - ); - let activeCitizenStatus = false; - if ( - Object.keys(activeCitizenAudits.passed).length > 0 && - Object.keys(activeCitizenAudits.failed).length === 0 - ) { - activeCitizenStatus = true; - } + //const activeCitizenAudits = await getAuditByClusterGroup( + // parsedResult, + // municipalityAudits, + // "active-citizen" + //); + //let activeCitizenStatus = false; + //if ( + // Object.keys(activeCitizenAudits.passed).length > 0 && + // Object.keys(activeCitizenAudits.failed).length === 0 + //) { + // activeCitizenStatus = true; + //} const recommendationsAudits = await getAuditByClusterGroup( parsedResult, @@ -138,10 +138,10 @@ const cleanMunicipalityJSONReport = async (jsonResult: string) => { }, }, - "cittadino-attivo": { - status: activeCitizenStatus, - audits: { ...activeCitizenAudits.passed, ...activeCitizenAudits.failed }, - }, + //"cittadino-attivo": { + // status: activeCitizenStatus, + // audits: { ...activeCitizenAudits.passed, ...activeCitizenAudits.failed }, + //}, raccomandazioni: { status: recommendationsStatus, @@ -349,8 +349,8 @@ const isPassedReport = async ( } else if (subtype === allowedMunicipalitySubTypes[1]) { // eslint-disable-next-line passed = - jsonReport["cittadino-informato"].status && - jsonReport["cittadino-attivo"].status; + jsonReport["cittadino-informato"].status; + //&& jsonReport["cittadino-attivo"].status; } else { passed = false; } diff --git a/database/models/job.ts b/database/models/job.ts index 0c94810..0cd3c1b 100644 --- a/database/models/job.ts +++ b/database/models/job.ts @@ -145,12 +145,12 @@ const options = { Sequelize.literal( "((json_result->'raccomandazioni'->'audits'->>'municipality-metatag')::float)" ), - Sequelize.literal( - "((json_result->'cittadino-attivo'->'audits'->>'municipality-subdomain')::float)" - ), - Sequelize.literal( - "((json_result->'cittadino-attivo'->'audits'->>'municipality-personal-area-security')::float)" - ), + //Sequelize.literal( + // "((json_result->'cittadino-attivo'->'audits'->>'municipality-subdomain')::float)" + //), + //Sequelize.literal( + // "((json_result->'cittadino-attivo'->'audits'->>'municipality-personal-area-security')::float)" + //), Sequelize.literal( "((json_result->'cittadino-informato'->'groups'->'normativa'->'audits'->>'municipality-legislation-privacy-is-present')::float)" ), diff --git a/package-lock.json b/package-lock.json index 82c2d4b..033c2c4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "crawler-handler", - "version": "1.1.9", + "version": "1.2.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "crawler-handler", - "version": "1.1.9", + "version": "1.2.0", "license": "BSD-3-Clause", "dependencies": { "@types/sequelize": "^4.28.13", @@ -24,7 +24,7 @@ "mysql2": "^2.3.3", "nodemon": "^2.0.16", "npm-run-all": "^4.1.5", - "pa-website-validator": "github:italia/pa-website-validator#v1.0.13", + "pa-website-validator": "github:italia/pa-website-validator#v1.1.0", "pg": "^8.7.3", "redis": "^4.1.0", "sequelize": "^6.6.5", @@ -4444,6 +4444,25 @@ "version": "1.0.5", "license": "MIT" }, + "node_modules/node-cache": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/node-cache/-/node-cache-5.1.2.tgz", + "integrity": "sha512-t1QzWwnk4sjLWaQAS8CHgOJ+RAfmHpxFWmc36IWTiWHQfs0w5JDMBS1b1ZxQteo0vVVuWJvIUKHDkkeK7vIGCg==", + "dependencies": { + "clone": "2.x" + }, + "engines": { + "node": ">= 8.0.0" + } + }, + "node_modules/node-cache/node_modules/clone": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==", + "engines": { + "node": ">=0.8" + } + }, "node_modules/node-fetch": { "version": "2.6.7", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", @@ -4805,8 +4824,8 @@ } }, "node_modules/pa-website-validator": { - "version": "1.0.13", - "resolved": "git+ssh://git@github.com/italia/pa-website-validator.git#44854ad3761f9e3d56d14d6cd8de6b7623a0e495", + "version": "1.1.0", + "resolved": "git+ssh://git@github.com/italia/pa-website-validator.git#005b377611758d34aa98f8bd5b472f50571089f5", "license": "BSD-3-Clause", "dependencies": { "axios": "^1.1.3", @@ -4817,6 +4836,7 @@ "inquirer": "^9.0.2", "jsonschema": "^1.4.1", "lighthouse": "^9.5.0", + "node-cache": "^5.1.2", "open": "^8.4.0", "puppeteer": "^15.3.2", "semver": "^7.3.7", @@ -9831,6 +9851,21 @@ "nice-try": { "version": "1.0.5" }, + "node-cache": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/node-cache/-/node-cache-5.1.2.tgz", + "integrity": "sha512-t1QzWwnk4sjLWaQAS8CHgOJ+RAfmHpxFWmc36IWTiWHQfs0w5JDMBS1b1ZxQteo0vVVuWJvIUKHDkkeK7vIGCg==", + "requires": { + "clone": "2.x" + }, + "dependencies": { + "clone": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==" + } + } + }, "node-fetch": { "version": "2.6.7", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", @@ -10064,8 +10099,8 @@ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" }, "pa-website-validator": { - "version": "git+ssh://git@github.com/italia/pa-website-validator.git#44854ad3761f9e3d56d14d6cd8de6b7623a0e495", - "from": "pa-website-validator@github:italia/pa-website-validator#v1.0.13", + "version": "git+ssh://git@github.com/italia/pa-website-validator.git#005b377611758d34aa98f8bd5b472f50571089f5", + "from": "pa-website-validator@github:italia/pa-website-validator#v1.1.0", "requires": { "axios": "^1.1.3", "cheerio": "^1.0.0-rc.10", @@ -10075,6 +10110,7 @@ "inquirer": "^9.0.2", "jsonschema": "^1.4.1", "lighthouse": "^9.5.0", + "node-cache": "^5.1.2", "open": "^8.4.0", "puppeteer": "^15.3.2", "semver": "^7.3.7", diff --git a/package.json b/package.json index 8ba195b..7b646d1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "crawler-handler", - "version": "1.1.9", + "version": "1.2.0", "description": "Handler per il validatore di comuni e scuole", "main": "index.js", "type": "module", @@ -40,7 +40,7 @@ "mysql2": "^2.3.3", "nodemon": "^2.0.16", "npm-run-all": "^4.1.5", - "pa-website-validator": "github:italia/pa-website-validator#v1.0.13", + "pa-website-validator": "github:italia/pa-website-validator#v1.1.0", "pg": "^8.7.3", "redis": "^4.1.0", "sequelize": "^6.6.5", diff --git a/storage/municipalityAudits.ts b/storage/municipalityAudits.ts index e62aa1a..4b322bf 100644 --- a/storage/municipalityAudits.ts +++ b/storage/municipalityAudits.ts @@ -23,9 +23,9 @@ export const audits = { ], security: ["municipality-security", "municipality-domain"], }, - "active-citizen": [ - "municipality-personal-area-security", - "municipality-subdomain", - ], + //"active-citizen": [ + // "municipality-personal-area-security", + // "municipality-subdomain", + //], recommendations: ["municipality-metatag"], }; diff --git a/utils/utils.ts b/utils/utils.ts index 6eddb60..4b026fc 100644 --- a/utils/utils.ts +++ b/utils/utils.ts @@ -124,13 +124,13 @@ const mapPA2026Body = async ( const functionObj = cleanJsonResult[mainObjKey].groups["funzionalita"]; (initialBody[`Cittadino_Informato_${key}__c`] = cleanJsonResult[mainObjKey].status), - (initialBody[`Cittadino_Attivo_${key}__c`] = - cleanJsonResult["cittadino-attivo"].status), + //(initialBody[`Cittadino_Attivo_${key}__c`] = + // cleanJsonResult["cittadino-attivo"].status), (initialBody[`Funzionalita_${key}__c`] = functionObj.status), - (initialBody[`Cittadino_Attivo_${key}_Descrizione__c`] = - getFailAudits(cleanJsonResult["cittadino-attivo"].audits) - .map((x) => mapAuditTitle(x)) - .join(" | ") ?? ""), + //(initialBody[`Cittadino_Attivo_${key}_Descrizione__c`] = + // getFailAudits(cleanJsonResult["cittadino-attivo"].audits) + // .map((x) => mapAuditTitle(x)) + // .join(" | ") ?? ""), (initialBody[`Funzionalita_${key}_Descrizione__c`] = getFailAudits(functionObj.audits) .map((x) => mapAuditTitle(x)) From 295056b95ff7551ad0390e9cf40633ee736a073e Mon Sep 17 00:00:00 2001 From: "simone.amadio" Date: Wed, 14 Dec 2022 09:21:58 +0100 Subject: [PATCH 2/2] fix: prettier --- controller/auditController.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/controller/auditController.ts b/controller/auditController.ts index f67bc8c..eaf373b 100644 --- a/controller/auditController.ts +++ b/controller/auditController.ts @@ -348,8 +348,7 @@ const isPassedReport = async ( passed = jsonReport["cittadino-informato"].status; } else if (subtype === allowedMunicipalitySubTypes[1]) { // eslint-disable-next-line - passed = - jsonReport["cittadino-informato"].status; + passed = jsonReport["cittadino-informato"].status; //&& jsonReport["cittadino-attivo"].status; } else { passed = false;