SRSoftware/Umbrella
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

working on tag handling in accounting module

Browse Source 
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
Stephan Richter
2026-04-10 00:02:54 +02:00
parent 85efb0ec02
commit ec3add70c6
11 changed files with 114 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accounting/src/main/java/de/srsoftware/umbrella/accounting/AccountDb.java
View File

@@ -19,4 +19,6 @@ public interface AccountDb {
Transaction save(Transaction transaction);
Set<String> searchField(long userId, String field, String key);
Set<String> searchTagsContaining(String key, long accountId);
}

29
accounting/src/main/java/de/srsoftware/umbrella/accounting/AccountingModule.java
View File

@@ -4,6 +4,7 @@ package de.srsoftware.umbrella.accounting;
import static de.srsoftware.tools.Optionals.nullIfEmpty;
import static de.srsoftware.umbrella.accounting.Constants.CONFIG_DATABASE;
import static de.srsoftware.umbrella.core.ConnectionProvider.connect;
import static de.srsoftware.umbrella.core.ModuleRegistry.tagService;
import static de.srsoftware.umbrella.core.ModuleRegistry.userService;
import static de.srsoftware.umbrella.core.Util.mapValues;
import static de.srsoftware.umbrella.core.constants.Path.*;
@@ -71,10 +72,18 @@ public class AccountingModule extends BaseHandler implements AccountingService {
var head = path.pop();
return switch (head) {
case null -> postEntry(user.get(),ex);
case SOURCES -> postSearchSources(user.get(),ex);
case DESTINATIONS -> postSearchDestinations(user.get(),ex);
case PURPOSES -> postSearchPurposes(user.get(),ex);
default -> super.doPost(path,ex);
case SOURCES -> postSearchSources(user.get(),ex);
default -> {
try {
var accountId = Long.parseLong(head);
yield postToAccount(accountId,path,user.get(),ex);
} catch (NumberFormatException ignored) {
yield super.doPost(path,ex);
}
}
};
} catch (UmbrellaException e){
return send(ex,e);
@@ -82,6 +91,7 @@ public class AccountingModule extends BaseHandler implements AccountingService {
}
private boolean getAccount(UmbrellaUser user, long accountId, HttpExchange ex) throws IOException {
LOG.log(WARNING,"Missing authorization check in AccountingModule.getAccount(…)!");
var account = accountDb.loadAccount(accountId);
var transactions = accountDb.loadTransactions(account);
var userMap = new HashMap<Long,UmbrellaUser>();
@@ -202,6 +212,21 @@ public class AccountingModule extends BaseHandler implements AccountingService {
return sendContent(ex,searchOptions(user, Field.SOURCE, body(ex)));
}
private boolean postSearchTags(long accountId, UmbrellaUser user, HttpExchange ex) throws IOException {
LOG.log(WARNING,"Missing authorization check in AccountingModule.getAccount(…)!");
var key = body(ex);
var tags = accountDb.searchTagsContaining(key,accountId);
if (tags.size()<10) tags.addAll(tagService().search(key,user));
return sendContent(ex,tags);
}
private boolean postToAccount(long accountId, Path path, UmbrellaUser user, HttpExchange ex) throws IOException {
return switch (path.pop()) {
case TAGS -> postSearchTags(accountId,user,ex);
case null, default -> super.doPost(path,ex);
};
}
public ArrayList<Map<String,?>> searchOptions(UmbrellaUser user, String field, String key){
var users = userService().search(key);
var destinations = accountDb.searchField(user.id(), field, key);

41
accounting/src/main/java/de/srsoftware/umbrella/accounting/SqliteDb.java
View File

@@ -7,6 +7,7 @@ import static de.srsoftware.tools.jdbc.Query.*;
import static de.srsoftware.tools.jdbc.Query.SelectQuery.ALL;
import static de.srsoftware.umbrella.accounting.Constants.*;
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*;
import static de.srsoftware.umbrella.core.model.Translatable.t;
import static java.text.MessageFormat.format;
import de.srsoftware.tools.jdbc.Condition;
@@ -20,10 +21,7 @@ import de.srsoftware.umbrella.core.model.Transaction;
import java.sql.Connection;
import java.sql.SQLException;
import java.time.ZoneOffset;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.*;
public class SqliteDb extends BaseDb implements AccountDb {
public SqliteDb(Connection connection) {
@@ -155,11 +153,21 @@ public class SqliteDb extends BaseDb implements AccountDb {
@Override
public List<Transaction> loadTransactions(Account account) {
try {
var list = new ArrayList<Transaction>();
var transactions = new HashMap<Long,Transaction>();
var rs = select(ALL).from(TABLE_TRANSACTIONS).where(Field.ACCOUNT,equal(account.id())).sort(Field.TIMESTAMP).exec(db);
while (rs.next()) list.add(Transaction.of(rs));
while (rs.next()) {
var transaction = Transaction.of(rs);
transactions.put(transaction.id(),transaction);
}
rs.close();
return list;
var transactionIds = transactions.keySet().toArray();
rs = select(ALL).from(TABLE_TAGS_TRANSACTIONS).leftJoin(Field.TAG_ID,TABLE_TAGS,Field.ID).where(Field.TRANSACTION_ID,in(transactionIds)).exec(db);
while (rs.next()) {
var transaction = transactions.get(rs.getLong(Field.TRANSACTION_ID));
if (transaction != null) transaction.tags().add(rs.getString(Field.TAG));
}
rs.close();
return new ArrayList<>(transactions.values());
} catch (SQLException e) {
throw failedToLoadMembers(account);
}
@@ -197,11 +205,10 @@ public class SqliteDb extends BaseDb implements AccountDb {
} else { // TODO : implement update
throw UmbrellaException.failedToStoreObject(transaction);
}
saveTags(transaction);
return transaction;
return saveTags(transaction);
}
private void saveTags(Transaction transaction) {
private Transaction saveTags(Transaction transaction) {
var remaining = new HashSet<String>(transaction.tags());
var existingTags = new HashMap<String,Long>();
try {
@@ -228,6 +235,7 @@ public class SqliteDb extends BaseDb implements AccountDb {
} catch (SQLException e){
throw failedToStoreObject(transaction);
}
return transaction;
}
@Override
@@ -244,4 +252,17 @@ public class SqliteDb extends BaseDb implements AccountDb {
throw failedToReadFromTable(field,TABLE_TRANSACTIONS).causedBy(e);
}
}
@Override
public Set<String> searchTagsContaining(String key, long accountId) {
try {
var tags = new HashSet<String>();
var rs = select(ALL).from(TABLE_TRANSACTIONS).leftJoin(Field.ID,TABLE_TAGS_TRANSACTIONS,Field.TRANSACTION_ID).leftJoin(Field.TAG_ID,TABLE_TAGS,Field.ID).where(Field.TAG,like(format("%{0}%",key))).exec(db);
while (rs.next()) tags.add(rs.getString(Field.TAG));
rs.close();
return tags;
} catch (SQLException e){
throw failedToSearchDb(t(Text.TAGS));
}
}
}