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

implemented storing edit as new version, impelemented loading of arbitrary versions of wiki page

Browse Source 
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
Stephan Richter
2025-09-10 15:44:51 +02:00
parent e831b8a4e0
commit aad9a7d9b8
6 changed files with 77 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wiki/src/main/java/de/srsoftware/umbrella/wiki/SqliteDb.java
View File

@@ -2,8 +2,6 @@ package de.srsoftware.umbrella.wiki;
import de.srsoftware.tools.jdbc.Condition;
import de.srsoftware.umbrella.core.BaseDb;
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import de.srsoftware.umbrella.core.model.Hash;
import de.srsoftware.umbrella.core.model.Permission;
import de.srsoftware.umbrella.core.model.WikiPage;
@@ -80,9 +78,15 @@ public class SqliteDb extends BaseDb implements WikiDb {
}
@Override
public WikiPage load(String id) {
public WikiPage load(String id, Integer version) {
try {
var rs = select(ALL).from(TABLE_PAGES).where(ID,Condition.equal(id)).sort(VERSION+" DESC").limit(1).exec(db);
var query = select(ALL).from(TABLE_PAGES).where(ID,Condition.equal(id));
if (version == null) {
query.sort(VERSION+" DESC").limit(1);
} else {
query.where(VERSION,Condition.equal(version));
}
var rs = query.exec(db);
WikiPage page = null;
if (rs.next()) page = WikiPage.of(rs);
rs.close();

2
wiki/src/main/java/de/srsoftware/umbrella/wiki/WikiDb.java
View File

@@ -12,7 +12,7 @@ public interface WikiDb {
List<String> listUserPages(long userId);
WikiPage load(String id);
WikiPage load(String id, Integer version);
Map<Long, Permission> loadMembers(WikiPage page);

24
wiki/src/main/java/de/srsoftware/umbrella/wiki/WikiModule.java
View File

@@ -17,11 +17,9 @@ import java.io.IOException;
import java.util.Optional;
import static de.srsoftware.umbrella.core.ConnectionProvider.connect;
import static de.srsoftware.umbrella.core.Constants.VERSION;
import static de.srsoftware.umbrella.core.Paths.PAGE;
import static de.srsoftware.umbrella.core.Paths.VIEW;
import static de.srsoftware.umbrella.core.Util.mapValues;
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.forbidden;
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.missingFieldException;
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*;
import static de.srsoftware.umbrella.core.model.Permission.EDIT;
import static de.srsoftware.umbrella.wiki.Constants.*;
@@ -73,7 +71,17 @@ public class WikiModule extends BaseHandler implements WikiService {
private boolean getPage(Path path, UmbrellaUser user, HttpExchange ex) throws IOException {
var id = path.pop();
var page = loadPage(id);
Integer version = null;
if (!path.empty()){
var head = path.pop();
if (!VERSION.equals(head)) return doGet(path,ex);
try {
version = Integer.parseInt(path.pop());
} catch (NumberFormatException e) {
throw invalidFieldException(VERSION,"int number");
}
}
var page = loadPage(id,version);
var permission = page.members().get(user.id());
if (permission == null) throw forbidden("You are not allowed to access \"{0}\"!",id);
return sendContent(ex, page);
@@ -97,14 +105,14 @@ public class WikiModule extends BaseHandler implements WikiService {
return page;
}
private WikiPage loadPage(String id){
private WikiPage loadPage(String id, Integer version){
if (id == null) throw missingFieldException(PAGE_ID);
return loadMembers(wikiDb.load(id));
return loadMembers(wikiDb.load(id, version));
}
private boolean patchPage(Path path, UmbrellaUser user, HttpExchange ex) throws IOException {
var id = path.pop();
var page = loadPage(id);
var page = loadPage(id, null);
var member = page.members().get(user.id());
if (member == null || member.permission() != EDIT) throw forbidden("You are not allowed to edit {0}!",id);
var json = json(ex);