Compare commits

..

1 Commits

  1. 10
      pom.xml
  2. 222
      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,108 +19,122 @@ 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 QUERY_FINDALL = "Person.findAll"; public static final String SESSION_LOGIN = "SESSION_LOGIN_USER";
public static final String QUERY_FINDLOGIN = "Person.findLogin"; public static final String QUERY_FINDALL = "Person.findAll";
private static final long serialVersionUID = -8361264400619997123L; public static final String QUERY_FINDLOGIN = "Person.findLogin";
@Basic private static final long serialVersionUID = -8361264400619997123L;
private LocalDate birth; @Basic
private String prename; private LocalDate birth;
private String surname; private String prename;
private String username; private String surname;
private String password; private String username;
private Integer gender; private String password;
@ManyToMany private Integer gender;
@JoinTable(name = "persongroup", joinColumns = @JoinColumn(name = "person_id"), inverseJoinColumns = @JoinColumn(name = "group_id")) @ManyToMany
private List<GroupDef> groups; @JoinTable(name = "persongroup", joinColumns = @JoinColumn(name = "person_id"), inverseJoinColumns = @JoinColumn(name = "group_id"))
private List<GroupDef> groups;
public Gender getGender() {
if (gender == null) { public Gender getGender()
return null; {
} if (gender == null) {
return Gender.valueOf(gender); return null;
} }
return Gender.valueOf(gender);
public LocalDate getBirth() { }
return birth;
} public LocalDate getBirth()
{
public void setBirth(LocalDate birth) { return birth;
this.birth = birth; }
}
public void setBirth(LocalDate birth)
public String getPrename() { {
return prename; this.birth = birth;
} }
public void setPrename(String prename) { public String getPrename()
this.prename = prename; {
} return prename;
}
public String getSurname() {
return surname; public void setPrename(String prename)
} {
this.prename = prename;
public void setSurname(String surname) { }
this.surname = surname;
} public String getSurname()
{
public String getUsername() { return surname;
return username; }
}
public void setSurname(String surname)
public void setUsername(String username) { {
this.username = username; this.surname = surname;
} }
public String getPassword() { public String getUsername()
return password; {
} return username;
}
public void setPassword(String password) {
this.password = password; public void setUsername(String username)
} {
this.username = username;
public void setGender(Integer gender) { }
this.gender = gender;
} public String getPassword()
{
public boolean isMember(GroupDef group) { return password;
return groups != null && groups.contains(group); }
}
public void setPassword(String password)
public List<GroupDef> getGroups() { {
return groups; this.password = password;
} }
@Override public void setGender(Integer gender)
public int hashCode() { {
final int prime = 59; this.gender = gender;
int result = super.hashCode(); }
result = prime * result;
return result; public boolean isMember(GroupDef group)
} {
return groups != null && groups.contains(group);
@Override }
public boolean equals(Object obj) {
if (this == obj) @Override
return true; public int hashCode()
if (!super.equals(obj)) {
return false; final int prime = 59;
if (getClass() != obj.getClass()) int result = super.hashCode();
return false; result = prime * result;
Person other = (Person) obj; return result;
if (surname == null) { }
if (other.surname != null)
return false; @Override
} else if (!surname.equals(other.surname)) public boolean equals(Object obj)
return false; {
return true; if (this == obj)
} return true;
if (!super.equals(obj))
@Override return false;
public String toString() { if (getClass() != obj.getClass())
return "Person [id=" + getId() + ", prename=" + prename + ", surname=" + surname + "]"; return false;
} Person other = (Person) obj;
if (surname == null) {
if (other.surname != null)
return false;
}
else if (!surname.equals(other.surname))
return false;
return true;
}
@Override
public String toString()
{
return "Person [id=" + getId() + ", prename=" + prename + ", surname=" + surname + "]";
}
} }

Loading…
Cancel
Save