bronku/cake-order-tracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

status workflow and seed with special cakes

Browse source 
Change terminal status from 'done' to 'picked_up' in all queries.
Add dateRangeParams helper, GetOrderCounts, GetCakeCounts.
Load special cakes in getOrdersFromQuery, save in UpdateOrderContents.
Seed: 5 tags, 3 special cakes, Maria status 'done'->'ready'.
Test: 'Done'->'ready'.
This commit is contained in:
bronkuu 2026-06-15 18:49:49 +02:00
parent 9aafbb94ec
commit 17b92a706a
3 changed files with 75 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

61
store/order.go
View file

@ -10,6 +10,15 @@ import (
"git.bronku.xyz/bronku/cake-order-tracker/models"
)
func dateRangeParams(from, to time.Time) (start, end string) {
start = from.Format(config.DateFormat) + " 00:00"
end = to.Format(config.DateFormat) + " 99:99"
if to.IsZero() {
end = "9999-99-99 99:99"
}
return
}
func (s *Store) scanOrderRow(row *sql.Rows) (models.Order, error) {
var out models.Order
var orderDate, deliveryDate string
@ -68,6 +77,10 @@ func (s *Store) getOrdersFromQuery(query string, args ...any) ([]models.Order, e
if err != nil {
continue
}
order.SpecialCakes, err = s.GetSpecialCakes(order.ID)
if err != nil {
continue
}
out = append(out, order)
}
@ -87,15 +100,48 @@ func (s *Store) GetOrder(id int) (models.Order, error) {
}
func (s *Store) GetOrders(from, to time.Time) ([]models.Order, error) {
start := from.Format(config.DateFormat) + " 00:00"
end := to.Format(config.DateFormat) + " 99:99"
if to.IsZero() {
end = "9999-99-99 99:99"
}
query := "select * from customer_order where status != 'done' and delivery_date >= ? and delivery_date <= ? ;"
start, end := dateRangeParams(from, to)
query := "select * from customer_order where status != 'picked_up' and delivery_date >= ? and delivery_date <= ? ;"
return s.getOrdersFromQuery(query, start, end)
}
func (s *Store) GetOrderCounts() (models.OrderCounts, error) {
var c models.OrderCounts
err := s.db.QueryRow(`
SELECT COUNT(*),
COALESCE(SUM(CASE WHEN substr(delivery_date, 1, 10) = date('now') THEN 1 ELSE 0 END), 0)
FROM customer_order WHERE status != 'picked_up'
`).Scan(&c.Active, &c.DueToday)
return c, err
}
func (s *Store) GetCakeCounts(from, to time.Time) ([]models.CakeCount, error) {
start, end := dateRangeParams(from, to)
rows, err := s.db.Query(`
SELECT c.id, c.name, COALESCE(SUM(oc.amount), 0)
FROM ordered_cake oc
JOIN customer_order co ON oc.customer_order = co.id
JOIN cake c ON oc.cake = c.id
WHERE co.status != 'picked_up' AND co.delivery_date >= ? AND co.delivery_date <= ?
GROUP BY oc.cake
ORDER BY SUM(oc.amount) DESC
`, start, end)
if err != nil {
return nil, err
}
defer rows.Close()
var out []models.CakeCount
for rows.Next() {
var cc models.CakeCount
if err := rows.Scan(&cc.ID, &cc.Name, &cc.Amount); err != nil {
return nil, err
}
out = append(out, cc)
}
return out, rows.Err()
}
func (s *Store) UpdateOrderContents(tx *sql.Tx, newOrder models.Order) error {
q := "delete from ordered_cake where customer_order = ?;"
_, err := tx.Exec(q, newOrder.ID)
@ -110,7 +156,8 @@ func (s *Store) UpdateOrderContents(tx *sql.Tx, newOrder models.Order) error {
return err
}
}
return nil
return s.SaveSpecialCakes(tx, newOrder.ID, newOrder.SpecialCakes)
}
func (s *Store) UpdateOrder(newOrder models.Order) error {