home
·
contact
·
privacy
projects
/
plomtask
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor from_table_row methods of core DB models.
[plomtask]
/
plomtask
/
days.py
diff --git
a/plomtask/days.py
b/plomtask/days.py
index abfce06f51fc7ab43607ccd177dddc2194667391..a21b4ef5535d81597a4b04d2662f6969313c5e9f 100644
(file)
--- a/
plomtask/days.py
+++ b/
plomtask/days.py
@@
-1,9
+1,8
@@
"""Collecting Day and date-related items."""
from __future__ import annotations
from datetime import datetime, timedelta
"""Collecting Day and date-related items."""
from __future__ import annotations
from datetime import datetime, timedelta
-from sqlite3 import Row
from plomtask.exceptions import BadFormatException, NotFoundException
from plomtask.exceptions import BadFormatException, NotFoundException
-from plomtask.db import DatabaseConnection
+from plomtask.db import DatabaseConnection
, BaseModel
DATE_FORMAT = '%Y-%m-%d'
DATE_FORMAT = '%Y-%m-%d'
@@
-25,11
+24,14
@@
def todays_date() -> str:
return datetime.now().strftime(DATE_FORMAT)
return datetime.now().strftime(DATE_FORMAT)
-class Day:
+class Day
(BaseModel)
:
"""Individual days defined by their dates."""
"""Individual days defined by their dates."""
+ table_name = 'days'
+ to_save = ['comment']
+ id_type = str
def __init__(self, date: str, comment: str = '') -> None:
def __init__(self, date: str, comment: str = '') -> None:
- self.
date
= valid_date(date)
+ self.
id_: str
= valid_date(date)
self.datetime = datetime.strptime(self.date, DATE_FORMAT)
self.comment = comment
self.datetime = datetime.strptime(self.date, DATE_FORMAT)
self.comment = comment
@@
-39,13
+41,6
@@
class Day:
def __lt__(self, other: Day) -> bool:
return self.date < other.date
def __lt__(self, other: Day) -> bool:
return self.date < other.date
- @classmethod
- def from_table_row(cls, db_conn: DatabaseConnection, row: Row) -> Day:
- """Make Day from database row, write to cache."""
- day = cls(row[0], row[1])
- db_conn.cached_days[day.date] = day
- return day
-
@classmethod
def all(cls, db_conn: DatabaseConnection,
date_range: tuple[str, str] = ('', ''),
@classmethod
def all(cls, db_conn: DatabaseConnection,
date_range: tuple[str, str] = ('', ''),
@@
-80,7
+75,9
@@
class Day:
assert isinstance(day, Day)
return day
for row in db_conn.exec('SELECT * FROM days WHERE date = ?', (date,)):
assert isinstance(day, Day)
return day
for row in db_conn.exec('SELECT * FROM days WHERE date = ?', (date,)):
- return cls.from_table_row(db_conn, row)
+ day = cls.from_table_row(db_conn, row)
+ assert isinstance(day, Day)
+ return day
if not create:
raise NotFoundException(f'Day not found for date: {date}')
day = cls(date)
if not create:
raise NotFoundException(f'Day not found for date: {date}')
day = cls(date)
@@
-88,6
+85,11
@@
class Day:
assert isinstance(day, Day)
return day
assert isinstance(day, Day)
return day
+ @property
+ def date(self) -> str:
+ """Return self.id_ under the assumption it's a date string."""
+ return self.id_
+
@property
def weekday(self) -> str:
"""Return what weekday matches self.date."""
@property
def weekday(self) -> str:
"""Return what weekday matches self.date."""
@@
-107,6
+109,4
@@
class Day:
def save(self, db_conn: DatabaseConnection) -> None:
"""Add (or re-write) self to DB and cache."""
def save(self, db_conn: DatabaseConnection) -> None:
"""Add (or re-write) self to DB and cache."""
- db_conn.exec('REPLACE INTO days VALUES (?, ?)',
- (self.date, self.comment))
- db_conn.cached_days[self.date] = self
+ self.save_core(db_conn, update_with_lastrowid=False)