From cbfe9207ad7c9bba96b39c550d250d12097fd06f Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Thu, 23 Jan 2014 19:21:10 +0000
Subject: [PATCH] #395 feature - Implemented license section at 75%

---
 securis/src/main/java/net/curisit/securis/db/License.java |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/securis/src/main/java/net/curisit/securis/db/License.java b/securis/src/main/java/net/curisit/securis/db/License.java
index 010b933..f683161 100644
--- a/securis/src/main/java/net/curisit/securis/db/License.java
+++ b/securis/src/main/java/net/curisit/securis/db/License.java
@@ -15,6 +15,7 @@
 
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonIgnore;
+import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 
@@ -26,8 +27,9 @@
 @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
 @Entity
 @Table(name = "license")
+@JsonIgnoreProperties(ignoreUnknown = true)
 @NamedQueries(
-	{ @NamedQuery(name = "list-licenses", query = "SELECT l FROM License l") })
+	{ @NamedQuery(name = "list-licenses-by-pack", query = "SELECT l FROM License l where l.pack.id = :packId") })
 public class License implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -56,9 +58,18 @@
 	private int status;
 
 	@Column(name = "full_name")
+	@JsonProperty("full_name")
 	private String fullName;
 
 	private String email;
+
+	@Column(name = "request_data")
+	@JsonProperty("request_data")
+	private String requestData;
+
+	@Column(name = "license_data")
+	@JsonProperty("license_data")
+	private String licenseData;
 
 	@Column(name = "creation_timestamp")
 	private Date creationTimestamp;
@@ -77,6 +88,8 @@
 
 	@Column(name = "last_access_timestamp")
 	private Date lastAccessTimestamp;
+
+	private String comments;
 
 	public int getId() {
 		return id;
@@ -240,6 +253,30 @@
 		this.lastAccessTimestamp = lastAccessTimestamp;
 	}
 
+	public String getRequestData() {
+		return requestData;
+	}
+
+	public void setRequestData(String requestData) {
+		this.requestData = requestData;
+	}
+
+	public String getLicenseData() {
+		return licenseData;
+	}
+
+	public void setLicenseData(String licenseData) {
+		this.licenseData = licenseData;
+	}
+
+	public String getComments() {
+		return comments;
+	}
+
+	public void setComments(String comments) {
+		this.comments = comments;
+	}
+
 	public static class Status {
 		public static final int CREATED = 0;
 		public static final int SENT = 1;

--
Gitblit v1.3.2