Refactor request handler delete or retrieving items on POST.

[plomtask] / tests / days.py

diff --git a/tests/days.py b/tests/days.py
index bfec21af29d977190222e5a2ce1a6ce18820d61f..008fc1e658b66b7f05f78299d20ba48efd465d38 100644 (file)
--- a/tests/days.py
+++ b/tests/days.py
@@ -156,13 +156,12 @@ class TestsWithServer(TestCaseWithServer):
         # check defined day
         date = '2024-01-01'
         expected = self.get_day_dict(date)
+        assert isinstance(expected['_library'], dict)
         self.check_json_get(f'/day?date={date}', expected)
         # check saved day
         post: dict[str, object] = {'day_comment': 'foo', 'make_type': ''}
         self.post_day(f'date={date}', post)
-        assert isinstance(expected['_library'], dict)
-        day = expected['_library']['Day'][date]
-        day['comment'] = post['day_comment']
+        expected['_library']['Day'][date]['comment'] = post['day_comment']
         self.check_json_get(f'/day?date={date}', expected)
         # check GET parameter to GET requests affects immediate reply, but …
         expected['make_type'] = 'bar'
@@ -208,21 +207,21 @@ class TestsWithServer(TestCaseWithServer):
         procs_expected = self.post_batch(procs_data, [],
                                          ['title', 'description', 'effort'],
                                          self.proc_as_dict, self.post_process)
-        self.post_day(f'date={date}')
         expected = self.get_day_dict(date)
         assert isinstance(expected['_library'], dict)
         expected['processes'] = self.as_id_list(procs_expected)
         expected['_library']['Process'] = self.as_refs(procs_expected)
+        self.post_day(f'date={date}')
         self.check_json_get(f'/day?date={date}', expected)
         # post Todos of either process and check their display
         post_day: dict[str, object]
         post_day = {'day_comment': '', 'make_type': '', 'new_todo': [1, 2]}
-        self.post_day(f'date={date}', post_day)
         todos = [self.todo_as_dict(1, 1, date), self.todo_as_dict(2, 2, date)]
         expected['_library']['Todo'] = self.as_refs(todos)
         expected['_library']['Day'][date]['todos'] = self.as_id_list(todos)
         nodes = [self.todo_node_as_dict(1), self.todo_node_as_dict(2)]
         expected['top_nodes'] = nodes
+        self.post_day(f'date={date}', post_day)
         self.check_json_get(f'/day?date={date}', expected)
         # add a comment to one Todo and set the other's doneness and effort
         post_day['new_todo'] = []
@@ -230,10 +229,10 @@ class TestsWithServer(TestCaseWithServer):
         post_day['done'] = [2]
         post_day['comment'] = ['FOO', '']
         post_day['effort'] = ['2.3', '']
-        self.post_day(f'date={date}', post_day)
         expected['_library']['Todo']['1']['comment'] = 'FOO'
         expected['_library']['Todo']['1']['effort'] = 2.3
         expected['_library']['Todo']['2']['is_done'] = True
+        self.post_day(f'date={date}', post_day)
         self.check_json_get(f'/day?date={date}', expected)
 
     def test_do_GET_day_with_conditions(self) -> None:
@@ -260,7 +259,6 @@ class TestsWithServer(TestCaseWithServer):
         # add Todos in relation to Conditions, check consequences
         post_day: dict[str, object]
         post_day = {'day_comment': '', 'make_type': '', 'new_todo': [1, 2]}
-        self.post_day(f'date={date}', post_day)
         todos = [self.todo_as_dict(1, 1, date, [1], [1], [2], [2]),
                  self.todo_as_dict(2, 2, date, [2], [2], [1], [1])]
         expected['_library']['Todo'] = self.as_refs(todos)
@@ -270,6 +268,7 @@ class TestsWithServer(TestCaseWithServer):
         expected['disablers_for'] = {'1': [1], '2': [2]}
         expected['enablers_for'] = {'1': [2], '2': [1]}
         expected['conditions_present'] = self.as_id_list(conds_expected)
+        self.post_day(f'date={date}', post_day)
         self.check_json_get(f'/day?date={date}', expected)
 
     def test_do_GET(self) -> None: