o Including state in both badge and badge progress.

o Removing count from badge, inserting one badge per badge received.

1 files changed, 19 insertions, 6 deletions

diff --git a/src/main/java/io/trygvis/esper/testing/web/resource/BadgeJson.java b/src/main/java/io/trygvis/esper/testing/web/resource/BadgeJson.java
index 8eea335..ded97ae 100644
--- a/src/main/java/io/trygvis/esper/testing/web/resource/BadgeJson.java
+++ b/src/main/java/io/trygvis/esper/testing/web/resource/BadgeJson.java
@@ -1,20 +1,33 @@
 package io.trygvis.esper.testing.web.resource;
 
+import org.joda.time.*;
+
 public class BadgeJson {
+    public final DateTime createdDate;
     public final String name;
     public final int level;
 
+    public final Integer progress;
+    public final Integer goal;
+
     /**
-     * Number of times this badge has been received.
+     * For completed badges.
      */
-    public final int count;
-    public final int progress;
-    public final int goal;
+    public BadgeJson(DateTime createdDate, String name, int level) {
+        this.createdDate = createdDate;
+        this.name = name;
+        this.level = level;
+        this.progress = null;
+        this.goal = null;
+    }
 
-    public BadgeJson(String name, int level, int count, int progress, int goal) {
+    /**
+     * For badges in progress.
+     */
+    public BadgeJson(DateTime createdDate, String name, int level, int progress, int goal) {
+        this.createdDate = createdDate;
         this.name = name;
         this.level = level;
-        this.count = count;
         this.progress = progress;
         this.goal = goal;
     }