rsanchez
2014-10-16 4d18a46ee3ada751517f9bf767d5057a3bf5eb9e
securis/src/main/java/net/curisit/securis/db/Pack.java
....@@ -73,6 +73,16 @@
7373 @Column(name = "num_licenses")
7474 @JsonProperty("num_licenses")
7575 private int numLicenses;
76
+
77
+ @Column(name = "init_valid_date")
78
+ @JsonProperty("init_valid_date")
79
+ private Date initValidDate;
80
+
81
+ @Column(name = "end_valid_date")
82
+ @JsonProperty("end_valid_date")
83
+ private Date endValidDate;
84
+
85
+ private String status;
7686
7787 @Column(name = "license_preactivation")
7888 @JsonProperty("license_preactivation")
....@@ -239,7 +249,7 @@
239249
240250 @JsonProperty("created_by_name")
241251 public String getCreatedByname() {
242
- return createdBy == null ? null : String.format("%s %s (%s)", createdBy.getFirstName(), createdBy.getLastName(), createdBy.getUsername());
252
+ return createdBy == null ? null : String.format("%s %s (%s)", createdBy.getFirstName(), createdBy.getLastName() != null ? createdBy.getLastName() : "", createdBy.getUsername());
243253 }
244254
245255 @JsonProperty("licensetype_code")
....@@ -271,6 +281,30 @@
271281 this.metadata = metadata;
272282 }
273283
284
+ public String getStatus() {
285
+ return status;
286
+ }
287
+
288
+ public void setStatus(String status) {
289
+ this.status = status;
290
+ }
291
+
292
+ public Date getInitValidDate() {
293
+ return initValidDate;
294
+ }
295
+
296
+ public void setInitValidDate(Date initValidDate) {
297
+ this.initValidDate = initValidDate;
298
+ }
299
+
300
+ public Date getEndValidDate() {
301
+ return endValidDate;
302
+ }
303
+
304
+ public void setEndValidDate(Date endValidDate) {
305
+ this.endValidDate = endValidDate;
306
+ }
307
+
274308 @Override
275309 public boolean equals(Object obj) {
276310 if (!(obj instanceof Pack))