#17: stored function for "fixing" inventory transaction

brmbar3/brmbar/Shop.py

@@ -202,30 +202,37 @@ class Shop:
         return accts
 
     def fix_inventory(self, item, amount):
-        amount_in_reality = amount
+        rv = self.db.execute_and_fetch(
-        amount_in_system = item.balance()
+            "SELECT public.fix_inventory(%s, %s, %s, %s, %s, %s)",
-        (buy, sell) = item.currency.rates(self.currency)
+            [item.id, item.currency.id, self.excess.id, self.deficit.id, self.currency.id, amount]
+        )[0]
 
-        diff = abs(amount_in_reality - amount_in_system)
+        self.db.commit()
-        buy_total = buy * diff
+        return rv
-        if amount_in_reality > amount_in_system:
+        #amount_in_reality = amount
-            transaction = self._transaction(description = "BrmBar inventory fix of {}pcs {} in system to {}pcs in reality".format(amount_in_system, item.name,amount_in_reality))
+        #amount_in_system = item.balance()
-            item.debit(transaction, diff, "Inventory fix excess")
+        #(buy, sell) = item.currency.rates(self.currency)
-            self.excess.credit(transaction, buy_total, "Inventory fix excess " + item.name)
+
-            self.db.commit()
+        #diff = abs(amount_in_reality - amount_in_system)
-            return True
+        #buy_total = buy * diff
-        elif amount_in_reality < amount_in_system:
+        #if amount_in_reality > amount_in_system:
-            transaction = self._transaction(description = "BrmBar inventory fix of {}pcs {} in system to {}pcs in reality".format(amount_in_system, item.name,amount_in_reality))
+        #    transaction = self._transaction(description = "BrmBar inventory fix of {}pcs {} in system to {}pcs in reality".format(amount_in_system, item.name,amount_in_reality))
-            item.credit(transaction, diff, "Inventory fix deficit")
+        #    item.debit(transaction, diff, "Inventory fix excess")
-            self.deficit.debit(transaction, buy_total, "Inventory fix deficit " + item.name)
+        #    self.excess.credit(transaction, buy_total, "Inventory fix excess " + item.name)
-            self.db.commit()
+        #    self.db.commit()
-            return True
+        #    return True
-        else:
+        #elif amount_in_reality < amount_in_system:
-            transaction = self._transaction(description = "BrmBar inventory fix of {}pcs {} in system to {}pcs in reality".format(amount_in_system, item.name,amount_in_reality))
+        #    transaction = self._transaction(description = "BrmBar inventory fix of {}pcs {} in system to {}pcs in reality".format(amount_in_system, item.name,amount_in_reality))
-            item.debit(transaction, 0, "Inventory fix - amount was correct")
+        #    item.credit(transaction, diff, "Inventory fix deficit")
-            item.credit(transaction, 0, "Inventory fix - amount was correct")
+        #    self.deficit.debit(transaction, buy_total, "Inventory fix deficit " + item.name)
-            self.db.commit()
+        #    self.db.commit()
-            return False
+        #    return True
+        #else:
+        #    transaction = self._transaction(description = "BrmBar inventory fix of {}pcs {} in system to {}pcs in reality".format(amount_in_system, item.name,amount_in_reality))
+        #    item.debit(transaction, 0, "Inventory fix - amount was correct")
+        #    item.credit(transaction, 0, "Inventory fix - amount was correct")
+        #    self.db.commit()
+        #    return False
 
     def fix_cash(self, amount):
         amount_in_reality = amount

brmbar3/schema/0017-shop-fix-inventory.sql

@@ -0,0 +1,157 @@
+--
+-- 0017-shop-fix-inventory.sql
+--
+-- #17 - stored function for "fixing" inventory 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(16) THEN
+
+CREATE OR REPLACE FUNCTION public.compute_account_balance(
+	i_account_id public.accounts.id%TYPE
+) RETURNS NUMERIC
+LANGUAGE plpgsql
+AS $$
+DECLARE
+	v_crsum NUMERIC;
+	v_dbsum NUMERIC;
+BEGIN
+	SELECT COALESCE(SUM(CASE WHEN side='credit' THEN amount ELSE 0 END),0) crsum INTO v_crsum,
+	COALESCE(SUM(CASE WHEN side='debit' THEN amount ELSE 0 END),0) dbsum into v_dbsum
+	FROM public.transaction_splits ts WHERE ts.account=4
+	RETURN v_dbsum - v_crsum;
+END; $$;
+
+CREATE OR REPLACE FUNCTION brmbar_privileged.fix_account_balance(
+	IN i_account_id public.acounts.id%TYPE,
+	IN i_account_currency_id public.currencies.id%TYPE,
+	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$
+DECLARE
+	v_amount_in_system NUMERIC;
+	v_buy_rate NUMERIC;
+	v_currency_id public.currencies.id%TYPE;
+	v_diff NUMERIC;
+	v_buy_total NUMERIC;
+	v_ntrn_id public.transactions.id%TYPE;
+	v_transaction_memo TEXT;
+	v_item_name TEXT;
+	v_excess_memo TEXT;
+	v_deficit_memo TEXT;
+
+	v_old_trn public.transactions%ROWTYPE;
+	v_old_split public.transaction_splits%ROWTYPE;
+BEGIN
+	v_amount_in_system := public.compute_account_balance(i_account_id);
+	IF i_account_currency_id <> i_shop_currency_id THEN
+		v_buy_rate := public.find_buy_rate(i_item_id, i_shop_currency_id);
+	ELSE
+		v_buy_rate := 1;
+	END IF;
+
+	v_diff := ABS(i_amount_in_reality - v_amount_in_system);
+	v_buy_total := v_buy_rate * v_diff;
+	-- compute memo strings
+	IF i_item_id = 1 THEN -- cash account recognized by magic id
+		-- fixing cash
+		v_transaction_memo :=
+		'BrmBar cash inventory fix of ' || v_amount_in_system
+		|| ' in system to ' || i_amount_in_reality || ' in reality';
+		v_excess_memo := 'Inventory cash fix excess.';
+		v_deficit_memo := 'Inventory fix deficit.';
+	ELSE
+		-- fixing other account
+		SELECT "name" INTO v_item_name FROM public.accounts WHERE id = i_account_id;
+		v_transaction_memo :=
+		'BrmBar inventory fix of ' || v_amount_in_system || 'pcs '
+		|| v_item_name
+		|| ' in system to ' || i_amount_in_reality || 'pcs in reality';
+		v_excess_memo := 'Inventory fix excess ' || v_item_name;
+		v_deficit_memo := 'Inventory fix deficit ' || v_item_name;
+	END IF;
+	-- create transaction based on the relation between counting and accounting
+	IF i_amount_in_reality > v_amount_in_system THEN
+		v_ntrn_id := brmbar_privileged.create_transaction(NULL, v_transaction_memo);
+		INSERT INTO transaction_splits ("transaction", "side", "account", "amount", "memo")
+		VALUES (v_ntrn_id, 'debit', i_item_id, v_diff, 'Inventory fix excess');
+		INSERT INTO transaction_splits ("transaction", "side", "account", "amount", "memo")
+		VALUES (v_ntrn_id, 'credit', i_excess_id, v_buy_total, v_excess_memo);
+		RETURN TRUE;
+	ELSIF i_amount_in_reality < v_amount_in_system THEN
+		v_ntrn_id := brmbar_privileged.create_transaction(NULL, v_transaction_memo);
+		INSERT INTO transaction_splits ("transaction", "side", "account", "amount", "memo")
+		VALUES (v_ntrn_id, 'credit', i_item_id, v_diff, 'Inventory fix deficit');
+		INSERT INTO transaction_splits ("transaction", "side", "account", "amount", "memo")
+		VALUES (v_ntrn_id, 'debit', i_deficit_id, v_buy_total, v_deficit_memo);
+		RETURN TRUE;
+	ELSIF i_account_id <> 1 THEN -- cash account recognized by magic id
+		-- record that everything is going on swimmingly only for noncash accounts (WTF)
+		v_ntrn_id := brmbar_privileged.create_transaction(NULL, v_transaction_memo);
+		INSERT INTO transaction_splits ("transaction", "side", "account", "amount", "memo")
+		VALUES (v_ntrn_id, 'debit', i_item_id, 0, 'Inventory fix - amount was correct');
+		INSERT INTO transaction_splits ("transaction", "side", "account", "amount", "memo")
+		VALUES (v_ntrn_id, 'credit', i_item_id, 0, 'Inventory fix - amount was correct');
+		RETURN FALSE;
+	END IF;
+	RETURN FALSE;
+END;
+$fn$;
+
+
+CREATE OR REPLACE FUNCTION public.fix_inventory(
+	IN i_account_id public.acounts.id%TYPE,
+	IN i_account_currency_id public.currencies.id%TYPE,
+	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(
+		i_account_id,
+		i_account_currency_id,
+		i_excess_id,
+		i_deficit_id,
+		i_shop_currency_id,
+		i_amount_in_reality
+	);
+END;
+$fn$;
+
+
+PERFORM brmbar_privileged.upgrade_schema_version_to(17);
+END IF;
+
+END;
+$upgrade_block$;
+
+-- vim: set ft=plsql :

brmbar3/schema/0019-shop-consolidate.sql

@@ -31,21 +31,6 @@ BEGIN
 
 IF brmbar_privileged.has_exact_schema_version(18) THEN
 
-CREATE OR REPLACE FUNCTION public.compute_account_balance(
-	i_account_id public.accounts.id%TYPE
-) RETURNS NUMERIC
-LANGUAGE plpgsql
-AS $$
-DECLARE
-	v_crsum NUMERIC;
-	v_dbsum NUMERIC;
-BEGIN
-	SELECT COALESCE(SUM(CASE WHEN side='credit' THEN amount ELSE 0 END),0) crsum INTO v_crsum,
-	COALESCE(SUM(CASE WHEN side='debit' THEN amount ELSE 0 END),0) dbsum into v_dbsum
-	FROM public.transaction_splits ts WHERE ts.account=4
-	RETURN v_dbsum - v_crsum;
-END; $$;
-
 CREATE OR REPLACE FUNCTION public.make_consolidate_transaction(
 	i_excess_id public.accounts.id%TYPE,
 	i_deficit_id public.accounts.id%TYPE,