tests; fixed editById overloads

Luticate2.Utils/DataAccess/LuEfCrudDataAccess.cs

@@ -220,12 +220,6 @@ namespace Luticate2.Utils.DataAccess
                 list => returnFunc(list.FirstOrDefault()));
         }
 
-        public LuResult<string> EditSingleByIdGuid(long id, Action<TModel> update)
-        {
-            var func = GetIdFunc<string>();
-            return EditSingleById(id, update, func);
-        }
-
         public LuResult<long> EditSingleByIdId(long id, Action<TModel> update)
         {
             var func = GetIdFunc<long>();
@@ -249,11 +243,6 @@ namespace Luticate2.Utils.DataAccess
             return EditSingleById(id, update, GetIdFunc<string>());
         }
 
-        public LuResult<long> EditSingleByIdId(string id, Action<TModel> update)
-        {
-            return EditSingleById(id, update, GetIdFunc<long>());
-        }
-
         public LuResult<TDboRead> EditSingleByIdDbo(string id, Action<TModel> update)
         {
             return EditSingleById(id, update, read => read);
@@ -266,11 +255,6 @@ namespace Luticate2.Utils.DataAccess
                 model => EditModelFromTUpdate(update, model), list => returnFunc(list.FirstOrDefault()));
         }
 
-        public LuResult<string> EditSingleByIdGuid(long id, TDboUpdate update)
-        {
-            return EditSingleById(id, update, GetIdFunc<string>());
-        }
-
         public LuResult<long> EditSingleByIdId(long id, TDboUpdate update)
         {
             return EditSingleById(id, update, GetIdFunc<long>());
@@ -284,7 +268,7 @@ namespace Luticate2.Utils.DataAccess
 
         public LuResult<T> EditSingleById<T>(string id, TDboUpdate update, Func<TDboRead, T> returnFunc)
         {
-            return Edit(GetExpression(new KeyValuePair<string, object>("id", id)),
+            return Edit(GetExpression(new KeyValuePair<string, object>("id", new Guid(id))),
                 model => EditModelFromTUpdate(update, model), list => returnFunc(list.FirstOrDefault()));
         }
 
@@ -293,11 +277,6 @@ namespace Luticate2.Utils.DataAccess
             return EditSingleById(id, update, GetIdFunc<string>());
         }
 
-        public LuResult<long> EditSingleByIdId(string id, TDboUpdate update)
-        {
-            return EditSingleById(id, update, GetIdFunc<long>());
-        }
-
         public LuResult<TDboRead> EditSingleByIdDbo(string id, TDboUpdate update)
         {
             return EditSingleById(id, update, read => read);
@@ -349,12 +328,6 @@ namespace Luticate2.Utils.DataAccess
             return DeleteSingleById(id, func);
         }
 
-        public LuResult<long> DeleteSingleByIdId(string id)
-        {
-            var func = GetIdFunc<long>();
-            return DeleteSingleById(id, func);
-        }
-
         public LuResult<TDboRead> DeleteSingleByIdDbo(string id)
         {
             return DeleteSingleById(id, read => read);
@@ -367,12 +340,6 @@ namespace Luticate2.Utils.DataAccess
                 reads => returnFunc(reads.First()));
         }
 
-        public LuResult<string> DeleteSingleByGuid(long id)
-        {
-            var func = GetIdFunc<string>();
-            return DeleteSingleById(id, func);
-        }
-
         public LuResult<long> DeleteSingleByIdId(long id)
         {
             var func = GetIdFunc<long>();

Test/Utils/EfCrubDataAccess/LuEfUpdateDataAccessTest.cs

@@ -219,5 +219,645 @@ namespace Test.Utils.EfCrubDataAccess
                 Assert.Equal("42", e.SomeText);
             });
         }
+
+        [Fact]
+        public void TestEditSingle1()
+        {
+            Tests.TestRealDb(context =>
+            {
+                var dbos = new List<PkBigSerialAddDbo>
+                {
+                    new PkBigSerialAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "442"
+                    },
+                    new PkBigSerialAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "42"
+                    },
+                    new PkBigSerialAddDbo
+                    {
+                        SomeInt = 24,
+                        SomeText = "24"
+                    }
+                };
+                var service = new LuUtilsPkBigSerialDataAccess(context);
+                var res = service.AddId(dbos);
+                Assert.Equal(LuStatus.Success, res.Status);
+                var ids = res.Data.ToList();
+
+                var edit = service.EditSingleById(ids[0], guid => guid.some_int = -1, d => d);
+                Assert.Equal(LuStatus.Success, edit.Status);
+                Assert.Equal(-1, edit.Data.SomeInt);
+                Assert.Equal("442", edit.Data.SomeText);
+
+                var get = service.GetMultiple(guid => guid.some_text);
+
+                Assert.Equal(LuStatus.Success, get.Status);
+                Assert.Equal(3, get.Data.Count);
+                Assert.Equal(3, get.Data.Data.Count);
+
+                var dbo = get.Data.Data[0];
+                Assert.Equal(24, dbo.SomeInt);
+                Assert.Equal("24", dbo.SomeText);
+
+                dbo = get.Data.Data[1];
+                Assert.Equal(42, dbo.SomeInt);
+                Assert.Equal("42", dbo.SomeText);
+
+                dbo = get.Data.Data[2];
+                Assert.Equal(-1, dbo.SomeInt);
+                Assert.Equal("442", dbo.SomeText);
+            });
+        }
+
+        [Fact]
+        public void TestEditSingle2()
+        {
+            Tests.TestRealDb(context =>
+            {
+                var dbos = new List<PkBigSerialAddDbo>
+                {
+                    new PkBigSerialAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "442"
+                    },
+                    new PkBigSerialAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "42"
+                    },
+                    new PkBigSerialAddDbo
+                    {
+                        SomeInt = 24,
+                        SomeText = "24"
+                    }
+                };
+                var service = new LuUtilsPkBigSerialDataAccess(context);
+                var res = service.AddId(dbos);
+                Assert.Equal(LuStatus.Success, res.Status);
+                var ids = res.Data.ToList();
+
+                var edit = service.EditSingleByIdId(ids[0], guid => guid.some_int = -1);
+                Assert.Equal(LuStatus.Success, edit.Status);
+
+                var get = service.GetMultiple(guid => guid.some_text);
+
+                Assert.Equal(LuStatus.Success, get.Status);
+                Assert.Equal(3, get.Data.Count);
+                Assert.Equal(3, get.Data.Data.Count);
+
+                var dbo = get.Data.Data[0];
+                Assert.Equal(24, dbo.SomeInt);
+                Assert.Equal("24", dbo.SomeText);
+
+                dbo = get.Data.Data[1];
+                Assert.Equal(42, dbo.SomeInt);
+                Assert.Equal("42", dbo.SomeText);
+
+                dbo = get.Data.Data[2];
+                Assert.Equal(-1, dbo.SomeInt);
+                Assert.Equal("442", dbo.SomeText);
+            });
+        }
+
+        [Fact]
+        public void TestEditSingle3()
+        {
+            Tests.TestRealDb(context =>
+            {
+                var dbos = new List<PkBigSerialAddDbo>
+                {
+                    new PkBigSerialAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "442"
+                    },
+                    new PkBigSerialAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "42"
+                    },
+                    new PkBigSerialAddDbo
+                    {
+                        SomeInt = 24,
+                        SomeText = "24"
+                    }
+                };
+                var service = new LuUtilsPkBigSerialDataAccess(context);
+                var res = service.AddId(dbos);
+                Assert.Equal(LuStatus.Success, res.Status);
+                var ids = res.Data.ToList();
+
+                var edit = service.EditSingleByIdDbo(ids[0], guid => guid.some_int = -1);
+                Assert.Equal(LuStatus.Success, edit.Status);
+                Assert.Equal(-1, edit.Data.SomeInt);
+                Assert.Equal("442", edit.Data.SomeText);
+
+                var get = service.GetMultiple(guid => guid.some_text);
+
+                Assert.Equal(LuStatus.Success, get.Status);
+                Assert.Equal(3, get.Data.Count);
+                Assert.Equal(3, get.Data.Data.Count);
+
+                var dbo = get.Data.Data[0];
+                Assert.Equal(24, dbo.SomeInt);
+                Assert.Equal("24", dbo.SomeText);
+
+                dbo = get.Data.Data[1];
+                Assert.Equal(42, dbo.SomeInt);
+                Assert.Equal("42", dbo.SomeText);
+
+                dbo = get.Data.Data[2];
+                Assert.Equal(-1, dbo.SomeInt);
+                Assert.Equal("442", dbo.SomeText);
+            });
+        }
+
+        [Fact]
+        public void TestEditSingle4()
+        {
+            Tests.TestRealDb(context =>
+            {
+                var dbos = new List<PkGuidAddDbo>
+                {
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "442"
+                    },
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "42"
+                    },
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 24,
+                        SomeText = "24"
+                    }
+                };
+                var service = new LuUtilsPkGuidDataAccess(context);
+                var res = service.AddGuid(dbos);
+                Assert.Equal(LuStatus.Success, res.Status);
+                var ids = res.Data.ToList();
+
+                var edit = service.EditSingleById(ids[0], guid => guid.some_int = -1, d => d);
+                Assert.Equal(LuStatus.Success, edit.Status);
+                Assert.Equal(-1, edit.Data.SomeInt);
+                Assert.Equal("442", edit.Data.SomeText);
+
+                var get = service.GetMultiple(guid => guid.some_text);
+
+                Assert.Equal(LuStatus.Success, get.Status);
+                Assert.Equal(3, get.Data.Count);
+                Assert.Equal(3, get.Data.Data.Count);
+
+                var dbo = get.Data.Data[0];
+                Assert.Equal(24, dbo.SomeInt);
+                Assert.Equal("24", dbo.SomeText);
+
+                dbo = get.Data.Data[1];
+                Assert.Equal(42, dbo.SomeInt);
+                Assert.Equal("42", dbo.SomeText);
+
+                dbo = get.Data.Data[2];
+                Assert.Equal(-1, dbo.SomeInt);
+                Assert.Equal("442", dbo.SomeText);
+            });
+        }
+
+        [Fact]
+        public void TestEditSingle5()
+        {
+            Tests.TestRealDb(context =>
+            {
+                var dbos = new List<PkGuidAddDbo>
+                {
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "442"
+                    },
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "42"
+                    },
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 24,
+                        SomeText = "24"
+                    }
+                };
+                var service = new LuUtilsPkGuidDataAccess(context);
+                var res = service.AddGuid(dbos);
+                Assert.Equal(LuStatus.Success, res.Status);
+                var ids = res.Data.ToList();
+
+                var edit = service.EditSingleByIdGuid(ids[0], guid => guid.some_int = -1);
+                Assert.Equal(LuStatus.Success, edit.Status);
+
+                var get = service.GetMultiple(guid => guid.some_text);
+
+                Assert.Equal(LuStatus.Success, get.Status);
+                Assert.Equal(3, get.Data.Count);
+                Assert.Equal(3, get.Data.Data.Count);
+
+                var dbo = get.Data.Data[0];
+                Assert.Equal(24, dbo.SomeInt);
+                Assert.Equal("24", dbo.SomeText);
+
+                dbo = get.Data.Data[1];
+                Assert.Equal(42, dbo.SomeInt);
+                Assert.Equal("42", dbo.SomeText);
+
+                dbo = get.Data.Data[2];
+                Assert.Equal(-1, dbo.SomeInt);
+                Assert.Equal("442", dbo.SomeText);
+            });
+        }
+
+        [Fact]
+        public void TestEditSingle6()
+        {
+            Tests.TestRealDb(context =>
+            {
+                var dbos = new List<PkGuidAddDbo>
+                {
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "442"
+                    },
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "42"
+                    },
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 24,
+                        SomeText = "24"
+                    }
+                };
+                var service = new LuUtilsPkGuidDataAccess(context);
+                var res = service.AddGuid(dbos);
+                Assert.Equal(LuStatus.Success, res.Status);
+                var ids = res.Data.ToList();
+
+                var edit = service.EditSingleByIdDbo(ids[0], guid => guid.some_int = -1);
+                Assert.Equal(LuStatus.Success, edit.Status);
+                Assert.Equal(-1, edit.Data.SomeInt);
+                Assert.Equal("442", edit.Data.SomeText);
+
+                var get = service.GetMultiple(guid => guid.some_text);
+
+                Assert.Equal(LuStatus.Success, get.Status);
+                Assert.Equal(3, get.Data.Count);
+                Assert.Equal(3, get.Data.Data.Count);
+
+                var dbo = get.Data.Data[0];
+                Assert.Equal(24, dbo.SomeInt);
+                Assert.Equal("24", dbo.SomeText);
+
+                dbo = get.Data.Data[1];
+                Assert.Equal(42, dbo.SomeInt);
+                Assert.Equal("42", dbo.SomeText);
+
+                dbo = get.Data.Data[2];
+                Assert.Equal(-1, dbo.SomeInt);
+                Assert.Equal("442", dbo.SomeText);
+            });
+        }
+
+        [Fact]
+        public void TestEditSingle7()
+        {
+            Tests.TestRealDb(context =>
+            {
+                var dbos = new List<PkBigSerialAddDbo>
+                {
+                    new PkBigSerialAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "442"
+                    },
+                    new PkBigSerialAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "42"
+                    },
+                    new PkBigSerialAddDbo
+                    {
+                        SomeInt = 24,
+                        SomeText = "24"
+                    }
+                };
+                var service = new LuUtilsPkBigSerialDataAccess(context);
+                var res = service.AddId(dbos);
+                Assert.Equal(LuStatus.Success, res.Status);
+                var ids = res.Data.ToList();
+
+                dbos[0].SomeInt = -1;
+
+                var edit = service.EditSingleById(ids[0], dbos[0], d => d);
+                Assert.Equal(LuStatus.Success, edit.Status);
+                Assert.Equal(-1, edit.Data.SomeInt);
+                Assert.Equal("442", edit.Data.SomeText);
+
+                var get = service.GetMultiple(guid => guid.some_text);
+
+                Assert.Equal(LuStatus.Success, get.Status);
+                Assert.Equal(3, get.Data.Count);
+                Assert.Equal(3, get.Data.Data.Count);
+
+                var dbo = get.Data.Data[0];
+                Assert.Equal(24, dbo.SomeInt);
+                Assert.Equal("24", dbo.SomeText);
+
+                dbo = get.Data.Data[1];
+                Assert.Equal(42, dbo.SomeInt);
+                Assert.Equal("42", dbo.SomeText);
+
+                dbo = get.Data.Data[2];
+                Assert.Equal(-1, dbo.SomeInt);
+                Assert.Equal("442", dbo.SomeText);
+            });
+        }
+
+        [Fact]
+        public void TestEditSingle8()
+        {
+            Tests.TestRealDb(context =>
+            {
+                var dbos = new List<PkBigSerialAddDbo>
+                {
+                    new PkBigSerialAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "442"
+                    },
+                    new PkBigSerialAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "42"
+                    },
+                    new PkBigSerialAddDbo
+                    {
+                        SomeInt = 24,
+                        SomeText = "24"
+                    }
+                };
+                var service = new LuUtilsPkBigSerialDataAccess(context);
+                var res = service.AddId(dbos);
+                Assert.Equal(LuStatus.Success, res.Status);
+                var ids = res.Data.ToList();
+
+                dbos[0].SomeInt = -1;
+
+                var edit = service.EditSingleByIdId(ids[0], dbos[0]);
+                Assert.Equal(LuStatus.Success, edit.Status);
+
+                var get = service.GetMultiple(guid => guid.some_text);
+
+                Assert.Equal(LuStatus.Success, get.Status);
+                Assert.Equal(3, get.Data.Count);
+                Assert.Equal(3, get.Data.Data.Count);
+
+                var dbo = get.Data.Data[0];
+                Assert.Equal(24, dbo.SomeInt);
+                Assert.Equal("24", dbo.SomeText);
+
+                dbo = get.Data.Data[1];
+                Assert.Equal(42, dbo.SomeInt);
+                Assert.Equal("42", dbo.SomeText);
+
+                dbo = get.Data.Data[2];
+                Assert.Equal(-1, dbo.SomeInt);
+                Assert.Equal("442", dbo.SomeText);
+            });
+        }
+
+        [Fact]
+        public void TestEditSingle9()
+        {
+            Tests.TestRealDb(context =>
+            {
+                var dbos = new List<PkBigSerialAddDbo>
+                {
+                    new PkBigSerialAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "442"
+                    },
+                    new PkBigSerialAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "42"
+                    },
+                    new PkBigSerialAddDbo
+                    {
+                        SomeInt = 24,
+                        SomeText = "24"
+                    }
+                };
+                var service = new LuUtilsPkBigSerialDataAccess(context);
+                var res = service.AddId(dbos);
+                Assert.Equal(LuStatus.Success, res.Status);
+                var ids = res.Data.ToList();
+
+                dbos[0].SomeInt = -1;
+
+                var edit = service.EditSingleByIdDbo(ids[0], dbos[0]);
+                Assert.Equal(LuStatus.Success, edit.Status);
+                Assert.Equal(-1, edit.Data.SomeInt);
+                Assert.Equal("442", edit.Data.SomeText);
+
+                var get = service.GetMultiple(guid => guid.some_text);
+
+                Assert.Equal(LuStatus.Success, get.Status);
+                Assert.Equal(3, get.Data.Count);
+                Assert.Equal(3, get.Data.Data.Count);
+
+                var dbo = get.Data.Data[0];
+                Assert.Equal(24, dbo.SomeInt);
+                Assert.Equal("24", dbo.SomeText);
+
+                dbo = get.Data.Data[1];
+                Assert.Equal(42, dbo.SomeInt);
+                Assert.Equal("42", dbo.SomeText);
+
+                dbo = get.Data.Data[2];
+                Assert.Equal(-1, dbo.SomeInt);
+                Assert.Equal("442", dbo.SomeText);
+            });
+        }
+
+        [Fact]
+        public void TestEditSingle10()
+        {
+            Tests.TestRealDb(context =>
+            {
+                var dbos = new List<PkGuidAddDbo>
+                {
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "442"
+                    },
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "42"
+                    },
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 24,
+                        SomeText = "24"
+                    }
+                };
+                var service = new LuUtilsPkGuidDataAccess(context);
+                var res = service.AddGuid(dbos);
+                Assert.Equal(LuStatus.Success, res.Status);
+                var ids = res.Data.ToList();
+
+                dbos[0].SomeInt = -1;
+
+                var edit = service.EditSingleById(ids[0], dbos[0], d => d);
+                Assert.Equal(LuStatus.Success, edit.Status);
+                Assert.Equal(-1, edit.Data.SomeInt);
+                Assert.Equal("442", edit.Data.SomeText);
+
+                var get = service.GetMultiple(guid => guid.some_text);
+
+                Assert.Equal(LuStatus.Success, get.Status);
+                Assert.Equal(3, get.Data.Count);
+                Assert.Equal(3, get.Data.Data.Count);
+
+                var dbo = get.Data.Data[0];
+                Assert.Equal(24, dbo.SomeInt);
+                Assert.Equal("24", dbo.SomeText);
+
+                dbo = get.Data.Data[1];
+                Assert.Equal(42, dbo.SomeInt);
+                Assert.Equal("42", dbo.SomeText);
+
+                dbo = get.Data.Data[2];
+                Assert.Equal(-1, dbo.SomeInt);
+                Assert.Equal("442", dbo.SomeText);
+            });
+        }
+
+        [Fact]
+        public void TestEditSingle11()
+        {
+            Tests.TestRealDb(context =>
+            {
+                var dbos = new List<PkGuidAddDbo>
+                {
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "442"
+                    },
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "42"
+                    },
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 24,
+                        SomeText = "24"
+                    }
+                };
+                var service = new LuUtilsPkGuidDataAccess(context);
+                var res = service.AddGuid(dbos);
+                Assert.Equal(LuStatus.Success, res.Status);
+                var ids = res.Data.ToList();
+
+                dbos[0].SomeInt = -1;
+
+                var edit = service.EditSingleByIdGuid(ids[0], dbos[0]);
+                Assert.Equal(LuStatus.Success, edit.Status);
+
+                var get = service.GetMultiple(guid => guid.some_text);
+
+                Assert.Equal(LuStatus.Success, get.Status);
+                Assert.Equal(3, get.Data.Count);
+                Assert.Equal(3, get.Data.Data.Count);
+
+                var dbo = get.Data.Data[0];
+                Assert.Equal(24, dbo.SomeInt);
+                Assert.Equal("24", dbo.SomeText);
+
+                dbo = get.Data.Data[1];
+                Assert.Equal(42, dbo.SomeInt);
+                Assert.Equal("42", dbo.SomeText);
+
+                dbo = get.Data.Data[2];
+                Assert.Equal(-1, dbo.SomeInt);
+                Assert.Equal("442", dbo.SomeText);
+            });
+        }
+
+        [Fact]
+        public void TestEditSingle12()
+        {
+            Tests.TestRealDb(context =>
+            {
+                var dbos = new List<PkGuidAddDbo>
+                {
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "442"
+                    },
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "42"
+                    },
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 24,
+                        SomeText = "24"
+                    }
+                };
+                var service = new LuUtilsPkGuidDataAccess(context);
+                var res = service.AddGuid(dbos);
+                Assert.Equal(LuStatus.Success, res.Status);
+                var ids = res.Data.ToList();
+
+                dbos[0].SomeInt = -1;
+
+                var edit = service.EditSingleByIdDbo(ids[0], dbos[0]);
+                Assert.Equal(LuStatus.Success, edit.Status);
+                Assert.Equal(-1, edit.Data.SomeInt);
+                Assert.Equal("442", edit.Data.SomeText);
+
+                var get = service.GetMultiple(guid => guid.some_text);
+
+                Assert.Equal(LuStatus.Success, get.Status);
+                Assert.Equal(3, get.Data.Count);
+                Assert.Equal(3, get.Data.Data.Count);
+
+                var dbo = get.Data.Data[0];
+                Assert.Equal(24, dbo.SomeInt);
+                Assert.Equal("24", dbo.SomeText);
+
+                dbo = get.Data.Data[1];
+                Assert.Equal(42, dbo.SomeInt);
+                Assert.Equal("42", dbo.SomeText);
+
+                dbo = get.Data.Data[2];
+                Assert.Equal(-1, dbo.SomeInt);
+                Assert.Equal("442", dbo.SomeText);
+            });
+        }
     }
 }