Skip to content

Commit 9b8b29f

Browse files
Miguel7373Miguel7373
committed
feat: Add everything from migrations to controller
1 parent 92bcf57 commit 9b8b29f

11 files changed

Lines changed: 331 additions & 0 deletions

File tree

‎backend/src/main/java/ch/puzzle/pcts/controller/OrganisationUnitController.java‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
package ch.puzzle.pcts.controller;
2+
3+
import ch.puzzle.pcts.dto.organisation_unit.OrganisationUnitDto;
4+
import ch.puzzle.pcts.mapper.OrganisationUnitMapper;
5+
import ch.puzzle.pcts.model.organisation_unit.OrganisationUnit;
6+
import ch.puzzle.pcts.service.business.OrganisationUnitBusinessService;
7+
import io.swagger.v3.oas.annotations.Operation;
8+
import io.swagger.v3.oas.annotations.media.ArraySchema;
9+
import io.swagger.v3.oas.annotations.media.Content;
10+
import io.swagger.v3.oas.annotations.media.Schema;
11+
import io.swagger.v3.oas.annotations.responses.ApiResponse;
12+
import io.swagger.v3.oas.annotations.responses.ApiResponses;
13+
import jakarta.validation.Valid;
14+
import java.util.List;
15+
import org.springframework.beans.factory.annotation.Autowired;
16+
import org.springframework.http.ResponseEntity;
17+
import org.springframework.web.bind.annotation.*;
18+
19+
@RestController
20+
@RequestMapping("/api/v1/organisation_unit")
21+
public class OrganisationUnitController {
22+
private final OrganisationUnitMapper mapper;
23+
private final OrganisationUnitBusinessService service;
24+
25+
@Autowired
26+
public OrganisationUnitController(OrganisationUnitMapper mapper, OrganisationUnitBusinessService service) {
27+
this.mapper = mapper;
28+
this.service = service;
29+
}
30+
31+
@Operation(summary = "List all organisation units")
32+
@ApiResponse(responseCode = "200", description = "A list of organisation units", content = {
33+
@Content(mediaType = "application/json", array = @ArraySchema(schema = @Schema(implementation = OrganisationUnitDto.class))) })
34+
@GetMapping
35+
public ResponseEntity<List<OrganisationUnitDto>> getOrganisationUnit() {
36+
return ResponseEntity.ok(mapper.toDto(service.getAll()));
37+
}
38+
39+
@Operation(summary = "Get an organisation unit by ID")
40+
@ApiResponses(value = { @ApiResponse(responseCode = "200", description = "A single organisation unit", content = {
41+
@Content(mediaType = "application/json", schema = @Schema(implementation = OrganisationUnitDto.class)) }),
42+
@ApiResponse(responseCode = "404", description = "OrganisationUnit not found", content = @Content) })
43+
@GetMapping("{id}")
44+
public ResponseEntity<OrganisationUnitDto> getOrganisationUnitById(@PathVariable long id) {
45+
OrganisationUnit organisationUnit = service.getById(id);
46+
return ResponseEntity.ok(mapper.toDto(organisationUnit));
47+
}
48+
49+
@Operation(summary = "Create a new organisation unit")
50+
@ApiResponse(responseCode = "201", description = "organisation unit created successfully", content = {
51+
@Content(mediaType = "application/json", schema = @Schema(implementation = OrganisationUnitDto.class)) })
52+
@PostMapping
53+
public ResponseEntity<OrganisationUnitDto> createNew(@Valid @RequestBody OrganisationUnitDto dto) {
54+
OrganisationUnit newOrganisationUnit = service.create(mapper.fromDto(dto));
55+
return ResponseEntity.status(201).body(mapper.toDto(newOrganisationUnit));
56+
}
57+
58+
@Operation(summary = "Update an organisation unit")
59+
@ApiResponses(value = {
60+
@ApiResponse(responseCode = "200", description = "Organisation unit updated successfully", content = {
61+
@Content(mediaType = "application/json", schema = @Schema(implementation = OrganisationUnitDto.class)) }),
62+
@ApiResponse(responseCode = "404", description = "Organisation unit not found", content = @Content) })
63+
@PutMapping("{id}")
64+
public ResponseEntity<OrganisationUnitDto> updateOrganisationUnit(@PathVariable Long id,
65+
@RequestBody OrganisationUnitDto dto) {
66+
OrganisationUnit updatedOrganisationUnit = service.update(id, mapper.fromDto(dto));
67+
return ResponseEntity.ok(mapper.toDto(updatedOrganisationUnit));
68+
}
69+
70+
@Operation(summary = "Delete an organisation unit")
71+
@ApiResponses(value = {
72+
@ApiResponse(responseCode = "204", description = "Organisation unit deleted successfully", content = @Content),
73+
@ApiResponse(responseCode = "404", description = "Organisation unit not found", content = @Content) })
74+
@DeleteMapping("{id}")
75+
public ResponseEntity<Void> deleteOrganisationUnit(@PathVariable Long id) {
76+
service.delete(id);
77+
return ResponseEntity.status(204).build();
78+
}
79+
}

‎backend/src/main/java/ch/puzzle/pcts/dto/organisation_unit/OrganisationUnitDto.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package ch.puzzle.pcts.dto.organisation_unit;
2+
3+
public record OrganisationUnitDto(Long id, String name) {
4+
}

‎backend/src/main/java/ch/puzzle/pcts/mapper/OrganisationUnitMapper.java‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package ch.puzzle.pcts.mapper;
2+
3+
import ch.puzzle.pcts.dto.organisation_unit.OrganisationUnitDto;
4+
import ch.puzzle.pcts.model.organisation_unit.OrganisationUnit;
5+
import java.util.List;
6+
import org.springframework.stereotype.Component;
7+
8+
@Component
9+
public class OrganisationUnitMapper {
10+
11+
public List<OrganisationUnitDto> toDto(List<OrganisationUnit> models) {
12+
return models.stream().map(this::toDto).toList();
13+
}
14+
15+
public List<OrganisationUnit> fromDto(List<OrganisationUnitDto> dtos) {
16+
return dtos.stream().map(this::fromDto).toList();
17+
}
18+
19+
public OrganisationUnitDto toDto(OrganisationUnit model) {
20+
return new OrganisationUnitDto(model.getId(), model.getName());
21+
}
22+
23+
public OrganisationUnit fromDto(OrganisationUnitDto dto) {
24+
return new OrganisationUnit(dto.id(), dto.name());
25+
}
26+
}

‎backend/src/main/java/ch/puzzle/pcts/model/error/ErrorKey.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,6 @@ public enum ErrorKey {
88
NOT_FOUND,
99
ROLE_NAME_IS_NULL,
1010
ROLE_NAME_IS_EMPTY,
11+
ORGANIZATION_UNIT_NAME_IS_NULL,
12+
ORGANIZATION_UNIT_NAME_IS_EMPTY,
1113
}

‎backend/src/main/java/ch/puzzle/pcts/model/organisation_unit/OrganisationUnit.java‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
package ch.puzzle.pcts.model.organisation_unit;
2+
3+
import jakarta.persistence.*;
4+
import org.hibernate.annotations.SQLDelete;
5+
import org.hibernate.annotations.SQLRestriction;
6+
7+
@Entity
8+
@SQLDelete(sql = "UPDATE organisation_unit SET deleted_at = CURRENT_TIMESTAMP WHERE id = ?")
9+
@SQLRestriction("deleted_at IS NULL")
10+
public class OrganisationUnit {
11+
@Id
12+
@GeneratedValue(strategy = GenerationType.IDENTITY)
13+
private Long id;
14+
15+
private String name;
16+
17+
public OrganisationUnit(Long id, String name) {
18+
this.id = id;
19+
this.name = name;
20+
}
21+
22+
public OrganisationUnit() {
23+
}
24+
25+
public Long getId() {
26+
return id;
27+
}
28+
29+
public void setId(Long id) {
30+
this.id = id;
31+
}
32+
33+
public String getName() {
34+
return name;
35+
}
36+
37+
public void setName(String name) {
38+
this.name = name;
39+
}
40+
41+
@Override
42+
public String toString() {
43+
return "OrganisationUnit{" + "id=" + id + ", name='" + name + '\'' + '}';
44+
}
45+
}

‎backend/src/main/java/ch/puzzle/pcts/repository/OrganisationUnitRepository.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package ch.puzzle.pcts.repository;
2+
3+
import ch.puzzle.pcts.model.organisation_unit.OrganisationUnit;
4+
import org.springframework.data.jpa.repository.JpaRepository;
5+
6+
public interface OrganisationUnitRepository extends JpaRepository<OrganisationUnit, Long> {
7+
}

‎backend/src/main/java/ch/puzzle/pcts/service/business/OrganisationUnitBusinessService.java‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
package ch.puzzle.pcts.service.business;
2+
3+
import ch.puzzle.pcts.exception.PCTSException;
4+
import ch.puzzle.pcts.model.error.ErrorKey;
5+
import ch.puzzle.pcts.model.organisation_unit.OrganisationUnit;
6+
import ch.puzzle.pcts.service.persistence.OrganisationUnitPersistenceService;
7+
import ch.puzzle.pcts.service.validation.OrganisationUnitValidationService;
8+
import java.util.List;
9+
import org.springframework.http.HttpStatus;
10+
import org.springframework.stereotype.Service;
11+
12+
@Service
13+
public class OrganisationUnitBusinessService {
14+
private final OrganisationUnitValidationService validationService;
15+
private final OrganisationUnitPersistenceService persistenceService;
16+
17+
public OrganisationUnitBusinessService(OrganisationUnitValidationService validationService,
18+
OrganisationUnitPersistenceService persistenceService) {
19+
this.validationService = validationService;
20+
this.persistenceService = persistenceService;
21+
}
22+
23+
public List<OrganisationUnit> getAll() {
24+
return persistenceService.getAll();
25+
}
26+
27+
public OrganisationUnit getById(long id) {
28+
validationService.validateOnGetById(id);
29+
return persistenceService
30+
.getById(id)
31+
.orElseThrow(() -> new PCTSException(HttpStatus.NOT_FOUND,
32+
"Organisation unit with id: " + id + " does not exist.",
33+
ErrorKey.NOT_FOUND));
34+
}
35+
36+
public OrganisationUnit create(OrganisationUnit organisationUnit) {
37+
validationService.validateOnCreate(organisationUnit);
38+
return persistenceService.create(organisationUnit);
39+
}
40+
41+
public OrganisationUnit update(Long id, OrganisationUnit organisationUnit) {
42+
validationService.validateOnUpdate(id, organisationUnit);
43+
return persistenceService.update(id, organisationUnit);
44+
}
45+
46+
public void delete(Long id) {
47+
validationService.validateOnDelete(id);
48+
persistenceService.delete(id);
49+
}
50+
}

‎backend/src/main/java/ch/puzzle/pcts/service/persistence/OrganisationUnitPersistenceService.java‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package ch.puzzle.pcts.service.persistence;
2+
3+
import ch.puzzle.pcts.model.organisation_unit.OrganisationUnit;
4+
import ch.puzzle.pcts.repository.OrganisationUnitRepository;
5+
import java.util.List;
6+
import java.util.Optional;
7+
import org.springframework.beans.factory.annotation.Autowired;
8+
import org.springframework.stereotype.Component;
9+
10+
@Component
11+
public class OrganisationUnitPersistenceService {
12+
private final OrganisationUnitRepository repository;
13+
14+
@Autowired
15+
public OrganisationUnitPersistenceService(OrganisationUnitRepository repository) {
16+
this.repository = repository;
17+
}
18+
19+
public OrganisationUnit create(OrganisationUnit organisationUnit) {
20+
return repository.save(organisationUnit);
21+
}
22+
23+
public Optional<OrganisationUnit> getById(long id) {
24+
return repository.findById(id);
25+
}
26+
27+
public List<OrganisationUnit> getAll() {
28+
return repository.findAll();
29+
}
30+
31+
public OrganisationUnit update(Long id, OrganisationUnit organisationUnit) {
32+
organisationUnit.setId(id);
33+
return repository.save(organisationUnit);
34+
}
35+
36+
public void delete(Long id) {
37+
repository.deleteById(id);
38+
}
39+
}

‎backend/src/main/java/ch/puzzle/pcts/service/validation/OrganisationUnitValidationService.java‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
package ch.puzzle.pcts.service.validation;
2+
3+
import ch.puzzle.pcts.exception.PCTSException;
4+
import ch.puzzle.pcts.model.error.ErrorKey;
5+
import ch.puzzle.pcts.model.organisation_unit.OrganisationUnit;
6+
import ch.puzzle.pcts.service.persistence.OrganisationUnitPersistenceService;
7+
import org.springframework.beans.factory.annotation.Autowired;
8+
import org.springframework.http.HttpStatus;
9+
import org.springframework.stereotype.Component;
10+
11+
@Component
12+
public class OrganisationUnitValidationService {
13+
private final OrganisationUnitPersistenceService persistenceService;
14+
15+
@Autowired
16+
public OrganisationUnitValidationService(OrganisationUnitPersistenceService persistenceService) {
17+
this.persistenceService = persistenceService;
18+
}
19+
20+
public void validateOnGetById(Long id) {
21+
validateIfExists(id);
22+
}
23+
24+
public void validateOnCreate(OrganisationUnit organisationUnit) {
25+
validateIfIdIsNull(organisationUnit.getId());
26+
validateName(organisationUnit.getName());
27+
}
28+
29+
public void validateOnDelete(Long id) {
30+
validateIfExists(id);
31+
}
32+
33+
public void validateOnUpdate(Long id, OrganisationUnit organisationUnit) {
34+
validateIfExists(id);
35+
validateIfIdIsNull(organisationUnit.getId());
36+
validateName(organisationUnit.getName());
37+
}
38+
39+
private void validateIfIdIsNull(Long id) {
40+
if (id != null) {
41+
throw new PCTSException(HttpStatus.BAD_REQUEST, "Id needs to be undefined", ErrorKey.ID_IS_NOT_NULL);
42+
}
43+
}
44+
45+
private void validateName(String name) {
46+
if (name == null) {
47+
throw new PCTSException(HttpStatus.BAD_REQUEST,
48+
"Name must not be null",
49+
ErrorKey.ORGANIZATION_UNIT_NAME_IS_NULL);
50+
}
51+
52+
if (name.isBlank()) {
53+
throw new PCTSException(HttpStatus.BAD_REQUEST,
54+
"Name must not be empty",
55+
ErrorKey.ORGANIZATION_UNIT_NAME_IS_EMPTY);
56+
}
57+
}
58+
59+
private void validateIfExists(long id) {
60+
persistenceService
61+
.getById(id)
62+
.orElseThrow(() -> new PCTSException(HttpStatus.NOT_FOUND,
63+
"Organisation Unit with id: " + id + " does not exist.",
64+
ErrorKey.NOT_FOUND));
65+
}
66+
}

‎backend/src/main/resources/db/dev-data-migration/afterMigrate__0_0_initialData.sql‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,10 @@ VALUES
2020
('Intern', FALSE),
2121
('Extern', FALSE),
2222
('Consultant', FALSE);
23+
24+
INSERT INTO organisation_unit (name)
25+
VALUES
26+
('/zh'),
27+
('/mobility'),
28+
('/bbt'),
29+
('/mid')

0 commit comments

Comments
 (0)