diff --git a/src/CMSMicroservice.Application/CMSMicroservice.Application.csproj b/src/CMSMicroservice.Application/CMSMicroservice.Application.csproj index 793a4d9..3879c49 100644 --- a/src/CMSMicroservice.Application/CMSMicroservice.Application.csproj +++ b/src/CMSMicroservice.Application/CMSMicroservice.Application.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable diff --git a/src/CMSMicroservice.Application/TransactionsCQ/Commands/CreateNewTransactions/CreateNewTransactionsCommand.cs b/src/CMSMicroservice.Application/TransactionsCQ/Commands/CreateNewTransactions/CreateNewTransactionsCommand.cs index bebc758..da14141 100644 --- a/src/CMSMicroservice.Application/TransactionsCQ/Commands/CreateNewTransactions/CreateNewTransactionsCommand.cs +++ b/src/CMSMicroservice.Application/TransactionsCQ/Commands/CreateNewTransactions/CreateNewTransactionsCommand.cs @@ -1,3 +1,5 @@ +using CMSMicroservice.Domain.Enums; + namespace CMSMicroservice.Application.TransactionsCQ.Commands.CreateNewTransactions; public record CreateNewTransactionsCommand : IRequest { diff --git a/src/CMSMicroservice.Application/TransactionsCQ/Commands/UpdateTransactions/UpdateTransactionsCommand.cs b/src/CMSMicroservice.Application/TransactionsCQ/Commands/UpdateTransactions/UpdateTransactionsCommand.cs index e9721f9..e326947 100644 --- a/src/CMSMicroservice.Application/TransactionsCQ/Commands/UpdateTransactions/UpdateTransactionsCommand.cs +++ b/src/CMSMicroservice.Application/TransactionsCQ/Commands/UpdateTransactions/UpdateTransactionsCommand.cs @@ -1,3 +1,5 @@ +using CMSMicroservice.Domain.Enums; + namespace CMSMicroservice.Application.TransactionsCQ.Commands.UpdateTransactions; public record UpdateTransactionsCommand : IRequest { diff --git a/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterQuery.cs b/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterQuery.cs index 33f9916..d48e63b 100644 --- a/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterQuery.cs +++ b/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterQuery.cs @@ -1,3 +1,5 @@ +using CMSMicroservice.Domain.Enums; + namespace CMSMicroservice.Application.TransactionsCQ.Queries.GetAllTransactionsByFilter; public record GetAllTransactionsByFilterQuery : IRequest { diff --git a/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterResponseDto.cs b/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterResponseDto.cs index dbc9d95..f9ce576 100644 --- a/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterResponseDto.cs +++ b/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterResponseDto.cs @@ -1,3 +1,5 @@ +using CMSMicroservice.Domain.Enums; + namespace CMSMicroservice.Application.TransactionsCQ.Queries.GetAllTransactionsByFilter; public class GetAllTransactionsByFilterResponseDto { diff --git a/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetTransactions/GetTransactionsResponseDto.cs b/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetTransactions/GetTransactionsResponseDto.cs index daf774e..ddcff8e 100644 --- a/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetTransactions/GetTransactionsResponseDto.cs +++ b/src/CMSMicroservice.Application/TransactionsCQ/Queries/GetTransactions/GetTransactionsResponseDto.cs @@ -1,3 +1,5 @@ +using CMSMicroservice.Domain.Enums; + namespace CMSMicroservice.Application.TransactionsCQ.Queries.GetTransactions; public class GetTransactionsResponseDto { diff --git a/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQueryHandler.cs b/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQueryHandler.cs index bc81ccf..905a0dd 100644 --- a/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQueryHandler.cs +++ b/src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQueryHandler.cs @@ -21,7 +21,7 @@ public class GetAllUserOrderByFilterQueryHandler : IRequestHandler request.Filter.Price == null || x.Price == request.Filter.Price) .Where(x => request.Filter.PackageId == null || x.PackageId == request.Filter.PackageId) .Where(x => request.Filter.TransactionId == null || x.TransactionId == request.Filter.TransactionId) - .Where(x => request.Filter.PaymentStatus == null || x.PaymentStatus == request.Filter.PaymentStatus) + .Where(x => request.Filter.PaymentStatus == null || x.PaymentStatus.GetHashCode() == request.Filter.PaymentStatus) .Where(x => request.Filter.PaymentDate == null || x.PaymentDate == request.Filter.PaymentDate) .Where(x => request.Filter.UserId == null || x.UserId == request.Filter.UserId) .Where(x => request.Filter.UserAddressId == null || x.UserAddressId == request.Filter.UserAddressId) diff --git a/src/CMSMicroservice.Domain/CMSMicroservice.Domain.csproj b/src/CMSMicroservice.Domain/CMSMicroservice.Domain.csproj index 8d4bd93..c8d69e7 100644 --- a/src/CMSMicroservice.Domain/CMSMicroservice.Domain.csproj +++ b/src/CMSMicroservice.Domain/CMSMicroservice.Domain.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable diff --git a/src/CMSMicroservice.Domain/Entities/Transactions.cs b/src/CMSMicroservice.Domain/Entities/Transactions.cs index 5d8e3d2..3dc15e2 100644 --- a/src/CMSMicroservice.Domain/Entities/Transactions.cs +++ b/src/CMSMicroservice.Domain/Entities/Transactions.cs @@ -1,3 +1,5 @@ +using CMSMicroservice.Domain.Enums; + namespace CMSMicroservice.Domain.Entities; //آدرس کاربر public class Transactions : BaseAuditableEntity diff --git a/src/CMSMicroservice.Domain/Entities/UserOrder.cs b/src/CMSMicroservice.Domain/Entities/UserOrder.cs index d1b9f84..859a0f8 100644 --- a/src/CMSMicroservice.Domain/Entities/UserOrder.cs +++ b/src/CMSMicroservice.Domain/Entities/UserOrder.cs @@ -1,3 +1,5 @@ +using CMSMicroservice.Domain.Enums; + namespace CMSMicroservice.Domain.Entities; //سفارش کاربر public class UserOrder : BaseAuditableEntity diff --git a/src/CMSMicroservice.Infrastructure/CMSMicroservice.Infrastructure.csproj b/src/CMSMicroservice.Infrastructure/CMSMicroservice.Infrastructure.csproj index 8f085f4..6b0d4a6 100644 --- a/src/CMSMicroservice.Infrastructure/CMSMicroservice.Infrastructure.csproj +++ b/src/CMSMicroservice.Infrastructure/CMSMicroservice.Infrastructure.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable diff --git a/src/CMSMicroservice.Infrastructure/Persistence/Configurations/FactorDetailsConfiguration.cs b/src/CMSMicroservice.Infrastructure/Persistence/Configurations/FactorDetailsConfiguration.cs index e7b89f3..6401a07 100644 --- a/src/CMSMicroservice.Infrastructure/Persistence/Configurations/FactorDetailsConfiguration.cs +++ b/src/CMSMicroservice.Infrastructure/Persistence/Configurations/FactorDetailsConfiguration.cs @@ -13,7 +13,7 @@ public class FactorDetailsConfiguration : IEntityTypeConfiguration entity.Id).UseIdentityColumn(); builder .HasOne(entity => entity.Product) - .WithMany(entity => entity.ProductFactorDetailss) + .WithMany(entity => entity.FactorDetailss) .HasForeignKey(entity => entity.ProductId) .IsRequired(true); builder.Property(entity => entity.Count).IsRequired(true); @@ -21,7 +21,7 @@ public class FactorDetailsConfiguration : IEntityTypeConfiguration entity.UnitDiscount).IsRequired(true); builder .HasOne(entity => entity.Order) - .WithMany(entity => entity.OrderFactorDetailss) + .WithMany(entity => entity.FactorDetailss) .HasForeignKey(entity => entity.OrderId) .IsRequired(true); builder.Property(entity => entity.UnitDiscountPrice).IsRequired(true); diff --git a/src/CMSMicroservice.Infrastructure/Persistence/Configurations/ProductGallerysConfiguration.cs b/src/CMSMicroservice.Infrastructure/Persistence/Configurations/ProductGallerysConfiguration.cs index 2530984..b84fa5b 100644 --- a/src/CMSMicroservice.Infrastructure/Persistence/Configurations/ProductGallerysConfiguration.cs +++ b/src/CMSMicroservice.Infrastructure/Persistence/Configurations/ProductGallerysConfiguration.cs @@ -13,12 +13,12 @@ public class ProductGallerysConfiguration : IEntityTypeConfiguration entity.Id).UseIdentityColumn(); builder .HasOne(entity => entity.ProductImage) - .WithMany(entity => entity.ProductImageProductGalleryss) + .WithMany(entity => entity.ProductGalleryss) .HasForeignKey(entity => entity.ProductImageId) .IsRequired(true); builder .HasOne(entity => entity.Product) - .WithMany(entity => entity.ProductProductGalleryss) + .WithMany(entity => entity.ProductGalleryss) .HasForeignKey(entity => entity.ProductId) .IsRequired(true); diff --git a/src/CMSMicroservice.Infrastructure/Persistence/Configurations/TransactionsConfiguration.cs b/src/CMSMicroservice.Infrastructure/Persistence/Configurations/TransactionsConfiguration.cs index 83af140..e06308f 100644 --- a/src/CMSMicroservice.Infrastructure/Persistence/Configurations/TransactionsConfiguration.cs +++ b/src/CMSMicroservice.Infrastructure/Persistence/Configurations/TransactionsConfiguration.cs @@ -32,7 +32,7 @@ public class TransactionsConfiguration : IEntityTypeConfiguration builder.Property(entity => entity.RefId).IsRequired(false); builder .HasOne(entity => entity.Order) - .WithMany(entity => entity.OrderTransactionss) + .WithMany(entity => entity.Transactionss) .HasForeignKey(entity => entity.OrderId) .IsRequired(false); builder.Property(entity => entity.Type).IsRequired(true); diff --git a/src/CMSMicroservice.Infrastructure/Persistence/Configurations/UserCartsConfiguration.cs b/src/CMSMicroservice.Infrastructure/Persistence/Configurations/UserCartsConfiguration.cs index 98a6b24..106a0ef 100644 --- a/src/CMSMicroservice.Infrastructure/Persistence/Configurations/UserCartsConfiguration.cs +++ b/src/CMSMicroservice.Infrastructure/Persistence/Configurations/UserCartsConfiguration.cs @@ -13,7 +13,7 @@ public class UserCartsConfiguration : IEntityTypeConfiguration builder.Property(entity => entity.Id).UseIdentityColumn(); builder .HasOne(entity => entity.Product) - .WithMany(entity => entity.ProductUserCartss) + .WithMany(entity => entity.UserCartss) .HasForeignKey(entity => entity.ProductId) .IsRequired(true); builder diff --git a/src/CMSMicroservice.Infrastructure/Persistence/Configurations/UserWalletChangeLogConfiguration.cs b/src/CMSMicroservice.Infrastructure/Persistence/Configurations/UserWalletChangeLogConfiguration.cs index 17e25be..0205b56 100644 --- a/src/CMSMicroservice.Infrastructure/Persistence/Configurations/UserWalletChangeLogConfiguration.cs +++ b/src/CMSMicroservice.Infrastructure/Persistence/Configurations/UserWalletChangeLogConfiguration.cs @@ -13,7 +13,7 @@ public class UserWalletChangeLogConfiguration : IEntityTypeConfiguration entity.Id).UseIdentityColumn(); builder .HasOne(entity => entity.Wallet) - .WithMany(entity => entity.WalletUserWalletChangeLogs) + .WithMany(entity => entity.UserWalletChangeLogs) .HasForeignKey(entity => entity.WalletId) .IsRequired(true); builder.Property(entity => entity.CurrentBalance).IsRequired(true); diff --git a/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj b/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj index 0336ac7..7d9057f 100644 --- a/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj +++ b/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj @@ -1,6 +1,6 @@ - net7.0 + net9.0 enable enable 0.0.117 diff --git a/src/CMSMicroservice.WebApi/CMSMicroservice.WebApi.csproj b/src/CMSMicroservice.WebApi/CMSMicroservice.WebApi.csproj index b54fa53..ba6ad0e 100644 --- a/src/CMSMicroservice.WebApi/CMSMicroservice.WebApi.csproj +++ b/src/CMSMicroservice.WebApi/CMSMicroservice.WebApi.csproj @@ -1,7 +1,7 @@ - net7.0 + net9.0 enable Linux ..\..\..