Merge branch 'main' into MIJN-8175-feature/Parkeren-evs-aansluiting

Amsterdam · Nov 7, 2024 · a6752a9 · a6752a9
2 parents b7e9764 + 9c5e69a
commit a6752a9
Show file tree

Hide file tree

Showing 62 changed files with 1,890 additions and 886 deletions.
diff --git a/.env.local.template b/.env.local.template
@@ -103,6 +103,9 @@ REACT_APP_MONITORING_CONNECTION_STRING
 BFF_SERVER_CLIENT_CERT
 BFF_SERVER_CLIENT_KEY
 
+# DB Enabled?
+BFF_DB_ENABLED=true
+
 # PG Database
 PGHOST=
 PGUSER=

diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -44,6 +44,7 @@ export default [
           detectObjects: false,
         },
       ],
+      'no-undef': 'off',
     },
   },
   {

diff --git a/mocks/collections.json b/mocks/collections.json
@@ -68,7 +68,7 @@
       "get-afis-factuur-id:standard",
       "get-afis-paylink:standard",
       "get-powerbrowser-bb-zaak-adres:standard",
-      "post-powerbrowser-search-person:standard",
+      "post-powerbrowser-search-requests:standard",
       "post-powerbrowser-zaak-status:standard",
       "get-powerbrowser-bb-zaak-attachment-download:standard",
       "get-powerbrowser-bb-zaak-attachments:standard",

diff --git a/mocks/fixtures/powerbrowser-bb-attachments.json b/mocks/fixtures/powerbrowser-bb-attachments.json
@@ -1,93 +1,86 @@
-[
-  {
-    "mainTable": "DOCLINK",
-    "mainId": -994888,
-    "caption": "begane grond SchniffSchnaffplein 34T BNB.pdf  ",
-    "linkID": -996163,
-    "note": "Bijlage"
-  },
-  {
-    "mainTable": "DOCLINK",
-    "mainId": -994886,
-    "caption": "SchniffSchnaffplein 34T - Amsterdam - 1e Verdieping - 2D.jpg  ",
-    "linkID": -996162,
-    "note": "Bijlage"
-  },
-  {
-    "mainTable": "DOCLINK",
-    "mainId": -994884,
-    "caption": "SchniffSchnaffplein 34T - Amsterdam - 2e Verdieping - 2D.jpg  ",
-    "linkID": -996161,
-    "note": "Bijlage"
-  },
-  {
-    "mainTable": "DOCLINK",
-    "mainId": -994882,
-    "caption": "SchniffSchnaffplein 34T - Amsterdam - 3e Verdieping - 2D.jpg  ",
-    "linkID": -996160,
-    "note": "Bijlage"
-  },
-  {
-    "mainTable": "DOCLINK",
-    "mainId": -994880,
-    "caption": "SchniffSchnaffplein 34T - Amsterdam - 4everdieping.jpg  ",
-    "linkID": -996159,
-    "note": "Bijlage"
-  },
-  {
-    "mainTable": "DOCLINK",
-    "mainId": -994878,
-    "caption": "13-2-2023_Samenvatting_1015KV1A.pdf  ",
-    "linkID": -996158,
-    "note": "Bijlage"
-  },
-  {
-    "mainTable": "DOCLINK",
-    "mainId": -994876,
-    "caption": "Samenvatting-f53b2109-7c4e-4b96-9abf-cb54bd925659.pdf  ",
-    "linkID": -996157,
-    "note": "Bijlage"
-  },
-  {
-    "mainTable": "DOCLINK",
-    "mainId": -994874,
-    "caption": "Onbekend  ",
-    "linkID": -996156,
-    "note": "Bijlage"
-  },
-  {
-    "mainTable": "DOCLINK",
-    "mainId": -994872,
-    "caption": "VAG  ",
-    "linkID": -996155,
-    "note": "Bijlage"
-  },
-  {
-    "mainTable": "DOCLINK",
-    "mainId": -994870,
-    "caption": "RE: Uw vergunningaanvraag Z/12/987987  ",
-    "linkID": -996154,
-    "note": "Bijlage"
-  },
-  {
-    "mainTable": "DOCLINK",
-    "mainId": -994868,
-    "caption": "Besluit B&B  ",
-    "linkID": -996153,
-    "note": "Bijlage"
-  },
-  {
-    "mainTable": "DOCLINK",
-    "mainId": -994866,
-    "caption": "Begeleidende mail -B&B  ",
-    "linkID": -996152,
-    "note": "Bijlage"
-  },
-  {
-    "mainTable": "DOCLINK",
-    "mainId": -994864,
-    "caption": "Onbekend  ",
-    "linkID": -996151,
-    "note": "Bijlage"
-  }
-]
+{
+  "mainTableName": "DOCLINK",
+  "records": [
+    {
+      "fmtCpn": "Z2024-WK000245 BB Besluit buiten behandeling stellen D2024-10-000402",
+      "mainTableName": "DOCLINK",
+      "id": "1189270",
+      "fields": [
+        {
+          "fieldName": "ID",
+          "text": "1189270",
+          "fieldValue": "1189270"
+        },
+        {
+          "fieldName": "OMSCHRIJVING",
+          "text": "Z2024-WK000245 BB Besluit buiten behandeling stellen",
+          "fieldValue": "Z2024-WK000245 BB Besluit buiten behandeling stellen"
+        },
+        {
+          "fieldName": "CREATEDATE",
+          "text": "31-10-2024 16:17",
+          "fieldValue": "2024-10-31T15:17:06.0000000Z"
+        },
+        {
+          "fieldName": "DOCUMENTNR",
+          "text": "D2024-10-000402",
+          "fieldValue": "D2024-10-000402"
+        }
+      ]
+    },
+    {
+      "fmtCpn": "1-10-2024_Samenvatting_1064LK41.pdf D2024-10-000036",
+      "mainTableName": "DOCLINK",
+      "id": "1188904",
+      "fields": [
+        {
+          "fieldName": "ID",
+          "text": "1188904",
+          "fieldValue": "1188904"
+        },
+        {
+          "fieldName": "OMSCHRIJVING",
+          "text": "1-10-2024_Samenvatting_1064LK41.pdf",
+          "fieldValue": "1-10-2024_Samenvatting_1064LK41.pdf"
+        },
+        {
+          "fieldName": "CREATEDATE",
+          "text": "01-10-2024 00:00",
+          "fieldValue": "2024-09-30T22:00:00.0000000Z"
+        },
+        {
+          "fieldName": "DOCUMENTNR",
+          "text": "D2024-10-000036",
+          "fieldValue": "D2024-10-000036"
+        }
+      ]
+    },
+    {
+      "fmtCpn": "Test document.pdf D2024-10-000035",
+      "mainTableName": "DOCLINK",
+      "id": "1188903",
+      "fields": [
+        {
+          "fieldName": "ID",
+          "text": "1188903",
+          "fieldValue": "1188903"
+        },
+        {
+          "fieldName": "OMSCHRIJVING",
+          "text": "Test document.pdf",
+          "fieldValue": "Test document.pdf"
+        },
+        {
+          "fieldName": "CREATEDATE",
+          "text": "01-10-2024 00:00",
+          "fieldValue": "2024-09-30T22:00:00.0000000Z"
+        },
+        {
+          "fieldName": "DOCUMENTNR",
+          "text": "D2024-10-000035",
+          "fieldValue": "D2024-10-000035"
+        }
+      ]
+    }
+  ]
+}
diff --git a/mocks/fixtures/powerbrowser-bb-zaak-adres.json b/mocks/fixtures/powerbrowser-bb-zaak-adres.json
@@ -0,0 +1,17 @@
+{
+  "mainTableName": "ADRESSEN",
+  "records": [
+    {
+      "fmtCpn": "Jan en allemanplein 58 1122AB Amsterdam",
+      "mainTableName": "ADRESSEN",
+      "id": "-999752",
+      "fields": [
+        {
+          "fieldName": "FMT_CAPTION",
+          "text": "Jan en allemanplein 58 1122AB Amsterdam",
+          "fieldValue": "Jan en allemanplein 58 1122AB Amsterdam"
+        }
+      ]
+    }
+  ]
+}
diff --git a/mocks/routes/afis.js b/mocks/routes/afis.js
@@ -1,3 +1,4 @@
+const httpConstants = require('http2').constants;
 const settings = require('../settings');
 
 const BASE = '/afis';
@@ -196,13 +197,13 @@ module.exports = [
             };
 
             const stateName = Object.entries(stateFilters).find(
-              ([name, filterValueSegment]) => {
+              ([_name, filterValueSegment]) => {
                 return req.query?.['$filter']?.includes(filterValueSegment);
               }
             )?.[0];
 
             if (!stateName) {
-              return res.status(500).end();
+              return res.status(httpConstants.HTTP_STATUS_FORBIDDEN).end();
             }
 
             // DO NOT adjust this mock data (tests depend on it).
@@ -268,7 +269,7 @@ module.exports = [
         id: 'standard',
         type: 'middleware',
         options: {
-          middleware: (req, res, next, core) => {
+          middleware: (_req, res) => {
             const htmlResponse = `<h1>Afis factuur betalen</h1><button onclick="history.back()">Betaal factuur</button>`;
             res.send(htmlResponse);
           },

diff --git a/mocks/routes/powerbrowser.js b/mocks/routes/powerbrowser.js
@@ -1,9 +1,10 @@
-const settings = require('../settings');
-const BB_ZAKEN = require('../fixtures/powerbrowser-bb-zaken.json');
-const BB_ZAAK_STATUS = require('../fixtures/powerbrowser-bb-zaak-status.json');
+const BB_SEARCH_DOCUMENTS = require('../fixtures/powerbrowser-bb-attachments.json');
 const BB_PERSONEN_ZAKEN = require('../fixtures/powerbrowser-bb-personen-zaken.json');
 const BB_SEARCH_PERSON = require('../fixtures/powerbrowser-bb-search-person.json');
-const BB_ZAAK_ATTACHMENTS = require('../fixtures/powerbrowser-bb-attachments.json');
+const BB_LINK_ZAAK_ADRES = require('../fixtures/powerbrowser-bb-zaak-adres.json');
+const BB_ZAAK_STATUS = require('../fixtures/powerbrowser-bb-zaak-status.json');
+const BB_ZAKEN = require('../fixtures/powerbrowser-bb-zaken.json');
+const settings = require('../settings');
 
 module.exports = [
   {
@@ -22,16 +23,22 @@ module.exports = [
     ],
   },
   {
-    id: 'post-powerbrowser-search-person',
+    id: 'post-powerbrowser-search-requests',
     url: `${settings.MOCK_BASE_PATH}/powerbrowser/SearchRequest`,
     method: 'POST',
+    delay: 5000,
     variants: [
       {
         id: 'standard',
-        type: 'json',
+        type: 'middleware',
         options: {
-          status: 200,
-          body: BB_SEARCH_PERSON,
+          middleware: (req, res) => {
+            if (['MAATSCHAP', 'PERSONEN'].includes(req.body.query.tableName)) {
+              return res.send(BB_SEARCH_PERSON);
+            }
+
+            return res.send(BB_SEARCH_DOCUMENTS);
+          },
         },
       },
     ],
@@ -81,33 +88,17 @@ module.exports = [
       },
     ],
   },
-
-  {
-    id: 'get-powerbrowser-bb-zaak-attachments',
-    url: `${settings.MOCK_BASE_PATH}/powerbrowser/link/GFO_ZAKEN/:zaaknummer`,
-    method: 'GET',
-    variants: [
-      {
-        id: 'standard',
-        type: 'json',
-        options: {
-          status: 200,
-          body: BB_ZAAK_ATTACHMENTS,
-        },
-      },
-    ],
-  },
   {
     id: 'get-powerbrowser-bb-zaak-adres',
-    url: `${settings.MOCK_BASE_PATH}/powerbrowser/Record/AdresMbtZaakOrLocatie/GFO_ZAKEN/:zaaknummer`,
-    method: 'GET',
+    url: `${settings.MOCK_BASE_PATH}/powerbrowser/Link/GFO_ZAKEN/ADRESSEN/Table`,
+    method: 'POST',
     variants: [
       {
         id: 'standard',
-        type: 'text',
+        type: 'json',
         options: {
           status: 200,
-          body: 'Dingemanstraat 12-H 1234AB Amsterdam',
+          body: BB_LINK_ZAAK_ADRES,
         },
       },
     ],

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -90,6 +90,7 @@
     "cron": "^3.1.7",
     "cross-env": "^7.0.3",
     "date-fns": "^4.1.0",
+    "decimal.js": "^10.4.3",
     "dotenv": "^16.4.5",
     "dotenv-expand": "^11.0.6",
     "express": "^4.21.1",
@@ -121,6 +122,7 @@
     "nock": "^13.5.5",
     "node-jose": "^2.2.0",
     "npm": "^10.9.0",
+    "outdent": "^0.8.0",
     "pg": "^8.13.1",
     "prettier": "^3.3.3",
     "proj4": "^2.12.1",

diff --git a/src/client/AppState.ts b/src/client/AppState.ts
@@ -9,7 +9,12 @@ export const PRISTINE_APPSTATE: AppState = {
   NOTIFICATIONS: apiPristineResult([]),
 
   AFIS: apiPristineResult(
-    { isKnown: false, businessPartnerIdEncrypted: null },
+    {
+      isKnown: false,
+      businessPartnerIdEncrypted: null,
+      businessPartnerId: null,
+      facturen: null,
+    },
     {
       isActive: FeatureToggle.afisActive,
       profileTypes: ['private', 'commercial'],