home · contact · privacy
Refactor request handler delete or retrieving items on POST.
[plomtask] / tests / days.py
index 856ce9978dc1d12cb0f8fc1040f02257b21ddedb..008fc1e658b66b7f05f78299d20ba48efd465d38 100644 (file)
@@ -1,6 +1,7 @@
 """Test Days module."""
 from unittest import TestCase
 from datetime import datetime
+from typing import Callable
 from tests.utils import TestCaseWithDB, TestCaseWithServer
 from plomtask.dating import date_in_n_days
 from plomtask.days import Day
@@ -155,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'
@@ -174,34 +174,54 @@ class TestsWithServer(TestCaseWithServer):
         self.post_day(f'date={date}', post)
         self.check_json_get(f'/day?date={date}', expected)
 
+    @staticmethod
+    def post_batch(list_of_args: list[list[object]],
+                   names_of_simples: list[str],
+                   names_of_versioneds: list[str],
+                   f_as_dict: Callable[..., dict[str, object]],
+                   f_to_post: Callable[..., None | dict[str, object]]
+                   ) -> list[dict[str, object]]:
+        """Post expected=f_as_dict(*args) as input to f_to_post, for many."""
+        expecteds = []
+        for args in list_of_args:
+            expecteds += [f_as_dict(*args)]
+        for expected in expecteds:
+            assert isinstance(expected['_versioned'], dict)
+            post = {}
+            for name in names_of_simples:
+                post[name] = expected[name]
+            for name in names_of_versioneds:
+                post[name] = expected['_versioned'][name][0]
+            f_to_post(expected['id'], post)
+        return expecteds
+
+    def post_cond(self, id_: int, form_data: dict[str, object]) -> None:
+        """POST Condition of id_ with form_data."""
+        self.check_post(form_data, f'/condition?id={id_}', 302)
+
     def test_do_GET_day_with_processes_and_todos(self) -> None:
         """Test GET /day displaying Processes and Todos."""
         date = '2024-01-01'
         # check Processes get displayed in ['processes'] and ['_library']
-        procs_expected = [self.proc_as_dict(1, 'foo', 'oof', 1.1),
-                          self.proc_as_dict(2, 'bar', 'rab', 0.9)]
-        for proc in procs_expected:
-            post = {}
-            assert isinstance(proc['_versioned'], dict)
-            for k in ('title', 'description', 'effort'):
-                post[k] = proc['_versioned'][k][0]
-            assert isinstance(proc['id'], int)
-            self.post_process(proc['id'], post)
-        self.post_day(f'date={date}')
+        procs_data = [[1, 'foo', 'oof', 1.1], [2, 'bar', 'rab', 0.9]]
+        procs_expected = self.post_batch(procs_data, [],
+                                         ['title', 'description', 'effort'],
+                                         self.proc_as_dict, self.post_process)
         expected = self.get_day_dict(date)
-        expected['processes'] = self.as_id_list(procs_expected)
         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'] = []
@@ -209,41 +229,29 @@ 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:
         """Test GET /day displaying Conditions and their relations."""
         # add Process with Conditions and their Todos, check display
-        # pylint: disable=too-many-locals
-        conds_expected = [self.cond_as_dict(1, False, ['A'], ['a']),
-                          self.cond_as_dict(2, True, ['B'], ['b'])]
-        for i, cond in enumerate(conds_expected):
-            post = {'is_active': cond['is_active']}
-            assert isinstance(cond['_versioned'], dict)
-            for k in ('title', 'description'):
-                post[k] = cond['_versioned'][k][0]
-            self.check_post(post, f'/condition?id={i+1}', 302)
-        procs_expected = [self.proc_as_dict(1, 'foo', 'oof', 1.1),
-                          self.proc_as_dict(2, 'bar', 'rab', 0.9)]
-        cond_names = ('conditions', 'disables', 'blockers', 'enables')
-        cond_vals = ((1, 1, 2, 2), (2, 2, 1, 1))
-        for i, proc in enumerate(procs_expected):
-            post = {}
-            assert isinstance(proc['_versioned'], dict)
-            for k in ('title', 'description', 'effort'):
-                post[k] = proc['_versioned'][k][0]
-            for j, cond_name in enumerate(cond_names):
-                post[cond_name] = proc[cond_name] = [cond_vals[i][j]]
-            assert isinstance(proc['id'], int)
-            self.post_process(proc['id'], post)
+        conds_data = [[1, False, ['A'], ['a']], [2, True, ['B'], ['b']]]
+        conds_expected = self.post_batch(conds_data, ['is_active'],
+                                         ['title', 'description'],
+                                         self.cond_as_dict, self.post_cond)
+        cond_names = ['conditions', 'disables', 'blockers', 'enables']
+        procs_data = [[1, 'foo', 'oof', 1.1, [1], [1], [2], [2]],
+                      [2, 'bar', 'rab', 0.9, [2], [2], [1], [1]]]
+        procs_expected = self.post_batch(procs_data, cond_names,
+                                         ['title', 'description', 'effort'],
+                                         self.proc_as_dict, self.post_process)
         date = '2024-01-01'
         expected = self.get_day_dict(date)
-        expected['processes'] = self.as_id_list(procs_expected)
         assert isinstance(expected['_library'], dict)
+        expected['processes'] = self.as_id_list(procs_expected)
         expected['_library']['Process'] = self.as_refs(procs_expected)
         expected['_library']['Condition'] = self.as_refs(conds_expected)
         self.post_day(f'date={date}')
@@ -251,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)
@@ -261,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: