#394 feature - Added all catalog resources with refereced fields

Roberto Sánchez

2014-01-10 59cdd2b7ebceae94fbecdb1eeb46a969666dc88f

 securis/src/main/java/net/curisit/securis/db/User.java
..
..
@@ -1,6 +1,7 @@
1
1
 package net.curisit.securis.db;
2
2
 
3
3
 import java.io.Serializable;
4
+import java.util.ArrayList;
4
5
 import java.util.Date;
5
6
 import java.util.List;
6
7
 
..
..
@@ -15,6 +16,7 @@
15
16
 import javax.persistence.Table;
16
17
 
17
18
 import org.codehaus.jackson.annotate.JsonAutoDetect;
19
+import org.codehaus.jackson.annotate.JsonIgnore;
18
20
 import org.codehaus.jackson.annotate.JsonProperty;
19
21
 import org.codehaus.jackson.map.annotate.JsonSerialize;
20
22
 
..
..
@@ -37,15 +39,16 @@
37
39
 	private String username;
38
40
 
39
41
 	private String password;
40
-	@JsonProperty(value = "short_name")
41
-	@Column(name = "short_name")
42
-	private String shortName;
42
+
43
+	@JsonProperty(value = "first_name")
44
+	@Column(name = "first_name")
45
+	private String firstName;
46
+
47
+	@JsonProperty(value = "last_name")
48
+	@Column(name = "last_name")
49
+	private String lastName;
43
50
 
44
51
 	private int roles;
45
-
46
-	@JsonProperty(value = "full_name")
47
-	@Column(name = "full_name")
48
-	private String fullName;
49
52
 
50
53
 	@JsonProperty(value = "last_login")
51
54
 	@Column(name = "last_login")
..
..
@@ -59,10 +62,11 @@
59
62
 
60
63
 	private String lang;
61
64
 
65
+	@JsonIgnore
62
66
 	@ManyToMany
63
67
 	@JoinTable(name = "user_organization", //
64
68
 	joinColumns =
65
-		{ @JoinColumn(name = "user_id", referencedColumnName = "username") }, //
69
+		{ @JoinColumn(name = "username", referencedColumnName = "username") }, //
66
70
 	inverseJoinColumns =
67
71
 		{ @JoinColumn(name = "organization_id", referencedColumnName = "id") } //
68
72
 	)
..
..
@@ -92,20 +96,20 @@
92
96
 		this.roles = roles;
93
97
 	}
94
98
 
95
-	public String getFullName() {
96
-		return fullName;
99
+	public String getFirstName() {
100
+		return firstName;
97
101
 	}
98
102
 
99
-	public void setFullName(String fullName) {
100
-		this.fullName = fullName;
103
+	public void setFirstName(String firstName) {
104
+		this.firstName = firstName;
101
105
 	}
102
106
 
103
-	public String getShortName() {
104
-		return shortName;
107
+	public String getLastName() {
108
+		return lastName;
105
109
 	}
106
110
 
107
-	public void setShortName(String shortName) {
108
-		this.shortName = shortName;
111
+	public void setLastName(String lastName) {
112
+		this.lastName = lastName;
109
113
 	}
110
114
 
111
115
 	public Date getLastLogin() {
..
..
@@ -134,7 +138,7 @@
134
138
 
135
139
 	@Override
136
140
 	public String toString() {
137
-		return "{User: " + username + " Full Name: " + fullName + ", last login: " + lastLogin + "}";
141
+		return "{User: " + username + " Name: " + firstName + " " + lastName + ", last login: " + lastLogin + "}";
138
142
 	}
139
143
 
140
144
 	public String getLang() {
..
..
@@ -153,6 +157,27 @@
153
157
 		this.organizations = organizations;
154
158
 	}
155
159
 
160
+	@JsonProperty("organizations_ids")
161
+	public void setOrgsIds(List<Integer> orgsIds) {
162
+		organizations = new ArrayList<>();
163
+		for (Integer orgid : orgsIds) {
164
+			Organization o = new Organization();
165
+			o.setId(orgid);
166
+			organizations.add(o);
167
+		}
168
+	}
169
+
170
+	@JsonProperty("organizations_ids")
171
+	public List<Integer> getOrgsIds() {
172
+		if (organizations == null)
173
+			return null;
174
+		List<Integer> ids = new ArrayList<>();
175
+		for (Organization org : organizations) {
176
+			ids.add(org.getId());
177
+		}
178
+		return ids;
179
+	}
180
+
156
181
 	static public class Rol {
157
182
 		static public final int ADVANCE = 0x01;
158
183
 		static public final int ADMIN = 0x02;