#2021 feature - Added blocked request table and refactoring License actions

rsanchez

2014-10-22 ddec2c5c7b7842536d6d705c2de20f96e16c8aa8

 securis/src/main/java/net/curisit/securis/db/License.java
..
..
@@ -63,7 +63,7 @@
63
63
     @JoinColumn(name = "canceled_by")
64
64
     private User canceledBy;
65
65
 
66
-    private int status;
66
+    private LicenseStatus status;
67
67
 
68
68
     @Column(name = "full_name")
69
69
     @JsonProperty("full_name")
..
..
@@ -186,11 +186,11 @@
186
186
         }
187
187
     }
188
188
 
189
-    public int getStatus() {
189
+    public LicenseStatus getStatus() {
190
190
         return status;
191
191
     }
192
192
 
193
-    public void setStatus(int status) {
193
+    public void setStatus(LicenseStatus status) {
194
194
         this.status = status;
195
195
     }
196
196
 
..
..
@@ -289,21 +289,14 @@
289
289
     }
290
290
 
291
291
     public static class Status {
292
-        public static final int CREATED = 1;
293
-        public static final int REQUESTED = 2;
294
-        public static final int PREACTIVE = 3;
295
-        public static final int ACTIVE = 4;
296
-        public static final int EXPIRED = 5;
297
-        public static final int CANCELED = 6;
298
-        public static final int DELETED = 7;
299
292
 
300
293
         private static final Map<Integer, List<Integer>> transitions = Utils.createMap( //
301
-                Action.REQUEST, Arrays.asList(CREATED, REQUESTED), //
302
-                Action.ACTIVATION, Arrays.asList(REQUESTED, PREACTIVE, EXPIRED), //
303
-                Action.SEND, Arrays.asList(ACTIVE, PREACTIVE), //
304
-                Action.DOWNLOAD, Arrays.asList(ACTIVE, PREACTIVE), //
305
-                Action.CANCEL, Arrays.asList(ACTIVE, PREACTIVE, REQUESTED, EXPIRED), //
306
-                Action.DELETE, Arrays.asList(CANCELED, CREATED) //
294
+                Action.REQUEST, Arrays.asList(LicenseStatus.CREATED, LicenseStatus.REQUESTED), //
295
+                Action.ACTIVATION, Arrays.asList(LicenseStatus.REQUESTED, LicenseStatus.PRE_ACTIVE, LicenseStatus.EXPIRED), //
296
+                Action.SEND, Arrays.asList(LicenseStatus.ACTIVE, LicenseStatus.PRE_ACTIVE), //
297
+                Action.DOWNLOAD, Arrays.asList(LicenseStatus.ACTIVE, LicenseStatus.PRE_ACTIVE), //
298
+                Action.CANCEL, Arrays.asList(LicenseStatus.ACTIVE, LicenseStatus.PRE_ACTIVE, LicenseStatus.REQUESTED, LicenseStatus.EXPIRED), //
299
+                Action.DELETE, Arrays.asList(LicenseStatus.CANCELLED, LicenseStatus.CREATED) //
307
300
 
308
301
                 );
309
302
 
..
..
@@ -315,7 +308,7 @@
315
308
          * @param newStatus
316
309
          * @return
317
310
          */
318
-        public static boolean isActionValid(Integer action, Integer currentStatus) {
311
+        public static boolean isActionValid(Integer action, LicenseStatus currentStatus) {
319
312
             List<Integer> validStatuses = transitions.get(currentStatus);
320
313
 
321
314
             return validStatuses != null && validStatuses.contains(currentStatus);