groups are delivered per person

master
Markus Kreth 5 years ago
parent f21e21c674
commit 6498dd9551
  1. 58
      src/main/java/de/kreth/clubhelper/model/data/Person.java

@ -19,8 +19,7 @@ import javax.persistence.Table;
@Entity
@Table(name = "person")
@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
public class Person extends BaseEntity implements Serializable
{
public class Person extends BaseEntity implements Serializable {
public static final String SESSION_LOGIN = "SESSION_LOGIN_USER";
public static final String QUERY_FINDALL = "Person.findAll";
public static final String QUERY_FINDLOGIN = "Person.findLogin";
@ -36,77 +35,67 @@ public class Person extends BaseEntity implements Serializable
@JoinTable(name = "persongroup", joinColumns = @JoinColumn(name = "person_id"), inverseJoinColumns = @JoinColumn(name = "group_id"))
private List<GroupDef> groups;
public Gender getGender()
{
public Gender getGender() {
if (gender == null) {
return null;
}
return Gender.valueOf(gender);
}
public LocalDate getBirth()
{
public LocalDate getBirth() {
return birth;
}
public void setBirth(LocalDate birth)
{
public void setBirth(LocalDate birth) {
this.birth = birth;
}
public String getPrename()
{
public String getPrename() {
return prename;
}
public void setPrename(String prename)
{
public void setPrename(String prename) {
this.prename = prename;
}
public String getSurname()
{
public String getSurname() {
return surname;
}
public void setSurname(String surname)
{
public void setSurname(String surname) {
this.surname = surname;
}
public String getUsername()
{
public String getUsername() {
return username;
}
public void setUsername(String username)
{
public void setUsername(String username) {
this.username = username;
}
public String getPassword()
{
public String getPassword() {
return password;
}
public void setPassword(String password)
{
public void setPassword(String password) {
this.password = password;
}
public void setGender(Integer gender)
{
public void setGender(Integer gender) {
this.gender = gender;
}
public boolean isMember(GroupDef group)
{
public boolean isMember(GroupDef group) {
return groups != null && groups.contains(group);
}
public List<GroupDef> getGroups() {
return groups;
}
@Override
public int hashCode()
{
public int hashCode() {
final int prime = 59;
int result = super.hashCode();
result = prime * result;
@ -114,8 +103,7 @@ public class Person extends BaseEntity implements Serializable
}
@Override
public boolean equals(Object obj)
{
public boolean equals(Object obj) {
if (this == obj)
return true;
if (!super.equals(obj))
@ -126,15 +114,13 @@ public class Person extends BaseEntity implements Serializable
if (surname == null) {
if (other.surname != null)
return false;
}
else if (!surname.equals(other.surname))
} else if (!surname.equals(other.surname))
return false;
return true;
}
@Override
public String toString()
{
public String toString() {
return "Person [id=" + getId() + ", prename=" + prename + ", surname=" + surname + "]";
}
}

Loading…
Cancel
Save