From e7da563f3e2dcd709e36c5864df05807bb6fb9b8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 1 Nov 2017 19:43:08 +0100 Subject: [PATCH] Continued: - headquarter's "owning" user is now optional - headquarters may have contact persons, too - added opening times for headquarters MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../model/branchoffice/BranchOffice.java | 2 +- .../branchoffice/BusinessBranchOffice.java | 2 +- .../BusinessHeadquartersData.java | 49 +++++++++++++++++-- .../model/headquarters/HeadquartersData.java | 31 ++++++++++++ 4 files changed, 79 insertions(+), 5 deletions(-) diff --git a/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java index 0e09c86..9f9fa14 100644 --- a/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java +++ b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOffice.java @@ -19,13 +19,13 @@ package org.mxchange.jcontactsbusiness.model.branchoffice; import java.io.Serializable; import java.util.Date; import java.util.List; +import org.mxchange.jcontactsbusiness.model.basicdata.BasicData; import org.mxchange.jcontactsbusiness.model.employee.Employable; import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime; import org.mxchange.jcountry.model.data.Country; import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jusercore.model.user.User; -import org.mxchange.jcontactsbusiness.model.basicdata.BasicData; /** * A POJI for branch offices diff --git a/src/org/mxchange/jcontactsbusiness/model/branchoffice/BusinessBranchOffice.java b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BusinessBranchOffice.java index 23e4114..8c23a74 100644 --- a/src/org/mxchange/jcontactsbusiness/model/branchoffice/BusinessBranchOffice.java +++ b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BusinessBranchOffice.java @@ -37,6 +37,7 @@ import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; +import org.mxchange.jcontactsbusiness.model.basicdata.BasicData; import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; import org.mxchange.jcontactsbusiness.model.employee.BusinessEmployee; import org.mxchange.jcontactsbusiness.model.employee.Employable; @@ -50,7 +51,6 @@ import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jphone.model.phonenumbers.landline.LandLineNumber; import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; -import org.mxchange.jcontactsbusiness.model.basicdata.BasicData; /** * A POJO for company branch offices diff --git a/src/org/mxchange/jcontactsbusiness/model/headquarters/BusinessHeadquartersData.java b/src/org/mxchange/jcontactsbusiness/model/headquarters/BusinessHeadquartersData.java index 26554ea..1ce6048 100644 --- a/src/org/mxchange/jcontactsbusiness/model/headquarters/BusinessHeadquartersData.java +++ b/src/org/mxchange/jcontactsbusiness/model/headquarters/BusinessHeadquartersData.java @@ -17,6 +17,7 @@ package org.mxchange.jcontactsbusiness.model.headquarters; import java.util.Date; +import java.util.List; import java.util.Objects; import javax.persistence.Basic; import javax.persistence.CascadeType; @@ -26,11 +27,17 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.ManyToMany; import javax.persistence.OneToOne; import javax.persistence.Table; import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; +import org.mxchange.jcontactsbusiness.model.employee.BusinessEmployee; +import org.mxchange.jcontactsbusiness.model.employee.Employable; +import org.mxchange.jcontactsbusiness.model.opening_time.BusinessOpeningTime; +import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime; import org.mxchange.jcountry.model.data.Country; import org.mxchange.jcountry.model.data.CountryData; import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; @@ -41,7 +48,7 @@ import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; /** - * A POJO for company headquarts data + * A POJO for company headquarters data *

* @author Roland Häder */ @@ -63,6 +70,13 @@ public class BusinessHeadquartersData implements HeadquartersData { @Column (name = "headquarters_city", length = 100, nullable = false) private String headquartersCity; + /** + * Reference to contact person + */ + @JoinColumn (name = "headquarters_contact_employee_id", referencedColumnName = "employee_id") + @OneToOne (targetEntity = BusinessEmployee.class, cascade = CascadeType.REFRESH) + private Employable headquartersContactEmployee; + /** * Headquarter's country code */ @@ -100,6 +114,13 @@ public class BusinessHeadquartersData implements HeadquartersData { @Column (name = "headquarters_id", nullable = false, updatable = false) private Long headquartersId; + /** + * Opening times for this branch office + */ + @JoinTable (name = "headquarters_opening_times", joinColumns = @JoinColumn (name = "headquarters_opening_id", referencedColumnName = "branch_id"), inverseJoinColumns = @JoinColumn (name = "opening_headquarters_id", referencedColumnName = "opening_times_id")) + @ManyToMany (targetEntity = BusinessOpeningTime.class, cascade = CascadeType.ALL) + private List headquartersOpeningTimes; + /** * Headquarters' phone number */ @@ -129,8 +150,8 @@ public class BusinessHeadquartersData implements HeadquartersData { /** * User owner instance */ - @JoinColumn (name = "headquarters_user_id", nullable = false, updatable = false) - @OneToOne (targetEntity = LoginUser.class, cascade = CascadeType.REFRESH, optional = false) + @JoinColumn (name = "headquarters_user_id") + @OneToOne (targetEntity = LoginUser.class, cascade = CascadeType.REFRESH) private User headquartersUserOwner; /** @@ -181,6 +202,16 @@ public class BusinessHeadquartersData implements HeadquartersData { this.headquartersCity = headquartersCity; } + @Override + public Employable getHeadquartersContactEmployee () { + return this.headquartersContactEmployee; + } + + @Override + public void setHeadquartersContactEmployee (final Employable headquartersContactEmployee) { + this.headquartersContactEmployee = headquartersContactEmployee; + } + @Override public Country getHeadquartersCountry () { return this.headquartersCountry; @@ -233,6 +264,18 @@ public class BusinessHeadquartersData implements HeadquartersData { this.headquartersId = headquartersId; } + @Override + @SuppressWarnings ("ReturnOfCollectionOrArrayField") + public List getHeadquartersOpeningTimes () { + return this.headquartersOpeningTimes; + } + + @Override + @SuppressWarnings ("AssignmentToCollectionOrArrayFieldFromParameter") + public void setHeadquartersOpeningTimes (final List headquartersOpeningTimes) { + this.headquartersOpeningTimes = headquartersOpeningTimes; + } + @Override public DialableLandLineNumber getHeadquartersPhoneNumber () { return this.headquartersPhoneNumber; diff --git a/src/org/mxchange/jcontactsbusiness/model/headquarters/HeadquartersData.java b/src/org/mxchange/jcontactsbusiness/model/headquarters/HeadquartersData.java index e87b0d4..42fecef 100644 --- a/src/org/mxchange/jcontactsbusiness/model/headquarters/HeadquartersData.java +++ b/src/org/mxchange/jcontactsbusiness/model/headquarters/HeadquartersData.java @@ -18,6 +18,9 @@ package org.mxchange.jcontactsbusiness.model.headquarters; import java.io.Serializable; import java.util.Date; +import java.util.List; +import org.mxchange.jcontactsbusiness.model.employee.Employable; +import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime; import org.mxchange.jcountry.model.data.Country; import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; @@ -184,6 +187,34 @@ public interface HeadquartersData extends Serializable { */ void setHeadquartersUserOwner (final User headquartersUserOwner); + /** + * Getter for branch office owning employee + *

+ * @return Owning employee + */ + Employable getHeadquartersContactEmployee (); + + /** + * Setter for branch office contact person + *

+ * @param branchContactEmployee Contact person + */ + void setHeadquartersContactEmployee (final Employable branchContactEmployee); + + /** + * Getter for opening times for this branch office + *

+ * @return Opening times + */ + List getHeadquartersOpeningTimes (); + + /** + * Setter for opening times for this branch office + *

+ * @param branchOpeningTimes Opening times + */ + void setHeadquartersOpeningTimes (final List branchOpeningTimes); + /** * Getter for timestamp when this entry has been created *

-- 2.39.5