From 6b7f29ea15db516dbf9a4f2a9514acc0ba37305d Mon Sep 17 00:00:00 2001 From: Nocco Giovanni Emanuele Date: Fri, 29 Nov 2024 15:33:46 +0100 Subject: [PATCH] Update packages and refactor MongoDB repository methods - Updated `Microsoft.NET.Test.Sdk` to `17.12.0` in multiple test projects. - Changed `GetMongoQueryable` return type to `IQueryable` in `IMongoDbBaseRepository.cs` and corresponding implementations. - Removed unused `using` directives and wrapped commented code in `AzureInitializer.cs`. - Updated `MongoDB.Driver` to `3.0.0` and `MongoDB.Driver.Core.Extensions.DiagnosticSources` to `2.0.0` in `Genocs.Persistence.MongoDb.csproj`. - Changed `collection` parameter type to `IQueryable` in `Pagination.cs` methods. - Updated `OpenTelemetry.Instrumentation.Http` to `1.10.0` in `Genocs.Tracing.csproj`. --- .../Genocs.Core.UnitTests.csproj | 2 +- .../Genocs.Persistence.MongoDB.UnitTests.csproj | 2 +- .../Domain/Repositories/IMongoDbBaseRepository.cs | 3 +-- .../Domain/Repositories/MongoDbBaseRepository.cs | 2 +- .../Repositories/MongoDbBaseRepositoryOfType.cs | 4 ++-- .../Encryptions/AzureInitializer.cs | 15 ++++++--------- .../Genocs.Persistence.MongoDb.csproj | 4 ++-- .../Repositories/Pagination.cs | 12 ++++++------ .../Genocs.QueryBuilder.UnitTests.csproj | 2 +- .../Genocs.ServiceBusAzure.UnitTests.csproj | 2 +- src/Genocs.Tracing/Genocs.Tracing.csproj | 2 +- 11 files changed, 23 insertions(+), 27 deletions(-) diff --git a/src/Genocs.Core.UnitTests/Genocs.Core.UnitTests.csproj b/src/Genocs.Core.UnitTests/Genocs.Core.UnitTests.csproj index 418db733..d373d228 100644 --- a/src/Genocs.Core.UnitTests/Genocs.Core.UnitTests.csproj +++ b/src/Genocs.Core.UnitTests/Genocs.Core.UnitTests.csproj @@ -7,7 +7,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Genocs.Persistence.MongoDb.UnitTests/Genocs.Persistence.MongoDB.UnitTests.csproj b/src/Genocs.Persistence.MongoDb.UnitTests/Genocs.Persistence.MongoDB.UnitTests.csproj index 65343529..152946ae 100644 --- a/src/Genocs.Persistence.MongoDb.UnitTests/Genocs.Persistence.MongoDB.UnitTests.csproj +++ b/src/Genocs.Persistence.MongoDb.UnitTests/Genocs.Persistence.MongoDB.UnitTests.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Genocs.Persistence.MongoDb/Domain/Repositories/IMongoDbBaseRepository.cs b/src/Genocs.Persistence.MongoDb/Domain/Repositories/IMongoDbBaseRepository.cs index 5cdacef2..41ac2f15 100644 --- a/src/Genocs.Persistence.MongoDb/Domain/Repositories/IMongoDbBaseRepository.cs +++ b/src/Genocs.Persistence.MongoDb/Domain/Repositories/IMongoDbBaseRepository.cs @@ -3,7 +3,6 @@ using Genocs.Core.Domain.Entities; using Genocs.Core.Domain.Repositories; using MongoDB.Driver; -using MongoDB.Driver.Linq; namespace Genocs.Persistence.MongoDb.Domain.Repositories; @@ -12,7 +11,7 @@ public interface IMongoDbBaseRepository : IRepositoryOfEntity Collection { get; } - IMongoQueryable GetMongoQueryable(); + IQueryable GetMongoQueryable(); Task GetAsync(Expression> predicate); Task> FindAsync(Expression> predicate); diff --git a/src/Genocs.Persistence.MongoDb/Domain/Repositories/MongoDbBaseRepository.cs b/src/Genocs.Persistence.MongoDb/Domain/Repositories/MongoDbBaseRepository.cs index d7f91e79..b9d2b605 100644 --- a/src/Genocs.Persistence.MongoDb/Domain/Repositories/MongoDbBaseRepository.cs +++ b/src/Genocs.Persistence.MongoDb/Domain/Repositories/MongoDbBaseRepository.cs @@ -22,7 +22,7 @@ public MongoDbBaseRepository(IMongoDatabase database, string collectionName) /// It returns the Mongo Collection as Queryable. /// /// - public IMongoQueryable GetMongoQueryable() + public IQueryable GetMongoQueryable() { return Collection.AsQueryable(); } diff --git a/src/Genocs.Persistence.MongoDb/Domain/Repositories/MongoDbBaseRepositoryOfType.cs b/src/Genocs.Persistence.MongoDb/Domain/Repositories/MongoDbBaseRepositoryOfType.cs index e498574a..de19fe26 100644 --- a/src/Genocs.Persistence.MongoDb/Domain/Repositories/MongoDbBaseRepositoryOfType.cs +++ b/src/Genocs.Persistence.MongoDb/Domain/Repositories/MongoDbBaseRepositoryOfType.cs @@ -1,10 +1,10 @@ +using System.Linq.Expressions; using Genocs.Core.CQRS.Queries; using Genocs.Core.Domain.Entities; using Genocs.Core.Domain.Repositories; using Genocs.Persistence.MongoDb.Repositories; using MongoDB.Driver; using MongoDB.Driver.Linq; -using System.Linq.Expressions; namespace Genocs.Persistence.MongoDb.Domain.Repositories; @@ -144,7 +144,7 @@ public override void Delete(TKey id) /// It returns the Mongo Collection as Queryable. /// /// - public IMongoQueryable GetMongoQueryable() + public IQueryable GetMongoQueryable() => Collection.AsQueryable(); public async Task GetAsync(Expression> predicate) diff --git a/src/Genocs.Persistence.MongoDb/Encryptions/AzureInitializer.cs b/src/Genocs.Persistence.MongoDb/Encryptions/AzureInitializer.cs index a9e71c14..b4ad049b 100644 --- a/src/Genocs.Persistence.MongoDb/Encryptions/AzureInitializer.cs +++ b/src/Genocs.Persistence.MongoDb/Encryptions/AzureInitializer.cs @@ -1,18 +1,13 @@ -using Genocs.Persistence.MongoDb.Configurations; -using Microsoft.Extensions.Options; -using MongoDB.Bson; -using MongoDB.Driver; -using MongoDB.Driver.Encryption; - -namespace Genocs.Persistence.MongoDb.Encryptions; +namespace Genocs.Persistence.MongoDb.Encryptions; /// -/// The initializer +/// The initializer. /// public class AzureInitializer { + /* /// - /// Setup the client + /// Setup the client. /// /// public AutoEncryptionOptions EncryptionOptions(IOptions options) @@ -179,4 +174,6 @@ BsonBinaryData CreateKeyGetID(DataKeyOptions options) //Console.WriteLine("Created encrypted collection!"); // end-create-enc-collection } + + */ } diff --git a/src/Genocs.Persistence.MongoDb/Genocs.Persistence.MongoDb.csproj b/src/Genocs.Persistence.MongoDb/Genocs.Persistence.MongoDb.csproj index a3e9acfc..e9daafd2 100644 --- a/src/Genocs.Persistence.MongoDb/Genocs.Persistence.MongoDb.csproj +++ b/src/Genocs.Persistence.MongoDb/Genocs.Persistence.MongoDb.csproj @@ -26,8 +26,8 @@ - - + + diff --git a/src/Genocs.Persistence.MongoDb/Repositories/Pagination.cs b/src/Genocs.Persistence.MongoDb/Repositories/Pagination.cs index 2096828c..78371c77 100644 --- a/src/Genocs.Persistence.MongoDb/Repositories/Pagination.cs +++ b/src/Genocs.Persistence.MongoDb/Repositories/Pagination.cs @@ -1,14 +1,14 @@ +using System.Linq.Expressions; using Genocs.Core.CQRS.Queries; using MongoDB.Driver; using MongoDB.Driver.Linq; -using System.Linq.Expressions; namespace Genocs.Persistence.MongoDb.Repositories; public static class Pagination { public static async Task> PaginateAsync( - this IMongoQueryable collection, + this IQueryable collection, IPagedQuery query) => await collection.PaginateAsync( query.OrderBy, @@ -17,7 +17,7 @@ public static async Task> PaginateAsync( query.Results); public static async Task> PaginateAsync( - this IMongoQueryable collection, + this IQueryable collection, string? orderBy, string? sortOrder, int page = 1, @@ -61,11 +61,11 @@ public static async Task> PaginateAsync( return PagedResult.Create(data, page, resultsPerPage, totalPages, totalResults); } - public static IMongoQueryable Limit(this IMongoQueryable collection, IPagedQuery query) + public static IQueryable Limit(this IQueryable collection, IPagedQuery query) => collection.Limit(query.Page, query.Results); - public static IMongoQueryable Limit( - this IMongoQueryable collection, + public static IQueryable Limit( + this IQueryable collection, int page = 1, int resultsPerPage = 10) { diff --git a/src/Genocs.QueryBuilder.UnitTests/Genocs.QueryBuilder.UnitTests.csproj b/src/Genocs.QueryBuilder.UnitTests/Genocs.QueryBuilder.UnitTests.csproj index 59a58922..6f0a4d5e 100644 --- a/src/Genocs.QueryBuilder.UnitTests/Genocs.QueryBuilder.UnitTests.csproj +++ b/src/Genocs.QueryBuilder.UnitTests/Genocs.QueryBuilder.UnitTests.csproj @@ -11,7 +11,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Genocs.ServiceBusAzure.UnitTests/Genocs.ServiceBusAzure.UnitTests.csproj b/src/Genocs.ServiceBusAzure.UnitTests/Genocs.ServiceBusAzure.UnitTests.csproj index 9f2b7f07..d02f1b6d 100644 --- a/src/Genocs.ServiceBusAzure.UnitTests/Genocs.ServiceBusAzure.UnitTests.csproj +++ b/src/Genocs.ServiceBusAzure.UnitTests/Genocs.ServiceBusAzure.UnitTests.csproj @@ -7,7 +7,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Genocs.Tracing/Genocs.Tracing.csproj b/src/Genocs.Tracing/Genocs.Tracing.csproj index d34d0661..646b1479 100644 --- a/src/Genocs.Tracing/Genocs.Tracing.csproj +++ b/src/Genocs.Tracing/Genocs.Tracing.csproj @@ -35,7 +35,7 @@ - +