Merge branch 'jhipster-generated'

src/main/java/org/hostsharing/hsadminng/domain/Membership.java

@@ -30,15 +30,23 @@ public class Membership implements Serializable {
     private Long id;
 
     @NotNull
-    @Column(name = "since_date", nullable = false)
-    private LocalDate sinceDate;
+    @Column(name = "document_date", nullable = false)
+    private LocalDate documentDate;
 
-    @Column(name = "until_date")
-    private LocalDate untilDate;
+    @NotNull
+    @Column(name = "member_from", nullable = false)
+    private LocalDate memberFrom;
 
-    @OneToMany(mappedBy = "member")
+    @Column(name = "member_until")
+    private LocalDate memberUntil;
+
+    @Size(max = 160)
+    @Column(name = "remark", length = 160)
+    private String remark;
+
+    @OneToMany(mappedBy = "membership")
     private Set<Share> shares = new HashSet<>();
-    @OneToMany(mappedBy = "member")
+    @OneToMany(mappedBy = "membership")
     private Set<Asset> assets = new HashSet<>();
     @ManyToOne(optional = false)
     @NotNull
@@ -54,30 +62,56 @@ public class Membership implements Serializable {
         this.id = id;
     }
 
-    public LocalDate getSinceDate() {
-        return sinceDate;
+    public LocalDate getDocumentDate() {
+        return documentDate;
     }
 
-    public Membership sinceDate(LocalDate sinceDate) {
-        this.sinceDate = sinceDate;
+    public Membership documentDate(LocalDate documentDate) {
+        this.documentDate = documentDate;
         return this;
     }
 
-    public void setSinceDate(LocalDate sinceDate) {
-        this.sinceDate = sinceDate;
+    public void setDocumentDate(LocalDate documentDate) {
+        this.documentDate = documentDate;
     }
 
-    public LocalDate getUntilDate() {
-        return untilDate;
+    public LocalDate getMemberFrom() {
+        return memberFrom;
     }
 
-    public Membership untilDate(LocalDate untilDate) {
-        this.untilDate = untilDate;
+    public Membership memberFrom(LocalDate memberFrom) {
+        this.memberFrom = memberFrom;
         return this;
     }
 
-    public void setUntilDate(LocalDate untilDate) {
-        this.untilDate = untilDate;
+    public void setMemberFrom(LocalDate memberFrom) {
+        this.memberFrom = memberFrom;
+    }
+
+    public LocalDate getMemberUntil() {
+        return memberUntil;
+    }
+
+    public Membership memberUntil(LocalDate memberUntil) {
+        this.memberUntil = memberUntil;
+        return this;
+    }
+
+    public void setMemberUntil(LocalDate memberUntil) {
+        this.memberUntil = memberUntil;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public Membership remark(String remark) {
+        this.remark = remark;
+        return this;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
     }
 
     public Set<Share> getShares() {
@@ -168,8 +202,10 @@ public class Membership implements Serializable {
     public String toString() {
         return "Membership{" +
             "id=" + getId() +
-            ", sinceDate='" + getSinceDate() + "'" +
-            ", untilDate='" + getUntilDate() + "'" +
+            ", documentDate='" + getDocumentDate() + "'" +
+            ", memberFrom='" + getMemberFrom() + "'" +
+            ", memberUntil='" + getMemberUntil() + "'" +
+            ", remark='" + getRemark() + "'" +
             "}";
     }
 }

src/main/java/org/hostsharing/hsadminng/repository/MembershipRepository.java

@@ -16,6 +16,6 @@ import org.springframework.stereotype.Repository;
 public interface MembershipRepository extends JpaRepository<Membership, Long>, JpaSpecificationExecutor<Membership> {
 
     @Query("SELECT CASE WHEN COUNT(m)> 0 THEN TRUE ELSE FALSE END " +
-        " FROM Membership m WHERE m.customer.id=:customerId AND m.to IS NULL")
+        " FROM Membership m WHERE m.customer.id=:customerId AND m.memberUntil IS NULL")
     boolean hasUncancelledMembershipForCustomer(@Param("customerId") final long customerId);
 }

src/main/java/org/hostsharing/hsadminng/service/MembershipValidator.java

@@ -14,7 +14,7 @@ public class MembershipValidator {
     private MembershipRepository membershipRepository;
 
     public void validate(final MembershipDTO membershipDTO) {
-        if (membershipDTO.getTo() != null && !membershipDTO.getTo().isAfter(membershipDTO.getFrom())) {
+        if (membershipDTO.getMemberUntil() != null && !membershipDTO.getMemberUntil().isAfter(membershipDTO.getMemberFrom())) {
             throw new BadRequestAlertException("Invalid untilDate", Membership.ENTITY_NAME, "untilDateMustBeAfterSinceDate");
         }
 

src/main/java/org/hostsharing/hsadminng/service/dto/MembershipDTO.java

@@ -3,6 +3,7 @@ import java.time.LocalDate;
 import javax.validation.constraints.*;
 import java.io.Serializable;
 import java.util.Objects;
+import java.util.function.Consumer;
 
 /**
  * A DTO for the Membership entity.