From b33557d3faf3e45eff3d3e19f4a1549ffe907b4c Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Tue, 18 Nov 2014 10:52:52 +0000
Subject: [PATCH] #396 fix - Corrected actions: "Download" and "Send email"
---
securis/src/main/java/net/curisit/securis/db/License.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 c8e1e1a..bd104f9 100644
--- a/securis/src/main/java/net/curisit/securis/db/License.java
+++ b/securis/src/main/java/net/curisit/securis/db/License.java
@@ -28,6 +28,7 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.hibernate.annotations.Type;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -75,6 +76,7 @@
@JoinColumn(name = "cancelled_by")
private User cancelledBy;
+ @Type(type = "net.curisit.securis.db.common.LicenseStatusType")
private LicenseStatus status;
@Column(name = "full_name")
@@ -316,7 +318,7 @@
public static class Status {
- private static final Map<Integer, List<Integer>> transitions = Utils.createMap( //
+ private static final Map<Integer, List<LicenseStatus>> transitions = Utils.createMap( //
Action.REQUEST, Arrays.asList(LicenseStatus.CREATED, LicenseStatus.REQUESTED), //
Action.ACTIVATION, Arrays.asList(LicenseStatus.REQUESTED, LicenseStatus.PRE_ACTIVE, LicenseStatus.EXPIRED), //
Action.SEND, Arrays.asList(LicenseStatus.ACTIVE, LicenseStatus.PRE_ACTIVE), //
@@ -335,8 +337,8 @@
* @return
*/
public static boolean isActionValid(Integer action, LicenseStatus currentStatus) {
- List<Integer> validStatuses = transitions.get(action);
-
+ List<LicenseStatus> validStatuses = transitions.get(action);
+ LOG.info("Action {} is valid ? => {} current: {} OK? {}", action, validStatuses, currentStatus, validStatuses.contains(currentStatus));
return validStatuses != null && validStatuses.contains(currentStatus);
}
}
--
Gitblit v1.3.2