[backend/frontend] Fix editing challenge

openbas-api/src/main/java/io/openbas/rest/challenge/ChallengeApi.java

@@ -11,9 +11,8 @@
 import io.openbas.database.model.Exercise;
 import io.openbas.database.model.User;
 import io.openbas.database.repository.*;
-import io.openbas.rest.challenge.form.ChallengeCreateInput;
+import io.openbas.rest.challenge.form.ChallengeInput;
 import io.openbas.rest.challenge.form.ChallengeTryInput;
-import io.openbas.rest.challenge.form.ChallengeUpdateInput;
 import io.openbas.rest.challenge.response.ChallengeInformation;
 import io.openbas.rest.challenge.response.ChallengeResult;
 import io.openbas.rest.challenge.response.ChallengesReader;
@@ -53,11 +52,11 @@
   @PutMapping("/api/challenges/{challengeId}")
   @Transactional(rollbackOn = Exception.class)
   public Challenge updateChallenge(
-      @PathVariable String challengeId, @Valid @RequestBody ChallengeUpdateInput input) {
+      @PathVariable String challengeId, @Valid @RequestBody ChallengeInput input) {
     Challenge challenge =
         challengeRepository.findById(challengeId).orElseThrow(ElementNotFoundException::new);
-    challenge.setTags(iterableToSet(tagRepository.findAllById(input.getTagIds())));
-    challenge.setDocuments(fromIterable(documentRepository.findAllById(input.getDocumentIds())));
+    challenge.setTags(iterableToSet(tagRepository.findAllById(input.tagIds())));
+    challenge.setDocuments(fromIterable(documentRepository.findAllById(input.documentIds())));
     challenge.setUpdateAttributes(input);
     challenge.setUpdatedAt(Instant.now());
     // Clear all flags
@@ -66,7 +65,7 @@
     challengeFlags.clear();
     // Add new ones
     input
-        .getFlags()
+        .flags()
         .forEach(
             flagInput -> {
               ChallengeFlag challengeFlag = new ChallengeFlag();
@@ -82,13 +81,13 @@
   @PreAuthorize("isPlanner()")
   @PostMapping("/api/challenges")
   @Transactional(rollbackOn = Exception.class)
-  public Challenge createChallenge(@Valid @RequestBody ChallengeCreateInput input) {
+  public Challenge createChallenge(@Valid @RequestBody ChallengeInput input) {
     Challenge challenge = new Challenge();
     challenge.setUpdateAttributes(input);
-    challenge.setTags(iterableToSet(tagRepository.findAllById(input.getTagIds())));
-    challenge.setDocuments(fromIterable(documentRepository.findAllById(input.getDocumentIds())));
+    challenge.setTags(iterableToSet(tagRepository.findAllById(input.tagIds())));
+    challenge.setDocuments(fromIterable(documentRepository.findAllById(input.documentIds())));
     List<ChallengeFlag> challengeFlags =
-        input.getFlags().stream()
+        input.flags().stream()
             .map(
                 flagInput -> {
                   ChallengeFlag challengeFlag = new ChallengeFlag();

openbas-api/src/main/java/io/openbas/rest/challenge/form/ChallengeInput.java

@@ -0,0 +1,32 @@
+package io.openbas.rest.challenge.form;
+
+import static io.openbas.config.AppConfig.EMPTY_MESSAGE;
+import static io.openbas.config.AppConfig.MANDATORY_MESSAGE;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import java.util.List;
+
+public record ChallengeInput(
+    @NotBlank(message = MANDATORY_MESSAGE) @JsonProperty("challenge_name") String name,
+    @JsonProperty("challenge_category") String category,
+    @JsonProperty("challenge_content") String content,
+    @JsonProperty("challenge_score") Double score,
+    @JsonProperty("challenge_max_attempts") Integer maxAttempts,
+    @JsonProperty("challenge_tags") List<String> tagIds,
+    @JsonProperty("challenge_documents") List<String> documentIds,
+    @NotEmpty(message = EMPTY_MESSAGE) @JsonProperty("challenge_flags") List<FlagInput> flags) {
+
+  public ChallengeInput {
+    if (tagIds == null) {
+      tagIds = List.of();
+    }
+    if (documentIds == null) {
+      documentIds = List.of();
+    }
+    if (flags == null) {
+      flags = List.of();
+    }
+  }
+}