fix mapping bug

Author: DOMAIN\ext.patryk.bujalla

PortaCapena.OdooJsonRpcClient.Example/OdooClientTests.cs

@@ -79,10 +79,10 @@ public async Task Get_product_by_Id_test()
         {
             var odooClient = new OdooClient(TestConfig);
 
-            var query = OdooQuery<ProductProductOdooDto>.Create()
+            var query = OdooQuery<ProductProductOdooModel>.Create()
                 .Where(x => x.Id, OdooOperator.EqualsTo, 303);
 
-            var products = await odooClient.GetAsync<ProductProductOdooDto>(query);
+            var products = await odooClient.GetAsync<ProductProductOdooModel>(query);
 
             products.Error.Should().BeNull();
             products.Value.Should().NotBeNull();
@@ -95,10 +95,10 @@ public async Task Get_product_by_Id_test()
         public async Task Shoud_get_products_using_query_take()
         {
             var odooClient = new OdooClient(TestConfig);
-            var query = OdooQuery<ProductProductOdooDto>.Create()
+            var query = OdooQuery<ProductProductOdooModel>.Create()
                 .Take(10);
 
-            var products = await odooClient.GetAsync<ProductProductOdooDto>(query);
+            var products = await odooClient.GetAsync<ProductProductOdooModel>(query);
 
             products.Error.Should().BeNull();
             products.Value.Should().NotBeNull();
@@ -110,11 +110,11 @@ public async Task Shoud_get_products_using_query_take()
         public async Task Shoud_get_products_using_query_skip()
         {
             var odooClient = new OdooClient(TestConfig);
-            var query = OdooQuery<ProductProductOdooDto>.Create().Skip(5);
+            var query = OdooQuery<ProductProductOdooModel>.Create().Skip(5);
 
-            var products = await odooClient.GetAsync<ProductProductOdooDto>(query);
+            var products = await odooClient.GetAsync<ProductProductOdooModel>(query);
 
-            var allProducts = await odooClient.GetAsync<ProductProductOdooDto>();
+            var allProducts = await odooClient.GetAsync<ProductProductOdooModel>();
 
             products.Error.Should().BeNull();
             products.Value.Should().NotBeNull();
@@ -130,10 +130,10 @@ public async Task Shoud_get_products_using_query_skip()
         public async Task Get_products_with_order_query()
         {
             var odooClient = new OdooClient(TestConfig);
-            var query = OdooQuery<ProductProductOdooDto>.Create()
+            var query = OdooQuery<ProductProductOdooModel>.Create()
                 .OrderBy(x => x.Id);
 
-            var products = await odooClient.GetAsync<ProductProductOdooDto>(query);
+            var products = await odooClient.GetAsync<ProductProductOdooModel>(query);
 
             products.Error.Should().BeNull();
             products.Value.Should().NotBeNull();
@@ -149,10 +149,10 @@ public async Task Get_products_with_order_query()
         public async Task Get_products_with_order_desc_query()
         {
             var odooClient = new OdooClient(TestConfig);
-            var query = OdooQuery<ProductProductOdooDto>.Create()
+            var query = OdooQuery<ProductProductOdooModel>.Create()
                 .OrderByDescending(x => x.Id);
 
-            var products = await odooClient.GetAsync<ProductProductOdooDto>(query);
+            var products = await odooClient.GetAsync<ProductProductOdooModel>(query);
 
             products.Error.Should().BeNull();
             products.Value.Should().NotBeNull();
@@ -171,7 +171,7 @@ public async Task Should_get_products_with_selected_properties_using_query()
         {
             var odooClient = new OdooClient(TestConfig);
 
-            var filters = OdooQuery<ProductProductOdooDto>.Create()
+            var filters = OdooQuery<ProductProductOdooModel>.Create()
                 .Select(x => new
                 {
                     x.Name,
@@ -181,7 +181,7 @@ public async Task Should_get_products_with_selected_properties_using_query()
                 .Where(x => x.Name, OdooOperator.EqualsTo, "Bioboxen 610l")
                 .Where(x => x.WriteDate, OdooOperator.GreaterThanOrEqualTo, new DateTime(2020, 12, 2));
 
-            var products = await odooClient.GetAsync<ProductProductOdooDto>(filters);
+            var products = await odooClient.GetAsync<ProductProductOdooModel>(filters);
 
             products.Error.Should().BeNull();
             products.Value.Should().NotBeNull();
@@ -274,7 +274,6 @@ public async Task Can_create_product()
                 Name = "Prod test Kg",
                 UomId = 3,
                 UomPoId = 3,
-                InvoicePolicy = InvoicingPolicyOdooEnum.DeliveredQuantities
             };
 
             var products = await odooClient.CreateAsync(model);
@@ -294,17 +293,16 @@ public async Task Can_create_update_delete_product()
                 Name = "Prod test Kg",
                 UomId = 3,
                 UomPoId = 3,
-                InvoicePolicy = InvoicingPolicyOdooEnum.DeliveredQuantities
             };
 
             var createResult = await odooClient.CreateAsync(model);
             createResult.Succeed.Should().BeTrue();
             var createdProductId = createResult.Value;
 
-            var query = OdooQuery<ProductProductOdooDto>.Create()
+            var query = OdooQuery<ProductProductOdooModel>.Create()
                 .Where(x => x.Id, OdooOperator.EqualsTo, createdProductId);
 
-            var products = await odooClient.GetAsync<ProductProductOdooDto>(query);
+            var products = await odooClient.GetAsync<ProductProductOdooModel>(query);
             products.Succeed.Should().BeTrue();
             products.Value.Length.Should().Be(1);
             products.Value.First().Name.Should().Be(model.Name);
@@ -314,10 +312,10 @@ public async Task Can_create_update_delete_product()
             var updateProductResult = await odooClient.UpdateAsync(model, createdProductId);
             updateProductResult.Succeed.Should().BeTrue();
 
-            var query2 = OdooQuery<ProductProductOdooDto>.Create()
+            var query2 = OdooQuery<ProductProductOdooModel>.Create()
                 .Where(x => x.Id, OdooOperator.EqualsTo, createdProductId);
 
-            var products2 = await odooClient.GetAsync<ProductProductOdooDto>(query2);
+            var products2 = await odooClient.GetAsync<ProductProductOdooModel>(query2);
             products2.Succeed.Should().BeTrue();
             products2.Value.Length.Should().Be(1);
             products2.Value.First().Name.Should().Be(model.Name);
@@ -334,17 +332,17 @@ public async Task Can_create_product_from_dictionary_model()
         {
             var odooClient = new OdooClient(TestConfig);
 
-            var dictModel = OdooDictionaryModel.Create(() => new ProductProductOdooDto
+            var dictModel = OdooDictionaryModel.Create(() => new ProductProductOdooModel
             {
                 Name = "test OdooCreateDictionary",
             });
 
-            var dictModel2 = OdooDictionaryModel.Create<ProductProductOdooDto>(x => x.CombinationIndices, "create test");
+            var dictModel2 = OdooDictionaryModel.Create<ProductProductOdooModel>(x => x.CombinationIndices, "create test");
 
-            var dictModel3 = OdooDictionaryModel.Create<ProductProductOdooDto>(x => x.InvoicePolicy, InvoicingPolicyOdooEnum.DeliveredQuantities);
+            var dictModel3 = OdooDictionaryModel.Create<ProductProductOdooModel>(x => x.InvoicePolicy, InvoicingPolicyProductProductOdooEnum.DeliveredQuantities);
 
-            dictModel.Add<ProductProductOdooDto>(x => x.CombinationIndices, "sadasd");
-            dictModel.Add<ProductProductOdooDto>(x => x.InvoicePolicy, InvoicingPolicyOdooEnum.DeliveredQuantities);
+            dictModel.Add<ProductProductOdooModel>(x => x.CombinationIndices, "sadasd");
+            dictModel.Add<ProductProductOdooModel>(x => x.InvoicePolicy, InvoicingPolicyProductProductOdooEnum.DeliveredQuantities);
 
             var createResult = await odooClient.CreateAsync(dictModel);
             createResult.Succeed.Should().BeTrue();
@@ -372,9 +370,9 @@ public async Task Can_create_product_and_delete_using_object()
             createResult.Succeed.Should().BeTrue();
             var createdProductId = createResult.Value;
 
-            var query = OdooQuery<ProductProductOdooDto>.Create().ById(createdProductId);
+            var query = OdooQuery<ProductProductOdooModel>.Create().ById(createdProductId);
 
-            var product = await odooClient.GetAsync<ProductProductOdooDto>(query);
+            var product = await odooClient.GetAsync<ProductProductOdooModel>(query);
             product.Succeed.Should().BeTrue();
             product.Value.First().Name.Should().Be(model.Name);
 
@@ -418,8 +416,8 @@ public async Task Can_create_sale_order()
             partnerResult.Succeed.Should().BeTrue();
             var partner = partnerResult.Value.First();
 
-            var productQuery = OdooQuery<ProductProductOdooDto>.Create().ById(41);
-            var productsResult = await odooClient.GetAsync<ProductProductOdooDto>(productQuery);
+            var productQuery = OdooQuery<ProductProductOdooModel>.Create().ById(41);
+            var productsResult = await odooClient.GetAsync<ProductProductOdooModel>(productQuery);
             productsResult.Succeed.Should().BeTrue();
             var product = productsResult.Value.First();
 
@@ -504,9 +502,50 @@ public async Task Can_create_purchase_order()
             //createResult.Succeed.Should().BeTrue();
         }
 
+       // [Fact(Skip = "Test for working on Odoo")]
+          [Fact]
+        public async Task Can_create_update_and_delete_product()
+        {
+            var odooClient = new OdooClient(TestConfig);
 
-        #endregion
+            var model = OdooDictionaryModel.Create(() => new ProductProductOdooModel
+            {
+                Name = "test name",
+                UomId = 3,
+                UomPoId = 3,
+                CompanyId = 1
+            });
 
+            var createResult = await odooClient.CreateAsync(model);
+
+            createResult.Error.Should().BeNull();
+            createResult.Succeed.Should().BeTrue();
+
+            var query = OdooQuery<ProductProductOdooModel>.Create()
+                .ById(createResult.Value);
+
+            var products = await odooClient.GetAsync<ProductProductOdooModel>(query);
+            products.Succeed.Should().BeTrue();
+            products.Value.First().CompanyId.Should().Be(1);
+
+            var dict = OdooDictionaryModel.Create(() => new ProductProductOdooModel
+            {
+                CompanyId = null
+            });
+
+            var updateResult = await odooClient.UpdateAsync(dict, createResult.Value);
+
+            updateResult.Succeed.Should().BeTrue();
+
+            var products2 = await odooClient.GetAsync<ProductProductOdooModel>(query);
+            products2.Succeed.Should().BeTrue();
+            products2.Value.First().CompanyId.Should().BeNull();
+
+            var deleteResult = await odooClient.DeleteAsync(products2.Value.First());
+            deleteResult.Succeed.Should().BeTrue();
+        }
+
+        #endregion
 
         [Fact(Skip = "Test for working on Odoo")]
         //[Fact]

PortaCapena.OdooJsonRpcClient.Example/OdooRepositoryTests.cs

@@ -13,7 +13,7 @@ public class OdooRepositoryTests : RequestTestBase
         [Fact]
         public async Task Can_get_all_products()
         {
-            var repository = new OdooRepository<ProductProductOdooDto>(TestConfig);
+            var repository = new OdooRepository<ProductProductOdooModel>(TestConfig);
             var products = await repository.Query().ToListAsync();
 
             products.Error.Should().BeNull();
@@ -25,7 +25,7 @@ public async Task Can_get_all_products()
         [Fact]
         public async Task Can_get_product_by_id()
         {
-            var repository = new OdooRepository<ProductProductOdooDto>(TestConfig);
+            var repository = new OdooRepository<ProductProductOdooModel>(TestConfig);
             var products = await repository.Query().ById(282).ToListAsync();
 
             products.Error.Should().BeNull();
@@ -36,7 +36,7 @@ public async Task Can_get_product_by_id()
         [Fact]
         public async Task Can_get_product_with_deep_where()
         {
-            var repository = new OdooRepository<ProductProductOdooDto>(TestConfig);
+            var repository = new OdooRepository<ProductProductOdooModel>(TestConfig);
 
             var products = await repository.Query()
                  .Where<ResCurrencyOdooModel>(x => x.CurrencyId, z => z.Name, OdooOperator.EqualsTo, "Euros")
@@ -51,7 +51,7 @@ public async Task Can_get_product_with_deep_where()
         [Fact]
         public async Task Can_get_product_with_deep_secound_level_where()
         {
-            var repository = new OdooRepository<ProductProductOdooDto>(TestConfig);
+            var repository = new OdooRepository<ProductProductOdooModel>(TestConfig);
 
             var products = await repository.Query()
                 .Where<AccountAccountOdooModel, AccountAccountTypeOdooModel>(x => x.PropertyAccountIncomeId, x => x.UserTypeId, x => x.Type, OdooOperator.EqualsTo, TypeAccountAccountTypeOdooEnum.Regular)
@@ -66,7 +66,7 @@ public async Task Can_get_product_with_deep_secound_level_where()
         [Fact]
         public async Task Can_get_products_with_where_and_select()
         {
-            var repository = new OdooRepository<ProductProductOdooDto>(TestConfig);
+            var repository = new OdooRepository<ProductProductOdooModel>(TestConfig);
             var products = await repository.Query()
                 .ById(66)
                 .Select(x => new { x.Name })
@@ -95,7 +95,7 @@ public async Task Can_get_all_OdooVoucher()
         [Fact]
         public async Task Can_get_product_with_selected_language_uning_query()
         {
-            var repository = new OdooRepository<ProductProductOdooDto>(TestConfig);
+            var repository = new OdooRepository<ProductProductOdooModel>(TestConfig);
 
             var context = new OdooContext
             {
@@ -126,7 +126,7 @@ public async Task Can_get_product_with_selected_language_uning_query()
         public async Task Can_get_product_with_selected_language_using_repository_init()
         {
             var confing = new OdooConfig(TestConfig.ApiUrl, TestConfig.DbName, TestConfig.UserName, TestConfig.Password, "nl_BE");
-            var repository = new OdooRepository<ProductProductOdooDto>(confing);
+            var repository = new OdooRepository<ProductProductOdooModel>(confing);
 
             var product = await repository.Query()
                 .ById(282)
@@ -169,7 +169,7 @@ public async Task Can_get_product_with_selected_language_using_repository_init()
         [Fact]
         public async Task Can_get_product_with_selected_language_using_repository_prop()
         {
-            var repository = new OdooRepository<ProductProductOdooDto>(TestConfig);
+            var repository = new OdooRepository<ProductProductOdooModel>(TestConfig);
             repository.Config.Context.Language = "nl_BE";
 
             var product = await repository.Query()

PortaCapena.OdooJsonRpcClient.Shared/Models/Create/OdooCreateProduct.cs

@@ -16,7 +16,5 @@ public class OdooCreateProduct : IOdooCreateModel
         [JsonProperty("uom_po_id")]
         public int UomPoId { get; set; }
 
-        [JsonProperty("invoice_policy")]
-        public InvoicingPolicyOdooEnum? InvoicePolicy { get; set; }
     }
 }