Merge pull request #173 from doubleSlashde/feature/#165_Rest-API-New

Feature/#165 rest api new

Author: Death111

.gitignore

@@ -30,3 +30,4 @@ logs/
 
 config.xml
 /db/
+application.properties

pom.xml

@@ -48,6 +48,17 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>org.mapstruct</groupId>
+      <artifactId>mapstruct</artifactId>
+      <version>1.5.5.Final</version>
+    </dependency>
+    <dependency>
+      <groupId>org.mapstruct</groupId>
+      <artifactId>mapstruct-processor</artifactId>
+      <version>1.5.5.Final</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-controls</artifactId>
@@ -85,6 +96,27 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-data-jpa</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springdoc</groupId>
+      <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+      <version>2.5.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-validation</artifactId>
+    </dependency>
+    <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-security -->
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-security</artifactId>
+      <version>3.1.3</version>
+    </dependency>
+
+
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-runtime</artifactId>
@@ -226,10 +258,24 @@
       <id>coverage</id>
       <build>
         <plugins>
+           <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>3.11.0</version>
+            <configuration>
+              <annotationProcessorPaths>
+                <path>
+                  <groupId>org.mapstruct</groupId>
+                  <artifactId>mapstruct-processor</artifactId>
+                  <version>1.5.5.Final</version>
+                </path>
+              </annotationProcessorPaths>
+            </configuration>
+          </plugin>
           <plugin>
             <groupId>org.jacoco</groupId>
             <artifactId>jacoco-maven-plugin</artifactId>
-            <version>0.8.7</version>
+            <version>0.8.10</version>
             <executions>
               <execution>
                 <id>prepare-agent</id>

src/main/java/de/doubleslash/keeptime/App.java

@@ -305,7 +305,7 @@ private void registerMaximizeEventlistener(final Scene mainScene, final Stage pr
 
    @Override
    public void stop() throws Exception {
-      springContext.stop();
+      springContext.close();
    }
 
 }

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

@@ -34,7 +34,6 @@
 import de.doubleslash.keeptime.model.Settings;
 import de.doubleslash.keeptime.model.Work;
 import jakarta.annotation.PreDestroy;
-import javafx.collections.ObservableList;
 
 @Service
 public class Controller {
@@ -84,9 +83,7 @@ public void changeProject(final Project newProject, final long minusSeconds) {
       final Work newWork = new Work(workEnd, workEnd.plusSeconds(minusSeconds), newProject, "");
 
       model.getPastWorkItems().add(newWork);
-
       model.activeWorkItem.set(newWork);
-
    }
 
    public Work saveCurrentWork(final LocalDateTime workEnd) {
@@ -98,19 +95,19 @@ public Work saveCurrentWork(final LocalDateTime workEnd) {
 
       currentWork.setEndTime(workEnd);
 
-      final String time = DateFormatter
-            .secondsToHHMMSS(Duration.between(currentWork.getStartTime(), currentWork.getEndTime()).getSeconds());
+      final String time = DateFormatter.secondsToHHMMSS(
+            Duration.between(currentWork.getStartTime(), currentWork.getEndTime()).getSeconds());
 
       LOG.info("Saving Work from '{}' to '{}' ({}) on project '{}' with notes '{}'", currentWork.getStartTime(),
             currentWork.getEndTime(), time, currentWork.getProject().getName(), currentWork.getNotes());
 
       // 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);
 
@@ -190,7 +187,7 @@ public void deleteProject(final Project p) {
 
       final int indexToRemove = p.getIndex();
       p.setEnabled(false); // we don't delete it because of the referenced work
-                           // items
+      // items
       p.setIndex(-1);
 
       model.getAvailableProjects().remove(p);
@@ -253,7 +250,7 @@ public void deleteWork(final Work workToBeDeleted) {
 
    /**
     * Changes the indexes of the originalList parameter to have a consistent order.
-    * 
+    *
     * @param originalList
     *           list of all projects to adapt the indexes for
     * @param changedProject
@@ -296,7 +293,7 @@ List<Project> resortProjectIndexes(final List<Project> originalList, final Proje
 
    /**
     * Decreases all indexes by one, after the removed index
-    * 
+    *
     * @param originalList
     *           list of all projects to adapt the indexes for
     * @param removedIndex
@@ -361,5 +358,4 @@ public long calcSeconds(final List<Work> workItems) {
 
       return seconds;
    }
-
 }

src/main/java/de/doubleslash/keeptime/model/Model.java

@@ -25,6 +25,7 @@
 import javafx.collections.ObservableList;
 import javafx.collections.transformation.SortedList;
 import javafx.scene.paint.Color;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.stereotype.Component;
 
@@ -35,7 +36,7 @@ public class Model {
    private ProjectRepository projectRepository;
    private WorkRepository workRepository;
    private SettingsRepository settingsRepository;
-
+   @Autowired
    public Model(final ProjectRepository projectRepository, final WorkRepository workRepository,
          final SettingsRepository settingsRepository) {
       super();

src/main/java/de/doubleslash/keeptime/model/Project.java

@@ -29,7 +29,6 @@ public class Project {
    @GeneratedValue(strategy = GenerationType.IDENTITY)
    @Column(name = "id", updatable = false, nullable = false)
    private long id;
-
    private String name;
 
    @Lob
@@ -39,9 +38,7 @@ public class Project {
    private Color color;
 
    private boolean isWork;
-
    private boolean isDefault;
-
    private boolean isEnabled;
 
    private int index;
@@ -50,9 +47,7 @@ public Project() {
       // Needed for jpa
    }
 
-   public Project(final String name, final String description, final Color color, final boolean isWork, final int index,
-         final boolean isDefault) {
-      super();
+   public Project(String name, String description, Color color, boolean isWork, int index, boolean isDefault) {
       this.name = name;
       this.description = description;
       this.color = color;
@@ -62,48 +57,47 @@ public Project(final String name, final String description, final Color color, f
       this.index = index;
    }
 
-   public Project(final String name, final String description, final Color color, final boolean isWork,
-         final int index) {
+   public Project(String name, String description, Color color, boolean isWork, int index) {
       this(name, description, color, isWork, index, false);
    }
 
    public String getName() {
       return name;
    }
 
-   public void setName(final String name) {
+   public void setName(String name) {
       this.name = name;
    }
 
    public Color getColor() {
       return color;
    }
 
-   public void setColor(final Color color) {
+   public void setColor(Color color) {
       this.color = color;
    }
 
    public boolean isWork() {
       return isWork;
    }
 
-   public void setWork(final boolean isWork) {
+   public void setWork(boolean isWork) {
       this.isWork = isWork;
    }
 
    public boolean isDefault() {
       return isDefault;
    }
 
-   public void setDefault(final boolean isDefault) {
+   public void setDefault(boolean isDefault) {
       this.isDefault = isDefault;
    }
 
    public boolean isEnabled() {
       return isEnabled;
    }
 
-   public void setEnabled(final boolean isEnabled) {
+   public void setEnabled(boolean isEnabled) {
       this.isEnabled = isEnabled;
    }
 
@@ -115,15 +109,15 @@ public int getIndex() {
       return index;
    }
 
-   public void setIndex(final int index) {
+   public void setIndex(int index) {
       this.index = index;
    }
 
    public String getDescription() {
       return description;
    }
 
-   public void setDescription(final String description) {
+   public void setDescription(String description) {
       this.description = description;
    }
 
@@ -132,5 +126,4 @@ public String toString() {
       return "Project [id=" + id + ", name=" + name + ", description=" + description + ", color=" + color + ", isWork="
             + isWork + ", isDefault=" + isDefault + ", isEnabled=" + isEnabled + ", index=" + index + "]";
    }
-
-}
+}

src/main/java/de/doubleslash/keeptime/model/ScreenSettings.java

@@ -1,3 +1,19 @@
+// Copyright 2024 doubleSlash Net Business GmbH
+//
+// This file is part of KeepTime.
+// KeepTime is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 package de.doubleslash.keeptime.model;
 
 import javafx.beans.property.ObjectProperty;

src/main/java/de/doubleslash/keeptime/model/Settings.java

@@ -29,7 +29,7 @@
 
 /**
  * Object holding settings
- * 
+ *
  * @author nmutter
  */
 @Entity
@@ -73,7 +73,8 @@ public class Settings {
 
    private boolean confirmClose;
 
-   public Settings() {}
+   public Settings() {
+   }
 
    public Settings(final Color hoverBackgroundColor, final Color hoverFontColor, final Color defaultBackgroundColor,
          final Color defaultFontColor, final Color taskBarColor, final boolean useHotkey,
@@ -96,7 +97,6 @@ public Settings(final Color hoverBackgroundColor, final Color hoverFontColor, fi
       this.remindIfNotesAreEmpty = remindIfNotesAreEmpty;
       this.remindIfNotesAreEmptyOnlyForWorkEntry = remindIfNotesAreEmptyOnlyForWorkEntry;
       this.confirmClose = confirmClose;
-
    }
 
    public boolean isRemindIfNotesAreEmptyOnlyForWorkEntry() {
@@ -222,5 +222,4 @@ public boolean isRemindIfNotesAreEmpty() {
    public void setRemindIfNotesAreEmpty(final boolean emptyNoteReminder) {
       this.remindIfNotesAreEmpty = emptyNoteReminder;
    }
-
 }

src/main/java/de/doubleslash/keeptime/model/Work.java

@@ -18,7 +18,14 @@
 
 import java.time.LocalDateTime;
 
-import jakarta.persistence.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Lob;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "Work")
@@ -30,14 +37,12 @@ public class Work {
 
    private LocalDateTime startTime;
    private LocalDateTime endTime;
-
    @ManyToOne
    private Project project;
    @Lob
    private String notes;
 
-   public Work() {
-   }
+   public Work() {}
 
    public Work(final LocalDateTime startTime, final LocalDateTime endTime, final Project project, final String notes) {
       super();
@@ -88,5 +93,4 @@ public String toString() {
       return "Work [id=" + id + ", startTime=" + startTime + ", endTime=" + endTime + ", projectName="
             + project.getName() + ", notes=" + notes + "]";
    }
-
 }

src/main/java/de/doubleslash/keeptime/model/persistenceconverter/ColorConverter.java

@@ -20,7 +20,6 @@
 import javafx.scene.paint.Color;
 
 public class ColorConverter implements AttributeConverter<Color, String> {
-
    @Override
    public Color convertToEntityAttribute(final String arg0) {
       try {
@@ -34,5 +33,4 @@ public Color convertToEntityAttribute(final String arg0) {
    public String convertToDatabaseColumn(final Color arg0) {
       return arg0.toString();
    }
-
 }