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

working on backend-side translations

Browse Source
This commit is contained in:
Stephan Richter
2025-12-14 12:36:26 +01:00
parent 00d05bfaff
commit 9fd540ba3c
12 changed files with 59 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
company/src/main/java/de/srsoftware/umbrella/company/SqliteDb.java
View File

@@ -21,12 +21,11 @@ import de.srsoftware.umbrella.core.BaseDb;
import de.srsoftware.umbrella.core.ModuleRegistry;
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import de.srsoftware.umbrella.core.model.Company;
import de.srsoftware.umbrella.core.model.UmbrellaUser;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.*;
import java.util.regex.Pattern;
import de.srsoftware.umbrella.core.model.UmbrellaUser;
import org.json.JSONObject;
public class SqliteDb extends BaseDb implements CompanyDb {
@@ -104,7 +103,7 @@ CREATE TABLE IF NOT EXISTS "companies" (
delete().from(TABLE_COMPANIES).where(ID,equal(companyId)).execute(db);
return companyId;
} catch (SQLException e) {
throw databaseException(FAILED_TO_DROP_COMPANY,companyId);
throw databaseException(FAILED_TO_DROP_ENTITY,"company",companyId);
}
}
@@ -113,14 +112,14 @@ CREATE TABLE IF NOT EXISTS "companies" (
try {
delete().from(TABLE_COMPANIES_USERS).where(COMPANY_ID,equal(companyId)).where(USER_ID,equal(userId)).execute(db);
} catch (SQLException e) {
throw databaseException(FAILED_TO_REMOVE_USER_FROM_COMPANY,userId,companyId);
throw databaseException(FAILED_TO_DROP_ENTITY_OF_ENTITY,"user",userId,"company",companyId);
}
}
@Override
public Collection<Long> getMembers(long companyId) throws UmbrellaException {
try {
var rs = select(ALL).from(TABLE_COMPANIES_USERS).where(COMPANY_ID, equal(companyId)).exec(db);
var rs = select(ALL).from(TABLE_COMPANIES_USERS).where(COMPANY_ID, equal(companyId)).exec(db);
var ids = new HashSet<Long>();
while (rs.next()) ids.add(rs.getLong(USER_ID));
rs.close();
@@ -137,7 +136,7 @@ CREATE TABLE IF NOT EXISTS "companies" (
var last = 0L;
String prefix = null;
if (rs.next()){
last = rs.getLong(LAST_CUSTOMER_NUMBER);
last = rs.getLong(LAST_CUSTOMER_NUMBER);
prefix = rs.getString(CUSTOMER_NUMBER_PREFIX);
}
rs.close();
@@ -192,10 +191,10 @@ CREATE TABLE IF NOT EXISTS "companies" (
Company company = null;
if (rs.next()) company = Company.of(rs);
rs.close();
if (company == null) throw databaseException(FAILED_TO_LOAD_COMPANY,companyId);
if (company == null) throw databaseException(FAILED_TO_LOAD_ENTITY_BY_ID,"company",companyId);
return company;
} catch (SQLException e){
throw databaseException(FAILED_TO_LOAD_COMPANY,companyId);
throw databaseException(FAILED_TO_LOAD_ENTITY_BY_ID,"company",companyId);
}
}

1
company/src/main/java/de/srsoftware/umbrella/company/api/CompanyDb.java
View File

@@ -4,7 +4,6 @@ package de.srsoftware.umbrella.company.api;
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import de.srsoftware.umbrella.core.model.Company;
import de.srsoftware.umbrella.core.model.UmbrellaUser;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;