Merge pull request 'PMT-32: Alle Bestehende Projekte mit ihren Informationen abrufen' (!7) from story/PMT-32-alle-bestehende-projekte-mit into trunk
Reviewed-on: #7 Reviewed-by: SZUT-Rajbir <rajbir2@schule.bremen.de>
This commit is contained in:
commit
b31685b79d
6 changed files with 198 additions and 64 deletions
36
api/pmt.yml
36
api/pmt.yml
|
@ -14,20 +14,22 @@ 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
|
||||
UnAuthorized:
|
||||
description: "Un Authorized"
|
||||
InternalError:
|
||||
description: "Internal Server Error"
|
||||
content:
|
||||
|
@ -35,16 +37,18 @@ 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: "Returns a List of all Projects"
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/HelloOut"
|
||||
$ref: "#/components/schemas/GetAllProjectsDTO"
|
||||
401:
|
||||
$ref: "#/components/responses/UnAuthorized"
|
||||
500:
|
||||
$ref: "#/components/responses/InternalError"
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
47
src/main/java/de/hmmh/pmt/db/Project.java
Normal file
47
src/main/java/de/hmmh/pmt/db/Project.java
Normal file
|
@ -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
|
||||
}
|
||||
|
6
src/main/java/de/hmmh/pmt/db/ProjectRepository.java
Normal file
6
src/main/java/de/hmmh/pmt/db/ProjectRepository.java
Normal file
|
@ -0,0 +1,6 @@
|
|||
package de.hmmh.pmt.db;
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
public interface ProjectRepository extends JpaRepository<Project, Long> {
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
package de.hmmh.pmt;
|
||||
|
||||
//import de.hmmh.pmt.db.Project;
|
||||
//import de.hmmh.pmt.db.ProjectRepository;
|
||||
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;
|
||||
|
@ -11,6 +11,7 @@ import org.springframework.test.context.ActiveProfiles;
|
|||
import org.springframework.test.web.servlet.MockMvc;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@SpringBootTest
|
||||
@AutoConfigureMockMvc(addFilters = false)
|
||||
|
@ -21,53 +22,83 @@ public abstract class IntegrationTest {
|
|||
|
||||
@Autowired
|
||||
protected MockMvc mvc;
|
||||
//@Autowired
|
||||
//protected ProjectRepository projectRepository;
|
||||
@Autowired
|
||||
protected ProjectRepository projectRepository;
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
//projectRepository.deleteAll();
|
||||
projectRepository.deleteAll();
|
||||
}
|
||||
|
||||
@AfterEach
|
||||
void cleanUp() {
|
||||
//projectRepository.deleteAll();
|
||||
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)
|
||||
protected List<Project> createTestProjectData() {
|
||||
Project project1 = new Project(
|
||||
1L,
|
||||
"Build a Dream Space Station",
|
||||
"Launch a self-sustaining space habitat!",
|
||||
42L,
|
||||
101L,
|
||||
LocalDateTime.of(2024, 3, 1, 10, 0),
|
||||
LocalDateTime.of(2028, 6, 30, 18, 0),
|
||||
LocalDateTime.of(2029, 12, 15, 16, 30)
|
||||
);
|
||||
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 project2 = new Project(
|
||||
2L,
|
||||
"Underwater Research Lab",
|
||||
"Discover new marine species!",
|
||||
73L,
|
||||
202L,
|
||||
LocalDateTime.of(2025, 5, 22, 8, 45),
|
||||
LocalDateTime.of(2027, 11, 5, 17, 0),
|
||||
LocalDateTime.of(2027, 10, 20, 14, 0)
|
||||
);
|
||||
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)
|
||||
Project project3 = new Project(
|
||||
3L,
|
||||
"AI-Powered Smart City",
|
||||
"Create the world's most advanced smart city!",
|
||||
89L,
|
||||
303L,
|
||||
LocalDateTime.of(2026, 9, 14, 12, 0),
|
||||
LocalDateTime.of(2030, 4, 1, 9, 30),
|
||||
LocalDateTime.of(2030, 5, 2, 15, 0)
|
||||
);
|
||||
Project project4 = new Project(
|
||||
4L,
|
||||
"Renewable Energy Revolution",
|
||||
"Replace all fossil fuels with renewables!",
|
||||
56L,
|
||||
404L,
|
||||
LocalDateTime.of(2023, 7, 19, 11, 30),
|
||||
LocalDateTime.of(2029, 12, 31, 20, 0),
|
||||
LocalDateTime.of(2029, 10, 5, 18, 45)
|
||||
);
|
||||
Project project5 = new Project(
|
||||
5L,
|
||||
"Virtual Reality Theme Park",
|
||||
"Build a fully immersive VR theme park!",
|
||||
99L,
|
||||
505L,
|
||||
LocalDateTime.of(2024, 2, 28, 9, 15),
|
||||
LocalDateTime.of(2026, 9, 30, 17, 0),
|
||||
LocalDateTime.of(2026, 8, 15, 13, 45)
|
||||
);
|
||||
|
||||
projectRepository.save(project1);
|
||||
projectRepository.save(project2);
|
||||
projectRepository.save(project3);
|
||||
projectRepository.save(project4);
|
||||
projectRepository.save(project5);
|
||||
|
||||
return List.of(
|
||||
project1,
|
||||
project2,
|
||||
project3,
|
||||
project4,
|
||||
project5
|
||||
);
|
||||
projectRepository.save(testProject1);
|
||||
projectRepository.save(testProject2);
|
||||
projectRepository.save(testProject3);
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
|
39
src/test/java/de/hmmh/pmt/project/GetAllTest.java
Normal file
39
src/test/java/de/hmmh/pmt/project/GetAllTest.java
Normal file
|
@ -0,0 +1,39 @@
|
|||
package de.hmmh.pmt.project;
|
||||
|
||||
import de.hmmh.pmt.IntegrationTest;
|
||||
|
||||
import de.hmmh.pmt.db.Project;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
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 {
|
||||
List<Project> allProjects = createTestProjectData();
|
||||
|
||||
mvc
|
||||
.perform(get(baseUri + "/project"))
|
||||
.andExpect(status().isOk())
|
||||
.andExpect(jsonPath("$", hasSize(allProjects.size())))
|
||||
.andExpect(jsonPath("$[*].id").exists())
|
||||
.andExpect(jsonPath("$[*].name").exists())
|
||||
;
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in a new issue