add: add new routes for contract and contract-modifications

src/main/java/dev/urner/volodb/converter/AddressStatusConverter.java

@@ -1,7 +1,7 @@
 package dev.urner.volodb.converter;
 
-import dev.urner.volodb.entity.AddressStatusNotFoundException;
 import dev.urner.volodb.entity.Enums.AddressStatus;
+import dev.urner.volodb.exception.AddressStatusNotFoundException;
 import jakarta.persistence.AttributeConverter;
 
 public class AddressStatusConverter implements AttributeConverter<AddressStatus, Integer> {

src/main/java/dev/urner/volodb/dao/ContractModificationDAO.java

@@ -0,0 +1,19 @@
+package dev.urner.volodb.dao;
+
+import java.util.List;
+
+import org.springframework.data.repository.ListCrudRepository;
+import org.springframework.stereotype.Repository;
+
+import dev.urner.volodb.entity.ContractModification;
+
+@Repository
+public interface ContractModificationDAO extends ListCrudRepository<ContractModification, Integer> {
+
+  List<ContractModification> findAll();
+
+  ContractModification findById(int id);
+
+  List<ContractModification> findAllByContractId(int contractId);
+
+}

src/main/java/dev/urner/volodb/dao/ContractSalaryDAO.java

@@ -0,0 +1,17 @@
+package dev.urner.volodb.dao;
+
+import java.util.List;
+
+import org.springframework.data.repository.ListCrudRepository;
+import org.springframework.stereotype.Repository;
+
+import dev.urner.volodb.entity.Salary;
+
+@Repository
+public interface ContractSalaryDAO extends ListCrudRepository<Salary, Integer> {
+
+  List<Salary> findAll();
+
+  Salary findById(int id);
+
+}

src/main/java/dev/urner/volodb/entity/ContractModification.java

@@ -0,0 +1,59 @@
+package dev.urner.volodb.entity;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Map;
+
+import dev.urner.volodb.converter.HashMapConverter;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Table(name = "ContractModification")
+@Getter
+@Setter
+@RequiredArgsConstructor
+public class ContractModification {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "id")
+  private int id;
+
+  @Column(name = "timestamp")
+  private LocalDateTime timestamp;
+
+  // status (ContractModificationStatus) -> FK
+  @ManyToOne
+  @JoinColumn(name = "status")
+  private ContractModificationStatus status;
+
+  // contract -> FK
+  @Column(name = "contract")
+  private int contractId;
+
+  // type (contractModificationType) -> FK
+  @ManyToOne
+  @JoinColumn(name = "type")
+  private ContractModificationType type;
+
+  // into_force_from (Date)
+  @Column
+  private LocalDate intoForceFrom;
+
+  // value (JSON)
+  @Column
+  private String value;
+
+}

src/main/java/dev/urner/volodb/entity/ContractModificationStatus.java

@@ -0,0 +1,27 @@
+package dev.urner.volodb.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Table(name = "ContractModificationStatus")
+@Getter
+@Setter
+@RequiredArgsConstructor
+public class ContractModificationStatus {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "id")
+  private int id;
+
+  @Column
+  private String name;
+}

src/main/java/dev/urner/volodb/entity/ContractModificationType.java

@@ -0,0 +1,27 @@
+package dev.urner.volodb.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Table(name = "ContractModificationType")
+@Getter
+@Setter
+@RequiredArgsConstructor
+public class ContractModificationType {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "id")
+  private int id;
+
+  @Column
+  private String name;
+}

src/main/java/dev/urner/volodb/entity/ProjectDeserializer.java

@@ -13,6 +13,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 
+import dev.urner.volodb.exception.ProjectInvalidFormatException;
 import dev.urner.volodb.service.CountryService;
 
 public class ProjectDeserializer extends StdDeserializer {

src/main/java/dev/urner/volodb/entity/VolunteerDeserializer.java

@@ -16,6 +16,7 @@
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 
 import dev.urner.volodb.entity.Enums.OngoingLegalProceedingsState;
+import dev.urner.volodb.exception.VolunteerInvalidFormatException;
 import dev.urner.volodb.service.CountryService;
 import dev.urner.volodb.service.HealthInsuranceService;
 import dev.urner.volodb.service.ReligionService;

src/main/java/dev/urner/volodb/entity/AddressInvalidFormatException.java → src/main/java/dev/urner/volodb/exception/AddressInvalidFormatException.java

@@ -1,4 +1,4 @@
-package dev.urner.volodb.entity;
+package dev.urner.volodb.exception;
 
 public class AddressInvalidFormatException extends RuntimeException {
   public AddressInvalidFormatException(String message) {

src/main/java/dev/urner/volodb/entity/AddressStatusNotFoundException.java → src/main/java/dev/urner/volodb/exception/AddressStatusNotFoundException.java

@@ -1,4 +1,4 @@
-package dev.urner.volodb.entity;
+package dev.urner.volodb.exception;
 
 public class AddressStatusNotFoundException extends RuntimeException {
   public AddressStatusNotFoundException(String message) {

src/main/java/dev/urner/volodb/entity/ContactTypeNotFoundException.java → src/main/java/dev/urner/volodb/exception/ContactTypeNotFoundException.java

@@ -1,4 +1,4 @@
-package dev.urner.volodb.entity;
+package dev.urner.volodb.exception;
 
 public class ContactTypeNotFoundException extends RuntimeException {
   public ContactTypeNotFoundException(String message) {

src/main/java/dev/urner/volodb/exception/ContractModificationNotFoundException.java

@@ -0,0 +1,7 @@
+package dev.urner.volodb.exception;
+
+public class ContractModificationNotFoundException extends RuntimeException {
+  public ContractModificationNotFoundException(String message) {
+    super(message);
+  }
+}

src/main/java/dev/urner/volodb/exception/ContractNotFoundException.java

@@ -0,0 +1,7 @@
+package dev.urner.volodb.exception;
+
+public class ContractNotFoundException extends RuntimeException {
+  public ContractNotFoundException(String message) {
+    super(message);
+  }
+}

src/main/java/dev/urner/volodb/entity/CountryNotFoundException.java → src/main/java/dev/urner/volodb/exception/CountryNotFoundException.java

@@ -1,4 +1,4 @@
-package dev.urner.volodb.entity;
+package dev.urner.volodb.exception;
 
 public class CountryNotFoundException extends RuntimeException {
   public CountryNotFoundException(String message) {

src/main/java/dev/urner/volodb/entity/ProjectInvalidFormatException.java → src/main/java/dev/urner/volodb/exception/ProjectInvalidFormatException.java

@@ -1,4 +1,4 @@
-package dev.urner.volodb.entity;
+package dev.urner.volodb.exception;
 
 public class ProjectInvalidFormatException extends RuntimeException {
   public ProjectInvalidFormatException(String message) {

src/main/java/dev/urner/volodb/entity/ProjectNotFoundException.java → src/main/java/dev/urner/volodb/exception/ProjectNotFoundException.java

@@ -1,4 +1,4 @@
-package dev.urner.volodb.entity;
+package dev.urner.volodb.exception;
 
 public class ProjectNotFoundException extends RuntimeException {
   public ProjectNotFoundException(String message) {

src/main/java/dev/urner/volodb/entity/UserNotFoundException.java → src/main/java/dev/urner/volodb/exception/UserNotFoundException.java

@@ -1,4 +1,4 @@
-package dev.urner.volodb.entity;
+package dev.urner.volodb.exception;
 
 public class UserNotFoundException extends RuntimeException {
   public UserNotFoundException(String message) {

src/main/java/dev/urner/volodb/entity/VolunteerInvalidFormatException.java → src/main/java/dev/urner/volodb/exception/VolunteerInvalidFormatException.java

@@ -1,4 +1,4 @@
-package dev.urner.volodb.entity;
+package dev.urner.volodb.exception;
 
 public class VolunteerInvalidFormatException extends RuntimeException {
   public VolunteerInvalidFormatException(String message) {

src/main/java/dev/urner/volodb/entity/VolunteerNotFoundException.java → src/main/java/dev/urner/volodb/exception/VolunteerNotFoundException.java

@@ -1,4 +1,4 @@
-package dev.urner.volodb.entity;
+package dev.urner.volodb.exception;
 
 public class VolunteerNotFoundException extends RuntimeException {
   public VolunteerNotFoundException(String message) {

src/main/java/dev/urner/volodb/entity/VolunteerNoteInvalidFormatException.java → src/main/java/dev/urner/volodb/exception/VolunteerNoteInvalidFormatException.java

@@ -1,4 +1,4 @@
-package dev.urner.volodb.entity;
+package dev.urner.volodb.exception;
 
 public class VolunteerNoteInvalidFormatException extends RuntimeException {
   public VolunteerNoteInvalidFormatException(String message) {

src/main/java/dev/urner/volodb/entity/VolunteerNoteNotFoundException.java → src/main/java/dev/urner/volodb/exception/VolunteerNoteNotFoundException.java

@@ -1,4 +1,4 @@
-package dev.urner.volodb.entity;
+package dev.urner.volodb.exception;
 
 public class VolunteerNoteNotFoundException extends RuntimeException {
   public VolunteerNoteNotFoundException(String message) {

src/main/java/dev/urner/volodb/rest/AuthRestController.java

@@ -5,7 +5,7 @@
 import com.auth0.jwt.exceptions.TokenExpiredException;
 
 import dev.urner.volodb.entity.User;
-import dev.urner.volodb.entity.UserNotFoundException;
+import dev.urner.volodb.exception.UserNotFoundException;
 import dev.urner.volodb.model.LoginRequest;
 import dev.urner.volodb.model.LoginResponse;
 import dev.urner.volodb.security.JwtIssuer;

src/main/java/dev/urner/volodb/rest/ProjectRestController.java

@@ -5,11 +5,11 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import dev.urner.volodb.entity.CountryNotFoundException;
 import dev.urner.volodb.entity.Project;
-import dev.urner.volodb.entity.ProjectInvalidFormatException;
-import dev.urner.volodb.entity.ProjectNotFoundException;
-import dev.urner.volodb.entity.VolunteerInvalidFormatException;
+import dev.urner.volodb.exception.CountryNotFoundException;
+import dev.urner.volodb.exception.ProjectInvalidFormatException;
+import dev.urner.volodb.exception.ProjectNotFoundException;
+import dev.urner.volodb.exception.VolunteerInvalidFormatException;
 import dev.urner.volodb.service.ProjectService;
 import lombok.RequiredArgsConstructor;
 

src/main/java/dev/urner/volodb/rest/UserRestController.java

@@ -3,7 +3,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import dev.urner.volodb.entity.User;
-import dev.urner.volodb.entity.UserNotFoundException;
+import dev.urner.volodb.exception.UserNotFoundException;
 import dev.urner.volodb.security.UserPrincipal;
 import dev.urner.volodb.service.UserService;
 import lombok.RequiredArgsConstructor;

src/main/java/dev/urner/volodb/rest/VolunteerRestController.java

@@ -12,14 +12,17 @@
 
 import dev.urner.volodb.entity.Address;
 import dev.urner.volodb.entity.Contact;
+import dev.urner.volodb.entity.Contract;
+import dev.urner.volodb.entity.ContractModification;
 import dev.urner.volodb.entity.Volunteer;
 import dev.urner.volodb.entity.VolunteerDocument;
-import dev.urner.volodb.entity.VolunteerInvalidFormatException;
-import dev.urner.volodb.entity.VolunteerNotFoundException;
 import dev.urner.volodb.entity.VolunteerNote;
+import dev.urner.volodb.exception.VolunteerInvalidFormatException;
+import dev.urner.volodb.exception.VolunteerNotFoundException;
 import dev.urner.volodb.security.UserPrincipal;
 import dev.urner.volodb.service.AddressService;
 import dev.urner.volodb.service.ContactService;
+import dev.urner.volodb.service.ContractService;
 import dev.urner.volodb.service.VolunteerDocumentService;
 import dev.urner.volodb.service.VolunteerNoteService;
 import dev.urner.volodb.service.VolunteerService;
@@ -29,8 +32,6 @@
 import java.util.Map;
 import java.util.List;
 import java.time.LocalDateTime;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 
 @RestController
 @RequestMapping("/volunteers")
@@ -42,6 +43,7 @@ public class VolunteerRestController {
   private final VolunteerDocumentService volunteerDocumentService;
   private final ContactService contactService;
   private final AddressService addressService;
+  private final ContractService contractService;
 
   // expose "/volunteers" and return a list of volunteers
   @GetMapping
@@ -323,4 +325,24 @@ public String deleteByAddressId(@PathVariable int volunteerId, @PathVariable int
     return "Address with Id '" + addressId + "' deleted.";
   }
 
+  // **********************************
+  // Contracts
+  // **********************************
+
+  // GET all contacts BY VoloID
+  @GetMapping("/{volunteerId}/contracts")
+  public List<Contract> getAllContractsFromVolo(@PathVariable int volunteerId) {
+    return contractService.findAllByVolunteerId(volunteerId);
+  }
+
+  @GetMapping("/{volunteerId}/contracts/relevant")
+  public Contract getRelevantContractFromVolo(@PathVariable int volunteerId) {
+    return contractService.findRelevantContractByVolunteerId(volunteerId);
+  }
+
+  @GetMapping("/{volunteerId}/contracts/{contractId}/modifications")
+  public List<ContractModification> getAllContractModsFromVolo(@PathVariable int volunteerId,
+      @PathVariable int contractId) {
+    return contractService.findModifications(volunteerId, contractId);
+  }
 }