Merge pull request #327 from IATI/develop

nosvalds · web-flow · commit 6df739fb2f2e · 2022-07-06T10:26:38.000+01:00
Next Release
diff --git a/.github/workflows/develop-func-ci.yml b/.github/workflows/develop-func-ci.yml
@@ -6,6 +6,7 @@ on:
       - '**/README.md'
       - '**/dependabot.yml'
       - 'docs/*'
+      - '.vscode/*'
     branches:
       - develop
       - main
diff --git a/.github/workflows/develop-func-deploy.yml b/.github/workflows/develop-func-deploy.yml
@@ -9,6 +9,7 @@ on:
       - '.github/workflows/prod-func-deploy.yml'
       - '.github/workflows/develop-func-ci.yml'
       - 'docs/*'
+      - '.vscode/*'
     branches:
       - develop
   schedule:
@@ -47,7 +48,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: 'Login via Azure CLI'
-        uses: azure/login@v1.4.4
+        uses: azure/login@v1.4.5
         with:
           creds: ${{ env.AZURE_CREDENTIALS }} # Service Principal credentials saved in GitHub Secrets
 
@@ -148,7 +149,7 @@ jobs:
           image: ${{ env.ACR_LOGIN_SERVER }}/func-${{ env.NAME}}-${{ env.STAGE }}:${{ env.TAG }}
 
       - name: 'Tag resource for Tech Climate Impact'
-        uses: 'azure/CLI@1.0.4'
+        uses: 'azure/CLI@v1.0.6'
         with:
           azcliversion: 2.30.0
           inlineScript: |
@@ -179,3 +180,14 @@ jobs:
             --working-dir integration-tests/test-files \
             --env-var keyValue=$API_KEY \
             --delay-request 50
+
+  # Mark status checks success/fail on dependabot commits for scheduled deploys
+  status_check_success:
+    needs: [build-test-deploy, integration-test]
+    if: success() && github.event_name == 'schedule'
+    uses: IATI/.github/.github/workflows/status_check_success.yaml@main
+
+  status_check_failure:
+    needs: [build-test-deploy, integration-test]
+    if: failure() && github.event_name == 'schedule'
+    uses: IATI/.github/.github/workflows/status_check_failure.yaml@main
diff --git a/.github/workflows/prod-func-deploy.yml b/.github/workflows/prod-func-deploy.yml
@@ -33,7 +33,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: 'Login via Azure CLI'
-        uses: azure/login@v1.4.4
+        uses: azure/login@v1.4.5
         with:
           creds: ${{ env.AZURE_CREDENTIALS }} # Service Principal credentials saved in GitHub Secrets
 
@@ -134,7 +134,7 @@ jobs:
           image: ${{ env.ACR_LOGIN_SERVER }}/func-${{ env.NAME}}-${{ env.STAGE }}:${{ env.TAG }}
 
       - name: 'Tag resource for Tech Climate Impact'
-        uses: 'azure/CLI@1.0.4'
+        uses: 'azure/CLI@v1.0.6'
         with:
           azcliversion: 2.30.0
           inlineScript: |
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,5 +1,7 @@
 {
     "recommendations": [
-        "ms-azuretools.vscode-azurefunctions"
+        "ms-azuretools.vscode-azurefunctions",
+        "dbaeumer.vscode-eslint",
+        "esbenp.prettier-vscode"
     ]
-}
+}
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -24,7 +24,7 @@
             "name": "Attach to Node Functions",
             "type": "node",
             "request": "attach",
-            "port": 5858,
+            "port": 9229,
             "preLaunchTask": "func: host start"
         }
     ]
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,5 +2,11 @@
     "editor.formatOnSave": true,
     "files.associations": {
         "*.xslt": "xml"
-    }
+    },
+    "azureFunctions.deploySubpath": ".",
+    "azureFunctions.postDeployTask": "npm install (functions)",
+    "azureFunctions.projectLanguage": "JavaScript",
+    "azureFunctions.projectRuntime": "~3",
+    "debug.internalConsoleOptions": "neverOpen",
+    "azureFunctions.preDeployTask": "npm prune (functions)"
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -5,10 +5,21 @@
     "tasks": [
         {
             "type": "func",
-            "command": "host start --language-worker -- --inspect=5858",
-            "label": "func: host start",
-            "problemMatcher": "$func-watch",
-            "isBackground": true
+            "command": "host start",
+            "problemMatcher": "$func-node-watch",
+            "isBackground": true,
+            "dependsOn": "npm install (functions)"
+        },
+        {
+            "type": "shell",
+            "label": "npm install (functions)",
+            "command": "npm install"
+        },
+        {
+            "type": "shell",
+            "label": "npm prune (functions)",
+            "command": "npm prune --production",
+            "problemMatcher": []
         }
     ]
 }
diff --git a/integration-tests/js-validator-api-tests.postman_collection.json b/integration-tests/js-validator-api-tests.postman_collection.json
@@ -1,8 +1,9 @@
 {
 	"info": {
-		"_postman_id": "c2e4fc5b-1f70-46cd-b6fb-dec3e0379979",
-		"name": "js-validator-api-tests",
-		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+		"_postman_id": "f8276da3-7473-469e-ad31-2dbd6b7d46d9",
+		"name": "js-validator-api-tests bugfix-branch",
+		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",
+		"_exporter_id": "13097277"
 	},
 	"item": [
 		{
@@ -223,7 +224,7 @@
 							"query": [
 								{
 									"key": "",
-									"value": null,
+									"value": "",
 									"disabled": true
 								}
 							]
@@ -2407,7 +2408,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "<iati-activities generated-datetime=\"2014-09-10T07:15:37Z\" version=\"2.03\">\n    <iati-activity last-updated-datetime=\"2014-09-10T07:20:37Z\">\n        <iati-identifier>ACT-1</iati-identifier>\n        <reporting-org ref=\"AA-AAA-123456789\" type=\"40\" secondary-reporter=\"0\">\n            <narrative>Organisation name</narrative>\n            <narrative xml:lang=\"fr\">Nom de l'organisme</narrative>\n        </reporting-org>\n\n        <title>\n            <narrative>Activity title</narrative>\n            <narrative xml:lang=\"fr\">Titre de l'activité</narrative>\n            <narrative xml:lang=\"es\">Título de la actividad</narrative>\n        </title>\n        <activity-date iso-date=\"2012-15-04\" type=\"1\"/>\n        <budget type=\"1\" status=\"1\">\n            <period-start iso-date=\"2014-15-01\" />\n            <period-end iso-date=\"2014-12-31\" />\n            <value currency=\"EUR\" value-date=\"2014-01-01\">3000</value>\n        </budget>\n\n        <fss extraction-date=\"2014-05-06\" priority=\"1\" phaseout-year=\"2016\">\n            <forecast year=\"2014\" value-date=\"2013-07-03\" currency=\"GBP\">10000</forecast>\n        </fss>\n    </iati-activity>\n</iati-activities>"
+							"raw": "<iati-activities generated-datetime=\"2014-19-10T07:15:37Z\" version=\"2.03\">\n    <iati-activity last-updated-datetime=\"2014-19-10T07:20:37Z\">\n        <iati-identifier>ACT-1</iati-identifier>\n        <reporting-org ref=\"AA-AAA-123456789\" type=\"40\" secondary-reporter=\"0\">\n            <narrative>Organisation name</narrative>\n            <narrative xml:lang=\"fr\">Nom de l'organisme</narrative>\n        </reporting-org>\n\n        <title>\n            <narrative>Activity title</narrative>\n            <narrative xml:lang=\"fr\">Titre de l'activité</narrative>\n            <narrative xml:lang=\"es\">Título de la actividad</narrative>\n        </title>\n        <description>\n        <narrative>Activity title</narrative>\n        </description>\n        <participating-org role=\"\">\n        </participating-org>\n        <activity-status code=\"\">\n        </activity-status>\n        <activity-date iso-date=\"2012-15-04\" type=\"1\"/>\n        <budget type=\"1\" status=\"1\">\n            <period-start iso-date=\"2014-15-01\" />\n            <period-end iso-date=\"2014-12-31\" />\n            <value currency=\"EUR\" value-date=\"2014-01-01\">3000</value>\n        </budget>\n\n        <fss extraction-date=\"2014-05-06\" priority=\"1\" phaseout-year=\"2016\">\n            <forecast year=\"2014\" value-date=\"2013-07-03\" currency=\"GBP\">10000</forecast>\n        </fss>\n    </iati-activity>\n</iati-activities>"
 						},
 						"url": {
 							"raw": "{{baseURL}}/pub/validate?group=false",
@@ -3469,7 +3470,7 @@
 									"query": [
 										{
 											"key": "",
-											"value": null,
+											"value": "",
 											"disabled": true
 										}
 									]
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -29,14 +29,14 @@
     "devDependencies": {
         "@prettier/plugin-xml": "^2.2.0",
         "chai": "*",
-        "eslint": "^8.17.0",
+        "eslint": "^8.19.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-config-prettier": "^8.5.0",
         "eslint-plugin-import": "^2.26.0",
         "husky": "^8.0.1",
-        "lint-staged": "^13.0.1",
+        "lint-staged": "^13.0.3",
         "mocha": "*",
-        "prettier": "^2.7.0"
+        "prettier": "^2.7.1"
     },
     "lint-staged": {
         "*.js": "eslint --cache --fix",
diff --git a/ruleset-unit-tests/dateNow/test.js b/ruleset-unit-tests/dateNow/test.js
@@ -9,7 +9,7 @@ const { allRulesResult } = require('../../services/rulesValidator');
 const testMap = [
     { rule: 'date_now.json', file: 'good.xml', expectedResult: true },
     { rule: 'date_now.json', file: 'bad.xml', expectedResult: false },
-    { rule: 'date_now.json', file: 'bad_date_format.xml', expectedResult: false },
+    { rule: 'date_now.json', file: 'bad_date_format.xml', expectedResult: 'No Condition Match' },
 ];
 
 describe('dateNow rules', () => {
diff --git a/services/rulesValidator.js b/services/rulesValidator.js
@@ -7,9 +7,6 @@ const ruleNameObj = require('./ruleNameMap.json');
 
 const ruleNameMap = new Map(ruleNameObj);
 
-const dateReg = /(-?[0-9]{4,})-([0-9]{2})-([0-9]{2})/;
-const dateTimeReg = /(-?[0-9]{4,})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})/;
-
 const transactionTypes = {
     1: 'incoming funds',
     2: '(outgoing) commitment',
@@ -290,15 +287,13 @@ class Rules {
         if (dateElements.length < 1) return null;
         const dateText = dateElements[0].value;
         if (dateText !== '') {
-            if (dateReg.test(dateText)) {
-                const parsedDate = new Date(dateText);
-                if (dateReg.test(dateText) && parsedDate.toString() !== 'Invalid Date')
-                    return {
-                        parsedDate,
-                        lineNumber: dateElements[0].lineNumber,
-                        columnNumber: dateElements[0].columnNumber,
-                    };
-            }
+            const parsedDate = new Date(dateText);
+            if (parsedDate.toString() !== 'Invalid Date')
+                return {
+                    parsedDate,
+                    lineNumber: dateElements[0].lineNumber,
+                    columnNumber: dateElements[0].columnNumber,
+                };
         }
         return null;
     }
@@ -308,14 +303,9 @@ class Rules {
         return compareAsc(this.less.parsedDate, this.more.parsedDate) <= 0;
     }
 
-    dateNow(oneCase) {
-        const datetimeElement = xpath(oneCase.date, this.element);
-        if (datetimeElement.length > 0 && dateTimeReg.test(datetimeElement[0].nodeValue)) {
-            const selectedDatetime = new Date(datetimeElement[0].nodeValue);
-            const now = new Date();
-            return compareAsc(selectedDatetime, now) <= 0;
-        }
-        return '';
+    dateNow() {
+        if (this.date === null) return '';
+        return compareAsc(this.date.parsedDate, new Date()) <= 0;
     }
 
     betweenDates(oneCase) {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"recommendations": [`
`3`		`- "ms-azuretools.vscode-azurefunctions"`
	`3`	`+ "ms-azuretools.vscode-azurefunctions",`
	`4`	`+ "dbaeumer.vscode-eslint",`
	`5`	`+ "esbenp.prettier-vscode"`
`4`	`6`	`]`
`5`		`-}`
	`7`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`"name": "Attach to Node Functions",`
`25`	`25`	`"type": "node",`
`26`	`26`	`"request": "attach",`
`27`		`- "port": 5858,`
	`27`	`+ "port": 9229,`
`28`	`28`	`"preLaunchTask": "func: host start"`
`29`	`29`	`}`
`30`	`30`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"info": {`
`3`		`- "_postman_id": "c2e4fc5b-1f70-46cd-b6fb-dec3e0379979",`
`4`		`- "name": "js-validator-api-tests",`
`5`		`- "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"`
	`3`	`+ "_postman_id": "f8276da3-7473-469e-ad31-2dbd6b7d46d9",`
	`4`	`+ "name": "js-validator-api-tests bugfix-branch",`
	`5`	`+ "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",`
	`6`	`+ "_exporter_id": "13097277"`
`6`	`7`	`},`
`7`	`8`	`"item": [`
`8`	`9`	`{`
`@@ -223,7 +224,7 @@`
`223`	`224`	`"query": [`
`224`	`225`	`{`
`225`	`226`	`"key": "",`
`226`		`- "value": null,`
	`227`	`+ "value": "",`
`227`	`228`	`"disabled": true`
`228`	`229`	`}`
`229`	`230`	`]`
`@@ -2407,7 +2408,7 @@`
`2407`	`2408`	`],`
`2408`	`2409`	`"body": {`
`2409`	`2410`	`"mode": "raw",`
`2410`		- "raw": "<iati-activities generated-datetime=\"2014-09-10T07:15:37Z\" version=\"2.03\">\n <iati-activity last-updated-datetime=\"2014-09-10T07:20:37Z\">\n <iati-identifier>ACT-1</iati-identifier>\n <reporting-org ref=\"AA-AAA-123456789\" type=\"40\" secondary-reporter=\"0\">\n <narrative>Organisation name</narrative>\n <narrative xml:lang=\"fr\">Nom de l'organisme</narrative>\n </reporting-org>\n\n <title>\n <narrative>Activity title</narrative>\n <narrative xml:lang=\"fr\">Titre de l'activité</narrative>\n <narrative xml:lang=\"es\">Título de la actividad</narrative>\n </title>\n <activity-date iso-date=\"2012-15-04\" type=\"1\"/>\n <budget type=\"1\" status=\"1\">\n <period-start iso-date=\"2014-15-01\" />\n <period-end iso-date=\"2014-12-31\" />\n <value currency=\"EUR\" value-date=\"2014-01-01\">3000</value>\n </budget>\n\n <fss extraction-date=\"2014-05-06\" priority=\"1\" phaseout-year=\"2016\">\n <forecast year=\"2014\" value-date=\"2013-07-03\" currency=\"GBP\">10000</forecast>\n </fss>\n </iati-activity>\n</iati-activities>"
	`2411`	+ "raw": "<iati-activities generated-datetime=\"2014-19-10T07:15:37Z\" version=\"2.03\">\n <iati-activity last-updated-datetime=\"2014-19-10T07:20:37Z\">\n <iati-identifier>ACT-1</iati-identifier>\n <reporting-org ref=\"AA-AAA-123456789\" type=\"40\" secondary-reporter=\"0\">\n <narrative>Organisation name</narrative>\n <narrative xml:lang=\"fr\">Nom de l'organisme</narrative>\n </reporting-org>\n\n <title>\n <narrative>Activity title</narrative>\n <narrative xml:lang=\"fr\">Titre de l'activité</narrative>\n <narrative xml:lang=\"es\">Título de la actividad</narrative>\n </title>\n <description>\n <narrative>Activity title</narrative>\n </description>\n <participating-org role=\"\">\n </participating-org>\n <activity-status code=\"\">\n </activity-status>\n <activity-date iso-date=\"2012-15-04\" type=\"1\"/>\n <budget type=\"1\" status=\"1\">\n <period-start iso-date=\"2014-15-01\" />\n <period-end iso-date=\"2014-12-31\" />\n <value currency=\"EUR\" value-date=\"2014-01-01\">3000</value>\n </budget>\n\n <fss extraction-date=\"2014-05-06\" priority=\"1\" phaseout-year=\"2016\">\n <forecast year=\"2014\" value-date=\"2013-07-03\" currency=\"GBP\">10000</forecast>\n </fss>\n </iati-activity>\n</iati-activities>"
`2411`	`2412`	`},`
`2412`	`2413`	`"url": {`
`2413`	`2414`	`"raw": "{{baseURL}}/pub/validate?group=false",`
`@@ -3469,7 +3470,7 @@`
`3469`	`3470`	`"query": [`
`3470`	`3471`	`{`
`3471`	`3472`	`"key": "",`
`3472`		`- "value": null,`
	`3473`	`+ "value": "",`
`3473`	`3474`	`"disabled": true`
`3474`	`3475`	`}`
`3475`	`3476`	`]`