From b49b89b9683ca239e57fda07e191cca837ad0be2 Mon Sep 17 00:00:00 2001 From: Steven Bal Date: Tue, 19 Nov 2024 15:06:23 +0100 Subject: [PATCH] :truck: [#4788] Move setup config code to objects_api contrib directory since this is all tightly coupled with the objects API models, the steps and models should be defined there as well --- src/openforms/conf/base.py | 2 +- ...tepTests.test_validate_result_failure.yaml | 324 ----------------- ...tepTests.test_validate_result_success.yaml | 342 ------------------ .../setup_configuration/__init__.py | 0 .../setup_configuration/models.py | 0 .../objects_api}/setup_configuration/steps.py | 0 .../setup_configuration/tests/__init__.py | 0 .../tests/files/setup_config_objects_api.yaml | 0 .../setup_config_objects_api_all_fields.yaml | 0 ...up_config_objects_api_required_fields.yaml | 0 .../tests/test_objects_api_config.py | 4 +- 11 files changed, 2 insertions(+), 670 deletions(-) delete mode 100644 src/openforms/config/setup_configuration/tests/files/vcr_cassettes/ObjectsAPIConfigurationStepTests/ObjectsAPIConfigurationStepTests.test_validate_result_failure.yaml delete mode 100644 src/openforms/config/setup_configuration/tests/files/vcr_cassettes/ObjectsAPIConfigurationStepTests/ObjectsAPIConfigurationStepTests.test_validate_result_success.yaml rename src/openforms/{config => contrib/objects_api}/setup_configuration/__init__.py (100%) rename src/openforms/{config => contrib/objects_api}/setup_configuration/models.py (100%) rename src/openforms/{config => contrib/objects_api}/setup_configuration/steps.py (100%) rename src/openforms/{config => contrib/objects_api}/setup_configuration/tests/__init__.py (100%) rename src/openforms/{config => contrib/objects_api}/setup_configuration/tests/files/setup_config_objects_api.yaml (100%) rename src/openforms/{config => contrib/objects_api}/setup_configuration/tests/files/setup_config_objects_api_all_fields.yaml (100%) rename src/openforms/{config => contrib/objects_api}/setup_configuration/tests/files/setup_config_objects_api_required_fields.yaml (100%) rename src/openforms/{config => contrib/objects_api}/setup_configuration/tests/test_objects_api_config.py (98%) diff --git a/src/openforms/conf/base.py b/src/openforms/conf/base.py index 69e8cde91d..09a97a58c0 100644 --- a/src/openforms/conf/base.py +++ b/src/openforms/conf/base.py @@ -1226,5 +1226,5 @@ SETUP_CONFIGURATION_STEPS = [ "zgw_consumers.contrib.setup_configuration.steps.ServiceConfigurationStep", - "openforms.config.setup_configuration.steps.ObjectsAPIConfigurationStep", + "openforms.contrib.objects_api.setup_configuration.steps.ObjectsAPIConfigurationStep", ] diff --git a/src/openforms/config/setup_configuration/tests/files/vcr_cassettes/ObjectsAPIConfigurationStepTests/ObjectsAPIConfigurationStepTests.test_validate_result_failure.yaml b/src/openforms/config/setup_configuration/tests/files/vcr_cassettes/ObjectsAPIConfigurationStepTests/ObjectsAPIConfigurationStepTests.test_validate_result_failure.yaml deleted file mode 100644 index f4c8bbeb7b..0000000000 --- a/src/openforms/config/setup_configuration/tests/files/vcr_cassettes/ObjectsAPIConfigurationStepTests/ObjectsAPIConfigurationStepTests.test_validate_result_failure.yaml +++ /dev/null @@ -1,324 +0,0 @@ -interactions: -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate, br - Authorization: - - Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ0ZXN0X2NsaWVudF9pZCIsImlhdCI6MTczMTY3NzMwNSwiY2xpZW50X2lkIjoidGVzdF9jbGllbnRfaWQiLCJ1c2VyX2lkIjoiIiwidXNlcl9yZXByZXNlbnRhdGlvbiI6IiJ9.Q2lg_QzdZ54d8M5-NBSFRQ7eS5U7_Slz2cmm01dM8xk - Connection: - - keep-alive - User-Agent: - - python-requests/2.32.2 - method: GET - uri: http://localhost:8003/catalogi/api/v1/catalogussen?domein=OTHER&rsin=000000000 - response: - body: - string: '{"count":1,"next":null,"previous":null,"results":[{"url":"http://localhost:8003/catalogi/api/v1/catalogussen/630271f6-568a-485e-b1c4-4ed2d6ab3a58","domein":"OTHER","rsin":"000000000","contactpersoonBeheerNaam":"Test - name","contactpersoonBeheerTelefoonnummer":"","contactpersoonBeheerEmailadres":"","zaaktypen":[],"besluittypen":[],"informatieobjecttypen":["http://localhost:8003/catalogi/api/v1/informatieobjecttypen/d1cfb1d8-8593-4814-919d-72e38e80388f","http://localhost:8003/catalogi/api/v1/informatieobjecttypen/f2908f6f-aa07-42ef-8760-74c5234f2d25","http://localhost:8003/catalogi/api/v1/informatieobjecttypen/cd6aeaf2-ca37-416f-b78c-1cc302f81a81"],"naam":"Test - catalog 2","versie":"","begindatumVersie":null}]}' - headers: - API-version: - - 1.3.1 - Allow: - - GET, POST, HEAD, OPTIONS - Content-Length: - - '716' - Content-Type: - - application/json - Cross-Origin-Opener-Policy: - - same-origin - Referrer-Policy: - - same-origin - Vary: - - Accept, origin - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - DENY - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate, br - Authorization: - - Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ0ZXN0X2NsaWVudF9pZCIsImlhdCI6MTczMTY3NzMwNSwiY2xpZW50X2lkIjoidGVzdF9jbGllbnRfaWQiLCJ1c2VyX2lkIjoiIiwidXNlcl9yZXByZXNlbnRhdGlvbiI6IiJ9.Q2lg_QzdZ54d8M5-NBSFRQ7eS5U7_Slz2cmm01dM8xk - Connection: - - keep-alive - User-Agent: - - python-requests/2.32.2 - method: GET - uri: http://localhost:8003/catalogi/api/v1/informatieobjecttypen?catalogus=http%3A%2F%2Flocalhost%3A8003%2Fcatalogi%2Fapi%2Fv1%2Fcatalogussen%2F630271f6-568a-485e-b1c4-4ed2d6ab3a58&omschrijving=PDF+Informatieobjecttype - response: - body: - string: '{"count":0,"next":null,"previous":null,"results":[]}' - headers: - API-version: - - 1.3.1 - Allow: - - GET, POST, HEAD, OPTIONS - Content-Length: - - '52' - Content-Type: - - application/json - Cross-Origin-Opener-Policy: - - same-origin - Referrer-Policy: - - same-origin - Vary: - - Accept, origin - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - DENY - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate, br - Authorization: - - Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ0ZXN0X2NsaWVudF9pZCIsImlhdCI6MTczMTY3NzMwNSwiY2xpZW50X2lkIjoidGVzdF9jbGllbnRfaWQiLCJ1c2VyX2lkIjoiIiwidXNlcl9yZXByZXNlbnRhdGlvbiI6IiJ9.Q2lg_QzdZ54d8M5-NBSFRQ7eS5U7_Slz2cmm01dM8xk - Connection: - - keep-alive - User-Agent: - - python-requests/2.32.2 - method: GET - uri: http://localhost:8003/catalogi/api/v1/informatieobjecttypen?catalogus=http%3A%2F%2Flocalhost%3A8003%2Fcatalogi%2Fapi%2Fv1%2Fcatalogussen%2F630271f6-568a-485e-b1c4-4ed2d6ab3a58&omschrijving=PDF+Informatieobjecttype - response: - body: - string: '{"count":0,"next":null,"previous":null,"results":[]}' - headers: - API-version: - - 1.3.1 - Allow: - - GET, POST, HEAD, OPTIONS - Content-Length: - - '52' - Content-Type: - - application/json - Cross-Origin-Opener-Policy: - - same-origin - Referrer-Policy: - - same-origin - Vary: - - Accept, origin - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - DENY - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate, br - Authorization: - - Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ0ZXN0X2NsaWVudF9pZCIsImlhdCI6MTczMTY3NzMwNSwiY2xpZW50X2lkIjoidGVzdF9jbGllbnRfaWQiLCJ1c2VyX2lkIjoiIiwidXNlcl9yZXByZXNlbnRhdGlvbiI6IiJ9.Q2lg_QzdZ54d8M5-NBSFRQ7eS5U7_Slz2cmm01dM8xk - Connection: - - keep-alive - User-Agent: - - python-requests/2.32.2 - method: GET - uri: http://localhost:8003/catalogi/api/v1/informatieobjecttypen?catalogus=http%3A%2F%2Flocalhost%3A8003%2Fcatalogi%2Fapi%2Fv1%2Fcatalogussen%2F630271f6-568a-485e-b1c4-4ed2d6ab3a58&omschrijving=CSV+Informatieobjecttype - response: - body: - string: '{"count":0,"next":null,"previous":null,"results":[]}' - headers: - API-version: - - 1.3.1 - Allow: - - GET, POST, HEAD, OPTIONS - Content-Length: - - '52' - Content-Type: - - application/json - Cross-Origin-Opener-Policy: - - same-origin - Referrer-Policy: - - same-origin - Vary: - - Accept, origin - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - DENY - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate, br - Authorization: - - Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ0ZXN0X2NsaWVudF9pZCIsImlhdCI6MTczMTY3NzMwNSwiY2xpZW50X2lkIjoidGVzdF9jbGllbnRfaWQiLCJ1c2VyX2lkIjoiIiwidXNlcl9yZXByZXNlbnRhdGlvbiI6IiJ9.Q2lg_QzdZ54d8M5-NBSFRQ7eS5U7_Slz2cmm01dM8xk - Connection: - - keep-alive - User-Agent: - - python-requests/2.32.2 - method: GET - uri: http://localhost:8003/catalogi/api/v1/informatieobjecttypen?catalogus=http%3A%2F%2Flocalhost%3A8003%2Fcatalogi%2Fapi%2Fv1%2Fcatalogussen%2F630271f6-568a-485e-b1c4-4ed2d6ab3a58&omschrijving=CSV+Informatieobjecttype - response: - body: - string: '{"count":0,"next":null,"previous":null,"results":[]}' - headers: - API-version: - - 1.3.1 - Allow: - - GET, POST, HEAD, OPTIONS - Content-Length: - - '52' - Content-Type: - - application/json - Cross-Origin-Opener-Policy: - - same-origin - Referrer-Policy: - - same-origin - Vary: - - Accept, origin - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - DENY - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate, br - Authorization: - - Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ0ZXN0X2NsaWVudF9pZCIsImlhdCI6MTczMTY3NzMwNSwiY2xpZW50X2lkIjoidGVzdF9jbGllbnRfaWQiLCJ1c2VyX2lkIjoiIiwidXNlcl9yZXByZXNlbnRhdGlvbiI6IiJ9.Q2lg_QzdZ54d8M5-NBSFRQ7eS5U7_Slz2cmm01dM8xk - Connection: - - keep-alive - User-Agent: - - python-requests/2.32.2 - method: GET - uri: http://localhost:8003/catalogi/api/v1/informatieobjecttypen?catalogus=http%3A%2F%2Flocalhost%3A8003%2Fcatalogi%2Fapi%2Fv1%2Fcatalogussen%2F630271f6-568a-485e-b1c4-4ed2d6ab3a58&omschrijving=Attachment+Informatieobjecttype - response: - body: - string: '{"count":0,"next":null,"previous":null,"results":[]}' - headers: - API-version: - - 1.3.1 - Allow: - - GET, POST, HEAD, OPTIONS - Content-Length: - - '52' - Content-Type: - - application/json - Cross-Origin-Opener-Policy: - - same-origin - Referrer-Policy: - - same-origin - Vary: - - Accept, origin - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - DENY - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate, br - Authorization: - - Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ0ZXN0X2NsaWVudF9pZCIsImlhdCI6MTczMTY3NzMwNSwiY2xpZW50X2lkIjoidGVzdF9jbGllbnRfaWQiLCJ1c2VyX2lkIjoiIiwidXNlcl9yZXByZXNlbnRhdGlvbiI6IiJ9.Q2lg_QzdZ54d8M5-NBSFRQ7eS5U7_Slz2cmm01dM8xk - Connection: - - keep-alive - User-Agent: - - python-requests/2.32.2 - method: GET - uri: http://localhost:8003/catalogi/api/v1/informatieobjecttypen?catalogus=http%3A%2F%2Flocalhost%3A8003%2Fcatalogi%2Fapi%2Fv1%2Fcatalogussen%2F630271f6-568a-485e-b1c4-4ed2d6ab3a58&omschrijving=Attachment+Informatieobjecttype - response: - body: - string: '{"count":0,"next":null,"previous":null,"results":[]}' - headers: - API-version: - - 1.3.1 - Allow: - - GET, POST, HEAD, OPTIONS - Content-Length: - - '52' - Content-Type: - - application/json - Cross-Origin-Opener-Policy: - - same-origin - Referrer-Policy: - - same-origin - Vary: - - Accept, origin - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - DENY - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate, br - Authorization: - - Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ0ZXN0X2NsaWVudF9pZCIsImlhdCI6MTczMTY3NzMwNiwiY2xpZW50X2lkIjoidGVzdF9jbGllbnRfaWQiLCJ1c2VyX2lkIjoiIiwidXNlcl9yZXByZXNlbnRhdGlvbiI6IiJ9.VZZjxRHz4dy14petppjXi4OHm2XyM8McFgqyYD27-TM - Connection: - - keep-alive - User-Agent: - - python-requests/2.32.2 - method: GET - uri: http://localhost:8003/catalogi/api/v1/catalogussen?domein=WRONG&rsin=000000000 - response: - body: - string: '{"count":0,"next":null,"previous":null,"results":[]}' - headers: - API-version: - - 1.3.1 - Allow: - - GET, POST, HEAD, OPTIONS - Content-Length: - - '52' - Content-Type: - - application/json - Cross-Origin-Opener-Policy: - - same-origin - Referrer-Policy: - - same-origin - Vary: - - Accept, origin - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - DENY - status: - code: 200 - message: OK -version: 1 diff --git a/src/openforms/config/setup_configuration/tests/files/vcr_cassettes/ObjectsAPIConfigurationStepTests/ObjectsAPIConfigurationStepTests.test_validate_result_success.yaml b/src/openforms/config/setup_configuration/tests/files/vcr_cassettes/ObjectsAPIConfigurationStepTests/ObjectsAPIConfigurationStepTests.test_validate_result_success.yaml deleted file mode 100644 index 05eb53849d..0000000000 --- a/src/openforms/config/setup_configuration/tests/files/vcr_cassettes/ObjectsAPIConfigurationStepTests/ObjectsAPIConfigurationStepTests.test_validate_result_success.yaml +++ /dev/null @@ -1,342 +0,0 @@ -interactions: -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate, br - Authorization: - - Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ0ZXN0X2NsaWVudF9pZCIsImlhdCI6MTczMTY3NzMwNiwiY2xpZW50X2lkIjoidGVzdF9jbGllbnRfaWQiLCJ1c2VyX2lkIjoiIiwidXNlcl9yZXByZXNlbnRhdGlvbiI6IiJ9.VZZjxRHz4dy14petppjXi4OHm2XyM8McFgqyYD27-TM - Connection: - - keep-alive - User-Agent: - - python-requests/2.32.2 - method: GET - uri: http://localhost:8003/catalogi/api/v1/catalogussen?domein=TEST&rsin=000000000 - response: - body: - string: '{"count":1,"next":null,"previous":null,"results":[{"url":"http://localhost:8003/catalogi/api/v1/catalogussen/bd58635c-793e-446d-a7e0-460d7b04829d","domein":"TEST","rsin":"000000000","contactpersoonBeheerNaam":"Test - name","contactpersoonBeheerTelefoonnummer":"","contactpersoonBeheerEmailadres":"","zaaktypen":["http://localhost:8003/catalogi/api/v1/zaaktypen/1f41885e-23fc-4462-bbc8-80be4ae484dc","http://localhost:8003/catalogi/api/v1/zaaktypen/b79d9c2f-5ec4-4e23-bb66-ec6dd959a400"],"besluittypen":[],"informatieobjecttypen":["http://localhost:8003/catalogi/api/v1/informatieobjecttypen/7a474713-0833-402a-8441-e467c08ac55b","http://localhost:8003/catalogi/api/v1/informatieobjecttypen/b2d83b94-9b9b-4e80-a82f-73ff993c62f3","http://localhost:8003/catalogi/api/v1/informatieobjecttypen/531f6c1a-97f7-478c-85f0-67d2f23661c7","http://localhost:8003/catalogi/api/v1/informatieobjecttypen/29b63e5c-3835-4f68-8fad-f2aea9ae6b71"],"naam":"Test - catalog","versie":"","begindatumVersie":null}]}' - headers: - API-version: - - 1.3.1 - Allow: - - GET, POST, HEAD, OPTIONS - Content-Length: - - '985' - Content-Type: - - application/json - Cross-Origin-Opener-Policy: - - same-origin - Referrer-Policy: - - same-origin - Vary: - - Accept, origin - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - DENY - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate, br - Authorization: - - Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ0ZXN0X2NsaWVudF9pZCIsImlhdCI6MTczMTY3NzMwNiwiY2xpZW50X2lkIjoidGVzdF9jbGllbnRfaWQiLCJ1c2VyX2lkIjoiIiwidXNlcl9yZXByZXNlbnRhdGlvbiI6IiJ9.VZZjxRHz4dy14petppjXi4OHm2XyM8McFgqyYD27-TM - Connection: - - keep-alive - User-Agent: - - python-requests/2.32.2 - method: GET - uri: http://localhost:8003/catalogi/api/v1/informatieobjecttypen?catalogus=http%3A%2F%2Flocalhost%3A8003%2Fcatalogi%2Fapi%2Fv1%2Fcatalogussen%2Fbd58635c-793e-446d-a7e0-460d7b04829d&omschrijving=PDF+Informatieobjecttype - response: - body: - string: '{"count":2,"next":null,"previous":null,"results":[{"url":"http://localhost:8003/catalogi/api/v1/informatieobjecttypen/29b63e5c-3835-4f68-8fad-f2aea9ae6b71","catalogus":"http://localhost:8003/catalogi/api/v1/catalogussen/bd58635c-793e-446d-a7e0-460d7b04829d","omschrijving":"PDF - Informatieobjecttype","vertrouwelijkheidaanduiding":"openbaar","beginGeldigheid":"2024-07-11","eindeGeldigheid":null,"concept":false,"besluittypen":[],"informatieobjectcategorie":"Test - category","trefwoord":[],"omschrijvingGeneriek":{"informatieobjecttypeOmschrijvingGeneriek":"","definitieInformatieobjecttypeOmschrijvingGeneriek":"","herkomstInformatieobjecttypeOmschrijvingGeneriek":"","hierarchieInformatieobjecttypeOmschrijvingGeneriek":"","opmerkingInformatieobjecttypeOmschrijvingGeneriek":""},"zaaktypen":[],"beginObject":"2024-03-19","eindeObject":null},{"url":"http://localhost:8003/catalogi/api/v1/informatieobjecttypen/7a474713-0833-402a-8441-e467c08ac55b","catalogus":"http://localhost:8003/catalogi/api/v1/catalogussen/bd58635c-793e-446d-a7e0-460d7b04829d","omschrijving":"PDF - Informatieobjecttype","vertrouwelijkheidaanduiding":"openbaar","beginGeldigheid":"2024-03-19","eindeGeldigheid":"2024-07-10","concept":false,"besluittypen":[],"informatieobjectcategorie":"Test - category","trefwoord":[],"omschrijvingGeneriek":{"informatieobjecttypeOmschrijvingGeneriek":"","definitieInformatieobjecttypeOmschrijvingGeneriek":"","herkomstInformatieobjecttypeOmschrijvingGeneriek":"","hierarchieInformatieobjecttypeOmschrijvingGeneriek":"","opmerkingInformatieobjecttypeOmschrijvingGeneriek":""},"zaaktypen":[],"beginObject":"2024-03-19","eindeObject":null}]}' - headers: - API-version: - - 1.3.1 - Allow: - - GET, POST, HEAD, OPTIONS - Content-Length: - - '1641' - Content-Type: - - application/json - Cross-Origin-Opener-Policy: - - same-origin - Referrer-Policy: - - same-origin - Vary: - - Accept, origin - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - DENY - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate, br - Authorization: - - Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ0ZXN0X2NsaWVudF9pZCIsImlhdCI6MTczMTY3NzMwNiwiY2xpZW50X2lkIjoidGVzdF9jbGllbnRfaWQiLCJ1c2VyX2lkIjoiIiwidXNlcl9yZXByZXNlbnRhdGlvbiI6IiJ9.VZZjxRHz4dy14petppjXi4OHm2XyM8McFgqyYD27-TM - Connection: - - keep-alive - User-Agent: - - python-requests/2.32.2 - method: GET - uri: http://localhost:8003/catalogi/api/v1/informatieobjecttypen?catalogus=http%3A%2F%2Flocalhost%3A8003%2Fcatalogi%2Fapi%2Fv1%2Fcatalogussen%2Fbd58635c-793e-446d-a7e0-460d7b04829d&omschrijving=PDF+Informatieobjecttype - response: - body: - string: '{"count":2,"next":null,"previous":null,"results":[{"url":"http://localhost:8003/catalogi/api/v1/informatieobjecttypen/29b63e5c-3835-4f68-8fad-f2aea9ae6b71","catalogus":"http://localhost:8003/catalogi/api/v1/catalogussen/bd58635c-793e-446d-a7e0-460d7b04829d","omschrijving":"PDF - Informatieobjecttype","vertrouwelijkheidaanduiding":"openbaar","beginGeldigheid":"2024-07-11","eindeGeldigheid":null,"concept":false,"besluittypen":[],"informatieobjectcategorie":"Test - category","trefwoord":[],"omschrijvingGeneriek":{"informatieobjecttypeOmschrijvingGeneriek":"","definitieInformatieobjecttypeOmschrijvingGeneriek":"","herkomstInformatieobjecttypeOmschrijvingGeneriek":"","hierarchieInformatieobjecttypeOmschrijvingGeneriek":"","opmerkingInformatieobjecttypeOmschrijvingGeneriek":""},"zaaktypen":[],"beginObject":"2024-03-19","eindeObject":null},{"url":"http://localhost:8003/catalogi/api/v1/informatieobjecttypen/7a474713-0833-402a-8441-e467c08ac55b","catalogus":"http://localhost:8003/catalogi/api/v1/catalogussen/bd58635c-793e-446d-a7e0-460d7b04829d","omschrijving":"PDF - Informatieobjecttype","vertrouwelijkheidaanduiding":"openbaar","beginGeldigheid":"2024-03-19","eindeGeldigheid":"2024-07-10","concept":false,"besluittypen":[],"informatieobjectcategorie":"Test - category","trefwoord":[],"omschrijvingGeneriek":{"informatieobjecttypeOmschrijvingGeneriek":"","definitieInformatieobjecttypeOmschrijvingGeneriek":"","herkomstInformatieobjecttypeOmschrijvingGeneriek":"","hierarchieInformatieobjecttypeOmschrijvingGeneriek":"","opmerkingInformatieobjecttypeOmschrijvingGeneriek":""},"zaaktypen":[],"beginObject":"2024-03-19","eindeObject":null}]}' - headers: - API-version: - - 1.3.1 - Allow: - - GET, POST, HEAD, OPTIONS - Content-Length: - - '1641' - Content-Type: - - application/json - Cross-Origin-Opener-Policy: - - same-origin - Referrer-Policy: - - same-origin - Vary: - - Accept, origin - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - DENY - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate, br - Authorization: - - Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ0ZXN0X2NsaWVudF9pZCIsImlhdCI6MTczMTY3NzMwNiwiY2xpZW50X2lkIjoidGVzdF9jbGllbnRfaWQiLCJ1c2VyX2lkIjoiIiwidXNlcl9yZXByZXNlbnRhdGlvbiI6IiJ9.VZZjxRHz4dy14petppjXi4OHm2XyM8McFgqyYD27-TM - Connection: - - keep-alive - User-Agent: - - python-requests/2.32.2 - method: GET - uri: http://localhost:8003/catalogi/api/v1/informatieobjecttypen?catalogus=http%3A%2F%2Flocalhost%3A8003%2Fcatalogi%2Fapi%2Fv1%2Fcatalogussen%2Fbd58635c-793e-446d-a7e0-460d7b04829d&omschrijving=CSV+Informatieobjecttype - response: - body: - string: '{"count":1,"next":null,"previous":null,"results":[{"url":"http://localhost:8003/catalogi/api/v1/informatieobjecttypen/b2d83b94-9b9b-4e80-a82f-73ff993c62f3","catalogus":"http://localhost:8003/catalogi/api/v1/catalogussen/bd58635c-793e-446d-a7e0-460d7b04829d","omschrijving":"CSV - Informatieobjecttype","vertrouwelijkheidaanduiding":"openbaar","beginGeldigheid":"2024-03-19","eindeGeldigheid":null,"concept":false,"besluittypen":[],"informatieobjectcategorie":"Test - category","trefwoord":[],"omschrijvingGeneriek":{"informatieobjecttypeOmschrijvingGeneriek":"","definitieInformatieobjecttypeOmschrijvingGeneriek":"","herkomstInformatieobjecttypeOmschrijvingGeneriek":"","hierarchieInformatieobjecttypeOmschrijvingGeneriek":"","opmerkingInformatieobjecttypeOmschrijvingGeneriek":""},"zaaktypen":[],"beginObject":"2024-03-19","eindeObject":null}]}' - headers: - API-version: - - 1.3.1 - Allow: - - GET, POST, HEAD, OPTIONS - Content-Length: - - '842' - Content-Type: - - application/json - Cross-Origin-Opener-Policy: - - same-origin - Referrer-Policy: - - same-origin - Vary: - - Accept, origin - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - DENY - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate, br - Authorization: - - Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ0ZXN0X2NsaWVudF9pZCIsImlhdCI6MTczMTY3NzMwNiwiY2xpZW50X2lkIjoidGVzdF9jbGllbnRfaWQiLCJ1c2VyX2lkIjoiIiwidXNlcl9yZXByZXNlbnRhdGlvbiI6IiJ9.VZZjxRHz4dy14petppjXi4OHm2XyM8McFgqyYD27-TM - Connection: - - keep-alive - User-Agent: - - python-requests/2.32.2 - method: GET - uri: http://localhost:8003/catalogi/api/v1/informatieobjecttypen?catalogus=http%3A%2F%2Flocalhost%3A8003%2Fcatalogi%2Fapi%2Fv1%2Fcatalogussen%2Fbd58635c-793e-446d-a7e0-460d7b04829d&omschrijving=CSV+Informatieobjecttype - response: - body: - string: '{"count":1,"next":null,"previous":null,"results":[{"url":"http://localhost:8003/catalogi/api/v1/informatieobjecttypen/b2d83b94-9b9b-4e80-a82f-73ff993c62f3","catalogus":"http://localhost:8003/catalogi/api/v1/catalogussen/bd58635c-793e-446d-a7e0-460d7b04829d","omschrijving":"CSV - Informatieobjecttype","vertrouwelijkheidaanduiding":"openbaar","beginGeldigheid":"2024-03-19","eindeGeldigheid":null,"concept":false,"besluittypen":[],"informatieobjectcategorie":"Test - category","trefwoord":[],"omschrijvingGeneriek":{"informatieobjecttypeOmschrijvingGeneriek":"","definitieInformatieobjecttypeOmschrijvingGeneriek":"","herkomstInformatieobjecttypeOmschrijvingGeneriek":"","hierarchieInformatieobjecttypeOmschrijvingGeneriek":"","opmerkingInformatieobjecttypeOmschrijvingGeneriek":""},"zaaktypen":[],"beginObject":"2024-03-19","eindeObject":null}]}' - headers: - API-version: - - 1.3.1 - Allow: - - GET, POST, HEAD, OPTIONS - Content-Length: - - '842' - Content-Type: - - application/json - Cross-Origin-Opener-Policy: - - same-origin - Referrer-Policy: - - same-origin - Vary: - - Accept, origin - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - DENY - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate, br - Authorization: - - Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ0ZXN0X2NsaWVudF9pZCIsImlhdCI6MTczMTY3NzMwNiwiY2xpZW50X2lkIjoidGVzdF9jbGllbnRfaWQiLCJ1c2VyX2lkIjoiIiwidXNlcl9yZXByZXNlbnRhdGlvbiI6IiJ9.VZZjxRHz4dy14petppjXi4OHm2XyM8McFgqyYD27-TM - Connection: - - keep-alive - User-Agent: - - python-requests/2.32.2 - method: GET - uri: http://localhost:8003/catalogi/api/v1/informatieobjecttypen?catalogus=http%3A%2F%2Flocalhost%3A8003%2Fcatalogi%2Fapi%2Fv1%2Fcatalogussen%2Fbd58635c-793e-446d-a7e0-460d7b04829d&omschrijving=Attachment+Informatieobjecttype - response: - body: - string: '{"count":1,"next":null,"previous":null,"results":[{"url":"http://localhost:8003/catalogi/api/v1/informatieobjecttypen/531f6c1a-97f7-478c-85f0-67d2f23661c7","catalogus":"http://localhost:8003/catalogi/api/v1/catalogussen/bd58635c-793e-446d-a7e0-460d7b04829d","omschrijving":"Attachment - Informatieobjecttype","vertrouwelijkheidaanduiding":"openbaar","beginGeldigheid":"2024-03-19","eindeGeldigheid":"2024-07-10","concept":false,"besluittypen":[],"informatieobjectcategorie":"Test - category","trefwoord":[],"omschrijvingGeneriek":{"informatieobjecttypeOmschrijvingGeneriek":"","definitieInformatieobjecttypeOmschrijvingGeneriek":"","herkomstInformatieobjecttypeOmschrijvingGeneriek":"","hierarchieInformatieobjecttypeOmschrijvingGeneriek":"","opmerkingInformatieobjecttypeOmschrijvingGeneriek":""},"zaaktypen":["http://localhost:8003/catalogi/api/v1/zaaktypen/1f41885e-23fc-4462-bbc8-80be4ae484dc","http://localhost:8003/catalogi/api/v1/zaaktypen/b79d9c2f-5ec4-4e23-bb66-ec6dd959a400"],"beginObject":"2024-03-19","eindeObject":"2024-07-10"}]}' - headers: - API-version: - - 1.3.1 - Allow: - - GET, POST, HEAD, OPTIONS - Content-Length: - - '1038' - Content-Type: - - application/json - Cross-Origin-Opener-Policy: - - same-origin - Referrer-Policy: - - same-origin - Vary: - - Accept, origin - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - DENY - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate, br - Authorization: - - Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ0ZXN0X2NsaWVudF9pZCIsImlhdCI6MTczMTY3NzMwNiwiY2xpZW50X2lkIjoidGVzdF9jbGllbnRfaWQiLCJ1c2VyX2lkIjoiIiwidXNlcl9yZXByZXNlbnRhdGlvbiI6IiJ9.VZZjxRHz4dy14petppjXi4OHm2XyM8McFgqyYD27-TM - Connection: - - keep-alive - User-Agent: - - python-requests/2.32.2 - method: GET - uri: http://localhost:8003/catalogi/api/v1/informatieobjecttypen?catalogus=http%3A%2F%2Flocalhost%3A8003%2Fcatalogi%2Fapi%2Fv1%2Fcatalogussen%2Fbd58635c-793e-446d-a7e0-460d7b04829d&omschrijving=Attachment+Informatieobjecttype - response: - body: - string: '{"count":1,"next":null,"previous":null,"results":[{"url":"http://localhost:8003/catalogi/api/v1/informatieobjecttypen/531f6c1a-97f7-478c-85f0-67d2f23661c7","catalogus":"http://localhost:8003/catalogi/api/v1/catalogussen/bd58635c-793e-446d-a7e0-460d7b04829d","omschrijving":"Attachment - Informatieobjecttype","vertrouwelijkheidaanduiding":"openbaar","beginGeldigheid":"2024-03-19","eindeGeldigheid":"2024-07-10","concept":false,"besluittypen":[],"informatieobjectcategorie":"Test - category","trefwoord":[],"omschrijvingGeneriek":{"informatieobjecttypeOmschrijvingGeneriek":"","definitieInformatieobjecttypeOmschrijvingGeneriek":"","herkomstInformatieobjecttypeOmschrijvingGeneriek":"","hierarchieInformatieobjecttypeOmschrijvingGeneriek":"","opmerkingInformatieobjecttypeOmschrijvingGeneriek":""},"zaaktypen":["http://localhost:8003/catalogi/api/v1/zaaktypen/1f41885e-23fc-4462-bbc8-80be4ae484dc","http://localhost:8003/catalogi/api/v1/zaaktypen/b79d9c2f-5ec4-4e23-bb66-ec6dd959a400"],"beginObject":"2024-03-19","eindeObject":"2024-07-10"}]}' - headers: - API-version: - - 1.3.1 - Allow: - - GET, POST, HEAD, OPTIONS - Content-Length: - - '1038' - Content-Type: - - application/json - Cross-Origin-Opener-Policy: - - same-origin - Referrer-Policy: - - same-origin - Vary: - - Accept, origin - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - DENY - status: - code: 200 - message: OK -- request: - body: null - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate, br - Authorization: - - Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ0ZXN0X2NsaWVudF9pZCIsImlhdCI6MTczMTY3NzMwNiwiY2xpZW50X2lkIjoidGVzdF9jbGllbnRfaWQiLCJ1c2VyX2lkIjoiIiwidXNlcl9yZXByZXNlbnRhdGlvbiI6IiJ9.VZZjxRHz4dy14petppjXi4OHm2XyM8McFgqyYD27-TM - Connection: - - keep-alive - User-Agent: - - python-requests/2.32.2 - method: GET - uri: http://localhost:8003/catalogi/api/v1/catalogussen?domein=OTHER&rsin=000000000 - response: - body: - string: '{"count":1,"next":null,"previous":null,"results":[{"url":"http://localhost:8003/catalogi/api/v1/catalogussen/630271f6-568a-485e-b1c4-4ed2d6ab3a58","domein":"OTHER","rsin":"000000000","contactpersoonBeheerNaam":"Test - name","contactpersoonBeheerTelefoonnummer":"","contactpersoonBeheerEmailadres":"","zaaktypen":[],"besluittypen":[],"informatieobjecttypen":["http://localhost:8003/catalogi/api/v1/informatieobjecttypen/d1cfb1d8-8593-4814-919d-72e38e80388f","http://localhost:8003/catalogi/api/v1/informatieobjecttypen/f2908f6f-aa07-42ef-8760-74c5234f2d25","http://localhost:8003/catalogi/api/v1/informatieobjecttypen/cd6aeaf2-ca37-416f-b78c-1cc302f81a81"],"naam":"Test - catalog 2","versie":"","begindatumVersie":null}]}' - headers: - API-version: - - 1.3.1 - Allow: - - GET, POST, HEAD, OPTIONS - Content-Length: - - '716' - Content-Type: - - application/json - Cross-Origin-Opener-Policy: - - same-origin - Referrer-Policy: - - same-origin - Vary: - - Accept, origin - X-Content-Type-Options: - - nosniff - X-Frame-Options: - - DENY - status: - code: 200 - message: OK -version: 1 diff --git a/src/openforms/config/setup_configuration/__init__.py b/src/openforms/contrib/objects_api/setup_configuration/__init__.py similarity index 100% rename from src/openforms/config/setup_configuration/__init__.py rename to src/openforms/contrib/objects_api/setup_configuration/__init__.py diff --git a/src/openforms/config/setup_configuration/models.py b/src/openforms/contrib/objects_api/setup_configuration/models.py similarity index 100% rename from src/openforms/config/setup_configuration/models.py rename to src/openforms/contrib/objects_api/setup_configuration/models.py diff --git a/src/openforms/config/setup_configuration/steps.py b/src/openforms/contrib/objects_api/setup_configuration/steps.py similarity index 100% rename from src/openforms/config/setup_configuration/steps.py rename to src/openforms/contrib/objects_api/setup_configuration/steps.py diff --git a/src/openforms/config/setup_configuration/tests/__init__.py b/src/openforms/contrib/objects_api/setup_configuration/tests/__init__.py similarity index 100% rename from src/openforms/config/setup_configuration/tests/__init__.py rename to src/openforms/contrib/objects_api/setup_configuration/tests/__init__.py diff --git a/src/openforms/config/setup_configuration/tests/files/setup_config_objects_api.yaml b/src/openforms/contrib/objects_api/setup_configuration/tests/files/setup_config_objects_api.yaml similarity index 100% rename from src/openforms/config/setup_configuration/tests/files/setup_config_objects_api.yaml rename to src/openforms/contrib/objects_api/setup_configuration/tests/files/setup_config_objects_api.yaml diff --git a/src/openforms/config/setup_configuration/tests/files/setup_config_objects_api_all_fields.yaml b/src/openforms/contrib/objects_api/setup_configuration/tests/files/setup_config_objects_api_all_fields.yaml similarity index 100% rename from src/openforms/config/setup_configuration/tests/files/setup_config_objects_api_all_fields.yaml rename to src/openforms/contrib/objects_api/setup_configuration/tests/files/setup_config_objects_api_all_fields.yaml diff --git a/src/openforms/config/setup_configuration/tests/files/setup_config_objects_api_required_fields.yaml b/src/openforms/contrib/objects_api/setup_configuration/tests/files/setup_config_objects_api_required_fields.yaml similarity index 100% rename from src/openforms/config/setup_configuration/tests/files/setup_config_objects_api_required_fields.yaml rename to src/openforms/contrib/objects_api/setup_configuration/tests/files/setup_config_objects_api_required_fields.yaml diff --git a/src/openforms/config/setup_configuration/tests/test_objects_api_config.py b/src/openforms/contrib/objects_api/setup_configuration/tests/test_objects_api_config.py similarity index 98% rename from src/openforms/config/setup_configuration/tests/test_objects_api_config.py rename to src/openforms/contrib/objects_api/setup_configuration/tests/test_objects_api_config.py index 211e5b44a7..b9b193b132 100644 --- a/src/openforms/config/setup_configuration/tests/test_objects_api_config.py +++ b/src/openforms/contrib/objects_api/setup_configuration/tests/test_objects_api_config.py @@ -8,7 +8,6 @@ from openforms.contrib.objects_api.models import ObjectsAPIGroupConfig from openforms.contrib.objects_api.tests.factories import ObjectsAPIGroupConfigFactory -from openforms.utils.tests.vcr import OFVCRMixin from ..steps import ObjectsAPIConfigurationStep @@ -26,8 +25,7 @@ def get_config_model(path): return load_step_config_from_source(ObjectsAPIConfigurationStep, path) -class ObjectsAPIConfigurationStepTests(OFVCRMixin, TestCase): - VCR_TEST_FILES = TEST_FILES +class ObjectsAPIConfigurationStepTests(TestCase): maxDiff = None def setUp(self):