Compare commits

..

1 Commits

  1. 10
      pom.xml
  2. 58
      src/main/java/de/kreth/clubhelper/model/data/Person.java

@ -11,7 +11,7 @@
<groupId>de.kreth.clubhelper</groupId> <groupId>de.kreth.clubhelper</groupId>
<artifactId>ClubhelperModel</artifactId> <artifactId>ClubhelperModel</artifactId>
<version>0.0.3-SNAPSHOT</version> <version>0.0.2</version>
<name>clubhelper-model</name> <name>clubhelper-model</name>
<description>Model for Clubhelper Projects</description> <description>Model for Clubhelper Projects</description>
@ -54,13 +54,6 @@
<artifactId>springfox-boot-starter</artifactId> <artifactId>springfox-boot-starter</artifactId>
<version>3.0.0</version> <version>3.0.0</version>
</dependency> </dependency>
<!-- Documentation -->
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
<version>1.4.6</version>
</dependency>
<!-- <dependency> --> <!-- <dependency> -->
<!-- <groupId>io.springfox</groupId> --> <!-- <groupId>io.springfox</groupId> -->
<!-- <artifactId>springfox-swagger2</artifactId> --> <!-- <artifactId>springfox-swagger2</artifactId> -->
@ -103,6 +96,7 @@
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.googlecode.libphonenumber</groupId> <groupId>com.googlecode.libphonenumber</groupId>

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

Loading…
Cancel
Save