Enable serializing deleted record

Author: Ben Lei

skygear/src/androidTest/java/io/skygear/skygear/RecordSerializerUnitTest.java

@@ -63,6 +63,7 @@ public void testRecordDataKeyValidation() throws Exception {
         assertFalse(RecordSerializer.isValidKey("_created_by"));
         assertFalse(RecordSerializer.isValidKey("_updated_by"));
         assertFalse(RecordSerializer.isValidKey("_access"));
+        assertFalse(RecordSerializer.isValidKey("_deleted"));
         assertFalse(RecordSerializer.isValidKey("_transient"));
 
         assertTrue(RecordSerializer.isValidKey("hello"));
@@ -277,6 +278,17 @@ public void testRecordSerializeNull() throws Exception {
         assertTrue(jsonObject.isNull("null-value-key"));
     }
 
+    @Test
+    public void testRecordSerializeDeleted() throws Exception {
+        Record aDeletedNote = new Record("Note");
+        aDeletedNote.deleted = true;
+
+        JSONObject jsonObject = RecordSerializer.serialize(aDeletedNote);
+
+        assertNotNull(jsonObject);
+        assertTrue(jsonObject.getBoolean("_deleted"));
+    }
+
     @Test
     public void testRecordDeserializationNormalFlow() throws Exception {
         // prepare reference record data
@@ -532,6 +544,17 @@ public void testRecordDeserializeNull() throws Exception {
         assertEquals(JSONObject.NULL, aNote.get("null-value-key"));
     }
 
+    @Test
+    public void testRecordDeserializeDeleted() throws Exception {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("_recordType", "Note");
+        jsonObject.put("_recordID", "48092492-0791-4120-B314-022202AD3971");
+        jsonObject.put("_deleted", true);
+
+        Record aDeletedNote = RecordSerializer.deserialize(jsonObject);
+        assertTrue(aDeletedNote.deleted);
+    }
+
     @Test
     public void testRecordSerializeAndDeserialize() throws Exception {
         Record note = new Record("note");

skygear/src/main/java/io/skygear/skygear/Record.java

@@ -48,6 +48,8 @@ public class Record implements Parcelable {
     String updaterId;
     String ownerId;
 
+    boolean deleted;
+
     Map<String, Object> transientMap;
 
     Map<String, Object> data;
@@ -108,6 +110,8 @@ public Record(String type, String id, Map<String, Object>data) {
         this.createdAt = null;
         this.updatedAt = null;
 
+        this.deleted = false;
+
         this.access = AccessControl.defaultAccessControl();
 
         this.transientMap = new HashMap<>();

skygear/src/main/java/io/skygear/skygear/RecordSerializer.java

@@ -52,6 +52,7 @@ public class RecordSerializer {
     private static final String RecordSerializationCreatorIDKey = "_created_by";
     private static final String RecordSerializationUpdaterIDKey = "_updated_by";
     private static final String RecordSerializationAccessKey = "_access";
+    private static final String RecordSerializationDeletedKey = "_deleted";
     private static final String RecordSerializationTransientKey = "_transient";
 
     private static final String TAG = "Skygear SDK";
@@ -66,6 +67,7 @@ public class RecordSerializer {
             RecordSerializationCreatorIDKey,
             RecordSerializationUpdaterIDKey,
             RecordSerializationAccessKey,
+            RecordSerializationDeletedKey,
             RecordSerializationTransientKey
     );
 
@@ -205,6 +207,10 @@ public static JSONObject serialize(Record record) {
                 jsonObject.put(RecordSerializationOwnerIDKey, record.ownerId);
             }
 
+            if (record.deleted) {
+                jsonObject.put(RecordSerializationDeletedKey, true);
+            }
+
             if (record.getAccess() != null) {
                 jsonObject.put(
                         RecordSerializationAccessKey,
@@ -276,6 +282,9 @@ public static Record deserialize(JSONObject jsonObject) throws JSONException {
             accessJsonArray = jsonObject.getJSONArray(RecordSerializationAccessKey);
         }
 
+        // handler _deleted
+        record.deleted = jsonObject.optBoolean(RecordSerializationDeletedKey, false);
+
         // handle _transient
         if (!jsonObject.isNull(RecordSerializationTransientKey)) {
             JSONObject transientObject = jsonObject.getJSONObject(RecordSerializationTransientKey);