Merge with master

MNie · Jun 6, 2021 · c4d4a8f · c4d4a8f
2 parents cd1bd46 + 3b190c7
commit c4d4a8f
Show file tree

Hide file tree

Showing 11 changed files with 101 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@ bin/
 obj/
 /packages/
 .idea
-.ionide
+.ionide
+.localDB
diff --git a/BagnoDB.sln.DotSettings.user b/BagnoDB.sln.DotSettings.user
@@ -1,4 +1,7 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue">&lt;AssemblyExplorer&gt;
   &lt;Assembly Path="/Users/mniegrzybowski/.nuget/packages/xunit.extensibility.execution/2.4.0/lib/netstandard2.0/xunit.execution.dotnet.dll" /&gt;
-&lt;/AssemblyExplorer&gt;</s:String></wpf:ResourceDictionary>
+&lt;/AssemblyExplorer&gt;</s:String>
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=91ab0c00_002D97f9_002D42b7_002Db58d_002D7f8ebdedcb02/@EntryIndexedValue">&lt;SessionState ContinuousTestingIsOn="False" ContinuousTestingMode="0" FrameworkVersion="{x:Null}" IsLocked="False" Name="All tests from Solution" PlatformMonoPreference="{x:Null}" PlatformType="{x:Null}" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"&gt;
+  &lt;Solution /&gt;
+&lt;/SessionState&gt;</s:String></wpf:ResourceDictionary>
diff --git a/README.md b/README.md
@@ -1,4 +1,10 @@
-# BagnoDB
+# BagnoDB 
+* NuGet Status
+
+    |   | BagnoDB | BagnoDB.Serializator |
+    |---|---|---|
+    | nuget | [![NuGet](https://buildstats.info/nuget/BagnoDB?includePreReleases=true)](https://www.nuget.org/packages/BagnoDB) | [![NuGet](https://buildstats.info/nuget/BagnoDB.Serializator?includePreReleases=true)](https://www.nuget.org/packages/BagnoDB.Serializator) |
+
 
 F# wrapper over MongoDB.Driver.
 

diff --git a/src/BagnoDB.Serializator/BagnoDB.Serializator.fsproj b/src/BagnoDB.Serializator/BagnoDB.Serializator.fsproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>netstandard2.1</TargetFramework>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <Version>0.0.9</Version>
+        <Version>0.0.11</Version>
         <Authors>Michał Niegrzybowski</Authors>
         <Company>Michał Niegrzybowski - MNie</Company>
         <PackageId>BagnoDB.Serializator</PackageId>
@@ -30,7 +30,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="MongoDB.Bson" Version="2.10.2" />
+      <PackageReference Include="MongoDB.Bson" Version="2.10.4" />
     </ItemGroup>
 
 </Project>
diff --git a/src/BagnoDB.Serializator/OptionSerializer.fs b/src/BagnoDB.Serializator/OptionSerializer.fs
@@ -21,7 +21,8 @@ type OptionSerializer<'TOption when 'TOption: equality>() =
 
         let (case, args) =
             let value =
-                if (typeOfArg.IsPrimitive) then
+                let isDecimalValueNull = (typeOfArg = typeof<decimal> && context.Reader.CurrentBsonType = BsonType.Null)
+                if typeOfArg.IsPrimitive || isDecimalValueNull then
                     BsonSerializer.Deserialize(context.Reader, typeof<obj>)
                 else
                     BsonSerializer.Deserialize(context.Reader, typeOfArg)

diff --git a/src/BagnoDB/BagnoDB.fsproj b/src/BagnoDB/BagnoDB.fsproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>netstandard2.1</TargetFramework>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <Version>0.0.9</Version>
+        <Version>0.0.11</Version>
         <Authors>Michał Niegrzybowski</Authors>
         <Company>Michał Niegrzybowski - MNie</Company>
         <PackageId>BagnoDB</PackageId>
@@ -30,7 +30,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="MongoDB.Driver" Version="2.10.2" />
+        <PackageReference Include="MongoDB.Driver" Version="2.10.4" />
     </ItemGroup>
 
 </Project>
diff --git a/src/BagnoDB/Serialization.fs b/src/BagnoDB/Serialization.fs
@@ -1,7 +1,14 @@
 namespace BagnoDB
 
     open MongoDB.Bson.Serialization
+    open MongoDB.Bson.Serialization.Serializers
 
     module Serialization =
         let bson bsonSerializer =
-            BsonSerializer.RegisterSerializationProvider bsonSerializer
+            BsonSerializer.RegisterSerializationProvider bsonSerializer
+
+        let typedBson<'TType> bsonSerializer =
+            BsonSerializer.RegisterSerializer<'TType> bsonSerializer
+
+        let decimal () =
+            BsonSerializer.RegisterSerializer(typeof<decimal>, DecimalSerializer MongoDB.Bson.BsonType.Decimal128)
diff --git a/tests/BagnoDB.IntegrationTests/BagnoDB.IntegrationTests.fsproj b/tests/BagnoDB.IntegrationTests/BagnoDB.IntegrationTests.fsproj
@@ -8,10 +8,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
-        <PackageReference Include="xunit" Version="2.4.0" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
-        <PackageReference Include="coverlet.collector" Version="1.0.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+        <PackageReference Include="xunit" Version="2.4.1" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+        <PackageReference Include="coverlet.collector" Version="1.2.1" />
         <PackageReference Include="Unquote" Version="5.0.0" />
     </ItemGroup>
 

diff --git a/tests/BagnoDB.Serializator.IntegrationTests/BagnoDB.Serializator.IntegrationTests.fsproj b/tests/BagnoDB.Serializator.IntegrationTests/BagnoDB.Serializator.IntegrationTests.fsproj
@@ -13,11 +13,11 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
         <PackageReference Include="Unquote" Version="5.0.0" />
-        <PackageReference Include="xunit" Version="2.4.0" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
-        <PackageReference Include="coverlet.collector" Version="1.2.0" />
+        <PackageReference Include="xunit" Version="2.4.1" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+        <PackageReference Include="coverlet.collector" Version="1.2.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/tests/BagnoDB.Serializator.IntegrationTests/Tests.fs b/tests/BagnoDB.Serializator.IntegrationTests/Tests.fs
@@ -1,6 +1,7 @@
 namespace BagnoDB.Serializator.Tests
 
 open System.Threading
+open System
 open Xunit
 open Swensen.Unquote
 open BagnoDB
@@ -45,7 +46,22 @@ type SmallestPossibleRecord =
         Foo: Union
     }
 
+type RecordOfOptionTypes = {
+    Boolean: bool option
+    Decimal: decimal option
+    float: float option
+    Int32: Int32 option
+    Int64: Int64 option
+}
+
 type SerializatorTests() =
+    do 
+        Serialization.bson (BagnoSerializationProvider ())
+        Conventions.create
+        |> Conventions.add (OptionConvention ())
+        |> Conventions.add (RecordConvention ())
+        |> Conventions.build "F# Type Conventions"
+
     let database = "BagnoDB_Serializator_IntegrationTests"
 
     let config = {
@@ -61,14 +77,6 @@ type SerializatorTests() =
             Connection.host config
             |> Connection.database database
             |> Connection.collection collection
-
-        Conventions.create
-        |> Conventions.add (OptionConvention ())
-        |> Conventions.add (RecordConvention ())
-        |> Conventions.build "F# Type Conventions"
-
-        Serialization.bson (BagnoSerializationProvider ())
-
         connection
 
     [<Fact>]
@@ -140,3 +148,49 @@ type SerializatorTests() =
             let! saved = con |> Query.filter CancellationToken.None filterOpt wildcard
             testCase =! (saved |> Seq.head)
         } |> Async.RunSynchronously
+
+    [<Fact>]
+    member _.``record with optional type None should be serialized/deserialized correctly`` () =
+        let wildcard = Filter.empty
+        let testCase: RecordOfOptionTypes = {
+            Boolean = None
+            Decimal = None
+            float = None
+            Int32 = None
+            Int64 = None
+        }
+
+        let con = connection "RecordOptionType_None_Tests"
+        let delOpt = DeleteOptions()
+        let insOpt = InsertOneOptions()
+        let filterOpt = FindOptions<RecordOfOptionTypes>()
+
+        async {
+            let! _ = con |> Query.deleteMany CancellationToken.None delOpt wildcard
+            do! con |> Query.insertOne CancellationToken.None insOpt testCase
+            let! saved = con |> Query.filter CancellationToken.None filterOpt wildcard
+            testCase =! (saved |> Seq.head)
+        } |> Async.RunSynchronously
+
+    [<Fact>]
+    member _.``record with optional type fields all Some value should be serialized/deserialized correctly`` () =
+        let wildcard = Filter.empty
+        let testCase: RecordOfOptionTypes = {
+            Boolean = Some true
+            Decimal = Some 1M
+            float = Some 1.0
+            Int32 = Some 1
+            Int64 = Some 1L
+        }
+
+        let con = connection "RecordOptionType_Some_Tests"
+        let delOpt = DeleteOptions()
+        let insOpt = InsertOneOptions()
+        let filterOpt = FindOptions<RecordOfOptionTypes>()
+
+        async {
+            let! _ = con |> Query.deleteMany CancellationToken.None delOpt wildcard
+            do! con |> Query.insertOne CancellationToken.None insOpt testCase
+            let! saved = con |> Query.filter CancellationToken.None filterOpt wildcard
+            testCase =! (saved |> Seq.head)
+        } |> Async.RunSynchronously
diff --git a/tests/BagnoDB.Tests/BagnoDB.Tests.fsproj b/tests/BagnoDB.Tests/BagnoDB.Tests.fsproj
@@ -14,10 +14,10 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
-        <PackageReference Include="xunit" Version="2.4.0" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
-        <PackageReference Include="coverlet.collector" Version="1.0.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+        <PackageReference Include="xunit" Version="2.4.1" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+        <PackageReference Include="coverlet.collector" Version="1.2.1" />
         <PackageReference Include="Unquote" Version="5.0.0" />
     </ItemGroup>