hostsharing/hs.hsadmin.ng
1
0
Fork 0
Code Activity

Fixed tests after merge.

Browse Source
This commit is contained in:
Michael Hierweck
2019-04-24 17:22:56 +02:00
parent 5ac1277e7e
commit 7c7d79c870
10 changed files with 131 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/hostsharing/hsadminng/repository/MembershipRepository.java
View File

@@ -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.memberUntil IS NULL")
" FROM Membership m WHERE m.customer.id=:customerId AND m.memberUntilDate IS NULL")
boolean hasUncancelledMembershipForCustomer(@Param("customerId") final long customerId);
}

2
src/main/java/org/hostsharing/hsadminng/service/MembershipValidator.java
View File

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

7
src/main/java/org/hostsharing/hsadminng/service/dto/MembershipDTO.java
View File

@@ -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.
@@ -29,6 +30,12 @@ public class MembershipDTO implements Serializable {
private String customerPrefix;
public MembershipDTO with(
Consumer<MembershipDTO> builderFunction) {
builderFunction.accept(this);
return this;
}
public Long getId() {
return id;
}