Update RecordDeleteRequest for the latest protocol

Author: Ben Lei

skygear/src/androidTest/java/io/skygear/skygear/RecordDeleteRequestUnitTest.java

@@ -61,19 +61,37 @@ public void testRecordDeleteRequestNormalFlow() throws Exception {
                 = new RecordDeleteRequest(new Record[]{note1, note2}, instrumentationPublicDatabase);
         Map<String, Object> data = request.data;
         assertEquals("_public", data.get("database_id"));
-        assertEquals("Note", data.get("recordType"));
-
-        JSONArray recordIDs = (JSONArray) data.get("recordIDs");
-
-        assertEquals(2, recordIDs.length());
-        assertEquals("9C0F4536-FEA7-42DB-B8EF-561CCD175E06", recordIDs.getString(0));
-        assertEquals("05A2946A-72DC-4F20-99F9-129BD1FCB52A", recordIDs.getString(1));
 
         JSONArray deprecatedIDs = (JSONArray) data.get("ids");
         assertEquals(2, deprecatedIDs.length());
         assertEquals("Note/9C0F4536-FEA7-42DB-B8EF-561CCD175E06", deprecatedIDs.getString(0));
         assertEquals("Note/05A2946A-72DC-4F20-99F9-129BD1FCB52A", deprecatedIDs.getString(1));
 
+        JSONArray recordIdentifiers = (JSONArray) data.get("records");
+        assertEquals(2, recordIdentifiers.length());
+        assertEquals(
+                "Note/9C0F4536-FEA7-42DB-B8EF-561CCD175E06",
+                recordIdentifiers.getJSONObject(0).getString("_id"));
+        assertEquals(
+                "Note",
+                recordIdentifiers.getJSONObject(0).getString("_recordType")
+        );
+        assertEquals(
+                "9C0F4536-FEA7-42DB-B8EF-561CCD175E06",
+                recordIdentifiers.getJSONObject(0).getString("_recordID")
+        );
+        assertEquals(
+                "Note/05A2946A-72DC-4F20-99F9-129BD1FCB52A",
+                recordIdentifiers.getJSONObject(1).getString("_id"));
+        assertEquals(
+                "Note",
+                recordIdentifiers.getJSONObject(1).getString("_recordType")
+        );
+        assertEquals(
+                "05A2946A-72DC-4F20-99F9-129BD1FCB52A",
+                recordIdentifiers.getJSONObject(1).getString("_recordID")
+        );
+
         request.validate();
     }
 
@@ -83,16 +101,4 @@ public void testRecordSaveRequestNotAllowSaveNoRecords() throws Exception {
                 = new RecordDeleteRequest(new Record[]{}, instrumentationPublicDatabase);
         request.validate();
     }
-
-    @Test(expected = InvalidParameterException.class)
-    public void testRecordSaveRequestNotAllowMultiTypeRecords() throws Exception {
-        RecordDeleteRequest request = new RecordDeleteRequest(
-                new Record[]{
-                        new Record("Note"),
-                        new Record("Comment")
-                },
-                instrumentationPublicDatabase
-        );
-        request.validate();
-    }
 }

skygear/src/main/java/io/skygear/skygear/RecordDeleteRequest.java

@@ -17,30 +17,35 @@
 
 package io.skygear.skygear;
 
+import android.util.Log;
+
 import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 import java.security.InvalidParameterException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
+
+import static io.skygear.skygear.RecordSerializer.RecordIdentifier;
 
 /**
  * The Skygear Record Delete Request.
  */
 public class RecordDeleteRequest extends Request {
+    private static final String TAG = "Skygear SDK";
+
     private String databaseId;
-    private List<Record> records;
+    private List<RecordIdentifier> recordIdentifiers;
 
     /**
      * Instantiates a new record delete request with default properties.
      */
     RecordDeleteRequest() {
         super("record:delete");
         this.data = new HashMap<>();
-        this.records = new ArrayList<>();
+        this.recordIdentifiers = new ArrayList<>();
     }
 
     /**
@@ -52,30 +57,44 @@ public class RecordDeleteRequest extends Request {
     public RecordDeleteRequest(Record[] records, Database database) {
         this();
         this.databaseId = database.getName();
-        this.records = Arrays.asList(records);
+
+        for (Record perRecord : records) {
+            this.recordIdentifiers.add(
+                    new RecordIdentifier(perRecord.type, perRecord.id)
+            );
+        }
+
         this.updateData();
     }
 
     private void updateData() {
-        String recordType = null;
-        JSONArray recordIDs = new JSONArray();
         JSONArray deprecatedIDs = new JSONArray();
-        for (Record perRecord : this.records) {
-            if (recordType == null) {
-                recordType = perRecord.getType();
-            }
+        JSONArray recordIdentifiers = new JSONArray();
+
+        try {
+            for (RecordIdentifier perRecordIdentifier : this.recordIdentifiers) {
+                String perRecordDeprecatedID = String.format(
+                        "%s/%s",
+                        perRecordIdentifier.type,
+                        perRecordIdentifier.id
+                );
+
+                deprecatedIDs.put(perRecordDeprecatedID);
 
-            recordIDs.put(perRecord.getId());
-            deprecatedIDs.put(String.format("%s/%s", perRecord.getType(), perRecord.getId()));
+                JSONObject perRecordIdentifierData = new JSONObject();
+                perRecordIdentifierData.put("_id", perRecordDeprecatedID);
+                perRecordIdentifierData.put("_recordType", perRecordIdentifier.type);
+                perRecordIdentifierData.put("_recordID", perRecordIdentifier.id);
+
+                recordIdentifiers.put(perRecordIdentifierData);
+            }
+        } catch(JSONException e) {
+            Log.w(TAG, "Fail to serialize record identifiers");
         }
 
         this.data.put("ids", deprecatedIDs);
-        this.data.put("recordIDs", recordIDs);
+        this.data.put("records", recordIdentifiers);
         this.data.put("database_id", this.databaseId);
-
-        if (recordType != null) {
-            this.data.put("recordType", recordType);
-        }
     }
 
     @Override
@@ -86,14 +105,5 @@ protected void validate() throws Exception {
         if (ids.length() == 0) {
             throw new InvalidParameterException("No records to be processed");
         }
-
-        Set<String> typeSet = new HashSet<>();
-        for (Record perRecord : this.records) {
-            typeSet.add(perRecord.getType());
-        }
-
-        if (typeSet.size() > 1) {
-            throw new InvalidParameterException("Only records in the same type are allowed");
-        }
     }
 }