Merge pull request #73 from ParsePlatform/richardross.relation.query.redirect

Add support for redirecting class-names of ParseRelations.

Author: richardjrossiii

Parse/ParseQuery.cs

@@ -50,6 +50,7 @@ public class ParseQuery<T> where T : ParseObject {
     private readonly ReadOnlyCollection<string> orderBy;
     private readonly ReadOnlyCollection<string> includes;
     private readonly ReadOnlyCollection<string> selectedKeys;
+    private readonly String redirectClassNameForKey;
     private readonly int? skip;
     private readonly int? limit;
 
@@ -73,7 +74,8 @@ private ParseQuery(ParseQuery<T> source,
         int? skip = null,
         int? limit = null,
         IEnumerable<string> includes = null,
-        IEnumerable<string> selectedKeys = null) {
+        IEnumerable<string> selectedKeys = null,
+        String redirectClassNameForKey = null) {
       if (source == null) {
         throw new ArgumentNullException("source");
       }
@@ -85,6 +87,7 @@ private ParseQuery(ParseQuery<T> source,
       this.limit = source.limit;
       this.includes = source.includes;
       this.selectedKeys = source.selectedKeys;
+      this.redirectClassNameForKey = source.redirectClassNameForKey;
 
       if (where != null) {
         var newWhere = MergeWhereClauses(where);
@@ -127,6 +130,10 @@ private ParseQuery(ParseQuery<T> source,
         var newSelectedKeys = MergeSelectedKeys(selectedKeys);
         this.selectedKeys = new ReadOnlyCollection<string>(newSelectedKeys.ToList());
       }
+
+      if (redirectClassNameForKey != null) {
+        this.redirectClassNameForKey = redirectClassNameForKey;
+      }
     }
 
     private HashSet<string> MergeIncludes(IEnumerable<string> includes) {
@@ -326,6 +333,10 @@ public ParseQuery<T> Limit(int count) {
       return new ParseQuery<T>(this, limit: count);
     }
 
+    internal ParseQuery<T> RedirectClassName(String key) {
+      return new ParseQuery<T>(this, redirectClassNameForKey: key);
+    }
+
     #region Where
 
     /// <summary>
@@ -848,6 +859,9 @@ internal IDictionary<string, object> BuildParameters(bool includeClassName = fal
       if (includeClassName) {
         result["className"] = className;
       }
+      if (redirectClassNameForKey != null) {
+        result["redirectClassNameForKey"] = redirectClassNameForKey;
+      }
       return result;
     }
 

Parse/ParseRelation.cs

@@ -56,8 +56,14 @@ IDictionary<string, object> IJsonConvertible.ToJSON() {
     }
 
     internal ParseQuery<T> GetQuery<T>() where T : ParseObject {
-      return new ParseQuery<T>(targetClassName)
-            .WhereRelatedTo(parent, key);
+      if (targetClassName != null) {
+        return new ParseQuery<T>(targetClassName)
+          .WhereRelatedTo(parent, key);
+      }
+
+      return new ParseQuery<T>(parent.ClassName)
+        .RedirectClassName(key)
+        .WhereRelatedTo(parent, key);
     }
 
     internal string TargetClassName {

ParseTest.Unit/ParseTest.Unit.NetFx45.csproj

@@ -96,6 +96,7 @@
     <Compile Include="PushEncoderTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="InstallationTests.cs" />
+    <Compile Include="RelationTests.cs" />
     <Compile Include="SessionTests.cs" />
     <Compile Include="SessionControllerTests.cs" />
     <Compile Include="ObjectControllerTests.cs" />

ParseTest.Unit/RelationTests.cs

@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using NUnit.Framework;
+using Parse;
+using Parse.Internal;
+
+namespace ParseTest {
+  [TestFixture]
+  public class RelationTests {
+    [Test]
+    public void TestRelationQuery() {
+      ParseObject parent = ParseObject.CreateWithoutData("Foo", "abcxyz");
+
+      ParseRelation<ParseObject> relation = new ParseRelation<ParseObject>(parent, "child");
+      ParseQuery<ParseObject> query = relation.Query;
+
+      // Client side, the query will appear to be for the wrong class.
+      // When the server recieves it, the class name will be redirected using the 'redirectClassNameForKey' option.
+      Assert.AreEqual("Foo", query.ClassName);
+
+      IDictionary<string, object> encoded = query.BuildParameters();
+
+      Assert.AreEqual("child", encoded["redirectClassNameForKey"]);
+    }
+  }
+}