| .. | .. |
|---|
| 35 | 35 | |
|---|
| 36 | 36 | @Id |
|---|
| 37 | 37 | private String username; |
|---|
| 38 | + |
|---|
| 38 | 39 | private String password; |
|---|
| 39 | 40 | @JsonProperty(value = "short_name") |
|---|
| 40 | 41 | @Column(name = "short_name") |
|---|
| 41 | 42 | private String shortName; |
|---|
| 42 | 43 | |
|---|
| 43 | | - private int role; |
|---|
| 44 | + private int roles; |
|---|
| 44 | 45 | |
|---|
| 45 | 46 | @JsonProperty(value = "full_name") |
|---|
| 46 | 47 | @Column(name = "full_name") |
|---|
| .. | .. |
|---|
| 61 | 62 | @ManyToMany |
|---|
| 62 | 63 | @JoinTable(name = "user_organization", // |
|---|
| 63 | 64 | joinColumns = |
|---|
| 64 | | - { @JoinColumn(name = "user_id", referencedColumnName = "id") }, // |
|---|
| 65 | + { @JoinColumn(name = "user_id", referencedColumnName = "username") }, // |
|---|
| 65 | 66 | inverseJoinColumns = |
|---|
| 66 | 67 | { @JoinColumn(name = "organization_id", referencedColumnName = "id") } // |
|---|
| 67 | 68 | ) |
|---|
| .. | .. |
|---|
| 83 | 84 | this.password = password; |
|---|
| 84 | 85 | } |
|---|
| 85 | 86 | |
|---|
| 86 | | - public int getRole() { |
|---|
| 87 | | - return role; |
|---|
| 87 | + public int getRoles() { |
|---|
| 88 | + return roles; |
|---|
| 88 | 89 | } |
|---|
| 89 | 90 | |
|---|
| 90 | | - public void setRole(int role) { |
|---|
| 91 | | - this.role = role; |
|---|
| 91 | + public void setRoles(int roles) { |
|---|
| 92 | + this.roles = roles; |
|---|
| 92 | 93 | } |
|---|
| 93 | 94 | |
|---|
| 94 | 95 | public String getFullName() { |
|---|