Skip to content

Allow null steps in AchievementUpdateRequest #1145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Brutus5000 merged 2 commits into from
Jun 21, 2026
+13 −3
Merged

Allow null steps in AchievementUpdateRequest #1145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f436d1c
Allow null steps in AchievementUpdateRequest
Brutus5000 Jun 21, 2026
d98139d
Reject INCREMENT/SET_STEPS_AT_LEAST without steps
Brutus5000 Jun 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/main/java/com/faforever/api/achievements/AchievementUpdateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package com.faforever.api.achievements;

import io.swagger.v3.oas.annotations.media.Schema;

record AchievementUpdateRequest(
int playerId,
String achievementId,
Operation operation,
int steps
@Schema(description = "Required for INCREMENT and SET_STEPS_AT_LEAST; ignored (and may be null/omitted) for REVEAL and UNLOCK.", nullable = true)
Integer steps
) {
public enum Operation {
REVEAL, UNLOCK, INCREMENT, SET_STEPS_AT_LEAST
Expand Down
11 changes: 9 additions & 2 deletions src/main/java/com/faforever/api/achievements/AchievementsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,16 @@ public void update(AchievementUpdateRequest request) {
switch (request.operation()) {
case REVEAL -> throw new UnsupportedOperationException("REVEAL is not yet implemented");
case UNLOCK -> achievementService.unlock(request.playerId(), request.achievementId());
case INCREMENT -> achievementService.increment(request.playerId(), request.achievementId(), request.steps());
case INCREMENT -> achievementService.increment(request.playerId(), request.achievementId(), requireSteps(request));
case SET_STEPS_AT_LEAST ->
achievementService.setStepsAtLeast(request.playerId(), request.achievementId(), request.steps());
achievementService.setStepsAtLeast(request.playerId(), request.achievementId(), requireSteps(request));
}
}

private static int requireSteps(AchievementUpdateRequest request) {
if (request.steps() == null) {
throw new IllegalArgumentException("steps is required for operation " + request.operation());
}
return request.steps();
}
}
Loading