From bd5bb859d993de20a374f4d7dc272e8eb9068f63 Mon Sep 17 00:00:00 2001 From: Michael Hoennig Date: Fri, 12 Apr 2019 16:46:43 +0200 Subject: [PATCH] re-importing latest customer.jdl from master branch --- .jhipster/Asset.json | 1 + .jhipster/Customer.json | 54 ++- .jhipster/Membership.json | 1 + .jhipster/Share.json | 1 + .../hostsharing/hsadminng/domain/Asset.java | 10 +- .../hsadminng/domain/Customer.java | 125 ++++++- .../hsadminng/domain/Membership.java | 9 +- .../hostsharing/hsadminng/domain/Share.java | 10 +- .../service/CustomerQueryService.java | 44 ++- .../service/dto/CustomerCriteria.java | 93 ++++- .../hsadminng/service/dto/CustomerDTO.java | 62 ++++ .../service/mapper/CustomerMapper.java | 8 +- src/main/jdl/customer.jdl | 19 +- .../20190403083735_added_entity_Customer.xml | 24 +- ...20190403083738_added_entity_Membership.xml | 6 +- .../20190403083739_added_entity_Share.xml | 6 +- .../20190403083740_added_entity_Asset.xml | 6 +- .../asset/asset-update.component.html | 11 +- .../customer/customer-detail.component.html | 20 ++ .../customer/customer-update.component.html | 80 +++++ .../entities/customer/customer.component.html | 21 ++ src/main/webapp/app/entities/entity.module.ts | 18 +- .../membership-update.component.html | 12 +- .../share/share-update.component.html | 11 +- .../webapp/app/shared/model/customer.model.ts | 18 +- src/main/webapp/i18n/de/customer.json | 9 +- src/main/webapp/i18n/en/customer.json | 9 +- .../web/rest/AssetResourceIntTest.java | 16 +- .../web/rest/CustomerResourceIntTest.java | 323 ++++++++++++++++-- .../web/rest/MembershipResourceIntTest.java | 17 +- .../web/rest/ShareResourceIntTest.java | 18 +- .../asset/asset-update.component.spec.ts | 4 +- .../customer-update.component.spec.ts | 4 +- .../customer/customer.service.spec.ts | 24 +- .../membership-update.component.spec.ts | 4 +- .../share/share-update.component.spec.ts | 4 +- 36 files changed, 927 insertions(+), 175 deletions(-) diff --git a/.jhipster/Asset.json b/.jhipster/Asset.json index baf8a85f..c1e70387 100644 --- a/.jhipster/Asset.json +++ b/.jhipster/Asset.json @@ -37,6 +37,7 @@ "relationshipType": "many-to-one", "otherEntityName": "membership", "otherEntityRelationshipName": "asset", + "relationshipValidateRules": "required", "relationshipName": "member", "otherEntityField": "id" } diff --git a/.jhipster/Customer.json b/.jhipster/Customer.json index 9725cc51..36d7340c 100644 --- a/.jhipster/Customer.json +++ b/.jhipster/Customer.json @@ -22,20 +22,62 @@ "pattern" ], "fieldValidateRulesPattern": "[a-z][a-z0-9]+" + }, + { + "fieldName": "name", + "fieldType": "String", + "fieldValidateRules": [ + "required", + "maxlength" + ], + "fieldValidateRulesMaxlength": 80 + }, + { + "fieldName": "contractualAddress", + "fieldType": "String", + "fieldValidateRules": [ + "required", + "maxlength" + ], + "fieldValidateRulesMaxlength": 400 + }, + { + "fieldName": "contractualSalutation", + "fieldType": "String", + "fieldValidateRules": [ + "maxlength" + ], + "fieldValidateRulesMaxlength": 80 + }, + { + "fieldName": "billingAddress", + "fieldType": "String", + "fieldValidateRules": [ + "maxlength" + ], + "fieldValidateRulesMaxlength": 400 + }, + { + "fieldName": "billingSalutation", + "fieldType": "String", + "fieldValidateRules": [ + "maxlength" + ], + "fieldValidateRulesMaxlength": 80 } ], "relationships": [ - { - "relationshipType": "one-to-many", - "otherEntityName": "membership", - "otherEntityRelationshipName": "customer", - "relationshipName": "membership" - }, { "relationshipType": "one-to-many", "otherEntityName": "customerContact", "otherEntityRelationshipName": "customer", "relationshipName": "role" + }, + { + "relationshipType": "one-to-many", + "otherEntityName": "membership", + "otherEntityRelationshipName": "customer", + "relationshipName": "membership" } ], "changelogDate": "20190403083735", diff --git a/.jhipster/Membership.json b/.jhipster/Membership.json index 3c479c3f..c44a5c77 100644 --- a/.jhipster/Membership.json +++ b/.jhipster/Membership.json @@ -30,6 +30,7 @@ "relationshipType": "many-to-one", "otherEntityName": "customer", "otherEntityRelationshipName": "membership", + "relationshipValidateRules": "required", "relationshipName": "customer", "otherEntityField": "prefix" } diff --git a/.jhipster/Share.json b/.jhipster/Share.json index 181ab499..630f5a24 100644 --- a/.jhipster/Share.json +++ b/.jhipster/Share.json @@ -37,6 +37,7 @@ "relationshipType": "many-to-one", "otherEntityName": "membership", "otherEntityRelationshipName": "share", + "relationshipValidateRules": "required", "relationshipName": "member", "otherEntityField": "id" } diff --git a/src/main/java/org/hostsharing/hsadminng/domain/Asset.java b/src/main/java/org/hostsharing/hsadminng/domain/Asset.java index 2f7861c3..fa69bb84 100644 --- a/src/main/java/org/hostsharing/hsadminng/domain/Asset.java +++ b/src/main/java/org/hostsharing/hsadminng/domain/Asset.java @@ -2,17 +2,16 @@ package org.hostsharing.hsadminng.domain; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import org.hostsharing.hsadminng.domain.enumeration.AssetAction; import javax.persistence.*; -import javax.validation.constraints.*; - +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDate; import java.util.Objects; -import org.hostsharing.hsadminng.domain.enumeration.AssetAction; - /** * A Asset. */ @@ -44,7 +43,8 @@ public class Asset implements Serializable { @Column(name = "jhi_comment", length = 160) private String comment; - @ManyToOne + @ManyToOne(optional = false) + @NotNull @JsonIgnoreProperties("assets") private Membership member; diff --git a/src/main/java/org/hostsharing/hsadminng/domain/Customer.java b/src/main/java/org/hostsharing/hsadminng/domain/Customer.java index 00e10ab4..de1d9e78 100644 --- a/src/main/java/org/hostsharing/hsadminng/domain/Customer.java +++ b/src/main/java/org/hostsharing/hsadminng/domain/Customer.java @@ -1,15 +1,12 @@ package org.hostsharing.hsadminng.domain; -import com.fasterxml.jackson.annotation.JsonIgnore; - import javax.persistence.*; import javax.validation.constraints.*; - import java.io.Serializable; import java.util.HashSet; -import java.util.Set; import java.util.Objects; +import java.util.Set; /** * A Customer. @@ -36,10 +33,32 @@ public class Customer implements Serializable { @Column(name = "prefix", nullable = false, unique = true) private String prefix; - @OneToMany(mappedBy = "customer") - private Set memberships = new HashSet<>(); + @NotNull + @Size(max = 80) + @Column(name = "name", length = 80, nullable = false) + private String name; + + @NotNull + @Size(max = 400) + @Column(name = "contractual_address", length = 400, nullable = false) + private String contractualAddress; + + @Size(max = 80) + @Column(name = "contractual_salutation", length = 80) + private String contractualSalutation; + + @Size(max = 400) + @Column(name = "billing_address", length = 400) + private String billingAddress; + + @Size(max = 80) + @Column(name = "billing_salutation", length = 80) + private String billingSalutation; + @OneToMany(mappedBy = "customer") private Set roles = new HashSet<>(); + @OneToMany(mappedBy = "customer") + private Set memberships = new HashSet<>(); // jhipster-needle-entity-add-field - JHipster will add fields here, do not remove public Long getId() { return id; @@ -75,29 +94,69 @@ public class Customer implements Serializable { this.prefix = prefix; } - public Set getMemberships() { - return memberships; + public String getName() { + return name; } - public Customer memberships(Set memberships) { - this.memberships = memberships; + public Customer name(String name) { + this.name = name; return this; } - public Customer addMembership(Membership membership) { - this.memberships.add(membership); - membership.setCustomer(this); + public void setName(String name) { + this.name = name; + } + + public String getContractualAddress() { + return contractualAddress; + } + + public Customer contractualAddress(String contractualAddress) { + this.contractualAddress = contractualAddress; return this; } - public Customer removeMembership(Membership membership) { - this.memberships.remove(membership); - membership.setCustomer(null); + public void setContractualAddress(String contractualAddress) { + this.contractualAddress = contractualAddress; + } + + public String getContractualSalutation() { + return contractualSalutation; + } + + public Customer contractualSalutation(String contractualSalutation) { + this.contractualSalutation = contractualSalutation; return this; } - public void setMemberships(Set memberships) { - this.memberships = memberships; + public void setContractualSalutation(String contractualSalutation) { + this.contractualSalutation = contractualSalutation; + } + + public String getBillingAddress() { + return billingAddress; + } + + public Customer billingAddress(String billingAddress) { + this.billingAddress = billingAddress; + return this; + } + + public void setBillingAddress(String billingAddress) { + this.billingAddress = billingAddress; + } + + public String getBillingSalutation() { + return billingSalutation; + } + + public Customer billingSalutation(String billingSalutation) { + this.billingSalutation = billingSalutation; + return this; + } + + public void setBillingSalutation(String billingSalutation) { + this.billingSalutation = billingSalutation; } public Set getRoles() { @@ -124,6 +183,31 @@ public class Customer implements Serializable { public void setRoles(Set customerContacts) { this.roles = customerContacts; } + + public Set getMemberships() { + return memberships; + } + + public Customer memberships(Set memberships) { + this.memberships = memberships; + return this; + } + + public Customer addMembership(Membership membership) { + this.memberships.add(membership); + membership.setCustomer(this); + return this; + } + + public Customer removeMembership(Membership membership) { + this.memberships.remove(membership); + membership.setCustomer(null); + return this; + } + + public void setMemberships(Set memberships) { + this.memberships = memberships; + } // jhipster-needle-entity-add-getters-setters - JHipster will add getters and setters here, do not remove @Override @@ -152,6 +236,11 @@ public class Customer implements Serializable { "id=" + getId() + ", number=" + getNumber() + ", prefix='" + getPrefix() + "'" + + ", name='" + getName() + "'" + + ", contractualAddress='" + getContractualAddress() + "'" + + ", contractualSalutation='" + getContractualSalutation() + "'" + + ", billingAddress='" + getBillingAddress() + "'" + + ", billingSalutation='" + getBillingSalutation() + "'" + "}"; } } diff --git a/src/main/java/org/hostsharing/hsadminng/domain/Membership.java b/src/main/java/org/hostsharing/hsadminng/domain/Membership.java index c3e15d50..93f20433 100644 --- a/src/main/java/org/hostsharing/hsadminng/domain/Membership.java +++ b/src/main/java/org/hostsharing/hsadminng/domain/Membership.java @@ -1,17 +1,15 @@ package org.hostsharing.hsadminng.domain; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import javax.persistence.*; -import javax.validation.constraints.*; - +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.time.LocalDate; import java.util.HashSet; -import java.util.Set; import java.util.Objects; +import java.util.Set; /** * A Membership. @@ -38,7 +36,8 @@ public class Membership implements Serializable { private Set shares = new HashSet<>(); @OneToMany(mappedBy = "member") private Set assets = new HashSet<>(); - @ManyToOne + @ManyToOne(optional = false) + @NotNull @JsonIgnoreProperties("memberships") private Customer customer; diff --git a/src/main/java/org/hostsharing/hsadminng/domain/Share.java b/src/main/java/org/hostsharing/hsadminng/domain/Share.java index c130fc23..0d91abc1 100644 --- a/src/main/java/org/hostsharing/hsadminng/domain/Share.java +++ b/src/main/java/org/hostsharing/hsadminng/domain/Share.java @@ -2,16 +2,15 @@ package org.hostsharing.hsadminng.domain; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import org.hostsharing.hsadminng.domain.enumeration.ShareAction; import javax.persistence.*; -import javax.validation.constraints.*; - +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import java.io.Serializable; import java.time.LocalDate; import java.util.Objects; -import org.hostsharing.hsadminng.domain.enumeration.ShareAction; - /** * A Share. */ @@ -43,7 +42,8 @@ public class Share implements Serializable { @Column(name = "jhi_comment", length = 160) private String comment; - @ManyToOne + @ManyToOne(optional = false) + @NotNull @JsonIgnoreProperties("shares") private Membership member; diff --git a/src/main/java/org/hostsharing/hsadminng/service/CustomerQueryService.java b/src/main/java/org/hostsharing/hsadminng/service/CustomerQueryService.java index a2a6b056..214369a7 100644 --- a/src/main/java/org/hostsharing/hsadminng/service/CustomerQueryService.java +++ b/src/main/java/org/hostsharing/hsadminng/service/CustomerQueryService.java @@ -1,9 +1,14 @@ package org.hostsharing.hsadminng.service; -import java.util.List; - -import javax.persistence.criteria.JoinType; - +import io.github.jhipster.service.QueryService; +import org.hostsharing.hsadminng.domain.Customer; +import org.hostsharing.hsadminng.domain.CustomerContact_; +import org.hostsharing.hsadminng.domain.Customer_; +import org.hostsharing.hsadminng.domain.Membership_; +import org.hostsharing.hsadminng.repository.CustomerRepository; +import org.hostsharing.hsadminng.service.dto.CustomerCriteria; +import org.hostsharing.hsadminng.service.dto.CustomerDTO; +import org.hostsharing.hsadminng.service.mapper.CustomerMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.domain.Page; @@ -12,14 +17,8 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import io.github.jhipster.service.QueryService; - -import org.hostsharing.hsadminng.domain.Customer; -import org.hostsharing.hsadminng.domain.*; // for static metamodels -import org.hostsharing.hsadminng.repository.CustomerRepository; -import org.hostsharing.hsadminng.service.dto.CustomerCriteria; -import org.hostsharing.hsadminng.service.dto.CustomerDTO; -import org.hostsharing.hsadminng.service.mapper.CustomerMapper; +import javax.persistence.criteria.JoinType; +import java.util.List; /** * Service for executing complex queries for Customer entities in the database. @@ -95,14 +94,29 @@ public class CustomerQueryService extends QueryService { if (criteria.getPrefix() != null) { specification = specification.and(buildStringSpecification(criteria.getPrefix(), Customer_.prefix)); } - if (criteria.getMembershipId() != null) { - specification = specification.and(buildSpecification(criteria.getMembershipId(), - root -> root.join(Customer_.memberships, JoinType.LEFT).get(Membership_.id))); + if (criteria.getName() != null) { + specification = specification.and(buildStringSpecification(criteria.getName(), Customer_.name)); + } + if (criteria.getContractualAddress() != null) { + specification = specification.and(buildStringSpecification(criteria.getContractualAddress(), Customer_.contractualAddress)); + } + if (criteria.getContractualSalutation() != null) { + specification = specification.and(buildStringSpecification(criteria.getContractualSalutation(), Customer_.contractualSalutation)); + } + if (criteria.getBillingAddress() != null) { + specification = specification.and(buildStringSpecification(criteria.getBillingAddress(), Customer_.billingAddress)); + } + if (criteria.getBillingSalutation() != null) { + specification = specification.and(buildStringSpecification(criteria.getBillingSalutation(), Customer_.billingSalutation)); } if (criteria.getRoleId() != null) { specification = specification.and(buildSpecification(criteria.getRoleId(), root -> root.join(Customer_.roles, JoinType.LEFT).get(CustomerContact_.id))); } + if (criteria.getMembershipId() != null) { + specification = specification.and(buildSpecification(criteria.getMembershipId(), + root -> root.join(Customer_.memberships, JoinType.LEFT).get(Membership_.id))); + } } return specification; } 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 eedf5349..c46dd0d3 100644 --- a/src/main/java/org/hostsharing/hsadminng/service/dto/CustomerCriteria.java +++ b/src/main/java/org/hostsharing/hsadminng/service/dto/CustomerCriteria.java @@ -1,15 +1,13 @@ 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; +import java.io.Serializable; +import java.util.Objects; + /** * Criteria class for the Customer entity. This class is used in CustomerResource to * receive all the possible filtering options from the Http GET request parameters. @@ -28,10 +26,20 @@ public class CustomerCriteria implements Serializable { private StringFilter prefix; - private LongFilter membershipId; + private StringFilter name; + + private StringFilter contractualAddress; + + private StringFilter contractualSalutation; + + private StringFilter billingAddress; + + private StringFilter billingSalutation; private LongFilter roleId; + private LongFilter membershipId; + public LongFilter getId() { return id; } @@ -56,12 +64,44 @@ public class CustomerCriteria implements Serializable { this.prefix = prefix; } - public LongFilter getMembershipId() { - return membershipId; + public StringFilter getName() { + return name; } - public void setMembershipId(LongFilter membershipId) { - this.membershipId = membershipId; + public void setName(StringFilter name) { + this.name = name; + } + + public StringFilter getContractualAddress() { + return contractualAddress; + } + + public void setContractualAddress(StringFilter contractualAddress) { + this.contractualAddress = contractualAddress; + } + + public StringFilter getContractualSalutation() { + return contractualSalutation; + } + + public void setContractualSalutation(StringFilter contractualSalutation) { + this.contractualSalutation = contractualSalutation; + } + + public StringFilter getBillingAddress() { + return billingAddress; + } + + public void setBillingAddress(StringFilter billingAddress) { + this.billingAddress = billingAddress; + } + + public StringFilter getBillingSalutation() { + return billingSalutation; + } + + public void setBillingSalutation(StringFilter billingSalutation) { + this.billingSalutation = billingSalutation; } public LongFilter getRoleId() { @@ -72,6 +112,14 @@ public class CustomerCriteria implements Serializable { this.roleId = roleId; } + public LongFilter getMembershipId() { + return membershipId; + } + + public void setMembershipId(LongFilter membershipId) { + this.membershipId = membershipId; + } + @Override public boolean equals(Object o) { @@ -86,8 +134,13 @@ public class CustomerCriteria implements Serializable { Objects.equals(id, that.id) && Objects.equals(number, that.number) && Objects.equals(prefix, that.prefix) && - Objects.equals(membershipId, that.membershipId) && - Objects.equals(roleId, that.roleId); + Objects.equals(name, that.name) && + Objects.equals(contractualAddress, that.contractualAddress) && + Objects.equals(contractualSalutation, that.contractualSalutation) && + Objects.equals(billingAddress, that.billingAddress) && + Objects.equals(billingSalutation, that.billingSalutation) && + Objects.equals(roleId, that.roleId) && + Objects.equals(membershipId, that.membershipId); } @Override @@ -96,8 +149,13 @@ public class CustomerCriteria implements Serializable { id, number, prefix, - membershipId, - roleId + name, + contractualAddress, + contractualSalutation, + billingAddress, + billingSalutation, + roleId, + membershipId ); } @@ -107,8 +165,13 @@ public class CustomerCriteria implements Serializable { (id != null ? "id=" + id + ", " : "") + (number != null ? "number=" + number + ", " : "") + (prefix != null ? "prefix=" + prefix + ", " : "") + - (membershipId != null ? "membershipId=" + membershipId + ", " : "") + + (name != null ? "name=" + name + ", " : "") + + (contractualAddress != null ? "contractualAddress=" + contractualAddress + ", " : "") + + (contractualSalutation != null ? "contractualSalutation=" + contractualSalutation + ", " : "") + + (billingAddress != null ? "billingAddress=" + billingAddress + ", " : "") + + (billingSalutation != null ? "billingSalutation=" + billingSalutation + ", " : "") + (roleId != null ? "roleId=" + roleId + ", " : "") + + (membershipId != null ? "membershipId=" + membershipId + ", " : "") + "}"; } 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 ec8d0e14..ff8bf3d8 100644 --- a/src/main/java/org/hostsharing/hsadminng/service/dto/CustomerDTO.java +++ b/src/main/java/org/hostsharing/hsadminng/service/dto/CustomerDTO.java @@ -19,6 +19,23 @@ public class CustomerDTO implements Serializable { @Pattern(regexp = "[a-z][a-z0-9]+") private String prefix; + @NotNull + @Size(max = 80) + private String name; + + @NotNull + @Size(max = 400) + private String contractualAddress; + + @Size(max = 80) + private String contractualSalutation; + + @Size(max = 400) + private String billingAddress; + + @Size(max = 80) + private String billingSalutation; + public Long getId() { return id; @@ -44,6 +61,46 @@ public class CustomerDTO implements Serializable { this.prefix = prefix; } + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getContractualAddress() { + return contractualAddress; + } + + public void setContractualAddress(String contractualAddress) { + this.contractualAddress = contractualAddress; + } + + public String getContractualSalutation() { + return contractualSalutation; + } + + public void setContractualSalutation(String contractualSalutation) { + this.contractualSalutation = contractualSalutation; + } + + public String getBillingAddress() { + return billingAddress; + } + + public void setBillingAddress(String billingAddress) { + this.billingAddress = billingAddress; + } + + public String getBillingSalutation() { + return billingSalutation; + } + + public void setBillingSalutation(String billingSalutation) { + this.billingSalutation = billingSalutation; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -71,6 +128,11 @@ public class CustomerDTO implements Serializable { "id=" + getId() + ", number=" + getNumber() + ", prefix='" + getPrefix() + "'" + + ", name='" + getName() + "'" + + ", contractualAddress='" + getContractualAddress() + "'" + + ", contractualSalutation='" + getContractualSalutation() + "'" + + ", billingAddress='" + getBillingAddress() + "'" + + ", billingSalutation='" + getBillingSalutation() + "'" + "}"; } } diff --git a/src/main/java/org/hostsharing/hsadminng/service/mapper/CustomerMapper.java b/src/main/java/org/hostsharing/hsadminng/service/mapper/CustomerMapper.java index 35da6964..4bb2f1e9 100644 --- a/src/main/java/org/hostsharing/hsadminng/service/mapper/CustomerMapper.java +++ b/src/main/java/org/hostsharing/hsadminng/service/mapper/CustomerMapper.java @@ -1,9 +1,9 @@ package org.hostsharing.hsadminng.service.mapper; -import org.hostsharing.hsadminng.domain.*; +import org.hostsharing.hsadminng.domain.Customer; import org.hostsharing.hsadminng.service.dto.CustomerDTO; - -import org.mapstruct.*; +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; /** * Mapper for the entity Customer and its DTO CustomerDTO. @@ -12,8 +12,8 @@ import org.mapstruct.*; public interface CustomerMapper extends EntityMapper { - @Mapping(target = "memberships", ignore = true) @Mapping(target = "roles", ignore = true) + @Mapping(target = "memberships", ignore = true) Customer toEntity(CustomerDTO customerDTO); default Customer fromId(Long id) { diff --git a/src/main/jdl/customer.jdl b/src/main/jdl/customer.jdl index 707076ea..14b17d8f 100644 --- a/src/main/jdl/customer.jdl +++ b/src/main/jdl/customer.jdl @@ -6,6 +6,11 @@ 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]+/), + name String required maxlength(80), + contractualAddress String required maxlength(400), + contractualSalutation String maxlength(80), + billingAddress String maxlength(400), + billingSalutation String maxlength(80) } entity Contact { @@ -14,7 +19,6 @@ entity Contact { email String required maxlength(80) } - enum CustomerContactRole { CONTRACTUAL, TECHNICAL, @@ -59,13 +63,10 @@ entity Asset { } relationship OneToMany { - Customer to Membership{customer(prefix)}, - Membership to Share{member}, - Membership to Asset{member} -} - -relationship ManyToOne { - CustomerContact{contact(email) required} to Contact{role}, - CustomerContact{customer(prefix) required} to Customer{role} + Contact{role} to CustomerContact{contact(email) required}, + Customer{role} to CustomerContact{customer(prefix) required}, + Customer to Membership{customer(prefix) required}, + Membership to Share{member required}, + Membership to Asset{member required} } diff --git a/src/main/resources/config/liquibase/changelog/20190403083735_added_entity_Customer.xml b/src/main/resources/config/liquibase/changelog/20190403083735_added_entity_Customer.xml index 8b6f2eb3..b888eebe 100644 --- a/src/main/resources/config/liquibase/changelog/20190403083735_added_entity_Customer.xml +++ b/src/main/resources/config/liquibase/changelog/20190403083735_added_entity_Customer.xml @@ -1,10 +1,8 @@ + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd"> @@ -29,6 +27,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/config/liquibase/changelog/20190403083738_added_entity_Membership.xml b/src/main/resources/config/liquibase/changelog/20190403083738_added_entity_Membership.xml index dbf69e2c..95973eb5 100644 --- a/src/main/resources/config/liquibase/changelog/20190403083738_added_entity_Membership.xml +++ b/src/main/resources/config/liquibase/changelog/20190403083738_added_entity_Membership.xml @@ -1,10 +1,8 @@ + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd"> @@ -30,7 +28,7 @@ - + diff --git a/src/main/resources/config/liquibase/changelog/20190403083739_added_entity_Share.xml b/src/main/resources/config/liquibase/changelog/20190403083739_added_entity_Share.xml index fc66b034..24fd082a 100644 --- a/src/main/resources/config/liquibase/changelog/20190403083739_added_entity_Share.xml +++ b/src/main/resources/config/liquibase/changelog/20190403083739_added_entity_Share.xml @@ -1,10 +1,8 @@ + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd"> @@ -38,7 +36,7 @@ - + diff --git a/src/main/resources/config/liquibase/changelog/20190403083740_added_entity_Asset.xml b/src/main/resources/config/liquibase/changelog/20190403083740_added_entity_Asset.xml index 229a29bc..682f4e2c 100644 --- a/src/main/resources/config/liquibase/changelog/20190403083740_added_entity_Asset.xml +++ b/src/main/resources/config/liquibase/changelog/20190403083740_added_entity_Asset.xml @@ -1,10 +1,8 @@ + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd"> @@ -38,7 +36,7 @@ - + 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 38bc16c7..0e1fa8d1 100644 --- a/src/main/webapp/app/entities/asset/asset-update.component.html +++ b/src/main/webapp/app/entities/asset/asset-update.component.html @@ -71,11 +71,18 @@
- +
+
+ + This field is required. + +
+
+ + +
+ + This field is required. + + + This field cannot be longer than 80 characters. + +
+
+
+ + +
+ + This field is required. + + + This field cannot be longer than 400 characters. + +
+
+
+ + +
+ + This field cannot be longer than 80 characters. + +
+
+
+ + +
+ + This field cannot be longer than 400 characters. + +
+
+
+ + +
+ + This field cannot be longer than 80 characters. + +
+
diff --git a/src/main/webapp/app/entities/customer/customer.component.html b/src/main/webapp/app/entities/customer/customer.component.html index 02824bee..def61b53 100644 --- a/src/main/webapp/app/entities/customer/customer.component.html +++ b/src/main/webapp/app/entities/customer/customer.component.html @@ -17,6 +17,22 @@ ID Number Prefix + Name + + + Contractual Address + + + Contractual Salutation + + + Billing Address + + + Billing Salutation + + @@ -25,6 +41,11 @@ {{customer.id}} {{customer.number}} {{customer.prefix}} + {{customer.name}} + {{customer.contractualAddress}} + {{customer.contractualSalutation}} + {{customer.billingAddress}} + {{customer.billingSalutation}}
+
+ + This field is required. + +