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

implemented tagging of bookmarks

Browse Source
This commit is contained in:
Stephan Richter
2025-08-03 14:25:25 +02:00
parent 6de65f3070
commit b041e4e9be
8 changed files with 46 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bookmark/src/main/java/de/srsoftware/umbrella/bookmarks/BookmarkApi.java
View File

@@ -3,8 +3,7 @@ package de.srsoftware.umbrella.bookmarks;
import static de.srsoftware.umbrella.bookmarks.Constants.*;
import static de.srsoftware.umbrella.core.ConnectionProvider.connect;
import static de.srsoftware.umbrella.core.Constants.COMMENT;
import static de.srsoftware.umbrella.core.Constants.URL;
import static de.srsoftware.umbrella.core.Constants.*;
import static de.srsoftware.umbrella.core.Paths.LIST;
import static de.srsoftware.umbrella.core.Util.mapValues;
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.missingFieldException;
@@ -15,21 +14,27 @@ 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.TagService;
import de.srsoftware.umbrella.core.api.UserService;
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import de.srsoftware.umbrella.core.model.Token;
import de.srsoftware.umbrella.core.model.UmbrellaUser;
import org.json.JSONArray;
import java.io.IOException;
import java.util.List;
import java.util.Optional;
public class BookmarkApi extends BaseHandler {
private final BookmarkDb db;
private final UserService users;
private final TagService tags;
public BookmarkApi(Configuration config, UserService userService) {
public BookmarkApi(Configuration config, TagService tagService) {
var dbFile = config.get(CONFIG_DATABASE).orElseThrow(() -> missingFieldException(CONFIG_DATABASE));
db = new SqliteDb(connect(dbFile));
users = userService;
tags = tagService;
users = tagService.userService();
}
@Override
@@ -80,6 +85,10 @@ public class BookmarkApi extends BaseHandler {
if (!(json.has(URL) && json.get(URL) instanceof String url)) throw missingFieldException(URL);
if (!(json.has(COMMENT) && json.get(COMMENT) instanceof String comment)) throw missingFieldException(COMMENT);
var bookmark = db.save(url,comment, user.id());
if (json.has(TAGS) && json.get(TAGS) instanceof JSONArray tagList){
var list = tagList.toList().stream().map(Object::toString).toList();
tags.save(BOOKMARK,bookmark.id(), List.of(user.id()),list);
}
return sendContent(ex,bookmark);
}
}