NetinaShop
/
Api
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add version 0.27.38.60 , fix search service

release
Amir Hossein Khademi 2024-05-24 16:18:56 +03:30
parent b45b0450a7
commit b7dbe67e7f
9 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.version
View File

@ -1 +1 @@
0.27.37.59
0.27.38.60

4
Netina.Api/Netina.Api.csproj
View File

@ -6,8 +6,8 @@
<ImplicitUsings>enable</ImplicitUsings>
<InvariantGlobalization>true</InvariantGlobalization>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<AssemblyVersion>0.27.37.59</AssemblyVersion>
<FileVersion>0.27.37.59</FileVersion>
<AssemblyVersion>0.27.38.60</AssemblyVersion>
<FileVersion>0.27.38.60</FileVersion>
</PropertyGroup>
<ItemGroup>

2
Netina.Api/Program.cs
View File

@ -8,7 +8,7 @@ string env = builder.Environment.IsDevelopment() == true ? "Development" : "Prod
builder.Host.UseContentRoot(Directory.GetCurrentDirectory());
if (builder.Environment.IsDevelopment())
{
string projectName = "Hamyan";
string projectName = "Vesmeh";
builder.Configuration.AddJsonFile($"AppSettings/appsettings.json").AddJsonFile($"AppSettings/appsettings.{env}{projectName}.json");
}

2
Netina.Api/WebFramework/Configurations/ServiceExtensions.cs
View File

@ -74,7 +74,7 @@ public static class ServiceExtensions
options.UseQueryTrackingBehavior(QueryTrackingBehavior.NoTracking);
options.UseNpgsql(Configuration.GetConnectionString("Postgres"), b => b.MigrationsAssembly("Netina.Repository"))
.UseProjectAssembly(typeof(ApplicationUser).Assembly);
//options.EnableServiceProviderCaching(true);
}).BuildServiceProvider();
AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);

6
Netina.Core/Abstracts/IStorageService.cs
View File

@ -1,8 +1,4 @@
using Netina.Common.Models;
using Netina.Domain.Dtos.SmallDtos;
using Netina.Domain.Enums;
namespace Netina.Core.Abstracts;
namespace Netina.Core.Abstracts;
public interface IStorageService : IScopedDependency
{

17
Netina.Core/CoreServices/SearchService.cs
View File

@ -15,17 +15,17 @@ public class SearchService : ISearchService
}
public async Task<SearchResponseDto> SearchAsync(string name, CancellationToken cancellationToken = default)
{
var searchQuery = name.ToLowerInvariant().Trim();
var searchQuery = name.ToLower().Trim();
int minSimilarityThreshold = 20;
var products = await _repositoryWrapper.SetRepository<Product>()
.TableNoTracking
.Where(p => FuzzySharp.Fuzz.PartialRatio(p.PersianName.ToLowerInvariant().Trim(), searchQuery) >= minSimilarityThreshold)
.Where(p => FuzzySharp.Fuzz.PartialRatio(p.PersianName.ToLower().Trim(), searchQuery) >= minSimilarityThreshold)
.Select(ProductMapper.ProjectToSDto)
.ToListAsync(cancellationToken);
var categories = await _repositoryWrapper.SetRepository<ProductCategory>()
.TableNoTracking
.Where(p => FuzzySharp.Fuzz.PartialRatio(p.Name.ToLowerInvariant().Trim(), searchQuery) >= minSimilarityThreshold)
.Where(p => FuzzySharp.Fuzz.PartialRatio(p.Name.ToLower().Trim(), searchQuery) >= minSimilarityThreshold)
.Select(ProductCategoryMapper.ProjectToSDto)
.ToListAsync(cancellationToken);
@ -38,21 +38,22 @@ public class SearchService : ISearchService
public async Task<SearchResponseDto> ThumbSearchAsync(string name, CancellationToken cancellationToken = default)
{
var searchQuery = name.ToLowerInvariant().Trim();
int minSimilarityThreshold = 20;
var searchQuery = name;
var products = await _repositoryWrapper.SetRepository<Product>()
.TableNoTracking
.Where(p => FuzzySharp.Fuzz.PartialRatio(p.PersianName.ToLowerInvariant().Trim(), searchQuery) >= minSimilarityThreshold)
.OrderByDescending(p => EF.Functions.TrigramsSimilarity(p.PersianName, searchQuery))
.Take(8)
.Select(ProductMapper.ProjectToSDto)
.ToListAsync(cancellationToken);
var categories = await _repositoryWrapper.SetRepository<ProductCategory>()
.TableNoTracking
.Where(p => FuzzySharp.Fuzz.PartialRatio(p.Name.ToLowerInvariant().Trim(), searchQuery) >= minSimilarityThreshold)
.OrderByDescending(p => EF.Functions.TrigramsSimilarity(p.Name.ToLower().Trim(), searchQuery))
.Take(8)
.Select(ProductCategoryMapper.ProjectToSDto)
.ToListAsync(cancellationToken);
return new SearchResponseDto
{
Products = products.Select(p => p.Adapt<SearchedProductResponseDto>()).ToList(),

2
Netina.Infrastructure/Marten/MartenRepositoryWrapper.cs
View File

@ -1,6 +1,4 @@
using Marten;
using Netina.Common.Models.Entity;
using Netina.Repository.Repositories.Marten;
namespace Netina.Infrastructure.Marten;

10
Netina.Repository/Models/ApplicationContext.cs
View File

@ -1,5 +1,6 @@
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
using System.Reflection.Emit;
namespace Netina.Repository.Models;
@ -26,6 +27,10 @@ public class ApplicationContext : IdentityDbContext<ApplicationUser, Application
_logger.LogInformation($"!!!!!!! RegisterAllEntities : {stopwatch.ElapsedMilliseconds}ms !!!!!!!");
builder.HasPostgresExtension("pg_trgm");
builder.HasPostgresExtension("fuzzystrmatch");
builder.HasDbFunction(() => FuzzyStringMatchDifference(default, default));
RenameIdentityTables(builder);
builder.RegisterEntityTypeConfiguration(entitiesAssembly);
builder.AddPluralizingTableNameConvention();
@ -33,6 +38,11 @@ public class ApplicationContext : IdentityDbContext<ApplicationUser, Application
//builder.AddSequentialGuidForIdConvention();
}
[DbFunction("difference", Schema = "public")]
public static int FuzzyStringMatchDifference(string source, string target)
{
throw new NotImplementedException();
}
protected void RenameIdentityTables(ModelBuilder builder)
{

1
Netina.Repository/Services/DbInitializerService.cs
View File

@ -33,6 +33,7 @@ public class DbInitializerService : IDbInitializerService
try
{
_context.Database.Migrate();
_context.Database.ExecuteSqlRaw("CREATE EXTENSION IF NOT EXISTS pg_trgm");
_logger.LogInformation("Migration SUCCESS !!!!");
}
catch (Exception e)