#395 feature - Changes in REST API for license system

Roberto Sánchez

2014-01-17 c8eb07e8dc020346aaee0d859040ccabb79349bd

 securis/src/main/java/net/curisit/securis/db/License.java
..
..
@@ -14,6 +14,8 @@
14
14
 import javax.persistence.Table;
15
15
 
16
16
 import org.codehaus.jackson.annotate.JsonAutoDetect;
17
+import org.codehaus.jackson.annotate.JsonIgnore;
18
+import org.codehaus.jackson.annotate.JsonProperty;
17
19
 import org.codehaus.jackson.map.annotate.JsonSerialize;
18
20
 
19
21
 /**
..
..
@@ -36,22 +38,45 @@
36
38
 
37
39
 	private String code;
38
40
 
39
-	@Column(name = "creation_timestamp")
40
-	private Date creationTimestamp;
41
-
42
-	@ManyToOne
43
-	@JoinColumn(name = "organization_id")
44
-	private Organization organization;
45
-
41
+	@JsonIgnore
46
42
 	@ManyToOne
47
43
 	@JoinColumn(name = "pack_id")
48
44
 	private Pack pack;
49
45
 
46
+	@JsonIgnore
50
47
 	@ManyToOne
51
48
 	@JoinColumn(name = "created_by")
52
49
 	private User createdBy;
53
50
 
54
-	private int numLicenses;
51
+	@JsonIgnore
52
+	@ManyToOne
53
+	@JoinColumn(name = "canceled_by")
54
+	private User canceledBy;
55
+
56
+	private int status;
57
+
58
+	@JoinColumn(name = "full_name")
59
+	private String fullName;
60
+
61
+	private String email;
62
+
63
+	@Column(name = "creation_timestamp")
64
+	private Date creationTimestamp;
65
+
66
+	@Column(name = "modification_timestamp")
67
+	private Date modificationTimestamp;
68
+
69
+	@Column(name = "activation_timestamp")
70
+	private Date activationTimestamp;
71
+
72
+	@Column(name = "cancelation_timestamp")
73
+	private Date cancelationTimestamp;
74
+
75
+	@Column(name = "send_timestamp")
76
+	private Date sendTimestamp;
77
+
78
+	@Column(name = "last_access_timestamp")
79
+	private Date lastAccessTimestamp;
55
80
 
56
81
 	public int getId() {
57
82
 		return id;
..
..
@@ -73,28 +98,12 @@
73
98
 		this.creationTimestamp = creationTimestamp;
74
99
 	}
75
100
 
76
-	public Organization getOrganization() {
77
-		return organization;
78
-	}
79
-
80
-	public void setOrganization(Organization organization) {
81
-		this.organization = organization;
82
-	}
83
-
84
101
 	public User getCreatedBy() {
85
102
 		return createdBy;
86
103
 	}
87
104
 
88
105
 	public void setCreatedBy(User createdBy) {
89
106
 		this.createdBy = createdBy;
90
-	}
91
-
92
-	public int getNumLicenses() {
93
-		return numLicenses;
94
-	}
95
-
96
-	public void setNumLicenses(int numLicenses) {
97
-		this.numLicenses = numLicenses;
98
107
 	}
99
108
 
100
109
 	public Pack getPack() {
..
..
@@ -105,4 +114,136 @@
105
114
 		this.pack = pack;
106
115
 	}
107
116
 
117
+	@JsonProperty("created_by_id")
118
+	public String getCreatedById() {
119
+		return createdBy == null ? null : createdBy.getUsername();
120
+	}
121
+
122
+	@JsonProperty("created_by_id")
123
+	public void setCreatedById(String username) {
124
+		if (username == null) {
125
+			createdBy = null;
126
+		} else {
127
+			createdBy = new User();
128
+			createdBy.setUsername(username);
129
+		}
130
+	}
131
+
132
+	@JsonProperty("canceled_by_id")
133
+	public String getCanceledById() {
134
+		return canceledBy == null ? null : canceledBy.getUsername();
135
+	}
136
+
137
+	@JsonProperty("canceled_by_id")
138
+	public void setCanceledById(String username) {
139
+		if (username == null) {
140
+			canceledBy = null;
141
+		} else {
142
+			canceledBy = new User();
143
+			canceledBy.setUsername(username);
144
+		}
145
+	}
146
+
147
+	@JsonProperty("pack_code")
148
+	public String getLicenseTypcode() {
149
+		return pack == null ? null : pack.getCode();
150
+	}
151
+
152
+	@JsonProperty("pack_id")
153
+	public Integer getOrgId() {
154
+		return pack == null ? null : pack.getId();
155
+	}
156
+
157
+	@JsonProperty("pack_id")
158
+	public void setOrgId(Integer idPack) {
159
+		if (idPack == null) {
160
+			pack = null;
161
+		} else {
162
+			pack = new Pack();
163
+			pack.setId(idPack);
164
+		}
165
+	}
166
+
167
+	public int getStatus() {
168
+		return status;
169
+	}
170
+
171
+	public void setStatus(int status) {
172
+		this.status = status;
173
+	}
174
+
175
+	public Date getModificationTimestamp() {
176
+		return modificationTimestamp;
177
+	}
178
+
179
+	public void setModificationTimestamp(Date modificationTimestamp) {
180
+		this.modificationTimestamp = modificationTimestamp;
181
+	}
182
+
183
+	public String getFullName() {
184
+		return fullName;
185
+	}
186
+
187
+	public void setFullName(String fullName) {
188
+		this.fullName = fullName;
189
+	}
190
+
191
+	public String getEmail() {
192
+		return email;
193
+	}
194
+
195
+	public void setEmail(String email) {
196
+		this.email = email;
197
+	}
198
+
199
+	public Date getActivationTimestamp() {
200
+		return activationTimestamp;
201
+	}
202
+
203
+	public void setActivationTimestamp(Date activationTimestamp) {
204
+		this.activationTimestamp = activationTimestamp;
205
+	}
206
+
207
+	public Date getSendTimestamp() {
208
+		return sendTimestamp;
209
+	}
210
+
211
+	public void setSendTimestamp(Date sendTimestamp) {
212
+		this.sendTimestamp = sendTimestamp;
213
+	}
214
+
215
+	public void setId(int id) {
216
+		this.id = id;
217
+	}
218
+
219
+	public User getCanceledBy() {
220
+		return canceledBy;
221
+	}
222
+
223
+	public void setCanceledBy(User canceledBy) {
224
+		this.canceledBy = canceledBy;
225
+	}
226
+
227
+	public Date getCancelationTimestamp() {
228
+		return cancelationTimestamp;
229
+	}
230
+
231
+	public void setCancelationTimestamp(Date cancelationTimestamp) {
232
+		this.cancelationTimestamp = cancelationTimestamp;
233
+	}
234
+
235
+	public Date getLastAccessTimestamp() {
236
+		return lastAccessTimestamp;
237
+	}
238
+
239
+	public void setLastAccessTimestamp(Date lastAccessTimestamp) {
240
+		this.lastAccessTimestamp = lastAccessTimestamp;
241
+	}
242
+
243
+	public static class Status {
244
+		public static final int CREATED = 0;
245
+		public static final int SENT = 1;
246
+		public static final int ACTIVE = 2;
247
+		public static final int CANCELED = 3;
248
+	}
108
249
 }