Fix from AK

MinBZK · Dec 17, 2024 · 468ea4c · 468ea4c
1 parent b8a0988
commit 468ea4c
Show file tree

Hide file tree

Showing 12 changed files with 1,233 additions and 932 deletions.
diff --git a/resources/system_card_templates/AMT_Template_1.json b/resources/system_card_templates/AMT_Template_1.json
@@ -495,6 +495,16 @@
       "state": "to do",
       "version": ""
     },
+    {
+      "urn": "urn:nl:ak:ver:aia-26",
+      "state": "to do",
+      "version": ""
+    },
+    {
+      "urn": "urn:nl:ak:ver:aia-27",
+      "state": "to do",
+      "version": ""
+    },
     {
       "urn": "urn:nl:ak:ver:aia-28",
       "state": "to do",

diff --git a/tests/fixtures/vcr_cassettes/test_fetch_task_with_invalid_urn.yml b/tests/fixtures/vcr_cassettes/test_fetch_task_with_invalid_urn.yml
@@ -25,7 +25,7 @@ interactions:
         Content-Type:
           - application/json
         Date:
-          - Tue, 17 Dec 2024 12:57:06 GMT
+          - Tue, 17 Dec 2024 13:25:34 GMT
         Strict-Transport-Security:
           - max-age=31536000; includeSubDomains
       status:

diff --git a/tests/fixtures/vcr_cassettes/test_fetch_task_with_urn.yml b/tests/fixtures/vcr_cassettes/test_fetch_task_with_urn.yml
@@ -282,10 +282,42 @@ interactions:
         Content-Type:
           - application/json
         Date:
-          - Tue, 17 Dec 2024 12:57:06 GMT
+          - Tue, 17 Dec 2024 13:25:34 GMT
         Strict-Transport-Security:
           - max-age=31536000; includeSubDomains
       status:
         code: 200
         message: OK
+  - request:
+      body: ""
+      headers:
+        accept:
+          - "*/*"
+        accept-encoding:
+          - gzip, deflate
+        connection:
+          - keep-alive
+        host:
+          - task-registry.apps.digilab.network
+        user-agent:
+          - python-httpx/0.27.2
+      method: GET
+      uri: https://task-registry.apps.digilab.network/measures/urn/urn:nl:ak:mtr:dat-03?version=latest
+    response:
+      body:
+        string: '{"detail":"invalid urn: urn:nl:ak:mtr:dat-03"}'
+      headers:
+        Connection:
+          - keep-alive
+        Content-Length:
+          - "46"
+        Content-Type:
+          - application/json
+        Date:
+          - Tue, 17 Dec 2024 13:25:34 GMT
+        Strict-Transport-Security:
+          - max-age=31536000; includeSubDomains
+      status:
+        code: 400
+        message: Bad Request
 version: 1
diff --git a/tests/fixtures/vcr_cassettes/test_fetch_task_with_urns.yml b/tests/fixtures/vcr_cassettes/test_fetch_task_with_urns.yml
@@ -426,7 +426,7 @@ interactions:
         Content-Type:
           - application/json
         Date:
-          - Tue, 17 Dec 2024 12:57:06 GMT
+          - Tue, 17 Dec 2024 13:25:34 GMT
         Strict-Transport-Security:
           - max-age=31536000; includeSubDomains
       status:

diff --git a/tests/fixtures/vcr_cassettes/test_fetch_task_with_valid_and_invalid_urn.yml b/tests/fixtures/vcr_cassettes/test_fetch_task_with_valid_and_invalid_urn.yml
@@ -25,7 +25,7 @@ interactions:
         Content-Type:
           - application/json
         Date:
-          - Tue, 17 Dec 2024 12:57:06 GMT
+          - Tue, 17 Dec 2024 13:25:34 GMT
         Strict-Transport-Security:
           - max-age=31536000; includeSubDomains
       status:

diff --git a/tests/fixtures/vcr_cassettes/test_fetch_tasks_all.yml b/tests/fixtures/vcr_cassettes/test_fetch_tasks_all.yml
diff --git a/tests/fixtures/vcr_cassettes/test_get_assessment_card.yml b/tests/fixtures/vcr_cassettes/test_get_assessment_card.yml
@@ -2116,12 +2116,12 @@ interactions:
         content-type:
           - text/html; charset=utf-8
         set-cookie:
-          - fastapi-csrf-token=IjUwZmVhZjJhMWVmMTY0MjVjZTMzZGRmM2ZmYWNmNmNhZjUzZTIzNjYi.Z2F1HQ.XlZExhWI0yo3twIRJy_ZoEoLhKA;
+          - fastapi-csrf-token=IjNkMWQwMzRlN2RmM2FjNDgwYTk4ODRiYTkwNGEwOWYyZWQ2MjJkZjQi.Z2F7yA.vMkjuZxO9Q7QEawlRn95-boOc3E;
             HttpOnly; Max-Age=3600; Path=/; SameSite=strict
         strict-transport-security:
           - max-age=31536000; includeSubDomains
         x-api-request-id:
-          - 01JFAB2YVK2MPZWT6D5ZJQQKRZ
+          - 01JFACQ1G3PRZ3E10RRF1QXP5N
       status:
         code: 200
         message: OK

diff --git a/tests/fixtures/vcr_cassettes/test_get_model_card.yml b/tests/fixtures/vcr_cassettes/test_get_model_card.yml
@@ -134,7 +134,7 @@ interactions:
           style=\"padding-block: 0.0em 1.25em;\">\n                Data will be stored
           for at least 45 days before permanent\n                deletion.\n            </p>\n
           \           <p class=\"utrecht-button-group\">\n                <button hx-headers='{\"X-CSRF-Token\":
-          \"c6dca4c84eef7ea71159d362a4a820f20d95dfde\"}'\n                        hx-delete=\"/algorithm/1\"\n
+          \"f813cb5a72a4176fd8674270776f5f1097baf3bc\"}'\n                        hx-delete=\"/algorithm/1\"\n
           \                       class=\"utrecht-button utrecht-button--primary-action
           utrecht-button--rvo-md\"\n                        type=\"button\">\n                    Yes\n
           \               </button>\n                <button class=\"utrecht-button
@@ -169,7 +169,7 @@ interactions:
           rvo-icon--md rvo-icon--hemelblauw rvo-link__icon--before\"\n                                  role=\"img\"\n
           \                                 aria-label=\"\"></span>Does the algorithm
           meet the requirements?\n                        </h5>\n                        <a
-          class=\"rvo-text--subtle rvo-text--bold\">0/35\n                        Done</a>\n
+          class=\"rvo-text--subtle rvo-text--bold\">0/37\n                        Done</a>\n
           \                   </div>\n                    <ul class=\"rvo-item-list\">\n
           \                       \n                            \n                            \n
           \                               <li class=\"rvo-item-list__item\">\n                                    <div
@@ -251,6 +251,8 @@ interactions:
           \                           \n                            \n                        \n
           \                           \n                            \n                        \n
           \                           \n                            \n                        \n
+          \                           \n                            \n                        \n
+          \                           \n                            \n                        \n
           \                   </ul>\n                    <a class=\"rvo-link rvo-link--normal
           rvo-link--with-icon\"\n                       href=\"/algorithm/1/details/system_card/requirements\"\n
           \                      style=\"margin-top: auto\">\n                        <span
@@ -603,16 +605,16 @@ interactions:
         content-language:
           - en,nl
         content-length:
-          - "49069"
+          - "49235"
         content-type:
           - text/html; charset=utf-8
         set-cookie:
-          - fastapi-csrf-token=ImM2ZGNhNGM4NGVlZjdlYTcxMTU5ZDM2MmE0YTgyMGYyMGQ5NWRmZGUi.Z2F1HQ.crg2d12GWSmBBNoVnGCzQG1IDSI;
+          - fastapi-csrf-token=ImY4MTNjYjVhNzJhNDE3NmZkODY3NDI3MDc3NmY1ZjEwOTdiYWYzYmMi.Z2F7yA.OdZhe3b9WwnmMSw3uW_o0lVUjM0;
             HttpOnly; Max-Age=3600; Path=/; SameSite=strict
         strict-transport-security:
           - max-age=31536000; includeSubDomains
         x-api-request-id:
-          - 01JFAB2Z05H65Y1TNAD6V57R2X
+          - 01JFACQ1N1EFDH676HFWNHHVTA
       status:
         code: 200
         message: OK

diff --git a/tests/fixtures/vcr_cassettes/test_get_system_card_data_page.yml b/tests/fixtures/vcr_cassettes/test_get_system_card_data_page.yml
@@ -134,7 +134,7 @@ interactions:
           style=\"padding-block: 0.0em 1.25em;\">\n                Data will be stored
           for at least 45 days before permanent\n                deletion.\n            </p>\n
           \           <p class=\"utrecht-button-group\">\n                <button hx-headers='{\"X-CSRF-Token\":
-          \"2f63075191e99fb2a49c1332703bf2d8a76caa1e\"}'\n                        hx-delete=\"/algorithm/1\"\n
+          \"03179d30dbf1b1f26fef9ef9ecea43c7401545e0\"}'\n                        hx-delete=\"/algorithm/1\"\n
           \                       class=\"utrecht-button utrecht-button--primary-action
           utrecht-button--rvo-md\"\n                        type=\"button\">\n                    Yes\n
           \               </button>\n                <button class=\"utrecht-button
@@ -169,7 +169,7 @@ interactions:
           rvo-icon--md rvo-icon--hemelblauw rvo-link__icon--before\"\n                                  role=\"img\"\n
           \                                 aria-label=\"\"></span>Does the algorithm
           meet the requirements?\n                        </h5>\n                        <a
-          class=\"rvo-text--subtle rvo-text--bold\">0/35\n                        Done</a>\n
+          class=\"rvo-text--subtle rvo-text--bold\">0/37\n                        Done</a>\n
           \                   </div>\n                    <ul class=\"rvo-item-list\">\n
           \                       \n                            \n                            \n
           \                               <li class=\"rvo-item-list__item\">\n                                    <div
@@ -251,6 +251,8 @@ interactions:
           \                           \n                            \n                        \n
           \                           \n                            \n                        \n
           \                           \n                            \n                        \n
+          \                           \n                            \n                        \n
+          \                           \n                            \n                        \n
           \                   </ul>\n                    <a class=\"rvo-link rvo-link--normal
           rvo-link--with-icon\"\n                       href=\"/algorithm/1/details/system_card/requirements\"\n
           \                      style=\"margin-top: auto\">\n                        <span
@@ -353,16 +355,16 @@ interactions:
         content-language:
           - en,nl
         content-length:
-          - "28749"
+          - "28915"
         content-type:
           - text/html; charset=utf-8
         set-cookie:
-          - fastapi-csrf-token=IjJmNjMwNzUxOTFlOTlmYjJhNDljMTMzMjcwM2JmMmQ4YTc2Y2FhMWUi.Z2F1Hw.YBDUN9StR47JBLm5ahUf0noPuGY;
+          - fastapi-csrf-token=IjAzMTc5ZDMwZGJmMWIxZjI2ZmVmOWVmOWVjZWE0M2M3NDAxNTQ1ZTAi.Z2F7yg.sKiQ5QwUkfA0N0X_rtXO_7iVXhI;
             HttpOnly; Max-Age=3600; Path=/; SameSite=strict
         strict-transport-security:
           - max-age=31536000; includeSubDomains
         x-api-request-id:
-          - 01JFAB30F0GXF4KZJG6A73PY5T
+          - 01JFACQ3KG34GS5X7P32E5ST91
       status:
         code: 200
         message: OK

diff --git a/tests/fixtures/vcr_cassettes/test_get_system_card_instruments.yml b/tests/fixtures/vcr_cassettes/test_get_system_card_instruments.yml
@@ -134,7 +134,7 @@ interactions:
           style=\"padding-block: 0.0em 1.25em;\">\n                Data will be stored
           for at least 45 days before permanent\n                deletion.\n            </p>\n
           \           <p class=\"utrecht-button-group\">\n                <button hx-headers='{\"X-CSRF-Token\":
-          \"9716d1546426375c3bc91adb4d995e1047a39c19\"}'\n                        hx-delete=\"/algorithm/1\"\n
+          \"3a8412ee4f38b2e7556afb9b9ba3e5e6dd4c6775\"}'\n                        hx-delete=\"/algorithm/1\"\n
           \                       class=\"utrecht-button utrecht-button--primary-action
           utrecht-button--rvo-md\"\n                        type=\"button\">\n                    Yes\n
           \               </button>\n                <button class=\"utrecht-button
@@ -169,7 +169,7 @@ interactions:
           rvo-icon--md rvo-icon--hemelblauw rvo-link__icon--before\"\n                                  role=\"img\"\n
           \                                 aria-label=\"\"></span>Does the algorithm
           meet the requirements?\n                        </h5>\n                        <a
-          class=\"rvo-text--subtle rvo-text--bold\">0/35\n                        Done</a>\n
+          class=\"rvo-text--subtle rvo-text--bold\">0/37\n                        Done</a>\n
           \                   </div>\n                    <ul class=\"rvo-item-list\">\n
           \                       \n                            \n                            \n
           \                               <li class=\"rvo-item-list__item\">\n                                    <div
@@ -251,6 +251,8 @@ interactions:
           \                           \n                            \n                        \n
           \                           \n                            \n                        \n
           \                           \n                            \n                        \n
+          \                           \n                            \n                        \n
+          \                           \n                            \n                        \n
           \                   </ul>\n                    <a class=\"rvo-link rvo-link--normal
           rvo-link--with-icon\"\n                       href=\"/algorithm/1/details/system_card/requirements\"\n
           \                      style=\"margin-top: auto\">\n                        <span
@@ -353,16 +355,16 @@ interactions:
         content-language:
           - en,nl
         content-length:
-          - "28749"
+          - "28915"
         content-type:
           - text/html; charset=utf-8
         set-cookie:
-          - fastapi-csrf-token=Ijk3MTZkMTU0NjQyNjM3NWMzYmM5MWFkYjRkOTk1ZTEwNDdhMzljMTki.Z2F1Hw.7Erq8eVfi9oz1QRsCHKwyHnfbeU;
+          - fastapi-csrf-token=IjNhODQxMmVlNGYzOGIyZTc1NTZhZmI5YjliYTNlNWU2ZGQ0YzY3NzUi.Z2F7yg.o8VRCW_Hsne9qhgZro98qH15imw;
             HttpOnly; Max-Age=3600; Path=/; SameSite=strict
         strict-transport-security:
           - max-age=31536000; includeSubDomains
         x-api-request-id:
-          - 01JFAB30GMFBS976N0NK057KT1
+          - 01JFACQ3N473B6ZKSEMZDAVT5A
       status:
         code: 200
         message: OK