From 854cdded3d128f01e3554e168c647eebae43aa35 Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Sun, 3 May 2026 14:01:58 +0200 Subject: [PATCH] implemented purpose proposals based on source, dest and amount Signed-off-by: Stephan Richter --- .../umbrella/accounting/AccountDb.java | 3 +++ .../umbrella/accounting/AccountingModule.java | 22 +++++++++++++++-- .../umbrella/accounting/SqliteDb.java | 24 +++++++++++++++++++ frontend/src/Components/Autocomplete.svelte | 2 +- .../src/routes/accounting/add_entry.svelte | 21 ++++++++++++++-- 5 files changed, 67 insertions(+), 5 deletions(-) diff --git a/accounting/src/main/java/de/srsoftware/umbrella/accounting/AccountDb.java b/accounting/src/main/java/de/srsoftware/umbrella/accounting/AccountDb.java index ab7daf76..be9f40cd 100644 --- a/accounting/src/main/java/de/srsoftware/umbrella/accounting/AccountDb.java +++ b/accounting/src/main/java/de/srsoftware/umbrella/accounting/AccountDb.java @@ -5,11 +5,14 @@ import de.srsoftware.umbrella.core.model.Account; import de.srsoftware.umbrella.core.model.Transaction; import java.util.Collection; import java.util.List; +import java.util.Optional; import java.util.Set; public interface AccountDb { void dropTransactionTag(long transactionId, String tag); + Optional lastTransaction(long accountId, String source, String dest, double amount); + Collection listAccounts(long userId); Collection listTags(long accountId, String source, String destination); diff --git a/accounting/src/main/java/de/srsoftware/umbrella/accounting/AccountingModule.java b/accounting/src/main/java/de/srsoftware/umbrella/accounting/AccountingModule.java index 36c71d36..16c2ae65 100644 --- a/accounting/src/main/java/de/srsoftware/umbrella/accounting/AccountingModule.java +++ b/accounting/src/main/java/de/srsoftware/umbrella/accounting/AccountingModule.java @@ -119,7 +119,7 @@ public class AccountingModule extends BaseHandler implements AccountingService { var head = path.pop(); return switch (head) { case null -> postEntry(user.get(),ex); - case DESTINATIONS -> postSearchDestinations(user.get(),ex); + case DESTINATIONS -> postSearchDestinations(user.get(),ex); case PURPOSES -> postSearchPurposes(user.get(),ex); case SOURCES -> postSearchSources(user.get(),ex); default -> { @@ -295,6 +295,22 @@ public class AccountingModule extends BaseHandler implements AccountingService { return sendContent(ex,newAccount != null ? newAccount : transaction); } + public boolean postGetLastTransaction(long accountId, UmbrellaUser user, HttpExchange ex) throws IOException { + var json = json(ex); + if (!json.has(Field.SOURCE)) throw missingField(Field.SOURCE); + if (!(json.get(Field.SOURCE) instanceof JSONObject src)) throw invalidField(Field.SOURCE,JSON); + var source = src.get(src.has(Field.ID) ? Field.ID : Field.DISPLAY).toString(); + if (!json.has(Field.DESTINATION)) throw missingField(Field.DESTINATION); + if (!(json.get(Field.DESTINATION) instanceof JSONObject dst)) throw invalidField(Field.SOURCE,JSON); + var dest = dst.get(dst.has(Field.ID) ? Field.ID : Field.DISPLAY).toString(); + if (!json.has(Field.AMOUNT)) throw missingField(Field.AMOUNT); + if (!(json.get(Field.AMOUNT) instanceof Number amt)) throw invalidField(Field.AMOUNT,Text.NUMBER); + var amount = amt.doubleValue(); + + var transaction = accountDb.lastTransaction(accountId, source, dest, amount); + return transaction.isPresent() ? sendContent(ex,transaction.get()) : notFound(ex); + } + public boolean postSearchDestinations(UmbrellaUser user, HttpExchange ex) throws IOException { return sendContent(ex,searchOptions(user, Field.DESTINATION, body(ex))); } @@ -327,7 +343,9 @@ public class AccountingModule extends BaseHandler implements AccountingService { } private boolean postToAccount(long accountId, Path path, UmbrellaUser user, HttpExchange ex) throws IOException { - return switch (path.pop()) { + var head = path.pop(); + return switch (head) { + case PURPOSES -> postGetLastTransaction(accountId,user,ex); case TAGS -> postSearchTags(accountId,user,ex); case null, default -> super.doPost(path,ex); }; diff --git a/accounting/src/main/java/de/srsoftware/umbrella/accounting/SqliteDb.java b/accounting/src/main/java/de/srsoftware/umbrella/accounting/SqliteDb.java index a2582be1..5c21cadb 100644 --- a/accounting/src/main/java/de/srsoftware/umbrella/accounting/SqliteDb.java +++ b/accounting/src/main/java/de/srsoftware/umbrella/accounting/SqliteDb.java @@ -2,6 +2,7 @@ package de.srsoftware.umbrella.accounting; import static de.srsoftware.tools.NotImplemented.notImplemented; +import static de.srsoftware.tools.Optionals.nullable; import static de.srsoftware.tools.jdbc.Condition.*; import static de.srsoftware.tools.jdbc.Query.*; import static de.srsoftware.tools.jdbc.Query.SelectQuery.ALL; @@ -130,6 +131,29 @@ public class SqliteDb extends BaseDb implements AccountDb { } } + @Override + public Optional lastTransaction(long accountId, String source, String dest, double amount) { + try { + var rs = select(ALL).from(TABLE_TRANSACTIONS) + .where(ACCOUNT,equal(accountId)).where(SOURCE,equal(source)).where(DESTINATION,equal(dest)).where(AMOUNT,equal(amount)) + .sort(ID+" DESC") + .limit(1) + .exec(db); + Transaction ta = null; + if (rs.next()) ta = Transaction.of(rs); + rs.close(); + if (ta != null){ + var tags = ta.tags(); + rs = select(TAG).from(TABLE_TAGS_TRANSACTIONS).leftJoin(TAG_ID,TABLE_TAGS,ID).where(TRANSACTION_ID,equal(ta.id())).exec(db); + while (rs.next()) tags.add(rs.getString(1)); + rs.close(); + } + return nullable(ta); + } catch (SQLException e) { + throw failedToSearchDb(t(Text.ACCOUNTING)); + } + } + @Override public HashSet listAccounts(long userId) { try { diff --git a/frontend/src/Components/Autocomplete.svelte b/frontend/src/Components/Autocomplete.svelte index 1729fc77..27631e63 100644 --- a/frontend/src/Components/Autocomplete.svelte +++ b/frontend/src/Components/Autocomplete.svelte @@ -145,7 +145,7 @@ - + {#if candidates && candidates.length > 0}
    {#each candidates as candidate,i} diff --git a/frontend/src/routes/accounting/add_entry.svelte b/frontend/src/routes/accounting/add_entry.svelte index db7531e9..55190fdb 100644 --- a/frontend/src/routes/accounting/add_entry.svelte +++ b/frontend/src/routes/accounting/add_entry.svelte @@ -42,7 +42,10 @@ } function focusOnEnter(ev,id){ - if (ev.key == 'Enter') document.getElementById(id).focus(); + if (ev.key == 'Enter') { + proposePurpose(); + document.getElementById(id).focus(); + } } async function getAccountTags(text){ @@ -93,6 +96,20 @@ } } + async function proposePurpose(){ + const source = entry.source; + const destination = entry.destination; + const amount = entry.amount; + const url = api(`accounting/${account.id}/purposes`); + const res = await post(url,{source,destination,amount}); + if (res.ok) { + yikes(); + var lastTransaction = await res.json(); + entry.purpose = { display: lastTransaction.purpose}; + entry.tags = lastTransaction.tags; + } else error(res); + } + async function save(){ let data = { ...entry, @@ -169,4 +186,4 @@ - \ No newline at end of file +