home · contact · privacy
Rename "condition"/"blocker" input names to plurals, like they are everywhere else.
[plomtask] / tests / days.py
index 4727fac743dad82bc5aee56635d253ac9b63c192..59c9f4911b8d6b649d42cb71a9035c811af7e1df 100644 (file)
@@ -2,23 +2,22 @@
 from unittest import TestCase
 from datetime import datetime
 from tests.utils import TestCaseWithDB, TestCaseWithServer
-from plomtask.dating import todays_date
+from plomtask.dating import date_in_n_days
 from plomtask.days import Day
-from plomtask.exceptions import BadFormatException
 
 
 class TestsSansDB(TestCase):
     """Days module tests not requiring DB setup."""
+    legal_ids = ['2024-01-01']
+    illegal_ids = ['foo', '2024-02-30', '2024-02-01 23:00:00']
 
-    def test_Day_valid_date(self) -> None:
-        """Test Day's date format validation and parsing."""
-        with self.assertRaises(BadFormatException):
-            Day('foo')
-        with self.assertRaises(BadFormatException):
-            Day('2024-02-30')
-        with self.assertRaises(BadFormatException):
-            Day('2024-02-01 23:00:00')
-        self.assertEqual(datetime(2024, 1, 1), Day('2024-01-01').datetime)
+    def test_Day_datetime_weekday_neighbor_dates(self) -> None:
+        """Test Day's date parsing."""
+        self.assertEqual(datetime(2024, 5, 1), Day('2024-05-01').datetime)
+        self.assertEqual('Sunday', Day('2024-03-17').weekday)
+        self.assertEqual('March', Day('2024-03-17').month_name)
+        self.assertEqual('2023-12-31', Day('2024-01-01').prev_date)
+        self.assertEqual('2023-03-01', Day('2023-02-28').next_date)
 
     def test_Day_sorting(self) -> None:
         """Test sorting by .__lt__ and Day.__eq__."""
@@ -28,43 +27,21 @@ class TestsSansDB(TestCase):
         days = [day3, day1, day2]
         self.assertEqual(sorted(days), [day1, day2, day3])
 
-    def test_Day_weekday(self) -> None:
-        """Test Day.weekday."""
-        self.assertEqual(Day('2024-03-17').weekday, 'Sunday')
-
-    def test_Day_neighbor_dates(self) -> None:
-        """Test Day.prev_date and Day.next_date."""
-        self.assertEqual(Day('2024-01-01').prev_date, '2023-12-31')
-        self.assertEqual(Day('2023-02-28').next_date, '2023-03-01')
-
 
 class TestsWithDB(TestCaseWithDB):
     """Tests requiring DB, but not server setup."""
     checked_class = Day
     default_ids = ('2024-01-01', '2024-01-02', '2024-01-03')
 
-    def test_saving_and_caching(self) -> None:
-        """Test storage of instances.
-
-        We don't use the parent class's method here because the checked class
-        has too different a handling of IDs.
-        """
-        kwargs = {'date': self.default_ids[0], 'comment': 'foo'}
-        self.check_saving_and_caching(**kwargs)
-
-    def test_Day_from_table_row(self) -> None:
-        """Test .from_table_row() properly reads in class from DB"""
-        self.check_from_table_row()
-
-    def test_Day_by_id(self) -> None:
-        """Test .by_id()."""
-        self.check_by_id()
-
     def test_Day_by_date_range_filled(self) -> None:
         """Test Day.by_date_range_filled."""
         date1, date2, date3 = self.default_ids
-        day1, day2, day3 = self.check_all()
-        # check date range is a closed interval
+        day1 = Day(date1)
+        day2 = Day(date2)
+        day3 = Day(date3)
+        for day in [day1, day2, day3]:
+            day.save(self.db_conn)
+        # check date range includes limiter days
         self.assertEqual(Day.by_date_range_filled(self.db_conn, date1, date3),
                          [day1, day2, day3])
         # check first date range value excludes what's earlier
@@ -85,31 +62,216 @@ class TestsWithDB(TestCaseWithDB):
         self.assertEqual(Day.by_date_range_filled(self.db_conn,
                                                   day5.date, day7.date),
                          [day5, day6, day7])
-        self.check_storage([day1, day2, day3, day6])
+        self.check_identity_with_cache_and_db([day1, day2, day3, day6])
         # check 'today' is interpreted as today's date
-        today = Day(todays_date())
-        today.save(self.db_conn)
+        today = Day(date_in_n_days(0))
         self.assertEqual(Day.by_date_range_filled(self.db_conn,
                                                   'today', 'today'),
                          [today])
-
-    def test_Day_remove(self) -> None:
-        """Test .remove() effects on DB and cache."""
-        self.check_remove()
-
-    def test_Day_singularity(self) -> None:
-        """Test pointers made for single object keep pointing to it."""
-        self.check_singularity('day_comment', 'boo')
+        prev_day = Day(date_in_n_days(-1))
+        next_day = Day(date_in_n_days(1))
+        self.assertEqual(Day.by_date_range_filled(self.db_conn,
+                                                  'yesterday', 'tomorrow'),
+                         [prev_day, today, next_day])
 
 
 class TestsWithServer(TestCaseWithServer):
     """Tests against our HTTP server/handler (and database)."""
 
+    @staticmethod
+    def todo_as_dict(id_: int = 1,
+                     process_id: int = 1,
+                     date: str = '2024-01-01',
+                     conditions: None | list[int] = None,
+                     disables: None | list[int] = None,
+                     blockers: None | list[int] = None,
+                     enables: None | list[int] = None
+                     ) -> dict[str, object]:
+        """Return JSON of Process to expect."""
+        # pylint: disable=too-many-arguments
+        d = {'id': id_,
+             'date': date,
+             'process_id': process_id,
+             'is_done': False,
+             'calendarize': False,
+             'comment': '',
+             'children': [],
+             'parents': [],
+             'effort': None,
+             'conditions': conditions if conditions else [],
+             'disables': disables if disables else [],
+             'blockers': blockers if blockers else [],
+             'enables': enables if enables else []}
+        return d
+
+    @staticmethod
+    def todo_node_as_dict(todo_id: int) -> dict[str, object]:
+        """Return JSON of TodoNode to expect."""
+        return {'children': [], 'seen': False, 'todo': todo_id}
+
+    @staticmethod
+    def get_day_dict(date: str) -> dict[str, object]:
+        """Return JSON of GET /day to expect."""
+        day: dict[str, object] = {'id': date, 'comment': '', 'todos': []}
+        d: dict[str, object]
+        d = {'day': date,
+             'top_nodes': [],
+             'make_type': '',
+             'enablers_for': {},
+             'disablers_for': {},
+             'conditions_present': [],
+             'processes': [],
+             '_library': {'Day': TestsWithServer.as_refs([day])}}
+        return d
+
+    def post_day(self, params: str = '',
+                 form_data: None | dict[str, object] = None,
+                 redir_to: str = '',
+                 status: int = 302,
+                 ) -> None:
+        """POST /day?{params} with form_data."""
+        if not form_data:
+            form_data = {'day_comment': '', 'make_type': ''}
+        target = f'/day?{params}'
+        if not redir_to:
+            redir_to = f'{target}&make_type={form_data["make_type"]}'
+        self.check_post(form_data, target, status, redir_to)
+
+    def test_do_GET_day_basics(self) -> None:
+        """Test GET /day basics (no Todos)."""
+        # check undefined day
+        date = date_in_n_days(0)
+        expected = self.get_day_dict(date)
+        self.check_json_get('/day', expected)
+        # check "today", "yesterday", "tomorrow" days
+        self.check_json_get('/day?date=today', expected)
+        expected = self.get_day_dict(date_in_n_days(1))
+        self.check_json_get('/day?date=tomorrow', expected)
+        expected = self.get_day_dict(date_in_n_days(-1))
+        self.check_json_get('/day?date=yesterday', expected)
+        # check wrong day strings
+        self.check_get('/day?date=foo', 400)
+        self.check_get('/day?date=2024-02-30', 400)
+        # check defined day
+        date = '2024-01-01'
+        expected = self.get_day_dict(date)
+        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']
+        self.check_json_get(f'/day?date={date}', expected)
+        # check GET parameter to GET requests affects immediate reply, but …
+        expected['make_type'] = 'bar'
+        self.check_json_get(f'/day?date={date}&make_type=bar', expected)
+        # … not any following, …
+        expected['make_type'] = ''
+        self.check_json_get(f'/day?date={date}', expected)
+        # … not even when part of a POST request
+        post['make_type'] = 'foo'
+        self.post_day(f'date={date}', post)
+        self.check_json_get(f'/day?date={date}', expected)
+
+    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']
+        post_proc1 = {'title': 'foo', 'description': 'oof', 'effort': 1.1}
+        post_proc2 = {'title': 'bar', 'description': 'rab', 'effort': 0.9}
+        procs_expected: list[dict[str, object]] = [{}, {}]
+        for i, post in enumerate([post_proc1, post_proc2]):
+            self.post_process(i+1, post)
+            assert isinstance(post['title'], str)
+            assert isinstance(post['description'], str)
+            assert isinstance(post['effort'], float)
+            procs_expected[i] = self.proc_as_dict(i+1, post['title'],
+                                                  post['description'],
+                                                  post['effort'])
+        self.post_day(f'date={date}')
+        expected = self.get_day_dict(date)
+        expected['processes'] = self.as_id_list(procs_expected)
+        assert isinstance(expected['_library'], dict)
+        expected['_library']['Process'] = self.as_refs(procs_expected)
+        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.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'] = []
+        post_day['todo_id'] = [1, 2]
+        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.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
+        post_cond1 = {'title': 'A', 'description': '', 'is_active': False}
+        post_cond2 = {'title': 'B', 'description': '', 'is_active': True}
+        conds: list[dict[str, object]] = [{}, {}]
+        for i, post in enumerate([post_cond1, post_cond2]):
+            self.check_post(post, f'/condition?id={i+1}', 302)
+            assert isinstance(post['is_active'], bool)
+            assert isinstance(post['title'], str)
+            assert isinstance(post['description'], str)
+            conds[i] = self.cond_as_dict(i+1, post['is_active'],
+                                         [post['title']],
+                                         [post['description']])
+        post_proc1 = {'title': 'foo', 'description': 'oof', 'effort': 1.1}
+        post_proc2 = {'title': 'bar', 'description': 'rab', 'effort': 0.9}
+        procs: list[dict[str, object]] = [{}, {}]
+        cond_names = ('conditions', 'disables', 'blockers', 'enables')
+        cond_vals = ((1, 1, 2, 2), (2, 2, 1, 1))
+        for i, post in enumerate([post_proc1, post_proc2]):
+            assert isinstance(post['title'], str)
+            assert isinstance(post['description'], str)
+            assert isinstance(post['effort'], float)
+            procs[i] = self.proc_as_dict(i+1, post['title'],
+                                         post['description'], post['effort'])
+            for j, cond_name in enumerate(cond_names):
+                post[cond_name] = [cond_vals[i][j]]
+                procs[i][cond_name] = [cond_vals[i][j]]
+            self.post_process(i+1, post)
+        date = '2024-01-01'
+        expected = self.get_day_dict(date)
+        expected['processes'] = self.as_id_list(procs)
+        assert isinstance(expected['_library'], dict)
+        expected['_library']['Process'] = self.as_refs(procs)
+        expected['_library']['Condition'] = self.as_refs(conds)
+        self.post_day(f'date={date}')
+        self.check_json_get(f'/day?date={date}', expected)
+        # 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)
+        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
+        expected['disablers_for'] = {'1': [1], '2': [2]}
+        expected['enablers_for'] = {'1': [2], '2': [1]}
+        expected['conditions_present'] = self.as_id_list(conds)
+        self.check_json_get(f'/day?date={date}', expected)
+
     def test_do_GET(self) -> None:
         """Test /day and /calendar response codes, and / redirect."""
-        self.check_get('/day', 200)
-        self.check_get('/day?date=3000-01-01', 200)
-        self.check_get('/day?date=FOO', 400)
         self.check_get('/calendar', 200)
         self.check_get('/calendar?start=&end=', 200)
         self.check_get('/calendar?start=today&end=today', 200)
@@ -118,8 +280,8 @@ class TestsWithServer(TestCaseWithServer):
 
     def test_do_POST_day(self) -> None:
         """Test POST /day."""
-        form_data = {'day_comment': ''}
+        form_data = {'day_comment': '', 'make_type': 'full'}
         self.check_post(form_data, '/day', 400)
         self.check_post(form_data, '/day?date=foo', 400)
-        self.check_post(form_data, '/day?date=2024-01-01', 302)
+        self.check_post(form_data, '/day?date=2024-01-01&make_type=full', 302)
         self.check_post({'foo': ''}, '/day?date=2024-01-01', 400)