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

preparing moving of locations

Browse Source
This commit is contained in:
Stephan Richter
2025-10-22 18:51:14 +02:00
parent 1acf54f58a
commit 7b259e7425
7 changed files with 65 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
stock/src/main/java/de/srsoftware/umbrella/stock/Constants.java
View File

@@ -13,6 +13,7 @@ public class Constants {
public static final String ITEMS = "items";
public static final String LOCATIONS = "locations";
public static final String MOVE_ITEM = "move_item";
public static final String MOVE_LOCATION = "move_location";
public static final String OF_USER = "of_user";
public static final String PARENT = "parent";
public static final String PROPERTY_ID = "prop_id";

2
stock/src/main/java/de/srsoftware/umbrella/stock/SqliteDb.java
View File

@@ -288,7 +288,7 @@ public class SqliteDb extends BaseDb implements StockDb {
}
@Override
public Location save(DbLocation location) {
public DbLocation save(DbLocation location) {
if (location.id() == 0) { // new location
try {
var rs = insertInto(TABLE_LOCATIONS,OWNER,PARENT_LOCATION_ID,NAME,DESCRIPTION)

2
stock/src/main/java/de/srsoftware/umbrella/stock/StockDb.java
View File

@@ -15,7 +15,7 @@ public interface StockDb {
Collection<DbLocation> listUserLocations(UmbrellaUser userId);
Item loadItem(long id);
DbLocation loadLocation(long locationId);
Location save(DbLocation location);
DbLocation save(DbLocation location);
Item save(Item item);
Property setProperty(long itemId, long existingPropId, Object value);
}

23
stock/src/main/java/de/srsoftware/umbrella/stock/StockModule.java
View File

@@ -113,7 +113,8 @@ public class StockModule extends BaseHandler implements StockService {
var user = userService().loadUser(token);
if (user.isEmpty()) return unauthorized(ex);
return switch (path.pop()){
case MOVE_ITEM -> patchMove(user.get(), path,ex);
case MOVE_ITEM -> patchMoveItem(user.get(), path,ex);
case MOVE_LOCATION -> patchMoveLocation(user.get(), path, ex);
case null -> patchItem(user.get(),ex);
default -> super.doPatch(path,ex);
};
@@ -213,7 +214,7 @@ public class StockModule extends BaseHandler implements StockService {
return sendContent(ex,stockDb.save(item));
}
private boolean patchMove(UmbrellaUser user, Path path, HttpExchange ex) throws IOException {
private boolean patchMoveItem(UmbrellaUser user, Path path, HttpExchange ex) throws IOException {
var json = json(ex);
if (!(json.get(ITEM) instanceof Number itemId)) throw missingFieldException(ITEM);
if (!(json.get(TARGET) instanceof Number locationId)) throw missingFieldException(TARGET);
@@ -232,6 +233,24 @@ public class StockModule extends BaseHandler implements StockService {
return sendContent(ex,item);
}
private boolean patchMoveLocation(UmbrellaUser user, Path path, HttpExchange ex) throws IOException {
var json = json(ex);
if (!(json.get(LOCATION) instanceof Number locationId)) throw missingFieldException(LOCATION);
if (!(json.get(TARGET) instanceof Number destLocationId)) throw missingFieldException(TARGET);
var location = stockDb.loadLocation(locationId.longValue());
var owner = location.owner().resolve();
if (!assigned(owner,user)) throw forbidden("You are not allowed to alter the location of \"{0}\"!",location.name());
var target = stockDb.loadLocation(locationId.longValue());
var locOwner = target.resolve().owner().resolve();
if (!assigned(locOwner,user)) throw forbidden("You are not allowed to modify \"{0}\"!",target.name());
if (!locOwner.equals(owner)) throw unprocessable("You may not move locations from one owner ({0}) to another ({1})",owner,locOwner);
location = stockDb.save(location.parent(target));
return sendContent(ex,location);
}
private boolean postLocation(UmbrellaUser user, HttpExchange ex) throws IOException {
var json = json(ex);
if (!(json.get(NAME) instanceof String name)) throw missingFieldException(NAME);