Merge pull request #113 from progaudi/fix/sample

Use new tarantool library in sample

Author: roman-kozachenko

samples/docker-compose/dotnet/Controllers/HomeController.cs

@@ -40,15 +40,15 @@ private async Task<Tuple<ISpace, IIndex, IIndex>> Initialize()
 
         public async Task<ViewResult> Index()
         {
-            var allDogs = await _primaryIndex.Select<TarantoolTuple<long>, TarantoolTuple<long, string, long, MsgPackToken>>(TarantoolTuple.Create(-1L), new SelectOptions { Iterator = Iterator.All });
-            var seniorDogs = await _secondaryIndex.Select<TarantoolTuple<long>, TarantoolTuple<long, string, long, MsgPackToken>>(TarantoolTuple.Create(5L), new SelectOptions { Iterator = Iterator.Ge });
-            var juniorDogs = await _secondaryIndex.Select<TarantoolTuple<long>, TarantoolTuple<long, string, long, MsgPackToken>>(TarantoolTuple.Create(5L), new SelectOptions { Iterator = Iterator.Le });
+            var allDogs = await _primaryIndex.Select<TarantoolTuple<long>, Dog>(TarantoolTuple.Create(-1L), new SelectOptions { Iterator = Iterator.All });
+            var seniorDogs = await _secondaryIndex.Select<TarantoolTuple<long>, Dog>(TarantoolTuple.Create(5L), new SelectOptions { Iterator = Iterator.Ge });
+            var juniorDogs = await _secondaryIndex.Select<TarantoolTuple<long>, Dog>(TarantoolTuple.Create(5L), new SelectOptions { Iterator = Iterator.Le });
 
             return View(new []
             {
-                allDogs.Data.Select(x => new Dog(x)).ToArray(),
-                seniorDogs.Data.Select(x => new Dog(x)).ToArray(),
-                juniorDogs.Data.Select(x => new Dog(x)).ToArray()
+                allDogs.Data,
+                seniorDogs.Data,
+                juniorDogs.Data
             });
         }
     }

samples/docker-compose/dotnet/Models/Dog.cs

@@ -3,21 +3,30 @@
 
 namespace dotnet.Models
 {
+    [MsgPackArray]
     public class Dog
     {
-        public Dog(TarantoolTuple<long, string, long, MsgPackToken> tuple)
-        {
-            Id = tuple.Item1;
-            Name = tuple.Item2;
-            Age = tuple.Item3;
-            var _ = TryParseString(tuple.Item4) || TryParseInt(tuple.Item4);
-        }
+        private MsgPackToken _addditionalDataRaw;
 
-        public long Id { get; }
+        [MsgPackArrayElement(0)]
+        public long Id { get; set; }
 
-        public string Name { get; }
+        [MsgPackArrayElement(1)]
+        public string Name { get; set; }
 
-        public long Age { get; }
+        [MsgPackArrayElement(2)]
+        public long Age { get; set; }
+
+        [MsgPackArrayElement(3)]
+        public MsgPackToken AddditionalDataRaw
+        {
+            get => _addditionalDataRaw;
+            set
+            {
+                _addditionalDataRaw = value;
+                var _ = TryParseString(value) || TryParseInt(value);
+            }
+        }
 
         public string AdditionalData { get; private set; }
 

samples/docker-compose/dotnet/Startup.cs

@@ -1,10 +1,12 @@
+using dotnet.Models;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-
+using ProGaudi.MsgPack.Light;
 using ProGaudi.Tarantool.Client;
+using ProGaudi.Tarantool.Client.Model;
 
 namespace dotnet
 {
@@ -28,7 +30,14 @@ public void ConfigureServices(IServiceCollection services)
             // Add framework services.
             services.AddMvc();
 
-            var box = Box.Connect("operator:123123@tarantool1:3301").GetAwaiter().GetResult();
+            var msgPackContext = new MsgPackContext();
+            msgPackContext.GenerateAndRegisterArrayConverter<Dog>();
+
+            var clientOptions = new ClientOptions("operator:123123@tarantool1:3301", context: msgPackContext);
+
+            var box = new Box(clientOptions);
+            box.Connect().ConfigureAwait(false).GetAwaiter().GetResult();
+            
             services.AddSingleton(box);
         }
 

samples/docker-compose/dotnet/dotnet.csproj

@@ -16,6 +16,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.0" />
-    <PackageReference Include="progaudi.tarantool" Version="0.7.0" />
+    <PackageReference Include="msgpack.light" Version="1.3.0" />
+    <PackageReference Include="progaudi.tarantool" Version="0.8.0" />
   </ItemGroup>
 </Project>