Done ticket GEPAFINBE-35

src/main/java/net/gepafin/tendermanagement/dao/CompanyDao.java

@@ -21,6 +21,8 @@ import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationExceptio
 import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException;
 import net.gepafin.tendermanagement.web.rest.api.errors.Status;
 
+import static net.gepafin.tendermanagement.util.Utils.setIfUpdated;
+
 @Component
 public class CompanyDao {
 
@@ -97,6 +99,8 @@ public class CompanyDao {
 		entity.setEmail(request.getEmail());
 		entity.setNumberOfEmployees(request.getNumberOfEmployees());
 		entity.setAnnualRevenue(request.getAnnualRevenue());
+		entity.setContactName(request.getContactName());
+		entity.setContactEmail(request.getContactEmail());
 		return entity;
 	}
 
@@ -118,29 +122,33 @@ public class CompanyDao {
 		response.setAnnualRevenue(entity.getAnnualRevenue());
 		response.setCreatedDate(entity.getCreatedDate());
 		response.setUpdatedDate(entity.getUpdatedDate());
+		response.setContactName(entity.getContactName());
+		response.setContactEmail(entity.getContactEmail());
 		return response;
 	}
 
 	public CompanyResponse updateCompany(UserEntity userEntity, Long companyId, CompanyRequest companyRequest) {
 		CompanyEntity companyEntity = validateCompany(companyId);
-		Utils.setIfUpdated(companyEntity::getCompanyName, companyEntity::setCompanyName,
+		setIfUpdated(companyEntity::getCompanyName, companyEntity::setCompanyName,
 				companyRequest.getCompanyName());
-		Utils.setIfUpdated(companyEntity::getVatNumber, companyEntity::setVatNumber, companyRequest.getVatNumber());
+		setIfUpdated(companyEntity::getVatNumber, companyEntity::setVatNumber, companyRequest.getVatNumber());
-		Utils.setIfUpdated(companyEntity::getCodiceFiscale, companyEntity::setCodiceFiscale,
+		setIfUpdated(companyEntity::getCodiceFiscale, companyEntity::setCodiceFiscale,
 				companyRequest.getCodiceFiscale());
-		Utils.setIfUpdated(companyEntity::getAddress, companyEntity::setAddress, companyRequest.getAddress());
+		setIfUpdated(companyEntity::getAddress, companyEntity::setAddress, companyRequest.getAddress());
-		Utils.setIfUpdated(companyEntity::getPhoneNumber, companyEntity::setPhoneNumber,
+		setIfUpdated(companyEntity::getPhoneNumber, companyEntity::setPhoneNumber,
 				companyRequest.getPhoneNumber());
-		Utils.setIfUpdated(companyEntity::getCity, companyEntity::setCity, companyRequest.getCity());
+		setIfUpdated(companyEntity::getCity, companyEntity::setCity, companyRequest.getCity());
-		Utils.setIfUpdated(companyEntity::getProvince, companyEntity::setProvince, companyRequest.getProvince());
+		setIfUpdated(companyEntity::getProvince, companyEntity::setProvince, companyRequest.getProvince());
-		Utils.setIfUpdated(companyEntity::getCap, companyEntity::setCap, companyRequest.getCap());
+		setIfUpdated(companyEntity::getCap, companyEntity::setCap, companyRequest.getCap());
-		Utils.setIfUpdated(companyEntity::getCountry, companyEntity::setCountry, companyRequest.getCountry());
+		setIfUpdated(companyEntity::getCountry, companyEntity::setCountry, companyRequest.getCountry());
-		Utils.setIfUpdated(companyEntity::getPec, companyEntity::setPec, companyRequest.getPec());
+		setIfUpdated(companyEntity::getPec, companyEntity::setPec, companyRequest.getPec());
-		Utils.setIfUpdated(companyEntity::getEmail, companyEntity::setEmail, companyRequest.getEmail());
+		setIfUpdated(companyEntity::getEmail, companyEntity::setEmail, companyRequest.getEmail());
-		Utils.setIfUpdated(companyEntity::getNumberOfEmployees, companyEntity::setNumberOfEmployees,
+		setIfUpdated(companyEntity::getNumberOfEmployees, companyEntity::setNumberOfEmployees,
 				companyRequest.getNumberOfEmployees());
-		Utils.setIfUpdated(companyEntity::getAnnualRevenue, companyEntity::setAnnualRevenue,
+		setIfUpdated(companyEntity::getAnnualRevenue, companyEntity::setAnnualRevenue,
 				companyRequest.getAnnualRevenue());
+		setIfUpdated(companyEntity::getContactName,companyEntity::setContactName,companyRequest.getContactName());
+		setIfUpdated(companyEntity::getContactEmail,companyEntity::setContactEmail,companyRequest.getContactEmail());
 		companyRepository.save(companyEntity);
 		return convertCompanyEntityToCompanyResponse(companyEntity);
 	}

src/main/java/net/gepafin/tendermanagement/dao/UserDao.java

@@ -83,15 +83,12 @@ public class UserDao {
 			beneficiaryEntity.setLastName(userReq.getLastName());
 			beneficiaryEntity.setOrganization(userReq.getOrganization());
 			beneficiaryEntity.setPhoneNumber(userReq.getPhoneNumber());
-            beneficiaryEntity.setGdprRead(userReq.getGdprRead());
-            beneficiaryEntity.setGdprComunicazione(userReq.getGdprComunicazione());
-            beneficiaryEntity.setGdprElaborazione(userReq.getGdprElaborazione());
-            beneficiaryEntity.setGdprMateriale(userReq.getGdprMateriale());
             beneficiaryEntity.setPrivacy(userReq.getPrivacy());
             beneficiaryEntity.setTerms(userReq.getTerms());
             beneficiaryEntity.setOffers(userReq.getOffers());
             beneficiaryEntity.setMarketing(userReq.getMarketing());
             beneficiaryEntity.setThirdParty(userReq.getThirdParty());
+            beneficiaryEntity.setEmailPec(userReq.getEmailPec());
             beneficiaryEntity =beneficiaryRepository.save(beneficiaryEntity);
 		}
 		return beneficiaryEntity;
@@ -159,16 +156,14 @@ public class UserDao {
         setIfUpdated(userEntity::getPhoneNumber, userEntity::setPhoneNumber, userReq.getPhoneNumber());
         setIfUpdated(userEntity::getDateOfBirth, userEntity::setDateOfBirth, userReq.getDateOfBirth());
         setIfUpdated(userEntity.getBeneficiary()::getCodiceFiscale, userEntity.getBeneficiary()::setCodiceFiscale, userReq.getCodiceFiscale());
-        setIfUpdated(userEntity.getBeneficiary()::getGdprComunicazione, userEntity.getBeneficiary()::setGdprComunicazione, userReq.getGdprComunicazione());
+          setIfUpdated(userEntity.getBeneficiary()::getMarketing, userEntity.getBeneficiary()::setMarketing, userReq.getMarketing());
-        setIfUpdated(userEntity.getBeneficiary()::getGdprElaborazione, userEntity.getBeneficiary()::setGdprElaborazione, userReq.getGdprElaborazione());
-        setIfUpdated(userEntity.getBeneficiary()::getGdprMateriale, userEntity.getBeneficiary()::setGdprMateriale, userReq.getGdprMateriale());
-        setIfUpdated(userEntity.getBeneficiary()::getMarketing, userEntity.getBeneficiary()::setMarketing, userReq.getMarketing());
         setIfUpdated(userEntity.getBeneficiary()::getOffers, userEntity.getBeneficiary()::setOffers, userReq.getOffers());
         setIfUpdated(userEntity.getBeneficiary()::getThirdParty, userEntity.getBeneficiary()::setThirdParty, userReq.getThirdParty());
         if (userReq.getRoleId() != null) {
             RoleEntity roleEntity = roleDao.validateRole(userReq.getRoleId());
             setIfUpdated(userEntity::getRoleEntity, userEntity::setRoleEntity, roleEntity);
         }
+        setIfUpdated(userEntity.getBeneficiary()::getEmailPec, userEntity.getBeneficiary()::setEmailPec, userReq.getEmailPec());
         userEntity = userRepository.save(userEntity);
         log.info("User updated with ID: {}", userEntity.getId());
         return convertUserEntityToUserResponse(userEntity);
@@ -234,15 +229,12 @@ public class UserDao {
 			userResponseBean.setCountry(userEntity.getBeneficiary().getCountry());
 			userResponseBean.setCodiceFiscale(userEntity.getBeneficiary().getCodiceFiscale());
 			userResponseBean.setDateOfBirth(userEntity.getBeneficiary().getDateOfBirth());
-            userResponseBean.setGdprRead(userEntity.getBeneficiary().getGdprRead());
-            userResponseBean.setGdprComunicazione(userEntity.getBeneficiary().getGdprComunicazione());
-            userResponseBean.setGdprElaborazione(userEntity.getBeneficiary().getGdprElaborazione());
-            userResponseBean.setGdprMateriale(userEntity.getBeneficiary().getGdprMateriale());
             userResponseBean.setPrivacy(userEntity.getBeneficiary().getPrivacy());
             userResponseBean.setTerms(userEntity.getBeneficiary().getTerms());
             userResponseBean.setOffers(userEntity.getBeneficiary().getOffers());
             userResponseBean.setMarketing(userEntity.getBeneficiary().getMarketing());
             userResponseBean.setThirdParty(userEntity.getBeneficiary().getThirdParty());
+            userResponseBean.setEmailPec(userEntity.getBeneficiary().getEmailPec());
 		}
 		return userResponseBean;
 	}

src/main/java/net/gepafin/tendermanagement/entities/BeneficiaryEntity.java

@@ -50,9 +50,6 @@ public class BeneficiaryEntity extends BaseEntity {
     @Column(name = "TERMS")
     private Boolean terms;
 
-    @Column(name = "GDPR_READ")
-    private Boolean gdprRead;
-
     @Column(name = "MARKETING")
     private Boolean marketing;
 
@@ -62,12 +59,6 @@ public class BeneficiaryEntity extends BaseEntity {
     @Column(name = "THIRD_PARTY")
     private Boolean thirdParty;
 
-    @Column(name = "GDPR_MATERIALE")
+    @Column(name = "EMAIL_PEC")
-    private Boolean gdprMateriale;
+    private String emailPec;
-
-    @Column(name = "GDPR_ELABORAZIONE")
-    private Boolean gdprElaborazione;
-
-    @Column(name = "GDPR_COMUNICAZIONE")
-    private Boolean gdprComunicazione; 
 }

src/main/java/net/gepafin/tendermanagement/entities/CompanyEntity.java

@@ -50,4 +50,10 @@ public class CompanyEntity extends BaseEntity{
     
     @Column(name = "ANNUAL_REVENUE")
     private BigDecimal annualRevenue;
+
+    @Column(name = "CONTACT_NAME")
+    private String contactName;
+
+    @Column(name = "CONTACT_EMAIL")
+    private String contactEmail;
 }

src/main/java/net/gepafin/tendermanagement/model/request/CompanyRequest.java

@@ -20,5 +20,6 @@ public class CompanyRequest {
     private String email;
     private String numberOfEmployees;
     private BigDecimal annualRevenue;
-
+    private String contactName;
+    private String contactEmail;
 }

src/main/java/net/gepafin/tendermanagement/model/request/UpdateUserReq.java

@@ -24,7 +24,6 @@ public class UpdateUserReq  {
     private Boolean marketing;
     private Boolean offers;
     private Boolean thirdParty;
-    private Boolean gdprMateriale;
+
-    private Boolean gdprElaborazione;
+    private String emailPec;
-    private Boolean gdprComunicazione;
 }

src/main/java/net/gepafin/tendermanagement/model/request/UserReq.java

@@ -34,13 +34,9 @@ public class UserReq {
     private Boolean privacy;
     private Boolean terms;
 
-    private Boolean gdprRead;
-
     private Boolean marketing;
     private Boolean offers;
     private Boolean thirdParty;
 
-    private Boolean gdprMateriale;
+    private String emailPec;
-    private Boolean gdprElaborazione;
-    private Boolean gdprComunicazione;
 }

src/main/java/net/gepafin/tendermanagement/model/response/CompanyResponse.java

@@ -21,5 +21,6 @@ public class CompanyResponse extends BaseBean{
     private String email;
     private String numberOfEmployees;
     private BigDecimal annualRevenue;
-    
+    private String contactName;
+    private String contactEmail;
 }

src/main/java/net/gepafin/tendermanagement/model/response/LoginResponse.java

@@ -41,6 +41,18 @@ public class LoginResponse {
     
     private LocalDateTime dateOfBirth;
 
+    private Boolean privacy;
+
+    private Boolean terms;
+
+    private Boolean marketing;
+
+    private Boolean offers;
+
+    private Boolean thirdParty;
+
+    private String emailPec;
+
     private LocalDateTime createdDate;
 
     private LocalDateTime updatedDate;

src/main/java/net/gepafin/tendermanagement/model/response/UserResponseBean.java

@@ -42,13 +42,9 @@ public class UserResponseBean extends BaseBean {
     private Boolean privacy;
     private Boolean terms;
 
-    private Boolean gdprRead;
-
     private Boolean marketing;
     private Boolean offers;
     private Boolean thirdParty;
 
-    private Boolean gdprMateriale;
+    private String emailPec;
-    private Boolean gdprElaborazione;
-    private Boolean gdprComunicazione;
 }

src/main/java/net/gepafin/tendermanagement/service/impl/AuthenticationService.java

@@ -125,6 +125,12 @@ public class AuthenticationService {
 	        loginResponse.setCity(user.getBeneficiary().getCity());
 	        loginResponse.setCodiceFiscale(user.getBeneficiary().getCodiceFiscale());
 	        loginResponse.setDateOfBirth(user.getBeneficiary().getDateOfBirth());
+			loginResponse.setPrivacy(user.getBeneficiary().getPrivacy());
+			loginResponse.setMarketing(user.getBeneficiary().getMarketing());
+			loginResponse.setOffers(user.getBeneficiary().getOffers());
+			loginResponse.setTerms(user.getBeneficiary().getTerms());
+			loginResponse.setThirdParty(user.getBeneficiary().getThirdParty());
+			loginResponse.setEmailPec(user.getBeneficiary().getEmailPec());
 		}
         
         return loginResponse;

src/main/resources/db/changelog/db.changelog-1.0.0.xml

@@ -887,15 +887,15 @@
             <column name="TERMS" type="BOOLEAN">
                 <constraints nullable="false"/>
             </column>
-            <column name="GDPR_READ" type="BOOLEAN">
-                <constraints nullable="false"/>
-            </column>
             <column name="MARKETING" type="BOOLEAN"/>
             <column name="OFFERS" type="BOOLEAN"/>
             <column name="THIRD_PARTY" type="BOOLEAN"/>
-            <column name="GDPR_MATERIALE" type="BOOLEAN"/>
+            <column name="email_pec" type="VARCHAR(255)"/>
-            <column name="GDPR_ELABORAZIONE" type="BOOLEAN"/>
+        </addColumn>
-            <column name="GDPR_COMUNICAZIONE" type="BOOLEAN"/>
+        
+        <addColumn tableName="COMPANY">
+            <column name="contact_name" type="VARCHAR(255)"/>
+            <column name="contact_email" type="VARCHAR(255)"/>
         </addColumn>
     </changeSet>