#165: switched some if statements to be easier redable. started to make sure rest-requests do not cause errors in ui

Author: Death111

pom.xml

@@ -53,11 +53,6 @@
       <artifactId>mapstruct</artifactId>
       <version>1.5.5.Final</version>
     </dependency>
-    <dependency>
-      <groupId>javax.validation</groupId>
-      <artifactId>validation-api</artifactId>
-      <version>1.1.0.Final</version>
-    </dependency>
     <dependency>
       <groupId>org.mapstruct</groupId>
       <artifactId>mapstruct-processor</artifactId>

src/main/java/de/doubleslash/keeptime/REST_API/controller/ProjectController.java

@@ -26,13 +26,14 @@
 import de.doubleslash.keeptime.model.Work;
 import de.doubleslash.keeptime.model.repos.ProjectRepository;
 import de.doubleslash.keeptime.model.repos.WorkRepository;
+import javafx.application.Platform;
 import org.springframework.dao.DataAccessException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -102,8 +103,9 @@ public WorkDTO getWorkByIdFromProject(@PathVariable final long projectId, @PathV
                            .findFirst()
                            .map(workMapper::workToWorkDTO)
                            .orElseThrow(() -> new ResourceNotFoundException(
-                                 "Work with id '" + workId + "' related to project with id '" + projectId
-                                       + "' not found"));
+                               "Work with id '" + workId + "' related to project with id '"
+                                   + projectId
+                                   + "' not found"));
    }
 
    @PostMapping("")
@@ -113,10 +115,7 @@ public ResponseEntity<ProjectColorDTO> createProject(@Valid @RequestBody final P
 
          controller.addNewProject(newProject);
 
-         model.getProjectRepository().save(newProject);
-
          ProjectColorDTO projectDTO = projectMapper.projectToProjectDTO(newProject);
-
          return ResponseEntity.status(HttpStatus.CREATED).body(projectDTO);
       } catch (Exception e) {
          return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
@@ -136,15 +135,7 @@ public ResponseEntity<ProjectColorDTO> updateProjectColorDTO(@PathVariable final
          Project existingProject = optionalProject.get();
          Project newValuedProject = projectMapper.projectDTOToProject(newValuedProjectDTO);
 
-         existingProject.setName(newValuedProject.getName());
-         existingProject.setDescription(newValuedProject.getDescription());
-         existingProject.setIndex(newValuedProject.getIndex());
-         existingProject.setWork(newValuedProject.isWork());
-         existingProject.setColor(newValuedProject.getColor());
-         existingProject.setDefault(newValuedProject.isDefault());
-         existingProject.setEnabled(newValuedProject.isEnabled());
-
-         projectRepository.save(existingProject);
+         controller.editProject(existingProject, newValuedProject);
 
          ProjectColorDTO updatedProjectDTO = projectMapper.projectToProjectDTO(existingProject);
 
@@ -159,36 +150,36 @@ public ResponseEntity<WorkDTO> createWorkInProject(@PathVariable final long id,
          @Valid @RequestBody final Work work) {
       Optional<Project> projectOptional = projectRepository.findById(id);
 
-      if (projectOptional.isPresent()) {
-         Project project = projectOptional.get();
-         work.setProject(project);
-         workRepository.save(work);
-
-         WorkDTO workDTO = workMapper.workToWorkDTO(work);
-
-         return ResponseEntity.status(HttpStatus.CREATED).body(workDTO);
-      } else {
+      if (projectOptional.isEmpty()) {
          return ResponseEntity.notFound().build();
       }
+
+      Project project = projectOptional.get();
+      work.setProject(project);
+      workRepository.save(work);
+
+      WorkDTO workDTO = workMapper.workToWorkDTO(work);
+
+      return ResponseEntity.status(HttpStatus.CREATED).body(workDTO);
    }
 
    @DeleteMapping("/{id}")
    public ResponseEntity<String> deleteProject(@PathVariable final long id) {
       Optional<Project> projectOptional = projectRepository.findById(id);
 
       if (projectOptional.isEmpty()) {
-         throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Project with the ID '" + id + "' not found");
+         return ResponseEntity.notFound().build();
       }
 
       Project project = projectOptional.get();
 
       if (project.isDefault()) {
          return new ResponseEntity<>("Project cannot be deleted as it is the default", HttpStatus.BAD_REQUEST);
-      } else {
-         controller.deleteProject(project);
-         projectRepository.delete(project);
-         return new ResponseEntity<>("Project successfully deleted", HttpStatus.OK);
       }
+
+      controller.deleteProject(project);
+      projectRepository.delete(project);
+      return new ResponseEntity<>("Project successfully deleted", HttpStatus.OK);
    }
 
    @GetMapping("/current")
@@ -209,7 +200,7 @@ public ResponseEntity<ProjectColorDTO> changeProject(@Valid @RequestBody Project
    }
 
    @ResponseStatus(value = HttpStatus.NOT_FOUND)
-   public class ResourceNotFoundException extends RuntimeException {
+   public static class ResourceNotFoundException extends RuntimeException {
       public ResourceNotFoundException(String message) {
          super(message);
       }

src/main/java/de/doubleslash/keeptime/REST_API/controller/WorksController.java

@@ -18,7 +18,6 @@
 
 import de.doubleslash.keeptime.REST_API.DTO.WorkDTO;
 import de.doubleslash.keeptime.REST_API.mapper.WorkMapper;
-import de.doubleslash.keeptime.controller.Controller;
 import de.doubleslash.keeptime.model.Model;
 import de.doubleslash.keeptime.model.Work;
 import de.doubleslash.keeptime.model.repos.WorkRepository;
@@ -32,7 +31,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.server.ResponseStatusException;
 
 import java.util.List;
 import java.util.Optional;
@@ -70,33 +68,33 @@ public ResponseEntity<WorkDTO> editWork(@PathVariable("id") Long workId, @Reques
       Work newValuedWork = workMapper.workDTOToWork(newValuedWorkDTO);
       Optional<Work> optionalWork = workRepository.findById(workId);
 
-      if (optionalWork.isPresent()) {
-         Work workToBeEdited = optionalWork.get();
+      if (optionalWork.isEmpty()) {
+         return ResponseEntity.notFound().build();
+      }
 
-         workToBeEdited.setStartTime(newValuedWork.getStartTime());
-         workToBeEdited.setEndTime(newValuedWork.getEndTime());
-         workToBeEdited.setNotes(newValuedWork.getNotes());
-         workToBeEdited.setProject(newValuedWork.getProject());
+      Work workToBeEdited = optionalWork.get();
 
-         Work editedWork = workRepository.save(workToBeEdited);
+      workToBeEdited.setStartTime(newValuedWork.getStartTime());
+      workToBeEdited.setEndTime(newValuedWork.getEndTime());
+      workToBeEdited.setNotes(newValuedWork.getNotes());
+      workToBeEdited.setProject(newValuedWork.getProject());
 
-         return ResponseEntity.ok(workMapper.workToWorkDTO(editedWork));
-      } else {
-         return ResponseEntity.notFound().build();
-      }
+      Work editedWork = workRepository.save(workToBeEdited);
+
+      return ResponseEntity.ok(workMapper.workToWorkDTO(editedWork));
    }
 
    @DeleteMapping("/{id}")
    public ResponseEntity<String> deleteWork(@PathVariable final long id) {
       Optional<Work> optionalWork = workRepository.findById(id);
 
-      if (optionalWork.isPresent()) {
-         Work workToBeDeleted = optionalWork.get();
-         workRepository.delete(workToBeDeleted);
-         return new ResponseEntity<>("Work successfully deleted", HttpStatus.OK);
-      } else {
-         throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Work with the ID " + id + " not found");
+      if (optionalWork.isEmpty()) {
+         return ResponseEntity.notFound().build();
       }
+
+      Work workToBeDeleted = optionalWork.get();
+      workRepository.delete(workToBeDeleted);
+      return new ResponseEntity<>("Work successfully deleted", HttpStatus.OK);
    }
 
    @GetMapping("/current")

src/main/java/de/doubleslash/keeptime/controller/Controller.java

@@ -22,6 +22,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javafx.application.Platform;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -83,10 +84,10 @@ public void changeProject(final Project newProject, final long minusSeconds) {
       // Start new work
       final Work newWork = new Work(workEnd, workEnd.plusSeconds(minusSeconds), newProject, "");
 
-      model.getPastWorkItems().add(newWork);
-
-      model.activeWorkItem.set(newWork);
-
+      runInFXThread(() -> {
+         model.getPastWorkItems().add(newWork);
+         model.activeWorkItem.set(newWork);
+      });
    }
 
    public Work saveCurrentWork(final LocalDateTime workEnd) {
@@ -106,13 +107,14 @@ public Work saveCurrentWork(final LocalDateTime workEnd) {
 
       // Save in db
       return model.getWorkRepository().save(currentWork);
-
    }
 
    public void addNewProject(final Project project) {
       LOG.info("Creating new project '{}'.", project);
-      model.getAllProjects().add(project);
-      model.getAvailableProjects().add(project);
+      runInFXThread(() -> {
+         model.getAllProjects().add(project);
+         model.getAvailableProjects().add(project);
+      });
 
       final List<Project> changedProjects = resortProjectIndexes(model.getAvailableProjects(), project,
             model.getAvailableProjects().size(), project.getIndex());
@@ -355,4 +357,16 @@ public long calcSeconds(final List<Work> workItems) {
 
       return seconds;
    }
+
+   /**
+    * Helper to make sure change is run in FX Thread. Needed when triggered via REST-API
+    * @param runnable
+    */
+   private void runInFXThread(Runnable runnable){
+      if(Platform.isFxApplicationThread()){
+         runnable.run();
+      }else{
+         Platform.runLater(runnable);
+      }
+   }
 }