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

introduced ModuleRegistry to easy inter-module dependencies

Browse Source
This commit is contained in:
Stephan Richter
2025-08-09 13:43:10 +02:00
parent 1d569b4962
commit 5d506ac0f9
25 changed files with 347 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
items/src/main/java/de/srsoftware/umbrella/items/ItemApi.java
View File

@@ -13,8 +13,8 @@ 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.api.CompanyService;
import de.srsoftware.umbrella.core.api.UserService;
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.Token;
import de.srsoftware.umbrella.core.model.UmbrellaUser;
@@ -22,17 +22,15 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Optional;
public class ItemApi extends BaseHandler {
public class ItemApi extends BaseHandler implements ItemService {
private final ItemDb itemDb;
private final CompanyService companies;
private final UserService users;
private final ModuleRegistry registry;
public ItemApi(Configuration config, CompanyService companyService) throws UmbrellaException {
public ItemApi(ModuleRegistry registry, Configuration config) throws UmbrellaException {
var dbFile = config.get(CONFIG_DATABASE).orElseThrow(() -> missingFieldException(CONFIG_DATABASE));
itemDb = new SqliteDb(connect(dbFile));
companies = companyService;
users = companies.userService();
this.registry = registry.add(this);
}
@Override
@@ -40,7 +38,7 @@ public class ItemApi extends BaseHandler {
addCors(ex);
try {
Optional<Token> token = SessionToken.from(ex).map(Token::of);
var user = users.loadUser(token);
var user = registry.userService().loadUser(token);
if (user.isEmpty()) return unauthorized(ex);
var head = path.pop();
return switch (head) {
@@ -56,8 +54,8 @@ public class ItemApi extends BaseHandler {
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 = companies.get(companyId);
if (!companies.membership(companyId,user.id())) throw forbidden("You are mot a member of company {0}",company.name());
var company = registry.companyService().get(companyId);
if (!registry.companyService().membership(companyId,user.id())) throw forbidden("You are mot a member of company {0}",company.name());
var items = itemDb.list(companyId)
.stream()
.map(Item::toMap)