Merge pull request #44 from italia/feat/update_report_naming

feat: report file name update
italia · Dec 19, 2023 · 139be5a · 139be5a
2 parents 5fbf52c + 8d8a9e9
commit 139be5a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
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": "2.2.18",
+  "version": "2.3.1",
   "description": "Handler per il validatore di comuni e scuole",
   "main": "index.js",
   "type": "module",

diff --git a/utils/utils.ts b/utils/utils.ts
@@ -115,17 +115,32 @@ const mapPA2026Body = async (
       console.log("MAP PA2026 BODY EXCEPTION 01: ", e);
     }
 
+    const siteUrl = new URL(job.scan_url);
+
+    const crawlerVersion =
+      packageJSON?.dependencies["pa-website-validator"]?.split("#")[1] ?? "";
+
     const initialBody = [];
     initialBody[`Nome_file_${key}__c`] =
       `Report scansione ` +
-      job.id +
+      siteUrl.host +
+      "_" +
+      new Date()
+        .toLocaleDateString("en-US", {
+          year: "numeric",
+          month: "2-digit",
+          day: "2-digit",
+        })
+        .replace(/\//g, "") +
       "_" +
-      new Date().toISOString().split("T")[0] +
+      crawlerVersion +
+      "_" +
+      job.id +
       (isFirstScan ? "_Prima Scansione" : "");
+
     initialBody[`Data_scansione_fallita__c`] = null;
     initialBody[`URL_scansione_fallita__c`] = null;
-    initialBody[`Versione_Crawler_${key}__c`] =
-      packageJSON?.dependencies["pa-website-validator"]?.split("#")[1] ?? "";
+    initialBody[`Versione_Crawler_${key}__c`] = crawlerVersion;
     initialBody[`Criteri_Superati_Crawler_${key}__c`] = passedAuditsPercentage;
     initialBody[`Status_Generale_${key}__c`] = generalStatus;
     initialBody[`Data_Job_Crawler_${key}__c`] = new Date(job.end_at).getTime();