Update mongodb

Src/Asp.NetCore2/MongoDb.Ado.data/Common/MongoDbMethodUtils.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MongoDb.Ado.data
+{
+    public class MongoDbMethodUtils
+    { 
+        public void ValidateOperation(string operation)
+        {
+            if (ExecuteHandlerFactory.Items.TryGetValue(operation, out var handler))
+            {
+                return ;
+            }
+            if (DbDataReaderFactory.Items.TryGetValue(operation, out var handlerQuery)) 
+            {
+                return;
+            }
+            throw new InvalidOperationException($"Operation '{operation}' is not supported.");
+        }
+    }
+}

Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteDbDataReaderItems/DbDataReaderFactory.cs

@@ -12,24 +12,21 @@ namespace MongoDb.Ado.data
 {
     public class DbDataReaderFactory
     {
+        public readonly static Dictionary<string, IQueryHandler> Items = new Dictionary<string, IQueryHandler>(StringComparer.OrdinalIgnoreCase)
+            {
+                { "find", new QueryFindHandler() },
+                { "aggregate", new QueryFindHandler() },
+            };
         public DbDataReader Handle(string operation, IMongoCollection<BsonDocument> collection, string json)
         {
             var doc = MongoDB.Bson.Serialization.BsonSerializer.Deserialize<BsonValue>(json);
-            IQueryHandler queryHandler = null;
+            DbDataReaderFactory.Items.TryGetValue(operation, out var handler);
-            if (operation == "find")
+            if (handler==null)
             {
-                queryHandler = new QueryFindHandler();
+                ExecuteHandlerFactory.Handler(operation, json, collection);
-            }
-            else if (operation == "aggregate")
-            {
-                queryHandler = new QueryAggregateHandler();
-            }
-            else 
-            {
-                ExecuteHandlerFactory.Handler(operation,json, collection);
                 return new DataTable().CreateDataReader();
             }
-            return queryHandler.Handler(collection, doc);
+            return handler.Handler(collection, doc);
         }
 
     }

Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteDbDataReaderItemsAsync/DbDataReaderFactory.cs

@@ -13,24 +13,21 @@ namespace MongoDb.Ado.data
 {
     public class DbDataReaderFactoryAsync
     {
-        public async Task<DbDataReader> HandleAsync(string operation, IMongoCollection<BsonDocument> collection, string json)
+        public readonly static Dictionary<string, IQueryHandlerAsync> Items = new Dictionary<string, IQueryHandlerAsync>(StringComparer.OrdinalIgnoreCase)
+            {
+                { "find", new QueryFindHandlerAsync() },
+                { "aggregate", new QueryFindHandlerAsync() },
+            };
+        public async Task<DbDataReader> Handle(string operation, IMongoCollection<BsonDocument> collection, string json)
         {
             var doc = MongoDB.Bson.Serialization.BsonSerializer.Deserialize<BsonValue>(json);
-            IQueryHandlerAsync queryHandler = null;
+            DbDataReaderFactoryAsync.Items.TryGetValue(operation, out var handler);
-            if (operation == "find")
+            if (handler == null)
             {
-                queryHandler = new QueryFindHandlerAsync();
+                await  ExecuteHandlerFactoryAsync.HandlerAsync(operation, json, collection);
-            }
-            else if (operation == "aggregate")
-            {
-                queryHandler = new QueryAggregateHandlerAsync();
-            }
-            else 
-            {
-                await ExecuteHandlerFactoryAsync.HandlerAsync(operation,json, collection);
                 return new DataTable().CreateDataReader();
             }
-            return await queryHandler.HandlerAsync(collection, doc);
+            return await handler.HandlerAsync(collection, doc);
         }
 
     }

Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItems/DeleteHandler.cs

@@ -8,6 +8,7 @@ namespace MongoDb.Ado.data
 {
     public class DeleteHandler : IMongoOperationHandler
     {
+        public string operation { get; set; }
         public int Handle(IMongoCollection<BsonDocument> collection, string json)
         {
             var doc = BsonDocument.Parse(json);

Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItems/DeleteManyHandler.cs

@@ -9,6 +9,7 @@ namespace MongoDb.Ado.data
 {
     public class DeleteManyHandler : IMongoOperationHandler
     {
+        public string operation { get; set; }
         public int Handle(IMongoCollection<BsonDocument> collection, string json)
         {
             var documents = ParseJsonArray(json);

Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItems/ExecuteHandlerFactory.cs

@@ -27,7 +27,7 @@ namespace MongoDb.Ado.data
 
             if (!handlers.TryGetValue(operation, out var handler))
                 throw new NotSupportedException($"不支持的操作类型: {operation}");
-
+            handler.operation = operation;
             return handler.Handle(collection, json);
         }
 

Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItems/IMongoOperationHandler.cs

@@ -8,6 +8,7 @@ namespace MongoDb.Ado.data
 {
     public interface IMongoOperationHandler
     {
+        string operation { get; set; }
         int Handle(IMongoCollection<BsonDocument> collection, string json);
     }
 }

Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItems/InsertHandler.cs

@@ -8,6 +8,7 @@ namespace MongoDb.Ado.data
 {
     public class InsertHandler : IMongoOperationHandler
     {
+        public string operation { get; set; }
         public int Handle(IMongoCollection<BsonDocument> collection, string json)
         {
             var doc = BsonDocument.Parse(json);

Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItems/InsertManyHandler.cs

@@ -9,6 +9,7 @@ namespace MongoDb.Ado.data
 {
     public class InsertManyHandler : IMongoOperationHandler
     {
+        public string operation { get; set; }
         public int Handle(IMongoCollection<BsonDocument> collection, string json)
         {
             var documents = ParseJsonArray(json);

Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItems/NonFindHandler.cs

@@ -8,10 +8,16 @@ namespace MongoDb.Ado.data
 {
     public class NonFindHandler : IMongoOperationHandler
     {
+        public string operation { get; set; }
         public int Handle(IMongoCollection<BsonDocument> collection, string json)
         {
-            var filter = string.IsNullOrWhiteSpace(json) ? FilterDefinition<BsonDocument>.Empty : BsonDocument.Parse(json);
+            using (var dr =   new DbDataReaderFactory().Handle(operation, collection, json))
-            var result = collection.Find(filter).FirstOrDefault();
+            {
+                if (dr.Read())
+                {
+
+                }
+            }
             return 0; // 查询不改变数据库
         }
     }

Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItems/UpdateHandler.cs

@@ -8,6 +8,7 @@ namespace MongoDb.Ado.data
 {
     public class UpdateHandler : IMongoOperationHandler
     {
+        public string operation { get; set; }
         public int Handle(IMongoCollection<BsonDocument> collection, string json)
         {
             var doc = BsonDocument.Parse(json);

Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItems/UpdateManyHandler.cs

@@ -9,6 +9,7 @@ namespace MongoDb.Ado.data
 {
     public class UpdateManyHandler : IMongoOperationHandler
     {
+        public string operation { get; set; }
         public int Handle(IMongoCollection<BsonDocument> collection, string json)
         {
             var documents = ParseJsonArray(json);

Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItemsAsync/DeleteHandlerAsync.cs

@@ -9,6 +9,7 @@ namespace MongoDb.Ado.data
 {
     public class DeleteHandlerAsync : IMongoOperationHandlerAsync
     {
+        public string operation { get; set; }
         public async Task<int> HandleAsync(IMongoCollection<BsonDocument> collection, string json)
         {
             var doc = BsonDocument.Parse(json);

Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItemsAsync/DeleteManyHandlerAsync.cs

@@ -10,6 +10,7 @@ namespace MongoDb.Ado.data
 {
     public class DeleteManyHandlerAsync : IMongoOperationHandlerAsync
     {
+        public string operation { get; set; }
         public async Task<int> HandleAsync(IMongoCollection<BsonDocument> collection, string json)
         {
             var documents = ParseJsonArray(json);

Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItemsAsync/ExecuteHandlerFactory.cs

@@ -28,7 +28,7 @@ namespace MongoDb.Ado.data
 
             if (!handlers.TryGetValue(operation, out var handler))
                 throw new NotSupportedException($"不支持的操作类型: {operation}");
-
+            handler.operation = operation;
             return handler.HandleAsync(collection, json);
         }
 

Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItemsAsync/IMongoOperationHandler.cs

@@ -8,7 +8,8 @@ using System.Threading.Tasks;
 namespace MongoDb.Ado.data 
 {
     public interface IMongoOperationHandlerAsync
-    {
+    { 
+        string operation { get; set; }
         Task<int> HandleAsync(IMongoCollection<BsonDocument> collection, string json);
     }
 }

Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItemsAsync/InsertHandlerAsync.cs

@@ -9,6 +9,7 @@ namespace MongoDb.Ado.data
 {
     public class InsertHandlerAsync : IMongoOperationHandlerAsync
     {
+        public string operation { get; set; }
         public async Task<int> HandleAsync(IMongoCollection<BsonDocument> collection, string json)
         {
             var doc = BsonDocument.Parse(json);

Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItemsAsync/InsertManyHandlerAsync.cs

@@ -10,6 +10,7 @@ namespace MongoDb.Ado.data
 {
     public class InsertManyHandlerAsync : IMongoOperationHandlerAsync
     {
+        public string operation { get; set; }
         public async Task<int> HandleAsync(IMongoCollection<BsonDocument> collection, string json)
         {
             var documents = ParseJsonArray(json);

Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItemsAsync/NonFindHandlerAsync.cs

@@ -9,9 +9,11 @@ namespace MongoDb.Ado.data
 {
     public class NonFindHandlerAsync : IMongoOperationHandlerAsync
     {
+        public string operation { get; set; }
+
         public async Task<int> HandleAsync(IMongoCollection<BsonDocument> collection, string json)
         {
-            using (var dr = await new DbDataReaderFactoryAsync().HandleAsync("", collection, json))
+            using (var dr = await new DbDataReaderFactoryAsync().HandleAsync(operation, collection, json))
             {
                 if (dr.Read())
                 {

Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItemsAsync/UpdateHandler.cs

@@ -9,6 +9,7 @@ namespace MongoDb.Ado.data
 {
     public class UpdateHandlerAsync : IMongoOperationHandlerAsync
     {
+        public string operation { get; set; }
         public async Task<int> HandleAsync(IMongoCollection<BsonDocument> collection, string json)
         {
             var doc = BsonDocument.Parse(json);

Src/Asp.NetCore2/MongoDb.Ado.data/ExecuteNonQueryItemsAsync/UpdateManyHandler.cs

@@ -10,6 +10,7 @@ namespace MongoDb.Ado.data
 {
     public class UpdateManyHandlerAsync : IMongoOperationHandlerAsync
     {
+        public string operation { get; set; }
         public async  Task<int> HandleAsync(IMongoCollection<BsonDocument> collection, string json)
         {
             var documents = ParseJsonArray(json);