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

Shares and Assets.

Browse Source
This commit is contained in:
Michael Hierweck
2019-04-19 13:44:52 +02:00
parent e3792d9570
commit bc1c94a364
17 changed files with 502 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/hostsharing/hsadminng/domain/Asset.java
View File

@@ -21,6 +21,8 @@ import org.hostsharing.hsadminng.domain.enumeration.AssetAction;
public class Asset implements Serializable {
private static final long serialVersionUID = 1L;
public static final String ENTITY_NAME = "asset";
@Id
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sequenceGenerator")

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

@@ -26,10 +26,12 @@ public class AssetService {
private final AssetRepository assetRepository;
private final AssetMapper assetMapper;
private final AssetValidator assetValidator;
public AssetService(AssetRepository assetRepository, AssetMapper assetMapper) {
public AssetService(AssetRepository assetRepository, AssetMapper assetMapper, AssetValidator assetValidator ) {
this.assetRepository = assetRepository;
this.assetMapper = assetMapper;
this.assetValidator = assetValidator;
}
/**
@@ -40,6 +42,9 @@ public class AssetService {
*/
public AssetDTO save(AssetDTO assetDTO) {
log.debug("Request to save Asset : {}", assetDTO);
assetValidator.validate(assetDTO);
Asset asset = assetMapper.toEntity(assetDTO);
asset = assetRepository.save(asset);
return assetMapper.toDto(asset);

43
src/main/java/org/hostsharing/hsadminng/service/AssetValidator.java Normal file
View File

@@ -0,0 +1,43 @@
package org.hostsharing.hsadminng.service;
import org.hostsharing.hsadminng.domain.Asset;
import org.hostsharing.hsadminng.domain.enumeration.AssetAction;
import org.hostsharing.hsadminng.service.dto.AssetDTO;
import org.hostsharing.hsadminng.web.rest.errors.BadRequestAlertException;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
@Service
public class AssetValidator {
public void validate(final AssetDTO assetDTO) {
if (assetDTO.getId() != null) {
throw new BadRequestAlertException("Asset transactions are immutable", Asset.ENTITY_NAME, "assetTransactionImmutable");
}
if (assetDTO.getDocumentDate().isAfter(assetDTO.getValueDate())) {
throw new BadRequestAlertException("Document date may not be after value date", Asset.ENTITY_NAME, "documentDateMayNotBeAfterValueDate");
}
if ((assetDTO.getAction() == AssetAction.PAYMENT) && (assetDTO.getAmount().compareTo(BigDecimal.valueOf(0)) <= 0)) {
throw new BadRequestAlertException("Asset payments require a positive amount", Asset.ENTITY_NAME, "assetPaymentsPositiveAmount");
}
if ((assetDTO.getAction() == AssetAction.ADOPTION) && (assetDTO.getAmount().compareTo(BigDecimal.valueOf(0)) <= 0)) {
throw new BadRequestAlertException("Asset adoptions require a positive amount", Asset.ENTITY_NAME, "assetAdoptionsPositiveAmount");
}
if ((assetDTO.getAction() == AssetAction.PAYBACK) && (assetDTO.getAmount().compareTo(BigDecimal.valueOf(0)) >= 0)) {
throw new BadRequestAlertException("Asset paybacks require a negative amount", Asset.ENTITY_NAME, "assetPaybacksNegativeAmount");
}
if ((assetDTO.getAction() == AssetAction.HANDOVER) && (assetDTO.getAmount().compareTo(BigDecimal.valueOf(0)) >= 0)) {
throw new BadRequestAlertException("Asset handovers require a negative amount", Asset.ENTITY_NAME, "assetHandoversNegativeAmount");
}
if ((assetDTO.getAction() == AssetAction.LOSS) && (assetDTO.getAmount().compareTo(BigDecimal.valueOf(0)) >= 0)) {
throw new BadRequestAlertException("Asset losses require a negative amount", Asset.ENTITY_NAME, "assetLossesNegativeAmount");
}
if ((assetDTO.getAction() == AssetAction.CLEARING) && (assetDTO.getAmount().compareTo(BigDecimal.valueOf(0)) >= 0)) {
throw new BadRequestAlertException("Asset clearings require a negative amount", Asset.ENTITY_NAME, "assetClearingsNegativeAmount");
}
}
}

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

@@ -28,9 +28,12 @@ public class ShareService {
private final ShareMapper shareMapper;
public ShareService(ShareRepository shareRepository, ShareMapper shareMapper) {
private final ShareValidator shareValidator;
public ShareService(ShareRepository shareRepository, ShareMapper shareMapper, ShareValidator shareValidator) {
this.shareRepository = shareRepository;
this.shareMapper = shareMapper;
this.shareValidator = shareValidator;
}
/**
@@ -42,16 +45,8 @@ public class ShareService {
public ShareDTO save(ShareDTO shareDTO) {
log.debug("Request to save Share : {}", shareDTO);
if (shareDTO.getId() != null) {
throw new BadRequestAlertException("Share transactions are immutable", Share.ENTITY_NAME, "shareTransactionImmutable");
}
shareValidator.validate(shareDTO);
if((shareDTO.getAction() == ShareAction.SUBSCRIPTION) && (shareDTO.getQuantity() <= 0)) {
throw new BadRequestAlertException("Share subscriptions require a positive quantity", Share.ENTITY_NAME, "shareSubscriptionPositivQuantity");
}
if((shareDTO.getAction() == ShareAction.CANCELLATION) && (shareDTO.getQuantity() >= 0)) {
throw new BadRequestAlertException("Share cancellations require a negative quantity", Share.ENTITY_NAME, "shareCancellationNegativeQuantity");
}
Share share = shareMapper.toEntity(shareDTO);
share = shareRepository.save(share);
return shareMapper.toDto(share);

30
src/main/java/org/hostsharing/hsadminng/service/ShareValidator.java Normal file
View File

@@ -0,0 +1,30 @@
package org.hostsharing.hsadminng.service;
import org.hostsharing.hsadminng.domain.Share;
import org.hostsharing.hsadminng.domain.enumeration.ShareAction;
import org.hostsharing.hsadminng.service.dto.ShareDTO;
import org.hostsharing.hsadminng.web.rest.errors.BadRequestAlertException;
import org.springframework.stereotype.Service;
@Service
public class ShareValidator {
public void validate(final ShareDTO shareDTO) {
if (shareDTO.getId() != null) {
throw new BadRequestAlertException("Share transactions are immutable", Share.ENTITY_NAME, "shareTransactionImmutable");
}
if (shareDTO.getDocumentDate().isAfter(shareDTO.getValueDate())) {
throw new BadRequestAlertException("Document date may not be after value date", Share.ENTITY_NAME, "documentDateMayNotBeAfterValueDate");
}
if ((shareDTO.getAction() == ShareAction.SUBSCRIPTION) && (shareDTO.getQuantity() <= 0)) {
throw new BadRequestAlertException("Share subscriptions require a positive quantity", Share.ENTITY_NAME, "shareSubscriptionPositiveQuantity");
}
if ((shareDTO.getAction() == ShareAction.CANCELLATION) && (shareDTO.getQuantity() >= 0)) {
throw new BadRequestAlertException("Share cancellations require a negative quantity", Share.ENTITY_NAME, "shareCancellationNegativeQuantity");
}
}
}

28
src/main/webapp/i18n/de/asset.json
View File

@@ -2,25 +2,25 @@
"hsadminNgApp": {
"asset": {
"home": {
"title": "Assets",
"createLabel": "Asset erstellen",
"createOrEditLabel": "Asset erstellen oder bearbeiten"
"title": "Geschäftsguthaben-Transaktionen",
"createLabel": "Geschäftsguthaben-Transaktion erfassen",
"createOrEditLabel": "Geschäftsguthaben-Transaktion erfassen oder bearbeiten"
},
"created": "Asset erstellt mit ID {{ param }}",
"updated": "Asset aktualisiert mit ID {{ param }}",
"deleted": "Asset gelöscht mit ID {{ param }}",
"created": "Geschäftsguthaben-Transaktion erfasst mit ID {{ param }}",
"updated": "Geschäftsguthaben-Transaktion aktualisiert mit ID {{ param }}",
"deleted": "Geschäftsguthaben-Transaktion gelöscht mit ID {{ param }}",
"delete": {
"question": "Soll Asset {{ id }} wirklich dauerhaft gelöscht werden?"
"question": "Soll die Geschäftsguthaben-Transaktion {{ id }} wirklich dauerhaft gelöscht werden?"
},
"detail": {
"title": "Asset"
"title": "Geschäftsguthaben-Transaktion"
},
"documentDate": "Document Date",
"valueDate": "Value Date",
"action": "Action",
"amount": "Amount",
"remark": "Remark",
"membership": "Membership"
"documentDate": "Belegdatum",
"valueDate": "Buchungsdatum",
"action": "Transaktion",
"amount": "Betrag",
"remark": "Bemerkung",
"membership": "zugehörige Mitgliedschaft"
}
}
}

12
src/main/webapp/i18n/de/assetAction.json
View File

@@ -2,12 +2,12 @@
"hsadminNgApp": {
"AssetAction": {
"null": "",
"PAYMENT": "PAYMENT",
"HANDOVER": "HANDOVER",
"ADOPTION": "ADOPTION",
"LOSS": "LOSS",
"CLEARING": "CLEARING",
"PAYBACK": "PAYBACK"
"PAYMENT": "Einzahlung",
"HANDOVER": "Übertragung",
"ADOPTION": "Übernahme",
"LOSS": "Verlust",
"CLEARING": "Verrechnung",
"PAYBACK": "Auszahlung"
}
}
}

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

@@ -1,10 +1,17 @@
{
"error": {
"shareSubscriptionPositivQuantity": "Zeichnungen von Geschäftsanteilen erfordern eine positive Stückzahl",
"shareSubscriptionPositiveQuantity": "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'",
"untilDateMustBeAfterSinceDate": "Mitgliedshafts-Austrittsdatum muss nach dem Beitrittsdatum liegen",
"anotherUncancelledMembershipExists": "Nur eine einzige ungekündigte Mitgliedschaft pro Kunde ist zulässig"
"untilDateMustBeAfterSinceDate": "Mitgliedshaftsaustrittsdatum muss nach dem Beitrittsdatum liegen",
"documentDateMayNotBeAfterValueDate": "Belegdatum darf nicht vor dem Buchungsdatum liegen",
"anotherUncancelledMembershipExists": "Nur eine einzige ungekündigte Mitgliedschaft pro Kunde ist zulässig",
"assetPaymentsPositiveAmount": "Einzahlungen von Geschäftsguthaben erfordern einen positiven Betrag",
"assetAdoptionsPositiveAmount": "Übernahmen von Geschäftsguthaben erfordern einen positiven Betrag",
"assetPaybacksNegativeAmount": "Auszahlungen von Geschäftsguthaben erfordern einen negativen Betrag",
"assetHandoversNegativeAmount": "Übertragungen von Geschäftsguthaben erfordern einen negativen Betrag",
"assetLossesNegativeAmount": "Verluste von Geschäftsguthaben erfordern einen negativen Betrag",
"assetClearingsNegativeAmount": "Verrechnungen von Geschäftsguthaben erfordern einen negativen Betrag"
}
}

28
src/main/webapp/i18n/de/share.json
View File

@@ -2,25 +2,25 @@
"hsadminNgApp": {
"share": {
"home": {
"title": "Shares",
"createLabel": "Share erstellen",
"createOrEditLabel": "Share erstellen oder bearbeiten"
"title": "Geschäftsanteil-Transaktionen",
"createLabel": "Geschäftsanteil-Transaktion erfassen",
"createOrEditLabel": "Geschäftsanteil-Transaktion erfassen oder bearbeiten"
},
"created": "Share erstellt mit ID {{ param }}",
"updated": "Share aktualisiert mit ID {{ param }}",
"deleted": "Share gelöscht mit ID {{ param }}",
"created": "Geschäftsanteil-Transaktion erfasst mit ID {{ param }}",
"updated": "Geschäftsanteil-Transaktion aktualisiert mit ID {{ param }}",
"deleted": "Geschäftsanteil-Transaktion gelöscht mit ID {{ param }}",
"delete": {
"question": "Soll Share {{ id }} wirklich dauerhaft gelöscht werden?"
"question": "Soll die Geschäftsanteil-Transaktion {{ id }} wirklich dauerhaft gelöscht werden?"
},
"detail": {
"title": "Share"
"title": "Geschäftsanteil-Transaktion"
},
"documentDate": "Document Date",
"valueDate": "Value Date",
"action": "Action",
"quantity": "Quantity",
"remark": "Remark",
"membership": "Membership"
"documentDate": "Belegdatum",
"valueDate": "Buchungsdatum",
"action": "Aktion",
"quantity": "Anzahl",
"remark": "Bemerkung",
"membership": "zugehörige Mitgliedschaft"
}
}
}

4
src/main/webapp/i18n/de/shareAction.json
View File

@@ -2,8 +2,8 @@
"hsadminNgApp": {
"ShareAction": {
"null": "",
"SUBSCRIPTION": "SUBSCRIPTION",
"CANCELLATION": "CANCELLATION"
"SUBSCRIPTION": "Zeichnung",
"CANCELLATION": "Kündigung"
}
}
}

22
src/main/webapp/i18n/en/asset.json
View File

@@ -2,25 +2,25 @@
"hsadminNgApp": {
"asset": {
"home": {
"title": "Assets",
"createLabel": "Create a new Asset",
"createOrEditLabel": "Create or edit a Asset"
"title": "Asset Transactions",
"createLabel": "Register a new asset transaction",
"createOrEditLabel": "Register or edit an asset transaction"
},
"created": "A new Asset is created with identifier {{ param }}",
"updated": "A Asset is updated with identifier {{ param }}",
"deleted": "A Asset is deleted with identifier {{ param }}",
"created": "A new asset transaction is registered with identifier {{ param }}",
"updated": "An asset transaction is updated with identifier {{ param }}",
"deleted": "An asset transaction is deleted with identifier {{ param }}",
"delete": {
"question": "Are you sure you want to delete Asset {{ id }}?"
"question": "Are you sure you want to delete asset transaction {{ id }}?"
},
"detail": {
"title": "Asset"
"title": "Asset transaction"
},
"documentDate": "Document Date",
"valueDate": "Value Date",
"documentDate": "Document date",
"valueDate": "Value date",
"action": "Action",
"amount": "Amount",
"remark": "Remark",
"membership": "Membership"
"membership": "Related membership"
}
}
}

12
src/main/webapp/i18n/en/assetAction.json
View File

@@ -2,12 +2,12 @@
"hsadminNgApp": {
"AssetAction": {
"null": "",
"PAYMENT": "PAYMENT",
"HANDOVER": "HANDOVER",
"ADOPTION": "ADOPTION",
"LOSS": "LOSS",
"CLEARING": "CLEARING",
"PAYBACK": "PAYBACK"
"PAYMENT": "Payment",
"HANDOVER": "Handover",
"ADOPTION": "Adoption",
"LOSS": "Loss",
"CLEARING": "Clearing",
"PAYBACK": "Payback"
}
}
}

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

@@ -1,10 +1,17 @@
{
"error": {
"shareSubscriptionPositivQuantity": "Share subscriptions require a positive quantity",
"shareSubscriptionPositiveQuantity": "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'",
"untilDateMustBeAfterSinceDate": "Membership until date must be after since date",
"anotherUncancelledMembershipExists": "Only a single uncancelled membership allowed per customer"
"documentDateMayNotBeAfterValueDate": "Document date may not be after value date",
"anotherUncancelledMembershipExists": "Only a single uncancelled membership allowed per customer",
"assetPaymentsPositiveAmount": "Asset payments require a positive amount",
"assetAdoptionsPositiveAmount": "Asset adoptions require a positive amount",
"assetPaybacksNegativeAmount": "Asset paybacks require a negative amount",
"assetHandoversNegativeAmount": "Asset handovers require a negative amount",
"assetLossesNegativeAmount": "Asset losses require a negative amount",
"assetClearingsNegativeAmount": "Asset clearings require a negative amount"
}
}

22
src/main/webapp/i18n/en/share.json
View File

@@ -2,25 +2,25 @@
"hsadminNgApp": {
"share": {
"home": {
"title": "Shares",
"createLabel": "Create a new Share",
"createOrEditLabel": "Create or edit a Share"
"title": "Share Transactions",
"createLabel": "Register a new share transaction",
"createOrEditLabel": "Register or edit a share transaction"
},
"created": "A new Share is created with identifier {{ param }}",
"updated": "A Share is updated with identifier {{ param }}",
"deleted": "A Share is deleted with identifier {{ param }}",
"created": "A new share transactions is registered with identifier {{ param }}",
"updated": "A share transaction is updated with identifier {{ param }}",
"deleted": "A share transcation is deleted with identifier {{ param }}",
"delete": {
"question": "Are you sure you want to delete Share {{ id }}?"
"question": "Are you sure you want to delete share transaction {{ id }}?"
},
"detail": {
"title": "Share"
"title": "Share transaction"
},
"documentDate": "Document Date",
"valueDate": "Value Date",
"documentDate": "Document date",
"valueDate": "Value date",
"action": "Action",
"quantity": "Quantity",
"remark": "Remark",
"membership": "Membership"
"membership": "Related membership"
}
}
}

4
src/main/webapp/i18n/en/shareAction.json
View File

@@ -2,8 +2,8 @@
"hsadminNgApp": {
"ShareAction": {
"null": "",
"SUBSCRIPTION": "SUBSCRIPTION",
"CANCELLATION": "CANCELLATION"
"SUBSCRIPTION": "Subscription",
"CANCELLATION": "Cancellation"
}
}
}