commit modif

address-microservice/src/main/java/fr/natan/addressmicroservice/entity/Address.java

@@ -11,7 +11,6 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 
 @Entity
-@Data @AllArgsConstructor @NoArgsConstructor @ToString
 public class Address {
 
     @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -21,5 +20,65 @@ public class Address {
     private String pb;
     private String city;
     private String residenceCountry;
-    private String birthCountry;
+
+    public Address() {
+    }
+
+    public Address(Long addressID, String numHouse, String streetName,
+                   String pb, String city, String residenceCountry) {
+        this.addressID = addressID;
+        this.numHouse = numHouse;
+        this.streetName = streetName;
+        this.pb = pb;
+        this.city = city;
+        this.residenceCountry = residenceCountry;
+    }
+
+    public Long getAddressID() {
+        return addressID;
+    }
+
+    public void setAddressID(Long addressID) {
+        this.addressID = addressID;
+    }
+
+    public String getNumHouse() {
+        return numHouse;
+    }
+
+    public void setNumHouse(String numHouse) {
+        this.numHouse = numHouse;
+    }
+
+    public String getStreetName() {
+        return streetName;
+    }
+
+    public void setStreetName(String streetName) {
+        this.streetName = streetName;
+    }
+
+    public String getPb() {
+        return pb;
+    }
+
+    public void setPb(String pb) {
+        this.pb = pb;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getResidenceCountry() {
+        return residenceCountry;
+    }
+
+    public void setResidenceCountry(String residenceCountry) {
+        this.residenceCountry = residenceCountry;
+    }
 }

address-microservice/src/main/java/fr/natan/addressmicroservice/service/service/AddressService.java

@@ -25,7 +25,6 @@ public class AddressService  implements AddressContract {
         address.setPb(address.getPb().strip());
         address.setCity(address.getCity().strip());
         address.setResidenceCountry(address.getResidenceCountry().strip());
-        address.setBirthCountry(address.getBirthCountry().strip());
         return address;
     }
 
@@ -36,7 +35,6 @@ public class AddressService  implements AddressContract {
                 || address.getPb().isEmpty()
                 || address.getCity().isEmpty()
                 || address.getResidenceCountry().isEmpty()
-                || address.getBirthCountry().isEmpty()
         ){
             isInvalid=true;
         }

employee-microservice/src/main/java/fr/natan/employeemicroservice/entity/Employee.java

@@ -16,24 +16,29 @@ public class Employee {
     private String lastname;
     private String email;
     private String createdDate;
+    private String birthCountry;
     private Long addressID;
     @Transient
     private Address address;
 
-    public Employee(Long employeeID, String firstname, String lastname, String email, String createdDate,
-                    Long addressID, Address address) {
+    public Employee() {
+    }
+
+    public Employee(Long employeeID,
+                    String firstname, String lastname,
+                    String email, String createdDate,
+                    String birthCountry, Long addressID,
+                    Address address) {
         this.employeeID = employeeID;
         this.firstname = firstname;
         this.lastname = lastname;
         this.email = email;
         this.createdDate = createdDate;
+        this.birthCountry = birthCountry;
         this.addressID = addressID;
         this.address = address;
     }
 
-    public Employee() {
-    }
-
     public Long getEmployeeID() {
         return employeeID;
     }
@@ -74,6 +79,14 @@ public class Employee {
         this.createdDate = createdDate;
     }
 
+    public String getBirthCountry() {
+        return birthCountry;
+    }
+
+    public void setBirthCountry(String birthCountry) {
+        this.birthCountry = birthCountry;
+    }
+
     public Long getAddressID() {
         return addressID;
     }

employee-microservice/src/main/java/fr/natan/employeemicroservice/service/services/EmployeeService.java

@@ -29,6 +29,7 @@ public class EmployeeService implements EmployeeContract {
     private Employee normalizeEmployee(Employee employee){
         employee.setFirstname(employee.getFirstname().strip());
         employee.setLastname(employee.getLastname().strip());
+        employee.setBirthCountry(employee.getBirthCountry().strip());
         employee.setLastname(employee.getLastname().toUpperCase());
 
         return employee;

employee-microservice/src/main/java/fr/natan/employeemicroservice/t_openFeign/address/Address.java

@@ -10,5 +10,4 @@ public class Address {
     private int pb;
     private String city;
     private String residenceCountry;
-    private String birthCountry;
 }