diff --git a/.jhipster/Asset.json b/.jhipster/Asset.json index 5fb969e8..9c3d4501 100644 --- a/.jhipster/Asset.json +++ b/.jhipster/Asset.json @@ -2,7 +2,14 @@ "name": "Asset", "fields": [ { - "fieldName": "date", + "fieldName": "documentDate", + "fieldType": "LocalDate", + "fieldValidateRules": [ + "required" + ] + }, + { + "fieldName": "valueDate", "fieldType": "LocalDate", "fieldValidateRules": [ "required" @@ -24,7 +31,7 @@ ] }, { - "fieldName": "comment", + "fieldName": "remark", "fieldType": "String", "fieldValidateRules": [ "maxlength" @@ -39,10 +46,10 @@ "otherEntityRelationshipName": "asset", "relationshipValidateRules": "required", "relationshipName": "membership", - "otherEntityField": "from" + "otherEntityField": "documentDate" } ], - "changelogDate": "20190418073046", + "changelogDate": "20190403083740", "entityTableName": "asset", "dto": "mapstruct", "pagination": "infinite-scroll", diff --git a/.jhipster/Customer.json b/.jhipster/Customer.json index 923f2f92..76b1a567 100644 --- a/.jhipster/Customer.json +++ b/.jhipster/Customer.json @@ -2,7 +2,7 @@ "name": "Customer", "fields": [ { - "fieldName": "number", + "fieldName": "reference", "fieldType": "Integer", "fieldValidateRules": [ "required", @@ -18,9 +18,11 @@ "fieldType": "String", "fieldValidateRules": [ "required", + "maxlength", "unique", "pattern" ], + "fieldValidateRulesMaxlength": 3, "fieldValidateRulesPattern": "[a-z][a-z0-9]+" }, { @@ -64,6 +66,14 @@ "maxlength" ], "fieldValidateRulesMaxlength": 400 + }, + { + "fieldName": "remark", + "fieldType": "String", + "fieldValidateRules": [ + "maxlength" + ], + "fieldValidateRulesMaxlength": 160 } ], "relationships": [ @@ -80,7 +90,7 @@ "relationshipName": "sepamandate" } ], - "changelogDate": "20190418073043", + "changelogDate": "20190403083735", "entityTableName": "customer", "dto": "mapstruct", "pagination": "infinite-scroll", diff --git a/.jhipster/Membership.json b/.jhipster/Membership.json index 2497957f..38b6361e 100644 --- a/.jhipster/Membership.json +++ b/.jhipster/Membership.json @@ -2,18 +2,25 @@ "name": "Membership", "fields": [ { - "fieldName": "from", + "fieldName": "documentDate", "fieldType": "LocalDate", "fieldValidateRules": [ "required" ] }, { - "fieldName": "to", + "fieldName": "memberFrom", + "fieldType": "LocalDate", + "fieldValidateRules": [ + "required" + ] + }, + { + "fieldName": "memberUntil", "fieldType": "LocalDate" }, { - "fieldName": "comment", + "fieldName": "remark", "fieldType": "String", "fieldValidateRules": [ "maxlength" @@ -43,7 +50,7 @@ "otherEntityField": "prefix" } ], - "changelogDate": "20190418073044", + "changelogDate": "20190403083738", "entityTableName": "membership", "dto": "mapstruct", "pagination": "infinite-scroll", diff --git a/.jhipster/SepaMandate.json b/.jhipster/SepaMandate.json index 0ffe72d5..403ec21d 100644 --- a/.jhipster/SepaMandate.json +++ b/.jhipster/SepaMandate.json @@ -28,7 +28,7 @@ "fieldValidateRulesMaxlength": 11 }, { - "fieldName": "created", + "fieldName": "documentDate", "fieldType": "LocalDate", "fieldValidateRules": [ "required" @@ -42,7 +42,7 @@ ] }, { - "fieldName": "validTo", + "fieldName": "validUntil", "fieldType": "LocalDate" }, { @@ -50,11 +50,11 @@ "fieldType": "LocalDate" }, { - "fieldName": "cancelled", + "fieldName": "cancellationDate", "fieldType": "LocalDate" }, { - "fieldName": "comment", + "fieldName": "remark", "fieldType": "String", "fieldValidateRules": [ "maxlength" @@ -72,7 +72,7 @@ "otherEntityField": "prefix" } ], - "changelogDate": "20190418073047", + "changelogDate": "20190418100951", "entityTableName": "sepa_mandate", "dto": "mapstruct", "pagination": "infinite-scroll", diff --git a/.jhipster/Share.json b/.jhipster/Share.json index 037cc5d5..918983a7 100644 --- a/.jhipster/Share.json +++ b/.jhipster/Share.json @@ -2,7 +2,14 @@ "name": "Share", "fields": [ { - "fieldName": "date", + "fieldName": "documentDate", + "fieldType": "LocalDate", + "fieldValidateRules": [ + "required" + ] + }, + { + "fieldName": "valueDate", "fieldType": "LocalDate", "fieldValidateRules": [ "required" @@ -24,7 +31,7 @@ ] }, { - "fieldName": "comment", + "fieldName": "remark", "fieldType": "String", "fieldValidateRules": [ "maxlength" @@ -39,10 +46,10 @@ "otherEntityRelationshipName": "share", "relationshipValidateRules": "required", "relationshipName": "membership", - "otherEntityField": "from" + "otherEntityField": "documentDate" } ], - "changelogDate": "20190418073045", + "changelogDate": "20190403083739", "entityTableName": "share", "dto": "mapstruct", "pagination": "infinite-scroll", diff --git a/src/main/java/org/hostsharing/hsadminng/domain/Asset.java b/src/main/java/org/hostsharing/hsadminng/domain/Asset.java index 988b248f..3149e14c 100644 --- a/src/main/java/org/hostsharing/hsadminng/domain/Asset.java +++ b/src/main/java/org/hostsharing/hsadminng/domain/Asset.java @@ -28,8 +28,12 @@ public class Asset implements Serializable { private Long id; @NotNull - @Column(name = "jhi_date", nullable = false) - private LocalDate date; + @Column(name = "document_date", nullable = false) + private LocalDate documentDate; + + @NotNull + @Column(name = "value_date", nullable = false) + private LocalDate valueDate; @NotNull @Enumerated(EnumType.STRING) @@ -41,8 +45,8 @@ public class Asset implements Serializable { private BigDecimal amount; @Size(max = 160) - @Column(name = "jhi_comment", length = 160) - private String comment; + @Column(name = "remark", length = 160) + private String remark; @NotNull @ManyToOne(optional = false) @@ -58,17 +62,30 @@ public class Asset implements Serializable { this.id = id; } - public LocalDate getDate() { - return date; + public LocalDate getDocumentDate() { + return documentDate; } - public Asset date(LocalDate date) { - this.date = date; + public Asset documentDate(LocalDate documentDate) { + this.documentDate = documentDate; return this; } - public void setDate(LocalDate date) { - this.date = date; + public void setDocumentDate(LocalDate documentDate) { + this.documentDate = documentDate; + } + + public LocalDate getValueDate() { + return valueDate; + } + + public Asset valueDate(LocalDate valueDate) { + this.valueDate = valueDate; + return this; + } + + public void setValueDate(LocalDate valueDate) { + this.valueDate = valueDate; } public AssetAction getAction() { @@ -97,17 +114,17 @@ public class Asset implements Serializable { this.amount = amount; } - public String getComment() { - return comment; + public String getRemark() { + return remark; } - public Asset comment(String comment) { - this.comment = comment; + public Asset remark(String remark) { + this.remark = remark; return this; } - public void setComment(String comment) { - this.comment = comment; + public void setRemark(String remark) { + this.remark = remark; } public Membership getMembership() { @@ -148,10 +165,11 @@ public class Asset implements Serializable { public String toString() { return "Asset{" + "id=" + getId() + - ", date='" + getDate() + "'" + + ", documentDate='" + getDocumentDate() + "'" + + ", valueDate='" + getValueDate() + "'" + ", action='" + getAction() + "'" + ", amount=" + getAmount() + - ", comment='" + getComment() + "'" + + ", remark='" + getRemark() + "'" + "}"; } } diff --git a/src/main/java/org/hostsharing/hsadminng/domain/Customer.java b/src/main/java/org/hostsharing/hsadminng/domain/Customer.java index 8a158a02..c7cb1495 100644 --- a/src/main/java/org/hostsharing/hsadminng/domain/Customer.java +++ b/src/main/java/org/hostsharing/hsadminng/domain/Customer.java @@ -28,12 +28,13 @@ public class Customer implements Serializable { @NotNull @Min(value = 10000) @Max(value = 99999) - @Column(name = "jhi_number", nullable = false, unique = true) - private Integer number; + @Column(name = "reference", nullable = false, unique = true) + private Integer reference; @NotNull + @Size(max = 3) @Pattern(regexp = "[a-z][a-z0-9]+") - @Column(name = "prefix", nullable = false, unique = true) + @Column(name = "prefix", length = 3, nullable = false, unique = true) private String prefix; @NotNull @@ -58,12 +59,14 @@ public class Customer implements Serializable { @Column(name = "billing_address", length = 400) private String billingAddress; + @Size(max = 160) + @Column(name = "remark", length = 160) + private String remark; + @OneToMany(mappedBy = "customer") private Set memberships = new HashSet<>(); - @OneToMany(mappedBy = "customer") private Set sepamandates = new HashSet<>(); - // jhipster-needle-entity-add-field - JHipster will add fields here, do not remove public Long getId() { return id; @@ -73,17 +76,17 @@ public class Customer implements Serializable { this.id = id; } - public Integer getNumber() { - return number; + public Integer getReference() { + return reference; } - public Customer number(Integer number) { - this.number = number; + public Customer reference(Integer reference) { + this.reference = reference; return this; } - public void setNumber(Integer number) { - this.number = number; + public void setReference(Integer reference) { + this.reference = reference; } public String getPrefix() { @@ -164,6 +167,19 @@ public class Customer implements Serializable { this.billingAddress = billingAddress; } + public String getRemark() { + return remark; + } + + public Customer remark(String remark) { + this.remark = remark; + return this; + } + + public void setRemark(String remark) { + this.remark = remark; + } + public Set getMemberships() { return memberships; } @@ -239,13 +255,14 @@ public class Customer implements Serializable { public String toString() { return "Customer{" + "id=" + getId() + - ", number=" + getNumber() + + ", reference=" + getReference() + ", prefix='" + getPrefix() + "'" + ", name='" + getName() + "'" + ", contractualSalutation='" + getContractualSalutation() + "'" + ", contractualAddress='" + getContractualAddress() + "'" + ", billingSalutation='" + getBillingSalutation() + "'" + ", billingAddress='" + getBillingAddress() + "'" + + ", remark='" + getRemark() + "'" + "}"; } } diff --git a/src/main/java/org/hostsharing/hsadminng/domain/Membership.java b/src/main/java/org/hostsharing/hsadminng/domain/Membership.java index 2ebbc45e..2073fef7 100644 --- a/src/main/java/org/hostsharing/hsadminng/domain/Membership.java +++ b/src/main/java/org/hostsharing/hsadminng/domain/Membership.java @@ -30,22 +30,16 @@ public class Membership implements Serializable { private Long id; @NotNull - @Column(name = "jhi_from", nullable = false) - private LocalDate from; + @Column(name = "since_date", nullable = false) + private LocalDate sinceDate; - @Column(name = "jhi_to") - private LocalDate to; + @Column(name = "until_date") + private LocalDate untilDate; - @Size(max = 160) - @Column(name = "jhi_comment", length = 160) - private String comment; - - @OneToMany(mappedBy = "membership") + @OneToMany(mappedBy = "member") private Set shares = new HashSet<>(); - - @OneToMany(mappedBy = "membership") + @OneToMany(mappedBy = "member") private Set assets = new HashSet<>(); - @ManyToOne(optional = false) @NotNull @JsonIgnoreProperties("memberships") @@ -60,43 +54,30 @@ public class Membership implements Serializable { this.id = id; } - public LocalDate getFrom() { - return from; + public LocalDate getSinceDate() { + return sinceDate; } - public Membership from(LocalDate from) { - this.from = from; + public Membership sinceDate(LocalDate sinceDate) { + this.sinceDate = sinceDate; return this; } - public void setFrom(LocalDate from) { - this.from = from; + public void setSinceDate(LocalDate sinceDate) { + this.sinceDate = sinceDate; } - public LocalDate getTo() { - return to; + public LocalDate getUntilDate() { + return untilDate; } - public Membership to(LocalDate to) { - this.to = to; + public Membership untilDate(LocalDate untilDate) { + this.untilDate = untilDate; return this; } - public void setTo(LocalDate to) { - this.to = to; - } - - public String getComment() { - return comment; - } - - public Membership comment(String comment) { - this.comment = comment; - return this; - } - - public void setComment(String comment) { - this.comment = comment; + public void setUntilDate(LocalDate untilDate) { + this.untilDate = untilDate; } public Set getShares() { @@ -187,9 +168,8 @@ public class Membership implements Serializable { public String toString() { return "Membership{" + "id=" + getId() + - ", from='" + getFrom() + "'" + - ", to='" + getTo() + "'" + - ", comment='" + getComment() + "'" + + ", sinceDate='" + getSinceDate() + "'" + + ", untilDate='" + getUntilDate() + "'" + "}"; } } diff --git a/src/main/java/org/hostsharing/hsadminng/domain/SepaMandate.java b/src/main/java/org/hostsharing/hsadminng/domain/SepaMandate.java index 7cee2803..3c7741df 100644 --- a/src/main/java/org/hostsharing/hsadminng/domain/SepaMandate.java +++ b/src/main/java/org/hostsharing/hsadminng/domain/SepaMandate.java @@ -38,25 +38,25 @@ public class SepaMandate implements Serializable { private String bic; @NotNull - @Column(name = "created", nullable = false) - private LocalDate created; + @Column(name = "document_date", nullable = false) + private LocalDate documentDate; @NotNull @Column(name = "valid_from", nullable = false) private LocalDate validFrom; - @Column(name = "valid_to") - private LocalDate validTo; + @Column(name = "valid_until") + private LocalDate validUntil; @Column(name = "last_used") private LocalDate lastUsed; - @Column(name = "cancelled") - private LocalDate cancelled; + @Column(name = "cancellation_date") + private LocalDate cancellationDate; @Size(max = 160) - @Column(name = "jhi_comment", length = 160) - private String comment; + @Column(name = "remark", length = 160) + private String remark; @ManyToOne(optional = false) @NotNull @@ -111,17 +111,17 @@ public class SepaMandate implements Serializable { this.bic = bic; } - public LocalDate getCreated() { - return created; + public LocalDate getDocumentDate() { + return documentDate; } - public SepaMandate created(LocalDate created) { - this.created = created; + public SepaMandate documentDate(LocalDate documentDate) { + this.documentDate = documentDate; return this; } - public void setCreated(LocalDate created) { - this.created = created; + public void setDocumentDate(LocalDate documentDate) { + this.documentDate = documentDate; } public LocalDate getValidFrom() { @@ -137,17 +137,17 @@ public class SepaMandate implements Serializable { this.validFrom = validFrom; } - public LocalDate getValidTo() { - return validTo; + public LocalDate getValidUntil() { + return validUntil; } - public SepaMandate validTo(LocalDate validTo) { - this.validTo = validTo; + public SepaMandate validUntil(LocalDate validUntil) { + this.validUntil = validUntil; return this; } - public void setValidTo(LocalDate validTo) { - this.validTo = validTo; + public void setValidUntil(LocalDate validUntil) { + this.validUntil = validUntil; } public LocalDate getLastUsed() { @@ -163,30 +163,30 @@ public class SepaMandate implements Serializable { this.lastUsed = lastUsed; } - public LocalDate getCancelled() { - return cancelled; + public LocalDate getCancellationDate() { + return cancellationDate; } - public SepaMandate cancelled(LocalDate cancelled) { - this.cancelled = cancelled; + public SepaMandate cancellationDate(LocalDate cancellationDate) { + this.cancellationDate = cancellationDate; return this; } - public void setCancelled(LocalDate cancelled) { - this.cancelled = cancelled; + public void setCancellationDate(LocalDate cancellationDate) { + this.cancellationDate = cancellationDate; } - public String getComment() { - return comment; + public String getRemark() { + return remark; } - public SepaMandate comment(String comment) { - this.comment = comment; + public SepaMandate remark(String remark) { + this.remark = remark; return this; } - public void setComment(String comment) { - this.comment = comment; + public void setRemark(String remark) { + this.remark = remark; } public Customer getCustomer() { @@ -230,12 +230,12 @@ public class SepaMandate implements Serializable { ", reference='" + getReference() + "'" + ", iban='" + getIban() + "'" + ", bic='" + getBic() + "'" + - ", created='" + getCreated() + "'" + + ", documentDate='" + getDocumentDate() + "'" + ", validFrom='" + getValidFrom() + "'" + - ", validTo='" + getValidTo() + "'" + + ", validUntil='" + getValidUntil() + "'" + ", lastUsed='" + getLastUsed() + "'" + - ", cancelled='" + getCancelled() + "'" + - ", comment='" + getComment() + "'" + + ", cancellationDate='" + getCancellationDate() + "'" + + ", remark='" + getRemark() + "'" + "}"; } } diff --git a/src/main/java/org/hostsharing/hsadminng/domain/Share.java b/src/main/java/org/hostsharing/hsadminng/domain/Share.java index 05da24bc..a1d0e3c2 100644 --- a/src/main/java/org/hostsharing/hsadminng/domain/Share.java +++ b/src/main/java/org/hostsharing/hsadminng/domain/Share.java @@ -29,8 +29,12 @@ public class Share implements Serializable { private Long id; @NotNull - @Column(name = "jhi_date", nullable = false) - private LocalDate date; + @Column(name = "document_date", nullable = false) + private LocalDate documentDate; + + @NotNull + @Column(name = "value_date", nullable = false) + private LocalDate valueDate; @NotNull @Enumerated(EnumType.STRING) @@ -42,8 +46,8 @@ public class Share implements Serializable { private Integer quantity; @Size(max = 160) - @Column(name = "jhi_comment", length = 160) - private String comment; + @Column(name = "remark", length = 160) + private String remark; @NotNull @ManyToOne(optional = false) @@ -59,17 +63,30 @@ public class Share implements Serializable { this.id = id; } - public LocalDate getDate() { - return date; + public LocalDate getDocumentDate() { + return documentDate; } - public Share date(LocalDate date) { - this.date = date; + public Share documentDate(LocalDate documentDate) { + this.documentDate = documentDate; return this; } - public void setDate(LocalDate date) { - this.date = date; + public void setDocumentDate(LocalDate documentDate) { + this.documentDate = documentDate; + } + + public LocalDate getValueDate() { + return valueDate; + } + + public Share valueDate(LocalDate valueDate) { + this.valueDate = valueDate; + return this; + } + + public void setValueDate(LocalDate valueDate) { + this.valueDate = valueDate; } public ShareAction getAction() { @@ -98,17 +115,17 @@ public class Share implements Serializable { this.quantity = quantity; } - public String getComment() { - return comment; + public String getRemark() { + return remark; } - public Share comment(String comment) { - this.comment = comment; + public Share remark(String remark) { + this.remark = remark; return this; } - public void setComment(String comment) { - this.comment = comment; + public void setRemark(String remark) { + this.remark = remark; } public Membership getMembership() { @@ -149,10 +166,11 @@ public class Share implements Serializable { public String toString() { return "Share{" + "id=" + getId() + - ", date='" + getDate() + "'" + + ", documentDate='" + getDocumentDate() + "'" + + ", valueDate='" + getValueDate() + "'" + ", action='" + getAction() + "'" + ", quantity=" + getQuantity() + - ", comment='" + getComment() + "'" + + ", remark='" + getRemark() + "'" + "}"; } } diff --git a/src/main/java/org/hostsharing/hsadminng/service/AssetQueryService.java b/src/main/java/org/hostsharing/hsadminng/service/AssetQueryService.java index 8a823afc..82137a84 100644 --- a/src/main/java/org/hostsharing/hsadminng/service/AssetQueryService.java +++ b/src/main/java/org/hostsharing/hsadminng/service/AssetQueryService.java @@ -89,8 +89,11 @@ public class AssetQueryService extends QueryService { if (criteria.getId() != null) { specification = specification.and(buildSpecification(criteria.getId(), Asset_.id)); } - if (criteria.getDate() != null) { - specification = specification.and(buildRangeSpecification(criteria.getDate(), Asset_.date)); + if (criteria.getDocumentDate() != null) { + specification = specification.and(buildRangeSpecification(criteria.getDocumentDate(), Asset_.documentDate)); + } + if (criteria.getValueDate() != null) { + specification = specification.and(buildRangeSpecification(criteria.getValueDate(), Asset_.valueDate)); } if (criteria.getAction() != null) { specification = specification.and(buildSpecification(criteria.getAction(), Asset_.action)); @@ -98,8 +101,8 @@ public class AssetQueryService extends QueryService { if (criteria.getAmount() != null) { specification = specification.and(buildRangeSpecification(criteria.getAmount(), Asset_.amount)); } - if (criteria.getComment() != null) { - specification = specification.and(buildStringSpecification(criteria.getComment(), Asset_.comment)); + if (criteria.getRemark() != null) { + specification = specification.and(buildStringSpecification(criteria.getRemark(), Asset_.remark)); } if (criteria.getMembershipId() != null) { specification = specification.and(buildSpecification(criteria.getMembershipId(), diff --git a/src/main/java/org/hostsharing/hsadminng/service/CustomerQueryService.java b/src/main/java/org/hostsharing/hsadminng/service/CustomerQueryService.java index a3644a4f..937322d1 100644 --- a/src/main/java/org/hostsharing/hsadminng/service/CustomerQueryService.java +++ b/src/main/java/org/hostsharing/hsadminng/service/CustomerQueryService.java @@ -89,8 +89,8 @@ public class CustomerQueryService extends QueryService { if (criteria.getId() != null) { specification = specification.and(buildSpecification(criteria.getId(), Customer_.id)); } - if (criteria.getNumber() != null) { - specification = specification.and(buildRangeSpecification(criteria.getNumber(), Customer_.number)); + if (criteria.getReference() != null) { + specification = specification.and(buildRangeSpecification(criteria.getReference(), Customer_.reference)); } if (criteria.getPrefix() != null) { specification = specification.and(buildStringSpecification(criteria.getPrefix(), Customer_.prefix)); @@ -110,6 +110,9 @@ public class CustomerQueryService extends QueryService { if (criteria.getBillingAddress() != null) { specification = specification.and(buildStringSpecification(criteria.getBillingAddress(), Customer_.billingAddress)); } + if (criteria.getRemark() != null) { + specification = specification.and(buildStringSpecification(criteria.getRemark(), Customer_.remark)); + } if (criteria.getMembershipId() != null) { specification = specification.and(buildSpecification(criteria.getMembershipId(), root -> root.join(Customer_.memberships, JoinType.LEFT).get(Membership_.id))); diff --git a/src/main/java/org/hostsharing/hsadminng/service/MembershipQueryService.java b/src/main/java/org/hostsharing/hsadminng/service/MembershipQueryService.java index b8dd7b49..8ab0bb2f 100644 --- a/src/main/java/org/hostsharing/hsadminng/service/MembershipQueryService.java +++ b/src/main/java/org/hostsharing/hsadminng/service/MembershipQueryService.java @@ -89,14 +89,17 @@ public class MembershipQueryService extends QueryService { if (criteria.getId() != null) { specification = specification.and(buildSpecification(criteria.getId(), Membership_.id)); } - if (criteria.getFrom() != null) { - specification = specification.and(buildRangeSpecification(criteria.getFrom(), Membership_.from)); + if (criteria.getDocumentDate() != null) { + specification = specification.and(buildRangeSpecification(criteria.getDocumentDate(), Membership_.documentDate)); } - if (criteria.getTo() != null) { - specification = specification.and(buildRangeSpecification(criteria.getTo(), Membership_.to)); + if (criteria.getMemberFrom() != null) { + specification = specification.and(buildRangeSpecification(criteria.getMemberFrom(), Membership_.memberFrom)); } - if (criteria.getComment() != null) { - specification = specification.and(buildStringSpecification(criteria.getComment(), Membership_.comment)); + if (criteria.getMemberUntil() != null) { + specification = specification.and(buildRangeSpecification(criteria.getMemberUntil(), Membership_.memberUntil)); + } + if (criteria.getRemark() != null) { + specification = specification.and(buildStringSpecification(criteria.getRemark(), Membership_.remark)); } if (criteria.getShareId() != null) { specification = specification.and(buildSpecification(criteria.getShareId(), diff --git a/src/main/java/org/hostsharing/hsadminng/service/SepaMandateQueryService.java b/src/main/java/org/hostsharing/hsadminng/service/SepaMandateQueryService.java index 3cb7e5da..1e31c8b4 100644 --- a/src/main/java/org/hostsharing/hsadminng/service/SepaMandateQueryService.java +++ b/src/main/java/org/hostsharing/hsadminng/service/SepaMandateQueryService.java @@ -98,23 +98,23 @@ public class SepaMandateQueryService extends QueryService { if (criteria.getBic() != null) { specification = specification.and(buildStringSpecification(criteria.getBic(), SepaMandate_.bic)); } - if (criteria.getCreated() != null) { - specification = specification.and(buildRangeSpecification(criteria.getCreated(), SepaMandate_.created)); + if (criteria.getDocumentDate() != null) { + specification = specification.and(buildRangeSpecification(criteria.getDocumentDate(), SepaMandate_.documentDate)); } if (criteria.getValidFrom() != null) { specification = specification.and(buildRangeSpecification(criteria.getValidFrom(), SepaMandate_.validFrom)); } - if (criteria.getValidTo() != null) { - specification = specification.and(buildRangeSpecification(criteria.getValidTo(), SepaMandate_.validTo)); + if (criteria.getValidUntil() != null) { + specification = specification.and(buildRangeSpecification(criteria.getValidUntil(), SepaMandate_.validUntil)); } if (criteria.getLastUsed() != null) { specification = specification.and(buildRangeSpecification(criteria.getLastUsed(), SepaMandate_.lastUsed)); } - if (criteria.getCancelled() != null) { - specification = specification.and(buildRangeSpecification(criteria.getCancelled(), SepaMandate_.cancelled)); + if (criteria.getCancellationDate() != null) { + specification = specification.and(buildRangeSpecification(criteria.getCancellationDate(), SepaMandate_.cancellationDate)); } - if (criteria.getComment() != null) { - specification = specification.and(buildStringSpecification(criteria.getComment(), SepaMandate_.comment)); + if (criteria.getRemark() != null) { + specification = specification.and(buildStringSpecification(criteria.getRemark(), SepaMandate_.remark)); } if (criteria.getCustomerId() != null) { specification = specification.and(buildSpecification(criteria.getCustomerId(), diff --git a/src/main/java/org/hostsharing/hsadminng/service/ShareQueryService.java b/src/main/java/org/hostsharing/hsadminng/service/ShareQueryService.java index ddb8f286..7dcfb36c 100644 --- a/src/main/java/org/hostsharing/hsadminng/service/ShareQueryService.java +++ b/src/main/java/org/hostsharing/hsadminng/service/ShareQueryService.java @@ -89,8 +89,11 @@ public class ShareQueryService extends QueryService { if (criteria.getId() != null) { specification = specification.and(buildSpecification(criteria.getId(), Share_.id)); } - if (criteria.getDate() != null) { - specification = specification.and(buildRangeSpecification(criteria.getDate(), Share_.date)); + if (criteria.getDocumentDate() != null) { + specification = specification.and(buildRangeSpecification(criteria.getDocumentDate(), Share_.documentDate)); + } + if (criteria.getValueDate() != null) { + specification = specification.and(buildRangeSpecification(criteria.getValueDate(), Share_.valueDate)); } if (criteria.getAction() != null) { specification = specification.and(buildSpecification(criteria.getAction(), Share_.action)); @@ -98,8 +101,8 @@ public class ShareQueryService extends QueryService { if (criteria.getQuantity() != null) { specification = specification.and(buildRangeSpecification(criteria.getQuantity(), Share_.quantity)); } - if (criteria.getComment() != null) { - specification = specification.and(buildStringSpecification(criteria.getComment(), Share_.comment)); + if (criteria.getRemark() != null) { + specification = specification.and(buildStringSpecification(criteria.getRemark(), Share_.remark)); } if (criteria.getMembershipId() != null) { specification = specification.and(buildSpecification(criteria.getMembershipId(), diff --git a/src/main/java/org/hostsharing/hsadminng/service/dto/AssetCriteria.java b/src/main/java/org/hostsharing/hsadminng/service/dto/AssetCriteria.java index 8eaff96c..fe0091fc 100644 --- a/src/main/java/org/hostsharing/hsadminng/service/dto/AssetCriteria.java +++ b/src/main/java/org/hostsharing/hsadminng/service/dto/AssetCriteria.java @@ -32,13 +32,15 @@ public class AssetCriteria implements Serializable { private LongFilter id; - private LocalDateFilter date; + private LocalDateFilter documentDate; + + private LocalDateFilter valueDate; private AssetActionFilter action; private BigDecimalFilter amount; - private StringFilter comment; + private StringFilter remark; private LongFilter membershipId; @@ -50,12 +52,20 @@ public class AssetCriteria implements Serializable { this.id = id; } - public LocalDateFilter getDate() { - return date; + public LocalDateFilter getDocumentDate() { + return documentDate; } - public void setDate(LocalDateFilter date) { - this.date = date; + public void setDocumentDate(LocalDateFilter documentDate) { + this.documentDate = documentDate; + } + + public LocalDateFilter getValueDate() { + return valueDate; + } + + public void setValueDate(LocalDateFilter valueDate) { + this.valueDate = valueDate; } public AssetActionFilter getAction() { @@ -74,12 +84,12 @@ public class AssetCriteria implements Serializable { this.amount = amount; } - public StringFilter getComment() { - return comment; + public StringFilter getRemark() { + return remark; } - public void setComment(StringFilter comment) { - this.comment = comment; + public void setRemark(StringFilter remark) { + this.remark = remark; } public LongFilter getMembershipId() { @@ -102,10 +112,11 @@ public class AssetCriteria implements Serializable { final AssetCriteria that = (AssetCriteria) o; return Objects.equals(id, that.id) && - Objects.equals(date, that.date) && + Objects.equals(documentDate, that.documentDate) && + Objects.equals(valueDate, that.valueDate) && Objects.equals(action, that.action) && Objects.equals(amount, that.amount) && - Objects.equals(comment, that.comment) && + Objects.equals(remark, that.remark) && Objects.equals(membershipId, that.membershipId); } @@ -113,10 +124,11 @@ public class AssetCriteria implements Serializable { public int hashCode() { return Objects.hash( id, - date, + documentDate, + valueDate, action, amount, - comment, + remark, membershipId ); } @@ -125,10 +137,11 @@ public class AssetCriteria implements Serializable { public String toString() { return "AssetCriteria{" + (id != null ? "id=" + id + ", " : "") + - (date != null ? "date=" + date + ", " : "") + + (documentDate != null ? "documentDate=" + documentDate + ", " : "") + + (valueDate != null ? "valueDate=" + valueDate + ", " : "") + (action != null ? "action=" + action + ", " : "") + (amount != null ? "amount=" + amount + ", " : "") + - (comment != null ? "comment=" + comment + ", " : "") + + (remark != null ? "remark=" + remark + ", " : "") + (membershipId != null ? "membershipId=" + membershipId + ", " : "") + "}"; } diff --git a/src/main/java/org/hostsharing/hsadminng/service/dto/AssetDTO.java b/src/main/java/org/hostsharing/hsadminng/service/dto/AssetDTO.java index d1a1965c..2ed0d828 100644 --- a/src/main/java/org/hostsharing/hsadminng/service/dto/AssetDTO.java +++ b/src/main/java/org/hostsharing/hsadminng/service/dto/AssetDTO.java @@ -14,7 +14,10 @@ public class AssetDTO implements Serializable { private Long id; @NotNull - private LocalDate date; + private LocalDate documentDate; + + @NotNull + private LocalDate valueDate; @NotNull private AssetAction action; @@ -23,12 +26,12 @@ public class AssetDTO implements Serializable { private BigDecimal amount; @Size(max = 160) - private String comment; + private String remark; private Long membershipId; - private String membershipFrom; + private String membershipDocumentDate; public Long getId() { return id; @@ -38,12 +41,20 @@ public class AssetDTO implements Serializable { this.id = id; } - public LocalDate getDate() { - return date; + public LocalDate getDocumentDate() { + return documentDate; } - public void setDate(LocalDate date) { - this.date = date; + public void setDocumentDate(LocalDate documentDate) { + this.documentDate = documentDate; + } + + public LocalDate getValueDate() { + return valueDate; + } + + public void setValueDate(LocalDate valueDate) { + this.valueDate = valueDate; } public AssetAction getAction() { @@ -62,12 +73,12 @@ public class AssetDTO implements Serializable { this.amount = amount; } - public String getComment() { - return comment; + public String getRemark() { + return remark; } - public void setComment(String comment) { - this.comment = comment; + public void setRemark(String remark) { + this.remark = remark; } public Long getMembershipId() { @@ -78,12 +89,12 @@ public class AssetDTO implements Serializable { this.membershipId = membershipId; } - public String getMembershipFrom() { - return membershipFrom; + public String getMembershipDocumentDate() { + return membershipDocumentDate; } - public void setMembershipFrom(String membershipFrom) { - this.membershipFrom = membershipFrom; + public void setMembershipDocumentDate(String membershipDocumentDate) { + this.membershipDocumentDate = membershipDocumentDate; } @Override @@ -111,12 +122,13 @@ public class AssetDTO implements Serializable { public String toString() { return "AssetDTO{" + "id=" + getId() + - ", date='" + getDate() + "'" + + ", documentDate='" + getDocumentDate() + "'" + + ", valueDate='" + getValueDate() + "'" + ", action='" + getAction() + "'" + ", amount=" + getAmount() + - ", comment='" + getComment() + "'" + + ", remark='" + getRemark() + "'" + ", membership=" + getMembershipId() + - ", membership='" + getMembershipFrom() + "'" + + ", membership='" + getMembershipDocumentDate() + "'" + "}"; } } diff --git a/src/main/java/org/hostsharing/hsadminng/service/dto/CustomerCriteria.java b/src/main/java/org/hostsharing/hsadminng/service/dto/CustomerCriteria.java index 1614da6d..60d82e58 100644 --- a/src/main/java/org/hostsharing/hsadminng/service/dto/CustomerCriteria.java +++ b/src/main/java/org/hostsharing/hsadminng/service/dto/CustomerCriteria.java @@ -2,7 +2,10 @@ package org.hostsharing.hsadminng.service.dto; import java.io.Serializable; import java.util.Objects; +import io.github.jhipster.service.filter.BooleanFilter; +import io.github.jhipster.service.filter.DoubleFilter; import io.github.jhipster.service.filter.Filter; +import io.github.jhipster.service.filter.FloatFilter; import io.github.jhipster.service.filter.IntegerFilter; import io.github.jhipster.service.filter.LongFilter; import io.github.jhipster.service.filter.StringFilter; @@ -21,7 +24,7 @@ public class CustomerCriteria implements Serializable { private LongFilter id; - private IntegerFilter number; + private IntegerFilter reference; private StringFilter prefix; @@ -35,6 +38,8 @@ public class CustomerCriteria implements Serializable { private StringFilter billingAddress; + private StringFilter remark; + private LongFilter membershipId; private LongFilter sepamandateId; @@ -47,12 +52,12 @@ public class CustomerCriteria implements Serializable { this.id = id; } - public IntegerFilter getNumber() { - return number; + public IntegerFilter getReference() { + return reference; } - public void setNumber(IntegerFilter number) { - this.number = number; + public void setReference(IntegerFilter reference) { + this.reference = reference; } public StringFilter getPrefix() { @@ -103,6 +108,14 @@ public class CustomerCriteria implements Serializable { this.billingAddress = billingAddress; } + public StringFilter getRemark() { + return remark; + } + + public void setRemark(StringFilter remark) { + this.remark = remark; + } + public LongFilter getMembershipId() { return membershipId; } @@ -131,13 +144,14 @@ public class CustomerCriteria implements Serializable { final CustomerCriteria that = (CustomerCriteria) o; return Objects.equals(id, that.id) && - Objects.equals(number, that.number) && + Objects.equals(reference, that.reference) && Objects.equals(prefix, that.prefix) && Objects.equals(name, that.name) && Objects.equals(contractualSalutation, that.contractualSalutation) && Objects.equals(contractualAddress, that.contractualAddress) && Objects.equals(billingSalutation, that.billingSalutation) && Objects.equals(billingAddress, that.billingAddress) && + Objects.equals(remark, that.remark) && Objects.equals(membershipId, that.membershipId) && Objects.equals(sepamandateId, that.sepamandateId); } @@ -146,13 +160,14 @@ public class CustomerCriteria implements Serializable { public int hashCode() { return Objects.hash( id, - number, + reference, prefix, name, contractualSalutation, contractualAddress, billingSalutation, billingAddress, + remark, membershipId, sepamandateId ); @@ -162,13 +177,14 @@ public class CustomerCriteria implements Serializable { public String toString() { return "CustomerCriteria{" + (id != null ? "id=" + id + ", " : "") + - (number != null ? "number=" + number + ", " : "") + + (reference != null ? "reference=" + reference + ", " : "") + (prefix != null ? "prefix=" + prefix + ", " : "") + (name != null ? "name=" + name + ", " : "") + (contractualSalutation != null ? "contractualSalutation=" + contractualSalutation + ", " : "") + (contractualAddress != null ? "contractualAddress=" + contractualAddress + ", " : "") + (billingSalutation != null ? "billingSalutation=" + billingSalutation + ", " : "") + (billingAddress != null ? "billingAddress=" + billingAddress + ", " : "") + + (remark != null ? "remark=" + remark + ", " : "") + (membershipId != null ? "membershipId=" + membershipId + ", " : "") + (sepamandateId != null ? "sepamandateId=" + sepamandateId + ", " : "") + "}"; diff --git a/src/main/java/org/hostsharing/hsadminng/service/dto/CustomerDTO.java b/src/main/java/org/hostsharing/hsadminng/service/dto/CustomerDTO.java index 083c52ff..6dd5c845 100644 --- a/src/main/java/org/hostsharing/hsadminng/service/dto/CustomerDTO.java +++ b/src/main/java/org/hostsharing/hsadminng/service/dto/CustomerDTO.java @@ -13,9 +13,10 @@ public class CustomerDTO implements Serializable { @NotNull @Min(value = 10000) @Max(value = 99999) - private Integer number; + private Integer reference; @NotNull + @Size(max = 3) @Pattern(regexp = "[a-z][a-z0-9]+") private String prefix; @@ -36,6 +37,9 @@ public class CustomerDTO implements Serializable { @Size(max = 400) private String billingAddress; + @Size(max = 160) + private String remark; + public Long getId() { return id; @@ -45,12 +49,12 @@ public class CustomerDTO implements Serializable { this.id = id; } - public Integer getNumber() { - return number; + public Integer getReference() { + return reference; } - public void setNumber(Integer number) { - this.number = number; + public void setReference(Integer reference) { + this.reference = reference; } public String getPrefix() { @@ -101,6 +105,14 @@ public class CustomerDTO implements Serializable { this.billingAddress = billingAddress; } + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -126,13 +138,14 @@ public class CustomerDTO implements Serializable { public String toString() { return "CustomerDTO{" + "id=" + getId() + - ", number=" + getNumber() + + ", reference=" + getReference() + ", prefix='" + getPrefix() + "'" + ", name='" + getName() + "'" + ", contractualSalutation='" + getContractualSalutation() + "'" + ", contractualAddress='" + getContractualAddress() + "'" + ", billingSalutation='" + getBillingSalutation() + "'" + ", billingAddress='" + getBillingAddress() + "'" + + ", remark='" + getRemark() + "'" + "}"; } } diff --git a/src/main/java/org/hostsharing/hsadminng/service/dto/MembershipCriteria.java b/src/main/java/org/hostsharing/hsadminng/service/dto/MembershipCriteria.java index f9b3f4dd..be8308bc 100644 --- a/src/main/java/org/hostsharing/hsadminng/service/dto/MembershipCriteria.java +++ b/src/main/java/org/hostsharing/hsadminng/service/dto/MembershipCriteria.java @@ -25,11 +25,13 @@ public class MembershipCriteria implements Serializable { private LongFilter id; - private LocalDateFilter from; + private LocalDateFilter documentDate; - private LocalDateFilter to; + private LocalDateFilter memberFrom; - private StringFilter comment; + private LocalDateFilter memberUntil; + + private StringFilter remark; private LongFilter shareId; @@ -45,28 +47,36 @@ public class MembershipCriteria implements Serializable { this.id = id; } - public LocalDateFilter getFrom() { - return from; + public LocalDateFilter getDocumentDate() { + return documentDate; } - public void setFrom(LocalDateFilter from) { - this.from = from; + public void setDocumentDate(LocalDateFilter documentDate) { + this.documentDate = documentDate; } - public LocalDateFilter getTo() { - return to; + public LocalDateFilter getMemberFrom() { + return memberFrom; } - public void setTo(LocalDateFilter to) { - this.to = to; + public void setMemberFrom(LocalDateFilter memberFrom) { + this.memberFrom = memberFrom; } - public StringFilter getComment() { - return comment; + public LocalDateFilter getMemberUntil() { + return memberUntil; } - public void setComment(StringFilter comment) { - this.comment = comment; + public void setMemberUntil(LocalDateFilter memberUntil) { + this.memberUntil = memberUntil; + } + + public StringFilter getRemark() { + return remark; + } + + public void setRemark(StringFilter remark) { + this.remark = remark; } public LongFilter getShareId() { @@ -105,9 +115,10 @@ public class MembershipCriteria implements Serializable { final MembershipCriteria that = (MembershipCriteria) o; return Objects.equals(id, that.id) && - Objects.equals(from, that.from) && - Objects.equals(to, that.to) && - Objects.equals(comment, that.comment) && + Objects.equals(documentDate, that.documentDate) && + Objects.equals(memberFrom, that.memberFrom) && + Objects.equals(memberUntil, that.memberUntil) && + Objects.equals(remark, that.remark) && Objects.equals(shareId, that.shareId) && Objects.equals(assetId, that.assetId) && Objects.equals(customerId, that.customerId); @@ -117,9 +128,10 @@ public class MembershipCriteria implements Serializable { public int hashCode() { return Objects.hash( id, - from, - to, - comment, + documentDate, + memberFrom, + memberUntil, + remark, shareId, assetId, customerId @@ -130,9 +142,10 @@ public class MembershipCriteria implements Serializable { public String toString() { return "MembershipCriteria{" + (id != null ? "id=" + id + ", " : "") + - (from != null ? "from=" + from + ", " : "") + - (to != null ? "to=" + to + ", " : "") + - (comment != null ? "comment=" + comment + ", " : "") + + (documentDate != null ? "documentDate=" + documentDate + ", " : "") + + (memberFrom != null ? "memberFrom=" + memberFrom + ", " : "") + + (memberUntil != null ? "memberUntil=" + memberUntil + ", " : "") + + (remark != null ? "remark=" + remark + ", " : "") + (shareId != null ? "shareId=" + shareId + ", " : "") + (assetId != null ? "assetId=" + assetId + ", " : "") + (customerId != null ? "customerId=" + customerId + ", " : "") + diff --git a/src/main/java/org/hostsharing/hsadminng/service/dto/MembershipDTO.java b/src/main/java/org/hostsharing/hsadminng/service/dto/MembershipDTO.java index a7b0ed7f..72831def 100644 --- a/src/main/java/org/hostsharing/hsadminng/service/dto/MembershipDTO.java +++ b/src/main/java/org/hostsharing/hsadminng/service/dto/MembershipDTO.java @@ -1,11 +1,8 @@ package org.hostsharing.hsadminng.service.dto; - -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.io.Serializable; 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. @@ -15,14 +12,17 @@ public class MembershipDTO implements Serializable { private Long id; @NotNull - private LocalDate from; - - private LocalDate to; - - @Size(max = 160) - private String comment; + private LocalDate documentDate; @NotNull + private LocalDate memberFrom; + + private LocalDate memberUntil; + + @Size(max = 160) + private String remark; + + private Long customerId; private String customerPrefix; @@ -41,28 +41,36 @@ public class MembershipDTO implements Serializable { this.id = id; } - public LocalDate getFrom() { - return from; + public LocalDate getDocumentDate() { + return documentDate; } - public void setFrom(LocalDate from) { - this.from = from; + public void setDocumentDate(LocalDate documentDate) { + this.documentDate = documentDate; } - public LocalDate getTo() { - return to; + public LocalDate getMemberFrom() { + return memberFrom; } - public void setTo(LocalDate to) { - this.to = to; + public void setMemberFrom(LocalDate memberFrom) { + this.memberFrom = memberFrom; } - public String getComment() { - return comment; + public LocalDate getMemberUntil() { + return memberUntil; } - public void setComment(String comment) { - this.comment = comment; + public void setMemberUntil(LocalDate memberUntil) { + this.memberUntil = memberUntil; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; } public Long getCustomerId() { @@ -106,9 +114,10 @@ public class MembershipDTO implements Serializable { public String toString() { return "MembershipDTO{" + "id=" + getId() + - ", from='" + getFrom() + "'" + - ", to='" + getTo() + "'" + - ", comment='" + getComment() + "'" + + ", documentDate='" + getDocumentDate() + "'" + + ", memberFrom='" + getMemberFrom() + "'" + + ", memberUntil='" + getMemberUntil() + "'" + + ", remark='" + getRemark() + "'" + ", customer=" + getCustomerId() + ", customer='" + getCustomerPrefix() + "'" + "}"; diff --git a/src/main/java/org/hostsharing/hsadminng/service/dto/SepaMandateCriteria.java b/src/main/java/org/hostsharing/hsadminng/service/dto/SepaMandateCriteria.java index 8f285fe6..ce429df5 100644 --- a/src/main/java/org/hostsharing/hsadminng/service/dto/SepaMandateCriteria.java +++ b/src/main/java/org/hostsharing/hsadminng/service/dto/SepaMandateCriteria.java @@ -31,17 +31,17 @@ public class SepaMandateCriteria implements Serializable { private StringFilter bic; - private LocalDateFilter created; + private LocalDateFilter documentDate; private LocalDateFilter validFrom; - private LocalDateFilter validTo; + private LocalDateFilter validUntil; private LocalDateFilter lastUsed; - private LocalDateFilter cancelled; + private LocalDateFilter cancellationDate; - private StringFilter comment; + private StringFilter remark; private LongFilter customerId; @@ -77,12 +77,12 @@ public class SepaMandateCriteria implements Serializable { this.bic = bic; } - public LocalDateFilter getCreated() { - return created; + public LocalDateFilter getDocumentDate() { + return documentDate; } - public void setCreated(LocalDateFilter created) { - this.created = created; + public void setDocumentDate(LocalDateFilter documentDate) { + this.documentDate = documentDate; } public LocalDateFilter getValidFrom() { @@ -93,12 +93,12 @@ public class SepaMandateCriteria implements Serializable { this.validFrom = validFrom; } - public LocalDateFilter getValidTo() { - return validTo; + public LocalDateFilter getValidUntil() { + return validUntil; } - public void setValidTo(LocalDateFilter validTo) { - this.validTo = validTo; + public void setValidUntil(LocalDateFilter validUntil) { + this.validUntil = validUntil; } public LocalDateFilter getLastUsed() { @@ -109,20 +109,20 @@ public class SepaMandateCriteria implements Serializable { this.lastUsed = lastUsed; } - public LocalDateFilter getCancelled() { - return cancelled; + public LocalDateFilter getCancellationDate() { + return cancellationDate; } - public void setCancelled(LocalDateFilter cancelled) { - this.cancelled = cancelled; + public void setCancellationDate(LocalDateFilter cancellationDate) { + this.cancellationDate = cancellationDate; } - public StringFilter getComment() { - return comment; + public StringFilter getRemark() { + return remark; } - public void setComment(StringFilter comment) { - this.comment = comment; + public void setRemark(StringFilter remark) { + this.remark = remark; } public LongFilter getCustomerId() { @@ -148,12 +148,12 @@ public class SepaMandateCriteria implements Serializable { Objects.equals(reference, that.reference) && Objects.equals(iban, that.iban) && Objects.equals(bic, that.bic) && - Objects.equals(created, that.created) && + Objects.equals(documentDate, that.documentDate) && Objects.equals(validFrom, that.validFrom) && - Objects.equals(validTo, that.validTo) && + Objects.equals(validUntil, that.validUntil) && Objects.equals(lastUsed, that.lastUsed) && - Objects.equals(cancelled, that.cancelled) && - Objects.equals(comment, that.comment) && + Objects.equals(cancellationDate, that.cancellationDate) && + Objects.equals(remark, that.remark) && Objects.equals(customerId, that.customerId); } @@ -164,12 +164,12 @@ public class SepaMandateCriteria implements Serializable { reference, iban, bic, - created, + documentDate, validFrom, - validTo, + validUntil, lastUsed, - cancelled, - comment, + cancellationDate, + remark, customerId ); } @@ -181,12 +181,12 @@ public class SepaMandateCriteria implements Serializable { (reference != null ? "reference=" + reference + ", " : "") + (iban != null ? "iban=" + iban + ", " : "") + (bic != null ? "bic=" + bic + ", " : "") + - (created != null ? "created=" + created + ", " : "") + + (documentDate != null ? "documentDate=" + documentDate + ", " : "") + (validFrom != null ? "validFrom=" + validFrom + ", " : "") + - (validTo != null ? "validTo=" + validTo + ", " : "") + + (validUntil != null ? "validUntil=" + validUntil + ", " : "") + (lastUsed != null ? "lastUsed=" + lastUsed + ", " : "") + - (cancelled != null ? "cancelled=" + cancelled + ", " : "") + - (comment != null ? "comment=" + comment + ", " : "") + + (cancellationDate != null ? "cancellationDate=" + cancellationDate + ", " : "") + + (remark != null ? "remark=" + remark + ", " : "") + (customerId != null ? "customerId=" + customerId + ", " : "") + "}"; } diff --git a/src/main/java/org/hostsharing/hsadminng/service/dto/SepaMandateDTO.java b/src/main/java/org/hostsharing/hsadminng/service/dto/SepaMandateDTO.java index 47864e47..c763f352 100644 --- a/src/main/java/org/hostsharing/hsadminng/service/dto/SepaMandateDTO.java +++ b/src/main/java/org/hostsharing/hsadminng/service/dto/SepaMandateDTO.java @@ -22,19 +22,19 @@ public class SepaMandateDTO implements Serializable { private String bic; @NotNull - private LocalDate created; + private LocalDate documentDate; @NotNull private LocalDate validFrom; - private LocalDate validTo; + private LocalDate validUntil; private LocalDate lastUsed; - private LocalDate cancelled; + private LocalDate cancellationDate; @Size(max = 160) - private String comment; + private String remark; private Long customerId; @@ -73,12 +73,12 @@ public class SepaMandateDTO implements Serializable { this.bic = bic; } - public LocalDate getCreated() { - return created; + public LocalDate getDocumentDate() { + return documentDate; } - public void setCreated(LocalDate created) { - this.created = created; + public void setDocumentDate(LocalDate documentDate) { + this.documentDate = documentDate; } public LocalDate getValidFrom() { @@ -89,12 +89,12 @@ public class SepaMandateDTO implements Serializable { this.validFrom = validFrom; } - public LocalDate getValidTo() { - return validTo; + public LocalDate getValidUntil() { + return validUntil; } - public void setValidTo(LocalDate validTo) { - this.validTo = validTo; + public void setValidUntil(LocalDate validUntil) { + this.validUntil = validUntil; } public LocalDate getLastUsed() { @@ -105,20 +105,20 @@ public class SepaMandateDTO implements Serializable { this.lastUsed = lastUsed; } - public LocalDate getCancelled() { - return cancelled; + public LocalDate getCancellationDate() { + return cancellationDate; } - public void setCancelled(LocalDate cancelled) { - this.cancelled = cancelled; + public void setCancellationDate(LocalDate cancellationDate) { + this.cancellationDate = cancellationDate; } - public String getComment() { - return comment; + public String getRemark() { + return remark; } - public void setComment(String comment) { - this.comment = comment; + public void setRemark(String remark) { + this.remark = remark; } public Long getCustomerId() { @@ -165,12 +165,12 @@ public class SepaMandateDTO implements Serializable { ", reference='" + getReference() + "'" + ", iban='" + getIban() + "'" + ", bic='" + getBic() + "'" + - ", created='" + getCreated() + "'" + + ", documentDate='" + getDocumentDate() + "'" + ", validFrom='" + getValidFrom() + "'" + - ", validTo='" + getValidTo() + "'" + + ", validUntil='" + getValidUntil() + "'" + ", lastUsed='" + getLastUsed() + "'" + - ", cancelled='" + getCancelled() + "'" + - ", comment='" + getComment() + "'" + + ", cancellationDate='" + getCancellationDate() + "'" + + ", remark='" + getRemark() + "'" + ", customer=" + getCustomerId() + ", customer='" + getCustomerPrefix() + "'" + "}"; diff --git a/src/main/java/org/hostsharing/hsadminng/service/dto/ShareCriteria.java b/src/main/java/org/hostsharing/hsadminng/service/dto/ShareCriteria.java index cf91b036..313be4d3 100644 --- a/src/main/java/org/hostsharing/hsadminng/service/dto/ShareCriteria.java +++ b/src/main/java/org/hostsharing/hsadminng/service/dto/ShareCriteria.java @@ -31,13 +31,15 @@ public class ShareCriteria implements Serializable { private LongFilter id; - private LocalDateFilter date; + private LocalDateFilter documentDate; + + private LocalDateFilter valueDate; private ShareActionFilter action; private IntegerFilter quantity; - private StringFilter comment; + private StringFilter remark; private LongFilter membershipId; @@ -49,12 +51,20 @@ public class ShareCriteria implements Serializable { this.id = id; } - public LocalDateFilter getDate() { - return date; + public LocalDateFilter getDocumentDate() { + return documentDate; } - public void setDate(LocalDateFilter date) { - this.date = date; + public void setDocumentDate(LocalDateFilter documentDate) { + this.documentDate = documentDate; + } + + public LocalDateFilter getValueDate() { + return valueDate; + } + + public void setValueDate(LocalDateFilter valueDate) { + this.valueDate = valueDate; } public ShareActionFilter getAction() { @@ -73,12 +83,12 @@ public class ShareCriteria implements Serializable { this.quantity = quantity; } - public StringFilter getComment() { - return comment; + public StringFilter getRemark() { + return remark; } - public void setComment(StringFilter comment) { - this.comment = comment; + public void setRemark(StringFilter remark) { + this.remark = remark; } public LongFilter getMembershipId() { @@ -101,10 +111,11 @@ public class ShareCriteria implements Serializable { final ShareCriteria that = (ShareCriteria) o; return Objects.equals(id, that.id) && - Objects.equals(date, that.date) && + Objects.equals(documentDate, that.documentDate) && + Objects.equals(valueDate, that.valueDate) && Objects.equals(action, that.action) && Objects.equals(quantity, that.quantity) && - Objects.equals(comment, that.comment) && + Objects.equals(remark, that.remark) && Objects.equals(membershipId, that.membershipId); } @@ -112,10 +123,11 @@ public class ShareCriteria implements Serializable { public int hashCode() { return Objects.hash( id, - date, + documentDate, + valueDate, action, quantity, - comment, + remark, membershipId ); } @@ -124,10 +136,11 @@ public class ShareCriteria implements Serializable { public String toString() { return "ShareCriteria{" + (id != null ? "id=" + id + ", " : "") + - (date != null ? "date=" + date + ", " : "") + + (documentDate != null ? "documentDate=" + documentDate + ", " : "") + + (valueDate != null ? "valueDate=" + valueDate + ", " : "") + (action != null ? "action=" + action + ", " : "") + (quantity != null ? "quantity=" + quantity + ", " : "") + - (comment != null ? "comment=" + comment + ", " : "") + + (remark != null ? "remark=" + remark + ", " : "") + (membershipId != null ? "membershipId=" + membershipId + ", " : "") + "}"; } diff --git a/src/main/java/org/hostsharing/hsadminng/service/dto/ShareDTO.java b/src/main/java/org/hostsharing/hsadminng/service/dto/ShareDTO.java index b172da4b..e9f873fa 100644 --- a/src/main/java/org/hostsharing/hsadminng/service/dto/ShareDTO.java +++ b/src/main/java/org/hostsharing/hsadminng/service/dto/ShareDTO.java @@ -13,7 +13,10 @@ public class ShareDTO implements Serializable { private Long id; @NotNull - private LocalDate date; + private LocalDate documentDate; + + @NotNull + private LocalDate valueDate; @NotNull private ShareAction action; @@ -22,12 +25,12 @@ public class ShareDTO implements Serializable { private Integer quantity; @Size(max = 160) - private String comment; + private String remark; private Long membershipId; - private String membershipFrom; + private String membershipDocumentDate; public Long getId() { return id; @@ -37,12 +40,20 @@ public class ShareDTO implements Serializable { this.id = id; } - public LocalDate getDate() { - return date; + public LocalDate getDocumentDate() { + return documentDate; } - public void setDate(LocalDate date) { - this.date = date; + public void setDocumentDate(LocalDate documentDate) { + this.documentDate = documentDate; + } + + public LocalDate getValueDate() { + return valueDate; + } + + public void setValueDate(LocalDate valueDate) { + this.valueDate = valueDate; } public ShareAction getAction() { @@ -61,12 +72,12 @@ public class ShareDTO implements Serializable { this.quantity = quantity; } - public String getComment() { - return comment; + public String getRemark() { + return remark; } - public void setComment(String comment) { - this.comment = comment; + public void setRemark(String remark) { + this.remark = remark; } public Long getMembershipId() { @@ -77,12 +88,12 @@ public class ShareDTO implements Serializable { this.membershipId = membershipId; } - public String getMembershipFrom() { - return membershipFrom; + public String getMembershipDocumentDate() { + return membershipDocumentDate; } - public void setMembershipFrom(String membershipFrom) { - this.membershipFrom = membershipFrom; + public void setMembershipDocumentDate(String membershipDocumentDate) { + this.membershipDocumentDate = membershipDocumentDate; } @Override @@ -110,12 +121,13 @@ public class ShareDTO implements Serializable { public String toString() { return "ShareDTO{" + "id=" + getId() + - ", date='" + getDate() + "'" + + ", documentDate='" + getDocumentDate() + "'" + + ", valueDate='" + getValueDate() + "'" + ", action='" + getAction() + "'" + ", quantity=" + getQuantity() + - ", comment='" + getComment() + "'" + + ", remark='" + getRemark() + "'" + ", membership=" + getMembershipId() + - ", membership='" + getMembershipFrom() + "'" + + ", membership='" + getMembershipDocumentDate() + "'" + "}"; } } diff --git a/src/main/java/org/hostsharing/hsadminng/service/mapper/AssetMapper.java b/src/main/java/org/hostsharing/hsadminng/service/mapper/AssetMapper.java index f5d2b500..d43fc5c0 100644 --- a/src/main/java/org/hostsharing/hsadminng/service/mapper/AssetMapper.java +++ b/src/main/java/org/hostsharing/hsadminng/service/mapper/AssetMapper.java @@ -12,7 +12,7 @@ import org.mapstruct.*; public interface AssetMapper extends EntityMapper { @Mapping(source = "membership.id", target = "membershipId") - @Mapping(source = "membership.from", target = "membershipFrom") + @Mapping(source = "membership.documentDate", target = "membershipDocumentDate") AssetDTO toDto(Asset asset); @Mapping(source = "membershipId", target = "membership") diff --git a/src/main/java/org/hostsharing/hsadminng/service/mapper/ShareMapper.java b/src/main/java/org/hostsharing/hsadminng/service/mapper/ShareMapper.java index 5c6fa970..6867130d 100644 --- a/src/main/java/org/hostsharing/hsadminng/service/mapper/ShareMapper.java +++ b/src/main/java/org/hostsharing/hsadminng/service/mapper/ShareMapper.java @@ -12,7 +12,7 @@ import org.mapstruct.*; public interface ShareMapper extends EntityMapper { @Mapping(source = "membership.id", target = "membershipId") - @Mapping(source = "membership.from", target = "membershipFrom") + @Mapping(source = "membership.documentDate", target = "membershipDocumentDate") ShareDTO toDto(Share share); @Mapping(source = "membershipId", target = "membership") diff --git a/src/main/jdl/customer.jdl b/src/main/jdl/customer.jdl index 86189c72..9af8c485 100644 --- a/src/main/jdl/customer.jdl +++ b/src/main/jdl/customer.jdl @@ -4,19 +4,21 @@ service all with serviceClass paginate all with infinite-scroll entity Customer { - number Integer required unique min(10000) max(99999), - prefix String required unique pattern(/[a-z][a-z0-9]+/), + reference Integer required unique min(10000) max(99999), + prefix String required maxlength(3) unique pattern(/[a-z][a-z0-9]+/), name String required maxlength(80), contractualSalutation String maxlength(80), contractualAddress String required maxlength(400), billingSalutation String maxlength(80), - billingAddress String maxlength(400) + billingAddress String maxlength(400), + remark String maxlength(160) } entity Membership { - from LocalDate required, - to LocalDate, - comment String maxlength(160) + documentDate LocalDate required, + memberFrom LocalDate required, + memberUntil LocalDate, + remark String maxlength(160) } enum ShareAction { @@ -25,10 +27,11 @@ enum ShareAction { } entity Share { - date LocalDate required, + documentDate LocalDate required, + valueDate LocalDate required, action ShareAction required, quantity Integer required, - comment String maxlength(160) + remark String maxlength(160) } enum AssetAction { @@ -41,27 +44,28 @@ enum AssetAction { } entity Asset { - date LocalDate required, + documentDate LocalDate required, + valueDate LocalDate required, action AssetAction required, amount BigDecimal required, - comment String maxlength(160) + remark String maxlength(160) } entity SepaMandate { reference String maxlength(40) unique required, iban String maxlength(34), bic String maxlength(11), - created LocalDate required, + documentDate LocalDate required, validFrom LocalDate required, - validTo LocalDate, + validUntil LocalDate, lastUsed LocalDate, - cancelled LocalDate, - comment String maxlength(160) + cancellationDate LocalDate, + remark String maxlength(160) } relationship OneToMany { Customer{membership} to Membership{customer(prefix) required}, Customer{sepamandate} to SepaMandate{customer(prefix) required}, - Membership{share} to Share{membership(from) required}, - Membership{asset} to Asset{membership(from) required} + Membership{share} to Share{membership(documentDate) required}, + Membership{asset} to Asset{membership(documentDate) required} } diff --git a/src/main/resources/config/liquibase/changelog/20190418073043_added_entity_Customer.xml b/src/main/resources/config/liquibase/changelog/20190418073043_added_entity_Customer.xml index 806455ff..598384eb 100644 --- a/src/main/resources/config/liquibase/changelog/20190418073043_added_entity_Customer.xml +++ b/src/main/resources/config/liquibase/changelog/20190418073043_added_entity_Customer.xml @@ -16,16 +16,16 @@ - + - - + + - + @@ -49,6 +49,10 @@ + + + + diff --git a/src/main/resources/config/liquibase/changelog/20190418073044_added_entity_Membership.xml b/src/main/resources/config/liquibase/changelog/20190418073044_added_entity_Membership.xml index 0d507a7c..3daf95d2 100644 --- a/src/main/resources/config/liquibase/changelog/20190418073044_added_entity_Membership.xml +++ b/src/main/resources/config/liquibase/changelog/20190418073044_added_entity_Membership.xml @@ -1,8 +1,10 @@ + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd + http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd"> @@ -14,20 +16,24 @@ - + - + - + + + + + - + @@ -39,6 +45,5 @@ - diff --git a/src/main/resources/config/liquibase/changelog/20190418073045_added_entity_Share.xml b/src/main/resources/config/liquibase/changelog/20190418073045_added_entity_Share.xml index 2deeb846..dc3c9f2f 100644 --- a/src/main/resources/config/liquibase/changelog/20190418073045_added_entity_Share.xml +++ b/src/main/resources/config/liquibase/changelog/20190418073045_added_entity_Share.xml @@ -21,7 +21,11 @@ - + + + + + @@ -33,7 +37,7 @@ - + diff --git a/src/main/resources/config/liquibase/changelog/20190418073046_added_entity_Asset.xml b/src/main/resources/config/liquibase/changelog/20190418073046_added_entity_Asset.xml index 69d32fc5..54fbb83d 100644 --- a/src/main/resources/config/liquibase/changelog/20190418073046_added_entity_Asset.xml +++ b/src/main/resources/config/liquibase/changelog/20190418073046_added_entity_Asset.xml @@ -21,7 +21,11 @@ - + + + + + @@ -33,7 +37,7 @@ - + diff --git a/src/main/resources/config/liquibase/changelog/20190418100951_added_entity_SepaMandate.xml b/src/main/resources/config/liquibase/changelog/20190418100951_added_entity_SepaMandate.xml new file mode 100644 index 00000000..17a2e0bf --- /dev/null +++ b/src/main/resources/config/liquibase/changelog/20190418100951_added_entity_SepaMandate.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/config/liquibase/changelog/20190418100951_added_entity_constraints_SepaMandate.xml b/src/main/resources/config/liquibase/changelog/20190418100951_added_entity_constraints_SepaMandate.xml new file mode 100644 index 00000000..019bba36 --- /dev/null +++ b/src/main/resources/config/liquibase/changelog/20190418100951_added_entity_constraints_SepaMandate.xml @@ -0,0 +1,18 @@ + + + + + + + + + diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml index 0c4148bc..1b1e5941 100644 --- a/src/main/resources/config/liquibase/master.xml +++ b/src/main/resources/config/liquibase/master.xml @@ -5,16 +5,19 @@ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd"> - - - - - + + + + + + + - - - - + + + + + diff --git a/src/main/webapp/app/entities/asset/asset-detail.component.html b/src/main/webapp/app/entities/asset/asset-detail.component.html index 989ab045..c259a165 100644 --- a/src/main/webapp/app/entities/asset/asset-detail.component.html +++ b/src/main/webapp/app/entities/asset/asset-detail.component.html @@ -5,9 +5,13 @@
-
Date
+
Document Date
- {{asset.date}} + {{asset.documentDate}} +
+
Value Date
+
+ {{asset.valueDate}}
Action
@@ -17,14 +21,14 @@
{{asset.amount}}
-
Comment
+
Remark
- {{asset.comment}} + {{asset.remark}}
Membership
diff --git a/src/main/webapp/app/entities/asset/asset-update.component.html b/src/main/webapp/app/entities/asset/asset-update.component.html index dc7a98db..cc48af42 100644 --- a/src/main/webapp/app/entities/asset/asset-update.component.html +++ b/src/main/webapp/app/entities/asset/asset-update.component.html @@ -10,17 +10,33 @@ [(ngModel)]="asset.id" readonly />
- +
- - +
-
+
+ [hidden]="!editForm.controls.documentDate?.errors?.required" jhiTranslate="entity.validation.required"> + This field is required. + +
+
+
+ +
+ + + + +
+
+ This field is required.
@@ -58,12 +74,12 @@
- - -
+ + +
+ [hidden]="!editForm.controls.remark?.errors?.maxlength" jhiTranslate="entity.validation.maxlength" [translateValues]="{ max: 160 }"> This field cannot be longer than 160 characters.
@@ -73,7 +89,7 @@
diff --git a/src/main/webapp/app/entities/asset/asset-update.component.ts b/src/main/webapp/app/entities/asset/asset-update.component.ts index 98147937..a58ab009 100644 --- a/src/main/webapp/app/entities/asset/asset-update.component.ts +++ b/src/main/webapp/app/entities/asset/asset-update.component.ts @@ -19,7 +19,8 @@ export class AssetUpdateComponent implements OnInit { isSaving: boolean; memberships: IMembership[]; - dateDp: any; + documentDateDp: any; + valueDateDp: any; constructor( protected jhiAlertService: JhiAlertService, diff --git a/src/main/webapp/app/entities/asset/asset.component.html b/src/main/webapp/app/entities/asset/asset.component.html index f039d334..8fac5e46 100644 --- a/src/main/webapp/app/entities/asset/asset.component.html +++ b/src/main/webapp/app/entities/asset/asset.component.html @@ -15,24 +15,26 @@ ID - Date + Document Date + Value Date Action Amount - Comment - Membership + Remark + Membership {{asset.id}} - {{asset.date | date:'mediumDate'}} + {{asset.documentDate | date:'mediumDate'}} + {{asset.valueDate | date:'mediumDate'}} {{asset.action}} {{asset.amount}} - {{asset.comment}} + {{asset.remark}} diff --git a/src/main/webapp/app/entities/asset/asset.service.ts b/src/main/webapp/app/entities/asset/asset.service.ts index 9ef5cbde..379d2cec 100644 --- a/src/main/webapp/app/entities/asset/asset.service.ts +++ b/src/main/webapp/app/entities/asset/asset.service.ts @@ -51,14 +51,16 @@ export class AssetService { protected convertDateFromClient(asset: IAsset): IAsset { const copy: IAsset = Object.assign({}, asset, { - date: asset.date != null && asset.date.isValid() ? asset.date.format(DATE_FORMAT) : null + documentDate: asset.documentDate != null && asset.documentDate.isValid() ? asset.documentDate.format(DATE_FORMAT) : null, + valueDate: asset.valueDate != null && asset.valueDate.isValid() ? asset.valueDate.format(DATE_FORMAT) : null }); return copy; } protected convertDateFromServer(res: EntityResponseType): EntityResponseType { if (res.body) { - res.body.date = res.body.date != null ? moment(res.body.date) : null; + res.body.documentDate = res.body.documentDate != null ? moment(res.body.documentDate) : null; + res.body.valueDate = res.body.valueDate != null ? moment(res.body.valueDate) : null; } return res; } @@ -66,7 +68,8 @@ export class AssetService { protected convertDateArrayFromServer(res: EntityArrayResponseType): EntityArrayResponseType { if (res.body) { res.body.forEach((asset: IAsset) => { - asset.date = asset.date != null ? moment(asset.date) : null; + asset.documentDate = asset.documentDate != null ? moment(asset.documentDate) : null; + asset.valueDate = asset.valueDate != null ? moment(asset.valueDate) : null; }); } return res; diff --git a/src/main/webapp/app/entities/customer/customer-detail.component.html b/src/main/webapp/app/entities/customer/customer-detail.component.html index 06300ca7..a3d1343c 100644 --- a/src/main/webapp/app/entities/customer/customer-detail.component.html +++ b/src/main/webapp/app/entities/customer/customer-detail.component.html @@ -5,9 +5,9 @@
-
Number
+
Reference
- {{customer.number}} + {{customer.reference}}
Prefix
@@ -33,6 +33,10 @@
{{customer.billingAddress}}
+
Remark
+
+ {{customer.remark}} +
- - -
+ + +
+ [hidden]="!editForm.controls.reference?.errors?.required" jhiTranslate="entity.validation.required"> This field is required. + [hidden]="!editForm.controls.reference?.errors?.min" jhiTranslate="entity.validation.min" [translateValues]="{ min: 10000 }"> This field should be at least 10000. + [hidden]="!editForm.controls.reference?.errors?.max" jhiTranslate="entity.validation.max" [translateValues]="{ max: 99999 }"> This field cannot be more than 99999. + [hidden]="!editForm.controls.reference?.errors?.number" jhiTranslate="entity.validation.number"> This field should be a number.
@@ -35,12 +35,16 @@
+ [(ngModel)]="customer.prefix" required maxlength="3" pattern="[a-z][a-z0-9]+"/>
This field is required. + + This field cannot be longer than 3 characters. + This field should follow pattern for "Prefix". @@ -48,20 +52,17 @@
- + + [(ngModel)]="customer.name" required maxlength="80"/>
- This field is required. + [hidden]="!editForm.controls.name?.errors?.required" jhiTranslate="entity.validation.required"> + This field is required. - This field cannot be longer than 80 characters. + [hidden]="!editForm.controls.name?.errors?.maxlength" jhiTranslate="entity.validation.maxlength" [translateValues]="{ max: 80 }"> + This field cannot be longer than 80 characters.
@@ -82,14 +83,12 @@ [(ngModel)]="customer.contractualAddress" required maxlength="400"/>
- This field is required. + [hidden]="!editForm.controls.contractualAddress?.errors?.required" jhiTranslate="entity.validation.required"> + This field is required. - This field cannot be longer than 400 characters. + [hidden]="!editForm.controls.contractualAddress?.errors?.maxlength" jhiTranslate="entity.validation.maxlength" [translateValues]="{ max: 400 }"> + This field cannot be longer than 400 characters.
@@ -110,9 +109,19 @@ [(ngModel)]="customer.billingAddress" maxlength="400"/>
- This field cannot be longer than 400 characters. + [hidden]="!editForm.controls.billingAddress?.errors?.maxlength" jhiTranslate="entity.validation.maxlength" [translateValues]="{ max: 400 }"> + This field cannot be longer than 400 characters. + +
+
+
+ + +
+ + This field cannot be longer than 160 characters.
diff --git a/src/main/webapp/app/entities/customer/customer.component.html b/src/main/webapp/app/entities/customer/customer.component.html index 55bbff3e..38405029 100644 --- a/src/main/webapp/app/entities/customer/customer.component.html +++ b/src/main/webapp/app/entities/customer/customer.component.html @@ -15,26 +15,28 @@ ID - Number + Reference Prefix Name Contractual Salutation Contractual Address Billing Salutation Billing Address + Remark {{customer.id}} - {{customer.number}} + {{customer.reference}} {{customer.prefix}} {{customer.name}} {{customer.contractualSalutation}} {{customer.contractualAddress}} {{customer.billingSalutation}} {{customer.billingAddress}} + {{customer.remark}}
- +
- - +
-
+
+ [hidden]="!editForm.controls.documentDate?.errors?.required" jhiTranslate="entity.validation.required"> This field is required.
- +
- + + + +
+
+ + This field is required. + +
+
+
+ +
+ - +
- - -
+ + +
+ [hidden]="!editForm.controls.remark?.errors?.maxlength" jhiTranslate="entity.validation.maxlength" [translateValues]="{ max: 160 }"> This field cannot be longer than 160 characters.
diff --git a/src/main/webapp/app/entities/membership/membership-update.component.ts b/src/main/webapp/app/entities/membership/membership-update.component.ts index 9a4c88bb..1f68bfc2 100644 --- a/src/main/webapp/app/entities/membership/membership-update.component.ts +++ b/src/main/webapp/app/entities/membership/membership-update.component.ts @@ -19,8 +19,9 @@ export class MembershipUpdateComponent implements OnInit { isSaving: boolean; customers: ICustomer[]; - fromDp: any; - toDp: any; + documentDateDp: any; + memberFromDp: any; + memberUntilDp: any; constructor( protected jhiAlertService: JhiAlertService, diff --git a/src/main/webapp/app/entities/membership/membership.component.html b/src/main/webapp/app/entities/membership/membership.component.html index 16cce281..6852205f 100644 --- a/src/main/webapp/app/entities/membership/membership.component.html +++ b/src/main/webapp/app/entities/membership/membership.component.html @@ -15,9 +15,10 @@ ID - From - To - Comment + Document Date + Member From + Member Until + Remark Customer @@ -25,9 +26,10 @@ {{membership.id}} - {{membership.from | date:'mediumDate'}} - {{membership.to | date:'mediumDate'}} - {{membership.comment}} + {{membership.documentDate | date:'mediumDate'}} + {{membership.memberFrom | date:'mediumDate'}} + {{membership.memberUntil | date:'mediumDate'}} + {{membership.remark}}
{{membership.customerPrefix}} diff --git a/src/main/webapp/app/entities/membership/membership.service.ts b/src/main/webapp/app/entities/membership/membership.service.ts index 9784448f..c0fb3e77 100644 --- a/src/main/webapp/app/entities/membership/membership.service.ts +++ b/src/main/webapp/app/entities/membership/membership.service.ts @@ -51,16 +51,20 @@ export class MembershipService { protected convertDateFromClient(membership: IMembership): IMembership { const copy: IMembership = Object.assign({}, membership, { - from: membership.from != null && membership.from.isValid() ? membership.from.format(DATE_FORMAT) : null, - to: membership.to != null && membership.to.isValid() ? membership.to.format(DATE_FORMAT) : null + documentDate: + membership.documentDate != null && membership.documentDate.isValid() ? membership.documentDate.format(DATE_FORMAT) : null, + memberFrom: membership.memberFrom != null && membership.memberFrom.isValid() ? membership.memberFrom.format(DATE_FORMAT) : null, + memberUntil: + membership.memberUntil != null && membership.memberUntil.isValid() ? membership.memberUntil.format(DATE_FORMAT) : null }); return copy; } protected convertDateFromServer(res: EntityResponseType): EntityResponseType { if (res.body) { - res.body.from = res.body.from != null ? moment(res.body.from) : null; - res.body.to = res.body.to != null ? moment(res.body.to) : null; + res.body.documentDate = res.body.documentDate != null ? moment(res.body.documentDate) : null; + res.body.memberFrom = res.body.memberFrom != null ? moment(res.body.memberFrom) : null; + res.body.memberUntil = res.body.memberUntil != null ? moment(res.body.memberUntil) : null; } return res; } @@ -68,8 +72,9 @@ export class MembershipService { protected convertDateArrayFromServer(res: EntityArrayResponseType): EntityArrayResponseType { if (res.body) { res.body.forEach((membership: IMembership) => { - membership.from = membership.from != null ? moment(membership.from) : null; - membership.to = membership.to != null ? moment(membership.to) : null; + membership.documentDate = membership.documentDate != null ? moment(membership.documentDate) : null; + membership.memberFrom = membership.memberFrom != null ? moment(membership.memberFrom) : null; + membership.memberUntil = membership.memberUntil != null ? moment(membership.memberUntil) : null; }); } return res; diff --git a/src/main/webapp/app/entities/sepa-mandate/sepa-mandate-detail.component.html b/src/main/webapp/app/entities/sepa-mandate/sepa-mandate-detail.component.html index 0c38c5e5..5b87977f 100644 --- a/src/main/webapp/app/entities/sepa-mandate/sepa-mandate-detail.component.html +++ b/src/main/webapp/app/entities/sepa-mandate/sepa-mandate-detail.component.html @@ -17,29 +17,29 @@
{{sepaMandate.bic}}
-
Created
+
Document Date
- {{sepaMandate.created}} + {{sepaMandate.documentDate}}
Valid From
{{sepaMandate.validFrom}}
-
Valid To
+
Valid Until
- {{sepaMandate.validTo}} + {{sepaMandate.validUntil}}
Last Used
{{sepaMandate.lastUsed}}
-
Cancelled
+
Cancellation Date
- {{sepaMandate.cancelled}} + {{sepaMandate.cancellationDate}}
-
Comment
+
Remark
- {{sepaMandate.comment}} + {{sepaMandate.remark}}
Customer
diff --git a/src/main/webapp/app/entities/sepa-mandate/sepa-mandate-update.component.html b/src/main/webapp/app/entities/sepa-mandate/sepa-mandate-update.component.html index d4256216..c4803427 100644 --- a/src/main/webapp/app/entities/sepa-mandate/sepa-mandate-update.component.html +++ b/src/main/webapp/app/entities/sepa-mandate/sepa-mandate-update.component.html @@ -47,17 +47,17 @@
- +
- - +
-
+
+ [hidden]="!editForm.controls.documentDate?.errors?.required" jhiTranslate="entity.validation.required"> This field is required.
@@ -79,12 +79,12 @@
- +
- - +
@@ -99,22 +99,22 @@
- +
- - +
- - -
+ + +
+ [hidden]="!editForm.controls.remark?.errors?.maxlength" jhiTranslate="entity.validation.maxlength" [translateValues]="{ max: 160 }"> This field cannot be longer than 160 characters.
diff --git a/src/main/webapp/app/entities/sepa-mandate/sepa-mandate.component.html b/src/main/webapp/app/entities/sepa-mandate/sepa-mandate.component.html index 67450128..21976ea7 100644 --- a/src/main/webapp/app/entities/sepa-mandate/sepa-mandate.component.html +++ b/src/main/webapp/app/entities/sepa-mandate/sepa-mandate.component.html @@ -18,12 +18,12 @@ Reference Iban Bic - Created + Document Date Valid From - Valid To + Valid Until Last Used - Cancelled - Comment + Cancellation Date + Remark Customer @@ -34,12 +34,12 @@ {{sepaMandate.reference}} {{sepaMandate.iban}} {{sepaMandate.bic}} - {{sepaMandate.created | date:'mediumDate'}} + {{sepaMandate.documentDate | date:'mediumDate'}} {{sepaMandate.validFrom | date:'mediumDate'}} - {{sepaMandate.validTo | date:'mediumDate'}} + {{sepaMandate.validUntil | date:'mediumDate'}} {{sepaMandate.lastUsed | date:'mediumDate'}} - {{sepaMandate.cancelled | date:'mediumDate'}} - {{sepaMandate.comment}} + {{sepaMandate.cancellationDate | date:'mediumDate'}} + {{sepaMandate.remark}}
{{sepaMandate.customerPrefix}} diff --git a/src/main/webapp/app/entities/sepa-mandate/sepa-mandate.service.ts b/src/main/webapp/app/entities/sepa-mandate/sepa-mandate.service.ts index cb5e5b77..17a9584a 100644 --- a/src/main/webapp/app/entities/sepa-mandate/sepa-mandate.service.ts +++ b/src/main/webapp/app/entities/sepa-mandate/sepa-mandate.service.ts @@ -51,22 +51,29 @@ export class SepaMandateService { protected convertDateFromClient(sepaMandate: ISepaMandate): ISepaMandate { const copy: ISepaMandate = Object.assign({}, sepaMandate, { - created: sepaMandate.created != null && sepaMandate.created.isValid() ? sepaMandate.created.format(DATE_FORMAT) : null, + documentDate: + sepaMandate.documentDate != null && sepaMandate.documentDate.isValid() + ? sepaMandate.documentDate.format(DATE_FORMAT) + : null, validFrom: sepaMandate.validFrom != null && sepaMandate.validFrom.isValid() ? sepaMandate.validFrom.format(DATE_FORMAT) : null, - validTo: sepaMandate.validTo != null && sepaMandate.validTo.isValid() ? sepaMandate.validTo.format(DATE_FORMAT) : null, + validUntil: + sepaMandate.validUntil != null && sepaMandate.validUntil.isValid() ? sepaMandate.validUntil.format(DATE_FORMAT) : null, lastUsed: sepaMandate.lastUsed != null && sepaMandate.lastUsed.isValid() ? sepaMandate.lastUsed.format(DATE_FORMAT) : null, - cancelled: sepaMandate.cancelled != null && sepaMandate.cancelled.isValid() ? sepaMandate.cancelled.format(DATE_FORMAT) : null + cancellationDate: + sepaMandate.cancellationDate != null && sepaMandate.cancellationDate.isValid() + ? sepaMandate.cancellationDate.format(DATE_FORMAT) + : null }); return copy; } protected convertDateFromServer(res: EntityResponseType): EntityResponseType { if (res.body) { - res.body.created = res.body.created != null ? moment(res.body.created) : null; + res.body.documentDate = res.body.documentDate != null ? moment(res.body.documentDate) : null; res.body.validFrom = res.body.validFrom != null ? moment(res.body.validFrom) : null; - res.body.validTo = res.body.validTo != null ? moment(res.body.validTo) : null; + res.body.validUntil = res.body.validUntil != null ? moment(res.body.validUntil) : null; res.body.lastUsed = res.body.lastUsed != null ? moment(res.body.lastUsed) : null; - res.body.cancelled = res.body.cancelled != null ? moment(res.body.cancelled) : null; + res.body.cancellationDate = res.body.cancellationDate != null ? moment(res.body.cancellationDate) : null; } return res; } @@ -74,11 +81,11 @@ export class SepaMandateService { protected convertDateArrayFromServer(res: EntityArrayResponseType): EntityArrayResponseType { if (res.body) { res.body.forEach((sepaMandate: ISepaMandate) => { - sepaMandate.created = sepaMandate.created != null ? moment(sepaMandate.created) : null; + sepaMandate.documentDate = sepaMandate.documentDate != null ? moment(sepaMandate.documentDate) : null; sepaMandate.validFrom = sepaMandate.validFrom != null ? moment(sepaMandate.validFrom) : null; - sepaMandate.validTo = sepaMandate.validTo != null ? moment(sepaMandate.validTo) : null; + sepaMandate.validUntil = sepaMandate.validUntil != null ? moment(sepaMandate.validUntil) : null; sepaMandate.lastUsed = sepaMandate.lastUsed != null ? moment(sepaMandate.lastUsed) : null; - sepaMandate.cancelled = sepaMandate.cancelled != null ? moment(sepaMandate.cancelled) : null; + sepaMandate.cancellationDate = sepaMandate.cancellationDate != null ? moment(sepaMandate.cancellationDate) : null; }); } return res; diff --git a/src/main/webapp/app/entities/share/share-detail.component.html b/src/main/webapp/app/entities/share/share-detail.component.html index 5ebcd18a..505a8591 100644 --- a/src/main/webapp/app/entities/share/share-detail.component.html +++ b/src/main/webapp/app/entities/share/share-detail.component.html @@ -5,9 +5,13 @@
-
Date
+
Document Date
- {{share.date}} + {{share.documentDate}} +
+
Value Date
+
+ {{share.valueDate}}
Action
@@ -17,14 +21,14 @@
{{share.quantity}}
-
Comment
+
Remark
- {{share.comment}} + {{share.remark}}
Membership
diff --git a/src/main/webapp/app/entities/share/share-update.component.html b/src/main/webapp/app/entities/share/share-update.component.html index ee2f579d..34d6853c 100644 --- a/src/main/webapp/app/entities/share/share-update.component.html +++ b/src/main/webapp/app/entities/share/share-update.component.html @@ -10,17 +10,33 @@ [(ngModel)]="share.id" readonly />
- +
- - +
-
+
+ [hidden]="!editForm.controls.documentDate?.errors?.required" jhiTranslate="entity.validation.required"> + This field is required. + +
+
+
+ +
+ + + + +
+
+ This field is required.
@@ -54,12 +70,12 @@
- - -
+ + +
+ [hidden]="!editForm.controls.remark?.errors?.maxlength" jhiTranslate="entity.validation.maxlength" [translateValues]="{ max: 160 }"> This field cannot be longer than 160 characters.
@@ -69,7 +85,7 @@
diff --git a/src/main/webapp/app/entities/share/share-update.component.ts b/src/main/webapp/app/entities/share/share-update.component.ts index 677a033c..e7301309 100644 --- a/src/main/webapp/app/entities/share/share-update.component.ts +++ b/src/main/webapp/app/entities/share/share-update.component.ts @@ -19,7 +19,8 @@ export class ShareUpdateComponent implements OnInit { isSaving: boolean; memberships: IMembership[]; - dateDp: any; + documentDateDp: any; + valueDateDp: any; constructor( protected jhiAlertService: JhiAlertService, diff --git a/src/main/webapp/app/entities/share/share.component.html b/src/main/webapp/app/entities/share/share.component.html index 9ee3a776..81c23e25 100644 --- a/src/main/webapp/app/entities/share/share.component.html +++ b/src/main/webapp/app/entities/share/share.component.html @@ -15,24 +15,26 @@ ID - Date + Document Date + Value Date Action Quantity - Comment - Membership + Remark + Membership {{share.id}} - {{share.date | date:'mediumDate'}} + {{share.documentDate | date:'mediumDate'}} + {{share.valueDate | date:'mediumDate'}} {{share.action}} {{share.quantity}} - {{share.comment}} + {{share.remark}} diff --git a/src/main/webapp/app/entities/share/share.service.ts b/src/main/webapp/app/entities/share/share.service.ts index 4b9389b3..d9bf57ec 100644 --- a/src/main/webapp/app/entities/share/share.service.ts +++ b/src/main/webapp/app/entities/share/share.service.ts @@ -51,14 +51,16 @@ export class ShareService { protected convertDateFromClient(share: IShare): IShare { const copy: IShare = Object.assign({}, share, { - date: share.date != null && share.date.isValid() ? share.date.format(DATE_FORMAT) : null + documentDate: share.documentDate != null && share.documentDate.isValid() ? share.documentDate.format(DATE_FORMAT) : null, + valueDate: share.valueDate != null && share.valueDate.isValid() ? share.valueDate.format(DATE_FORMAT) : null }); return copy; } protected convertDateFromServer(res: EntityResponseType): EntityResponseType { if (res.body) { - res.body.date = res.body.date != null ? moment(res.body.date) : null; + res.body.documentDate = res.body.documentDate != null ? moment(res.body.documentDate) : null; + res.body.valueDate = res.body.valueDate != null ? moment(res.body.valueDate) : null; } return res; } @@ -66,7 +68,8 @@ export class ShareService { protected convertDateArrayFromServer(res: EntityArrayResponseType): EntityArrayResponseType { if (res.body) { res.body.forEach((share: IShare) => { - share.date = share.date != null ? moment(share.date) : null; + share.documentDate = share.documentDate != null ? moment(share.documentDate) : null; + share.valueDate = share.valueDate != null ? moment(share.valueDate) : null; }); } return res; diff --git a/src/main/webapp/app/shared/model/asset.model.ts b/src/main/webapp/app/shared/model/asset.model.ts index def847a0..7964c1f7 100644 --- a/src/main/webapp/app/shared/model/asset.model.ts +++ b/src/main/webapp/app/shared/model/asset.model.ts @@ -11,22 +11,24 @@ export const enum AssetAction { export interface IAsset { id?: number; - date?: Moment; + documentDate?: Moment; + valueDate?: Moment; action?: AssetAction; amount?: number; - comment?: string; - membershipFrom?: string; + remark?: string; + membershipDocumentDate?: string; membershipId?: number; } export class Asset implements IAsset { constructor( public id?: number, - public date?: Moment, + public documentDate?: Moment, + public valueDate?: Moment, public action?: AssetAction, public amount?: number, - public comment?: string, - public membershipFrom?: string, + public remark?: string, + public membershipDocumentDate?: string, public membershipId?: number ) {} } diff --git a/src/main/webapp/app/shared/model/customer.model.ts b/src/main/webapp/app/shared/model/customer.model.ts index c8c2cd8f..1970b289 100644 --- a/src/main/webapp/app/shared/model/customer.model.ts +++ b/src/main/webapp/app/shared/model/customer.model.ts @@ -3,13 +3,14 @@ import { ISepaMandate } from 'app/shared/model/sepa-mandate.model'; export interface ICustomer { id?: number; - number?: number; + reference?: number; prefix?: string; name?: string; contractualSalutation?: string; contractualAddress?: string; billingSalutation?: string; billingAddress?: string; + remark?: string; memberships?: IMembership[]; sepamandates?: ISepaMandate[]; } @@ -17,13 +18,14 @@ export interface ICustomer { export class Customer implements ICustomer { constructor( public id?: number, - public number?: number, + public reference?: number, public prefix?: string, public name?: string, public contractualSalutation?: string, public contractualAddress?: string, public billingSalutation?: string, public billingAddress?: string, + public remark?: string, public memberships?: IMembership[], public sepamandates?: ISepaMandate[] ) {} diff --git a/src/main/webapp/app/shared/model/membership.model.ts b/src/main/webapp/app/shared/model/membership.model.ts index 87bbf1d6..57418782 100644 --- a/src/main/webapp/app/shared/model/membership.model.ts +++ b/src/main/webapp/app/shared/model/membership.model.ts @@ -4,9 +4,10 @@ import { IAsset } from 'app/shared/model/asset.model'; export interface IMembership { id?: number; - from?: Moment; - to?: Moment; - comment?: string; + documentDate?: Moment; + memberFrom?: Moment; + memberUntil?: Moment; + remark?: string; shares?: IShare[]; assets?: IAsset[]; customerPrefix?: string; @@ -16,9 +17,10 @@ export interface IMembership { export class Membership implements IMembership { constructor( public id?: number, - public from?: Moment, - public to?: Moment, - public comment?: string, + public documentDate?: Moment, + public memberFrom?: Moment, + public memberUntil?: Moment, + public remark?: string, public shares?: IShare[], public assets?: IAsset[], public customerPrefix?: string, diff --git a/src/main/webapp/app/shared/model/sepa-mandate.model.ts b/src/main/webapp/app/shared/model/sepa-mandate.model.ts index 0589e0b0..feccc941 100644 --- a/src/main/webapp/app/shared/model/sepa-mandate.model.ts +++ b/src/main/webapp/app/shared/model/sepa-mandate.model.ts @@ -5,12 +5,12 @@ export interface ISepaMandate { reference?: string; iban?: string; bic?: string; - created?: Moment; + documentDate?: Moment; validFrom?: Moment; - validTo?: Moment; + validUntil?: Moment; lastUsed?: Moment; - cancelled?: Moment; - comment?: string; + cancellationDate?: Moment; + remark?: string; customerPrefix?: string; customerId?: number; } @@ -21,12 +21,12 @@ export class SepaMandate implements ISepaMandate { public reference?: string, public iban?: string, public bic?: string, - public created?: Moment, + public documentDate?: Moment, public validFrom?: Moment, - public validTo?: Moment, + public validUntil?: Moment, public lastUsed?: Moment, - public cancelled?: Moment, - public comment?: string, + public cancellationDate?: Moment, + public remark?: string, public customerPrefix?: string, public customerId?: number ) {} diff --git a/src/main/webapp/app/shared/model/share.model.ts b/src/main/webapp/app/shared/model/share.model.ts index e318889f..5338867a 100644 --- a/src/main/webapp/app/shared/model/share.model.ts +++ b/src/main/webapp/app/shared/model/share.model.ts @@ -7,22 +7,24 @@ export const enum ShareAction { export interface IShare { id?: number; - date?: Moment; + documentDate?: Moment; + valueDate?: Moment; action?: ShareAction; quantity?: number; - comment?: string; - membershipFrom?: string; + remark?: string; + membershipDocumentDate?: string; membershipId?: number; } export class Share implements IShare { constructor( public id?: number, - public date?: Moment, + public documentDate?: Moment, + public valueDate?: Moment, public action?: ShareAction, public quantity?: number, - public comment?: string, - public membershipFrom?: string, + public remark?: string, + public membershipDocumentDate?: string, public membershipId?: number ) {} } diff --git a/src/main/webapp/i18n/de/asset.json b/src/main/webapp/i18n/de/asset.json index 1cd6fa89..ff6df7e7 100644 --- a/src/main/webapp/i18n/de/asset.json +++ b/src/main/webapp/i18n/de/asset.json @@ -15,10 +15,11 @@ "detail": { "title": "Asset" }, - "date": "Date", + "documentDate": "Document Date", + "valueDate": "Value Date", "action": "Action", "amount": "Amount", - "comment": "Comment", + "remark": "Remark", "membership": "Membership" } } diff --git a/src/main/webapp/i18n/de/customer.json b/src/main/webapp/i18n/de/customer.json index 88e0fb1b..a699be5a 100644 --- a/src/main/webapp/i18n/de/customer.json +++ b/src/main/webapp/i18n/de/customer.json @@ -15,13 +15,14 @@ "detail": { "title": "Customer" }, - "number": "Number", + "reference": "Reference", "prefix": "Prefix", "name": "Name", "contractualSalutation": "Contractual Salutation", "contractualAddress": "Contractual Address", "billingSalutation": "Billing Salutation", "billingAddress": "Billing Address", + "remark": "Remark", "membership": "Membership", "sepamandate": "Sepamandate" } diff --git a/src/main/webapp/i18n/de/membership.json b/src/main/webapp/i18n/de/membership.json index 925ad16c..936c4fc9 100644 --- a/src/main/webapp/i18n/de/membership.json +++ b/src/main/webapp/i18n/de/membership.json @@ -15,9 +15,10 @@ "detail": { "title": "Membership" }, - "from": "From", - "to": "To", - "comment": "Comment", + "documentDate": "Document Date", + "memberFrom": "Member From", + "memberUntil": "Member Until", + "remark": "Remark", "share": "Share", "asset": "Asset", "customer": "Customer" diff --git a/src/main/webapp/i18n/de/sepaMandate.json b/src/main/webapp/i18n/de/sepaMandate.json index f071fcbb..c0d1347b 100644 --- a/src/main/webapp/i18n/de/sepaMandate.json +++ b/src/main/webapp/i18n/de/sepaMandate.json @@ -18,12 +18,12 @@ "reference": "Reference", "iban": "Iban", "bic": "Bic", - "created": "Created", + "documentDate": "Document Date", "validFrom": "Valid From", - "validTo": "Valid To", + "validUntil": "Valid Until", "lastUsed": "Last Used", - "cancelled": "Cancelled", - "comment": "Comment", + "cancellationDate": "Cancellation Date", + "remark": "Remark", "customer": "Customer" } } diff --git a/src/main/webapp/i18n/de/share.json b/src/main/webapp/i18n/de/share.json index 977c72b8..fdb5dec4 100644 --- a/src/main/webapp/i18n/de/share.json +++ b/src/main/webapp/i18n/de/share.json @@ -15,10 +15,11 @@ "detail": { "title": "Share" }, - "date": "Date", + "documentDate": "Document Date", + "valueDate": "Value Date", "action": "Action", "quantity": "Quantity", - "comment": "Comment", + "remark": "Remark", "membership": "Membership" } } diff --git a/src/main/webapp/i18n/en/asset.json b/src/main/webapp/i18n/en/asset.json index 207565eb..ac290fb7 100644 --- a/src/main/webapp/i18n/en/asset.json +++ b/src/main/webapp/i18n/en/asset.json @@ -15,10 +15,11 @@ "detail": { "title": "Asset" }, - "date": "Date", + "documentDate": "Document Date", + "valueDate": "Value Date", "action": "Action", "amount": "Amount", - "comment": "Comment", + "remark": "Remark", "membership": "Membership" } } diff --git a/src/main/webapp/i18n/en/customer.json b/src/main/webapp/i18n/en/customer.json index 620db497..6f30090f 100644 --- a/src/main/webapp/i18n/en/customer.json +++ b/src/main/webapp/i18n/en/customer.json @@ -15,13 +15,14 @@ "detail": { "title": "Customer" }, - "number": "Number", + "reference": "Reference", "prefix": "Prefix", "name": "Name", "contractualSalutation": "Contractual Salutation", "contractualAddress": "Contractual Address", "billingSalutation": "Billing Salutation", "billingAddress": "Billing Address", + "remark": "Remark", "membership": "Membership", "sepamandate": "Sepamandate" } diff --git a/src/main/webapp/i18n/en/membership.json b/src/main/webapp/i18n/en/membership.json index c9828a5d..9bf9136c 100644 --- a/src/main/webapp/i18n/en/membership.json +++ b/src/main/webapp/i18n/en/membership.json @@ -15,9 +15,10 @@ "detail": { "title": "Membership" }, - "from": "From", - "to": "To", - "comment": "Comment", + "documentDate": "Document Date", + "memberFrom": "Member From", + "memberUntil": "Member Until", + "remark": "Remark", "share": "Share", "asset": "Asset", "customer": "Customer" diff --git a/src/main/webapp/i18n/en/sepaMandate.json b/src/main/webapp/i18n/en/sepaMandate.json index 22ffee76..a403e016 100644 --- a/src/main/webapp/i18n/en/sepaMandate.json +++ b/src/main/webapp/i18n/en/sepaMandate.json @@ -18,12 +18,12 @@ "reference": "Reference", "iban": "Iban", "bic": "Bic", - "created": "Created", + "documentDate": "Document Date", "validFrom": "Valid From", - "validTo": "Valid To", + "validUntil": "Valid Until", "lastUsed": "Last Used", - "cancelled": "Cancelled", - "comment": "Comment", + "cancellationDate": "Cancellation Date", + "remark": "Remark", "customer": "Customer" } } diff --git a/src/main/webapp/i18n/en/share.json b/src/main/webapp/i18n/en/share.json index 1a446f85..5c178744 100644 --- a/src/main/webapp/i18n/en/share.json +++ b/src/main/webapp/i18n/en/share.json @@ -15,10 +15,11 @@ "detail": { "title": "Share" }, - "date": "Date", + "documentDate": "Document Date", + "valueDate": "Value Date", "action": "Action", "quantity": "Quantity", - "comment": "Comment", + "remark": "Remark", "membership": "Membership" } } diff --git a/src/test/java/org/hostsharing/hsadminng/web/rest/AssetResourceIntTest.java b/src/test/java/org/hostsharing/hsadminng/web/rest/AssetResourceIntTest.java index 7e5f86fa..99a0217f 100644 --- a/src/test/java/org/hostsharing/hsadminng/web/rest/AssetResourceIntTest.java +++ b/src/test/java/org/hostsharing/hsadminng/web/rest/AssetResourceIntTest.java @@ -50,8 +50,11 @@ import org.hostsharing.hsadminng.domain.enumeration.AssetAction; @SpringBootTest(classes = HsadminNgApp.class) public class AssetResourceIntTest { - private static final LocalDate DEFAULT_DATE = LocalDate.ofEpochDay(0L); - private static final LocalDate UPDATED_DATE = LocalDate.now(ZoneId.systemDefault()); + private static final LocalDate DEFAULT_DOCUMENT_DATE = LocalDate.ofEpochDay(0L); + private static final LocalDate UPDATED_DOCUMENT_DATE = LocalDate.now(ZoneId.systemDefault()); + + private static final LocalDate DEFAULT_VALUE_DATE = LocalDate.ofEpochDay(0L); + private static final LocalDate UPDATED_VALUE_DATE = LocalDate.now(ZoneId.systemDefault()); private static final AssetAction DEFAULT_ACTION = AssetAction.PAYMENT; private static final AssetAction UPDATED_ACTION = AssetAction.HANDOVER; @@ -59,8 +62,8 @@ public class AssetResourceIntTest { private static final BigDecimal DEFAULT_AMOUNT = new BigDecimal(1); private static final BigDecimal UPDATED_AMOUNT = new BigDecimal(2); - private static final String DEFAULT_COMMENT = "AAAAAAAAAA"; - private static final String UPDATED_COMMENT = "BBBBBBBBBB"; + private static final String DEFAULT_REMARK = "AAAAAAAAAA"; + private static final String UPDATED_REMARK = "BBBBBBBBBB"; @Autowired private AssetRepository assetRepository; @@ -113,10 +116,11 @@ public class AssetResourceIntTest { */ public static Asset createEntity(EntityManager em) { Asset asset = new Asset() - .date(DEFAULT_DATE) + .documentDate(DEFAULT_DOCUMENT_DATE) + .valueDate(DEFAULT_VALUE_DATE) .action(DEFAULT_ACTION) .amount(DEFAULT_AMOUNT) - .comment(DEFAULT_COMMENT); + .remark(DEFAULT_REMARK); // Add required entity Membership membership = MembershipResourceIntTest.createEntity(em); em.persist(membership); @@ -146,10 +150,11 @@ public class AssetResourceIntTest { List assetList = assetRepository.findAll(); assertThat(assetList).hasSize(databaseSizeBeforeCreate + 1); Asset testAsset = assetList.get(assetList.size() - 1); - assertThat(testAsset.getDate()).isEqualTo(DEFAULT_DATE); + assertThat(testAsset.getDocumentDate()).isEqualTo(DEFAULT_DOCUMENT_DATE); + assertThat(testAsset.getValueDate()).isEqualTo(DEFAULT_VALUE_DATE); assertThat(testAsset.getAction()).isEqualTo(DEFAULT_ACTION); assertThat(testAsset.getAmount()).isEqualTo(DEFAULT_AMOUNT); - assertThat(testAsset.getComment()).isEqualTo(DEFAULT_COMMENT); + assertThat(testAsset.getRemark()).isEqualTo(DEFAULT_REMARK); } @Test @@ -174,10 +179,29 @@ public class AssetResourceIntTest { @Test @Transactional - public void checkDateIsRequired() throws Exception { + public void checkDocumentDateIsRequired() throws Exception { int databaseSizeBeforeTest = assetRepository.findAll().size(); // set the field null - asset.setDate(null); + asset.setDocumentDate(null); + + // Create the Asset, which fails. + AssetDTO assetDTO = assetMapper.toDto(asset); + + restAssetMockMvc.perform(post("/api/assets") + .contentType(TestUtil.APPLICATION_JSON_UTF8) + .content(TestUtil.convertObjectToJsonBytes(assetDTO))) + .andExpect(status().isBadRequest()); + + List assetList = assetRepository.findAll(); + assertThat(assetList).hasSize(databaseSizeBeforeTest); + } + + @Test + @Transactional + public void checkValueDateIsRequired() throws Exception { + int databaseSizeBeforeTest = assetRepository.findAll().size(); + // set the field null + asset.setValueDate(null); // Create the Asset, which fails. AssetDTO assetDTO = assetMapper.toDto(asset); @@ -240,10 +264,11 @@ public class AssetResourceIntTest { .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)) .andExpect(jsonPath("$.[*].id").value(hasItem(asset.getId().intValue()))) - .andExpect(jsonPath("$.[*].date").value(hasItem(DEFAULT_DATE.toString()))) + .andExpect(jsonPath("$.[*].documentDate").value(hasItem(DEFAULT_DOCUMENT_DATE.toString()))) + .andExpect(jsonPath("$.[*].valueDate").value(hasItem(DEFAULT_VALUE_DATE.toString()))) .andExpect(jsonPath("$.[*].action").value(hasItem(DEFAULT_ACTION.toString()))) .andExpect(jsonPath("$.[*].amount").value(hasItem(DEFAULT_AMOUNT.intValue()))) - .andExpect(jsonPath("$.[*].comment").value(hasItem(DEFAULT_COMMENT.toString()))); + .andExpect(jsonPath("$.[*].remark").value(hasItem(DEFAULT_REMARK.toString()))); } @Test @@ -257,75 +282,142 @@ public class AssetResourceIntTest { .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)) .andExpect(jsonPath("$.id").value(asset.getId().intValue())) - .andExpect(jsonPath("$.date").value(DEFAULT_DATE.toString())) + .andExpect(jsonPath("$.documentDate").value(DEFAULT_DOCUMENT_DATE.toString())) + .andExpect(jsonPath("$.valueDate").value(DEFAULT_VALUE_DATE.toString())) .andExpect(jsonPath("$.action").value(DEFAULT_ACTION.toString())) .andExpect(jsonPath("$.amount").value(DEFAULT_AMOUNT.intValue())) - .andExpect(jsonPath("$.comment").value(DEFAULT_COMMENT.toString())); + .andExpect(jsonPath("$.remark").value(DEFAULT_REMARK.toString())); } @Test @Transactional - public void getAllAssetsByDateIsEqualToSomething() throws Exception { + public void getAllAssetsByDocumentDateIsEqualToSomething() throws Exception { // Initialize the database assetRepository.saveAndFlush(asset); - // Get all the assetList where date equals to DEFAULT_DATE - defaultAssetShouldBeFound("date.equals=" + DEFAULT_DATE); + // Get all the assetList where documentDate equals to DEFAULT_DOCUMENT_DATE + defaultAssetShouldBeFound("documentDate.equals=" + DEFAULT_DOCUMENT_DATE); - // Get all the assetList where date equals to UPDATED_DATE - defaultAssetShouldNotBeFound("date.equals=" + UPDATED_DATE); + // Get all the assetList where documentDate equals to UPDATED_DOCUMENT_DATE + defaultAssetShouldNotBeFound("documentDate.equals=" + UPDATED_DOCUMENT_DATE); } @Test @Transactional - public void getAllAssetsByDateIsInShouldWork() throws Exception { + public void getAllAssetsByDocumentDateIsInShouldWork() throws Exception { // Initialize the database assetRepository.saveAndFlush(asset); - // Get all the assetList where date in DEFAULT_DATE or UPDATED_DATE - defaultAssetShouldBeFound("date.in=" + DEFAULT_DATE + "," + UPDATED_DATE); + // Get all the assetList where documentDate in DEFAULT_DOCUMENT_DATE or UPDATED_DOCUMENT_DATE + defaultAssetShouldBeFound("documentDate.in=" + DEFAULT_DOCUMENT_DATE + "," + UPDATED_DOCUMENT_DATE); - // Get all the assetList where date equals to UPDATED_DATE - defaultAssetShouldNotBeFound("date.in=" + UPDATED_DATE); + // Get all the assetList where documentDate equals to UPDATED_DOCUMENT_DATE + defaultAssetShouldNotBeFound("documentDate.in=" + UPDATED_DOCUMENT_DATE); } @Test @Transactional - public void getAllAssetsByDateIsNullOrNotNull() throws Exception { + public void getAllAssetsByDocumentDateIsNullOrNotNull() throws Exception { // Initialize the database assetRepository.saveAndFlush(asset); - // Get all the assetList where date is not null - defaultAssetShouldBeFound("date.specified=true"); + // Get all the assetList where documentDate is not null + defaultAssetShouldBeFound("documentDate.specified=true"); - // Get all the assetList where date is null - defaultAssetShouldNotBeFound("date.specified=false"); + // Get all the assetList where documentDate is null + defaultAssetShouldNotBeFound("documentDate.specified=false"); } @Test @Transactional - public void getAllAssetsByDateIsGreaterThanOrEqualToSomething() throws Exception { + public void getAllAssetsByDocumentDateIsGreaterThanOrEqualToSomething() throws Exception { // Initialize the database assetRepository.saveAndFlush(asset); - // Get all the assetList where date greater than or equals to DEFAULT_DATE - defaultAssetShouldBeFound("date.greaterOrEqualThan=" + DEFAULT_DATE); + // Get all the assetList where documentDate greater than or equals to DEFAULT_DOCUMENT_DATE + defaultAssetShouldBeFound("documentDate.greaterOrEqualThan=" + DEFAULT_DOCUMENT_DATE); - // Get all the assetList where date greater than or equals to UPDATED_DATE - defaultAssetShouldNotBeFound("date.greaterOrEqualThan=" + UPDATED_DATE); + // Get all the assetList where documentDate greater than or equals to UPDATED_DOCUMENT_DATE + defaultAssetShouldNotBeFound("documentDate.greaterOrEqualThan=" + UPDATED_DOCUMENT_DATE); } @Test @Transactional - public void getAllAssetsByDateIsLessThanSomething() throws Exception { + public void getAllAssetsByDocumentDateIsLessThanSomething() throws Exception { // Initialize the database assetRepository.saveAndFlush(asset); - // Get all the assetList where date less than or equals to DEFAULT_DATE - defaultAssetShouldNotBeFound("date.lessThan=" + DEFAULT_DATE); + // Get all the assetList where documentDate less than or equals to DEFAULT_DOCUMENT_DATE + defaultAssetShouldNotBeFound("documentDate.lessThan=" + DEFAULT_DOCUMENT_DATE); - // Get all the assetList where date less than or equals to UPDATED_DATE - defaultAssetShouldBeFound("date.lessThan=" + UPDATED_DATE); + // Get all the assetList where documentDate less than or equals to UPDATED_DOCUMENT_DATE + defaultAssetShouldBeFound("documentDate.lessThan=" + UPDATED_DOCUMENT_DATE); + } + + + @Test + @Transactional + public void getAllAssetsByValueDateIsEqualToSomething() throws Exception { + // Initialize the database + assetRepository.saveAndFlush(asset); + + // Get all the assetList where valueDate equals to DEFAULT_VALUE_DATE + defaultAssetShouldBeFound("valueDate.equals=" + DEFAULT_VALUE_DATE); + + // Get all the assetList where valueDate equals to UPDATED_VALUE_DATE + defaultAssetShouldNotBeFound("valueDate.equals=" + UPDATED_VALUE_DATE); + } + + @Test + @Transactional + public void getAllAssetsByValueDateIsInShouldWork() throws Exception { + // Initialize the database + assetRepository.saveAndFlush(asset); + + // Get all the assetList where valueDate in DEFAULT_VALUE_DATE or UPDATED_VALUE_DATE + defaultAssetShouldBeFound("valueDate.in=" + DEFAULT_VALUE_DATE + "," + UPDATED_VALUE_DATE); + + // Get all the assetList where valueDate equals to UPDATED_VALUE_DATE + defaultAssetShouldNotBeFound("valueDate.in=" + UPDATED_VALUE_DATE); + } + + @Test + @Transactional + public void getAllAssetsByValueDateIsNullOrNotNull() throws Exception { + // Initialize the database + assetRepository.saveAndFlush(asset); + + // Get all the assetList where valueDate is not null + defaultAssetShouldBeFound("valueDate.specified=true"); + + // Get all the assetList where valueDate is null + defaultAssetShouldNotBeFound("valueDate.specified=false"); + } + + @Test + @Transactional + public void getAllAssetsByValueDateIsGreaterThanOrEqualToSomething() throws Exception { + // Initialize the database + assetRepository.saveAndFlush(asset); + + // Get all the assetList where valueDate greater than or equals to DEFAULT_VALUE_DATE + defaultAssetShouldBeFound("valueDate.greaterOrEqualThan=" + DEFAULT_VALUE_DATE); + + // Get all the assetList where valueDate greater than or equals to UPDATED_VALUE_DATE + defaultAssetShouldNotBeFound("valueDate.greaterOrEqualThan=" + UPDATED_VALUE_DATE); + } + + @Test + @Transactional + public void getAllAssetsByValueDateIsLessThanSomething() throws Exception { + // Initialize the database + assetRepository.saveAndFlush(asset); + + // Get all the assetList where valueDate less than or equals to DEFAULT_VALUE_DATE + defaultAssetShouldNotBeFound("valueDate.lessThan=" + DEFAULT_VALUE_DATE); + + // Get all the assetList where valueDate less than or equals to UPDATED_VALUE_DATE + defaultAssetShouldBeFound("valueDate.lessThan=" + UPDATED_VALUE_DATE); } @@ -409,41 +501,41 @@ public class AssetResourceIntTest { @Test @Transactional - public void getAllAssetsByCommentIsEqualToSomething() throws Exception { + public void getAllAssetsByRemarkIsEqualToSomething() throws Exception { // Initialize the database assetRepository.saveAndFlush(asset); - // Get all the assetList where comment equals to DEFAULT_COMMENT - defaultAssetShouldBeFound("comment.equals=" + DEFAULT_COMMENT); + // Get all the assetList where remark equals to DEFAULT_REMARK + defaultAssetShouldBeFound("remark.equals=" + DEFAULT_REMARK); - // Get all the assetList where comment equals to UPDATED_COMMENT - defaultAssetShouldNotBeFound("comment.equals=" + UPDATED_COMMENT); + // Get all the assetList where remark equals to UPDATED_REMARK + defaultAssetShouldNotBeFound("remark.equals=" + UPDATED_REMARK); } @Test @Transactional - public void getAllAssetsByCommentIsInShouldWork() throws Exception { + public void getAllAssetsByRemarkIsInShouldWork() throws Exception { // Initialize the database assetRepository.saveAndFlush(asset); - // Get all the assetList where comment in DEFAULT_COMMENT or UPDATED_COMMENT - defaultAssetShouldBeFound("comment.in=" + DEFAULT_COMMENT + "," + UPDATED_COMMENT); + // Get all the assetList where remark in DEFAULT_REMARK or UPDATED_REMARK + defaultAssetShouldBeFound("remark.in=" + DEFAULT_REMARK + "," + UPDATED_REMARK); - // Get all the assetList where comment equals to UPDATED_COMMENT - defaultAssetShouldNotBeFound("comment.in=" + UPDATED_COMMENT); + // Get all the assetList where remark equals to UPDATED_REMARK + defaultAssetShouldNotBeFound("remark.in=" + UPDATED_REMARK); } @Test @Transactional - public void getAllAssetsByCommentIsNullOrNotNull() throws Exception { + public void getAllAssetsByRemarkIsNullOrNotNull() throws Exception { // Initialize the database assetRepository.saveAndFlush(asset); - // Get all the assetList where comment is not null - defaultAssetShouldBeFound("comment.specified=true"); + // Get all the assetList where remark is not null + defaultAssetShouldBeFound("remark.specified=true"); - // Get all the assetList where comment is null - defaultAssetShouldNotBeFound("comment.specified=false"); + // Get all the assetList where remark is null + defaultAssetShouldNotBeFound("remark.specified=false"); } @Test @@ -472,10 +564,11 @@ public class AssetResourceIntTest { .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)) .andExpect(jsonPath("$.[*].id").value(hasItem(asset.getId().intValue()))) - .andExpect(jsonPath("$.[*].date").value(hasItem(DEFAULT_DATE.toString()))) + .andExpect(jsonPath("$.[*].documentDate").value(hasItem(DEFAULT_DOCUMENT_DATE.toString()))) + .andExpect(jsonPath("$.[*].valueDate").value(hasItem(DEFAULT_VALUE_DATE.toString()))) .andExpect(jsonPath("$.[*].action").value(hasItem(DEFAULT_ACTION.toString()))) .andExpect(jsonPath("$.[*].amount").value(hasItem(DEFAULT_AMOUNT.intValue()))) - .andExpect(jsonPath("$.[*].comment").value(hasItem(DEFAULT_COMMENT))); + .andExpect(jsonPath("$.[*].remark").value(hasItem(DEFAULT_REMARK))); // Check, that the count call also returns 1 restAssetMockMvc.perform(get("/api/assets/count?sort=id,desc&" + filter)) @@ -523,10 +616,11 @@ public class AssetResourceIntTest { // Disconnect from session so that the updates on updatedAsset are not directly saved in db em.detach(updatedAsset); updatedAsset - .date(UPDATED_DATE) + .documentDate(UPDATED_DOCUMENT_DATE) + .valueDate(UPDATED_VALUE_DATE) .action(UPDATED_ACTION) .amount(UPDATED_AMOUNT) - .comment(UPDATED_COMMENT); + .remark(UPDATED_REMARK); AssetDTO assetDTO = assetMapper.toDto(updatedAsset); restAssetMockMvc.perform(put("/api/assets") @@ -538,10 +632,11 @@ public class AssetResourceIntTest { List assetList = assetRepository.findAll(); assertThat(assetList).hasSize(databaseSizeBeforeUpdate); Asset testAsset = assetList.get(assetList.size() - 1); - assertThat(testAsset.getDate()).isEqualTo(UPDATED_DATE); + assertThat(testAsset.getDocumentDate()).isEqualTo(UPDATED_DOCUMENT_DATE); + assertThat(testAsset.getValueDate()).isEqualTo(UPDATED_VALUE_DATE); assertThat(testAsset.getAction()).isEqualTo(UPDATED_ACTION); assertThat(testAsset.getAmount()).isEqualTo(UPDATED_AMOUNT); - assertThat(testAsset.getComment()).isEqualTo(UPDATED_COMMENT); + assertThat(testAsset.getRemark()).isEqualTo(UPDATED_REMARK); } @Test diff --git a/src/test/java/org/hostsharing/hsadminng/web/rest/CustomerResourceIntTest.java b/src/test/java/org/hostsharing/hsadminng/web/rest/CustomerResourceIntTest.java index a5b737c4..8a3334f1 100644 --- a/src/test/java/org/hostsharing/hsadminng/web/rest/CustomerResourceIntTest.java +++ b/src/test/java/org/hostsharing/hsadminng/web/rest/CustomerResourceIntTest.java @@ -47,8 +47,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @SpringBootTest(classes = HsadminNgApp.class) public class CustomerResourceIntTest { - private static final Integer DEFAULT_NUMBER = 10000; - private static final Integer UPDATED_NUMBER = 10001; + private static final Integer DEFAULT_REFERENCE = 10000; + private static final Integer UPDATED_REFERENCE = 10001; private static final String DEFAULT_PREFIX = "nf"; private static final String UPDATED_PREFIX = "m2"; @@ -62,13 +62,21 @@ public class CustomerResourceIntTest { private static final String DEFAULT_CONTRACTUAL_ADDRESS = "AAAAAAAAAA"; private static final String UPDATED_CONTRACTUAL_ADDRESS = "BBBBBBBBBB"; + private static final String DEFAULT_BILLING_SALUTATION = "AAAAAAAAAA"; + private static final String UPDATED_BILLING_SALUTATION = "BBBBBBBBBB"; + private static final String DEFAULT_CONTRACTUAL_SALUTATION = "AAAAAAAAAA"; + private static final String UPDATED_CONTRACTUAL_SALUTATION = "BBBBBBBBBB"; + + @Autowired private static final String DEFAULT_BILLING_SALUTATION = "AAAAAAAAAA"; private static final String UPDATED_BILLING_SALUTATION = "BBBBBBBBBB"; private static final String DEFAULT_BILLING_ADDRESS = "AAAAAAAAAA"; private static final String UPDATED_BILLING_ADDRESS = "BBBBBBBBBB"; - @Autowired + private static final String DEFAULT_REMARK = "AAAAAAAAAA"; + private static final String UPDATED_REMARK = "BBBBBBBBBB"; + private CustomerRepository customerRepository; @Autowired @@ -119,13 +127,14 @@ public class CustomerResourceIntTest { */ public static Customer createEntity(EntityManager em) { Customer customer = new Customer() - .number(DEFAULT_NUMBER) + .reference(DEFAULT_REFERENCE) .prefix(DEFAULT_PREFIX) .name(DEFAULT_NAME) .contractualSalutation(DEFAULT_CONTRACTUAL_SALUTATION) .contractualAddress(DEFAULT_CONTRACTUAL_ADDRESS) .billingSalutation(DEFAULT_BILLING_SALUTATION) - .billingAddress(DEFAULT_BILLING_ADDRESS); + .billingAddress(DEFAULT_BILLING_ADDRESS) + .remark(DEFAULT_REMARK); return customer; } @@ -150,13 +159,14 @@ public class CustomerResourceIntTest { List customerList = customerRepository.findAll(); assertThat(customerList).hasSize(databaseSizeBeforeCreate + 1); Customer testCustomer = customerList.get(customerList.size() - 1); - assertThat(testCustomer.getNumber()).isEqualTo(DEFAULT_NUMBER); + assertThat(testCustomer.getReference()).isEqualTo(DEFAULT_REFERENCE); assertThat(testCustomer.getPrefix()).isEqualTo(DEFAULT_PREFIX); assertThat(testCustomer.getName()).isEqualTo(DEFAULT_NAME); assertThat(testCustomer.getContractualSalutation()).isEqualTo(DEFAULT_CONTRACTUAL_SALUTATION); assertThat(testCustomer.getContractualAddress()).isEqualTo(DEFAULT_CONTRACTUAL_ADDRESS); assertThat(testCustomer.getBillingSalutation()).isEqualTo(DEFAULT_BILLING_SALUTATION); assertThat(testCustomer.getBillingAddress()).isEqualTo(DEFAULT_BILLING_ADDRESS); + assertThat(testCustomer.getRemark()).isEqualTo(DEFAULT_REMARK); } @Test @@ -181,10 +191,10 @@ public class CustomerResourceIntTest { @Test @Transactional - public void checkNumberIsRequired() throws Exception { + public void checkReferenceIsRequired() throws Exception { int databaseSizeBeforeTest = customerRepository.findAll().size(); // set the field null - customer.setNumber(null); + customer.setReference(null); // Create the Customer, which fails. CustomerDTO customerDTO = customerMapper.toDto(customer); @@ -266,13 +276,14 @@ public class CustomerResourceIntTest { .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)) .andExpect(jsonPath("$.[*].id").value(hasItem(customer.getId().intValue()))) - .andExpect(jsonPath("$.[*].number").value(hasItem(DEFAULT_NUMBER))) + .andExpect(jsonPath("$.[*].reference").value(hasItem(DEFAULT_REFERENCE))) .andExpect(jsonPath("$.[*].prefix").value(hasItem(DEFAULT_PREFIX.toString()))) .andExpect(jsonPath("$.[*].name").value(hasItem(DEFAULT_NAME.toString()))) .andExpect(jsonPath("$.[*].contractualSalutation").value(hasItem(DEFAULT_CONTRACTUAL_SALUTATION.toString()))) .andExpect(jsonPath("$.[*].contractualAddress").value(hasItem(DEFAULT_CONTRACTUAL_ADDRESS.toString()))) .andExpect(jsonPath("$.[*].billingSalutation").value(hasItem(DEFAULT_BILLING_SALUTATION.toString()))) - .andExpect(jsonPath("$.[*].billingAddress").value(hasItem(DEFAULT_BILLING_ADDRESS.toString()))); + .andExpect(jsonPath("$.[*].billingAddress").value(hasItem(DEFAULT_BILLING_ADDRESS.toString()))) + .andExpect(jsonPath("$.[*].remark").value(hasItem(DEFAULT_REMARK.toString()))); } @Test @@ -286,78 +297,79 @@ public class CustomerResourceIntTest { .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)) .andExpect(jsonPath("$.id").value(customer.getId().intValue())) - .andExpect(jsonPath("$.number").value(DEFAULT_NUMBER)) + .andExpect(jsonPath("$.reference").value(DEFAULT_REFERENCE)) .andExpect(jsonPath("$.prefix").value(DEFAULT_PREFIX.toString())) .andExpect(jsonPath("$.name").value(DEFAULT_NAME.toString())) .andExpect(jsonPath("$.contractualSalutation").value(DEFAULT_CONTRACTUAL_SALUTATION.toString())) .andExpect(jsonPath("$.contractualAddress").value(DEFAULT_CONTRACTUAL_ADDRESS.toString())) .andExpect(jsonPath("$.billingSalutation").value(DEFAULT_BILLING_SALUTATION.toString())) - .andExpect(jsonPath("$.billingAddress").value(DEFAULT_BILLING_ADDRESS.toString())); + .andExpect(jsonPath("$.billingAddress").value(DEFAULT_BILLING_ADDRESS.toString())) + .andExpect(jsonPath("$.remark").value(DEFAULT_REMARK.toString())); } @Test @Transactional - public void getAllCustomersByNumberIsEqualToSomething() throws Exception { + public void getAllCustomersByReferenceIsEqualToSomething() throws Exception { // Initialize the database customerRepository.saveAndFlush(customer); - // Get all the customerList where number equals to DEFAULT_NUMBER - defaultCustomerShouldBeFound("number.equals=" + DEFAULT_NUMBER); + // Get all the customerList where reference equals to DEFAULT_REFERENCE + defaultCustomerShouldBeFound("reference.equals=" + DEFAULT_REFERENCE); - // Get all the customerList where number equals to UPDATED_NUMBER - defaultCustomerShouldNotBeFound("number.equals=" + UPDATED_NUMBER); + // Get all the customerList where reference equals to UPDATED_REFERENCE + defaultCustomerShouldNotBeFound("reference.equals=" + UPDATED_REFERENCE); } @Test @Transactional - public void getAllCustomersByNumberIsInShouldWork() throws Exception { + public void getAllCustomersByReferenceIsInShouldWork() throws Exception { // Initialize the database customerRepository.saveAndFlush(customer); - // Get all the customerList where number in DEFAULT_NUMBER or UPDATED_NUMBER - defaultCustomerShouldBeFound("number.in=" + DEFAULT_NUMBER + "," + UPDATED_NUMBER); + // Get all the customerList where reference in DEFAULT_REFERENCE or UPDATED_REFERENCE + defaultCustomerShouldBeFound("reference.in=" + DEFAULT_REFERENCE + "," + UPDATED_REFERENCE); - // Get all the customerList where number equals to UPDATED_NUMBER - defaultCustomerShouldNotBeFound("number.in=" + UPDATED_NUMBER); + // Get all the customerList where reference equals to UPDATED_REFERENCE + defaultCustomerShouldNotBeFound("reference.in=" + UPDATED_REFERENCE); } @Test @Transactional - public void getAllCustomersByNumberIsNullOrNotNull() throws Exception { + public void getAllCustomersByReferenceIsNullOrNotNull() throws Exception { // Initialize the database customerRepository.saveAndFlush(customer); - // Get all the customerList where number is not null - defaultCustomerShouldBeFound("number.specified=true"); + // Get all the customerList where reference is not null + defaultCustomerShouldBeFound("reference.specified=true"); - // Get all the customerList where number is null - defaultCustomerShouldNotBeFound("number.specified=false"); + // Get all the customerList where reference is null + defaultCustomerShouldNotBeFound("reference.specified=false"); } @Test @Transactional - public void getAllCustomersByNumberIsGreaterThanOrEqualToSomething() throws Exception { + public void getAllCustomersByReferenceIsGreaterThanOrEqualToSomething() throws Exception { // Initialize the database customerRepository.saveAndFlush(customer); - // Get all the customerList where number greater than or equals to DEFAULT_NUMBER - defaultCustomerShouldBeFound("number.greaterOrEqualThan=" + DEFAULT_NUMBER); + // Get all the customerList where reference greater than or equals to DEFAULT_REFERENCE + defaultCustomerShouldBeFound("reference.greaterOrEqualThan=" + DEFAULT_REFERENCE); - // Get all the customerList where number greater than or equals to (DEFAULT_NUMBER + 1) - defaultCustomerShouldNotBeFound("number.greaterOrEqualThan=" + (DEFAULT_NUMBER + 1)); + // Get all the customerList where reference greater than or equals to (DEFAULT_REFERENCE + 1) + defaultCustomerShouldNotBeFound("reference.greaterOrEqualThan=" + (DEFAULT_REFERENCE + 1)); } @Test @Transactional - public void getAllCustomersByNumberIsLessThanSomething() throws Exception { + public void getAllCustomersByReferenceIsLessThanSomething() throws Exception { // Initialize the database customerRepository.saveAndFlush(customer); - // Get all the customerList where number less than or equals to DEFAULT_NUMBER - defaultCustomerShouldNotBeFound("number.lessThan=" + DEFAULT_NUMBER); + // Get all the customerList where reference less than or equals to DEFAULT_REFERENCE + defaultCustomerShouldNotBeFound("reference.lessThan=" + DEFAULT_REFERENCE); - // Get all the customerList where number less than or equals to (DEFAULT_NUMBER + 1) - defaultCustomerShouldBeFound("number.lessThan=" + (DEFAULT_NUMBER + 1)); + // Get all the customerList where reference less than or equals to (DEFAULT_REFERENCE + 1) + defaultCustomerShouldBeFound("reference.lessThan=" + (DEFAULT_REFERENCE + 1)); } @@ -558,41 +570,80 @@ public class CustomerResourceIntTest { @Test @Transactional - public void getAllCustomersByBillingAddressIsEqualToSomething() throws Exception { + public void getAllCustomersByContractualAddressIsEqualToSomething() throws Exception { // Initialize the database customerRepository.saveAndFlush(customer); - // Get all the customerList where billingAddress equals to DEFAULT_BILLING_ADDRESS - defaultCustomerShouldBeFound("billingAddress.equals=" + DEFAULT_BILLING_ADDRESS); + // Get all the customerList where contractualAddress equals to DEFAULT_CONTRACTUAL_ADDRESS + defaultCustomerShouldBeFound("contractualAddress.equals=" + DEFAULT_CONTRACTUAL_ADDRESS); - // Get all the customerList where billingAddress equals to UPDATED_BILLING_ADDRESS - defaultCustomerShouldNotBeFound("billingAddress.equals=" + UPDATED_BILLING_ADDRESS); + // Get all the customerList where contractualAddress equals to UPDATED_CONTRACTUAL_ADDRESS + defaultCustomerShouldNotBeFound("contractualAddress.equals=" + UPDATED_CONTRACTUAL_ADDRESS); } @Test @Transactional - public void getAllCustomersByBillingAddressIsInShouldWork() throws Exception { + public void getAllCustomersByContractualAddressIsInShouldWork() throws Exception { // Initialize the database customerRepository.saveAndFlush(customer); - // Get all the customerList where billingAddress in DEFAULT_BILLING_ADDRESS or UPDATED_BILLING_ADDRESS - defaultCustomerShouldBeFound("billingAddress.in=" + DEFAULT_BILLING_ADDRESS + "," + UPDATED_BILLING_ADDRESS); + // Get all the customerList where contractualAddress in DEFAULT_CONTRACTUAL_ADDRESS or UPDATED_CONTRACTUAL_ADDRESS + defaultCustomerShouldBeFound("contractualAddress.in=" + DEFAULT_CONTRACTUAL_ADDRESS + "," + UPDATED_CONTRACTUAL_ADDRESS); - // Get all the customerList where billingAddress equals to UPDATED_BILLING_ADDRESS - defaultCustomerShouldNotBeFound("billingAddress.in=" + UPDATED_BILLING_ADDRESS); + // Get all the customerList where contractualAddress equals to UPDATED_CONTRACTUAL_ADDRESS + defaultCustomerShouldNotBeFound("contractualAddress.in=" + UPDATED_CONTRACTUAL_ADDRESS); } @Test @Transactional - public void getAllCustomersByBillingAddressIsNullOrNotNull() throws Exception { + public void getAllCustomersByContractualAddressIsNullOrNotNull() throws Exception { // Initialize the database customerRepository.saveAndFlush(customer); - // Get all the customerList where billingAddress is not null - defaultCustomerShouldBeFound("billingAddress.specified=true"); + // Get all the customerList where contractualAddress is not null + defaultCustomerShouldBeFound("contractualAddress.specified=true"); - // Get all the customerList where billingAddress is null - defaultCustomerShouldNotBeFound("billingAddress.specified=false"); + // Get all the customerList where contractualAddress is null + defaultCustomerShouldNotBeFound("contractualAddress.specified=false"); + } + + @Test + @Transactional + public void getAllCustomersByRemarkIsEqualToSomething() throws Exception { + // Initialize the database + customerRepository.saveAndFlush(customer); + + // Get all the customerList where remark equals to DEFAULT_REMARK + defaultCustomerShouldBeFound("remark.equals=" + DEFAULT_REMARK); + + // Get all the customerList where remark equals to UPDATED_REMARK + defaultCustomerShouldNotBeFound("remark.equals=" + UPDATED_REMARK); + } + + @Test + @Transactional + public void getAllCustomersByRemarkIsInShouldWork() throws Exception { + // Initialize the database + customerRepository.saveAndFlush(customer); + + // Get all the customerList where remark in DEFAULT_REMARK or UPDATED_REMARK + defaultCustomerShouldBeFound("remark.in=" + DEFAULT_REMARK + "," + UPDATED_REMARK); + + // Get all the customerList where remark equals to UPDATED_REMARK + defaultCustomerShouldNotBeFound("remark.in=" + UPDATED_REMARK); + } + + @Test + @Transactional + public void getAllCustomersByRemarkIsNullOrNotNull() throws Exception { + // Initialize the database + customerRepository.saveAndFlush(customer); + + // Get all the customerList where remark is not null + defaultCustomerShouldBeFound("remark.specified=true"); + + // Get all the customerList where remark is null + defaultCustomerShouldNotBeFound("remark.specified=false"); } @Test @@ -640,13 +691,14 @@ public class CustomerResourceIntTest { .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)) .andExpect(jsonPath("$.[*].id").value(hasItem(customer.getId().intValue()))) - .andExpect(jsonPath("$.[*].number").value(hasItem(DEFAULT_NUMBER))) + .andExpect(jsonPath("$.[*].reference").value(hasItem(DEFAULT_REFERENCE))) .andExpect(jsonPath("$.[*].prefix").value(hasItem(DEFAULT_PREFIX))) .andExpect(jsonPath("$.[*].name").value(hasItem(DEFAULT_NAME))) .andExpect(jsonPath("$.[*].contractualSalutation").value(hasItem(DEFAULT_CONTRACTUAL_SALUTATION))) .andExpect(jsonPath("$.[*].contractualAddress").value(hasItem(DEFAULT_CONTRACTUAL_ADDRESS))) .andExpect(jsonPath("$.[*].billingSalutation").value(hasItem(DEFAULT_BILLING_SALUTATION))) - .andExpect(jsonPath("$.[*].billingAddress").value(hasItem(DEFAULT_BILLING_ADDRESS))); + .andExpect(jsonPath("$.[*].billingAddress").value(hasItem(DEFAULT_BILLING_ADDRESS))) + .andExpect(jsonPath("$.[*].remark").value(hasItem(DEFAULT_REMARK))); // Check, that the count call also returns 1 restCustomerMockMvc.perform(get("/api/customers/count?sort=id,desc&" + filter)) @@ -694,13 +746,14 @@ public class CustomerResourceIntTest { // Disconnect from session so that the updates on updatedCustomer are not directly saved in db em.detach(updatedCustomer); updatedCustomer - .number(UPDATED_NUMBER) + .reference(UPDATED_REFERENCE) .prefix(UPDATED_PREFIX) .name(UPDATED_NAME) .contractualSalutation(UPDATED_CONTRACTUAL_SALUTATION) .contractualAddress(UPDATED_CONTRACTUAL_ADDRESS) .billingSalutation(UPDATED_BILLING_SALUTATION) - .billingAddress(UPDATED_BILLING_ADDRESS); + .billingAddress(UPDATED_BILLING_ADDRESS) + .remark(UPDATED_REMARK); CustomerDTO customerDTO = customerMapper.toDto(updatedCustomer); restCustomerMockMvc.perform(put("/api/customers") @@ -712,13 +765,14 @@ public class CustomerResourceIntTest { List customerList = customerRepository.findAll(); assertThat(customerList).hasSize(databaseSizeBeforeUpdate); Customer testCustomer = customerList.get(customerList.size() - 1); - assertThat(testCustomer.getNumber()).isEqualTo(UPDATED_NUMBER); + assertThat(testCustomer.getReference()).isEqualTo(UPDATED_REFERENCE); assertThat(testCustomer.getPrefix()).isEqualTo(UPDATED_PREFIX); assertThat(testCustomer.getName()).isEqualTo(UPDATED_NAME); assertThat(testCustomer.getContractualSalutation()).isEqualTo(UPDATED_CONTRACTUAL_SALUTATION); assertThat(testCustomer.getContractualAddress()).isEqualTo(UPDATED_CONTRACTUAL_ADDRESS); assertThat(testCustomer.getBillingSalutation()).isEqualTo(UPDATED_BILLING_SALUTATION); assertThat(testCustomer.getBillingAddress()).isEqualTo(UPDATED_BILLING_ADDRESS); + assertThat(testCustomer.getRemark()).isEqualTo(UPDATED_REMARK); } @Test diff --git a/src/test/java/org/hostsharing/hsadminng/web/rest/MembershipResourceIntTest.java b/src/test/java/org/hostsharing/hsadminng/web/rest/MembershipResourceIntTest.java index 2e7ac3e3..a267711d 100644 --- a/src/test/java/org/hostsharing/hsadminng/web/rest/MembershipResourceIntTest.java +++ b/src/test/java/org/hostsharing/hsadminng/web/rest/MembershipResourceIntTest.java @@ -50,14 +50,17 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @SpringBootTest(classes = HsadminNgApp.class) public class MembershipResourceIntTest { - private static final LocalDate DEFAULT_FROM = LocalDate.ofEpochDay(0L); - private static final LocalDate UPDATED_FROM = LocalDate.now(ZoneId.systemDefault()); + private static final LocalDate DEFAULT_DOCUMENT_DATE = LocalDate.ofEpochDay(0L); + private static final LocalDate UPDATED_DOCUMENT_DATE = LocalDate.now(ZoneId.systemDefault()); - private static final LocalDate DEFAULT_TO = LocalDate.ofEpochDay(0L); - private static final LocalDate UPDATED_TO = LocalDate.now(ZoneId.systemDefault()); + private static final LocalDate DEFAULT_MEMBER_FROM = LocalDate.ofEpochDay(0L); + private static final LocalDate UPDATED_MEMBER_FROM = LocalDate.now(ZoneId.systemDefault()); - private static final String DEFAULT_COMMENT = "AAAAAAAAAA"; - private static final String UPDATED_COMMENT = "BBBBBBBBBB"; + private static final LocalDate DEFAULT_MEMBER_UNTIL = LocalDate.ofEpochDay(0L); + private static final LocalDate UPDATED_MEMBER_UNTIL = LocalDate.now(ZoneId.systemDefault()); + + private static final String DEFAULT_REMARK = "AAAAAAAAAA"; + private static final String UPDATED_REMARK = "BBBBBBBBBB"; @Autowired private MembershipRepository membershipRepository; @@ -110,9 +113,10 @@ public class MembershipResourceIntTest { */ public static Membership createEntity(EntityManager em) { Membership membership = new Membership() - .from(DEFAULT_FROM) - .to(DEFAULT_TO) - .comment(DEFAULT_COMMENT); + .documentDate(DEFAULT_DOCUMENT_DATE) + .memberFrom(DEFAULT_MEMBER_FROM) + .memberUntil(DEFAULT_MEMBER_UNTIL) + .remark(DEFAULT_REMARK); // Add required entity Customer customer = CustomerResourceIntTest.createEntity(em); em.persist(customer); @@ -142,9 +146,10 @@ public class MembershipResourceIntTest { List membershipList = membershipRepository.findAll(); assertThat(membershipList).hasSize(databaseSizeBeforeCreate + 1); Membership testMembership = membershipList.get(membershipList.size() - 1); - assertThat(testMembership.getFrom()).isEqualTo(DEFAULT_FROM); - assertThat(testMembership.getTo()).isEqualTo(DEFAULT_TO); - assertThat(testMembership.getComment()).isEqualTo(DEFAULT_COMMENT); + assertThat(testMembership.getDocumentDate()).isEqualTo(DEFAULT_DOCUMENT_DATE); + assertThat(testMembership.getMemberFrom()).isEqualTo(DEFAULT_MEMBER_FROM); + assertThat(testMembership.getMemberUntil()).isEqualTo(DEFAULT_MEMBER_UNTIL); + assertThat(testMembership.getRemark()).isEqualTo(DEFAULT_REMARK); } @Test @@ -169,10 +174,29 @@ public class MembershipResourceIntTest { @Test @Transactional - public void checkFromIsRequired() throws Exception { + public void checkDocumentDateIsRequired() throws Exception { int databaseSizeBeforeTest = membershipRepository.findAll().size(); // set the field null - membership.setFrom(null); + membership.setDocumentDate(null); + + // Create the Membership, which fails. + MembershipDTO membershipDTO = membershipMapper.toDto(membership); + + restMembershipMockMvc.perform(post("/api/memberships") + .contentType(TestUtil.APPLICATION_JSON_UTF8) + .content(TestUtil.convertObjectToJsonBytes(membershipDTO))) + .andExpect(status().isBadRequest()); + + List membershipList = membershipRepository.findAll(); + assertThat(membershipList).hasSize(databaseSizeBeforeTest); + } + + @Test + @Transactional + public void checkMemberFromIsRequired() throws Exception { + int databaseSizeBeforeTest = membershipRepository.findAll().size(); + // set the field null + membership.setMemberFrom(null); // Create the Membership, which fails. MembershipDTO membershipDTO = membershipMapper.toDto(membership); @@ -197,9 +221,10 @@ public class MembershipResourceIntTest { .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)) .andExpect(jsonPath("$.[*].id").value(hasItem(membership.getId().intValue()))) - .andExpect(jsonPath("$.[*].from").value(hasItem(DEFAULT_FROM.toString()))) - .andExpect(jsonPath("$.[*].to").value(hasItem(DEFAULT_TO.toString()))) - .andExpect(jsonPath("$.[*].comment").value(hasItem(DEFAULT_COMMENT.toString()))); + .andExpect(jsonPath("$.[*].documentDate").value(hasItem(DEFAULT_DOCUMENT_DATE.toString()))) + .andExpect(jsonPath("$.[*].memberFrom").value(hasItem(DEFAULT_MEMBER_FROM.toString()))) + .andExpect(jsonPath("$.[*].memberUntil").value(hasItem(DEFAULT_MEMBER_UNTIL.toString()))) + .andExpect(jsonPath("$.[*].remark").value(hasItem(DEFAULT_REMARK.toString()))); } @Test @@ -213,180 +238,247 @@ public class MembershipResourceIntTest { .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)) .andExpect(jsonPath("$.id").value(membership.getId().intValue())) - .andExpect(jsonPath("$.from").value(DEFAULT_FROM.toString())) - .andExpect(jsonPath("$.to").value(DEFAULT_TO.toString())) - .andExpect(jsonPath("$.comment").value(DEFAULT_COMMENT.toString())); + .andExpect(jsonPath("$.documentDate").value(DEFAULT_DOCUMENT_DATE.toString())) + .andExpect(jsonPath("$.memberFrom").value(DEFAULT_MEMBER_FROM.toString())) + .andExpect(jsonPath("$.memberUntil").value(DEFAULT_MEMBER_UNTIL.toString())) + .andExpect(jsonPath("$.remark").value(DEFAULT_REMARK.toString())); } @Test @Transactional - public void getAllMembershipsByFromIsEqualToSomething() throws Exception { + public void getAllMembershipsByDocumentDateIsEqualToSomething() throws Exception { // Initialize the database membershipRepository.saveAndFlush(membership); - // Get all the membershipList where from equals to DEFAULT_FROM - defaultMembershipShouldBeFound("from.equals=" + DEFAULT_FROM); + // Get all the membershipList where documentDate equals to DEFAULT_DOCUMENT_DATE + defaultMembershipShouldBeFound("documentDate.equals=" + DEFAULT_DOCUMENT_DATE); - // Get all the membershipList where from equals to UPDATED_FROM - defaultMembershipShouldNotBeFound("from.equals=" + UPDATED_FROM); + // Get all the membershipList where documentDate equals to UPDATED_DOCUMENT_DATE + defaultMembershipShouldNotBeFound("documentDate.equals=" + UPDATED_DOCUMENT_DATE); } @Test @Transactional - public void getAllMembershipsByFromIsInShouldWork() throws Exception { + public void getAllMembershipsByDocumentDateIsInShouldWork() throws Exception { // Initialize the database membershipRepository.saveAndFlush(membership); - // Get all the membershipList where from in DEFAULT_FROM or UPDATED_FROM - defaultMembershipShouldBeFound("from.in=" + DEFAULT_FROM + "," + UPDATED_FROM); + // Get all the membershipList where documentDate in DEFAULT_DOCUMENT_DATE or UPDATED_DOCUMENT_DATE + defaultMembershipShouldBeFound("documentDate.in=" + DEFAULT_DOCUMENT_DATE + "," + UPDATED_DOCUMENT_DATE); - // Get all the membershipList where from equals to UPDATED_FROM - defaultMembershipShouldNotBeFound("from.in=" + UPDATED_FROM); + // Get all the membershipList where documentDate equals to UPDATED_DOCUMENT_DATE + defaultMembershipShouldNotBeFound("documentDate.in=" + UPDATED_DOCUMENT_DATE); } @Test @Transactional - public void getAllMembershipsByFromIsNullOrNotNull() throws Exception { + public void getAllMembershipsByDocumentDateIsNullOrNotNull() throws Exception { // Initialize the database membershipRepository.saveAndFlush(membership); - // Get all the membershipList where from is not null - defaultMembershipShouldBeFound("from.specified=true"); + // Get all the membershipList where documentDate is not null + defaultMembershipShouldBeFound("documentDate.specified=true"); - // Get all the membershipList where from is null - defaultMembershipShouldNotBeFound("from.specified=false"); + // Get all the membershipList where documentDate is null + defaultMembershipShouldNotBeFound("documentDate.specified=false"); } @Test @Transactional - public void getAllMembershipsByFromIsGreaterThanOrEqualToSomething() throws Exception { + public void getAllMembershipsByDocumentDateIsGreaterThanOrEqualToSomething() throws Exception { // Initialize the database membershipRepository.saveAndFlush(membership); - // Get all the membershipList where from greater than or equals to DEFAULT_FROM - defaultMembershipShouldBeFound("from.greaterOrEqualThan=" + DEFAULT_FROM); + // Get all the membershipList where documentDate greater than or equals to DEFAULT_DOCUMENT_DATE + defaultMembershipShouldBeFound("documentDate.greaterOrEqualThan=" + DEFAULT_DOCUMENT_DATE); - // Get all the membershipList where from greater than or equals to UPDATED_FROM - defaultMembershipShouldNotBeFound("from.greaterOrEqualThan=" + UPDATED_FROM); + // Get all the membershipList where documentDate greater than or equals to UPDATED_DOCUMENT_DATE + defaultMembershipShouldNotBeFound("documentDate.greaterOrEqualThan=" + UPDATED_DOCUMENT_DATE); } @Test @Transactional - public void getAllMembershipsByFromIsLessThanSomething() throws Exception { + public void getAllMembershipsByDocumentDateIsLessThanSomething() throws Exception { // Initialize the database membershipRepository.saveAndFlush(membership); - // Get all the membershipList where from less than or equals to DEFAULT_FROM - defaultMembershipShouldNotBeFound("from.lessThan=" + DEFAULT_FROM); + // Get all the membershipList where documentDate less than or equals to DEFAULT_DOCUMENT_DATE + defaultMembershipShouldNotBeFound("documentDate.lessThan=" + DEFAULT_DOCUMENT_DATE); - // Get all the membershipList where from less than or equals to UPDATED_FROM - defaultMembershipShouldBeFound("from.lessThan=" + UPDATED_FROM); + // Get all the membershipList where documentDate less than or equals to UPDATED_DOCUMENT_DATE + defaultMembershipShouldBeFound("documentDate.lessThan=" + UPDATED_DOCUMENT_DATE); } @Test @Transactional - public void getAllMembershipsByToIsEqualToSomething() throws Exception { + public void getAllMembershipsByMemberFromIsEqualToSomething() throws Exception { // Initialize the database membershipRepository.saveAndFlush(membership); - // Get all the membershipList where to equals to DEFAULT_TO - defaultMembershipShouldBeFound("to.equals=" + DEFAULT_TO); + // Get all the membershipList where memberFrom equals to DEFAULT_MEMBER_FROM + defaultMembershipShouldBeFound("memberFrom.equals=" + DEFAULT_MEMBER_FROM); - // Get all the membershipList where to equals to UPDATED_TO - defaultMembershipShouldNotBeFound("to.equals=" + UPDATED_TO); + // Get all the membershipList where memberFrom equals to UPDATED_MEMBER_FROM + defaultMembershipShouldNotBeFound("memberFrom.equals=" + UPDATED_MEMBER_FROM); } @Test @Transactional - public void getAllMembershipsByToIsInShouldWork() throws Exception { + public void getAllMembershipsByMemberFromIsInShouldWork() throws Exception { // Initialize the database membershipRepository.saveAndFlush(membership); - // Get all the membershipList where to in DEFAULT_TO or UPDATED_TO - defaultMembershipShouldBeFound("to.in=" + DEFAULT_TO + "," + UPDATED_TO); + // Get all the membershipList where memberFrom in DEFAULT_MEMBER_FROM or UPDATED_MEMBER_FROM + defaultMembershipShouldBeFound("memberFrom.in=" + DEFAULT_MEMBER_FROM + "," + UPDATED_MEMBER_FROM); - // Get all the membershipList where to equals to UPDATED_TO - defaultMembershipShouldNotBeFound("to.in=" + UPDATED_TO); + // Get all the membershipList where memberFrom equals to UPDATED_MEMBER_FROM + defaultMembershipShouldNotBeFound("memberFrom.in=" + UPDATED_MEMBER_FROM); } @Test @Transactional - public void getAllMembershipsByToIsNullOrNotNull() throws Exception { + public void getAllMembershipsByMemberFromIsNullOrNotNull() throws Exception { // Initialize the database membershipRepository.saveAndFlush(membership); - // Get all the membershipList where to is not null - defaultMembershipShouldBeFound("to.specified=true"); + // Get all the membershipList where memberFrom is not null + defaultMembershipShouldBeFound("memberFrom.specified=true"); - // Get all the membershipList where to is null - defaultMembershipShouldNotBeFound("to.specified=false"); + // Get all the membershipList where memberFrom is null + defaultMembershipShouldNotBeFound("memberFrom.specified=false"); } @Test @Transactional - public void getAllMembershipsByToIsGreaterThanOrEqualToSomething() throws Exception { + public void getAllMembershipsByMemberFromIsGreaterThanOrEqualToSomething() throws Exception { // Initialize the database membershipRepository.saveAndFlush(membership); - // Get all the membershipList where to greater than or equals to DEFAULT_TO - defaultMembershipShouldBeFound("to.greaterOrEqualThan=" + DEFAULT_TO); + // Get all the membershipList where memberFrom greater than or equals to DEFAULT_MEMBER_FROM + defaultMembershipShouldBeFound("memberFrom.greaterOrEqualThan=" + DEFAULT_MEMBER_FROM); - // Get all the membershipList where to greater than or equals to UPDATED_TO - defaultMembershipShouldNotBeFound("to.greaterOrEqualThan=" + UPDATED_TO); + // Get all the membershipList where memberFrom greater than or equals to UPDATED_MEMBER_FROM + defaultMembershipShouldNotBeFound("memberFrom.greaterOrEqualThan=" + UPDATED_MEMBER_FROM); } @Test @Transactional - public void getAllMembershipsByToIsLessThanSomething() throws Exception { + public void getAllMembershipsByMemberFromIsLessThanSomething() throws Exception { // Initialize the database membershipRepository.saveAndFlush(membership); - // Get all the membershipList where to less than or equals to DEFAULT_TO - defaultMembershipShouldNotBeFound("to.lessThan=" + DEFAULT_TO); + // Get all the membershipList where memberFrom less than or equals to DEFAULT_MEMBER_FROM + defaultMembershipShouldNotBeFound("memberFrom.lessThan=" + DEFAULT_MEMBER_FROM); - // Get all the membershipList where to less than or equals to UPDATED_TO - defaultMembershipShouldBeFound("to.lessThan=" + UPDATED_TO); + // Get all the membershipList where memberFrom less than or equals to UPDATED_MEMBER_FROM + defaultMembershipShouldBeFound("memberFrom.lessThan=" + UPDATED_MEMBER_FROM); } @Test @Transactional - public void getAllMembershipsByCommentIsEqualToSomething() throws Exception { + public void getAllMembershipsByMemberUntilIsEqualToSomething() throws Exception { // Initialize the database membershipRepository.saveAndFlush(membership); - // Get all the membershipList where comment equals to DEFAULT_COMMENT - defaultMembershipShouldBeFound("comment.equals=" + DEFAULT_COMMENT); + // Get all the membershipList where memberUntil equals to DEFAULT_MEMBER_UNTIL + defaultMembershipShouldBeFound("memberUntil.equals=" + DEFAULT_MEMBER_UNTIL); - // Get all the membershipList where comment equals to UPDATED_COMMENT - defaultMembershipShouldNotBeFound("comment.equals=" + UPDATED_COMMENT); + // Get all the membershipList where memberUntil equals to UPDATED_MEMBER_UNTIL + defaultMembershipShouldNotBeFound("memberUntil.equals=" + UPDATED_MEMBER_UNTIL); } @Test @Transactional - public void getAllMembershipsByCommentIsInShouldWork() throws Exception { + public void getAllMembershipsByMemberUntilIsInShouldWork() throws Exception { // Initialize the database membershipRepository.saveAndFlush(membership); - // Get all the membershipList where comment in DEFAULT_COMMENT or UPDATED_COMMENT - defaultMembershipShouldBeFound("comment.in=" + DEFAULT_COMMENT + "," + UPDATED_COMMENT); + // Get all the membershipList where memberUntil in DEFAULT_MEMBER_UNTIL or UPDATED_MEMBER_UNTIL + defaultMembershipShouldBeFound("memberUntil.in=" + DEFAULT_MEMBER_UNTIL + "," + UPDATED_MEMBER_UNTIL); - // Get all the membershipList where comment equals to UPDATED_COMMENT - defaultMembershipShouldNotBeFound("comment.in=" + UPDATED_COMMENT); + // Get all the membershipList where memberUntil equals to UPDATED_MEMBER_UNTIL + defaultMembershipShouldNotBeFound("memberUntil.in=" + UPDATED_MEMBER_UNTIL); } @Test @Transactional - public void getAllMembershipsByCommentIsNullOrNotNull() throws Exception { + public void getAllMembershipsByMemberUntilIsNullOrNotNull() throws Exception { // Initialize the database membershipRepository.saveAndFlush(membership); - // Get all the membershipList where comment is not null - defaultMembershipShouldBeFound("comment.specified=true"); + // Get all the membershipList where memberUntil is not null + defaultMembershipShouldBeFound("memberUntil.specified=true"); - // Get all the membershipList where comment is null - defaultMembershipShouldNotBeFound("comment.specified=false"); + // Get all the membershipList where memberUntil is null + defaultMembershipShouldNotBeFound("memberUntil.specified=false"); + } + + @Test + @Transactional + public void getAllMembershipsByMemberUntilIsGreaterThanOrEqualToSomething() throws Exception { + // Initialize the database + membershipRepository.saveAndFlush(membership); + + // Get all the membershipList where memberUntil greater than or equals to DEFAULT_MEMBER_UNTIL + defaultMembershipShouldBeFound("memberUntil.greaterOrEqualThan=" + DEFAULT_MEMBER_UNTIL); + + // Get all the membershipList where memberUntil greater than or equals to UPDATED_MEMBER_UNTIL + defaultMembershipShouldNotBeFound("memberUntil.greaterOrEqualThan=" + UPDATED_MEMBER_UNTIL); + } + + @Test + @Transactional + public void getAllMembershipsByMemberUntilIsLessThanSomething() throws Exception { + // Initialize the database + membershipRepository.saveAndFlush(membership); + + // Get all the membershipList where memberUntil less than or equals to DEFAULT_MEMBER_UNTIL + defaultMembershipShouldNotBeFound("memberUntil.lessThan=" + DEFAULT_MEMBER_UNTIL); + + // Get all the membershipList where memberUntil less than or equals to UPDATED_MEMBER_UNTIL + defaultMembershipShouldBeFound("memberUntil.lessThan=" + UPDATED_MEMBER_UNTIL); + } + + + @Test + @Transactional + public void getAllMembershipsByRemarkIsEqualToSomething() throws Exception { + // Initialize the database + membershipRepository.saveAndFlush(membership); + + // Get all the membershipList where remark equals to DEFAULT_REMARK + defaultMembershipShouldBeFound("remark.equals=" + DEFAULT_REMARK); + + // Get all the membershipList where remark equals to UPDATED_REMARK + defaultMembershipShouldNotBeFound("remark.equals=" + UPDATED_REMARK); + } + + @Test + @Transactional + public void getAllMembershipsByRemarkIsInShouldWork() throws Exception { + // Initialize the database + membershipRepository.saveAndFlush(membership); + + // Get all the membershipList where remark in DEFAULT_REMARK or UPDATED_REMARK + defaultMembershipShouldBeFound("remark.in=" + DEFAULT_REMARK + "," + UPDATED_REMARK); + + // Get all the membershipList where remark equals to UPDATED_REMARK + defaultMembershipShouldNotBeFound("remark.in=" + UPDATED_REMARK); + } + + @Test + @Transactional + public void getAllMembershipsByRemarkIsNullOrNotNull() throws Exception { + // Initialize the database + membershipRepository.saveAndFlush(membership); + + // Get all the membershipList where remark is not null + defaultMembershipShouldBeFound("remark.specified=true"); + + // Get all the membershipList where remark is null + defaultMembershipShouldNotBeFound("remark.specified=false"); } @Test @@ -453,9 +545,10 @@ public class MembershipResourceIntTest { .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)) .andExpect(jsonPath("$.[*].id").value(hasItem(membership.getId().intValue()))) - .andExpect(jsonPath("$.[*].from").value(hasItem(DEFAULT_FROM.toString()))) - .andExpect(jsonPath("$.[*].to").value(hasItem(DEFAULT_TO.toString()))) - .andExpect(jsonPath("$.[*].comment").value(hasItem(DEFAULT_COMMENT))); + .andExpect(jsonPath("$.[*].documentDate").value(hasItem(DEFAULT_DOCUMENT_DATE.toString()))) + .andExpect(jsonPath("$.[*].memberFrom").value(hasItem(DEFAULT_MEMBER_FROM.toString()))) + .andExpect(jsonPath("$.[*].memberUntil").value(hasItem(DEFAULT_MEMBER_UNTIL.toString()))) + .andExpect(jsonPath("$.[*].remark").value(hasItem(DEFAULT_REMARK))); // Check, that the count call also returns 1 restMembershipMockMvc.perform(get("/api/memberships/count?sort=id,desc&" + filter)) @@ -503,9 +596,10 @@ public class MembershipResourceIntTest { // Disconnect from session so that the updates on updatedMembership are not directly saved in db em.detach(updatedMembership); updatedMembership - .from(UPDATED_FROM) - .to(UPDATED_TO) - .comment(UPDATED_COMMENT); + .documentDate(UPDATED_DOCUMENT_DATE) + .memberFrom(UPDATED_MEMBER_FROM) + .memberUntil(UPDATED_MEMBER_UNTIL) + .remark(UPDATED_REMARK); MembershipDTO membershipDTO = membershipMapper.toDto(updatedMembership); restMembershipMockMvc.perform(put("/api/memberships") @@ -517,9 +611,10 @@ public class MembershipResourceIntTest { List membershipList = membershipRepository.findAll(); assertThat(membershipList).hasSize(databaseSizeBeforeUpdate); Membership testMembership = membershipList.get(membershipList.size() - 1); - assertThat(testMembership.getFrom()).isEqualTo(UPDATED_FROM); - assertThat(testMembership.getTo()).isEqualTo(UPDATED_TO); - assertThat(testMembership.getComment()).isEqualTo(UPDATED_COMMENT); + assertThat(testMembership.getDocumentDate()).isEqualTo(UPDATED_DOCUMENT_DATE); + assertThat(testMembership.getMemberFrom()).isEqualTo(UPDATED_MEMBER_FROM); + assertThat(testMembership.getMemberUntil()).isEqualTo(UPDATED_MEMBER_UNTIL); + assertThat(testMembership.getRemark()).isEqualTo(UPDATED_REMARK); } @Test diff --git a/src/test/java/org/hostsharing/hsadminng/web/rest/SepaMandateResourceIntTest.java b/src/test/java/org/hostsharing/hsadminng/web/rest/SepaMandateResourceIntTest.java index 1238d6f6..78bf4160 100644 --- a/src/test/java/org/hostsharing/hsadminng/web/rest/SepaMandateResourceIntTest.java +++ b/src/test/java/org/hostsharing/hsadminng/web/rest/SepaMandateResourceIntTest.java @@ -57,23 +57,23 @@ public class SepaMandateResourceIntTest { private static final String DEFAULT_BIC = "AAAAAAAAAA"; private static final String UPDATED_BIC = "BBBBBBBBBB"; - private static final LocalDate DEFAULT_CREATED = LocalDate.ofEpochDay(0L); - private static final LocalDate UPDATED_CREATED = LocalDate.now(ZoneId.systemDefault()); + private static final LocalDate DEFAULT_DOCUMENT_DATE = LocalDate.ofEpochDay(0L); + private static final LocalDate UPDATED_DOCUMENT_DATE = LocalDate.now(ZoneId.systemDefault()); private static final LocalDate DEFAULT_VALID_FROM = LocalDate.ofEpochDay(0L); private static final LocalDate UPDATED_VALID_FROM = LocalDate.now(ZoneId.systemDefault()); - private static final LocalDate DEFAULT_VALID_TO = LocalDate.ofEpochDay(0L); - private static final LocalDate UPDATED_VALID_TO = LocalDate.now(ZoneId.systemDefault()); + private static final LocalDate DEFAULT_VALID_UNTIL = LocalDate.ofEpochDay(0L); + private static final LocalDate UPDATED_VALID_UNTIL = LocalDate.now(ZoneId.systemDefault()); private static final LocalDate DEFAULT_LAST_USED = LocalDate.ofEpochDay(0L); private static final LocalDate UPDATED_LAST_USED = LocalDate.now(ZoneId.systemDefault()); - private static final LocalDate DEFAULT_CANCELLED = LocalDate.ofEpochDay(0L); - private static final LocalDate UPDATED_CANCELLED = LocalDate.now(ZoneId.systemDefault()); + private static final LocalDate DEFAULT_CANCELLATION_DATE = LocalDate.ofEpochDay(0L); + private static final LocalDate UPDATED_CANCELLATION_DATE = LocalDate.now(ZoneId.systemDefault()); - private static final String DEFAULT_COMMENT = "AAAAAAAAAA"; - private static final String UPDATED_COMMENT = "BBBBBBBBBB"; + private static final String DEFAULT_REMARK = "AAAAAAAAAA"; + private static final String UPDATED_REMARK = "BBBBBBBBBB"; @Autowired private SepaMandateRepository sepaMandateRepository; @@ -129,12 +129,12 @@ public class SepaMandateResourceIntTest { .reference(DEFAULT_REFERENCE) .iban(DEFAULT_IBAN) .bic(DEFAULT_BIC) - .created(DEFAULT_CREATED) + .documentDate(DEFAULT_DOCUMENT_DATE) .validFrom(DEFAULT_VALID_FROM) - .validTo(DEFAULT_VALID_TO) + .validUntil(DEFAULT_VALID_UNTIL) .lastUsed(DEFAULT_LAST_USED) - .cancelled(DEFAULT_CANCELLED) - .comment(DEFAULT_COMMENT); + .cancellationDate(DEFAULT_CANCELLATION_DATE) + .remark(DEFAULT_REMARK); // Add required entity Customer customer = CustomerResourceIntTest.createEntity(em); em.persist(customer); @@ -167,12 +167,12 @@ public class SepaMandateResourceIntTest { assertThat(testSepaMandate.getReference()).isEqualTo(DEFAULT_REFERENCE); assertThat(testSepaMandate.getIban()).isEqualTo(DEFAULT_IBAN); assertThat(testSepaMandate.getBic()).isEqualTo(DEFAULT_BIC); - assertThat(testSepaMandate.getCreated()).isEqualTo(DEFAULT_CREATED); + assertThat(testSepaMandate.getDocumentDate()).isEqualTo(DEFAULT_DOCUMENT_DATE); assertThat(testSepaMandate.getValidFrom()).isEqualTo(DEFAULT_VALID_FROM); - assertThat(testSepaMandate.getValidTo()).isEqualTo(DEFAULT_VALID_TO); + assertThat(testSepaMandate.getValidUntil()).isEqualTo(DEFAULT_VALID_UNTIL); assertThat(testSepaMandate.getLastUsed()).isEqualTo(DEFAULT_LAST_USED); - assertThat(testSepaMandate.getCancelled()).isEqualTo(DEFAULT_CANCELLED); - assertThat(testSepaMandate.getComment()).isEqualTo(DEFAULT_COMMENT); + assertThat(testSepaMandate.getCancellationDate()).isEqualTo(DEFAULT_CANCELLATION_DATE); + assertThat(testSepaMandate.getRemark()).isEqualTo(DEFAULT_REMARK); } @Test @@ -216,10 +216,10 @@ public class SepaMandateResourceIntTest { @Test @Transactional - public void checkCreatedIsRequired() throws Exception { + public void checkDocumentDateIsRequired() throws Exception { int databaseSizeBeforeTest = sepaMandateRepository.findAll().size(); // set the field null - sepaMandate.setCreated(null); + sepaMandate.setDocumentDate(null); // Create the SepaMandate, which fails. SepaMandateDTO sepaMandateDTO = sepaMandateMapper.toDto(sepaMandate); @@ -266,12 +266,12 @@ public class SepaMandateResourceIntTest { .andExpect(jsonPath("$.[*].reference").value(hasItem(DEFAULT_REFERENCE.toString()))) .andExpect(jsonPath("$.[*].iban").value(hasItem(DEFAULT_IBAN.toString()))) .andExpect(jsonPath("$.[*].bic").value(hasItem(DEFAULT_BIC.toString()))) - .andExpect(jsonPath("$.[*].created").value(hasItem(DEFAULT_CREATED.toString()))) + .andExpect(jsonPath("$.[*].documentDate").value(hasItem(DEFAULT_DOCUMENT_DATE.toString()))) .andExpect(jsonPath("$.[*].validFrom").value(hasItem(DEFAULT_VALID_FROM.toString()))) - .andExpect(jsonPath("$.[*].validTo").value(hasItem(DEFAULT_VALID_TO.toString()))) + .andExpect(jsonPath("$.[*].validUntil").value(hasItem(DEFAULT_VALID_UNTIL.toString()))) .andExpect(jsonPath("$.[*].lastUsed").value(hasItem(DEFAULT_LAST_USED.toString()))) - .andExpect(jsonPath("$.[*].cancelled").value(hasItem(DEFAULT_CANCELLED.toString()))) - .andExpect(jsonPath("$.[*].comment").value(hasItem(DEFAULT_COMMENT.toString()))); + .andExpect(jsonPath("$.[*].cancellationDate").value(hasItem(DEFAULT_CANCELLATION_DATE.toString()))) + .andExpect(jsonPath("$.[*].remark").value(hasItem(DEFAULT_REMARK.toString()))); } @Test @@ -288,12 +288,12 @@ public class SepaMandateResourceIntTest { .andExpect(jsonPath("$.reference").value(DEFAULT_REFERENCE.toString())) .andExpect(jsonPath("$.iban").value(DEFAULT_IBAN.toString())) .andExpect(jsonPath("$.bic").value(DEFAULT_BIC.toString())) - .andExpect(jsonPath("$.created").value(DEFAULT_CREATED.toString())) + .andExpect(jsonPath("$.documentDate").value(DEFAULT_DOCUMENT_DATE.toString())) .andExpect(jsonPath("$.validFrom").value(DEFAULT_VALID_FROM.toString())) - .andExpect(jsonPath("$.validTo").value(DEFAULT_VALID_TO.toString())) + .andExpect(jsonPath("$.validUntil").value(DEFAULT_VALID_UNTIL.toString())) .andExpect(jsonPath("$.lastUsed").value(DEFAULT_LAST_USED.toString())) - .andExpect(jsonPath("$.cancelled").value(DEFAULT_CANCELLED.toString())) - .andExpect(jsonPath("$.comment").value(DEFAULT_COMMENT.toString())); + .andExpect(jsonPath("$.cancellationDate").value(DEFAULT_CANCELLATION_DATE.toString())) + .andExpect(jsonPath("$.remark").value(DEFAULT_REMARK.toString())); } @Test @@ -415,67 +415,67 @@ public class SepaMandateResourceIntTest { @Test @Transactional - public void getAllSepaMandatesByCreatedIsEqualToSomething() throws Exception { + public void getAllSepaMandatesByDocumentDateIsEqualToSomething() throws Exception { // Initialize the database sepaMandateRepository.saveAndFlush(sepaMandate); - // Get all the sepaMandateList where created equals to DEFAULT_CREATED - defaultSepaMandateShouldBeFound("created.equals=" + DEFAULT_CREATED); + // Get all the sepaMandateList where documentDate equals to DEFAULT_DOCUMENT_DATE + defaultSepaMandateShouldBeFound("documentDate.equals=" + DEFAULT_DOCUMENT_DATE); - // Get all the sepaMandateList where created equals to UPDATED_CREATED - defaultSepaMandateShouldNotBeFound("created.equals=" + UPDATED_CREATED); + // Get all the sepaMandateList where documentDate equals to UPDATED_DOCUMENT_DATE + defaultSepaMandateShouldNotBeFound("documentDate.equals=" + UPDATED_DOCUMENT_DATE); } @Test @Transactional - public void getAllSepaMandatesByCreatedIsInShouldWork() throws Exception { + public void getAllSepaMandatesByDocumentDateIsInShouldWork() throws Exception { // Initialize the database sepaMandateRepository.saveAndFlush(sepaMandate); - // Get all the sepaMandateList where created in DEFAULT_CREATED or UPDATED_CREATED - defaultSepaMandateShouldBeFound("created.in=" + DEFAULT_CREATED + "," + UPDATED_CREATED); + // Get all the sepaMandateList where documentDate in DEFAULT_DOCUMENT_DATE or UPDATED_DOCUMENT_DATE + defaultSepaMandateShouldBeFound("documentDate.in=" + DEFAULT_DOCUMENT_DATE + "," + UPDATED_DOCUMENT_DATE); - // Get all the sepaMandateList where created equals to UPDATED_CREATED - defaultSepaMandateShouldNotBeFound("created.in=" + UPDATED_CREATED); + // Get all the sepaMandateList where documentDate equals to UPDATED_DOCUMENT_DATE + defaultSepaMandateShouldNotBeFound("documentDate.in=" + UPDATED_DOCUMENT_DATE); } @Test @Transactional - public void getAllSepaMandatesByCreatedIsNullOrNotNull() throws Exception { + public void getAllSepaMandatesByDocumentDateIsNullOrNotNull() throws Exception { // Initialize the database sepaMandateRepository.saveAndFlush(sepaMandate); - // Get all the sepaMandateList where created is not null - defaultSepaMandateShouldBeFound("created.specified=true"); + // Get all the sepaMandateList where documentDate is not null + defaultSepaMandateShouldBeFound("documentDate.specified=true"); - // Get all the sepaMandateList where created is null - defaultSepaMandateShouldNotBeFound("created.specified=false"); + // Get all the sepaMandateList where documentDate is null + defaultSepaMandateShouldNotBeFound("documentDate.specified=false"); } @Test @Transactional - public void getAllSepaMandatesByCreatedIsGreaterThanOrEqualToSomething() throws Exception { + public void getAllSepaMandatesByDocumentDateIsGreaterThanOrEqualToSomething() throws Exception { // Initialize the database sepaMandateRepository.saveAndFlush(sepaMandate); - // Get all the sepaMandateList where created greater than or equals to DEFAULT_CREATED - defaultSepaMandateShouldBeFound("created.greaterOrEqualThan=" + DEFAULT_CREATED); + // Get all the sepaMandateList where documentDate greater than or equals to DEFAULT_DOCUMENT_DATE + defaultSepaMandateShouldBeFound("documentDate.greaterOrEqualThan=" + DEFAULT_DOCUMENT_DATE); - // Get all the sepaMandateList where created greater than or equals to UPDATED_CREATED - defaultSepaMandateShouldNotBeFound("created.greaterOrEqualThan=" + UPDATED_CREATED); + // Get all the sepaMandateList where documentDate greater than or equals to UPDATED_DOCUMENT_DATE + defaultSepaMandateShouldNotBeFound("documentDate.greaterOrEqualThan=" + UPDATED_DOCUMENT_DATE); } @Test @Transactional - public void getAllSepaMandatesByCreatedIsLessThanSomething() throws Exception { + public void getAllSepaMandatesByDocumentDateIsLessThanSomething() throws Exception { // Initialize the database sepaMandateRepository.saveAndFlush(sepaMandate); - // Get all the sepaMandateList where created less than or equals to DEFAULT_CREATED - defaultSepaMandateShouldNotBeFound("created.lessThan=" + DEFAULT_CREATED); + // Get all the sepaMandateList where documentDate less than or equals to DEFAULT_DOCUMENT_DATE + defaultSepaMandateShouldNotBeFound("documentDate.lessThan=" + DEFAULT_DOCUMENT_DATE); - // Get all the sepaMandateList where created less than or equals to UPDATED_CREATED - defaultSepaMandateShouldBeFound("created.lessThan=" + UPDATED_CREATED); + // Get all the sepaMandateList where documentDate less than or equals to UPDATED_DOCUMENT_DATE + defaultSepaMandateShouldBeFound("documentDate.lessThan=" + UPDATED_DOCUMENT_DATE); } @@ -547,67 +547,67 @@ public class SepaMandateResourceIntTest { @Test @Transactional - public void getAllSepaMandatesByValidToIsEqualToSomething() throws Exception { + public void getAllSepaMandatesByValidUntilIsEqualToSomething() throws Exception { // Initialize the database sepaMandateRepository.saveAndFlush(sepaMandate); - // Get all the sepaMandateList where validTo equals to DEFAULT_VALID_TO - defaultSepaMandateShouldBeFound("validTo.equals=" + DEFAULT_VALID_TO); + // Get all the sepaMandateList where validUntil equals to DEFAULT_VALID_UNTIL + defaultSepaMandateShouldBeFound("validUntil.equals=" + DEFAULT_VALID_UNTIL); - // Get all the sepaMandateList where validTo equals to UPDATED_VALID_TO - defaultSepaMandateShouldNotBeFound("validTo.equals=" + UPDATED_VALID_TO); + // Get all the sepaMandateList where validUntil equals to UPDATED_VALID_UNTIL + defaultSepaMandateShouldNotBeFound("validUntil.equals=" + UPDATED_VALID_UNTIL); } @Test @Transactional - public void getAllSepaMandatesByValidToIsInShouldWork() throws Exception { + public void getAllSepaMandatesByValidUntilIsInShouldWork() throws Exception { // Initialize the database sepaMandateRepository.saveAndFlush(sepaMandate); - // Get all the sepaMandateList where validTo in DEFAULT_VALID_TO or UPDATED_VALID_TO - defaultSepaMandateShouldBeFound("validTo.in=" + DEFAULT_VALID_TO + "," + UPDATED_VALID_TO); + // Get all the sepaMandateList where validUntil in DEFAULT_VALID_UNTIL or UPDATED_VALID_UNTIL + defaultSepaMandateShouldBeFound("validUntil.in=" + DEFAULT_VALID_UNTIL + "," + UPDATED_VALID_UNTIL); - // Get all the sepaMandateList where validTo equals to UPDATED_VALID_TO - defaultSepaMandateShouldNotBeFound("validTo.in=" + UPDATED_VALID_TO); + // Get all the sepaMandateList where validUntil equals to UPDATED_VALID_UNTIL + defaultSepaMandateShouldNotBeFound("validUntil.in=" + UPDATED_VALID_UNTIL); } @Test @Transactional - public void getAllSepaMandatesByValidToIsNullOrNotNull() throws Exception { + public void getAllSepaMandatesByValidUntilIsNullOrNotNull() throws Exception { // Initialize the database sepaMandateRepository.saveAndFlush(sepaMandate); - // Get all the sepaMandateList where validTo is not null - defaultSepaMandateShouldBeFound("validTo.specified=true"); + // Get all the sepaMandateList where validUntil is not null + defaultSepaMandateShouldBeFound("validUntil.specified=true"); - // Get all the sepaMandateList where validTo is null - defaultSepaMandateShouldNotBeFound("validTo.specified=false"); + // Get all the sepaMandateList where validUntil is null + defaultSepaMandateShouldNotBeFound("validUntil.specified=false"); } @Test @Transactional - public void getAllSepaMandatesByValidToIsGreaterThanOrEqualToSomething() throws Exception { + public void getAllSepaMandatesByValidUntilIsGreaterThanOrEqualToSomething() throws Exception { // Initialize the database sepaMandateRepository.saveAndFlush(sepaMandate); - // Get all the sepaMandateList where validTo greater than or equals to DEFAULT_VALID_TO - defaultSepaMandateShouldBeFound("validTo.greaterOrEqualThan=" + DEFAULT_VALID_TO); + // Get all the sepaMandateList where validUntil greater than or equals to DEFAULT_VALID_UNTIL + defaultSepaMandateShouldBeFound("validUntil.greaterOrEqualThan=" + DEFAULT_VALID_UNTIL); - // Get all the sepaMandateList where validTo greater than or equals to UPDATED_VALID_TO - defaultSepaMandateShouldNotBeFound("validTo.greaterOrEqualThan=" + UPDATED_VALID_TO); + // Get all the sepaMandateList where validUntil greater than or equals to UPDATED_VALID_UNTIL + defaultSepaMandateShouldNotBeFound("validUntil.greaterOrEqualThan=" + UPDATED_VALID_UNTIL); } @Test @Transactional - public void getAllSepaMandatesByValidToIsLessThanSomething() throws Exception { + public void getAllSepaMandatesByValidUntilIsLessThanSomething() throws Exception { // Initialize the database sepaMandateRepository.saveAndFlush(sepaMandate); - // Get all the sepaMandateList where validTo less than or equals to DEFAULT_VALID_TO - defaultSepaMandateShouldNotBeFound("validTo.lessThan=" + DEFAULT_VALID_TO); + // Get all the sepaMandateList where validUntil less than or equals to DEFAULT_VALID_UNTIL + defaultSepaMandateShouldNotBeFound("validUntil.lessThan=" + DEFAULT_VALID_UNTIL); - // Get all the sepaMandateList where validTo less than or equals to UPDATED_VALID_TO - defaultSepaMandateShouldBeFound("validTo.lessThan=" + UPDATED_VALID_TO); + // Get all the sepaMandateList where validUntil less than or equals to UPDATED_VALID_UNTIL + defaultSepaMandateShouldBeFound("validUntil.lessThan=" + UPDATED_VALID_UNTIL); } @@ -679,107 +679,107 @@ public class SepaMandateResourceIntTest { @Test @Transactional - public void getAllSepaMandatesByCancelledIsEqualToSomething() throws Exception { + public void getAllSepaMandatesByCancellationDateIsEqualToSomething() throws Exception { // Initialize the database sepaMandateRepository.saveAndFlush(sepaMandate); - // Get all the sepaMandateList where cancelled equals to DEFAULT_CANCELLED - defaultSepaMandateShouldBeFound("cancelled.equals=" + DEFAULT_CANCELLED); + // Get all the sepaMandateList where cancellationDate equals to DEFAULT_CANCELLATION_DATE + defaultSepaMandateShouldBeFound("cancellationDate.equals=" + DEFAULT_CANCELLATION_DATE); - // Get all the sepaMandateList where cancelled equals to UPDATED_CANCELLED - defaultSepaMandateShouldNotBeFound("cancelled.equals=" + UPDATED_CANCELLED); + // Get all the sepaMandateList where cancellationDate equals to UPDATED_CANCELLATION_DATE + defaultSepaMandateShouldNotBeFound("cancellationDate.equals=" + UPDATED_CANCELLATION_DATE); } @Test @Transactional - public void getAllSepaMandatesByCancelledIsInShouldWork() throws Exception { + public void getAllSepaMandatesByCancellationDateIsInShouldWork() throws Exception { // Initialize the database sepaMandateRepository.saveAndFlush(sepaMandate); - // Get all the sepaMandateList where cancelled in DEFAULT_CANCELLED or UPDATED_CANCELLED - defaultSepaMandateShouldBeFound("cancelled.in=" + DEFAULT_CANCELLED + "," + UPDATED_CANCELLED); + // Get all the sepaMandateList where cancellationDate in DEFAULT_CANCELLATION_DATE or UPDATED_CANCELLATION_DATE + defaultSepaMandateShouldBeFound("cancellationDate.in=" + DEFAULT_CANCELLATION_DATE + "," + UPDATED_CANCELLATION_DATE); - // Get all the sepaMandateList where cancelled equals to UPDATED_CANCELLED - defaultSepaMandateShouldNotBeFound("cancelled.in=" + UPDATED_CANCELLED); + // Get all the sepaMandateList where cancellationDate equals to UPDATED_CANCELLATION_DATE + defaultSepaMandateShouldNotBeFound("cancellationDate.in=" + UPDATED_CANCELLATION_DATE); } @Test @Transactional - public void getAllSepaMandatesByCancelledIsNullOrNotNull() throws Exception { + public void getAllSepaMandatesByCancellationDateIsNullOrNotNull() throws Exception { // Initialize the database sepaMandateRepository.saveAndFlush(sepaMandate); - // Get all the sepaMandateList where cancelled is not null - defaultSepaMandateShouldBeFound("cancelled.specified=true"); + // Get all the sepaMandateList where cancellationDate is not null + defaultSepaMandateShouldBeFound("cancellationDate.specified=true"); - // Get all the sepaMandateList where cancelled is null - defaultSepaMandateShouldNotBeFound("cancelled.specified=false"); + // Get all the sepaMandateList where cancellationDate is null + defaultSepaMandateShouldNotBeFound("cancellationDate.specified=false"); } @Test @Transactional - public void getAllSepaMandatesByCancelledIsGreaterThanOrEqualToSomething() throws Exception { + public void getAllSepaMandatesByCancellationDateIsGreaterThanOrEqualToSomething() throws Exception { // Initialize the database sepaMandateRepository.saveAndFlush(sepaMandate); - // Get all the sepaMandateList where cancelled greater than or equals to DEFAULT_CANCELLED - defaultSepaMandateShouldBeFound("cancelled.greaterOrEqualThan=" + DEFAULT_CANCELLED); + // Get all the sepaMandateList where cancellationDate greater than or equals to DEFAULT_CANCELLATION_DATE + defaultSepaMandateShouldBeFound("cancellationDate.greaterOrEqualThan=" + DEFAULT_CANCELLATION_DATE); - // Get all the sepaMandateList where cancelled greater than or equals to UPDATED_CANCELLED - defaultSepaMandateShouldNotBeFound("cancelled.greaterOrEqualThan=" + UPDATED_CANCELLED); + // Get all the sepaMandateList where cancellationDate greater than or equals to UPDATED_CANCELLATION_DATE + defaultSepaMandateShouldNotBeFound("cancellationDate.greaterOrEqualThan=" + UPDATED_CANCELLATION_DATE); } @Test @Transactional - public void getAllSepaMandatesByCancelledIsLessThanSomething() throws Exception { + public void getAllSepaMandatesByCancellationDateIsLessThanSomething() throws Exception { // Initialize the database sepaMandateRepository.saveAndFlush(sepaMandate); - // Get all the sepaMandateList where cancelled less than or equals to DEFAULT_CANCELLED - defaultSepaMandateShouldNotBeFound("cancelled.lessThan=" + DEFAULT_CANCELLED); + // Get all the sepaMandateList where cancellationDate less than or equals to DEFAULT_CANCELLATION_DATE + defaultSepaMandateShouldNotBeFound("cancellationDate.lessThan=" + DEFAULT_CANCELLATION_DATE); - // Get all the sepaMandateList where cancelled less than or equals to UPDATED_CANCELLED - defaultSepaMandateShouldBeFound("cancelled.lessThan=" + UPDATED_CANCELLED); + // Get all the sepaMandateList where cancellationDate less than or equals to UPDATED_CANCELLATION_DATE + defaultSepaMandateShouldBeFound("cancellationDate.lessThan=" + UPDATED_CANCELLATION_DATE); } @Test @Transactional - public void getAllSepaMandatesByCommentIsEqualToSomething() throws Exception { + public void getAllSepaMandatesByRemarkIsEqualToSomething() throws Exception { // Initialize the database sepaMandateRepository.saveAndFlush(sepaMandate); - // Get all the sepaMandateList where comment equals to DEFAULT_COMMENT - defaultSepaMandateShouldBeFound("comment.equals=" + DEFAULT_COMMENT); + // Get all the sepaMandateList where remark equals to DEFAULT_REMARK + defaultSepaMandateShouldBeFound("remark.equals=" + DEFAULT_REMARK); - // Get all the sepaMandateList where comment equals to UPDATED_COMMENT - defaultSepaMandateShouldNotBeFound("comment.equals=" + UPDATED_COMMENT); + // Get all the sepaMandateList where remark equals to UPDATED_REMARK + defaultSepaMandateShouldNotBeFound("remark.equals=" + UPDATED_REMARK); } @Test @Transactional - public void getAllSepaMandatesByCommentIsInShouldWork() throws Exception { + public void getAllSepaMandatesByRemarkIsInShouldWork() throws Exception { // Initialize the database sepaMandateRepository.saveAndFlush(sepaMandate); - // Get all the sepaMandateList where comment in DEFAULT_COMMENT or UPDATED_COMMENT - defaultSepaMandateShouldBeFound("comment.in=" + DEFAULT_COMMENT + "," + UPDATED_COMMENT); + // Get all the sepaMandateList where remark in DEFAULT_REMARK or UPDATED_REMARK + defaultSepaMandateShouldBeFound("remark.in=" + DEFAULT_REMARK + "," + UPDATED_REMARK); - // Get all the sepaMandateList where comment equals to UPDATED_COMMENT - defaultSepaMandateShouldNotBeFound("comment.in=" + UPDATED_COMMENT); + // Get all the sepaMandateList where remark equals to UPDATED_REMARK + defaultSepaMandateShouldNotBeFound("remark.in=" + UPDATED_REMARK); } @Test @Transactional - public void getAllSepaMandatesByCommentIsNullOrNotNull() throws Exception { + public void getAllSepaMandatesByRemarkIsNullOrNotNull() throws Exception { // Initialize the database sepaMandateRepository.saveAndFlush(sepaMandate); - // Get all the sepaMandateList where comment is not null - defaultSepaMandateShouldBeFound("comment.specified=true"); + // Get all the sepaMandateList where remark is not null + defaultSepaMandateShouldBeFound("remark.specified=true"); - // Get all the sepaMandateList where comment is null - defaultSepaMandateShouldNotBeFound("comment.specified=false"); + // Get all the sepaMandateList where remark is null + defaultSepaMandateShouldNotBeFound("remark.specified=false"); } @Test @@ -811,12 +811,12 @@ public class SepaMandateResourceIntTest { .andExpect(jsonPath("$.[*].reference").value(hasItem(DEFAULT_REFERENCE))) .andExpect(jsonPath("$.[*].iban").value(hasItem(DEFAULT_IBAN))) .andExpect(jsonPath("$.[*].bic").value(hasItem(DEFAULT_BIC))) - .andExpect(jsonPath("$.[*].created").value(hasItem(DEFAULT_CREATED.toString()))) + .andExpect(jsonPath("$.[*].documentDate").value(hasItem(DEFAULT_DOCUMENT_DATE.toString()))) .andExpect(jsonPath("$.[*].validFrom").value(hasItem(DEFAULT_VALID_FROM.toString()))) - .andExpect(jsonPath("$.[*].validTo").value(hasItem(DEFAULT_VALID_TO.toString()))) + .andExpect(jsonPath("$.[*].validUntil").value(hasItem(DEFAULT_VALID_UNTIL.toString()))) .andExpect(jsonPath("$.[*].lastUsed").value(hasItem(DEFAULT_LAST_USED.toString()))) - .andExpect(jsonPath("$.[*].cancelled").value(hasItem(DEFAULT_CANCELLED.toString()))) - .andExpect(jsonPath("$.[*].comment").value(hasItem(DEFAULT_COMMENT))); + .andExpect(jsonPath("$.[*].cancellationDate").value(hasItem(DEFAULT_CANCELLATION_DATE.toString()))) + .andExpect(jsonPath("$.[*].remark").value(hasItem(DEFAULT_REMARK))); // Check, that the count call also returns 1 restSepaMandateMockMvc.perform(get("/api/sepa-mandates/count?sort=id,desc&" + filter)) @@ -867,12 +867,12 @@ public class SepaMandateResourceIntTest { .reference(UPDATED_REFERENCE) .iban(UPDATED_IBAN) .bic(UPDATED_BIC) - .created(UPDATED_CREATED) + .documentDate(UPDATED_DOCUMENT_DATE) .validFrom(UPDATED_VALID_FROM) - .validTo(UPDATED_VALID_TO) + .validUntil(UPDATED_VALID_UNTIL) .lastUsed(UPDATED_LAST_USED) - .cancelled(UPDATED_CANCELLED) - .comment(UPDATED_COMMENT); + .cancellationDate(UPDATED_CANCELLATION_DATE) + .remark(UPDATED_REMARK); SepaMandateDTO sepaMandateDTO = sepaMandateMapper.toDto(updatedSepaMandate); restSepaMandateMockMvc.perform(put("/api/sepa-mandates") @@ -887,12 +887,12 @@ public class SepaMandateResourceIntTest { assertThat(testSepaMandate.getReference()).isEqualTo(UPDATED_REFERENCE); assertThat(testSepaMandate.getIban()).isEqualTo(UPDATED_IBAN); assertThat(testSepaMandate.getBic()).isEqualTo(UPDATED_BIC); - assertThat(testSepaMandate.getCreated()).isEqualTo(UPDATED_CREATED); + assertThat(testSepaMandate.getDocumentDate()).isEqualTo(UPDATED_DOCUMENT_DATE); assertThat(testSepaMandate.getValidFrom()).isEqualTo(UPDATED_VALID_FROM); - assertThat(testSepaMandate.getValidTo()).isEqualTo(UPDATED_VALID_TO); + assertThat(testSepaMandate.getValidUntil()).isEqualTo(UPDATED_VALID_UNTIL); assertThat(testSepaMandate.getLastUsed()).isEqualTo(UPDATED_LAST_USED); - assertThat(testSepaMandate.getCancelled()).isEqualTo(UPDATED_CANCELLED); - assertThat(testSepaMandate.getComment()).isEqualTo(UPDATED_COMMENT); + assertThat(testSepaMandate.getCancellationDate()).isEqualTo(UPDATED_CANCELLATION_DATE); + assertThat(testSepaMandate.getRemark()).isEqualTo(UPDATED_REMARK); } @Test diff --git a/src/test/java/org/hostsharing/hsadminng/web/rest/ShareResourceIntTest.java b/src/test/java/org/hostsharing/hsadminng/web/rest/ShareResourceIntTest.java index 202f8229..3b99a17c 100644 --- a/src/test/java/org/hostsharing/hsadminng/web/rest/ShareResourceIntTest.java +++ b/src/test/java/org/hostsharing/hsadminng/web/rest/ShareResourceIntTest.java @@ -49,8 +49,11 @@ import org.hostsharing.hsadminng.domain.enumeration.ShareAction; @SpringBootTest(classes = HsadminNgApp.class) public class ShareResourceIntTest { - private static final LocalDate DEFAULT_DATE = LocalDate.ofEpochDay(0L); - private static final LocalDate UPDATED_DATE = LocalDate.now(ZoneId.systemDefault()); + private static final LocalDate DEFAULT_DOCUMENT_DATE = LocalDate.ofEpochDay(0L); + private static final LocalDate UPDATED_DOCUMENT_DATE = LocalDate.now(ZoneId.systemDefault()); + + private static final LocalDate DEFAULT_VALUE_DATE = LocalDate.ofEpochDay(0L); + private static final LocalDate UPDATED_VALUE_DATE = LocalDate.now(ZoneId.systemDefault()); private static final ShareAction DEFAULT_ACTION = ShareAction.SUBSCRIPTION; private static final ShareAction UPDATED_ACTION = ShareAction.CANCELLATION; @@ -58,8 +61,8 @@ public class ShareResourceIntTest { private static final Integer DEFAULT_QUANTITY = 1; private static final Integer UPDATED_QUANTITY = 2; - private static final String DEFAULT_COMMENT = "AAAAAAAAAA"; - private static final String UPDATED_COMMENT = "BBBBBBBBBB"; + private static final String DEFAULT_REMARK = "AAAAAAAAAA"; + private static final String UPDATED_REMARK = "BBBBBBBBBB"; @Autowired private ShareRepository shareRepository; @@ -112,10 +115,11 @@ public class ShareResourceIntTest { */ public static Share createEntity(EntityManager em) { Share share = new Share() - .date(DEFAULT_DATE) + .documentDate(DEFAULT_DOCUMENT_DATE) + .valueDate(DEFAULT_VALUE_DATE) .action(DEFAULT_ACTION) .quantity(DEFAULT_QUANTITY) - .comment(DEFAULT_COMMENT); + .remark(DEFAULT_REMARK); // Add required entity Membership membership = MembershipResourceIntTest.createEntity(em); em.persist(membership); @@ -145,10 +149,11 @@ public class ShareResourceIntTest { List shareList = shareRepository.findAll(); assertThat(shareList).hasSize(databaseSizeBeforeCreate + 1); Share testShare = shareList.get(shareList.size() - 1); - assertThat(testShare.getDate()).isEqualTo(DEFAULT_DATE); + assertThat(testShare.getDocumentDate()).isEqualTo(DEFAULT_DOCUMENT_DATE); + assertThat(testShare.getValueDate()).isEqualTo(DEFAULT_VALUE_DATE); assertThat(testShare.getAction()).isEqualTo(DEFAULT_ACTION); assertThat(testShare.getQuantity()).isEqualTo(DEFAULT_QUANTITY); - assertThat(testShare.getComment()).isEqualTo(DEFAULT_COMMENT); + assertThat(testShare.getRemark()).isEqualTo(DEFAULT_REMARK); } @Test @@ -173,10 +178,29 @@ public class ShareResourceIntTest { @Test @Transactional - public void checkDateIsRequired() throws Exception { + public void checkDocumentDateIsRequired() throws Exception { int databaseSizeBeforeTest = shareRepository.findAll().size(); // set the field null - share.setDate(null); + share.setDocumentDate(null); + + // Create the Share, which fails. + ShareDTO shareDTO = shareMapper.toDto(share); + + restShareMockMvc.perform(post("/api/shares") + .contentType(TestUtil.APPLICATION_JSON_UTF8) + .content(TestUtil.convertObjectToJsonBytes(shareDTO))) + .andExpect(status().isBadRequest()); + + List shareList = shareRepository.findAll(); + assertThat(shareList).hasSize(databaseSizeBeforeTest); + } + + @Test + @Transactional + public void checkValueDateIsRequired() throws Exception { + int databaseSizeBeforeTest = shareRepository.findAll().size(); + // set the field null + share.setValueDate(null); // Create the Share, which fails. ShareDTO shareDTO = shareMapper.toDto(share); @@ -239,10 +263,11 @@ public class ShareResourceIntTest { .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)) .andExpect(jsonPath("$.[*].id").value(hasItem(share.getId().intValue()))) - .andExpect(jsonPath("$.[*].date").value(hasItem(DEFAULT_DATE.toString()))) + .andExpect(jsonPath("$.[*].documentDate").value(hasItem(DEFAULT_DOCUMENT_DATE.toString()))) + .andExpect(jsonPath("$.[*].valueDate").value(hasItem(DEFAULT_VALUE_DATE.toString()))) .andExpect(jsonPath("$.[*].action").value(hasItem(DEFAULT_ACTION.toString()))) .andExpect(jsonPath("$.[*].quantity").value(hasItem(DEFAULT_QUANTITY))) - .andExpect(jsonPath("$.[*].comment").value(hasItem(DEFAULT_COMMENT.toString()))); + .andExpect(jsonPath("$.[*].remark").value(hasItem(DEFAULT_REMARK.toString()))); } @Test @@ -256,75 +281,142 @@ public class ShareResourceIntTest { .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)) .andExpect(jsonPath("$.id").value(share.getId().intValue())) - .andExpect(jsonPath("$.date").value(DEFAULT_DATE.toString())) + .andExpect(jsonPath("$.documentDate").value(DEFAULT_DOCUMENT_DATE.toString())) + .andExpect(jsonPath("$.valueDate").value(DEFAULT_VALUE_DATE.toString())) .andExpect(jsonPath("$.action").value(DEFAULT_ACTION.toString())) .andExpect(jsonPath("$.quantity").value(DEFAULT_QUANTITY)) - .andExpect(jsonPath("$.comment").value(DEFAULT_COMMENT.toString())); + .andExpect(jsonPath("$.remark").value(DEFAULT_REMARK.toString())); } @Test @Transactional - public void getAllSharesByDateIsEqualToSomething() throws Exception { + public void getAllSharesByDocumentDateIsEqualToSomething() throws Exception { // Initialize the database shareRepository.saveAndFlush(share); - // Get all the shareList where date equals to DEFAULT_DATE - defaultShareShouldBeFound("date.equals=" + DEFAULT_DATE); + // Get all the shareList where documentDate equals to DEFAULT_DOCUMENT_DATE + defaultShareShouldBeFound("documentDate.equals=" + DEFAULT_DOCUMENT_DATE); - // Get all the shareList where date equals to UPDATED_DATE - defaultShareShouldNotBeFound("date.equals=" + UPDATED_DATE); + // Get all the shareList where documentDate equals to UPDATED_DOCUMENT_DATE + defaultShareShouldNotBeFound("documentDate.equals=" + UPDATED_DOCUMENT_DATE); } @Test @Transactional - public void getAllSharesByDateIsInShouldWork() throws Exception { + public void getAllSharesByDocumentDateIsInShouldWork() throws Exception { // Initialize the database shareRepository.saveAndFlush(share); - // Get all the shareList where date in DEFAULT_DATE or UPDATED_DATE - defaultShareShouldBeFound("date.in=" + DEFAULT_DATE + "," + UPDATED_DATE); + // Get all the shareList where documentDate in DEFAULT_DOCUMENT_DATE or UPDATED_DOCUMENT_DATE + defaultShareShouldBeFound("documentDate.in=" + DEFAULT_DOCUMENT_DATE + "," + UPDATED_DOCUMENT_DATE); - // Get all the shareList where date equals to UPDATED_DATE - defaultShareShouldNotBeFound("date.in=" + UPDATED_DATE); + // Get all the shareList where documentDate equals to UPDATED_DOCUMENT_DATE + defaultShareShouldNotBeFound("documentDate.in=" + UPDATED_DOCUMENT_DATE); } @Test @Transactional - public void getAllSharesByDateIsNullOrNotNull() throws Exception { + public void getAllSharesByDocumentDateIsNullOrNotNull() throws Exception { // Initialize the database shareRepository.saveAndFlush(share); - // Get all the shareList where date is not null - defaultShareShouldBeFound("date.specified=true"); + // Get all the shareList where documentDate is not null + defaultShareShouldBeFound("documentDate.specified=true"); - // Get all the shareList where date is null - defaultShareShouldNotBeFound("date.specified=false"); + // Get all the shareList where documentDate is null + defaultShareShouldNotBeFound("documentDate.specified=false"); } @Test @Transactional - public void getAllSharesByDateIsGreaterThanOrEqualToSomething() throws Exception { + public void getAllSharesByDocumentDateIsGreaterThanOrEqualToSomething() throws Exception { // Initialize the database shareRepository.saveAndFlush(share); - // Get all the shareList where date greater than or equals to DEFAULT_DATE - defaultShareShouldBeFound("date.greaterOrEqualThan=" + DEFAULT_DATE); + // Get all the shareList where documentDate greater than or equals to DEFAULT_DOCUMENT_DATE + defaultShareShouldBeFound("documentDate.greaterOrEqualThan=" + DEFAULT_DOCUMENT_DATE); - // Get all the shareList where date greater than or equals to UPDATED_DATE - defaultShareShouldNotBeFound("date.greaterOrEqualThan=" + UPDATED_DATE); + // Get all the shareList where documentDate greater than or equals to UPDATED_DOCUMENT_DATE + defaultShareShouldNotBeFound("documentDate.greaterOrEqualThan=" + UPDATED_DOCUMENT_DATE); } @Test @Transactional - public void getAllSharesByDateIsLessThanSomething() throws Exception { + public void getAllSharesByDocumentDateIsLessThanSomething() throws Exception { // Initialize the database shareRepository.saveAndFlush(share); - // Get all the shareList where date less than or equals to DEFAULT_DATE - defaultShareShouldNotBeFound("date.lessThan=" + DEFAULT_DATE); + // Get all the shareList where documentDate less than or equals to DEFAULT_DOCUMENT_DATE + defaultShareShouldNotBeFound("documentDate.lessThan=" + DEFAULT_DOCUMENT_DATE); - // Get all the shareList where date less than or equals to UPDATED_DATE - defaultShareShouldBeFound("date.lessThan=" + UPDATED_DATE); + // Get all the shareList where documentDate less than or equals to UPDATED_DOCUMENT_DATE + defaultShareShouldBeFound("documentDate.lessThan=" + UPDATED_DOCUMENT_DATE); + } + + + @Test + @Transactional + public void getAllSharesByValueDateIsEqualToSomething() throws Exception { + // Initialize the database + shareRepository.saveAndFlush(share); + + // Get all the shareList where valueDate equals to DEFAULT_VALUE_DATE + defaultShareShouldBeFound("valueDate.equals=" + DEFAULT_VALUE_DATE); + + // Get all the shareList where valueDate equals to UPDATED_VALUE_DATE + defaultShareShouldNotBeFound("valueDate.equals=" + UPDATED_VALUE_DATE); + } + + @Test + @Transactional + public void getAllSharesByValueDateIsInShouldWork() throws Exception { + // Initialize the database + shareRepository.saveAndFlush(share); + + // Get all the shareList where valueDate in DEFAULT_VALUE_DATE or UPDATED_VALUE_DATE + defaultShareShouldBeFound("valueDate.in=" + DEFAULT_VALUE_DATE + "," + UPDATED_VALUE_DATE); + + // Get all the shareList where valueDate equals to UPDATED_VALUE_DATE + defaultShareShouldNotBeFound("valueDate.in=" + UPDATED_VALUE_DATE); + } + + @Test + @Transactional + public void getAllSharesByValueDateIsNullOrNotNull() throws Exception { + // Initialize the database + shareRepository.saveAndFlush(share); + + // Get all the shareList where valueDate is not null + defaultShareShouldBeFound("valueDate.specified=true"); + + // Get all the shareList where valueDate is null + defaultShareShouldNotBeFound("valueDate.specified=false"); + } + + @Test + @Transactional + public void getAllSharesByValueDateIsGreaterThanOrEqualToSomething() throws Exception { + // Initialize the database + shareRepository.saveAndFlush(share); + + // Get all the shareList where valueDate greater than or equals to DEFAULT_VALUE_DATE + defaultShareShouldBeFound("valueDate.greaterOrEqualThan=" + DEFAULT_VALUE_DATE); + + // Get all the shareList where valueDate greater than or equals to UPDATED_VALUE_DATE + defaultShareShouldNotBeFound("valueDate.greaterOrEqualThan=" + UPDATED_VALUE_DATE); + } + + @Test + @Transactional + public void getAllSharesByValueDateIsLessThanSomething() throws Exception { + // Initialize the database + shareRepository.saveAndFlush(share); + + // Get all the shareList where valueDate less than or equals to DEFAULT_VALUE_DATE + defaultShareShouldNotBeFound("valueDate.lessThan=" + DEFAULT_VALUE_DATE); + + // Get all the shareList where valueDate less than or equals to UPDATED_VALUE_DATE + defaultShareShouldBeFound("valueDate.lessThan=" + UPDATED_VALUE_DATE); } @@ -435,41 +527,41 @@ public class ShareResourceIntTest { @Test @Transactional - public void getAllSharesByCommentIsEqualToSomething() throws Exception { + public void getAllSharesByRemarkIsEqualToSomething() throws Exception { // Initialize the database shareRepository.saveAndFlush(share); - // Get all the shareList where comment equals to DEFAULT_COMMENT - defaultShareShouldBeFound("comment.equals=" + DEFAULT_COMMENT); + // Get all the shareList where remark equals to DEFAULT_REMARK + defaultShareShouldBeFound("remark.equals=" + DEFAULT_REMARK); - // Get all the shareList where comment equals to UPDATED_COMMENT - defaultShareShouldNotBeFound("comment.equals=" + UPDATED_COMMENT); + // Get all the shareList where remark equals to UPDATED_REMARK + defaultShareShouldNotBeFound("remark.equals=" + UPDATED_REMARK); } @Test @Transactional - public void getAllSharesByCommentIsInShouldWork() throws Exception { + public void getAllSharesByRemarkIsInShouldWork() throws Exception { // Initialize the database shareRepository.saveAndFlush(share); - // Get all the shareList where comment in DEFAULT_COMMENT or UPDATED_COMMENT - defaultShareShouldBeFound("comment.in=" + DEFAULT_COMMENT + "," + UPDATED_COMMENT); + // Get all the shareList where remark in DEFAULT_REMARK or UPDATED_REMARK + defaultShareShouldBeFound("remark.in=" + DEFAULT_REMARK + "," + UPDATED_REMARK); - // Get all the shareList where comment equals to UPDATED_COMMENT - defaultShareShouldNotBeFound("comment.in=" + UPDATED_COMMENT); + // Get all the shareList where remark equals to UPDATED_REMARK + defaultShareShouldNotBeFound("remark.in=" + UPDATED_REMARK); } @Test @Transactional - public void getAllSharesByCommentIsNullOrNotNull() throws Exception { + public void getAllSharesByRemarkIsNullOrNotNull() throws Exception { // Initialize the database shareRepository.saveAndFlush(share); - // Get all the shareList where comment is not null - defaultShareShouldBeFound("comment.specified=true"); + // Get all the shareList where remark is not null + defaultShareShouldBeFound("remark.specified=true"); - // Get all the shareList where comment is null - defaultShareShouldNotBeFound("comment.specified=false"); + // Get all the shareList where remark is null + defaultShareShouldNotBeFound("remark.specified=false"); } @Test @@ -498,10 +590,11 @@ public class ShareResourceIntTest { .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8_VALUE)) .andExpect(jsonPath("$.[*].id").value(hasItem(share.getId().intValue()))) - .andExpect(jsonPath("$.[*].date").value(hasItem(DEFAULT_DATE.toString()))) + .andExpect(jsonPath("$.[*].documentDate").value(hasItem(DEFAULT_DOCUMENT_DATE.toString()))) + .andExpect(jsonPath("$.[*].valueDate").value(hasItem(DEFAULT_VALUE_DATE.toString()))) .andExpect(jsonPath("$.[*].action").value(hasItem(DEFAULT_ACTION.toString()))) .andExpect(jsonPath("$.[*].quantity").value(hasItem(DEFAULT_QUANTITY))) - .andExpect(jsonPath("$.[*].comment").value(hasItem(DEFAULT_COMMENT))); + .andExpect(jsonPath("$.[*].remark").value(hasItem(DEFAULT_REMARK))); // Check, that the count call also returns 1 restShareMockMvc.perform(get("/api/shares/count?sort=id,desc&" + filter)) @@ -549,10 +642,11 @@ public class ShareResourceIntTest { // Disconnect from session so that the updates on updatedShare are not directly saved in db em.detach(updatedShare); updatedShare - .date(UPDATED_DATE) + .documentDate(UPDATED_DOCUMENT_DATE) + .valueDate(UPDATED_VALUE_DATE) .action(UPDATED_ACTION) .quantity(UPDATED_QUANTITY) - .comment(UPDATED_COMMENT); + .remark(UPDATED_REMARK); ShareDTO shareDTO = shareMapper.toDto(updatedShare); restShareMockMvc.perform(put("/api/shares") @@ -564,10 +658,11 @@ public class ShareResourceIntTest { List shareList = shareRepository.findAll(); assertThat(shareList).hasSize(databaseSizeBeforeUpdate); Share testShare = shareList.get(shareList.size() - 1); - assertThat(testShare.getDate()).isEqualTo(UPDATED_DATE); + assertThat(testShare.getDocumentDate()).isEqualTo(UPDATED_DOCUMENT_DATE); + assertThat(testShare.getValueDate()).isEqualTo(UPDATED_VALUE_DATE); assertThat(testShare.getAction()).isEqualTo(UPDATED_ACTION); assertThat(testShare.getQuantity()).isEqualTo(UPDATED_QUANTITY); - assertThat(testShare.getComment()).isEqualTo(UPDATED_COMMENT); + assertThat(testShare.getRemark()).isEqualTo(UPDATED_REMARK); } @Test diff --git a/src/test/javascript/spec/app/entities/asset/asset.service.spec.ts b/src/test/javascript/spec/app/entities/asset/asset.service.spec.ts index 99eabace..28250778 100644 --- a/src/test/javascript/spec/app/entities/asset/asset.service.spec.ts +++ b/src/test/javascript/spec/app/entities/asset/asset.service.spec.ts @@ -25,14 +25,15 @@ describe('Service Tests', () => { httpMock = injector.get(HttpTestingController); currentDate = moment(); - elemDefault = new Asset(0, currentDate, AssetAction.PAYMENT, 0, 'AAAAAAA'); + elemDefault = new Asset(0, currentDate, currentDate, AssetAction.PAYMENT, 0, 'AAAAAAA'); }); describe('Service methods', async () => { it('should find an element', async () => { const returnedFromService = Object.assign( { - date: currentDate.format(DATE_FORMAT) + documentDate: currentDate.format(DATE_FORMAT), + valueDate: currentDate.format(DATE_FORMAT) }, elemDefault ); @@ -49,13 +50,15 @@ describe('Service Tests', () => { const returnedFromService = Object.assign( { id: 0, - date: currentDate.format(DATE_FORMAT) + documentDate: currentDate.format(DATE_FORMAT), + valueDate: currentDate.format(DATE_FORMAT) }, elemDefault ); const expected = Object.assign( { - date: currentDate + documentDate: currentDate, + valueDate: currentDate }, returnedFromService ); @@ -70,17 +73,19 @@ describe('Service Tests', () => { it('should update a Asset', async () => { const returnedFromService = Object.assign( { - date: currentDate.format(DATE_FORMAT), + documentDate: currentDate.format(DATE_FORMAT), + valueDate: currentDate.format(DATE_FORMAT), action: 'BBBBBB', amount: 1, - comment: 'BBBBBB' + remark: 'BBBBBB' }, elemDefault ); const expected = Object.assign( { - date: currentDate + documentDate: currentDate, + valueDate: currentDate }, returnedFromService ); @@ -95,16 +100,18 @@ describe('Service Tests', () => { it('should return a list of Asset', async () => { const returnedFromService = Object.assign( { - date: currentDate.format(DATE_FORMAT), + documentDate: currentDate.format(DATE_FORMAT), + valueDate: currentDate.format(DATE_FORMAT), action: 'BBBBBB', amount: 1, - comment: 'BBBBBB' + remark: 'BBBBBB' }, elemDefault ); const expected = Object.assign( { - date: currentDate + documentDate: currentDate, + valueDate: currentDate }, returnedFromService ); diff --git a/src/test/javascript/spec/app/entities/customer/customer.service.spec.ts b/src/test/javascript/spec/app/entities/customer/customer.service.spec.ts index 46117d13..53f01f13 100644 --- a/src/test/javascript/spec/app/entities/customer/customer.service.spec.ts +++ b/src/test/javascript/spec/app/entities/customer/customer.service.spec.ts @@ -21,7 +21,7 @@ describe('Service Tests', () => { service = injector.get(CustomerService); httpMock = injector.get(HttpTestingController); - elemDefault = new Customer(0, 0, 'AAAAAAA', 'AAAAAAA', 'AAAAAAA', 'AAAAAAA', 'AAAAAAA', 'AAAAAAA'); + elemDefault = new Customer(0, 0, 'AAAAAAA', 'AAAAAAA', 'AAAAAAA', 'AAAAAAA', 'AAAAAAA', 'AAAAAAA', 'AAAAAAA'); }); describe('Service methods', async () => { @@ -55,13 +55,14 @@ describe('Service Tests', () => { it('should update a Customer', async () => { const returnedFromService = Object.assign( { - number: 1, + reference: 1, prefix: 'BBBBBB', name: 'BBBBBB', contractualSalutation: 'BBBBBB', contractualAddress: 'BBBBBB', billingSalutation: 'BBBBBB', - billingAddress: 'BBBBBB' + billingAddress: 'BBBBBB', + remark: 'BBBBBB' }, elemDefault ); @@ -78,13 +79,14 @@ describe('Service Tests', () => { it('should return a list of Customer', async () => { const returnedFromService = Object.assign( { - number: 1, + reference: 1, prefix: 'BBBBBB', name: 'BBBBBB', contractualSalutation: 'BBBBBB', contractualAddress: 'BBBBBB', billingSalutation: 'BBBBBB', - billingAddress: 'BBBBBB' + billingAddress: 'BBBBBB', + remark: 'BBBBBB' }, elemDefault ); diff --git a/src/test/javascript/spec/app/entities/membership/membership.service.spec.ts b/src/test/javascript/spec/app/entities/membership/membership.service.spec.ts index 139697e5..765beeec 100644 --- a/src/test/javascript/spec/app/entities/membership/membership.service.spec.ts +++ b/src/test/javascript/spec/app/entities/membership/membership.service.spec.ts @@ -25,15 +25,16 @@ describe('Service Tests', () => { httpMock = injector.get(HttpTestingController); currentDate = moment(); - elemDefault = new Membership(0, currentDate, currentDate, 'AAAAAAA'); + elemDefault = new Membership(0, currentDate, currentDate, currentDate, 'AAAAAAA'); }); describe('Service methods', async () => { it('should find an element', async () => { const returnedFromService = Object.assign( { - from: currentDate.format(DATE_FORMAT), - to: currentDate.format(DATE_FORMAT) + documentDate: currentDate.format(DATE_FORMAT), + memberFrom: currentDate.format(DATE_FORMAT), + memberUntil: currentDate.format(DATE_FORMAT) }, elemDefault ); @@ -50,15 +51,17 @@ describe('Service Tests', () => { const returnedFromService = Object.assign( { id: 0, - from: currentDate.format(DATE_FORMAT), - to: currentDate.format(DATE_FORMAT) + documentDate: currentDate.format(DATE_FORMAT), + memberFrom: currentDate.format(DATE_FORMAT), + memberUntil: currentDate.format(DATE_FORMAT) }, elemDefault ); const expected = Object.assign( { - from: currentDate, - to: currentDate + documentDate: currentDate, + memberFrom: currentDate, + memberUntil: currentDate }, returnedFromService ); @@ -73,17 +76,19 @@ describe('Service Tests', () => { it('should update a Membership', async () => { const returnedFromService = Object.assign( { - from: currentDate.format(DATE_FORMAT), - to: currentDate.format(DATE_FORMAT), - comment: 'BBBBBB' + documentDate: currentDate.format(DATE_FORMAT), + memberFrom: currentDate.format(DATE_FORMAT), + memberUntil: currentDate.format(DATE_FORMAT), + remark: 'BBBBBB' }, elemDefault ); const expected = Object.assign( { - from: currentDate, - to: currentDate + documentDate: currentDate, + memberFrom: currentDate, + memberUntil: currentDate }, returnedFromService ); @@ -98,16 +103,18 @@ describe('Service Tests', () => { it('should return a list of Membership', async () => { const returnedFromService = Object.assign( { - from: currentDate.format(DATE_FORMAT), - to: currentDate.format(DATE_FORMAT), - comment: 'BBBBBB' + documentDate: currentDate.format(DATE_FORMAT), + memberFrom: currentDate.format(DATE_FORMAT), + memberUntil: currentDate.format(DATE_FORMAT), + remark: 'BBBBBB' }, elemDefault ); const expected = Object.assign( { - from: currentDate, - to: currentDate + documentDate: currentDate, + memberFrom: currentDate, + memberUntil: currentDate }, returnedFromService ); diff --git a/src/test/javascript/spec/app/entities/sepa-mandate/sepa-mandate.service.spec.ts b/src/test/javascript/spec/app/entities/sepa-mandate/sepa-mandate.service.spec.ts index 98d20b23..0ff6222c 100644 --- a/src/test/javascript/spec/app/entities/sepa-mandate/sepa-mandate.service.spec.ts +++ b/src/test/javascript/spec/app/entities/sepa-mandate/sepa-mandate.service.spec.ts @@ -43,11 +43,11 @@ describe('Service Tests', () => { it('should find an element', async () => { const returnedFromService = Object.assign( { - created: currentDate.format(DATE_FORMAT), + documentDate: currentDate.format(DATE_FORMAT), validFrom: currentDate.format(DATE_FORMAT), - validTo: currentDate.format(DATE_FORMAT), + validUntil: currentDate.format(DATE_FORMAT), lastUsed: currentDate.format(DATE_FORMAT), - cancelled: currentDate.format(DATE_FORMAT) + cancellationDate: currentDate.format(DATE_FORMAT) }, elemDefault ); @@ -64,21 +64,21 @@ describe('Service Tests', () => { const returnedFromService = Object.assign( { id: 0, - created: currentDate.format(DATE_FORMAT), + documentDate: currentDate.format(DATE_FORMAT), validFrom: currentDate.format(DATE_FORMAT), - validTo: currentDate.format(DATE_FORMAT), + validUntil: currentDate.format(DATE_FORMAT), lastUsed: currentDate.format(DATE_FORMAT), - cancelled: currentDate.format(DATE_FORMAT) + cancellationDate: currentDate.format(DATE_FORMAT) }, elemDefault ); const expected = Object.assign( { - created: currentDate, + documentDate: currentDate, validFrom: currentDate, - validTo: currentDate, + validUntil: currentDate, lastUsed: currentDate, - cancelled: currentDate + cancellationDate: currentDate }, returnedFromService ); @@ -96,23 +96,23 @@ describe('Service Tests', () => { reference: 'BBBBBB', iban: 'BBBBBB', bic: 'BBBBBB', - created: currentDate.format(DATE_FORMAT), + documentDate: currentDate.format(DATE_FORMAT), validFrom: currentDate.format(DATE_FORMAT), - validTo: currentDate.format(DATE_FORMAT), + validUntil: currentDate.format(DATE_FORMAT), lastUsed: currentDate.format(DATE_FORMAT), - cancelled: currentDate.format(DATE_FORMAT), - comment: 'BBBBBB' + cancellationDate: currentDate.format(DATE_FORMAT), + remark: 'BBBBBB' }, elemDefault ); const expected = Object.assign( { - created: currentDate, + documentDate: currentDate, validFrom: currentDate, - validTo: currentDate, + validUntil: currentDate, lastUsed: currentDate, - cancelled: currentDate + cancellationDate: currentDate }, returnedFromService ); @@ -130,22 +130,22 @@ describe('Service Tests', () => { reference: 'BBBBBB', iban: 'BBBBBB', bic: 'BBBBBB', - created: currentDate.format(DATE_FORMAT), + documentDate: currentDate.format(DATE_FORMAT), validFrom: currentDate.format(DATE_FORMAT), - validTo: currentDate.format(DATE_FORMAT), + validUntil: currentDate.format(DATE_FORMAT), lastUsed: currentDate.format(DATE_FORMAT), - cancelled: currentDate.format(DATE_FORMAT), - comment: 'BBBBBB' + cancellationDate: currentDate.format(DATE_FORMAT), + remark: 'BBBBBB' }, elemDefault ); const expected = Object.assign( { - created: currentDate, + documentDate: currentDate, validFrom: currentDate, - validTo: currentDate, + validUntil: currentDate, lastUsed: currentDate, - cancelled: currentDate + cancellationDate: currentDate }, returnedFromService ); diff --git a/src/test/javascript/spec/app/entities/share/share.service.spec.ts b/src/test/javascript/spec/app/entities/share/share.service.spec.ts index b3288c82..73bf3281 100644 --- a/src/test/javascript/spec/app/entities/share/share.service.spec.ts +++ b/src/test/javascript/spec/app/entities/share/share.service.spec.ts @@ -25,14 +25,15 @@ describe('Service Tests', () => { httpMock = injector.get(HttpTestingController); currentDate = moment(); - elemDefault = new Share(0, currentDate, ShareAction.SUBSCRIPTION, 0, 'AAAAAAA'); + elemDefault = new Share(0, currentDate, currentDate, ShareAction.SUBSCRIPTION, 0, 'AAAAAAA'); }); describe('Service methods', async () => { it('should find an element', async () => { const returnedFromService = Object.assign( { - date: currentDate.format(DATE_FORMAT) + documentDate: currentDate.format(DATE_FORMAT), + valueDate: currentDate.format(DATE_FORMAT) }, elemDefault ); @@ -49,13 +50,15 @@ describe('Service Tests', () => { const returnedFromService = Object.assign( { id: 0, - date: currentDate.format(DATE_FORMAT) + documentDate: currentDate.format(DATE_FORMAT), + valueDate: currentDate.format(DATE_FORMAT) }, elemDefault ); const expected = Object.assign( { - date: currentDate + documentDate: currentDate, + valueDate: currentDate }, returnedFromService ); @@ -70,17 +73,19 @@ describe('Service Tests', () => { it('should update a Share', async () => { const returnedFromService = Object.assign( { - date: currentDate.format(DATE_FORMAT), + documentDate: currentDate.format(DATE_FORMAT), + valueDate: currentDate.format(DATE_FORMAT), action: 'BBBBBB', quantity: 1, - comment: 'BBBBBB' + remark: 'BBBBBB' }, elemDefault ); const expected = Object.assign( { - date: currentDate + documentDate: currentDate, + valueDate: currentDate }, returnedFromService ); @@ -95,16 +100,18 @@ describe('Service Tests', () => { it('should return a list of Share', async () => { const returnedFromService = Object.assign( { - date: currentDate.format(DATE_FORMAT), + documentDate: currentDate.format(DATE_FORMAT), + valueDate: currentDate.format(DATE_FORMAT), action: 'BBBBBB', quantity: 1, - comment: 'BBBBBB' + remark: 'BBBBBB' }, elemDefault ); const expected = Object.assign( { - date: currentDate + documentDate: currentDate, + valueDate: currentDate }, returnedFromService );