return self.date < other.date
@classmethod
- def from_table_row(cls, row: Row) -> Day:
- """Make Day from database row."""
- return cls(row[0], row[1])
+ 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,
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 * FROM days WHERE date >= ? AND date <= ?'
+ sql = 'SELECT date FROM days WHERE date >= ? AND date <= ?'
for row in db_conn.exec(sql, (start_date, end_date)):
- days += [cls.from_table_row(row)]
+ days += [cls.by_date(db_conn, row[0])]
days.sort()
if fill_gaps and len(days) > 1:
gapless_days = []
@classmethod
def by_date(cls, db_conn: DatabaseConnection,
date: str, create: bool = False) -> Day:
- """Retrieve Day by date if in DB, 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,)):
- return cls.from_table_row(row)
+ return cls.from_table_row(db_conn, row)
if not create:
raise NotFoundException(f'Day not found for date: {date}')
- return cls(date)
+ day = cls(date)
+ db_conn.cached_days[date] = day
+ assert isinstance(day, Day)
+ return day
@property
def weekday(self) -> str:
return next_datetime.strftime(DATE_FORMAT)
def save(self, db_conn: DatabaseConnection) -> None:
- """Add (or re-write) self to database."""
+ """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