.version

@@ -1 +1 @@
-1.0.0.1
+0.27.38.60

Netina.Api/AppSettings/appsettings.DevelopmentHamyan.json

@@ -1,7 +1,7 @@
 {
   "ConnectionStrings": {
     "PostgresServer": "User ID=postgres;Password=root;Host=localhost;Port=5432;Database=iGarsonDB;",
-    "Postgres": "Host=pg-0,pg-1;Username=igarsonAgent;Password=xHTpBf4wC+bBeNg2pL6Ga7VEWKFJx7VPEUpqxwPFfOc2YYTVwFQuHfsiqoVeT9+6;Database=HamyanDB;Load Balance Hosts=true;Target Session Attributes=primary;Application Name=iGLS",
+    "Postgres": "Host=pg-0,pg-1;Username=igarsonAgent;Password=xHTpBf4wC+bBeNg2pL6Ga7VEWKFJx7VPEUpqxwPFfOc2YYTVwFQuHfsiqoVeT9+6;Database=NetinaShopDB02;Load Balance Hosts=true;Target Session Attributes=primary;Application Name=iGLS",
     "MartenDB": "Host=pg-0,pg-1;Username=igarsonAgent;Password=xHTpBf4wC+bBeNg2pL6Ga7VEWKFJx7VPEUpqxwPFfOc2YYTVwFQuHfsiqoVeT9+6;Database=NetinaShopMartenDB;"
   },
   "Logging": {
@@ -13,8 +13,11 @@
       "Microsoft.AspNetCore.Http.Connections": "Debug"
     }
   },
+  "ShopSettings": {
+    "TaxesFee": 9
+  },
   "SiteSettings": {
-    "BaseUrl": "https://api.hamyanedalat.com",
+    "BaseUrl": "http://localhost:32770",
     "WebSiteUrl": "https://hamyanedalat.com",
     "AdminPanelBaseUrl": "https://admin.hamyanedalat.com",
     "StorageBaseUrl": "https://storage.hamyanedalat.com",
@@ -25,14 +28,18 @@
       "Email": "avvampier@gmail.com",
       "Password": "2Tsr87RWRn5T",
       "Phone": "09214802813",
-      "RoleName": "RootAdmin"
+      "RoleName": "RootAdmin",
+      "FirstName": "همه کاره",
+      "LastName": "سیستم"
     },
     "Manager": {
       "Username": "09122171024",
       "Email": "kamran_mirzayi@gmail.com",
       "Password": "YAWEheKEi7gh",
       "Phone": "09128387004",
-      "RoleName": "Manager"
+      "RoleName": "Manager",
+      "FirstName": "کامران",
+      "LastName": "میرزایی"
     },
     "StorageSetting": {
       "AccessKey": "de129835-b43a-4552-8ed4-865e2635ab3d",

Netina.Api/Controllers/SeedController.cs

@@ -17,8 +17,6 @@ public class SeedController : ICarterModule
             var group = app.NewVersionedApi("Seed")
                 .MapGroup("api/seed");
 
-            group.MapPost("sitemap", CreateSiteMapAsync)
-                .HasApiVersion(1.0);
 
             group.MapPost("product/categories", SeedCategoriesAsync)
                 .WithDisplayName("SeedCategoriesAsync")
@@ -45,16 +43,6 @@ public class SeedController : ICarterModule
 
     }
 
-    public async Task<IResult> CreateSiteMapAsync([FromQuery] string key, ISiteMapService siteMapService, CancellationToken cancellationToken)
-    {
-        if (key != "kKAYskyG8xPxKnJrHkuYxub4Ao2bnz7AOmNtwDT0RaqzaG7ZvbvaP29tCrC8wJ823RczJFXOIQT2bDOec4F38A==")
-            throw new AppException("Key is not valid", ApiResultStatusCode.UnAuthorized);
-
-        await siteMapService.CreateSiteMapAsync();
-
-        return TypedResults.Ok();
-    }
-
     public async Task<IResult> SeedProductsAsync([FromBody] List<CreateProductCommand> request, [FromQuery] string key, IMediator mediator, CancellationToken cancellationToken)
     {
         if (key != "kKAYskyG8xPxKnJrHkuYxub4Ao2bnz7AOmNtwDT0RaqzaG7ZvbvaP29tCrC8wJ823RczJFXOIQT2bDOec4F38A==")

Netina.Api/Netina.Api.csproj

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

Netina.Api/Program.cs

@@ -1,4 +1,3 @@
-using Netina.Api.WebFramework.ScalarUi;
 using Netina.Repository.Behaviors;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -9,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");
 }
 
@@ -98,13 +97,12 @@ var app = builder.Build();
 
 
 // Configure the HTTP request pipeline.
-
+if (app.Environment.IsDevelopment())
-//app.UseCustomSwagger(siteSetting.BaseUrl);
+{
-app.UseSwagger();
+    //app.UseSwagger();
-app.MapScalarUi();
+    //app.UseSwaggerUI();
-//app.UseSwaggerUI();
+}
-
+else
-if (app.Environment.IsProduction())
 {
     app.UseHsts();
 }
@@ -115,6 +113,7 @@ app.UseCors(x => x
     .AllowCredentials());
 app.UseHttpsRedirection();
 
+app.UseCustomSwagger(siteSetting.BaseUrl);
 
 app.UseAuthorization();
 app.UseAuthentication();

Netina.Api/Properties/launchSettings.json

@@ -21,7 +21,7 @@
     "Docker": {
       "commandName": "Docker",
       "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/scalar/v1",
+      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
       "environmentVariables": {
         "ASPNETCORE_URLS": "http://+:80"
       },

Netina.Api/WebFramework/ScalarUi/ScalarUiConfiguration.cs

@@ -1,44 +0,0 @@
-namespace Netina.Api.WebFramework.ScalarUi;
-
-public static class ScalarUiConfiguration
-{
-    public static void MapScalarUi(this IEndpointRouteBuilder app)
-    {
-        app.MapGet("/scalar/{documentName}", (string documentName) =>
-        {
-
-            var scalarScript = $$"""
-                                 <!doctype html>
-                                 <html>
-                                   <head>
-                                     <title>Scalar API Reference</title>
-                                     <meta charset="utf-8" />
-                                     <meta
-                                       name="viewport"
-                                       content="width=device-width, initial-scale=1" />
-                                   </head>
-                                   <body>
-                                     <!-- Add your own OpenAPI/Swagger specification URL here: -->
-                                     <!-- Note: The example is our public proxy (to avoid CORS issues). You can remove the `data-proxy-url` attribute if you don’t need it. -->
-                                     <script
-                                       id="api-reference"
-                                       data-url="/swagger/{{documentName}}/swagger.json"></script>
-                                 
-                                     <!-- Optional: You can set a full configuration object like this: -->
-                                     <script>
-                                       var configuration = {
-                                         theme: 'bluePlanet',
-                                       }
-                                 
-                                       document.getElementById('api-reference').dataset.configuration =
-                                         JSON.stringify(configuration)
-                                     </script>
-                                     <script src="https://cdn.jsdelivr.net/npm/@scalar/api-reference"></script>
-                                   </body>
-                                 </html>
-                                 """;
-
-            return Results.Content(scalarScript, "text/html");
-        }).ExcludeFromDescription();
-    }
-}

Netina.Core/BaseServices/SiteMapService.cs

@@ -1,6 +1,8 @@
 using System.IO.Compression;
 using System.Xml;
 using Netina.Core.Models;
+using Netina.Domain.Entities.Blogs;
+using Netina.Domain.Entities.Brands;
 using Netina.Domain.Entities.ProductCategories;
 
 namespace Netina.Core.BaseServices;

Netina.Core/CoreServices/SearchService.cs

@@ -1,4 +1,6 @@
-using Netina.Domain.Dtos.ResponseDtos.Zarehbin;
+using MediatR;
+using Netina.Domain.Dtos.ResponseDtos.Torob;
+using Netina.Domain.Dtos.ResponseDtos.Zarehbin;
 using Netina.Domain.Entities.ProductCategories;
 
 namespace Netina.Core.CoreServices;
@@ -13,16 +15,17 @@ public class SearchService : ISearchService
     }
     public async Task<SearchResponseDto> SearchAsync(string name, CancellationToken cancellationToken = default)
     {
-        var searchQuery = name;
+        var searchQuery = name.ToLower().Trim();
+        int minSimilarityThreshold = 20;
         var products = await _repositoryWrapper.SetRepository<Product>()
             .TableNoTracking
-            .OrderByDescending(p => EF.Functions.TrigramsSimilarity(p.PersianName, searchQuery))
+            .Where(p => FuzzySharp.Fuzz.PartialRatio(p.PersianName.ToLower().Trim(), searchQuery) >= minSimilarityThreshold)
             .Select(ProductMapper.ProjectToSDto)
             .ToListAsync(cancellationToken);
 
         var categories = await _repositoryWrapper.SetRepository<ProductCategory>()
             .TableNoTracking
-            .OrderByDescending(p => EF.Functions.TrigramsSimilarity(p.Name, searchQuery))
+            .Where(p => FuzzySharp.Fuzz.PartialRatio(p.Name.ToLower().Trim(), searchQuery) >= minSimilarityThreshold)
             .Select(ProductCategoryMapper.ProjectToSDto)
             .ToListAsync(cancellationToken);
 

Netina.Core/Utilities/ImageConvertor.cs

@@ -1,4 +1,5 @@
-using SixLabors.ImageSharp;
+using Netina.Common.Models.Api;
+using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Processing;
 
 namespace Netina.Core.Utilities;

Netina.Repository/Migrations/20240528071721_EditBlogCategoryAddIsMain.cs

@@ -1,77 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace NetinaShop.Repository.Migrations
-{
-    /// <inheritdoc />
-    public partial class EditBlogCategoryAddIsMain : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterDatabase()
-                .Annotation("Npgsql:PostgresExtension:fuzzystrmatch", ",,")
-                .Annotation("Npgsql:PostgresExtension:pg_trgm", ",,");
-
-            migrationBuilder.AddColumn<bool>(
-                name: "IsMain",
-                schema: "public",
-                table: "BlogCategories",
-                type: "boolean",
-                nullable: false,
-                defaultValue: false);
-
-            migrationBuilder.AddColumn<Guid>(
-                name: "ParentId",
-                schema: "public",
-                table: "BlogCategories",
-                type: "uuid",
-                nullable: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BlogCategories_ParentId",
-                schema: "public",
-                table: "BlogCategories",
-                column: "ParentId");
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_BlogCategories_BlogCategories_ParentId",
-                schema: "public",
-                table: "BlogCategories",
-                column: "ParentId",
-                principalSchema: "public",
-                principalTable: "BlogCategories",
-                principalColumn: "Id");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_BlogCategories_BlogCategories_ParentId",
-                schema: "public",
-                table: "BlogCategories");
-
-            migrationBuilder.DropIndex(
-                name: "IX_BlogCategories_ParentId",
-                schema: "public",
-                table: "BlogCategories");
-
-            migrationBuilder.DropColumn(
-                name: "IsMain",
-                schema: "public",
-                table: "BlogCategories");
-
-            migrationBuilder.DropColumn(
-                name: "ParentId",
-                schema: "public",
-                table: "BlogCategories");
-
-            migrationBuilder.AlterDatabase()
-                .OldAnnotation("Npgsql:PostgresExtension:fuzzystrmatch", ",,")
-                .OldAnnotation("Npgsql:PostgresExtension:pg_trgm", ",,");
-        }
-    }
-}

Netina.Repository/Migrations/ApplicationContextModelSnapshot.cs

@@ -21,8 +21,6 @@ namespace NetinaShop.Repository.Migrations
                 .HasAnnotation("ProductVersion", "8.0.4")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
-            NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "fuzzystrmatch");
-            NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "pg_trgm");
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<System.Guid>", b =>
@@ -285,9 +283,6 @@ namespace NetinaShop.Repository.Migrations
                         .IsRequired()
                         .HasColumnType("text");
 
-                    b.Property<bool>("IsMain")
-                        .HasColumnType("boolean");
-
                     b.Property<bool>("IsRemoved")
                         .HasColumnType("boolean");
 
@@ -302,9 +297,6 @@ namespace NetinaShop.Repository.Migrations
                         .IsRequired()
                         .HasColumnType("text");
 
-                    b.Property<Guid?>("ParentId")
-                        .HasColumnType("uuid");
-
                     b.Property<DateTime>("RemovedAt")
                         .HasColumnType("timestamp without time zone");
 
@@ -318,8 +310,6 @@ namespace NetinaShop.Repository.Migrations
 
                     b.HasKey("Id");
 
-                    b.HasIndex("ParentId");
-
                     b.ToTable("BlogCategories", "public");
                 });
 
@@ -1710,15 +1700,6 @@ namespace NetinaShop.Repository.Migrations
                     b.Navigation("Category");
                 });
 
-            modelBuilder.Entity("Netina.Domain.Entities.Blogs.BlogCategory", b =>
-                {
-                    b.HasOne("Netina.Domain.Entities.Blogs.BlogCategory", "Parent")
-                        .WithMany()
-                        .HasForeignKey("ParentId");
-
-                    b.Navigation("Parent");
-                });
-
             modelBuilder.Entity("Netina.Domain.Entities.Discounts.Discount", b =>
                 {
                     b.HasOne("Netina.Domain.Entities.Users.Marketer", "Marketer")