2 files changed, 67 insertions, 0 deletions
diff --git a/src/com/p4square/grow/backend/db/CassandraDatabase.java b/src/com/p4square/grow/backend/db/CassandraDatabase.java
index e40c251..b8cb6df 100644
--- a/src/com/p4square/grow/backend/db/CassandraDatabase.java
+++ b/src/com/p4square/grow/backend/db/CassandraDatabase.java
@@ -16,6 +16,7 @@ import com.netflix.astyanax.ColumnMutation;
 import com.netflix.astyanax.model.Column;
 import com.netflix.astyanax.model.ColumnFamily;
 import com.netflix.astyanax.model.ColumnList;
+import com.netflix.astyanax.ColumnListMutation;
 import com.netflix.astyanax.MutationBatch;
 import com.netflix.astyanax.serializers.StringSerializer;
 import com.netflix.astyanax.thrift.ThriftFamilyFactory;
@@ -189,4 +190,23 @@ public class CassandraDatabase {
             throw new RuntimeException(e);
         }
     }
+
+    /**
+     * Remove a row
+     */
+    public void deleteRow(final String cfName, final String key) {
+        ColumnFamily<String, String> cf = new ColumnFamily(cfName,
+            StringSerializer.get(),
+            StringSerializer.get());
+
+        try {
+            MutationBatch batch = mKeyspace.prepareMutationBatch();
+            ColumnListMutation<String> cfm = batch.withRow(cf, key).delete();
+            batch.execute();
+
+        } catch (ConnectionException e) {
+            cLog.error("deleteRow failed due to Connection Exception", e);
+            throw new RuntimeException(e);
+        }
+    }
 }
diff --git a/src/com/p4square/grow/backend/resources/SurveyResultsResource.java b/src/com/p4square/grow/backend/resources/SurveyResultsResource.java
index e87126d..eea0fb1 100644
--- a/src/com/p4square/grow/backend/resources/SurveyResultsResource.java
+++ b/src/com/p4square/grow/backend/resources/SurveyResultsResource.java
@@ -117,6 +117,7 @@ public class SurveyResultsResource extends ServerResource {
 
             default:
                 setStatus(Status.CLIENT_ERROR_METHOD_NOT_ALLOWED);
+                return null;
         }
 
         if (success) {
@@ -130,6 +131,52 @@ public class SurveyResultsResource extends ServerResource {
     }
 
     /**
+     * Clear assessment results.
+     */
+    @Override
+    protected Representation delete() {
+        boolean success = false;
+
+        switch (mRequestType) {
+            case ANSWER:
+                try {
+                    mDb.deleteKey("assessments", mUserId, mQuestionId);
+                    mDb.deleteKey("assessments", mUserId, "summary");
+                    success = true;
+
+                } catch (Exception e) {
+                    LOG.warn("Caught exception putting answer: " + e.getMessage(), e);
+                }
+                break;
+
+            case ASSESSMENT:
+                try {
+                    mDb.deleteRow("assessments", mUserId);
+                    mDb.deleteKey("accounts", mUserId, "value"); // TODO: IMPORTANT! This needs to be narrower.
+                    success = true;
+
+                } catch (Exception e) {
+                    LOG.warn("Caught exception putting answer: " + e.getMessage(), e);
+                }
+                break;
+
+            default:
+                setStatus(Status.CLIENT_ERROR_METHOD_NOT_ALLOWED);
+                return null;
+        }
+
+        if (success) {
+            setStatus(Status.SUCCESS_NO_CONTENT);
+
+        } else {
+            setStatus(Status.SERVER_ERROR_INTERNAL);
+        }
+
+        return null;
+
+    }
+
+    /**
      * This method compiles assessment results.
      */
     private String buildAssessment() {