Skip to content

Commit

Permalink
Refactor/metaobjecttype test factories (#1184)
Browse files Browse the repository at this point in the history 
* ♻️ Refactor meta objects generation in tests

* ✅ Fix tests

* camelcase to snakecase for functions
  • Loading branch information
@damm89
damm89 committed May 7, 2024
1 parent a406ef8 commit 06a8320
Show file tree
Hide file tree
Showing 33 changed files with 3,495 additions and 2,909 deletions.
8 changes: 4 additions & 4 deletions backend/src/zac/accounts/tests/test_command_add_atomic_permissions.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from zgw_consumers.models import Service
from zgw_consumers.test import generate_oas_component, mock_service_oas_get

from zac.contrib.objects.kownsl.tests.utils import ReviewRequestFactory
from zac.contrib.objects.kownsl.tests.factories import review_request_factory
from zac.contrib.objects.services import factory_review_request
from zac.core.permissions import zaakproces_usertasks, zaken_inzien
from zac.core.tests.utils import ClearCachesMixin
Expand Down Expand Up @@ -162,9 +162,9 @@ def test_add_permission_for_advisor(self, m):
vertrouwelijkheidaanduiding="zaakvertrouwelijk",
eigenschappen=[],
)
review_request = ReviewRequestFactory()
review_request["zaak"] = zaak["url"]
review_request["userDeadlines"] = {f"user:{self.user.username}": "2099-01-01"}
review_request = review_request_factory(
zaak=zaak["url"], userDeadlines={f"user:{self.user.username}": "2099-01-01"}
)

m.get(f"{CATALOGI_ROOT}zaaktypen", json=paginated_response([zaaktype]))
m.get(f"{ZAKEN_ROOT}zaken", json=paginated_response([zaak]))
Expand Down
223 changes: 124 additions & 99 deletions backend/src/zac/camunda/tests/test_user_task_view.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,12 @@
from zac.api.context import ZaakContext
from zac.camunda.data import Task
from zac.contrib.dowc.data import OpenDowc
from zac.contrib.objects.checklists.tests.utils import CHECKLIST_OBJECT
from zac.contrib.objects.checklists.tests.factories import checklist_object_factory
from zac.contrib.objects.kownsl.constants import KownslTypes
from zac.contrib.objects.kownsl.tests.utils import ReviewRequestFactory, ReviewsFactory
from zac.contrib.objects.kownsl.tests.factories import (
review_request_factory,
reviews_factory,
)
from zac.contrib.objects.services import factory_review_request, factory_reviews
from zac.core.models import CoreConfig
from zac.core.permissions import zaakproces_usertasks
Expand Down Expand Up @@ -426,39 +429,41 @@ def test_get_reconfigure_advice_review_request_user_task(self, m, gt, ct):
)

users = UserFactory.create_batch(3)
review_request_data = ReviewRequestFactory()
review_request_data["assignedUsers"] = [
{
"deadline": "2020-01-01",
"userAssignees": [
{
"username": user.username,
"firstName": user.first_name,
"lastName": user.last_name,
"fullName": user.get_full_name(),
}
for user in users
],
"groupAssignees": [],
"emailNotification": False,
review_request_data = review_request_factory(
assignedUsers=[
{
"deadline": "2020-01-01",
"userAssignees": [
{
"username": user.username,
"firstName": user.first_name,
"lastName": user.last_name,
"fullName": user.get_full_name(),
}
for user in users
],
"groupAssignees": [],
"emailNotification": False,
},
],
zaak=self.zaak.url,
userDeadlines={
"user:some-author": "2022-04-14",
"user:some-other-author": "2022-04-15",
},
]
review_request_data["zaak"] = self.zaak.url
review_request_data["userDeadlines"] = {
"user:some-author": "2022-04-14",
"user:some-other-author": "2022-04-15",
}
review_request_data["metadata"] = {
"taskDefinitionId": "submitAdvice",
"processInstanceId": "6ebf534a-bc0a-11ec-a591-c69dd6a420a0",
}
review_request_data["requester"] = {
"username": "some-user",
"firstName": "",
"lastName": "",
"fullName": "",
}
review_request_data["zaakeigenschappen"] = [self.zaakeigenschap["url"]]
zaakeigenschappen=[self.zaakeigenschap["url"]],
metadata={
"taskDefinitionId": "submitAdvice",
"processInstanceId": "6ebf534a-bc0a-11ec-a591-c69dd6a420a0",
},
requester={
"username": "some-user",
"firstName": "",
"lastName": "",
"fullName": "",
},
)

review_request = factory_review_request(review_request_data)
m.get(
f"{CAMUNDA_URL}task/{TASK_DATA['id']}/variables/assignedUsers?deserializeValue=false",
Expand Down Expand Up @@ -625,7 +630,7 @@ def test_get_zet_resultaat_context(self, m, *mocks):
json=paginated_response([self.zaaktype]),
)
tasks = [_get_task(**{"formKey": "zac:zetResultaat"})]
reviews = factory_reviews(ReviewsFactory())
reviews = factory_reviews(reviews_factory())
mock_resource_get(m, self.zaaktype)
resultaattype = generate_oas_component(
"ztc",
Expand Down Expand Up @@ -890,39 +895,42 @@ def test_put_configure_advice_review_request_user_task(self, m, gt, ct):
"toelichting": "some-toelichting",
"id": None,
}
rr = ReviewRequestFactory()
rr["assignedUsers"] = [
{
"deadline": "2020-01-01",
"userAssignees": [
{
"username": user.username,
"firstName": user.first_name,
"lastName": user.last_name,
"fullName": user.get_full_name(),
}
for user in users
],
"groupAssignees": [],
"emailNotification": False,
rr = review_request_factory()
review_request_data = review_request_factory(
assignedUsers=[
{
"deadline": "2020-01-01",
"userAssignees": [
{
"username": user.username,
"firstName": user.first_name,
"lastName": user.last_name,
"fullName": user.get_full_name(),
}
for user in users
],
"groupAssignees": [],
"emailNotification": False,
},
],
zaak=self.zaak.url,
userDeadlines={
"user:some-author": "2022-04-14",
"user:some-other-author": "2022-04-15",
},
]
rr["zaak"] = self.zaak.url
rr["userDeadlines"] = {
"user:some-author": "2022-04-14",
"user:some-other-author": "2022-04-15",
}
rr["metadata"] = {
"taskDefinitionId": "submitAdvice",
"processInstanceId": "6ebf534a-bc0a-11ec-a591-c69dd6a420a0",
}
rr["requester"] = {
"username": "some-user",
"firstName": "",
"lastName": "",
"fullName": "",
}
rr["documents"] = [self.document.url]
metadata={
"taskDefinitionId": "submitAdvice",
"processInstanceId": "6ebf534a-bc0a-11ec-a591-c69dd6a420a0",
},
requester={
"username": "some-user",
"firstName": "",
"lastName": "",
"fullName": "",
},
documents=[self.document.url],
)

review_request = factory_review_request(rr)

m.post(
Expand Down Expand Up @@ -959,39 +967,41 @@ def test_put_configure_advice_review_request_user_task(self, m, gt, ct):
def test_put_reconfigure_advice_review_request_user_task(self, m, gt, ct):
self._mock_permissions(m)
users = UserFactory.create_batch(3)
rr = ReviewRequestFactory()
rr["assignedUsers"] = [
{
"deadline": "2020-01-01",
"userAssignees": [
{
"username": user.username,
"firstName": user.first_name,
"lastName": user.last_name,
"fullName": user.get_full_name(),
}
for user in users
],
"groupAssignees": [],
"emailNotification": False,
rr = review_request_factory()
review_request_data = review_request_factory(
assignedUsers=[
{
"deadline": "2020-01-01",
"userAssignees": [
{
"username": user.username,
"firstName": user.first_name,
"lastName": user.last_name,
"fullName": user.get_full_name(),
}
for user in users
],
"groupAssignees": [],
"emailNotification": False,
},
],
zaak=self.zaak.url,
userDeadlines={
"user:some-author": "2022-04-14",
"user:some-other-author": "2022-04-15",
},
]
rr["zaak"] = self.zaak.url
rr["userDeadlines"] = {
"user:some-author": "2022-04-14",
"user:some-other-author": "2022-04-15",
}
rr["metadata"] = {
"taskDefinitionId": "submitAdvice",
"processInstanceId": "6ebf534a-bc0a-11ec-a591-c69dd6a420a0",
}
rr["requester"] = {
"username": "some-user",
"firstName": "",
"lastName": "",
"fullName": "",
}
rr["documents"] = [self.document.url]
metadata={
"taskDefinitionId": "submitAdvice",
"processInstanceId": "6ebf534a-bc0a-11ec-a591-c69dd6a420a0",
},
requester={
"username": "some-user",
"firstName": "",
"lastName": "",
"fullName": "",
},
)

review_request = factory_review_request(rr)
payload_assigned_users = [
{
Expand Down Expand Up @@ -1190,6 +1200,21 @@ def test_put_zet_resultaat_user_task(self, m, *mocks):
status_code=201,
)

rr = factory_review_request(
review_request_factory(
userDeadlines={
"user:some-author": "2022-04-14",
}
)
)

activity = ActivityFactory.create(zaak=self.zaak.url)
checklist_object = checklist_object_factory()
checklist_object["record"]["data"]["answers"][0] = {
"answer": "",
"question": "Ja?",
"userAssignee": "some-user",
}
patch_get_zaak_context = patch(
"zac.core.camunda.zet_resultaat.serializers.get_zaak_context",
return_value=self.zaak_context,
Expand Down

0 comments on commit 06a8320

Please sign in to comment.