From 810fdde741e257e54e077729b57539818376ee17 Mon Sep 17 00:00:00 2001
From: Ninjdai <ninjdai@duck.com>
Date: Sun, 17 Aug 2025 19:07:28 +0200
Subject: [PATCH] refactor: bal accounting data responses

---
 src/routes/bal.rs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/routes/bal.rs b/src/routes/bal.rs
index cc2547f..a4056c6 100644
--- a/src/routes/bal.rs
+++ b/src/routes/bal.rs
@@ -1,4 +1,4 @@
-use std::{collections::{HashMap, HashSet}, sync::Arc};
+use std::{collections::HashSet, sync::Arc};
 
 use axum::{extract::{Path, State}, Json};
 use reqwest::{StatusCode};
@@ -315,13 +315,14 @@ pub async fn get_bals(
 
 #[derive(Serialize, utoipa::ToSchema)]
 pub struct OwnerAccountingData {
+    pub owner_id: u32,
     pub owed_money: f32,
     pub owed_books: Vec<book_instance::Model>
 }
 
 #[derive(Serialize, utoipa::ToSchema)]
 pub struct BalAccounting {
-    pub owner_map: HashMap<u32, OwnerAccountingData>,
+    pub owners: Vec<OwnerAccountingData>,
     pub total_collected_money: f32
 }
 
@@ -350,7 +351,7 @@ pub async fn get_bal_accounting(
             (StatusCode::FORBIDDEN, Json(None))
         } else {
             let mut accounting_data = BalAccounting {
-                owner_map: HashMap::new(),
+                owners: vec![],
                 total_collected_money: 0.
             };
 
@@ -364,7 +365,7 @@ pub async fn get_bal_accounting(
                 if owner_books.is_empty() {
                     continue;
                 }
-                let mut owner_accounting_data = OwnerAccountingData { owed_money: 0., owed_books: vec![] };
+                let mut owner_accounting_data = OwnerAccountingData { owner_id: owner.id, owed_money: 0., owed_books: vec![] };
                 for book_instance in owner_books {
                     match book_instance.sold_price {
                         Some(val) => owner_accounting_data.owed_money += val,
@@ -372,7 +373,7 @@ pub async fn get_bal_accounting(
                     }
                 }
                 accounting_data.total_collected_money += owner_accounting_data.owed_money;
-                accounting_data.owner_map.insert(owner.id, owner_accounting_data);
+                accounting_data.owners.push(owner_accounting_data);
             }
 
             (StatusCode::OK, Json(Some(accounting_data)))