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

introduced MembershipValidator

Browse Source
This commit is contained in:
Michael Hoennig
2019-04-11 18:06:12 +02:00
parent c6bf856b34
commit d1d6001842
8 changed files with 103 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/hostsharing/hsadminng/service/MembershipService.java
View File

@@ -23,11 +23,16 @@ public class MembershipService {
private final Logger log = LoggerFactory.getLogger(MembershipService.class);
private final MembershipValidator membershipValidator;
private final MembershipRepository membershipRepository;
private final MembershipMapper membershipMapper;
public MembershipService(MembershipRepository membershipRepository, MembershipMapper membershipMapper) {
public MembershipService(final MembershipValidator membershipValidator,
final MembershipRepository membershipRepository,
final MembershipMapper membershipMapper) {
this.membershipValidator = membershipValidator;
this.membershipRepository = membershipRepository;
this.membershipMapper = membershipMapper;
}
@@ -40,6 +45,9 @@ public class MembershipService {
*/
public MembershipDTO save(MembershipDTO membershipDTO) {
log.debug("Request to save Membership : {}", membershipDTO);
membershipValidator.validate(membershipDTO);
Membership membership = membershipMapper.toEntity(membershipDTO);
membership = membershipRepository.save(membership);
return membershipMapper.toDto(membership);

15
src/main/java/org/hostsharing/hsadminng/service/MembershipValidator.java Normal file
View File

@@ -0,0 +1,15 @@
package org.hostsharing.hsadminng.service;
import org.hostsharing.hsadminng.domain.Membership;
import org.hostsharing.hsadminng.service.dto.MembershipDTO;
import org.hostsharing.hsadminng.web.rest.errors.BadRequestAlertException;
import org.springframework.stereotype.Service;
@Service
public class MembershipValidator {
public void validate(final MembershipDTO membershipDTO) {
if (membershipDTO.getUntilDate() != null && !membershipDTO.getUntilDate().isAfter(membershipDTO.getSinceDate())) {
throw new BadRequestAlertException("Invalid untilDate", Membership.ENTITY_NAME, "untilDateMustBeAfterSinceDate");
}
}
}

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

@@ -1,8 +1,10 @@
package org.hostsharing.hsadminng.service.dto;
import java.time.LocalDate;
import javax.validation.constraints.*;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDate;
import java.util.Objects;
import java.util.function.Consumer;
/**
* A DTO for the Membership entity.
@@ -16,11 +18,16 @@ public class MembershipDTO implements Serializable {
private LocalDate untilDate;
private Long customerId;
private String customerPrefix;
public MembershipDTO with(
Consumer<MembershipDTO> builderFunction) {
builderFunction.accept(this);
return this;
}
public Long getId() {
return id;
}

3
src/main/webapp/i18n/de/custom-error.json
View File

@@ -3,6 +3,7 @@
"shareSubscriptionPositivQuantity": "Zeichnungen von Geschäftsanteilen erfordern eine positive Stückzahl",
"shareCancellationNegativeQuantity": "Kündigungen von Geschäftsanteilen erfordern eine negative Stückzahl",
"shareTransactionImmutable": "Transaktionen mit Geschäftsanteilen sind unveränderlich",
"membershipNotDeletable": "Mitgliedschaft kann nicht gelöscht werden, setze stattdessen das 'untilDate'"
"membershipNotDeletable": "Mitgliedschaft kann nicht gelöscht werden, setze stattdessen das 'untilDate'",
"untilDateMustBeAfterSinceDate": "Mitgliedshafts-Austrittsdatum muss nach dem Beitrittsdatum liegen"
}
}

3
src/main/webapp/i18n/en/custom-error.json
View File

@@ -3,6 +3,7 @@
"shareSubscriptionPositivQuantity": "Share subscriptions require a positive quantity",
"shareCancellationNegativeQuantity": "Share cancellations require a negative quantity",
"shareTransactionImmutable": "Share transactions are immutable",
"membershipNotDeletable": "Membership cannot be deleted, instead set 'untilDate'"
"membershipNotDeletable": "Membership cannot be deleted, instead set 'untilDate'",
"untilDateMustBeAfterSinceDate": "Membership until date must be after since date"
}
}