Merge pull request #1108 from danskernesdigitalebibliotek/merge-devel…

…op-into-release-brahama-14 Merge develop into release brahama 14
danskernesdigitalebibliotek · Apr 11, 2024 · b75c1b5 · b75c1b5
2 parents 51adb6d + 7f0930e
commit b75c1b5
Show file tree

Hide file tree

Showing 94 changed files with 3,730 additions and 1,510 deletions.
diff --git a/.docker/wiremock/cms/mappings/cms-stub-2-8b0177da-969f-4461-ae54-34151ad21b07.json b/.docker/wiremock/cms/mappings/cms-stub-2-8b0177da-969f-4461-ae54-34151ad21b07.json
@@ -0,0 +1,18 @@
+{
+  "id" : "8b0177da-969f-4461-ae54-34151ad21b07",
+  "name" : "Next week",
+  "request" : {
+    "url" : "/dpl_opening_hours?branch_id=1&from_date=2024-03-25&to_date=2024-03-31",
+    "method" : "GET"
+  },
+  "response" : {
+    "status" : 200,
+    "body" : " [{\n    \"id\": 42,\n    \"category\": {\n      \"title\": \"Åbent\",\n      \"color\": \"#0000FF\"\n    },\n    \"date\": \"2024-03-25\",\n    \"start_time\": \"08:00\",\n    \"end_time\": \"12:00\",\n    \"branch_id\": 1\n  },\n  {\n    \"id\": 43,\n    \"category\": {\n      \"title\": \"Mors hyggehjørne\",\n      \"color\": \"#FF0000\"\n    },\n    \"date\": \"2024-03-25\",\n    \"start_time\": \"13:00\",\n    \"end_time\": \"17:00\",\n    \"branch_id\": 2\n  },\n  {\n    \"id\": 44,\n    \"category\": {\n      \"title\": \"Med betjening\",\n      \"color\": \"#008000\"\n    },\n    \"date\": \"2024-03-25\",\n    \"start_time\": \"18:00\",\n    \"end_time\": \"20:00\",\n    \"branch_id\": 3\n  },\n  {\n    \"id\": 45,\n    \"category\": {\n      \"title\": \"Telefontid\",\n      \"color\": \"#FFFF00\"\n    },\n    \"date\": \"2024-03-26\",\n    \"start_time\": \"09:00\",\n    \"end_time\": \"11:00\",\n    \"branch_id\": 1\n  },\n  {\n    \"id\": 46,\n    \"category\": {\n      \"title\": \"Borgerservice\",\n      \"color\": \"#0000FF\"\n    },\n    \"date\": \"2024-03-26\",\n    \"start_time\": \"12:00\",\n    \"end_time\": \"14:00\",\n    \"branch_id\": 2\n  },\n  {\n    \"id\": 47,\n    \"category\": {\n      \"title\": \"Børneetagen\",\n      \"color\": \"#FF0000\"\n    },\n    \"date\": \"2024-03-26\",\n    \"start_time\": \"15:00\",\n    \"end_time\": \"18:00\",\n    \"branch_id\": 3\n  },\n  {\n    \"id\": 48,\n    \"category\": {\n      \"title\": \"Makerlab\",\n      \"color\": \"#008000\"\n    },\n    \"date\": \"2024-03-27\",\n    \"start_time\": \"08:00\",\n    \"end_time\": \"11:00\",\n    \"branch_id\": 1\n  },\n  {\n    \"id\": 49,\n    \"category\": {\n      \"title\": \"Åbent\",\n      \"color\": \"#FFFF00\"\n    },\n    \"date\": \"2024-03-27\",\n    \"start_time\": \"12:00\",\n    \"end_time\": \"16:00\",\n    \"branch_id\": 2\n  },\n  {\n    \"id\": 50,\n    \"category\": {\n      \"title\": \"Selvbetjening\",\n      \"color\": \"#0000FF\"\n    },\n    \"date\": \"2024-03-27\",\n    \"start_time\": \"17:00\",\n    \"end_time\": \"20:00\",\n    \"branch_id\": 3\n  },\n  {\n    \"id\": 51,\n    \"category\": {\n      \"title\": \"Med betjening\",\n      \"color\": \"#FF0000\"\n    },\n    \"date\": \"2024-03-28\",\n    \"start_time\": \"09:00\",\n    \"end_time\": \"13:00\",\n    \"branch_id\": 1\n  },\n  {\n    \"id\": 52,\n    \"category\": {\n      \"title\": \"Telefontid\",\n      \"color\": \"#008000\"\n    },\n    \"date\": \"2024-03-28\",\n    \"start_time\": \"14:00\",\n    \"end_time\": \"17:00\",\n    \"branch_id\": 2\n  },\n  {\n    \"id\": 53,\n    \"category\": {\n      \"title\": \"Borgerservice\",\n      \"color\": \"#FFFF00\"\n    },\n    \"date\": \"2024-03-28\",\n    \"start_time\": \"18:00\",\n    \"end_time\": \"20:00\",\n    \"branch_id\": 3\n  },\n  {\n    \"id\": 54,\n    \"category\": {\n      \"title\": \"Børneetagen\",\n      \"color\": \"#0000FF\"\n    },\n    \"date\": \"2024-03-29\",\n    \"start_time\": \"08:00\",\n    \"end_time\": \"12:00\",\n    \"branch_id\": 1\n  },\n  {\n    \"id\": 55,\n    \"category\": {\n      \"title\": \"Makerlab\",\n      \"color\": \"#FF0000\"\n    },\n    \"date\": \"2024-03-29\",\n    \"start_time\": \"13:00\",\n    \"end_time\": \"16:00\",\n    \"branch_id\": 2\n  },\n  {\n    \"id\": 56,\n    \"category\": {\n      \"title\": \"Åbent\",\n      \"color\": \"#008000\"\n    },\n    \"date\": \"2024-03-29\",\n    \"start_time\": \"17:00\",\n    \"end_time\": \"19:00\",\n    \"branch_id\": 3\n  },\n  {\n    \"id\": 57,\n    \"category\": {\n      \"title\": \"Selvbetjening\",\n      \"color\": \"#FFFF00\"\n    },\n    \"date\": \"2024-03-30\",\n    \"start_time\": \"09:00\",\n    \"end_time\": \"12:00\",\n    \"branch_id\": 1\n  },\n  {\n    \"id\": 58,\n    \"category\": {\n      \"title\": \"Med betjening\",\n      \"color\": \"#0000FF\"\n    },\n    \"date\": \"2024-03-30\",\n    \"start_time\": \"12:30\",\n    \"end_time\": \"15:30\",\n    \"branch_id\": 2\n  },\n  {\n    \"id\": 59,\n    \"category\": {\n      \"title\": \"Telefontid\",\n      \"color\": \"#FF0000\"\n    },\n    \"date\": \"2024-03-30\",\n    \"start_time\": \"16:00\",\n    \"end_time\": \"18:00\",\n    \"branch_id\": 3\n  },\n  {\n    \"id\": 60,\n    \"category\": {\n      \"title\": \"Borgerservice\",\n      \"color\": \"#008000\"\n    },\n    \"date\": \"2024-03-31\",\n    \"start_time\": \"10:00\",\n    \"end_time\": \"13:00\",\n    \"branch_id\": 1\n  },\n  {\n    \"id\": 61,\n    \"category\": {\n      \"title\": \"Børneetagen\",\n      \"color\": \"#FFFF00\"\n    },\n    \"date\": \"2024-03-31\",\n    \"start_time\": \"14:00\",\n    \"end_time\": \"17:00\",\n    \"branch_id\": 2\n  },\n  {\n    \"id\": 62,\n    \"category\": {\n      \"title\": \"Makerlab\",\n      \"color\": \"#0000FF\"\n    },\n    \"date\": \"2024-03-31\",\n    \"start_time\": \"18:00\",\n    \"end_time\": \"20:00\",\n    \"branch_id\": 3\n  }\n]\n",
+    "headers" : { }
+  },
+  "uuid" : "8b0177da-969f-4461-ae54-34151ad21b07",
+  "persistent" : true,
+  "priority" : 5,
+  "insertionIndex" : 2,
+  "postServeActions" : [ ]
+}
diff --git a/.docker/wiremock/cms/mappings/current-week--4a24284b-7281-46df-ae95-de1a28578f3f.json b/.docker/wiremock/cms/mappings/current-week--4a24284b-7281-46df-ae95-de1a28578f3f.json
@@ -0,0 +1,18 @@
+{
+  "id" : "4a24284b-7281-46df-ae95-de1a28578f3f",
+  "name" : "Current week ",
+  "request" : {
+    "url" : "/dpl_opening_hours?branch_id=1&from_date=2024-03-18&to_date=2024-03-24",
+    "method" : "GET"
+  },
+  "response" : {
+    "status" : 200,
+    "body" : "[ {\n    \"id\": 0,\n    \"category\": {\n      \"title\": \"Åbent\",\n      \"color\": \"#0000FF\"\n    },\n    \"date\": \"2024-03-18\",\n    \"start_time\": \"09:00\",\n    \"end_time\": \"12:00\",\n    \"branch_id\": 1\n  },\n  {\n    \"id\": 1,\n    \"category\": {\n      \"title\": \"Selvbetjening\",\n      \"color\": \"#FF0000\"\n    },\n    \"date\": \"2024-03-18\",\n    \"start_time\": \"13:00\",\n    \"end_time\": \"16:00\",\n    \"branch_id\": 1\n  },\n  {\n    \"id\": 2,\n    \"category\": {\n      \"title\": \"Med betjening\",\n      \"color\": \"#008000\"\n    },\n    \"date\": \"2024-03-18\",\n    \"start_time\": \"17:00\",\n    \"end_time\": \"19:00\",\n    \"branch_id\": 1\n  },\n  {\n    \"id\": 3,\n    \"category\": {\n      \"title\": \"Telefontid\",\n      \"color\": \"#FFFF00\"\n    },\n    \"date\": \"2024-03-19\",\n    \"start_time\": \"08:00\",\n    \"end_time\": \"10:00\",\n    \"branch_id\": 1\n  },\n  {\n    \"id\": 4,\n    \"category\": {\n      \"title\": \"Borgerservice\",\n      \"color\": \"#0000FF\"\n    },\n    \"date\": \"2024-03-19\",\n    \"start_time\": \"11:00\",\n    \"end_time\": \"13:00\",\n    \"branch_id\": 1\n  },\n  {\n    \"id\": 5,\n    \"category\": {\n      \"title\": \"Børneetagen\",\n      \"color\": \"#FF0000\"\n    },\n    \"date\": \"2024-03-19\",\n    \"start_time\": \"14:00\",\n    \"end_time\": \"17:00\",\n    \"branch_id\": 1\n  },\n  {\n    \"id\": 6,\n    \"category\": {\n      \"title\": \"Makerlab\",\n      \"color\": \"#0000FF\"\n    },\n    \"date\": \"2024-03-20\",\n    \"start_time\": \"09:00\",\n    \"end_time\": \"12:00\",\n    \"branch_id\": 1\n  },\n  {\n    \"id\": 7,\n    \"category\": {\n      \"title\": \"Åbent\",\n      \"color\": \"#008000\"\n    },\n    \"date\": \"2024-03-20\",\n    \"start_time\": \"13:00\",\n    \"end_time\": \"15:00\",\n    \"branch_id\": 1\n  },\n  {\n    \"id\": 8,\n    \"category\": {\n      \"title\": \"Selvbetjening\",\n      \"color\": \"#FFFF00\"\n    },\n    \"date\": \"2024-03-20\",\n    \"start_time\": \"16:00\",\n    \"end_time\": \"19:00\",\n    \"branch_id\": 1\n  },\n  {\n    \"id\": 9,\n    \"category\": {\n      \"title\": \"Med betjening\",\n      \"color\": \"#0000FF\"\n    },\n    \"date\": \"2024-03-21\",\n    \"start_time\": \"09:00\",\n    \"end_time\": \"11:00\",\n    \"branch_id\": 1\n  },\n  {\n    \"id\": 10,\n    \"category\": {\n      \"title\": \"Telefontid\",\n      \"color\": \"#FF0000\"\n    },\n    \"date\": \"2024-03-21\",\n    \"start_time\": \"12:00\",\n    \"end_time\": \"14:00\",\n    \"branch_id\": 1\n  },\n  {\n    \"id\": 11,\n    \"category\": {\n      \"title\": \"Borgerservice\",\n      \"color\": \"#008000\"\n    },\n    \"date\": \"2024-03-21\",\n    \"start_time\": \"15:00\",\n    \"end_time\": \"18:00\",\n    \"branch_id\": 1\n  },\n  {\n    \"id\": 12,\n    \"category\": {\n      \"title\": \"Børneetagen\",\n      \"color\": \"#0000FF\"\n    },\n    \"date\": \"2024-03-22\",\n    \"start_time\": \"10:00\",\n    \"end_time\": \"13:00\",\n    \"branch_id\": 1\n  },\n\n  {\n    \"id\": 18,\n    \"category\": {\n      \"title\": \"Borgerservice\",\n      \"color\": \"#008000\"\n    },\n    \"date\": \"2024-03-24\",\n    \"start_time\": \"10:00\",\n    \"end_time\": \"13:00\",\n    \"branch_id\": 1\n  },\n  {\n    \"id\": 19,\n    \"category\": {\n      \"title\": \"Børneetagen\",\n      \"color\": \"#FFFF00\"\n    },\n    \"date\": \"2024-03-24\",\n    \"start_time\": \"14:00\",\n    \"end_time\": \"18:00\",\n    \"branch_id\": 1\n  },\n  {\n    \"id\": 20,\n    \"category\": {\n      \"title\": \"Makerlab\",\n      \"color\": \"#0000FF\"\n    },\n    \"date\": \"2024-03-24\",\n    \"start_time\": \"19:00\",\n    \"end_time\": \"21:00\",\n    \"branch_id\": 1\n  }]",
+    "headers" : { }
+  },
+  "uuid" : "4a24284b-7281-46df-ae95-de1a28578f3f",
+  "persistent" : true,
+  "priority" : 5,
+  "insertionIndex" : 3,
+  "postServeActions" : [ ]
+}
diff --git a/.docker/wiremock/cms/mappings/delete-event-f52a1b96-38d2-479a-aeaf-65367637d365.json b/.docker/wiremock/cms/mappings/delete-event-f52a1b96-38d2-479a-aeaf-65367637d365.json
@@ -0,0 +1,18 @@
+{
+  "id": "f52a1b96-38d2-479a-aeaf-65367637d365",
+  "name": "Delete event",
+  "request": {
+    "urlPathPattern": "/dpl_opening_hours/[0-9]+",
+    "method": "DELETE"
+  },
+  "response": {
+    "status": 204,
+    "body": "",
+    "headers": {}
+  },
+  "uuid": "f52a1b96-38d2-479a-aeaf-65367637d365",
+  "persistent": true,
+  "priority": 5,
+  "insertionIndex": 1,
+  "postServeActions": []
+}
diff --git a/.docker/wiremock/cms/mappings/dummy-479e26d6-5197-4d8f-a2dd-fefe64aabc14.json b/.docker/wiremock/cms/mappings/dummy-479e26d6-5197-4d8f-a2dd-fefe64aabc14.json
@@ -0,0 +1,18 @@
+{
+  "id" : "479e26d6-5197-4d8f-a2dd-fefe64aabc14",
+  "name" : "Opening hours",
+  "request" : {
+    "url" : "/dpl_opening_hours",
+    "method" : "GET"
+  },
+  "response" : {
+    "status" : 200,
+    "body" : "[\n  \n]\n",
+    "headers" : { }
+  },
+  "uuid" : "479e26d6-5197-4d8f-a2dd-fefe64aabc14",
+  "persistent" : true,
+  "priority" : 5,
+  "insertionIndex" : 0,
+  "postServeActions" : [ ]
+}