removed double unique key

[jcontacts-business-core.git] / src / org / mxchange / jcontactsbusiness / department / CompanyDepartment.java

diff --git a/src/org/mxchange/jcontactsbusiness/department/CompanyDepartment.java b/src/org/mxchange/jcontactsbusiness/department/CompanyDepartment.java
index 6d6ed4f702d180d7b122ba849e32c03f4d0484c2..e49a2ced355777401bd56a67b313dabbfcc11993 100644 (file)
--- a/src/org/mxchange/jcontactsbusiness/department/CompanyDepartment.java
+++ b/src/org/mxchange/jcontactsbusiness/department/CompanyDepartment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Roland Haeder
+ * Copyright (C) 2016, 2017 Roland Häder
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,20 +31,22 @@ import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
-import org.mxchange.jcontactsbusiness.BusinessContact;
-import org.mxchange.jcontactsbusiness.CompanyContact;
-import org.mxchange.jcontactsbusiness.branch.BranchOffice;
-import org.mxchange.jcontactsbusiness.branch.CompanyBranchOffice;
+import javax.persistence.Transient;
+import org.mxchange.jcontactsbusiness.basicdata.CompanyBasicData;
+import org.mxchange.jcontactsbusiness.branchoffice.BranchOffice;
+import org.mxchange.jcontactsbusiness.branchoffice.CompanyBranchOffice;
 import org.mxchange.jcontactsbusiness.employee.CompanyEmployee;
 import org.mxchange.jcontactsbusiness.employee.Employee;
-import org.mxchange.jcontactsbusiness.headquarters.HeadQuartersData;
+import org.mxchange.jcontactsbusiness.headquarters.CompanyHeadquartersData;
 import org.mxchange.jusercore.model.user.LoginUser;
 import org.mxchange.jusercore.model.user.User;
+import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData;
+import org.mxchange.jcontactsbusiness.headquarters.HeadquartersData;
 
 /**
  * A POJO for company departments
  * <p>
- * @author Roland Haeder<roland@mxchange.org>
+ * @author Roland Häder<roland@mxchange.org>
  */
 @Entity (name = "company_departments")
 @Table (name = "company_departments")
@@ -54,14 +56,15 @@ public class CompanyDepartment implements Department {
        /**
         * Serial number
         */
+       @Transient
        private static final long serialVersionUID = 94_835_918_958_717_660L;
 
        /**
         * Where this department is located
         */
        @JoinColumn (name = "department_headquarters_id")
-       @OneToOne (targetEntity = HeadQuartersData.class, cascade = CascadeType.ALL)
-       private HeadQuartersData departentHeadquarters;
+       @OneToOne (targetEntity = CompanyHeadquartersData.class, cascade = CascadeType.ALL)
+       private HeadquartersData departentHeadquarters;
 
        /**
         * Where this department is located
@@ -74,8 +77,8 @@ public class CompanyDepartment implements Department {
         * Connection to company contact
         */
        @JoinColumn (name = "department_company_id", nullable = false, updatable = false)
-       @ManyToOne (targetEntity = CompanyContact.class, cascade = CascadeType.ALL, optional = false)
-       private BusinessContact departmentCompany;
+       @ManyToOne (targetEntity = CompanyBasicData.class, cascade = CascadeType.ALL, optional = false)
+       private BusinessBasicData departmentCompany;
 
        /**
         * Timestamp when this entry has been created
@@ -124,7 +127,9 @@ public class CompanyDepartment implements Department {
 
                final Department other = (Department) object;
 
-               if (!Objects.equals(this.getDepartmentCompany(), other.getDepartmentCompany())) {
+               if (!Objects.equals(this.getDepartmentId(), other.getDepartmentId())) {
+                       return false;
+               } else if (!Objects.equals(this.getDepartmentCompany(), other.getDepartmentCompany())) {
                        return false;
                } else if (!Objects.equals(this.getDepartmentName(), other.getDepartmentName())) {
                        return false;
@@ -134,20 +139,12 @@ public class CompanyDepartment implements Department {
        }
 
        @Override
-       public int hashCode () {
-               int hash = 5;
-               hash = 53 * hash + Objects.hashCode(this.getDepartmentCompany());
-               hash = 53 * hash + Objects.hashCode(this.getDepartmentName());
-               return hash;
-       }
-
-       @Override
-       public HeadQuartersData getDepartentHeadquarters () {
+       public HeadquartersData getDepartentHeadquarters () {
                return this.departentHeadquarters;
        }
 
        @Override
-       public void setDepartentHeadquarters (final HeadQuartersData departentHeadquarters) {
+       public void setDepartentHeadquarters (final HeadquartersData departentHeadquarters) {
                this.departentHeadquarters = departentHeadquarters;
        }
 
@@ -162,12 +159,12 @@ public class CompanyDepartment implements Department {
        }
 
        @Override
-       public BusinessContact getDepartmentCompany () {
+       public BusinessBasicData getDepartmentCompany () {
                return this.departmentCompany;
        }
 
        @Override
-       public void setDepartmentCompany (final BusinessContact departmentCompany) {
+       public void setDepartmentCompany (final BusinessBasicData departmentCompany) {
                this.departmentCompany = departmentCompany;
        }
 
@@ -223,4 +220,15 @@ public class CompanyDepartment implements Department {
                this.departmentUserOwner = departmentUserOwner;
        }
 
+       @Override
+       public int hashCode () {
+               int hash = 5;
+
+               hash = 53 * hash + Objects.hashCode(this.getDepartmentId());
+               hash = 53 * hash + Objects.hashCode(this.getDepartmentCompany());
+               hash = 53 * hash + Objects.hashCode(this.getDepartmentName());
+
+               return hash;
+       }
+
 }