refactored item module → stock, added legacy database creation methods

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

backend/build.gradle.kts

@@ -17,12 +17,12 @@ dependencies{
     implementation(project(":core"))
     implementation(project(":documents"))
     implementation(project(":files"))
-    implementation(project(":items"))
     implementation(project(":legacy"))
     implementation(project(":markdown"))
     implementation(project(":messages"))
     implementation(project(":notes"))
     implementation(project(":project"))
+    implementation(project(":stock"))
     implementation(project(":tags"))
     implementation(project(":task"))
     implementation(project(":time"))
@@ -50,12 +50,12 @@ tasks.jar {
         ":core:jar",
         ":documents:jar",
         ":files:jar",
-        ":items:jar",
         ":legacy:jar",
         ":markdown:jar",
         ":messages:jar",
         ":notes:jar",
         ":project:jar",
+        ":stock:jar",
         ":tags:jar",
         ":task:jar",
         ":time:jar",

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

@@ -16,12 +16,12 @@ 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;
-import de.srsoftware.umbrella.items.ItemApi;
 import de.srsoftware.umbrella.legacy.*;
 import de.srsoftware.umbrella.markdown.MarkdownApi;
 import de.srsoftware.umbrella.message.MessageSystem;
 import de.srsoftware.umbrella.notes.NoteModule;
 import de.srsoftware.umbrella.project.ProjectModule;
+import de.srsoftware.umbrella.stock.StockApi;
 import de.srsoftware.umbrella.tags.TagModule;
 import de.srsoftware.umbrella.task.TaskModule;
 import de.srsoftware.umbrella.time.TimeModule;
@@ -71,7 +71,7 @@ public class Application {
 			new CompanyLegacy(config).bindPath("/legacy/company").on(server);
 			new ContactModule(config).bindPath("/api/contact").on(server);
 			new DocumentApi(config).bindPath("/api/document").on(server);
-			new ItemApi(config).bindPath("/api/items").on(server);
+			new StockApi(config).bindPath("/api/stock").on(server);
 			new UserLegacy(config).bindPath("/legacy/user").on(server);
 			new NotesLegacy(config).bindPath("/legacy/notes").on(server);
 			new MarkdownApi().bindPath("/api/markdown").on(server);

company/src/main/java/de/srsoftware/umbrella/company/CompanyModule.java

@@ -38,7 +38,7 @@ public class CompanyModule extends BaseHandler implements CompanyService {
 		var company = get(companyId);
 		if (!membership(companyId,user.id())) throw forbidden("You are mot a member of company {0}",company.name());
 		if (!documentService().list(companyId).isEmpty()) throw forbidden("There are documents owned by {0}",company.name());
-		if (!itemService().list(companyId).isEmpty()) throw forbidden("There are items owned by {0}",company.name());
+		if (!itemService().redefineMe(companyId).isEmpty()) throw forbidden("There are items owned by {0}",company.name());
 		if (!projectService().listCompanyProjects(companyId,true).isEmpty()) throw forbidden("There are projects owned by {0}",company.name());
 		return sendContent(ex, companyDb.drop(companyId));
 	}

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

@@ -10,11 +10,11 @@ public class ModuleRegistry {
 	private ContactService  contactService;
 	private DocumentService documentService;
 	private FileService     fileService;
-	private ItemService     itemService;
 	private MarkdownService markdownService;
 	private NoteService     noteService;
 	private PostBox         postBox;
 	private ProjectService  projectService;
+	private StockService    stockService;
 	private TagService      tagService;
 	private TaskService     taskService;
 	private TimeService     timeService;
@@ -33,7 +33,7 @@ public class ModuleRegistry {
 			case ContactService  cs: singleton.contactService  = cs; break;
 			case DocumentService ds: singleton.documentService = ds; break;
 			case FileService     fs: singleton.fileService     = fs; break;
-			case ItemService     is: singleton.itemService     = is; break;
+			case StockService is: singleton.stockService = is; break;
 			case MarkdownService ms: singleton.markdownService = ms; break;
 			case NoteService     ns: singleton.noteService     = ns; break;
 			case PostBox         pb: singleton.postBox         = pb; break;
@@ -65,8 +65,8 @@ public class ModuleRegistry {
 		return singleton.documentService;
 	}
 
-	public static ItemService itemService(){
-		return singleton.itemService;
+	public static StockService itemService(){
+		return singleton.stockService;
 	}
 
 	public static FileService fileService(){

core/src/main/java/de/srsoftware/umbrella/core/api/ItemService.java

@@ -1,10 +0,0 @@
-/* © SRSoftware 2025 */
-package de.srsoftware.umbrella.core.api;
-
-import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
-import de.srsoftware.umbrella.core.model.Item;
-import java.util.Collection;
-
-public interface ItemService {
-	Collection<Item> list(long companyId) throws UmbrellaException;
-}

core/src/main/java/de/srsoftware/umbrella/core/api/StockService.java

@@ -0,0 +1,15 @@
+/* © SRSoftware 2025 */
+package de.srsoftware.umbrella.core.api;
+
+
+import java.util.Collection;
+
+public interface StockService {
+	/**
+	 * Das war mal die methode um zu checken, ob einer Firma noch Items zugewiesen sind.
+	 * Diese Methode muss neu definiert werden, sobald der Stock-Service neu implementiert ist.
+	 * @param company_id
+	 * @return
+	 */
+	Collection<Object> redefineMe(long company_id);
+}

core/src/main/java/de/srsoftware/umbrella/core/model/Item.java

@@ -1,38 +1,12 @@
 /* © SRSoftware 2025 */
 package de.srsoftware.umbrella.core.model;
 
-import static de.srsoftware.umbrella.core.Constants.*;
-import static de.srsoftware.umbrella.core.Constants.CODE;
-import static de.srsoftware.umbrella.core.Util.mapMarkdown;
-
-import de.srsoftware.tools.Mappable;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Map;
-
-public record Item(long id, long companyId, String code, String name, String description, String unit, long unitPrice, long tax) implements Mappable {
-	public static Item of(ResultSet rs) throws SQLException {
-		var id = rs.getLong(ID);
-		var companyId = rs.getLong(COMPANY_ID);
-		var code      = rs.getString(CODE);
-		var name      =  rs.getString(NAME);
-		var desc      = rs.getString(DESCRIPTION);
-		var unit      = rs.getString(UNIT);
-		var unitPrice = rs.getLong(UNIT_PRICE);
-		var tax       = rs.getInt(TAX);
-
-		return new Item(id,companyId,code,name,desc,unit,unitPrice,tax);
-	}
-
-	@Override
-	public Map<String, Object> toMap() {
-		return Map.of(
-				ID,id,
-				COMPANY_ID,companyId,
-				CODE,code,NAME,name,
-				DESCRIPTION,mapMarkdown(description),
-				UNIT,unit,
-				UNIT_PRICE,unitPrice,
-				TAX,tax);
-	}
+import java.util.Collection;
+
+public class Item {
+	private long id;
+	private String code;
+	private boolean physical;
+	private Location location;
+	private Collection<Property> properties;
 }

core/src/main/java/de/srsoftware/umbrella/core/model/Location.java

@@ -0,0 +1,10 @@
+/* © SRSoftware 2025 */
+package de.srsoftware.umbrella.core.model;
+
+public class Location {
+	private long id;
+	private long parentLocationId;
+	private String name;
+	private String description;
+	private String relation; // when added to an item, this field describes the type of the relation
+}

core/src/main/java/de/srsoftware/umbrella/core/model/Property.java

@@ -0,0 +1,10 @@
+/* © SRSoftware 2025 */
+package de.srsoftware.umbrella.core.model;
+
+public class Property {
+	long id;
+	String name;
+	Object value;
+	String unit;
+	String quantity;
+}

frontend/src/routes/stock/ItemList.svelte

@@ -3,10 +3,9 @@
 </script>
 <ul>
     <li>
-        <button>
-            <span></span>
-            {t('add_object',{object:'item'})}
-        </button>
+        <a>
+            <span class="symbol"></span> {t('add_object',{object:'item'})}
+        </a>
     </li>
     <li>Item 1</li>
     <li>Item 2</li>

frontend/src/routes/stock/Locations.svelte

@@ -1,8 +1,15 @@
 <script>
+    import { t } from '../../translations.svelte';
+
     let { locations } = $props();
 </script>
 
 <ul>
+    <li>
+        <a>
+            <span class="symbol"></span> {t('add_object',{object:'location'})}
+        </a>
+    </li>
     {#each Object.entries(locations) as [k,v]}
     <li>
         {k}

items/src/main/java/de/srsoftware/umbrella/items/Constants.java

@@ -1,8 +0,0 @@
-/* © SRSoftware 2025 */
-package de.srsoftware.umbrella.items;
-
-public class Constants {
-	private Constants(){}
-	public static final String CONFIG_DATABASE = "umbrella.modules.items.database";
-	public static final String TABLE_ITEMS = "items";
-}

items/src/main/java/de/srsoftware/umbrella/items/ItemApi.java

@@ -1,75 +0,0 @@
-/* © SRSoftware 2025 */
-package de.srsoftware.umbrella.items;
-
-import static de.srsoftware.umbrella.core.ConnectionProvider.connect;
-import static de.srsoftware.umbrella.core.Constants.*;
-import static de.srsoftware.umbrella.core.ModuleRegistry.companyService;
-import static de.srsoftware.umbrella.core.ModuleRegistry.userService;
-import static de.srsoftware.umbrella.core.Paths.LIST;
-import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.forbidden;
-import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.missingFieldException;
-import static de.srsoftware.umbrella.items.Constants.CONFIG_DATABASE;
-
-import com.sun.net.httpserver.HttpExchange;
-import de.srsoftware.configuration.Configuration;
-import de.srsoftware.tools.Path;
-import de.srsoftware.tools.SessionToken;
-import de.srsoftware.umbrella.core.BaseHandler;
-import de.srsoftware.umbrella.core.ModuleRegistry;
-import de.srsoftware.umbrella.core.api.ItemService;
-import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
-import de.srsoftware.umbrella.core.model.Item;
-import de.srsoftware.umbrella.core.model.Token;
-import de.srsoftware.umbrella.core.model.UmbrellaUser;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Optional;
-
-public class ItemApi extends BaseHandler implements ItemService {
-
-	private final ItemDb itemDb;
-
-	public ItemApi(Configuration config) throws UmbrellaException {
-		super();
-		var dbFile = config.get(CONFIG_DATABASE).orElseThrow(() -> missingFieldException(CONFIG_DATABASE));
-		itemDb = new SqliteDb(connect(dbFile));
-		ModuleRegistry.add(this);
-	}
-
-	@Override
-	public boolean doPost(Path path, HttpExchange ex) throws IOException {
-		addCors(ex);
-		try {
-			Optional<Token> token = SessionToken.from(ex).map(Token::of);
-			var user = userService().loadUser(token);
-			if (user.isEmpty()) return unauthorized(ex);
-			var head = path.pop();
-			return switch (head) {
-				case LIST -> listItems(ex,user.get());
-				default -> super.doGet(path,ex);
-			};
-		} catch (UmbrellaException e){
-			return send(ex,e);
-		}
-	}
-
-	@Override
-	public Collection<Item> list(long companyId) throws UmbrellaException {
-		return itemDb.list(companyId);
-	}
-
-	private boolean listItems(HttpExchange ex, UmbrellaUser user) throws IOException, UmbrellaException {
-		var json = json(ex);
-		if (!(json.has(COMPANY_ID) && json.get(COMPANY_ID) instanceof Number cid)) throw missingFieldException(COMPANY_ID);
-		var companyId = cid.longValue();
-		var company = companyService().get(companyId);
-		if (!companyService().membership(companyId,user.id())) throw forbidden("You are mot a member of company {0}",company.name());
-		var items = list(companyId)
-				.stream()
-				.map(Item::toMap)
-				.map(HashMap::new)
-				.peek(map -> map.put(FIELD_CURRENCY,company.currency()));
-		return sendContent(ex,items);
-	}
-}

items/src/main/java/de/srsoftware/umbrella/items/ItemDb.java

@@ -1,10 +0,0 @@
-/* © SRSoftware 2025 */
-package de.srsoftware.umbrella.items;
-
-import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
-import de.srsoftware.umbrella.core.model.Item;
-import java.util.Collection;
-
-public interface ItemDb {
-	Collection<Item> list(long companyId) throws UmbrellaException;
-}

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

@@ -1,37 +0,0 @@
-/* © SRSoftware 2025 */
-package de.srsoftware.umbrella.items;
-
-import static de.srsoftware.tools.jdbc.Condition.equal;
-import static de.srsoftware.tools.jdbc.Query.SelectQuery.ALL;
-import static de.srsoftware.tools.jdbc.Query.select;
-import static de.srsoftware.umbrella.core.Constants.COMPANY_ID;
-import static de.srsoftware.umbrella.items.Constants.TABLE_ITEMS;
-
-import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
-import de.srsoftware.umbrella.core.model.Item;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Collection;
-import java.util.HashSet;
-
-public class SqliteDb implements ItemDb{
-
-	private final Connection db;
-
-	public SqliteDb(Connection connection) {
-		db = connection;
-	}
-
-	@Override
-	public Collection<Item> list(long companyId) throws UmbrellaException {
-		try {
-			var items = new HashSet<Item>();
-			var rs = select(ALL).from(TABLE_ITEMS).where(COMPANY_ID, equal(companyId)).exec(db);
-			while (rs.next()) items.add(Item.of(rs));
-			rs.close();
-			return items;
-		} catch (SQLException e) {
-			throw new UmbrellaException("Failed to load items from database");
-		}
-	}
-}

settings.gradle.kts

@@ -8,11 +8,11 @@ include("core")
 include("documents")
 include("files")
 include("legacy")
-include("items")
 include("messages")
 include("markdown")
 include("notes")
 include("project")
+include("stock")
 include("tags")
 include("task")
 include("time")

stock/build.gradle.kts

@@ -1,4 +1,4 @@
-description = "Umbrella : Items"
+description = "Umbrella : Stock"
 
 dependencies{
     implementation(project(":core"))

stock/src/main/java/de/srsoftware/umbrella/stock/Constants.java

@@ -0,0 +1,15 @@
+/* © SRSoftware 2025 */
+package de.srsoftware.umbrella.stock;
+
+public class Constants {
+	private Constants(){}
+
+
+	public static final String CONFIG_DATABASE = "umbrella.modules.stock.database";
+	public static final String ITEM_ID = "item_id";	public static final String LOCATION_ID = "location_id";
+	public static final String PROPERTY_ID = "prop_id";
+	public static final String TABLE_ITEMS = "items";
+	public static final String TABLE_ITEM_PROPERTIES = "item_props";
+	public static final String TABLE_LOCATIONS = "locations";
+	public static final String TABLE_PROPERTIES = "properties";
+}

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

@@ -0,0 +1,87 @@
+/* © SRSoftware 2025 */
+package de.srsoftware.umbrella.stock;
+
+import static de.srsoftware.umbrella.core.Constants.*;
+import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.databaseException;
+import static de.srsoftware.umbrella.stock.Constants.*;
+import static java.text.MessageFormat.format;
+
+import de.srsoftware.umbrella.core.BaseDb;
+import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
+import de.srsoftware.umbrella.core.model.Item;
+import de.srsoftware.umbrella.core.model.Location;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.List;
+
+public class SqliteDb extends BaseDb implements StockDb {
+	public SqliteDb(Connection connection) {
+		super(connection);
+	}
+
+	@Override
+	protected int createTables() {
+		int currentVersion = createSettingsTable();
+		switch (currentVersion){
+			case 0:
+				createLocationsTable();
+				createItemsTable();
+				createPropertiesTable();
+				createItemPropsTable();
+		}
+		return setCurrentVersion(1);
+	}
+
+	private void createItemsTable() {
+		try {
+			var sql = "CREATE TABLE IF NOT EXISTS {0} ( {1} VARCHAR(255) PRIMARY KEY, {2} VARCHAR(255) NOT NULL, {3} TEXT, {4} VARCHAR(255))";
+			sql = format(sql, TABLE_ITEMS, ID, CODE, NAME, LOCATION_ID);
+			db.prepareStatement(sql).execute();
+		} catch (SQLException e) {
+			throw databaseException(ERROR_FAILED_CREATE_TABLE,TABLE_ITEMS);
+		}
+	}
+
+	private void createItemPropsTable() {
+		try {
+			var sql = "CREATE TABLE IF NOT EXISTS {0} ( {1} INT NOT NULL, {2} INT NOT NULL, {3} VARCHAR(255) NOT NULL, PRIMARY KEY({1}, {2}))";
+			sql = format(sql, TABLE_ITEM_PROPERTIES, ITEM_ID, PROPERTY_ID,VALUE);
+			db.prepareStatement(sql).execute();
+		} catch (SQLException e) {
+			throw databaseException(ERROR_FAILED_CREATE_TABLE,TABLE_ITEM_PROPERTIES);
+		}
+	}
+
+	private void createLocationsTable() {
+		try {
+			var sql = "CREATE TABLE IF NOT EXISTS {0} ( {1} VARCHAR(255) PRIMARY KEY, {2} VARCHAR(255) DEFAULT NULL, {3} VARCHAR(255) NOT NULL, {4} TEXT)";
+			sql = format(sql, TABLE_LOCATIONS, ID, LOCATION_ID, NAME, DESCRIPTION);
+			db.prepareStatement(sql).execute();
+		} catch (SQLException e) {
+			throw databaseException(ERROR_FAILED_CREATE_TABLE,TABLE_LOCATIONS);
+		}
+	}
+
+	private void createPropertiesTable() {
+		try {
+			var sql = "CREATE TABLE IF NOT EXISTS {0} ( {1} LONG PRIMARY KEY, {2} VARCHAR(255) NOT NULL, {3} INT NOT NULL, {4} VARCHAR(255))";
+			sql = format(sql, TABLE_PROPERTIES, ID, NAME, TYPE, UNIT);
+			db.prepareStatement(sql).execute();
+		} catch (SQLException e) {
+			throw databaseException(ERROR_FAILED_CREATE_TABLE,TABLE_PROPERTIES);
+		}
+	}
+
+	@Override
+	public Collection<Item> listItems(long companyId) throws UmbrellaException {
+		return List.of();
+	}
+
+	@Override
+	public Collection<Location> listLocations(long companyId) {
+		return List.of();
+	}
+
+
+}

stock/src/main/java/de/srsoftware/umbrella/stock/StockApi.java

@@ -0,0 +1,31 @@
+/* © SRSoftware 2025 */
+package de.srsoftware.umbrella.stock;
+
+import static de.srsoftware.umbrella.core.ConnectionProvider.connect;
+import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.missingFieldException;
+import static de.srsoftware.umbrella.stock.Constants.CONFIG_DATABASE;
+
+import de.srsoftware.configuration.Configuration;
+import de.srsoftware.umbrella.core.BaseHandler;
+import de.srsoftware.umbrella.core.ModuleRegistry;
+import de.srsoftware.umbrella.core.api.StockService;
+import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
+import java.util.Collection;
+import java.util.List;
+
+public class StockApi extends BaseHandler implements StockService {
+
+	private final StockDb stockDb;
+
+	public StockApi(Configuration config) throws UmbrellaException {
+		super();
+		var dbFile = config.get(CONFIG_DATABASE).orElseThrow(() -> missingFieldException(CONFIG_DATABASE));
+		stockDb = new SqliteDb(connect(dbFile));
+		ModuleRegistry.add(this);
+	}
+
+	@Override
+	public Collection<Object> redefineMe(long company_id) {
+		return List.of();
+	}
+}

stock/src/main/java/de/srsoftware/umbrella/stock/StockDb.java

@@ -0,0 +1,12 @@
+/* © SRSoftware 2025 */
+package de.srsoftware.umbrella.stock;
+
+import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
+import de.srsoftware.umbrella.core.model.Item;
+import de.srsoftware.umbrella.core.model.Location;
+import java.util.Collection;
+
+public interface StockDb {
+	Collection<Item> listItems(long companyId) throws UmbrellaException;
+	Collection<Location> listLocations(long companyId);
+}