From f0058aad682da46f051486f0eeb4618f9e9b7b00 Mon Sep 17 00:00:00 2001
From: TMA <tma+hs@jikos.cz>
Date: Mon, 21 Apr 2025 21:14:34 +0200
Subject: [PATCH] #18: stored function for "fixing cash" transaction

---
 brmbar3/brmbar/Shop.py                | 41 ++++++++++--------
 brmbar3/schema/0018-shop-fix-cash.sql | 60 +++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 17 deletions(-)
 create mode 100644 brmbar3/schema/0018-shop-fix-cash.sql

diff --git a/brmbar3/brmbar/Shop.py b/brmbar3/brmbar/Shop.py
index 2d96fce..e7dbc6c 100644
--- a/brmbar3/brmbar/Shop.py
+++ b/brmbar3/brmbar/Shop.py
@@ -235,24 +235,31 @@ class Shop:
         #    return False
 
     def fix_cash(self, amount):
-        amount_in_reality = amount
-        amount_in_system = self.cash.balance()
+        rv = self.db.execute_and_fetch(
+            "SELECT public.fix_cash(%s, %s, %s, %s)",
+            [self.excess.id, self.deficit.id, self.currency.id, amount]
+        )[0]
 
-        diff = abs(amount_in_reality - amount_in_system)
-        if amount_in_reality > amount_in_system:
-            transaction = self._transaction(description = "BrmBar cash inventory fix of {} in system to {} in reality".format(amount_in_system, amount_in_reality))
-            self.cash.debit(transaction, diff, "Inventory fix excess")
-            self.excess.credit(transaction, diff, "Inventory cash fix excess.")
-            self.db.commit()
-            return True
-        elif amount_in_reality < amount_in_system:
-            transaction = self._transaction(description = "BrmBar cash inventory fix of {} in system to {} in reality".format(amount_in_system, amount_in_reality))
-            self.cash.credit(transaction, diff, "Inventory fix deficit")
-            self.deficit.debit(transaction, diff, "Inventory fix deficit.")
-            self.db.commit()
-            return True
-        else:
-            return False
+        self.db.commit()
+        return rv
+        #amount_in_reality = amount
+        #amount_in_system = self.cash.balance()
+
+        #diff = abs(amount_in_reality - amount_in_system)
+        #if amount_in_reality > amount_in_system:
+        #    transaction = self._transaction(description = "BrmBar cash inventory fix of {} in system to {} in reality".format(amount_in_system, amount_in_reality))
+        #    self.cash.debit(transaction, diff, "Inventory fix excess")
+        #    self.excess.credit(transaction, diff, "Inventory cash fix excess.")
+        #    self.db.commit()
+        #    return True
+        #elif amount_in_reality < amount_in_system:
+        #    transaction = self._transaction(description = "BrmBar cash inventory fix of {} in system to {} in reality".format(amount_in_system, amount_in_reality))
+        #    self.cash.credit(transaction, diff, "Inventory fix deficit")
+        #    self.deficit.debit(transaction, diff, "Inventory fix deficit.")
+        #    self.db.commit()
+        #    return True
+        #else:
+        #    return False
 
     def consolidate(self):
         msg = self.db.execute_and_fetch(
diff --git a/brmbar3/schema/0018-shop-fix-cash.sql b/brmbar3/schema/0018-shop-fix-cash.sql
new file mode 100644
index 0000000..2af5d72
--- /dev/null
+++ b/brmbar3/schema/0018-shop-fix-cash.sql
@@ -0,0 +1,60 @@
+--
+-- 0018-shop-fix-cash.sql
+--
+-- #18 - stored function for "fixing cash" transaction
+--
+-- ISC License
+--
+-- Copyright 2023-2025 Brmlab, z.s.
+-- TMA <tma+hs@jikos.cz>
+--
+-- Permission to use, copy, modify, and/or distribute this software
+-- for any purpose with or without fee is hereby granted, provided
+-- that the above copyright notice and this permission notice appear
+-- in all copies.
+--
+-- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+-- WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+-- WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+-- AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
+-- CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+-- OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+-- NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+-- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+--
+
+-- To require fully-qualified names
+SELECT pg_catalog.set_config('search_path', '', false);
+
+DO $upgrade_block$
+BEGIN
+
+IF brmbar_privileged.has_exact_schema_version(17) THEN
+
+CREATE OR REPLACE FUNCTION public.fix_cash(
+	IN i_excess_id public.acounts.id%TYPE,
+	IN i_deficit_id public.acounts.id%TYPE,
+	IN i_shop_currency_id public.currencies.id%TYPE,
+	IN i_amount_in_reality NUMERIC
+) RETURNS BOOLEAN
+VOLATILE  NOT LEAKPROOF  LANGUAGE plpgsql AS $fn$
+BEGIN
+	RETURN brmbar_privileged.fix_account_balance(
+		1,
+		1,
+		i_excess_id,
+		i_deficit_id,
+		i_shop_currency_id,
+		i_amount_in_reality
+	);
+END;
+$fn$;
+
+
+PERFORM brmbar_privileged.upgrade_schema_version_to(18);
+END IF;
+
+END;
+$upgrade_block$;
+
+-- vim: set ft=plsql :