feat: display synthetic costs in outstanding report (#19)

tructn · Nov 27, 2024 · 3b9a240 · 3b9a240
1 parent 4b971cf
commit 3b9a240
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/frontend/src/screens/reporting/outstanding-payments.tsx b/frontend/src/screens/reporting/outstanding-payments.tsx
@@ -109,8 +109,8 @@ export default function OutstandingPayments() {
             <Table.Tr>
               <Table.Th>Name</Table.Th>
               <Table.Th>Unpaid Amount</Table.Th>
-              <Table.Th>Matches</Table.Th>
-              <Table.Th>Summary</Table.Th>
+              <Table.Th>Attendant Count</Table.Th>
+              <Table.Th>Synthetic Costs</Table.Th>
               <Table.Th></Table.Th>
             </Table.Tr>
           </Table.Thead>

diff --git a/internal/service/reporting.go b/internal/service/reporting.go
@@ -41,10 +41,11 @@ func (s *ReportingService) GetUnpaidReport() ([]UnpaidByPlayer, error) {
 		GROUP BY m.id, m.sport_center_id, acx.additional_cost
 	),
 	cte_registration_history AS (
-		SELECT p.id AS player_id, STRING_AGG(TO_CHAR(m.start, 'DD-Mon'), ', ' ORDER BY m.start) AS registration_summary
+		SELECT p.id AS player_id, STRING_AGG('£' ||ROUND(mc.individual_cost, 2) || '(' || TO_CHAR(m.start, 'DD.Mon') || ')', ' + ' ORDER BY m.start) AS registration_summary
 		FROM registrations r
 		JOIN matches m ON m.id = r.match_id
 		JOIN players p on p.id = r.player_id
+		JOIN cte_match_costs mc ON m.id = mc.match_id
 		WHERE r.is_paid = false
 		GROUP BY p.id
 	)