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

preparing document display

Browse Source 
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
Stephan Richter
2025-07-10 13:13:46 +02:00
parent 163bcebf4f
commit 0bfbe47d96
6 changed files with 68 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
documents/src/main/java/de/srsoftware/umbrella/documents/DocumentApi.java
View File

@@ -3,7 +3,7 @@ package de.srsoftware.umbrella.documents;
import static de.srsoftware.tools.MimeType.MIME_FORM_URL;
import static de.srsoftware.umbrella.core.ConnectionProvider.connect;
import static de.srsoftware.umbrella.core.Constants.SENDER;
import static de.srsoftware.umbrella.core.Constants.*;
import static de.srsoftware.umbrella.core.Paths.LIST;
import static de.srsoftware.umbrella.core.Util.request;
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.missingFieldException;
@@ -60,7 +60,13 @@ public class DocumentApi extends BaseHandler {
case COMPANIES -> getCompanies(ex,user.get(),token.orElse(null));
case CONTACTS -> getContacts(ex,user.get(),token.orElse(null));
case PATH_TYPES -> getDocTypes(ex);
case null, default -> super.doGet(path,ex);
case null -> super.doGet(path,ex);
default -> {
try {
yield getDocument(ex,Long.parseLong(head),user.get());
} catch (NumberFormatException ignored) {}
yield super.doGet(path,ex);
}
};
} catch (UmbrellaException e) {
return send(ex,e);
@@ -99,6 +105,21 @@ public class DocumentApi extends BaseHandler {
return sendContent(ex,map);
}
private boolean getDocument(HttpExchange ex, long docId, UmbrellaUser user) throws IOException, UmbrellaException {
var doc = db.loadDoc(docId);
var companyId = doc.companyId();
var company = companies.get(companyId);
var members = companies.getMembers(companyId);
var isMember = false;
for (var member : members) isMember |= user.equals(member);
if (!isMember) return sendContent(ex,HTTP_FORBIDDEN,"You are mot a member of company "+doc.companyId());
var sep = company.decimalSeparator();
if (sep != null) doc.setDecimalSeparator(sep);
doc.setCompanyName(company.name());
return sendContent(ex,doc.renderToMap());
}
private HashMap<Long, Map<String, Object>> getLegacyCompanies(HttpExchange ex, UmbrellaUser umbrellaUser, Token token) throws IOException, UmbrellaException {
var location = config.get("umbrella.modules.company.baseUrl").map(s -> s+"/json").orElseThrow(() -> new UmbrellaException(500,"umbrella.modules.company.baseUrl not configured!"));
var resp = request(location, token.asMap(),MIME_FORM_URL,null);
@@ -139,9 +160,9 @@ public class DocumentApi extends BaseHandler {
var company = companies.get(companyId.longValue());
var members = companies.getMembers(companyId.longValue());
var match = false;
for (var member : members) match |= user.equals(member);
if (!match) return sendContent(ex,HTTP_FORBIDDEN,"You are mot a member of company "+companyId);
var isMember = false;
for (var member : members) isMember |= user.equals(member);
if (!isMember) return sendContent(ex,HTTP_FORBIDDEN,"You are mot a member of company "+companyId);
if (!json.has(FIELD_CUSTOMER) || !(json.get(FIELD_CUSTOMER) instanceof JSONObject customerData)) throw missingFieldException(FIELD_CUSTOMER);
if (!json.has(FIELD_TYPE) || !(json.get(FIELD_TYPE) instanceof Number docTypeId)) throw missingFieldException(FIELD_TYPE);

3
documents/src/main/java/de/srsoftware/umbrella/documents/model/Document.java
View File

@@ -5,7 +5,6 @@ import static de.srsoftware.umbrella.core.Constants.*;
import static de.srsoftware.umbrella.core.Util.markdown;
import static de.srsoftware.umbrella.documents.Constants.*;
import static de.srsoftware.umbrella.documents.Constants.FIELD_CUSTOMER;
import static java.text.MessageFormat.format;
import static java.util.Optional.empty;
import de.srsoftware.tools.Mappable;
@@ -209,7 +208,7 @@ public final class Document implements Mappable {
map.put(ID, id);
map.put(FIELD_COMPANY, Map.of(ID,companyId, NAME,companyName));
map.put(NUMBER, number);
map.put(FIELD_TYPE, format("<? {0} ?>", type.name()));
map.put(FIELD_TYPE, type.name());
map.put(DATE, date);
map.put(STATE, state.code);
map.put(FIELD_DELIVERY, delivery);