From 70129baad54fa1c3f975c6519b69b75bac9dbaec Mon Sep 17 00:00:00 2001 From: Egor Pozharov Date: Thu, 16 Apr 2026 13:00:32 +0600 Subject: [PATCH] change delivery count query to show next 7 days instead of current month --- backend/internal/db/queries/query.sql | 4 +++- backend/internal/db/sqlc/query.sql.go | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/backend/internal/db/queries/query.sql b/backend/internal/db/queries/query.sql index 459bca1..3330a15 100644 --- a/backend/internal/db/queries/query.sql +++ b/backend/internal/db/queries/query.sql @@ -24,7 +24,9 @@ DELETE FROM deliveries WHERE id = $1; UPDATE deliveries SET date = $1, pickup_location = $2, product_name = $3, address = $4, phone = $5, additional_phone = $6, has_elevator = $7, comment = $8, updated_at = NOW() WHERE id = $9; -- name: GetDeliveryCount :many -SELECT COUNT(*) as count, date FROM deliveries WHERE date >= DATE_TRUNC('month', CURRENT_DATE) GROUP BY date; +SELECT COUNT(*) as count, date FROM deliveries +WHERE date >= CURRENT_DATE AND date < CURRENT_DATE + INTERVAL '7 days' +GROUP BY date; -- name: UpdateDeliveryStatus :exec UPDATE deliveries SET status = $1, updated_at = NOW() WHERE id = $2; diff --git a/backend/internal/db/sqlc/query.sql.go b/backend/internal/db/sqlc/query.sql.go index a19ca12..cb4c81d 100644 --- a/backend/internal/db/sqlc/query.sql.go +++ b/backend/internal/db/sqlc/query.sql.go @@ -151,7 +151,9 @@ func (q *Queries) GetDeliveryByID(ctx context.Context, id pgtype.UUID) (Delivery } const getDeliveryCount = `-- name: GetDeliveryCount :many -SELECT COUNT(*) as count, date FROM deliveries WHERE date >= DATE_TRUNC('month', CURRENT_DATE) GROUP BY date +SELECT COUNT(*) as count, date FROM deliveries +WHERE date >= CURRENT_DATE AND date < CURRENT_DATE + INTERVAL '7 days' +GROUP BY date ` type GetDeliveryCountRow struct {