Merge pull request #9 from italia/update/validator

update: validator version 1.1.0
italia · Dec 14, 2022 · e2bad48 · e2bad48
2 parents d3046ba + 295056b
commit e2bad48
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 44 deletions.
diff --git 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,
@@ -348,9 +348,8 @@ const isPassedReport = async (
         passed = jsonReport["cittadino-informato"].status;
       } else if (subtype === allowedMunicipalitySubTypes[1]) {
         // eslint-disable-next-line
-        passed =
-          jsonReport["cittadino-informato"].status &&
-          jsonReport["cittadino-attivo"].status;
+        passed = jsonReport["cittadino-informato"].status;
+        //&& jsonReport["cittadino-attivo"].status;
       } else {
         passed = false;
       }

diff --git 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
diff --git 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
@@ -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
@@ -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))