fix upcoming deliveries display count on calendar

backend/internal/db/queries/query.sql

@@ -70,7 +70,11 @@ WHERE id = $21;
 
 -- name: GetDeliveryCount :many
 SELECT COUNT(*) as count, date FROM deliveries
-WHERE date >= CURRENT_DATE AND date < CURRENT_DATE + INTERVAL '7 days'
+WHERE date >= CURRENT_DATE
+  AND date < GREATEST(
+    CURRENT_DATE + INTERVAL '7 days',
+    DATE_TRUNC('month', CURRENT_DATE) + INTERVAL '1 month'
+  )
 GROUP BY date;
 
 -- name: UpdateDeliveryStatus :exec

backend/internal/db/sqlc/query.sql.go

@@ -218,7 +218,11 @@ 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 >= CURRENT_DATE AND date < CURRENT_DATE + INTERVAL '7 days'
+WHERE date >= CURRENT_DATE
+  AND date < GREATEST(
+    CURRENT_DATE + INTERVAL '7 days',
+    DATE_TRUNC('month', CURRENT_DATE) + INTERVAL '1 month'
+  )
 GROUP BY date
 `