PMT-32: NEEDS SPLITTING AND CURRENT PR #6

Reviewed-on: #6
Reviewed-by: SZUT-Ole <ole.kueck@hmmh.de>

api/pmt.yml

@@ -14,20 +14,20 @@ components:
       type: http
       scheme: bearer
       bearerFormat: JWT
-  schemas: 
-    HelloOut:
-      description: "A Test Schema"
+  schemas:
+    ProjectInfo:
       type: object
-      properties: 
-        msg:
+      properties:
+        id:
+          type: integer
+          format: int64
+        name:
           type: string
+    GetAllProjectsDTO:
+      type: array
+      items:
+        $ref: "#/components/schemas/ProjectInfo"
   responses:
-    OK:
-      description: "OK"
-      content: 
-        text/plain:
-          schema:
-            type: string
     InternalError:
       description: "Internal Server Error"
       content:
@@ -35,16 +35,16 @@ components:
           schema:
             type: string
 paths:
-  /hello:
+  /project:
     get:
-      operationId: "GetHello"
-      description: "A Simple Hello World Endpoint"
+      operationId: "getAllProjects"
+      description: "Get a List of all Projects"
       responses:
         200:
-          description: "A Hello Response"
+          description: ""
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/HelloOut"
+                $ref: "#/components/schemas/GetAllProjectsDTO"
         500:
           $ref: "#/components/responses/InternalError"

build.gradle.kts

@@ -65,6 +65,7 @@ dependencies {
     testImplementation("org.springframework.security:spring-security-test")
     testImplementation("org.testcontainers:junit-jupiter")
     testImplementation("org.testcontainers:postgresql")
+    testRuntimeOnly("com.h2database:h2")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 
     //OAS
@@ -95,7 +96,6 @@ swaggerSources {
 }
 
 tasks {
-    withType()
     withType<Checkstyle> {
         reports {
             xml.required.set(true)

src/main/java/de/hmmh/pmt/ApiController.java

@@ -2,9 +2,11 @@ package de.hmmh.pmt;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import de.hmmh.pmt.employee.ApiClientFactory;
-import de.hmmh.pmt.employee.dtos.EmployeeResponseDTO;
+import de.hmmh.pmt.db.Project;
+import de.hmmh.pmt.db.ProjectRepository;
 import de.hmmh.pmt.oas.DefaultApi;
-import de.hmmh.pmt.dtos.HelloOut;
+import de.hmmh.pmt.dtos.GetAllProjectsDTO;
+import de.hmmh.pmt.dtos.ProjectInfo;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -18,6 +20,10 @@ import java.util.Optional;
 public class ApiController implements DefaultApi {
     @Autowired
     private ApiClientFactory apiClientFactory;
+    @Autowired
+    private ProjectRepository projectRepository;
+    
+    // apiClientFactory.getEmployeeApi().findAll1()
 
     @Override
     public Optional<ObjectMapper> getObjectMapper() {
@@ -30,15 +36,16 @@ public class ApiController implements DefaultApi {
     }
 
     @Override
-    public ResponseEntity<HelloOut> getHello() {
+    public ResponseEntity<GetAllProjectsDTO> getAllProjects() {
+        GetAllProjectsDTO response = new GetAllProjectsDTO();
 
-        StringBuilder employees = new StringBuilder();
-        for (EmployeeResponseDTO employeeResponseDTO : apiClientFactory.getEmployeeApi().findAll1()) {
-            employees.append(employeeResponseDTO.toString());
+        for (Project project : this.projectRepository.findAll()){
+            ProjectInfo projectInfo = new ProjectInfo();
+            projectInfo.setId(project.getId());
+            projectInfo.setName(project.getName());
+            response.add(projectInfo);
         }
-        
-        HelloOut hello = new HelloOut();
-        hello.setMsg(employees.toString());
-        return ResponseEntity.ok(hello);
+
+        return ResponseEntity.ok(response);
     }
 }

src/main/java/de/hmmh/pmt/auth/AuthConfig.java

@@ -11,7 +11,6 @@ import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.session.RegisterSessionAuthenticationStrategy;
 import org.springframework.security.web.authentication.session.SessionAuthenticationStrategy;
 import org.springframework.security.web.session.HttpSessionEventPublisher;
-import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
 @Configuration
 @EnableWebSecurity

src/main/java/de/hmmh/pmt/db/Project.java

@@ -0,0 +1,47 @@
+package de.hmmh.pmt.db;
+
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+@Setter
+@Entity
+@Table(name = "project")
+public class Project {
+    @Id
+    @GeneratedValue(strategy =  GenerationType.IDENTITY)
+    private Long id;
+
+    @NotBlank
+    @Size(min = 3, max = 64)
+    private String name;
+
+    @NotBlank
+    @Size(min = 10)
+    private String goal;
+
+    @NotNull
+    private Long customerId;
+
+    @NotNull
+    private Long administratorId; // Is an Employee
+
+    @NotNull
+    private LocalDateTime start;
+
+    @NotNull
+    private LocalDateTime plannedEnd;
+
+    private LocalDateTime realEnd; // Cant be named just "end" because it's and SQL Keyword
+}
+

src/main/java/de/hmmh/pmt/db/ProjectRepository.java

@@ -0,0 +1,6 @@
+package de.hmmh.pmt.db;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ProjectRepository extends JpaRepository<Project, Long> {
+}

src/test/java/de/hmmh/pmt/IntegrationTest.java

@@ -1,26 +1,73 @@
 package de.hmmh.pmt;
 
+//import de.hmmh.pmt.db.Project;
+//import de.hmmh.pmt.db.ProjectRepository;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
 
+import java.time.LocalDateTime;
+
 @SpringBootTest
-@AutoConfigureMockMvc
+@AutoConfigureMockMvc(addFilters = false)
 @ActiveProfiles("test")
-@ContextConfiguration(initializers = PostgresContextInitializer.class)
 public abstract class IntegrationTest {
 
-    @Autowired
-    protected MockMvc mockMvc;
+    protected final static String baseUri = "/api/v1";
 
-    //protected Repository repository;
+    @Autowired
+    protected MockMvc mvc;
+    //@Autowired
+    //protected ProjectRepository projectRepository;
 
     @BeforeEach
     void setUp() {
-        //repository.deleteAll();
+        //projectRepository.deleteAll();
+    }
+
+    @AfterEach
+    void cleanUp() {
+        //projectRepository.deleteAll();
+    }
+
+    protected void createTestData() {
+        /*Project testProject1 = new Project(
+                0L,
+                "testName1",
+                "testGoaaaaaaaal!",
+                0L,
+                0L,
+                LocalDateTime.of(2001, 9, 11, 13, 34),
+                LocalDateTime.of(2002, 8, 13, 14, 34),
+                LocalDateTime.of(2003, 7, 12, 23, 34)
+        );
+        Project testProject2 = new Project(
+                0L,
+                "testName2",
+                "testGoaaaaaaaal!",
+                0L,
+                0L,
+                LocalDateTime.of(2009, 9, 11, 13, 34),
+                LocalDateTime.of(2009, 12, 13, 14, 34),
+                LocalDateTime.of(2010, 7, 12, 23, 34)
+        );
+        Project testProject3 = new Project(
+                0L,
+                "testName3",
+                "testGoaaaaaaaal!",
+                0L,
+                0L,
+                LocalDateTime.of(2010, 9, 11, 13, 34),
+                LocalDateTime.of(2012, 8, 13, 14, 34),
+                LocalDateTime.of(2013, 7, 12, 23, 34)
+        );
+        projectRepository.save(testProject1);
+        projectRepository.save(testProject2);
+        projectRepository.save(testProject3);
+        */
     }
 }

src/test/java/de/hmmh/pmt/PostgresContextInitializer.java

@@ -1,28 +0,0 @@
-package de.hmmh.pmt;
-
-import org.springframework.boot.test.util.TestPropertyValues;
-import org.springframework.context.ApplicationContextInitializer;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.testcontainers.containers.PostgreSQLContainer;
-import org.testcontainers.utility.DockerImageName;
-
-public class PostgresContextInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
-
-    private static final PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>(
-            DockerImageName.parse("postgres:16")
-    )
-            .withDatabaseName("test_db")
-            .withUsername("test-db-user")
-            .withPassword("test-db-password")
-            .withReuse(true);
-
-    public void initialize(ConfigurableApplicationContext configurableApplicationContext) {
-        postgres.start();
-
-        TestPropertyValues.of(
-                "spring.datasource.url=" + postgres.getJdbcUrl(),
-                "spring.datasource.username=" + postgres.getUsername(),
-                "spring.datasource.password=" + postgres.getPassword()
-        ).applyTo(configurableApplicationContext.getEnvironment());
-    }
-}

src/test/java/de/hmmh/pmt/project/GetAllTest.java

@@ -0,0 +1,32 @@
+package de.hmmh.pmt.project;
+
+import de.hmmh.pmt.IntegrationTest;
+
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasSize;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+public class GetAllTest extends IntegrationTest {
+    @Test
+    void noProjects() throws Exception {
+        mvc
+                .perform(get(baseUri + "/project"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", empty()));
+    }
+
+    @Test
+    void multipleProjects() throws Exception {
+        createTestData();
+
+        mvc
+            .perform(get(baseUri + "/project"))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", hasSize(3)));
+    }
+
+}

src/test/resources/application-test.properties

@@ -1,3 +1,5 @@
-spring.datasource.url=set_by_test_containers
-spring.datasource.username=set_by_test_containers
-spring.datasource.password=set_by_test_containers
+spring.datasource.url=jdbc:h2:mem:test_db
+spring.datasource.username=test
+spring.datasource.password=test
+spring.datasource.driver-class-name=org.h2.Driver
+spring.jpa.hibernate.ddl-auto=create-drop