brewlog/src/infrastructure/repositories/coffee/bags.rs
Jon Seager 937ee4c5f2
feat: store bag finished_at as full datetime for correct timeline ordering
The finished_at field previously stored only a date, causing bag "finished"
timeline events to sort before same-day brews. Now stores a full datetime
and uses the actual close time for timeline ordering.
2026-02-24 21:38:39 +00:00

288 lines
9.7 KiB
Rust

use async_trait::async_trait;
use chrono::{DateTime, NaiveDate, Utc};
use sqlx::{QueryBuilder, query_as};
use crate::domain::RepositoryError;
use crate::domain::bags::{Bag, BagFilter, BagSortKey, BagWithRoast, NewBag, UpdateBag};
use crate::domain::ids::{BagId, RoastId};
use crate::domain::listing::{ListRequest, Page, SortDirection};
use crate::domain::repositories::BagRepository;
use crate::infrastructure::database::DatabasePool;
use crate::infrastructure::repositories::macros::push_update_field;
const BASE_SELECT: &str = r"
SELECT
b.id, b.roast_id, b.roast_date, b.amount, b.remaining, b.closed, b.finished_at, b.created_at, b.updated_at,
r.name as roast_name, r.slug as roast_slug,
rr.name as roaster_name, rr.slug as roaster_slug
FROM bags b
JOIN roasts r ON b.roast_id = r.id
JOIN roasters rr ON r.roaster_id = rr.id
";
#[derive(Clone)]
pub struct SqlBagRepository {
pool: DatabasePool,
}
impl SqlBagRepository {
pub fn new(pool: DatabasePool) -> Self {
Self { pool }
}
fn order_clause(request: &ListRequest<BagSortKey>) -> String {
let dir_sql = match request.sort_direction() {
SortDirection::Asc => "ASC",
SortDirection::Desc => "DESC",
};
match request.sort_key() {
BagSortKey::RoastDate => format!("b.roast_date {dir_sql}, b.created_at DESC"),
BagSortKey::CreatedAt => format!("b.created_at {dir_sql}, b.id DESC"),
BagSortKey::UpdatedAt => format!("b.updated_at {dir_sql}, b.id DESC"),
BagSortKey::Roaster => format!("LOWER(rr.name) {dir_sql}, b.created_at DESC"),
BagSortKey::Roast => format!("LOWER(r.name) {dir_sql}, b.created_at DESC"),
BagSortKey::Status => format!(
"CASE WHEN b.closed THEN 10000 ELSE b.remaining END {dir_sql}, b.created_at DESC"
),
BagSortKey::FinishedAt => format!("b.finished_at {dir_sql}, b.created_at DESC"),
}
}
fn build_where_clause(filter: &BagFilter) -> Option<String> {
let mut conditions = Vec::new();
// SAFETY: Direct interpolation is safe here because:
// - `closed` is a bool, outputting literal "TRUE"/"FALSE"
// - `roast_id` is an i64 from a typed wrapper
// If adding string-based filters, use parameterized queries instead.
if let Some(closed) = filter.closed {
conditions.push(format!(
"b.closed = {}",
if closed { "TRUE" } else { "FALSE" }
));
}
if let Some(roast_id) = filter.roast_id {
conditions.push(format!("b.roast_id = {}", roast_id.into_inner()));
}
if conditions.is_empty() {
None
} else {
Some(conditions.join(" AND "))
}
}
}
#[async_trait]
impl BagRepository for SqlBagRepository {
async fn insert(&self, bag: NewBag) -> Result<Bag, RepositoryError> {
let created_at = bag.created_at.unwrap_or_else(Utc::now);
let query = r"
INSERT INTO bags (roast_id, roast_date, amount, remaining, created_at, updated_at)
VALUES (?, ?, ?, ?, ?, ?)
RETURNING id, roast_id, roast_date, amount, remaining, closed, finished_at, created_at, updated_at
";
let record = query_as::<_, BagRecord>(query)
.bind(bag.roast_id.into_inner())
.bind(bag.roast_date)
.bind(bag.amount)
.bind(bag.amount) // remaining starts as amount
.bind(created_at)
.bind(created_at)
.fetch_one(&self.pool)
.await
.map_err(|err| RepositoryError::unexpected(err.to_string()))?;
Ok(record.into())
}
async fn get(&self, id: BagId) -> Result<Bag, RepositoryError> {
let query = r"
SELECT id, roast_id, roast_date, amount, remaining, closed, finished_at, created_at, updated_at
FROM bags
WHERE id = ?
";
let record = query_as::<_, BagRecord>(query)
.bind(id.into_inner())
.fetch_optional(&self.pool)
.await
.map_err(|err| RepositoryError::unexpected(err.to_string()))?
.ok_or(RepositoryError::NotFound)?;
Ok(record.into())
}
async fn get_with_roast(&self, id: BagId) -> Result<BagWithRoast, RepositoryError> {
let query = format!("{BASE_SELECT} WHERE b.id = ?");
let record = query_as::<_, BagWithRoastRecord>(&query)
.bind(id.into_inner())
.fetch_optional(&self.pool)
.await
.map_err(|err| RepositoryError::unexpected(err.to_string()))?
.ok_or(RepositoryError::NotFound)?;
Ok(record.into())
}
async fn list(
&self,
filter: BagFilter,
request: &ListRequest<BagSortKey>,
search: Option<&str>,
) -> Result<Page<BagWithRoast>, RepositoryError> {
use crate::infrastructure::repositories::pagination::SearchFilter;
let order_clause = Self::order_clause(request);
// Build WHERE clause from filter
let where_clause = Self::build_where_clause(&filter);
let base_query = match &where_clause {
Some(w) => format!("{BASE_SELECT} WHERE {w}"),
None => BASE_SELECT.to_string(),
};
let count_query = match &where_clause {
Some(w) => format!(
"SELECT COUNT(*) FROM bags b JOIN roasts r ON b.roast_id = r.id JOIN roasters rr ON r.roaster_id = rr.id WHERE {w}"
),
None => "SELECT COUNT(*) FROM bags b JOIN roasts r ON b.roast_id = r.id JOIN roasters rr ON r.roaster_id = rr.id".to_string(),
};
let sf = search.and_then(|t| SearchFilter::new(t, vec!["rr.name", "r.name"]));
crate::infrastructure::repositories::pagination::paginate(
&self.pool,
request,
&base_query,
&count_query,
&order_clause,
sf.as_ref(),
|record: BagWithRoastRecord| Ok(record.into()),
)
.await
}
async fn update(&self, id: BagId, changes: UpdateBag) -> Result<Bag, RepositoryError> {
let mut builder = QueryBuilder::new("UPDATE bags SET updated_at = CURRENT_TIMESTAMP");
let mut sep = true; // Already have updated_at
push_update_field!(
builder,
sep,
"roast_id",
changes
.roast_id
.map(crate::domain::ids::RoastId::into_inner)
);
push_update_field!(builder, sep, "roast_date", changes.roast_date);
push_update_field!(builder, sep, "amount", changes.amount);
push_update_field!(builder, sep, "remaining", changes.remaining);
push_update_field!(builder, sep, "closed", changes.closed);
push_update_field!(builder, sep, "finished_at", changes.finished_at);
push_update_field!(builder, sep, "created_at", changes.created_at);
let _ = sep; // Suppress unused_assignments warning from macro
builder.push(" WHERE id = ");
builder.push_bind(id.into_inner());
builder.push(" RETURNING id, roast_id, roast_date, amount, remaining, closed, finished_at, created_at, updated_at");
let record = builder
.build_query_as::<BagRecord>()
.fetch_optional(&self.pool)
.await
.map_err(|err| RepositoryError::unexpected(err.to_string()))?
.ok_or(RepositoryError::NotFound)?;
Ok(record.into())
}
async fn delete(&self, id: BagId) -> Result<(), RepositoryError> {
let query = "DELETE FROM bags WHERE id = ?";
let result = sqlx::query(query)
.bind(id.into_inner())
.execute(&self.pool)
.await
.map_err(|err| RepositoryError::unexpected(err.to_string()))?;
if result.rows_affected() == 0 {
return Err(RepositoryError::NotFound);
}
Ok(())
}
}
#[derive(sqlx::FromRow)]
struct BagRecord {
id: i64,
roast_id: i64,
roast_date: Option<NaiveDate>,
amount: f64,
remaining: f64,
closed: bool,
finished_at: Option<DateTime<Utc>>,
created_at: DateTime<Utc>,
updated_at: DateTime<Utc>,
}
impl From<BagRecord> for Bag {
fn from(record: BagRecord) -> Self {
Bag {
id: BagId::new(record.id),
roast_id: RoastId::new(record.roast_id),
roast_date: record.roast_date,
amount: record.amount,
remaining: record.remaining,
closed: record.closed,
finished_at: record.finished_at,
created_at: record.created_at,
updated_at: record.updated_at,
}
}
}
#[derive(sqlx::FromRow)]
struct BagWithRoastRecord {
id: i64,
roast_id: i64,
roast_date: Option<NaiveDate>,
amount: f64,
remaining: f64,
closed: bool,
finished_at: Option<DateTime<Utc>>,
created_at: DateTime<Utc>,
updated_at: DateTime<Utc>,
roast_name: String,
roast_slug: String,
roaster_name: String,
roaster_slug: String,
}
impl From<BagWithRoastRecord> for BagWithRoast {
fn from(record: BagWithRoastRecord) -> Self {
BagWithRoast {
bag: Bag {
id: BagId::new(record.id),
roast_id: RoastId::new(record.roast_id),
roast_date: record.roast_date,
amount: record.amount,
remaining: record.remaining,
closed: record.closed,
finished_at: record.finished_at,
created_at: record.created_at,
updated_at: record.updated_at,
},
roast_name: record.roast_name,
roaster_name: record.roaster_name,
roast_slug: record.roast_slug,
roaster_slug: record.roaster_slug,
}
}
}