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

prevent deleting memberhsip via service call

Browse Source
This commit is contained in:
Michael Hoennig
2019-04-11 16:52:50 +02:00
parent 4fdcf77e8e
commit c6bf856b34
7 changed files with 54 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/hostsharing/hsadminng/domain/Membership.java
View File

@ -1,17 +1,15 @@
package org.hostsharing.hsadminng.domain;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import javax.persistence.*;
import javax.validation.constraints.*;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDate;
import java.util.HashSet;
import java.util.Set;
import java.util.Objects;
import java.util.Set;
/**
* A Membership.
@ -21,7 +19,9 @@ import java.util.Objects;
public class Membership implements Serializable {
private static final long serialVersionUID = 1L;
public static final String ENTITY_NAME = "membership";
@Id
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sequenceGenerator")
@SequenceGenerator(name = "sequenceGenerator")

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

@ -4,9 +4,9 @@ import org.hostsharing.hsadminng.domain.Membership;
import org.hostsharing.hsadminng.repository.MembershipRepository;
import org.hostsharing.hsadminng.service.dto.MembershipDTO;
import org.hostsharing.hsadminng.service.mapper.MembershipMapper;
import org.hostsharing.hsadminng.web.rest.errors.BadRequestAlertException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
@ -73,12 +73,12 @@ public class MembershipService {
}
/**
* Delete the membership by id.
* Prevent deleting a membership by id via service call.
*
* @param id the id of the entity
*/
public void delete(Long id) {
log.debug("Request to delete Membership : {}", id);
membershipRepository.deleteById(id);
throw new BadRequestAlertException("Membership cannot be deleted", Membership.ENTITY_NAME, "membershipNotDeletable");
}
}

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

@ -85,7 +85,7 @@ public class ShareService {
}
/**
* Delete the share by id.
* Prevent deleting a share transaction by id via service call
*
* @param id the id of the entity
*/

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

@ -2,6 +2,7 @@
"error": {
"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"
"shareTransactionImmutable": "Transaktionen mit Geschäftsanteilen sind unveränderlich",
"membershipNotDeletable": "Mitgliedschaft kann nicht gelöscht werden, setze stattdessen das 'untilDate'"
}
}

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

@ -2,6 +2,7 @@
"error": {
"shareSubscriptionPositivQuantity": "Share subscriptions require a positive quantity",
"shareCancellationNegativeQuantity": "Share cancellations require a negative quantity",
"shareTransactionImmutable": "Share transactions are immutable"
"shareTransactionImmutable": "Share transactions are immutable",
"membershipNotDeletable": "Membership cannot be deleted, instead set 'untilDate'"
}
}