MongoDB Fixes part 2

KSemenenko · KSemenenko · commit e3cb120e241c · 2021-04-13T19:00:12.000+03:00
diff --git a/ManagedCode.Repository.AzureTable/ManagedCode.Repository.AzureTable.csproj b/ManagedCode.Repository.AzureTable/ManagedCode.Repository.AzureTable.csproj
@@ -8,7 +8,7 @@
         <Authors>ManagedCode</Authors>
         <PackageLicenseUrl>https://github.com/managed-code-hub/Repository/blob/main/LICENSE</PackageLicenseUrl>
         <RepositoryUrl>https://github.com/managed-code-hub/Repository</RepositoryUrl>
-        <PackageVersion>1.0.9</PackageVersion>
+        <PackageVersion>1.0.10</PackageVersion>
         <Description>Repository for AzureTable</Description>
     </PropertyGroup>
 
diff --git a/ManagedCode.Repository.Core/ManagedCode.Repository.Core.csproj b/ManagedCode.Repository.Core/ManagedCode.Repository.Core.csproj
@@ -9,7 +9,7 @@
         <PackageProjectUrl>https://github.com/managed-code-hub/Repository</PackageProjectUrl>
         <PackageLicenseUrl>https://github.com/managed-code-hub/Repository/blob/main/LICENSE</PackageLicenseUrl>
         <RepositoryUrl>https://github.com/managed-code-hub/Repository</RepositoryUrl>
-        <PackageVersion>1.0.9</PackageVersion>
+        <PackageVersion>1.0.10</PackageVersion>
         <Description>Base implementation for Repository</Description>
     </PropertyGroup>
 
diff --git a/ManagedCode.Repository.CosmosDB/ManagedCode.Repository.CosmosDB.csproj b/ManagedCode.Repository.CosmosDB/ManagedCode.Repository.CosmosDB.csproj
@@ -8,7 +8,7 @@
         <Authors>ManagedCode</Authors>
         <PackageLicenseUrl>https://github.com/managed-code-hub/Repository/blob/main/LICENSE</PackageLicenseUrl>
         <RepositoryUrl>https://github.com/managed-code-hub/Repository</RepositoryUrl>
-        <PackageVersion>1.0.9</PackageVersion>
+        <PackageVersion>1.0.10</PackageVersion>
         <Description>Repository for CosmosDB</Description>
     </PropertyGroup>
 
diff --git a/ManagedCode.Repository.LiteDB/ManagedCode.Repository.LiteDB.csproj b/ManagedCode.Repository.LiteDB/ManagedCode.Repository.LiteDB.csproj
@@ -8,7 +8,7 @@
         <Authors>ManagedCode</Authors>
         <PackageLicenseUrl>https://github.com/managed-code-hub/Repository/blob/main/LICENSE</PackageLicenseUrl>
         <RepositoryUrl>https://github.com/managed-code-hub/Repository</RepositoryUrl>
-        <PackageVersion>1.0.9</PackageVersion>
+        <PackageVersion>1.0.10</PackageVersion>
         <Description>Repository for LiteDB</Description>
     </PropertyGroup>
 
diff --git a/ManagedCode.Repository.MongoDB/ManagedCode.Repository.MongoDB.csproj b/ManagedCode.Repository.MongoDB/ManagedCode.Repository.MongoDB.csproj
@@ -8,7 +8,7 @@
         <Authors>ManagedCode</Authors>
         <PackageLicenseUrl>https://github.com/managed-code-hub/Repository/blob/main/LICENSE</PackageLicenseUrl>
         <RepositoryUrl>https://github.com/managed-code-hub/Repository</RepositoryUrl>
-        <PackageVersion>1.0.9</PackageVersion>
+        <PackageVersion>1.0.10</PackageVersion>
         <Description>Repository for MongoDB</Description>
     </PropertyGroup>
 
diff --git a/ManagedCode.Repository.MongoDB/MongoDbItem.cs b/ManagedCode.Repository.MongoDB/MongoDbItem.cs
@@ -1,5 +1,6 @@
 using ManagedCode.Repository.Core;
 using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
 using Newtonsoft.Json;
 
 namespace ManagedCode.Repository.MongoDB
@@ -21,6 +22,8 @@ public MongoDbItem(ObjectId id)
             Id = id;
         }
 
+        [BsonId]
+        [BsonRepresentation(BsonType.ObjectId)]
         public ObjectId Id { get; set; }
     }
 }
diff --git a/ManagedCode.Repository.MongoDB/MongoDbRepository.cs b/ManagedCode.Repository.MongoDB/MongoDbRepository.cs
@@ -18,7 +18,7 @@ public class MongoDbRepository<TItem> : BaseRepository<ObjectId, TItem>, IMongoD
         where TItem : class, IItem<ObjectId>
     {
         private readonly IMongoCollection<TItem> _collection;
-
+        
         public MongoDbRepository(ILogger logger, [NotNull] MongoDbRepositoryOptions options) : base(logger)
         {
             var client = new MongoClient(options.ConnectionString);
@@ -53,11 +53,12 @@ protected override async Task<int> InsertAsyncInternal(IEnumerable<TItem> items,
 
         protected override async Task<TItem> InsertOrUpdateAsyncInternal(TItem item, CancellationToken token = default)
         {
-            return await _collection.FindOneAndReplaceAsync<TItem>(w => w.Id == item.Id, item, new FindOneAndReplaceOptions<TItem>
+            var result = await _collection.ReplaceOneAsync(w => w.Id == item.Id, item, new ReplaceOptions
             {
                 IsUpsert = true,
-                ReturnDocument = ReturnDocument.After
             }, token);
+            
+            return item;
         }
 
         protected override async Task<int> InsertOrUpdateAsyncInternal(IEnumerable<TItem> items, CancellationToken token = default)
@@ -78,7 +79,7 @@ protected override async Task<int> InsertOrUpdateAsyncInternal(IEnumerable<TItem
 
         protected override async Task<TItem> UpdateAsyncInternal(TItem item, CancellationToken token = default)
         {
-            await _collection.UpdateOneAsync(w => w.Id == item.Id, new ObjectUpdateDefinition<TItem>(item), new UpdateOptions(), token);
+            var r = await _collection.ReplaceOneAsync(Builders<TItem>.Filter.Eq("_id", item.Id), item, cancellationToken: token);
             return item;
         }
 
diff --git a/ManagedCode.Repository.SQLite/ManagedCode.Repository.SQLite.csproj b/ManagedCode.Repository.SQLite/ManagedCode.Repository.SQLite.csproj
@@ -8,7 +8,7 @@
         <Authors>ManagedCode</Authors>
         <PackageLicenseUrl>https://github.com/managed-code-hub/Repository/blob/main/LICENSE</PackageLicenseUrl>
         <RepositoryUrl>https://github.com/managed-code-hub/Repository</RepositoryUrl>
-        <PackageVersion>1.0.9</PackageVersion>
+        <PackageVersion>1.0.10</PackageVersion>
         <Description>Repository for SQLite</Description>
     </PropertyGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using ManagedCode.Repository.Core;`
`2`	`2`	`using MongoDB.Bson;`
	`3`	`+using MongoDB.Bson.Serialization.Attributes;`
`3`	`4`	`using Newtonsoft.Json;`
`4`	`5`
`5`	`6`	`namespace ManagedCode.Repository.MongoDB`
`@@ -21,6 +22,8 @@ public MongoDbItem(ObjectId id)`
`21`	`22`	`Id = id;`
`22`	`23`	`}`
`23`	`24`
	`25`	`+ [BsonId]`
	`26`	`+ [BsonRepresentation(BsonType.ObjectId)]`
`24`	`27`	`public ObjectId Id { get; set; }`
`25`	`28`	`}`
`26`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public class MongoDbRepository<TItem> : BaseRepository<ObjectId, TItem>, IMongoD`
`18`	`18`	`where TItem : class, IItem<ObjectId>`
`19`	`19`	`{`
`20`	`20`	`private readonly IMongoCollection<TItem> _collection;`
`21`		`-`
	`21`	`+`
`22`	`22`	`public MongoDbRepository(ILogger logger, [NotNull] MongoDbRepositoryOptions options) : base(logger)`
`23`	`23`	`{`
`24`	`24`	`var client = new MongoClient(options.ConnectionString);`
`@@ -53,11 +53,12 @@ protected override async Task<int> InsertAsyncInternal(IEnumerable<TItem> items,`
`53`	`53`
`54`	`54`	`protected override async Task<TItem> InsertOrUpdateAsyncInternal(TItem item, CancellationToken token = default)`
`55`	`55`	`{`
`56`		`- return await _collection.FindOneAndReplaceAsync<TItem>(w => w.Id == item.Id, item, new FindOneAndReplaceOptions<TItem>`
	`56`	`+ var result = await _collection.ReplaceOneAsync(w => w.Id == item.Id, item, new ReplaceOptions`
`57`	`57`	`{`
`58`	`58`	`IsUpsert = true,`
`59`		`- ReturnDocument = ReturnDocument.After`
`60`	`59`	`}, token);`
	`60`	`+`
	`61`	`+ return item;`
`61`	`62`	`}`
`62`	`63`
`63`	`64`	`protected override async Task<int> InsertOrUpdateAsyncInternal(IEnumerable<TItem> items, CancellationToken token = default)`
`@@ -78,7 +79,7 @@ protected override async Task<int> InsertOrUpdateAsyncInternal(IEnumerable<TItem`
`78`	`79`
`79`	`80`	`protected override async Task<TItem> UpdateAsyncInternal(TItem item, CancellationToken token = default)`
`80`	`81`	`{`
`81`		`- await _collection.UpdateOneAsync(w => w.Id == item.Id, new ObjectUpdateDefinition<TItem>(item), new UpdateOptions(), token);`
	`82`	`+ var r = await _collection.ReplaceOneAsync(Builders<TItem>.Filter.Eq("_id", item.Id), item, cancellationToken: token);`
`82`	`83`	`return item;`
`83`	`84`	`}`
`84`	`85`