#165 Pull Request

Author: mairKi

pom.xml

@@ -47,16 +47,6 @@
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>javax.persistence</groupId>
-      <artifactId>javax.persistence-api</artifactId>
-      <version>2.2</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</artifactId>
@@ -174,7 +164,12 @@
       <version>jdk-12.0.1+2</version>
       <scope>test</scope>
     </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>
 
   </dependencies>
   <build>

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

@@ -22,8 +22,6 @@
 
 import static javafx.application.Application.launch;
 
-@SpringBootApplication
-@ComponentScan(basePackages = "de.doubleslash.keeptime")
 public class KeepTime {
     public static void main(final String[] args) {
         launch(App.class, args);

src/main/java/de/doubleslash/keeptime/view/SettingsController.java

@@ -269,7 +269,7 @@ private void initialize() {
             }
          }
       } catch (IOException e) {
-         e.printStackTrace();
+        LOG.warn("There is currently no application.properties available");
       }
 
       LOG.debug("saveButton.setOnAction");

src/test/java/de/doubleslash/keeptime/REST_API/controller/WorkMapperTest.java

@@ -17,6 +17,8 @@
 
 package de.doubleslash.keeptime.REST_API.controller;
 
+import de.doubleslash.keeptime.REST_API.DTO.ColorDTO;
+import de.doubleslash.keeptime.REST_API.DTO.ProjectDTO;
 import de.doubleslash.keeptime.REST_API.DTO.WorkDTO;
 import de.doubleslash.keeptime.REST_API.mapper.WorkMapper;
 import de.doubleslash.keeptime.model.Project;
@@ -55,4 +57,58 @@ void workToWorkDTO() {
 
       assertEquals(0, workDTO.getProject().getId());
    }
+
+//   @Test
+//   void WorkDTOToWork() {
+//      // ARRANGE
+//      LocalDateTime startTime = LocalDateTime.of(2024, 4, 19, 9, 0);
+//      LocalDateTime endTime = LocalDateTime.of(2024, 4, 19, 17, 0);
+//
+//      // Erstellen eines ColorDTO-Objekts für das Projekt
+//      ColorDTO colorDTO = new ColorDTO();
+//      colorDTO.setRed(0.0);
+//      colorDTO.setGreen(0.0);
+//      colorDTO.setBlue(1.0);
+//
+//      // Erstellen eines ProjectDTO
+//      ProjectDTO projectDTO = new ProjectDTO(1);
+//      projectDTO.setId(1);
+//
+//
+//      // Erstellen einer WorkDTO
+//      WorkDTO workDTO = new WorkDTO(1, startTime, endTime, projectDTO, "Did something");
+//
+//      // ACT
+//      // Konvertieren der WorkDTO in ein Work-Objekt
+//      Work work = workMapper.workDTOToWork(workDTO);
+//
+//      // ASSERT
+//      // Überprüfen der notwendigen Felder des erstellten Work-Objekts
+//      assertEquals(1, work.getId());
+//
+//   }
+
+
+   @Test
+   public void testWorkDTOToWork() {
+      // Arrange
+      LocalDateTime startTime = LocalDateTime.of(2024, 4, 22, 9, 0); // Beispielzeit
+      LocalDateTime endTime = LocalDateTime.of(2024, 4, 22, 17, 0); // Beispielzeit
+      ProjectDTO projectDTO = new ProjectDTO(0);
+      String notes = "Test Notizen";
+      WorkDTO workDTO = new WorkDTO(1,startTime, endTime, projectDTO, notes);
+
+      // Act
+      Work work = workMapper.workDTOToWork(workDTO);
+
+      // Assert
+      assertNotNull(work);
+      assertEquals(startTime, work.getStartTime());
+      assertEquals(endTime, work.getEndTime());
+      assertNotNull(work.getProject());
+      assertEquals(projectDTO.getId(), work.getProject().getId());
+      assertEquals(notes, work.getNotes());
+   }
+
+
 }