Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: nuget package update #547

Merged
merged 3 commits into from
Dec 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<ItemGroup>
<PackageVersion Include="Asp.Versioning.Mvc" Version="8.1.0" />
<PackageVersion Include="AutoMapper" Version="13.0.1" />
<PackageVersion Include="BB84.EntityFrameworkCore.Models" Version="2.7.1119" />
<PackageVersion Include="BB84.EntityFrameworkCore.Repositories" Version="2.7.1119" />
<PackageVersion Include="BB84.EntityFrameworkCore.Repositories.Abstractions" Version="2.7.1119" />
<PackageVersion Include="BB84.EntityFrameworkCore.Repositories.SqlServer" Version="2.7.1119" />
<PackageVersion Include="BB84.EntityFrameworkCore.Entities" Version="3.0.1227" />
<PackageVersion Include="BB84.EntityFrameworkCore.Repositories" Version="3.0.1227" />
<PackageVersion Include="BB84.EntityFrameworkCore.Repositories.Abstractions" Version="3.0.1227" />
<PackageVersion Include="BB84.EntityFrameworkCore.Repositories.SqlServer" Version="3.0.1227" />
<PackageVersion Include="BB84.Extensions" Version="2.9.1225" />
<PackageVersion Include="Fare" Version="2.2.1" />
<PackageVersion Include="FluentAssertions" Version="7.0.0" />
Expand Down
40 changes: 20 additions & 20 deletions src/Application/Extensions/QueryableExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Application.Features.Requests;

using Domain.Entities.Attendance;
using Domain.Entities.Documents;
using Domain.Entities.Finance;
using Domain.Enumerators.Attendance;
using Domain.Models.Attendance;
using Domain.Models.Documents;
using Domain.Models.Finance;

namespace Application.Extensions;

Expand Down Expand Up @@ -36,9 +36,9 @@ public static IQueryable<DateTime> FilterByParameters(this IQueryable<DateTime>
/// <param name="query">The query to filter.</param>
/// <param name="parameters">The parameters to filter by.</param>
/// <returns>The filtered <paramref name="query"/>.</returns>
public static IQueryable<AttendanceModel> FilterByParameters(this IQueryable<AttendanceModel> query, AttendanceParameters parameters)
public static IQueryable<AttendanceEntity> FilterByParameters(this IQueryable<AttendanceEntity> query, AttendanceParameters parameters)
{
IQueryable<AttendanceModel> filteredQuery = query
IQueryable<AttendanceEntity> filteredQuery = query
.FilterByYear(parameters.Year)
.FilterByMonth(parameters.Month)
.FilterByDateRange(parameters.MinDate, parameters.MaxDate)
Expand All @@ -53,9 +53,9 @@ public static IQueryable<AttendanceModel> FilterByParameters(this IQueryable<Att
/// <param name="query">The query to filter.</param>
/// <param name="parameters">The parameters to filter by.</param>
/// <returns>The filtered <paramref name="query"/>.</returns>
public static IQueryable<Document> FilterByParameters(this IQueryable<Document> query, DocumentParameters parameters)
public static IQueryable<DocumentEntity> FilterByParameters(this IQueryable<DocumentEntity> query, DocumentParameters parameters)
{
IQueryable<Document> filteredQuery = query
IQueryable<DocumentEntity> filteredQuery = query
.FilterByDirectory(parameters.Directory)
.FilterByExtension(parameters.ExtensionName)
.FilterByName(parameters.Name);
Expand All @@ -69,9 +69,9 @@ public static IQueryable<Document> FilterByParameters(this IQueryable<Document>
/// <param name="query">The query to filter.</param>
/// <param name="parameters">The parameters to filter by.</param>
/// <returns>The filtered <paramref name="query"/>.</returns>
public static IQueryable<TransactionModel> FilterByParameters(this IQueryable<TransactionModel> query, TransactionParameters parameters)
public static IQueryable<TransactionEntity> FilterByParameters(this IQueryable<TransactionEntity> query, TransactionParameters parameters)
{
IQueryable<TransactionModel> filteredQuery = query
IQueryable<TransactionEntity> filteredQuery = query
.FilterByBookingDate(parameters.BookingDate)
.FilterByValueDate(parameters.ValueDate)
.FilterByBeneficiary(parameters.Beneficiary)
Expand All @@ -90,7 +90,7 @@ public static IQueryable<TransactionModel> FilterByParameters(this IQueryable<Tr
/// <param name="query">The query to filter.</param>
/// <param name="name">The name to search for.</param>
/// <returns>The filtered <paramref name="query"/>.</returns>
private static IQueryable<Document> FilterByName(this IQueryable<Document> query, string? name)
private static IQueryable<DocumentEntity> FilterByName(this IQueryable<DocumentEntity> query, string? name)
=> name is not null ? query.Where(x => x.Name.Contains(name)) : query;

/// <summary>
Expand All @@ -99,7 +99,7 @@ private static IQueryable<Document> FilterByName(this IQueryable<Document> query
/// <param name="query">The query to filter.</param>
/// <param name="directory">The directory to search for.</param>
/// <returns>The filtered <paramref name="query"/>.</returns>
private static IQueryable<Document> FilterByDirectory(this IQueryable<Document> query, string? directory)
private static IQueryable<DocumentEntity> FilterByDirectory(this IQueryable<DocumentEntity> query, string? directory)
=> directory is not null ? query.Where(x => x.Directory.Contains(directory)) : query;

/// <summary>
Expand All @@ -108,7 +108,7 @@ private static IQueryable<Document> FilterByDirectory(this IQueryable<Document>
/// <param name="query">The query to filter.</param>
/// <param name="extension">The extension to search for.</param>
/// <returns>The filtered <paramref name="query"/>.</returns>
private static IQueryable<Document> FilterByExtension(this IQueryable<Document> query, string? extension)
private static IQueryable<DocumentEntity> FilterByExtension(this IQueryable<DocumentEntity> query, string? extension)
=> extension is not null ? query.Where(x => x.Extension.Name.Contains(extension)) : query;

/// <summary>
Expand Down Expand Up @@ -150,7 +150,7 @@ private static IQueryable<DateTime> FilterByDateRange(this IQueryable<DateTime>
/// <param name="query">The query to filter.</param>
/// <param name="year">The year to be filtered.</param>
/// <returns><see cref="IQueryable{T}"/></returns>
private static IQueryable<AttendanceModel> FilterByYear(this IQueryable<AttendanceModel> query, int? year)
private static IQueryable<AttendanceEntity> FilterByYear(this IQueryable<AttendanceEntity> query, int? year)
=> year.HasValue ? query.Where(x => x.Date.Year.Equals(year)) : query;

/// <summary>
Expand All @@ -159,7 +159,7 @@ private static IQueryable<AttendanceModel> FilterByYear(this IQueryable<Attendan
/// <param name="query">The query to filter.</param>
/// <param name="month">The month to be filtered.</param>
/// <returns><see cref="IQueryable{T}"/></returns>
private static IQueryable<AttendanceModel> FilterByMonth(this IQueryable<AttendanceModel> query, int? month)
private static IQueryable<AttendanceEntity> FilterByMonth(this IQueryable<AttendanceEntity> query, int? month)
=> month.HasValue ? query.Where(x => x.Date.Month.Equals(month)) : query;

/// <summary>
Expand All @@ -169,7 +169,7 @@ private static IQueryable<AttendanceModel> FilterByMonth(this IQueryable<Attenda
/// <param name="minDate">The minimum date.</param>
/// <param name="maxDate">The maximum date.</param>
/// <returns><see cref="IQueryable{T}"/></returns>
private static IQueryable<AttendanceModel> FilterByDateRange(this IQueryable<AttendanceModel> query, DateTime? minDate, DateTime? maxDate)
private static IQueryable<AttendanceEntity> FilterByDateRange(this IQueryable<AttendanceEntity> query, DateTime? minDate, DateTime? maxDate)
{
query = minDate.HasValue ? query.Where(x => x.Date >= minDate.Value.Date) : query;
query = maxDate.HasValue ? query.Where(x => x.Date <= maxDate.Value.Date) : query;
Expand All @@ -183,7 +183,7 @@ private static IQueryable<AttendanceModel> FilterByDateRange(this IQueryable<Att
/// <param name="query">The query to filter.</param>
/// <param name="type">The attendance type to be filtered.</param>
/// <returns><see cref="IQueryable{T}"/></returns>
private static IQueryable<AttendanceModel> FilterByType(this IQueryable<AttendanceModel> query, AttendanceType? type)
private static IQueryable<AttendanceEntity> FilterByType(this IQueryable<AttendanceEntity> query, AttendanceType? type)
=> type.HasValue ? query.Where(x => x.Type.Equals(type)) : query;

/// <summary>
Expand All @@ -192,7 +192,7 @@ private static IQueryable<AttendanceModel> FilterByType(this IQueryable<Attendan
/// <param name="query">The query to filter.</param>
/// <param name="dateTime">The date to be filtered by.</param>
/// <returns><see cref="IQueryable{T}"/></returns>
private static IQueryable<TransactionModel> FilterByBookingDate(this IQueryable<TransactionModel> query, DateTime? dateTime)
private static IQueryable<TransactionEntity> FilterByBookingDate(this IQueryable<TransactionEntity> query, DateTime? dateTime)
=> dateTime.HasValue ? query.Where(x => x.BookingDate.Equals(dateTime.Value.Date)) : query;

/// <summary>
Expand All @@ -201,7 +201,7 @@ private static IQueryable<TransactionModel> FilterByBookingDate(this IQueryable<
/// <param name="query">The query to filter.</param>
/// <param name="dateTime">The date to be filtered by.</param>
/// <returns><see cref="IQueryable{T}"/></returns>
private static IQueryable<TransactionModel> FilterByValueDate(this IQueryable<TransactionModel> query, DateTime? dateTime)
private static IQueryable<TransactionEntity> FilterByValueDate(this IQueryable<TransactionEntity> query, DateTime? dateTime)
=> dateTime.HasValue ? query.Where(x => x.ValueDate.Equals(dateTime.Value.Date)) : query;

/// <summary>
Expand All @@ -210,7 +210,7 @@ private static IQueryable<TransactionModel> FilterByValueDate(this IQueryable<Tr
/// <param name="query">The query to filter.</param>
/// <param name="beneficiary">The client beneficiary to be filtered by.</param>
/// <returns><see cref="IQueryable{T}"/></returns>
private static IQueryable<TransactionModel> FilterByBeneficiary(this IQueryable<TransactionModel> query, string? beneficiary)
private static IQueryable<TransactionEntity> FilterByBeneficiary(this IQueryable<TransactionEntity> query, string? beneficiary)
=> beneficiary is not null ? query.Where(x => x.ClientBeneficiary.Contains(beneficiary)) : query;

/// <summary>
Expand All @@ -220,7 +220,7 @@ private static IQueryable<TransactionModel> FilterByBeneficiary(this IQueryable<
/// <param name="minValue">The minimum value to be filtered by.</param>
/// <param name="maxValue">The maximum value to be filtered by.</param>
/// <returns><see cref="IQueryable{T}"/></returns>
private static IQueryable<TransactionModel> FilterByAmountRange(this IQueryable<TransactionModel> query, decimal? minValue, decimal? maxValue)
private static IQueryable<TransactionEntity> FilterByAmountRange(this IQueryable<TransactionEntity> query, decimal? minValue, decimal? maxValue)
{
query = minValue.HasValue ? query.Where(x => x.AmountEur >= minValue) : query;
query = maxValue.HasValue ? query.Where(x => x.AmountEur <= maxValue) : query;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using BB84.EntityFrameworkCore.Repositories.Abstractions;

using Domain.Models.Attendance;
using Domain.Models.Documents;
using Domain.Models.Finance;
using Domain.Models.Todo;
using Domain.Entities.Attendance;
using Domain.Entities.Documents;
using Domain.Entities.Finance;
using Domain.Entities.Todo;

using Microsoft.EntityFrameworkCore;

Expand All @@ -15,25 +15,25 @@ namespace Application.Interfaces.Infrastructure.Persistence;
public interface IRepositoryContext : IDbContext
{
/// <inheritdoc cref="DbSet{TEntity}"/>
DbSet<AccountModel> Accounts { get; }
DbSet<AccountEntity> Accounts { get; }

/// <inheritdoc cref="DbSet{TEntity}"/>
DbSet<AttendanceModel> Attendances { get; }
DbSet<AttendanceEntity> Attendances { get; }

/// <inheritdoc cref="DbSet{TEntity}"/>
DbSet<CardModel> Cards { get; }
DbSet<CardEntity> Cards { get; }

/// <inheritdoc cref="DbSet{TEntity}"/>
DbSet<Document> Documents { get; }
DbSet<DocumentEntity> Documents { get; }

/// <inheritdoc cref="DbSet{TEntity}"/>
DbSet<TransactionModel> Transactions { get; }
DbSet<TransactionEntity> Transactions { get; }

/// <inheritdoc cref="DbSet{TEntity}"/>
DbSet<List> TodoLists { get; }
DbSet<ListEntity> TodoLists { get; }

/// <inheritdoc cref="DbSet{TEntity}"/>
DbSet<Item> TodoItems { get; }
DbSet<ItemEntity> TodoItems { get; }

/// <summary>
/// This function returns the last day of the month containing a specified date.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using BB84.EntityFrameworkCore.Repositories.Abstractions;

using Domain.Models.Documents;
using Domain.Entities.Documents;

namespace Application.Interfaces.Infrastructure.Persistence.Repositories.Documents;

/// <summary>
/// The interface for the document data entity.
/// </summary>
/// <inheritdoc/>
public interface IDocumentDataRepository : IIdentityRepository<Data>
public interface IDocumentDataRepository : IIdentityRepository<DataEntity>
{ }
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using BB84.EntityFrameworkCore.Repositories.Abstractions;

using Domain.Models.Documents;
using Domain.Entities.Documents;

namespace Application.Interfaces.Infrastructure.Persistence.Repositories.Documents;

/// <summary>
/// The interface for the document extension entity.
/// </summary>
/// <inheritdoc/>
public interface IDocumentExtensionRepository : IIdentityRepository<Extension>
public interface IDocumentExtensionRepository : IIdentityRepository<ExtensionEntity>
{ }
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using BB84.EntityFrameworkCore.Repositories.Abstractions;

using Domain.Models.Documents;
using Domain.Entities.Documents;

namespace Application.Interfaces.Infrastructure.Persistence.Repositories.Documents;

/// <summary>
/// The interface for the document entity.
/// </summary>
/// <inheritdoc/>
public interface IDocumentRepository : IIdentityRepository<Document>
public interface IDocumentRepository : IIdentityRepository<DocumentEntity>
{ }
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using BB84.EntityFrameworkCore.Repositories.Abstractions;

using Domain.Models.Finance;
using Domain.Entities.Finance;

namespace Application.Interfaces.Infrastructure.Persistence.Repositories;

/// <summary>
/// The account repository interface.
/// </summary>
/// <inheritdoc/>
public interface IAccountRepository : IIdentityRepository<AccountModel>
public interface IAccountRepository : IIdentityRepository<AccountEntity>
{ }
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using BB84.EntityFrameworkCore.Repositories.Abstractions;

using Domain.Models.Attendance;
using Domain.Entities.Attendance;

namespace Application.Interfaces.Infrastructure.Persistence.Repositories;

/// <summary>
/// The attendance repository interface.
/// </summary>
/// <inheritdoc/>
public interface IAttendanceRepository : IIdentityRepository<AttendanceModel>
public interface IAttendanceRepository : IIdentityRepository<AttendanceEntity>
{ }
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using BB84.EntityFrameworkCore.Repositories.Abstractions;

using Domain.Models.Finance;
using Domain.Entities.Finance;

namespace Application.Interfaces.Infrastructure.Persistence.Repositories;

/// <summary>
/// The card repository interface.
/// </summary>
/// <inheritdoc/>
public interface ICardRepository : IIdentityRepository<CardModel>
public interface ICardRepository : IIdentityRepository<CardEntity>
{ }
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using BB84.EntityFrameworkCore.Repositories.Abstractions;

using Domain.Models.Finance;
using Domain.Entities.Finance;

namespace Application.Interfaces.Infrastructure.Persistence.Repositories;

/// <summary>
/// The transaction repository interface.
/// </summary>
/// <inheritdoc/>
public interface ITransactionRepository : IIdentityRepository<TransactionModel>
public interface ITransactionRepository : IIdentityRepository<TransactionEntity>
{ }
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using BB84.EntityFrameworkCore.Repositories.Abstractions;

using Domain.Models.Todo;
using Domain.Entities.Todo;

namespace Application.Interfaces.Infrastructure.Persistence.Repositories.Todo;

/// <summary>
/// The interface for the todo item repository.
/// </summary>
/// <inheritdoc/>
public interface IItemRepository : IIdentityRepository<Item>
public interface IItemRepository : IIdentityRepository<ItemEntity>
{ }
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using BB84.EntityFrameworkCore.Repositories.Abstractions;

using Domain.Models.Todo;
using Domain.Entities.Todo;

namespace Application.Interfaces.Infrastructure.Persistence.Repositories.Todo;

/// <summary>
/// Theinterface for the todo list repository.
/// </summary>
/// <inheritdoc/>
public interface IListRepository : IIdentityRepository<List>
public interface IListRepository : IIdentityRepository<ListEntity>
{ }
6 changes: 3 additions & 3 deletions src/Application/Profiles/Requests/AttendanceRequestProfile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

using AutoMapper;

using Domain.Models.Attendance;
using Domain.Entities.Attendance;

namespace Application.Profiles.Requests;

Expand All @@ -14,7 +14,7 @@ internal sealed class AttendanceRequestProfile : Profile
{
public AttendanceRequestProfile()
{
CreateMap<AttendanceCreateRequest, AttendanceModel>();
CreateMap<AttendanceUpdateRequest, AttendanceModel>();
CreateMap<AttendanceCreateRequest, AttendanceEntity>();
CreateMap<AttendanceUpdateRequest, AttendanceEntity>();
}
}
6 changes: 3 additions & 3 deletions src/Application/Profiles/Requests/DocumentsRequestProfile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

using AutoMapper;

using Domain.Models.Documents;
using Domain.Entities.Documents;

namespace Application.Profiles.Requests;

Expand All @@ -14,7 +14,7 @@ internal sealed class DocumentsRequestProfile : Profile
{
public DocumentsRequestProfile()
{
CreateMap<DocumentCreateRequest, Document>();
CreateMap<DocumentUpdateRequest, Document>();
CreateMap<DocumentCreateRequest, DocumentEntity>();
CreateMap<DocumentUpdateRequest, DocumentEntity>();
}
}
Loading
Loading