From ddec2c5c7b7842536d6d705c2de20f96e16c8aa8 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Wed, 22 Oct 2014 17:38:57 +0000
Subject: [PATCH] #2021 feature - Added blocked request table and refactoring License actions
---
securis/src/main/java/net/curisit/securis/db/Pack.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/db/Pack.java b/securis/src/main/java/net/curisit/securis/db/Pack.java
index d8f6df9..dcc977e 100644
--- a/securis/src/main/java/net/curisit/securis/db/Pack.java
+++ b/securis/src/main/java/net/curisit/securis/db/Pack.java
@@ -74,7 +74,7 @@
@Column(name = "num_licenses")
@JsonProperty("num_licenses")
private int numLicenses;
-
+
@Column(name = "init_valid_date")
@JsonProperty("init_valid_date")
private Date initValidDate;
@@ -155,7 +155,7 @@
}
int num = 0;
for (License lic : licenses) {
- if (lic.getStatus() == License.Status.ACTIVE) {
+ if (lic.getStatus() == LicenseStatus.ACTIVE || lic.getStatus() == LicenseStatus.PRE_ACTIVE) {
num++;
}
}
@@ -176,7 +176,7 @@
}
int num = 0;
for (License lic : licenses) {
- if (lic.getStatus() != License.Status.CANCELED) {
+ if (lic.getStatus() != LicenseStatus.CANCELLED) {
num++;
}
}
@@ -190,7 +190,7 @@
*/
@JsonProperty("num_available")
public int getNumAvailables() {
- return numLicenses - getNumCreations();
+ return numLicenses - getNumActivations();
}
@JsonProperty("organization_name")
@@ -250,11 +250,12 @@
@JsonProperty("created_by_name")
public String getCreatedByname() {
- return createdBy == null ? null : String.format("%s %s (%s)", createdBy.getFirstName(), createdBy.getLastName() != null ? createdBy.getLastName() : "", createdBy.getUsername());
+ return createdBy == null ? null : String.format("%s %s (%s)", createdBy.getFirstName(),
+ createdBy.getLastName() != null ? createdBy.getLastName() : "", createdBy.getUsername());
}
@JsonProperty("licensetype_code")
- public String getLicenseTypcode() {
+ public String getLicenseTypeCode() {
return licenseType == null ? null : licenseType.getCode();
}
@@ -310,13 +311,13 @@
public boolean equals(Object obj) {
if (!(obj instanceof Pack))
return false;
- Pack other = (Pack)obj;
+ Pack other = (Pack) obj;
return id.equals(other.id);
}
-
+
@Override
public int hashCode() {
-
+
return (id == null ? 0 : id.hashCode());
}
}
--
Gitblit v1.3.2