add version 0.27.38.60 , fix search service

.version

@@ -1 +1 @@
-0.27.37.59
+0.27.38.60

Netina.Api/Netina.Api.csproj

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

Netina.Api/Program.cs

@@ -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");
 }
 

Netina.Core/Abstracts/IStorageService.cs

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

Netina.Core/CoreServices/SearchService.cs

@@ -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,18 +38,19 @@ public class SearchService : ISearchService
 
     public async Task<SearchResponseDto> ThumbSearchAsync(string name, CancellationToken cancellationToken = default)
     {
-        var searchQuery = name.ToLowerInvariant().Trim();
+        var searchQuery = name;
-        int minSimilarityThreshold = 20;
+
         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);
         

Netina.Infrastructure/Marten/MartenRepositoryWrapper.cs

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

Netina.Repository/Models/ApplicationContext.cs

@@ -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)
     {

Netina.Repository/Services/DbInitializerService.cs

@@ -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)