* AVACL.cs:

* ObjectTest.cs:
* AVObject.cs:
* AVException.cs:
* ObjectControllerTests.cs:

* AVObjectController.cs: chore: AVObject 增加符合条件删除

Storage/Storage.Test/ObjectControllerTests.cs

@@ -1,157 +0,0 @@
-using NUnit.Framework;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Collections.Generic;
-using LeanCloud;
-
-namespace LeanCloud.Test {
-    public class ObjectControllerTests {
-        [SetUp]
-        public void SetUp() {
-            Utils.InitNorthChina();
-        }
-
-        [Test]
-        public async Task Save() {
-            AVObject obj = AVObject.Create("Foo");
-            obj["content"] = "hello, world";
-            obj["list"] = new List<int> { 1, 1, 2, 3, 5, 8 };
-            obj["dict"] = new Dictionary<string, int> {
-                { "hello", 1 },
-                { "world", 2 }
-            };
-            await obj.SaveAsync();
-            Assert.NotNull(obj.ObjectId);
-            Assert.NotNull(obj.CreatedAt);
-            Assert.NotNull(obj.UpdatedAt);
-        }
-
-        [Test]
-        public async Task SaveWithOptions() {
-            AVObject account = AVObject.CreateWithoutData("Account", "5d65fa5330863b008065e476");
-            account["balance"] = 100;
-            await account.SaveAsync();
-            AVQuery<AVObject> query = new AVQuery<AVObject>("Account");
-            query.WhereGreaterThan("balance", 80);
-            account["balance"] = 50;
-            await account.SaveAsync(true, query);
-            TestContext.Out.WriteLine($"balance: {account["balance"]}");
-        }
-
-        [Test]
-        public async Task SaveWithPointer() {
-            AVObject comment = new AVObject("Comment") {
-                { "content", "Hello, Comment" }
-            };
-            
-            AVObject post = new AVObject("Post") {
-                { "name", "New Post" },
-                { "category", new AVObject("Category") {
-                    { "name", "new post category" }
-                } }
-            };
-            comment["post"] = post;
-
-            AVObject testPost = new AVObject("Post") {
-                { "name", "Test Post" },
-                { "category", new AVObject("Category") {
-                    { "name", "test post category" }
-                } }
-            };
-            comment["test_post"] = testPost;
-
-            await comment.SaveAsync();
-            TestContext.Out.WriteLine(post);
-            TestContext.Out.WriteLine(testPost);
-            TestContext.Out.WriteLine(comment);
-        }
-
-        [Test]
-        public async Task SaveBatch() {
-            List<AVObject> objList = new List<AVObject>();
-            for (int i = 0; i < 5; i++) {
-                AVObject obj = AVObject.Create("Foo");
-                obj["content"] = "batch object";
-                objList.Add(obj);
-            }
-            try {
-                await objList.SaveAllAsync();
-                objList.ForEach(obj => {
-                    Assert.NotNull(obj.ObjectId);
-                });
-            } catch (Exception e) {
-                TestContext.Out.WriteLine(e.Message);
-            }
-        }
-
-        [Test]
-        public async Task Fetch() {
-            AVObject obj = AVObject.CreateWithoutData("Todo", "5d5f6039d5de2b006cf29c8f");
-            await obj.FetchAsync();
-            Assert.NotNull(obj["title"]);
-            Assert.NotNull(obj["content"]);
-            TestContext.Out.WriteLine($"{obj["title"]}, {obj["content"]}");
-        }
-
-        [Test]
-        public async Task FetchWithKeys() {
-            AVObject obj = AVObject.CreateWithoutData("Post", "5d3abfa530863b0068e1b326");
-            await obj.FetchAsync(new List<string> { "pubUser" });
-            TestContext.Out.WriteLine($"{obj["pubUser"]}");
-        }
-
-        [Test]
-        public async Task FetchWithIncludes() {
-            AVObject obj = AVObject.CreateWithoutData("Post", "5d3abfa530863b0068e1b326");
-            await obj.FetchAsync(includes: new List<string> { "tag" });
-            AVObject tag = obj["tag"] as AVObject;
-            TestContext.Out.WriteLine($"{tag["name"]}");
-        }
-
-        [Test]
-        public async Task FetchAll() {
-            List<AVObject> objList = new List<AVObject> {
-                AVObject.CreateWithoutData("Tag", "5d64e5ebc05a8000730340ba"),
-                AVObject.CreateWithoutData("Tag", "5d64e5eb12215f0073db271c"),
-                AVObject.CreateWithoutData("Tag", "5d64e57f43e78c0068a14315")
-            };
-            await objList.FetchAllAsync();
-            objList.ForEach(obj => {
-                Assert.NotNull(obj.ObjectId);
-                TestContext.Out.WriteLine($"{obj.ObjectId}, {obj["name"]}");
-            });
-        }
-
-        [Test]
-        public async Task Delete() {
-            AVObject obj = AVObject.Create("Foo");
-            obj["content"] = "hello, world";
-            await obj.SaveAsync();
-            Assert.NotNull(obj);
-            await obj.DeleteAsync();
-        }
-
-        [Test]
-        public async Task DeleteAll() {
-            List<AVObject> objList = new List<AVObject>();
-            for (int i = 0; i < 5; i++) {
-                AVObject obj = AVObject.Create("Foo");
-                obj["content"] = "batch object";
-                objList.Add(obj);
-            }
-            await objList.SaveAllAsync();
-            await AVObject.DeleteAllAsync(objList);
-        }
-
-        [Test]
-        public async Task Set() {
-            AVObject obj = AVObject.Create("Foo");
-            obj["hello"] = "world";
-            await obj.SaveAsync();
-            obj["world"] = "aaa";
-            obj.Revert();
-            TestContext.Out.WriteAsync(obj["hello"] as string);
-        }
-    }
-}

Storage/Storage.Test/ObjectTest.cs

@@ -1,7 +1,8 @@
 using NUnit.Framework;
-using LeanCloud;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace LeanCloud.Test {
     public class ObjectTests {
@@ -11,22 +12,166 @@ namespace LeanCloud.Test {
         }
 
         [Test]
-        public void TestAVObjectConstructor() {
+        public async Task Save() {
-            AVObject obj = new AVObject("Foo");
+            AVObject obj = AVObject.Create("Foo");
-            Assert.AreEqual("Foo", obj.ClassName);
+            obj["content"] = "hello, world";
-            Assert.Null(obj.CreatedAt);
+            obj["list"] = new List<int> { 1, 1, 2, 3, 5, 8 };
-            Assert.True(obj.IsDataAvailable);
+            obj["dict"] = new Dictionary<string, int> {
-            Assert.True(obj.IsDirty);
+                { "hello", 1 },
+                { "world", 2 }
+            };
+            await obj.SaveAsync();
+            Assert.NotNull(obj.ObjectId);
+            Assert.NotNull(obj.CreatedAt);
+            Assert.NotNull(obj.UpdatedAt);
         }
 
         [Test]
-        public void TestAVObjectCreate() {
+        public async Task SaveWithOptions() {
-            AVObject obj = AVObject.CreateWithoutData("Foo", "5d356b1cd5de2b00837162ca");
+            AVObject account = AVObject.CreateWithoutData("Account", "5d65fa5330863b008065e476");
-            Assert.AreEqual("Foo", obj.ClassName);
+            account["balance"] = 100;
-            Assert.AreEqual("5d356b1cd5de2b00837162ca", obj.ObjectId);
+            await account.SaveAsync();
-            Assert.Null(obj.CreatedAt);
+            AVQuery<AVObject> query = new AVQuery<AVObject>("Account");
-            Assert.False(obj.IsDataAvailable);
+            query.WhereGreaterThan("balance", 80);
-            Assert.False(obj.IsDirty);
+            account["balance"] = 50;
+            await account.SaveAsync(true, query);
+            TestContext.Out.WriteLine($"balance: {account["balance"]}");
+        }
+
+        [Test]
+        public async Task SaveWithPointer() {
+            AVObject comment = new AVObject("Comment") {
+                { "content", "Hello, Comment" }
+            };
+
+            AVObject post = new AVObject("Post") {
+                { "name", "New Post" },
+                { "category", new AVObject("Category") {
+                    { "name", "new post category" }
+                } }
+            };
+            comment["post"] = post;
+
+            AVObject testPost = new AVObject("Post") {
+                { "name", "Test Post" },
+                { "category", new AVObject("Category") {
+                    { "name", "test post category" }
+                } }
+            };
+            comment["test_post"] = testPost;
+
+            await comment.SaveAsync();
+            TestContext.Out.WriteLine(post);
+            TestContext.Out.WriteLine(testPost);
+            TestContext.Out.WriteLine(comment);
+        }
+
+        [Test]
+        public async Task SaveBatch() {
+            List<AVObject> objList = new List<AVObject>();
+            for (int i = 0; i < 5; i++) {
+                AVObject obj = AVObject.Create("Foo");
+                obj["content"] = "batch object";
+                objList.Add(obj);
+            }
+            try {
+                await objList.SaveAllAsync();
+                objList.ForEach(obj => {
+                    Assert.NotNull(obj.ObjectId);
+                });
+            } catch (Exception e) {
+                TestContext.Out.WriteLine(e.Message);
+            }
+        }
+
+        [Test]
+        public async Task Fetch() {
+            AVObject obj = AVObject.CreateWithoutData("Todo", "5d5f6039d5de2b006cf29c8f");
+            await obj.FetchAsync();
+            Assert.NotNull(obj["title"]);
+            Assert.NotNull(obj["content"]);
+            TestContext.Out.WriteLine($"{obj["title"]}, {obj["content"]}");
+        }
+
+        [Test]
+        public async Task FetchWithKeys() {
+            AVObject obj = AVObject.CreateWithoutData("Post", "5d3abfa530863b0068e1b326");
+            await obj.FetchAsync(new List<string> { "pubUser" });
+            TestContext.Out.WriteLine($"{obj["pubUser"]}");
+        }
+
+        [Test]
+        public async Task FetchWithIncludes() {
+            AVObject obj = AVObject.CreateWithoutData("Post", "5d3abfa530863b0068e1b326");
+            await obj.FetchAsync(includes: new List<string> { "tag" });
+            AVObject tag = obj["tag"] as AVObject;
+            TestContext.Out.WriteLine($"{tag["name"]}");
+        }
+
+        [Test]
+        public async Task FetchAll() {
+            List<AVObject> objList = new List<AVObject> {
+                AVObject.CreateWithoutData("Tag", "5d64e5ebc05a8000730340ba"),
+                AVObject.CreateWithoutData("Tag", "5d64e5eb12215f0073db271c"),
+                AVObject.CreateWithoutData("Tag", "5d64e57f43e78c0068a14315")
+            };
+            await objList.FetchAllAsync();
+            objList.ForEach(obj => {
+                Assert.NotNull(obj.ObjectId);
+                TestContext.Out.WriteLine($"{obj.ObjectId}, {obj["name"]}");
+            });
+        }
+
+        [Test]
+        public async Task Delete() {
+            AVObject obj = AVObject.Create("Foo");
+            obj["content"] = "hello, world";
+            await obj.SaveAsync();
+            Assert.NotNull(obj);
+            await obj.DeleteAsync();
+        }
+
+        [Test]
+        public async Task DeleteWithCondition() {
+            AVObject account = new AVObject("Account") {
+                { "balance", 100 },
+            };
+            account.ACL = new AVACL {
+                PublicWriteAccess = true,
+                PublicReadAccess = true
+            };
+            await account.SaveAsync();
+            AVQuery<AVObject> condition = new AVQuery<AVObject>();
+            condition.WhereGreaterThan("balance", 10);
+            await account.DeleteAsync(condition);
+
+            account = new AVObject("Account") {
+                { "balance", 8 },
+            };
+            account.ACL = new AVACL {
+                PublicWriteAccess = true,
+                PublicReadAccess = true
+            };
+            await account.SaveAsync();
+            condition = new AVQuery<AVObject>();
+            condition.WhereGreaterThan("balance", 10);
+            try {
+                await account.DeleteAsync(condition);
+            } catch (AVException e) {
+                Assert.AreEqual(e.Code, AVException.ErrorCode.NoEffectOnUpdatingOrDeleting);
+            }
+        }
+
+        [Test]
+        public async Task DeleteAll() {
+            List<AVObject> objList = new List<AVObject>();
+            for (int i = 0; i < 5; i++) {
+                AVObject obj = AVObject.Create("Foo");
+                obj["content"] = "batch object";
+                objList.Add(obj);
+            }
+            await objList.SaveAllAsync();
+            await AVObject.DeleteAllAsync(objList);
         }
 
         [Test]

Storage/Storage/Internal/Object/Controller/AVObjectController.cs

@@ -74,12 +74,17 @@ namespace LeanCloud.Storage.Internal {
             return stateTasks;
         }
 
-        public async Task DeleteAsync(IObjectState state,
+        public async Task DeleteAsync(IObjectState state, AVQuery<AVObject> query, CancellationToken cancellationToken) {
-            CancellationToken cancellationToken) {
             var command = new AVCommand {
                 Path = $"classes/{state.ClassName}/{state.ObjectId}",
                 Method = HttpMethod.Delete
             };
+            if (query != null) {
+                Dictionary<string, object> where = new Dictionary<string, object> {
+                    { "where", query.BuildWhere() }
+                };
+                command.Path = $"{command.Path}?{AVClient.BuildQueryString(where)}";
+            }
             await AVPlugins.Instance.CommandRunner.RunCommandAsync<IDictionary<string, object>>(command, cancellationToken);
         }
 

Storage/Storage/Public/AVException.cs

@@ -258,7 +258,12 @@ namespace LeanCloud
             /// <summary>
             /// 手机号不合法
             /// </summary>
-            MobilePhoneInvalid = 253
+            MobilePhoneInvalid = 253,
+
+            /// <summary>
+            /// 按条件更新/删除失败
+            /// </summary>
+            NoEffectOnUpdatingOrDeleting = 305,
         }
 
         internal AVException(ErrorCode code, string message, Exception cause = null)

Storage/Storage/Public/AVObject.cs

@@ -790,11 +790,11 @@ string propertyName
         /// Deletes this object on the server.
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
-        public virtual async Task DeleteAsync(CancellationToken cancellationToken = default) {
+        public virtual async Task DeleteAsync(AVQuery<AVObject> query = null, CancellationToken cancellationToken = default) {
             if (ObjectId == null) {
                 return;
             }
-            await ObjectController.DeleteAsync(State, cancellationToken);
+            await ObjectController.DeleteAsync(State, query, cancellationToken);
             IsDirty = true;
         }