2 files changed, 26 insertions, 4 deletions
diff --git a/src/com/p4square/grow/backend/resources/BannerResource.java b/src/com/p4square/grow/backend/resources/BannerResource.java
index 4551777..8519f64 100644
--- a/src/com/p4square/grow/backend/resources/BannerResource.java
+++ b/src/com/p4square/grow/backend/resources/BannerResource.java
@@ -7,14 +7,19 @@ package com.p4square.grow.backend.resources;
 import java.io.IOException;
 
 import org.restlet.data.Status;
-import org.restlet.resource.ServerResource;
+import org.restlet.ext.jackson.JacksonRepresentation;
 import org.restlet.representation.Representation;
 import org.restlet.representation.StringRepresentation;
+import org.restlet.resource.ServerResource;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import org.apache.log4j.Logger;
 
 import com.p4square.grow.backend.GrowBackend;
 import com.p4square.grow.backend.db.CassandraDatabase;
+import com.p4square.grow.model.Banner;
+import com.p4square.grow.provider.JsonEncodedProvider;
 
 /**
  * Fetches or sets the banner string.
@@ -24,6 +29,8 @@ import com.p4square.grow.backend.db.CassandraDatabase;
 public class BannerResource extends ServerResource {
     private static final Logger LOG = Logger.getLogger(BannerResource.class);
 
+    public static final ObjectMapper MAPPER = JsonEncodedProvider.MAPPER;
+
     private CassandraDatabase mDb;
 
     @Override
@@ -42,7 +49,7 @@ public class BannerResource extends ServerResource {
         String result = mDb.getKey("strings", "banner");
 
         if (result == null || result.length() == 0) {
-            result = "{}";
+            result = "{\"html\":null}";
         }
 
         return new StringRepresentation(result);
@@ -54,7 +61,13 @@ public class BannerResource extends ServerResource {
     @Override
     protected Representation put(Representation entity) {
         try {
-            mDb.putKey("strings", "banner", entity.getText());
+            JacksonRepresentation<Banner> representation =
+                new JacksonRepresentation<>(entity, Banner.class);
+            representation.setObjectMapper(MAPPER);
+
+            Banner banner = representation.getObject();
+
+            mDb.putKey("strings", "banner", MAPPER.writeValueAsString(banner));
             setStatus(Status.SUCCESS_NO_CONTENT);
 
         } catch (IOException e) {
diff --git a/src/com/p4square/grow/backend/resources/SurveyResultsResource.java b/src/com/p4square/grow/backend/resources/SurveyResultsResource.java
index 4fba599..404ccec 100644
--- a/src/com/p4square/grow/backend/resources/SurveyResultsResource.java
+++ b/src/com/p4square/grow/backend/resources/SurveyResultsResource.java
@@ -26,6 +26,7 @@ import com.p4square.grow.model.Answer;
 import com.p4square.grow.model.Question;
 import com.p4square.grow.model.RecordedAnswer;
 import com.p4square.grow.model.Score;
+import com.p4square.grow.model.UserRecord;
 import com.p4square.grow.provider.Provider;
 
 
@@ -45,6 +46,7 @@ public class SurveyResultsResource extends ServerResource {
 
     private CassandraDatabase mDb;
     private Provider<String, Question> mQuestionProvider;
+    private Provider<String, UserRecord> mUserRecordProvider;
 
     private RequestType mRequestType;
     private String mUserId;
@@ -57,6 +59,7 @@ public class SurveyResultsResource extends ServerResource {
         final GrowBackend backend = (GrowBackend) getApplication();
         mDb = backend.getDatabase();
         mQuestionProvider = backend.getQuestionProvider();
+        mUserRecordProvider = backend.getUserRecordProvider();
 
         mUserId = getAttribute("userId");
         mQuestionId = getAttribute("questionId");
@@ -152,7 +155,13 @@ public class SurveyResultsResource extends ServerResource {
             case ASSESSMENT:
                 try {
                     mDb.deleteRow("assessments", mUserId);
-                    mDb.deleteKey("accounts", mUserId, "value"); // TODO: IMPORTANT! This needs to be narrower.
+
+                    UserRecord record = mUserRecordProvider.get(mUserId);
+                    if (record != null) {
+                        record.setLanding("assessment");
+                        mUserRecordProvider.put(mUserId, record);
+                    }
+
                     success = true;
 
                 } catch (Exception e) {