Skip to content

Commit d5df99f

Browse files
♻️ - refactor: refactor gherkin.py
1 parent 546e245 commit d5df99f

File tree

1 file changed

+19
-45
lines changed
  • backend/src/openarchiefbeheer/utils/tests

1 file changed

+19
-45
lines changed

backend/src/openarchiefbeheer/utils/tests/gherkin.py

+19-45
Original file line numberDiff line numberDiff line change
@@ -142,14 +142,6 @@ async def user_exists(self, **kwargs):
142142
)
143143

144144
async def list_exists(self, **kwargs):
145-
@sync_to_async()
146-
def add_items(destruction_list, assignees=[], items=[]):
147-
if assignees:
148-
destruction_list.assignees.set(assignees)
149-
150-
if items:
151-
destruction_list.items.set(items)
152-
153145
record_manager = await self.record_manager_exists()
154146
base_kwargs = {
155147
"name": "My First Destruction List",
@@ -171,7 +163,13 @@ def add_items(destruction_list, assignees=[], items=[]):
171163
)
172164
for zaak in zaken
173165
]
174-
await add_items(destruction_list, assignees, items)
166+
167+
if assignees:
168+
await destruction_list.assignees.aset(assignees)
169+
170+
if items:
171+
await destruction_list.items.aset(items)
172+
175173
return destruction_list
176174

177175
async def list_item_exists(self, **kwargs):
@@ -188,11 +186,6 @@ async def list_item_exists(self, **kwargs):
188186
)
189187

190188
async def review_exists(self, **kwargs):
191-
@sync_to_async()
192-
def add_items(review, items=None):
193-
if items:
194-
review.item_reviews.set(items)
195-
196189
base_kwargs = {
197190
"destruction_list": (
198191
await self.list_exists() if "destruction_list" not in kwargs else {}
@@ -211,18 +204,19 @@ def add_items(review, items=None):
211204
review = await self._get_or_create(
212205
DestructionListReviewFactory, **merged_kwargs
213206
)
214-
await add_items(review, items)
207+
208+
if items:
209+
await review.item_reviews.aset(items)
210+
215211
return review
216212

217213
async def review_item_exists(self, **kwargs):
218-
@sync_to_async()
219-
def get_item(merged_kwargs):
220-
return merged_kwargs["destruction_list"].items.first()
221-
222214
destruction_list = await self.list_exists()
223215
base_kwargs = {"destruction_list": destruction_list}
224216
merged_kwargs = {**base_kwargs, **kwargs}
225-
item = merged_kwargs.pop("items", await get_item(merged_kwargs))
217+
item = merged_kwargs.pop(
218+
"items", await merged_kwargs["destruction_list"].items.afirst()
219+
)
226220

227221
return await self._get_or_create(
228222
DestructionListItemReviewFactory,
@@ -252,10 +246,6 @@ async def zaak_selection_api_is_empty(self):
252246
await SelectionItem.objects.all().adelete()
253247
await AllSelectedToggle.objects.all().adelete()
254248

255-
@sync_to_async
256-
def _orm_get(self, model, **kwargs):
257-
return model.objects.get(**kwargs)
258-
259249
@sync_to_async
260250
def _orm_filter(self, model, **kwargs):
261251
return (
@@ -283,7 +273,7 @@ async def _get_or_create(self, factory, **kwargs):
283273
if key not in factory._meta.parameters
284274
and not key.startswith("post__")
285275
}
286-
return await self._orm_get(factory._meta.model, **orm_params)
276+
return await factory._meta.model.objects.aget(**orm_params)
287277
except factory._meta.model.DoesNotExist:
288278
return await self._factory_create(factory, **kwargs)
289279

@@ -475,41 +465,25 @@ async def inverted_method(*args, **kwargs):
475465
return InvertedThen(self)
476466

477467
async def list_should_exist(self, page, name):
478-
@sync_to_async()
479-
def get_list():
480-
return DestructionList.objects.get(name=name)
481-
482-
return await get_list()
468+
return await DestructionList.objects.aget(name=name)
483469

484470
async def list_should_have_assignee(self, page, destruction_list, assignee):
485-
@sync_to_async()
486-
def refresh_list():
487-
destruction_list.refresh_from_db()
488-
489471
@sync_to_async()
490472
def get_assignee():
491473
return destruction_list.assignee
492474

493-
await refresh_list()
475+
await destruction_list.arefresh_from_db()
494476
list_assignee = await get_assignee()
495477
self.testcase.assertEqual(list_assignee, assignee)
496478

497479
async def list_should_have_status(self, page, destruction_list, status):
498-
@sync_to_async()
499-
def refresh_list():
500-
destruction_list.refresh_from_db()
501-
502-
await refresh_list()
480+
await destruction_list.arefresh_from_db()
503481
self.testcase.assertEqual(destruction_list.status, status)
504482

505483
async def list_should_have_number_of_items(
506484
self, destruction_list, number_of_items
507485
):
508-
@sync_to_async()
509-
def get_number_of_items():
510-
return destruction_list.items.count()
511-
512-
count = await get_number_of_items()
486+
count = await destruction_list.items.acount()
513487
self.testcase.assertEqual(number_of_items, count)
514488

515489
async def page_should_contain_text(self, page, text, timeout=None):

0 commit comments

Comments
 (0)