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

bugfix + recalling of selections already made by user

Browse Source 
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
Stephan Richter
2026-03-10 15:34:15 +01:00
parent 1b17c8fb09
commit b95cdd32ec
4 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
poll/src/main/java/de/srsoftware/umbrella/poll/PollDb.java
View File

@@ -15,6 +15,8 @@ public interface PollDb {
Poll loadPoll(String id);
Map<Integer,Integer> loadSelections(Poll poll, UmbrellaUser user);
Poll save(Poll poll);
void saveSelection(Poll poll, Map<Integer,Integer> optionsToWeights, String guestName);

7
poll/src/main/java/de/srsoftware/umbrella/poll/PollModule.java
View File

@@ -97,7 +97,10 @@ public class PollModule extends BaseHandler implements PollService {
var poll = pollDb.loadPoll(pollId);
var permitted = !poll.isPrivate() || poll.owner().equals(user);
if (!permitted && poll.permissions().get(user) == null) throw forbidden(Text.NOT_ALLOWED_TO_EDIT, Field.OBJECT,Text.POLL);
return sendContent(ex,poll);
var result = new HashMap<>(poll.toMap());
if (user != null) result.put(SELECTION,pollDb.loadSelections(poll, user));
return sendContent(ex,result);
}
private boolean getPollEvaluation(HttpExchange ex, UmbrellaUser user, Path path) throws IOException {
@@ -208,7 +211,7 @@ public class PollModule extends BaseHandler implements PollService {
var poll = pollDb.loadPoll(id);
if (SELECT.equals(head)) {
if (user == null && poll.isPrivate()) return unauthorized(ex);
return postSelection(ex, poll, null);
return postSelection(ex, poll, user);
}
var permitted = poll.owner().equals(user);
if (!permitted && !Set.of(Permission.OWNER, Permission.EDIT).contains(poll.permissions().get(user))) throw forbidden(Text.NOT_ALLOWED_TO_EDIT, Field.OBJECT,Text.POLL);

16
poll/src/main/java/de/srsoftware/umbrella/poll/SqliteDb.java
View File

@@ -197,6 +197,20 @@ public class SqliteDb extends BaseDb implements PollDb {
}
}
@Override
public Map<Integer, Integer> loadSelections(Poll poll, UmbrellaUser user) {
try {
var map = new HashMap<Integer,Integer>();
var rs = select(ALL).from(TABLE_SELECTIONS).where(POLL_ID, equal(poll.id())).where(USER, equal(user.id())).exec(db);
while (rs.next()) map.put(rs.getInt(OPTION_ID),rs.getInt(WEIGHT));
rs.close();
return map;
} catch (SQLException e) {
throw failedToLoadObject(Text.SELECTIONS);
}
}
@Override
public Poll save(Poll poll) {
return is0(poll.id()) ? saveNew(poll) : update(poll);
@@ -243,7 +257,7 @@ public class SqliteDb extends BaseDb implements PollDb {
private void saveSelection(String pollId, Map<Integer, Integer> optionsToWeights, Object editor) {
var query = replaceInto(TABLE_SELECTIONS,POLL_ID,OPTION_ID,USER_ID,WEIGHT);
var query = replaceInto(TABLE_SELECTIONS,POLL_ID,OPTION_ID,USER,WEIGHT);
for (var entry : optionsToWeights.entrySet()){
var optionId = entry.getKey();
var weight = entry.getValue();