Merge pull request #84 from nimble-platform/staging

Pull Request for Release MVP 17.0.4 / FMP 11.0.4
nimble-platform · Nov 11, 2020 · df22329 · df22329
2 parents d545343 + 7677d81
commit df22329
Show file tree

Hide file tree

Showing 13 changed files with 1,781 additions and 1,299 deletions.
diff --git a/...rc/main/java/eu/nimble/core/infrastructure/identity/config/message/NimbleMessageCode.java b/...rc/main/java/eu/nimble/core/infrastructure/identity/config/message/NimbleMessageCode.java
@@ -6,7 +6,22 @@ public enum NimbleMessageCode {
     MAIL_SUBJECT_INVITATION_EXISTING_COMPANY("MAIL_SUBJECT.invitation_existing_company"),
     MAIL_SUBJECT_COMPANY_REGISTERED("MAIL_SUBJECT.company_registered"),
     MAIL_SUBJECT_COMPANY_VERIFIED("MAIL_SUBJECT.company_verified"),
-    MAIL_SUBJECT_COMPANY_DELETED("MAIL_SUBJECT.company_deleted")
+    MAIL_SUBJECT_COMPANY_DELETED("MAIL_SUBJECT.company_deleted"),
+    MAIL_SUBJECT_COMPANY_DATA_UPDATED("MAIL_SUBJECT.company_data_updated"),
+    COMPANY_NAME("COMPANY_NAME"),
+    BRAND_NAME("BRAND_NAME"),
+    VAT_NUMBER("VAT_NUMBER"),
+    VERIFICATION_INFO("VERIFICATION_INFO"),
+    BUSINESS_TYPE("BUSINESS_TYPE"),
+    ACTIVITY_SECTORS("ACTIVITY_SECTORS"),
+    BUSINESS_KEYWORDS("BUSINESS_KEYWORDS"),
+    YEAR_FOUNDATION("YEAR_FOUNDATION"),
+    STREET("STREET"),
+    BUILDING_NUMBER("BUILDING_NUMBER"),
+    CITY_TOWN("CITY_TOWN"),
+    STATE_PROVINCE("STATE_PROVINCE"),
+    POSTAL_CODE("POSTAL_CODE"),
+    COUNTRY("COUNTRY"),
     ;
 
     private String value;

diff --git a/...ce/src/main/java/eu/nimble/core/infrastructure/identity/entity/CompanyDetailsUpdates.java b/...ce/src/main/java/eu/nimble/core/infrastructure/identity/entity/CompanyDetailsUpdates.java
@@ -0,0 +1,112 @@
+package eu.nimble.core.infrastructure.identity.entity;
+
+import eu.nimble.core.infrastructure.identity.config.NimbleConfigurationProperties;
+import eu.nimble.core.infrastructure.identity.entity.dto.Address;
+
+import java.util.Map;
+
+/**
+ * Model to store updated fields of company details
+ */
+public class CompanyDetailsUpdates {
+
+    private Map<NimbleConfigurationProperties.LanguageID, String> brandName = null;
+
+    private Map<NimbleConfigurationProperties.LanguageID, String> legalName = null;
+
+    private String vatNumber = null;
+
+    private String verificationInformation = null;
+
+    private Address address = null;
+
+    private String businessType = null;
+
+    private Map<NimbleConfigurationProperties.LanguageID, String> businessKeywords = null;
+
+    private Integer yearOfCompanyRegistration = null;
+
+    private Map<NimbleConfigurationProperties.LanguageID, String> industrySectors = null;
+
+
+    public CompanyDetailsUpdates() {
+    }
+
+    public Map<NimbleConfigurationProperties.LanguageID, String> getBrandName() {
+        return brandName;
+    }
+
+    public void setBrandName(Map<NimbleConfigurationProperties.LanguageID, String> brandName) {
+        this.brandName = brandName;
+    }
+
+    public Map<NimbleConfigurationProperties.LanguageID, String> getLegalName() {
+        return legalName;
+    }
+
+    public void setLegalName(Map<NimbleConfigurationProperties.LanguageID, String> legalName) {
+        this.legalName = legalName;
+    }
+
+    public String getVatNumber() {
+        return vatNumber;
+    }
+
+    public void setVatNumber(String vatNumber) {
+        this.vatNumber = vatNumber;
+    }
+
+    public String getVerificationInformation() {
+        return verificationInformation;
+    }
+
+    public void setVerificationInformation(String verificationInformation) {
+        this.verificationInformation = verificationInformation;
+    }
+
+    public Address getAddress() {
+        return address;
+    }
+
+    public void setAddress(Address address) {
+        this.address = address;
+    }
+
+    public String getBusinessType() {
+        return businessType;
+    }
+
+    public void setBusinessType(String businessType) {
+        this.businessType = businessType;
+    }
+
+    public Map<NimbleConfigurationProperties.LanguageID, String> getBusinessKeywords() {
+        return businessKeywords;
+    }
+
+    public void setBusinessKeywords(Map<NimbleConfigurationProperties.LanguageID, String> businessKeywords) {
+        this.businessKeywords = businessKeywords;
+    }
+
+    public Integer getYearOfCompanyRegistration() {
+        return yearOfCompanyRegistration;
+    }
+
+    public void setYearOfCompanyRegistration(Integer yearOfCompanyRegistration) {
+        this.yearOfCompanyRegistration = yearOfCompanyRegistration;
+    }
+
+    public Map<NimbleConfigurationProperties.LanguageID, String> getIndustrySectors() {
+        return industrySectors;
+    }
+
+    public void setIndustrySectors(Map<NimbleConfigurationProperties.LanguageID, String> industrySectors) {
+        this.industrySectors = industrySectors;
+    }
+
+    public boolean areCompanyDetailsUpdated() {
+        return this.brandName != null || this.address != null || this.businessKeywords != null || this.businessType != null || this.industrySectors != null ||
+                this.legalName != null || this.vatNumber != null || this.verificationInformation != null || this.yearOfCompanyRegistration != null;
+    }
+
+}
diff --git a/...tity-service/src/main/java/eu/nimble/core/infrastructure/identity/entity/dto/Address.java b/...tity-service/src/main/java/eu/nimble/core/infrastructure/identity/entity/dto/Address.java
@@ -1,101 +1,121 @@
-package eu.nimble.core.infrastructure.identity.entity.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * Created by Johannes Innerbichler on 04/07/17.
- */
-public class Address {
-
-    @ApiModelProperty(value = "Name of the street")
-    private String streetName;
-    @ApiModelProperty(value = "Number of the building")
-    private String buildingNumber;
-    @ApiModelProperty(value = "Name of the city")
-    private String cityName;
-    @ApiModelProperty(value = "Postal code of the city")
-    private String postalCode;
-    @ApiModelProperty(value = "Name of the country")
-    private String country;
-    @ApiModelProperty(value = "Name of the district")
-    private String district;
-    @ApiModelProperty(value = "Name of the region")
-    private String region;
-
-    public Address() {
-    }
-
-    public Address(String streetName, String buildingNumber, String cityName, String postalCode, String country) {
-        this.streetName = streetName;
-        this.buildingNumber = buildingNumber;
-        this.cityName = cityName;
-        this.postalCode = postalCode;
-        this.country = country;
-    }
-
-    public Address(String streetName, String buildingNumber, String cityName, String postalCode, String country, String district, String region) {
-        this.streetName = streetName;
-        this.buildingNumber = buildingNumber;
-        this.cityName = cityName;
-        this.postalCode = postalCode;
-        this.country = country;
-        this.district = district;
-        this.region = region;
-    }
-
-    public String getStreetName() {
-        return streetName;
-    }
-
-    public void setStreetName(String streetName) {
-        this.streetName = streetName;
-    }
-
-    public String getBuildingNumber() {
-        return buildingNumber;
-    }
-
-    public void setBuildingNumber(String buildingNumber) {
-        this.buildingNumber = buildingNumber;
-    }
-
-    public String getCityName() {
-        return cityName;
-    }
-
-    public void setCityName(String cityName) {
-        this.cityName = cityName;
-    }
-
-    public String getPostalCode() {
-        return postalCode;
-    }
-
-    public void setPostalCode(String postalCode) {
-        this.postalCode = postalCode;
-    }
-
-    public String getCountry() {
-        return country;
-    }
-
-    public void setCountry(String country) {
-        this.country = country;
-    }
-
-    public String getDistrict() {
-        return district;
-    }
-
-    public void setDistrict(String district) {
-        this.district = district;
-    }
-
-    public String getRegion() {
-        return region;
-    }
-
-    public void setRegion(String region) {
-        this.region = region;
-    }
-}
+package eu.nimble.core.infrastructure.identity.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Objects;
+/**
+ * Created by Johannes Innerbichler on 04/07/17.
+ */
+public class Address {
+
+    @ApiModelProperty(value = "Name of the street")
+    private String streetName;
+    @ApiModelProperty(value = "Number of the building")
+    private String buildingNumber;
+    @ApiModelProperty(value = "Name of the city")
+    private String cityName;
+    @ApiModelProperty(value = "Postal code of the city")
+    private String postalCode;
+    @ApiModelProperty(value = "Name of the country")
+    private String country;
+    @ApiModelProperty(value = "Name of the district")
+    private String district;
+    @ApiModelProperty(value = "Name of the region")
+    private String region;
+
+    public Address() {
+    }
+
+    public Address(String streetName, String buildingNumber, String cityName, String postalCode, String country) {
+        this.streetName = streetName;
+        this.buildingNumber = buildingNumber;
+        this.cityName = cityName;
+        this.postalCode = postalCode;
+        this.country = country;
+    }
+
+    public Address(String streetName, String buildingNumber, String cityName, String postalCode, String country, String district, String region) {
+        this.streetName = streetName;
+        this.buildingNumber = buildingNumber;
+        this.cityName = cityName;
+        this.postalCode = postalCode;
+        this.country = country;
+        this.district = district;
+        this.region = region;
+    }
+
+    public String getStreetName() {
+        return streetName;
+    }
+
+    public void setStreetName(String streetName) {
+        this.streetName = streetName;
+    }
+
+    public String getBuildingNumber() {
+        return buildingNumber;
+    }
+
+    public void setBuildingNumber(String buildingNumber) {
+        this.buildingNumber = buildingNumber;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    public String getPostalCode() {
+        return postalCode;
+    }
+
+    public void setPostalCode(String postalCode) {
+        this.postalCode = postalCode;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getDistrict() {
+        return district;
+    }
+
+    public void setDistrict(String district) {
+        this.district = district;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Address address = (Address) o;
+        return Objects.equals(streetName, address.streetName) &&
+                Objects.equals(buildingNumber, address.buildingNumber) &&
+                Objects.equals(cityName, address.cityName) &&
+                Objects.equals(postalCode, address.postalCode) &&
+                Objects.equals(country, address.country) &&
+                Objects.equals(district, address.district) &&
+                Objects.equals(region, address.region);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(streetName, buildingNumber, cityName, postalCode, country, district, region);
+    }
+}