preparing for journal with timestamps

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>

accounting/src/main/java/de/srsoftware/umbrella/accounting/AccountDb.java

@@ -16,7 +16,7 @@ public interface AccountDb {
 
 	Collection<UmbrellaUser> getMembers(long accountId);
 
-	Optional<Transaction> lastTransaction(long accountId, String source, String destination, Double amount);
+	Optional<Transaction> lastTransaction(long accountId, String source, String dest, double amount);
 
 	Collection<Account> listAccounts(long userId);
 

accounting/src/main/java/de/srsoftware/umbrella/accounting/AccountingModule.java

@@ -311,11 +311,12 @@ public class AccountingModule extends BaseHandler implements AccountingService {
 		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);
-		String destination = dst.has(Field.ID) ? dst.get(Field.ID).toString() : dst.has(Field.DISPLAY) ? dst.get(Field.DISPLAY).toString() : null;
-		Double amount = null;
-		if (json.has(Field.AMOUNT) && json.get(Field.AMOUNT) instanceof Number amt) amount = amt.doubleValue();
+		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, destination, amount);
+		var transaction = accountDb.lastTransaction(accountId, source, dest, amount);
 		return transaction.isPresent() ? sendContent(ex,transaction.get()) : notFound(ex);
 	}
 

accounting/src/main/java/de/srsoftware/umbrella/accounting/SqliteDb.java

@@ -170,42 +170,22 @@ public class SqliteDb extends BaseDb implements AccountDb {
 	}
 
 	@Override
-	public Optional<Transaction> lastTransaction(long accountId, String source, String destination, Double amount) {
+	public Optional<Transaction> lastTransaction(long accountId, String source, String dest, double amount) {
 		try {
-			var query = select(ALL).from(TABLE_TRANSACTIONS).where(ACCOUNT,equal(accountId));
-			if (source != null)      query = query.where(SOURCE,equal(source));
-			if (destination != null) query = query.where(DESTINATION,equal(destination));
-			if (amount != null)      query = query.where(AMOUNT,equal(amount));
-			var rs = query.sort(ID+" DESC").limit(1).exec(db);
+			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 && amount != null) { // try to search by amount, ignore source and dest
-				rs = select(ALL).from(TABLE_TRANSACTIONS).where(ACCOUNT, equal(accountId)).where(AMOUNT, equal(amount))
-						.sort(ID + " DESC").limit(1).exec(db);
-				if (rs.next()) ta = Transaction.of(rs);
-				rs.close();
-			}
-
-			if (ta == null && source != null && destination != null) { // try to search by amount, ignore source and dest
-				rs = select(ALL).from(TABLE_TRANSACTIONS)
-						.where(SOURCE,equal(source))
-						.where(DESTINATION,equal(destination))
-						.where(ACCOUNT, equal(accountId))
-						.sort(ID + " DESC").limit(1).exec(db);
-				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));

backend/src/main/java/de/srsoftware/umbrella/backend/Application.java

@@ -14,6 +14,7 @@ import de.srsoftware.umbrella.bookmarks.BookmarkApi;
 import de.srsoftware.umbrella.company.CompanyModule;
 import de.srsoftware.umbrella.contact.ContactModule;
 import de.srsoftware.umbrella.core.SettingsService;
+import de.srsoftware.umbrella.core.Util;
 import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
 import de.srsoftware.umbrella.documents.DocumentApi;
 import de.srsoftware.umbrella.files.FileModule;
@@ -33,6 +34,7 @@ import de.srsoftware.umbrella.translations.Translations;
 import de.srsoftware.umbrella.user.UserModule;
 import de.srsoftware.umbrella.web.WebHandler;
 import de.srsoftware.umbrella.wiki.WikiModule;
+import java.io.File;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;

core/src/main/java/de/srsoftware/umbrella/core/Util.java

@@ -15,6 +15,7 @@ import static java.lang.System.Logger.Level.*;
 import static java.lang.System.Logger.Level.WARNING;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
+import com.xrbpowered.jparsedown.JParsedown;
 import de.srsoftware.tools.Mappable;
 import de.srsoftware.tools.Query;
 import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
@@ -31,6 +32,7 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.regex.Pattern;
 import org.json.JSONObject;
 
 public class Util {

demodata/.gitignore

@@ -1 +0,0 @@
-*.db-journal

demodata/config.json

@@ -1,74 +0,0 @@
-{
-  "umbrella": {
-    "base_url": "http://127.0.0.1:5173",
-    "logging": {
-      "rootLevel": "INFO"
-    },
-    "http": {
-      "port": 8080
-    },
-    "threads": 16,
-    "modules": {
-      "accounting": {
-        "database": "demodata/accounting.db"
-      },
-      "bookmark": {
-        "database": "demodata/bookmark.db"
-      },
-      "company": {
-        "database": "demodata/company.db"
-      },
-      "contact": {
-        "database": "demodata/contacts.db"
-      },
-      "document": {
-        "database": "demodata/documents.db",
-        "templates": "demodata/templates"
-      },
-      "files": {
-        "database": "demodata/files.db",
-        "base_dir": "demodata/filestore"
-      },
-      "journal": {
-        "database": "demodata/journal.db"
-      },
-      "message": {
-        "database": "demodata/message.db",
-        "smtp": {
-          "from": "umbrella@example.com",
-          "host": "none",
-          "pass": "none",
-          "port": 587,
-          "user": "none"
-        }
-      },
-      "notes": {
-        "database": "demodata/notes.db"
-      },
-      "poll": {
-        "database": "demodata/poll.db"
-      },
-      "project": {
-        "database": "demodata/projects.db"
-      },
-      "stock": {
-        "database": "demodata/stock.db"
-      },
-      "tags": {
-        "database": "demodata/tags.db"
-      },
-      "task": {
-        "database": "demodata/tasks.db"
-      },
-      "time": {
-        "database": "demodata/times.db"
-      },
-      "user": {
-        "database": "demodata/users.db"
-      },
-      "wiki": {
-        "database": "demodata/wiki.db"
-      }
-    }
-  }
-}

frontend/src/Components/Autocomplete.svelte

@@ -115,7 +115,7 @@
 
     function select(index){
         candidate = candidates[index];
-        <disableDropdown></disableDropdown>();
+        disableDropdown();
         onSelect(candidate);
     }
 

frontend/src/routes/accounting/account.svelte

@@ -4,7 +4,7 @@
 	import { error, yikes } from '../../warn.svelte';
 	import { t } from '../../translations.svelte';
 
-	import EntryForm from './add_entry_new.svelte';
+	import EntryForm from './add_entry.svelte';
 	import Transaction from './transaction.svelte';
 
 	let { id }       = $props();
@@ -163,5 +163,5 @@
 	</table>
 </fieldset>
 
-<EntryForm {account} {onSave} {users} />
+<EntryForm {account} {onSave} />
 {/if}

frontend/src/routes/accounting/add_entry_new.svelte

@@ -1,205 +0,0 @@
-<script>
-	import { useTinyRouter } from 'svelte-tiny-router';
-
-	import { t } from '../../translations.svelte';
-	import { api, post } from '../../urls.svelte';
-	import { error, yikes } from '../../warn.svelte';
-	import { user }  from '../../user.svelte';
-	import Autocomplete from '../../Components/Autocomplete.svelte';
-    import Tags from '../tags/TagList.svelte';
-
-	let defaultAccount = {
-		id       : 0,
-		name     : '',
-		currency : ''
-	};
-	let { account = defaultAccount, new_account = false, onSave = () => {}, users } = $props();
-
-	let entry = $state({
-		account,
-		date : new Date().toISOString().substring(0, 10),
-		source : {
-			display: user.name,
-			id: user.id
-		},
-		destination : {},
-		amount : 0.0,
-		purpose : {},
-		tags    : []
-	});
-	let router = useTinyRouter();
-
-	async function dst_selected(destination){
-		destination = JSON.parse(JSON.stringify(destination));
-		let source  = JSON.parse(JSON.stringify(entry.source));
-		const url   = api(`accounting/${entry.account.id}/tags`)
-		const res   = await post(url,{source,destination});
-		if (res.ok) {
-			yikes();
-			const json = await res.json();
-			await proposePurpose();
-			entry.tags = json;
-		} else error(res);
-	}
-
-	function focusOnEnter(ev,id){
-		if (ev.key == 'Enter') {
-			proposePurpose();
-			document.getElementById(id).focus();
-		}
-	}
-
-	async function getAccountTags(text){
-		if (!text) return [];
-		const url = api(`accounting/${entry.account.id}/tags`)
-		return await getProposals(text,url);
-	}
-
-	async function getDestinations(text){
-		const url = api('accounting/destinations');
-		return await getProposals(text,url);
-	}
-
-	async function getProposals(text,url){
-		const res = await post(url,text);
-        if (res.ok){
-            yikes();
-            const input = await res.json();
-            return Object.values(input).map(mapDisplay);
-        } else {
-            error(res);
-            return {};
-        }
-	}
-
-
-	async function getPurposes(text) {
-		const url = api('accounting/purposes');
-		return await getProposals(text,url);
-	}
-
-	async function getSources(text){
-		const url = api('accounting/sources');
-		return await getProposals(text,url);
-	}
-
-	function gotoTags(purpose){
-		document.getElementById('new_tag_input');
-	}
-
-	function mapDisplay(object){
-		if (object.display){
-			return object;
-		} else if (object.name) {
-			return {...object, display: object.name};
-		} else {
-		    return { display : object }
-		}
-	}
-
-	async function proposePurpose(){
-		console.log('proposePurpose()');
-		const amount      = entry.amount;
-		const source      = entry.source;
-		const destination = entry.destination;
-		const url         = api(`accounting/${account.id}/purposes`);
-		const res         = await post(url,{source,destination,amount});
-		if (res.ok) {
-			yikes();
-			var lastTransaction = await res.json();
-			console.log({lastTransaction,users:JSON.parse(JSON.stringify(users))});
-			entry.purpose       = { display: lastTransaction.purpose};
-			entry.tags          = lastTransaction.tags;
-			if (lastTransaction.source.value){
-				if (users[lastTransaction.source.value]){
-					let user = users[lastTransaction.source.value];
-					entry.source = { id : +lastTransaction.source.value, display : user.name };
-				} else entry.source = { display: lastTransaction.source.value };
-			}
-			if (lastTransaction.destination.value){
-				if (users[lastTransaction.destination.value]){
-					let user = users[lastTransaction.destination.value];
-					entry.destination = { id : +lastTransaction.destination.value, display : user.name };
-				} else entry.destination = { display: lastTransaction.destination.value };
-			}
-		} else error(res);
-	}
-
-	async function save(){
-		let data = {
-			...entry,
-			purpose: entry.purpose.display
-		}
-		let url = api('accounting');
-		let res = await post(url, data);
-		if (res.ok) {
-			yikes();
-			if (new_account){
-				router.navigate('/accounting');
-				return;
-			}
-			//entry.tags = [];
-			onSave();
-			document.getElementById('date-input').focus();
-		} else error(res);
-	}
-</script>
-
-<style>
-	hr{
-		grid-column: 1 / -1;
-		margin: 0.5rem 0;
-        border: 0;
-        height: 1px;
-        align-self: center;
-        background: red;
-	}
-</style>
-
-<fieldset class="grid2 new_transaction">
-	{#if new_account}
-		<legend>{t('create_new_object',{object:t('account')})}</legend>
-		<span style="display:none"></span>
-		<span>{t('account name')}</span>
-		<span>
-			<input type="text" bind:value={entry.account.name} />
-		</span>
-		<span>{t('currency')}</span>
-		<span>
-			<input type="text" bind:value={entry.account.currency} />
-		</span>
-		<hr/>
-		<span style="grid-column-end: span 2">{t('first transaction')}</span>
-	{:else}
-		<legend>{t('add_object',{object:t('transaction')})}</legend>
-		<span style="display:none"></span>
-	{/if}
-
-	<span>{t('date')}</span>
-	<span>
-		<input type="date" bind:value={entry.date} id="date-input" />
-	</span>
-
-	<span>{t('amount')}</span>
-	<span>
-		<input type="number" bind:value={entry.amount} onkeyup={e => focusOnEnter(e,'source-input')} />&nbsp;{entry.account.currency}
-	</span>
-
-	<span>{t('source')}</span>
-	<Autocomplete bind:candidate={entry.source} getCandidates={getSources} id="source-input" />
-
-	<span>{t('destination')}</span>
-	<Autocomplete bind:candidate={entry.destination} getCandidates={getDestinations} onSelect={dst_selected} />
-
-
-	<span>{t('purpose')}</span>
-	<Autocomplete bind:candidate={entry.purpose} getCandidates={getPurposes} onCommit={gotoTags} id="purpose_input" />
-
-	<span>{t('tags')}</span>
-	<Tags getCandidates={getAccountTags} module={null} bind:tags={entry.tags} onEmptyCommit={save} />
-
-	<span></span>
-	<span>
-		<button onclick={save}>{t('save')}</button>
-	</span>
-</fieldset>

journal/src/main/java/de/srsoftware/umbrella/journal/SqliteDb.java

@@ -13,6 +13,8 @@ import de.srsoftware.umbrella.core.BaseDb;
 import de.srsoftware.umbrella.messagebus.events.Event;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 
 public class SqliteDb extends BaseDb implements JournalDb{
 	public SqliteDb(Connection connection) {
@@ -33,13 +35,14 @@ public class SqliteDb extends BaseDb implements JournalDb{
 		var sql = """
 				CREATE TABLE IF NOT EXISTS {0} (
 					{1} INTEGER PRIMARY KEY,
-					{2} INTEGER,
-					{3} VARCHAR(255) NOT NULL,
-					{4} VARCHAR(16) NOT NULL,
-					{5} TEXT
+					{2} LONG NOT NULL,
+					{3} INTEGER,
+					{4} VARCHAR(255) NOT NULL,
+					{5} VARCHAR(16) NOT NULL,
+					{6} TEXT
 				);
 				""";
-		sql = format(sql,TABLE_JOURNAL,ID,USER_ID,MODULE,ACTION,DESCRIPTION);
+		sql = format(sql,TABLE_JOURNAL,ID,TIMESTAMP,USER_ID,MODULE,ACTION,DESCRIPTION);
 		try {
 			db.prepareStatement(sql).execute();
 		} catch (SQLException e) {
@@ -50,8 +53,9 @@ public class SqliteDb extends BaseDb implements JournalDb{
 	@Override
 	public void logEvent(Event<?> event) {
 		try {
-			insertInto(TABLE_JOURNAL,USER_ID,MODULE,ACTION,DESCRIPTION)
-					.values(event.initiator().id(), event.module(), event.eventType(), event.describe())
+			var timestamp = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC);
+			insertInto(TABLE_JOURNAL,TIMESTAMP,USER_ID,MODULE,ACTION,DESCRIPTION)
+					.values(timestamp,event.initiator().id(), event.module(), event.eventType(), event.describe())
 					.execute(db).close();
 		} catch (SQLException e) {
 			throw databaseException(ERROR_WRITE_EVENT,event.eventType(),event.initiator().name());

markdown/src/main/java/de/srsoftware/umbrella/markdown/MarkdownApi.java

@@ -14,8 +14,11 @@ import de.srsoftware.configuration.Configuration;
 import de.srsoftware.tools.Path;
 import de.srsoftware.umbrella.core.BaseHandler;
 import de.srsoftware.umbrella.core.ModuleRegistry;
+import de.srsoftware.umbrella.core.Util;
 import de.srsoftware.umbrella.core.api.MarkdownService;
+import de.srsoftware.umbrella.core.constants.Field;
 import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;