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 models' .by_id().
[plomtask]
/
plomtask
/
days.py
diff --git
a/plomtask/days.py
b/plomtask/days.py
index a21b4ef5535d81597a4b04d2662f6969313c5e9f..d838039a715677ffb3c9022f82715859d80fd652 100644
(file)
--- a/
plomtask/days.py
+++ b/
plomtask/days.py
@@
-51,9
+51,9
@@
class Day(BaseModel):
start_date = valid_date(date_range[0] if date_range[0] else min_date)
end_date = valid_date(date_range[1] if date_range[1] else max_date)
days = []
start_date = valid_date(date_range[0] if date_range[0] else min_date)
end_date = valid_date(date_range[1] if date_range[1] else max_date)
days = []
- sql = 'SELECT
date FROM days WHERE date >= ? AND date
<= ?'
+ sql = 'SELECT
id FROM days WHERE id >= ? AND id
<= ?'
for row in db_conn.exec(sql, (start_date, end_date)):
for row in db_conn.exec(sql, (start_date, end_date)):
- days += [cls.by_
date
(db_conn, row[0])]
+ days += [cls.by_
id
(db_conn, row[0])]
days.sort()
if fill_gaps and len(days) > 1:
gapless_days = []
days.sort()
if fill_gaps and len(days) > 1:
gapless_days = []
@@
-67,15
+67,11
@@
class Day(BaseModel):
return days
@classmethod
return days
@classmethod
- def by_
date
(cls, db_conn: DatabaseConnection,
-
date: str, create: bool = False) -> Day:
+ def by_
id
(cls, db_conn: DatabaseConnection,
+ date: str, create: bool = False) -> Day:
"""Retrieve Day by date if in DB (prefer cache), else return None."""
"""Retrieve Day by date if in DB (prefer cache), else return None."""
- if date in db_conn.cached_days.keys():
- day = db_conn.cached_days[date]
- assert isinstance(day, Day)
- return day
- for row in db_conn.exec('SELECT * FROM days WHERE date = ?', (date,)):
- day = cls.from_table_row(db_conn, row)
+ day, _ = super()._by_id(db_conn, date)
+ if day:
assert isinstance(day, Day)
return day
if not create:
assert isinstance(day, Day)
return day
if not create: