Kullanıcı Detayları ve Avatar

SubForms kısmında ListFormCode dahil edildi

.github/instructions/ai.instructions.md

@@ -101,7 +101,8 @@ Driven by:
 - ListForm
 - ListFormFields
 - ListFormCustomization (UserUiFilter, GridState, ServerJoin, ServerWhere)
-- ListFormImport and ListFormImportExecute
+- ListFormImport and ListFormImportLog
+- ListFormWorkflow
 - ListFormJsonRow operations
 
 Capabilities:

api/.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "volo.abp.cli": {
-      "version": "9.0.2",
+      "version": "10.0.0",
       "commands": [
         "abp"
       ]

api/.gitignore

@@ -268,3 +268,8 @@ src/Sozsoft.Platform.Blazor.Server.Tiered/Logs/*
 # DevExpress License - DO NOT commit to repository
 **/DevExpress_License.txt
 DevExpress_License.txt
+
+# Local cache files
+*.lscache
+lscache/
+**/lscache/

api/Directory.Build.props

@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);CS0162;CS8321;CS8618;CS8632</NoWarn>
+  </PropertyGroup>
+</Project>

api/Sozsoft.Platform.DbMigrator.Dockerfile

@@ -1,7 +1,13 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build
+FROM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS build
 ENV DOTNET_NUGET_SIGNATURE_VERIFICATION=false
 WORKDIR /app
 
+COPY global.json ./
+COPY common.props ./
+COPY "modules/Sozsoft.Languages/common.props" "modules/Sozsoft.Languages/"
+COPY "modules/Sozsoft.Notifications/common.props" "modules/Sozsoft.Notifications/"
+COPY "modules/Sozsoft.Settings/common.props" "modules/Sozsoft.Settings/"
+COPY "modules/Sozsoft.SqlQueryManager/common.props" "modules/Sozsoft.SqlQueryManager/"
 COPY "modules/Sozsoft.Languages/Sozsoft.Languages.Application.Contracts/Sozsoft.Languages.Application.Contracts.csproj" "modules/Sozsoft.Languages/Sozsoft.Languages.Application.Contracts/"
 COPY "modules/Sozsoft.Languages/Sozsoft.Languages.Domain/Sozsoft.Languages.Domain.csproj" "modules/Sozsoft.Languages/Sozsoft.Languages.Domain/"
 COPY "modules/Sozsoft.Languages/Sozsoft.Languages.Domain.Shared/Sozsoft.Languages.Domain.Shared.csproj" "modules/Sozsoft.Languages/Sozsoft.Languages.Domain.Shared/"
@@ -30,7 +36,7 @@ RUN dotnet restore "src/Sozsoft.Platform.DbMigrator/Sozsoft.Platform.DbMigrator.
 COPY . .
 RUN dotnet publish "src/Sozsoft.Platform.DbMigrator/Sozsoft.Platform.DbMigrator.csproj" -c Release -o /app/publish --no-restore
 
-FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS final
+FROM mcr.microsoft.com/dotnet/aspnet:10.0-alpine AS final
 
 # DevExpress License Key - runtime'da da gerekli
 ARG DevExpress_License

api/Sozsoft.Platform.HttpApi.Host.Dockerfile

@@ -1,9 +1,15 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build
+FROM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS build
 ENV DOTNET_NUGET_SIGNATURE_VERIFICATION=false
 WORKDIR /app
 RUN apk update && apk upgrade
 RUN apk add nodejs~=24 npm~=11
 
+COPY global.json ./
+COPY common.props ./
+COPY "modules/Sozsoft.Languages/common.props" "modules/Sozsoft.Languages/"
+COPY "modules/Sozsoft.Notifications/common.props" "modules/Sozsoft.Notifications/"
+COPY "modules/Sozsoft.Settings/common.props" "modules/Sozsoft.Settings/"
+COPY "modules/Sozsoft.SqlQueryManager/common.props" "modules/Sozsoft.SqlQueryManager/"
 COPY .config/dotnet-tools.json .config/dotnet-tools.json
 RUN dotnet tool restore
 ENV PATH="/root/.dotnet/tools:/app/.config/dotnet/tools:${PATH}"
@@ -54,7 +60,7 @@ RUN mkdir -p publish
 RUN dotnet publish "src/Sozsoft.Platform.HttpApi.Host/Sozsoft.Platform.HttpApi.Host.csproj" -c Release -o /app/publish --no-restore
 RUN dotnet publish "src/Sozsoft.Platform.DbMigrator/Sozsoft.Platform.DbMigrator.csproj" -c Release -o /app/migrator
 
-FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS final
+FROM mcr.microsoft.com/dotnet/aspnet:10.0-alpine AS final
 
 # DevExpress License Key - runtime'da da gerekli
 ARG DevExpress_License
@@ -75,6 +81,7 @@ RUN mkdir -p $HOME/.config/DevExpress && \
 # fontconfig ve fonts-* DevExpress reporting için gerekli
 RUN apk update 
 RUN apk add --no-cache \
+    tzdata \
     icu-data-full \
     icu-libs \
     libgdiplus \

api/common.props

@@ -16,4 +16,10 @@
     <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\*\*.abppkg*.json" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="MailKit" Version="4.16.0" />
+    <PackageReference Include="MimeKit" Version="4.16.0" />
+    <PackageReference Include="Scriban" Version="7.2.3" />
+  </ItemGroup>
+
 </Project>

api/global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.101",
+    "version": "10.0.300",
     "rollForward": "latestMajor"
   }
 }

api/modules/Sozsoft.Languages/Sozsoft.Languages.Application.Contracts/Permissions/LanguagesPermissionDefinitionProvider.cs

@@ -1,6 +1,4 @@
-using Sozsoft.Languages.Localization;
 using Volo.Abp.Authorization.Permissions;
-using Volo.Abp.Localization;
 
 namespace Sozsoft.Languages.Permissions;
 
@@ -8,12 +6,5 @@ public class LanguagesPermissionDefinitionProvider : PermissionDefinitionProvide
 {
     public override void Define(IPermissionDefinitionContext context)
     {
-        var myGroup = context.AddGroup(LanguagesPermissions.GroupName, L("Permission:Languages"));
-    }
-
-    private static LocalizableString L(string name)
-    {
-        return LocalizableString.Create<LanguagesResource>(name);
     }
 }
-

api/modules/Sozsoft.Languages/Sozsoft.Languages.Application.Contracts/Sozsoft.Languages.Application.Contracts.csproj

@@ -3,13 +3,13 @@
   <Import Project="..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>Sozsoft.Languages</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.Authorization" Version="9.0.2" />
+    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.Authorization" Version="10.0.0" />
     <ProjectReference Include="..\Sozsoft.Languages.Domain.Shared\Sozsoft.Languages.Domain.Shared.csproj" />
   </ItemGroup>
 

api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguagesApplicationAutoMapperProfile.cs

@@ -1,29 +0,0 @@
-using AutoMapper;
-using Sozsoft.Languages.Entities;
-using Volo.Abp.AutoMapper;
-using Volo.Abp.Localization;
-
-namespace Sozsoft.Languages;
-
-public class LanguagesApplicationAutoMapperProfile : Profile
-{
-    public LanguagesApplicationAutoMapperProfile()
-    {
-        CreateMap<Language, LanguageInfo>();
-        CreateMap<Language, LanguageDto>();
-        CreateMap<LanguageKey, LanguageKeyDto>();
-        CreateMap<LanguageText, LanguageTextDto>();
-        CreateMap<LanguageText, LanguageTextEto>();
-
-        CreateMap<LanguageTextCreateUpdateDto, LanguageText>()
-            .IgnoreAllPropertiesWithAnInaccessibleSetter()
-            .ForMember(dest => dest.LanguageKey, opt => opt.Ignore());
-
-        CreateMap<LanguageKey, LanguageTextTranslatedDto>()
-            .ForMember(d => d.Key, o => o.MapFrom(s => s.Key))
-            .ForMember(d => d.ResourceName, o => o.MapFrom(s => s.ResourceName))
-            .ForAllMembers(o => o.Ignore());
-
-    }
-}
-

api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguagesApplicationMappers.cs

@@ -0,0 +1,122 @@
+using Sozsoft.Languages.Entities;
+using Volo.Abp.Localization;
+using Riok.Mapperly.Abstractions;
+using Volo.Abp.Mapperly;
+
+namespace Sozsoft.Languages;
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class LanguageToLanguageInfoMapper : MapperBase<Language, LanguageInfo>
+{
+    public override partial LanguageInfo Map(Language source);
+
+    public override partial void Map(Language source, LanguageInfo destination);
+
+    public override void BeforeMap(Language source)
+    {
+    }
+
+    public override void AfterMap(Language source, LanguageInfo destination)
+    {
+    }
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class LanguageToLanguageDtoMapper : MapperBase<Language, LanguageDto>
+{
+    public override partial LanguageDto Map(Language source);
+
+    public override partial void Map(Language source, LanguageDto destination);
+
+    public override void BeforeMap(Language source)
+    {
+    }
+
+    public override void AfterMap(Language source, LanguageDto destination)
+    {
+    }
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class LanguageKeyToLanguageKeyDtoMapper : MapperBase<LanguageKey, LanguageKeyDto>
+{
+    public override partial LanguageKeyDto Map(LanguageKey source);
+
+    public override partial void Map(LanguageKey source, LanguageKeyDto destination);
+
+    public override void BeforeMap(LanguageKey source)
+    {
+    }
+
+    public override void AfterMap(LanguageKey source, LanguageKeyDto destination)
+    {
+    }
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class LanguageTextToLanguageTextDtoMapper : MapperBase<LanguageText, LanguageTextDto>
+{
+    public override partial LanguageTextDto Map(LanguageText source);
+
+    public override partial void Map(LanguageText source, LanguageTextDto destination);
+
+    public override void BeforeMap(LanguageText source)
+    {
+    }
+
+    public override void AfterMap(LanguageText source, LanguageTextDto destination)
+    {
+    }
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class LanguageTextToLanguageTextEtoMapper : MapperBase<LanguageText, LanguageTextEto>
+{
+    public override partial LanguageTextEto Map(LanguageText source);
+
+    public override partial void Map(LanguageText source, LanguageTextEto destination);
+
+    public override void BeforeMap(LanguageText source)
+    {
+    }
+
+    public override void AfterMap(LanguageText source, LanguageTextEto destination)
+    {
+    }
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class LanguageTextCreateUpdateDtoToLanguageTextMapper : MapperBase<LanguageTextCreateUpdateDto, LanguageText>
+{
+    [MapperIgnoreTarget(nameof(LanguageText.LanguageKey))]
+    public override partial LanguageText Map(LanguageTextCreateUpdateDto source);
+
+    [MapperIgnoreTarget(nameof(LanguageText.LanguageKey))]
+    public override partial void Map(LanguageTextCreateUpdateDto source, LanguageText destination);
+
+    public override void BeforeMap(LanguageTextCreateUpdateDto source)
+    {
+    }
+
+    public override void AfterMap(LanguageTextCreateUpdateDto source, LanguageText destination)
+    {
+    }
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class LanguageKeyToLanguageTextTranslatedDtoMapper : MapperBase<LanguageKey, LanguageTextTranslatedDto>
+{
+    [MapperIgnoreTarget(nameof(LanguageTextTranslatedDto.Id))]
+    public override partial LanguageTextTranslatedDto Map(LanguageKey source);
+
+    [MapperIgnoreTarget(nameof(LanguageTextTranslatedDto.Id))]
+    public override partial void Map(LanguageKey source, LanguageTextTranslatedDto destination);
+
+    public override void BeforeMap(LanguageKey source)
+    {
+    }
+
+    public override void AfterMap(LanguageKey source, LanguageTextTranslatedDto destination)
+    {
+    }
+}

api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguagesApplicationModule.cs

@@ -1,6 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Application;
-using Volo.Abp.AutoMapper;
+using Volo.Abp.Mapperly;
 using Volo.Abp.Modularity;
 
 namespace Sozsoft.Languages;
@@ -9,18 +9,13 @@ namespace Sozsoft.Languages;
     typeof(LanguagesDomainModule),
     typeof(LanguagesApplicationContractsModule),
     typeof(AbpDddApplicationModule),
-    typeof(AbpAutoMapperModule)
+    typeof(AbpMapperlyModule)
     )]
 public class LanguagesApplicationModule : AbpModule
 {
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        context.Services.AddAutoMapperObjectMapper<LanguagesApplicationModule>();
-
-        Configure<AbpAutoMapperOptions>(options =>
-        {
-            options.AddMaps<LanguagesApplicationModule>(validate: true);
-        });
+        context.Services.AddMapperlyObjectMapper<LanguagesApplicationModule>();
     }
 }
 

api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/Sozsoft.Languages.Application.csproj

@@ -3,14 +3,14 @@
   <Import Project="..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>Sozsoft.Languages</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.AutoMapper" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.Ddd.Application" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="9.0.2" />
+    <PackageReference Include="Volo.Abp.Mapperly" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.Ddd.Application" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="10.0.0" />
     <ProjectReference Include="..\Sozsoft.Languages.Application.Contracts\Sozsoft.Languages.Application.Contracts.csproj" />
     <ProjectReference Include="..\Sozsoft.Languages.Domain\Sozsoft.Languages.Domain.csproj" />
   </ItemGroup>

api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain.Shared/Sozsoft.Languages.Domain.Shared.csproj

@@ -1,19 +1,19 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
+    <TargetFramework>net10.0</TargetFramework>
+    <GenerateEmbeddedFilesManifest>false</GenerateEmbeddedFilesManifest>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Domain.Shared" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.Validation" Version="9.0.2" />
+    <PackageReference Include="Volo.Abp.Ddd.Domain.Shared" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.Validation" Version="10.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0" />
   </ItemGroup>
 
 </Project>

api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain/Sozsoft.Languages.Domain.csproj

@@ -3,13 +3,13 @@
   <Import Project="..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>Sozsoft.Languages</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="9.0.2" />
+    <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="10.0.0" />
     <ProjectReference Include="..\Sozsoft.Languages.Domain.Shared\Sozsoft.Languages.Domain.Shared.csproj" />
   </ItemGroup>
 

api/modules/Sozsoft.Languages/Sozsoft.Languages.EntityFrameworkCore/Sozsoft.Languages.EntityFrameworkCore.csproj

@@ -3,12 +3,12 @@
   <Import Project="..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>Sozsoft.Languages</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="9.0.2" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="10.0.0" />
     <ProjectReference Include="..\Sozsoft.Languages.Domain\Sozsoft.Languages.Domain.csproj" />
   </ItemGroup>
 

api/modules/Sozsoft.Languages/common.props

@@ -7,11 +7,14 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="ConfigureAwait.Fody" Version="3.3.1" PrivateAssets="All" />
-    <PackageReference Include="Fody" Version="6.5.3">
+    <PackageReference Include="ConfigureAwait.Fody" Version="3.4.0" PrivateAssets="All" />
+    <PackageReference Include="Fody" Version="6.9.3">
       <PrivateAssets>All</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="MailKit" Version="4.16.0" />
+    <PackageReference Include="MimeKit" Version="4.16.0" />
+    <PackageReference Include="Scriban" Version="7.2.3" />
   </ItemGroup>
 
 

api/modules/Sozsoft.MailQueue/Application/MailQueueAutoMapperProfile.cs

@@ -1,13 +0,0 @@
-using AutoMapper;
-
-namespace Sozsoft.MailQueue.Application;
-
-public class MailQueueAutoMapperProfile : Profile
-{
-    public MailQueueAutoMapperProfile()
-    {
-
-
-    }
-}
-

api/modules/Sozsoft.MailQueue/Application/MailQueueMappers.cs

@@ -0,0 +1 @@
+namespace Sozsoft.MailQueue.Application;

api/modules/Sozsoft.MailQueue/Domain/MailTracking/MailTrackingManager.cs

@@ -31,6 +31,8 @@ public class MailTrackingManager : DomainService
     /// <returns></returns>
     public async Task StartAsync()
     {
+        // https://us-east-1.console.aws.amazon.com/iam/home?region=eu-central-1#/users
+        // https://eu-central-1.console.aws.amazon.com/ses/home?region=eu-central-1#/identities/system%40sozsoft.com?tabId=authentication
         var accessKey = configuration.GetValue<string>(AmazonSesEmailSettingNames.AccessKey);
         var accessKeyId = configuration.GetValue<string>(AmazonSesEmailSettingNames.AccessKeyId);
         var region = configuration.GetValue<string>(AmazonSesEmailSettingNames.Region);

api/modules/Sozsoft.MailQueue/Sozsoft.MailQueue.csproj

@@ -1,10 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
-    <NoWarn>$(NoWarn);CS8632</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,22 +18,25 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.BackgroundJobs" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.Validation" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.Authorization" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.AutoMapper" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.Ddd.Application" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.TextTemplating.Razor" Version="9.0.2" />
+    <PackageReference Include="Volo.Abp.BackgroundJobs" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.Validation" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.Authorization" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.Mapperly" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.Ddd.Application" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.TextTemplating.Razor" Version="10.0.0" />
+    <PackageReference Include="MailKit" Version="4.16.0" />
+    <PackageReference Include="MimeKit" Version="4.16.0" />
+    <PackageReference Include="Scriban" Version="7.2.3" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="AWSSDK.SQS" Version="3.7.400" />
     <PackageReference Include="ClosedXML" Version="0.104.2" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0" />
     <PackageReference Include="Wkhtmltopdf.NetCore" Version="3.0.2" />
   </ItemGroup>
 

api/modules/Sozsoft.MailQueue/SozsoftMailQueueModule.cs

@@ -6,7 +6,7 @@ using Microsoft.CodeAnalysis;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Application;
 using Volo.Abp.Authorization;
-using Volo.Abp.AutoMapper;
+using Volo.Abp.Mapperly;
 using Volo.Abp.Domain;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.Localization;
@@ -22,7 +22,7 @@ namespace Sozsoft.MailQueue;
     typeof(AbpDddDomainModule),
     typeof(AbpDddApplicationModule),
     typeof(AbpDddApplicationContractsModule),
-    typeof(AbpAutoMapperModule),
+    typeof(AbpMapperlyModule),
     typeof(AbpAuthorizationModule),
     typeof(AbpEntityFrameworkCoreModule),
     typeof(AbpTextTemplatingRazorModule),
@@ -32,11 +32,7 @@ public class ErpMailQueueModule : AbpModule
 {
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        context.Services.AddAutoMapperObjectMapper<ErpMailQueueModule>();
-        Configure<AbpAutoMapperOptions>(options =>
-        {
-            options.AddMaps<ErpMailQueueModule>(validate: true);
-        });
+        context.Services.AddMapperlyObjectMapper<ErpMailQueueModule>();
 
         Configure<AbpLocalizationOptions>(options =>
         {

api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application.Contracts/NotificationRules/CreateUpdateNotificationRuleDto.cs

@@ -1,9 +1,11 @@
-namespace Sozsoft.Notifications.NotificationRules;
+using System;
+
+namespace Sozsoft.Notifications.NotificationRules;
 
 public class CreateUpdateNotificationRuleDto
 {
     public string Channel { get; set; }
-    public string NotificationType { get; set; }
+    public Guid NotificationTypeId { get; set; }
     public bool IsActive { get; set; }
 }
 

api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application.Contracts/NotificationRules/INotificationRuleAppService.cs

@@ -12,11 +12,10 @@ public interface INotificationRuleAppService : ICrudAppService<
     PagedAndSortedResultRequestDto,
     CreateUpdateNotificationRuleDto>
 {
-    string[] GetNotificationTypes();
+    Task<string[]> GetNotificationTypes();
     Task<string[]> GetMyNotificationTypesAsync();
     Task<List<NotificationRuleDto>> GetMyNotificationRules();
     Task PostMyNotificationRule(CreateUpdateNotificationRuleDto Input);
-    Task DeleteMyNotificationRules(string NotificationType);
-
+    Task DeleteMyNotificationRules(Guid NotificationTypeId);
 }
 

api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application.Contracts/NotificationRules/NotificationRuleDto.cs

@@ -5,7 +5,7 @@ namespace Sozsoft.Notifications.NotificationRules;
 
 public class NotificationRuleDto : FullAuditedEntityDto<Guid>
 {
-    public string? NotificationType { get; set; }
+    public Guid? NotificationTypeId { get; set; }
     public string? RecipientType { get; set; }
     public string? RecipientId { get; set; } //UserId, RoleId, OrganizationUnitId
     public string? Channel { get; set; }

api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application.Contracts/NotificationRules/NotificationTypeDto.cs

@@ -0,0 +1,10 @@
+using System;
+using Volo.Abp.Application.Dtos;
+
+namespace Sozsoft.Notifications.NotificationRules;
+
+public class NotificationTypeDto : FullAuditedEntityDto<Guid>
+{
+    public string Name { get; set; }
+}
+

api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application.Contracts/Permissions/NotificationPermissionDefinitionProvider.cs

@@ -1,6 +1,4 @@
-using Sozsoft.Notifications.Localization;
 using Volo.Abp.Authorization.Permissions;
-using Volo.Abp.Localization;
 
 namespace Sozsoft.Notifications.Permissions;
 
@@ -8,12 +6,5 @@ public class NotificationPermissionDefinitionProvider : PermissionDefinitionProv
 {
     public override void Define(IPermissionDefinitionContext context)
     {
-        var myGroup = context.AddGroup(NotificationPermissions.GroupName, L("Permission:Notifications"));
-    }
-
-    private static LocalizableString L(string name)
-    {
-        return LocalizableString.Create<NotificationResource>(name);
     }
 }
-

api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application.Contracts/Sozsoft.Notifications.Application.Contracts.csproj

@@ -3,14 +3,14 @@
   <Import Project="..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Sozsoft.Notifications</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.Authorization" Version="9.0.2" />
+    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.Authorization" Version="10.0.0" />
     <ProjectReference Include="..\Sozsoft.Notifications.Domain.Shared\Sozsoft.Notifications.Domain.Shared.csproj" />
   </ItemGroup>
 

api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationAppService.cs

@@ -57,10 +57,10 @@ public class NotificationAppService : ReadOnlyAppService<
 
     public async Task CreateNotificationByNotificationRuleIdAsync(NotificationRequestDto input)
     {
-        var notificationRule = await repositoryRule.GetAsync(input.Id);
+        var notificationRule = await repositoryRule.GetAsync(input.Id, true);
         if (notificationRule != null)
         {
-            await notificationManager.SendNotificationAsync(notificationRule.NotificationType, input.Message);
+            await notificationManager.SendNotificationAsync(notificationRule.NotificationTypeId, input.Message);
         }
     }
 

api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationApplicationAutoMapperProfile.cs

@@ -1,18 +0,0 @@
-using AutoMapper;
-using Sozsoft.Notifications.Entities;
-using Sozsoft.Notifications.NotificationRules;
-
-namespace Sozsoft.Notifications.Application;
-
-public class NotificationApplicationAutoMapperProfile : Profile
-{
-    public NotificationApplicationAutoMapperProfile()
-    {
-        CreateMap<NotificationRule, NotificationRuleDto>();
-        CreateMap<Notification, NotificationDto>()
-            .ForMember(d => d.CreatorFullname, o => o.Ignore())
-            .ForMember(d => d.TenantId, o => o.Ignore());
-        CreateMap<CreateUpdateNotificationRuleDto, NotificationRule>(MemberList.Source);
-    }
-}
-

api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationApplicationMappers.cs

@@ -0,0 +1,90 @@
+using Sozsoft.Notifications.Entities;
+using Sozsoft.Notifications.Domain;
+using Sozsoft.Notifications.NotificationRules;
+using Riok.Mapperly.Abstractions;
+using Volo.Abp.Mapperly;
+
+namespace Sozsoft.Notifications.Application;
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class NotificationTypeToNotificationTypeDtoMapper : MapperBase<NotificationType, NotificationTypeDto>
+{
+public override partial NotificationTypeDto Map(NotificationType source);
+
+    public override partial void Map(NotificationType source, NotificationTypeDto destination);
+
+    public override void BeforeMap(NotificationType source)
+    {
+    }
+
+    public override void AfterMap(NotificationType source, NotificationTypeDto destination)
+    {
+    }
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class NotificationRuleToNotificationRuleDtoMapper : MapperBase<NotificationRule, NotificationRuleDto>
+{
+public override partial NotificationRuleDto Map(NotificationRule source);
+
+    public override partial void Map(NotificationRule source, NotificationRuleDto destination);
+
+    public override void BeforeMap(NotificationRule source)
+    {
+    }
+
+    public override void AfterMap(NotificationRule source, NotificationRuleDto destination)
+    {
+    }
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class NotificationToNotificationDtoMapper : MapperBase<Notification, NotificationDto>
+{
+[MapperIgnoreTarget(nameof(NotificationDto.CreatorFullname))]
+    [MapperIgnoreTarget(nameof(NotificationDto.TenantId))]
+    public override partial NotificationDto Map(Notification source);
+
+    [MapperIgnoreTarget(nameof(NotificationDto.CreatorFullname))]
+    [MapperIgnoreTarget(nameof(NotificationDto.TenantId))]
+    public override partial void Map(Notification source, NotificationDto destination);
+
+    public override void BeforeMap(Notification source)
+    {
+    }
+
+    public override void AfterMap(Notification source, NotificationDto destination)
+    {
+    }
+}
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class CreateUpdateNotificationRuleDtoToNotificationRuleMapper : MapperBase<CreateUpdateNotificationRuleDto, NotificationRule>
+{
+    [MapperIgnoreTarget(nameof(NotificationRule.RecipientType))]
+    public override NotificationRule Map(CreateUpdateNotificationRuleDto source)
+    {
+        var destination = new NotificationRule
+        {
+            RecipientType = NotificationRecipientTypes.All,
+            Channel = source.Channel,
+            NotificationTypeId = source.NotificationTypeId,
+            IsActive = source.IsActive
+        };
+
+        AfterMap(source, destination);
+
+        return destination;
+    }
+
+    [MapperIgnoreTarget(nameof(NotificationRule.RecipientType))]
+    public override partial void Map(CreateUpdateNotificationRuleDto source, NotificationRule destination);
+
+    public override void BeforeMap(CreateUpdateNotificationRuleDto source)
+    {
+    }
+
+    public override void AfterMap(CreateUpdateNotificationRuleDto source, NotificationRule destination)
+    {
+    }
+}

api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationApplicationModule.cs

@@ -1,7 +1,7 @@
 using Sozsoft.Notifications.Domain;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Application;
-using Volo.Abp.AutoMapper;
+using Volo.Abp.Mapperly;
 using Volo.Abp.Modularity;
 
 namespace Sozsoft.Notifications.Application;
@@ -10,17 +10,13 @@ namespace Sozsoft.Notifications.Application;
     typeof(NotificationDomainModule),
     typeof(NotificationApplicationContractsModule),
     typeof(AbpDddApplicationModule),
-    typeof(AbpAutoMapperModule)
+    typeof(AbpMapperlyModule)
     )]
 public class NotificationApplicationModule : AbpModule
 {
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        context.Services.AddAutoMapperObjectMapper<NotificationApplicationModule>();
-        Configure<AbpAutoMapperOptions>(options =>
-        {
-            options.AddMaps<NotificationApplicationModule>(validate: true);
-        });
+        context.Services.AddMapperlyObjectMapper<NotificationApplicationModule>();
     }
 }
 

api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationRuleAppService.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using Sozsoft.Notifications.Domain;
 using Sozsoft.Notifications.Entities;
-using Sozsoft.Notifications.Enums;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp.Application.Dtos;
@@ -23,25 +22,30 @@ public class NotificationRuleAppService : CrudAppService<
     CreateUpdateNotificationRuleDto>,
     INotificationRuleAppService
 {
+    private readonly IRepository<NotificationType, Guid> repositoryType;
+    private readonly IOrganizationUnitRepository repositoryOrganizationUnit;
     private readonly IdentityUserManager userManager;
     private readonly IIdentityUserRepository repositoryUser;
-    private readonly IOrganizationUnitRepository repositoryOrganizationUnit;
 
     public NotificationRuleAppService(
+        IRepository<NotificationType, Guid> repositoryType,
         IRepository<NotificationRule, Guid> repository,
         IdentityUserManager userManager,
         IIdentityUserRepository repositoryUser,
         IOrganizationUnitRepository repositoryOrganizationUnit
     ) : base(repository)
     {
+        this.repositoryType = repositoryType;
         this.userManager = userManager;
         this.repositoryUser = repositoryUser;
         this.repositoryOrganizationUnit = repositoryOrganizationUnit;
     }
 
-    public string[] GetNotificationTypes()
+    public async Task<string[]> GetNotificationTypes()
     {
-        return NotificationTypes.GetAll();
+        var types = await repositoryType.GetListAsync();
+
+        return types.Select(a => a.Name).ToArray();
     }
 
     private void GetAllParentCodes(string code, List<string>? codes)
@@ -83,7 +87,8 @@ public class NotificationRuleAppService : CrudAppService<
     public async Task<string[]> GetMyNotificationTypesAsync()
     {
         var query = await CreateFilteredQueryAsync(new PagedAndSortedResultRequestDto());
-        return await query.Select(a => a.NotificationType).Distinct().ToArrayAsync();
+
+        return await query.Select(a => a.NotificationType.Name).Distinct().ToArrayAsync();
     }
 
     public async Task<List<NotificationRuleDto>> GetMyNotificationRules()
@@ -91,7 +96,7 @@ public class NotificationRuleAppService : CrudAppService<
         var query = await CreateFilteredQueryAsync(new PagedAndSortedResultRequestDto());
         var all = await query.ToListAsync();
         var list = all
-            .GroupBy(a => new { a.NotificationType, a.Channel })
+            .GroupBy(a => new { a.NotificationTypeId, a.Channel })
             .Select(a =>
             {
                 var item = a.FirstOrDefault(a => a.IsFixed)
@@ -101,7 +106,7 @@ public class NotificationRuleAppService : CrudAppService<
                 return new NotificationRuleDto
                 {
                     Id = item.Id,
-                    NotificationType = a.Key.NotificationType,
+                    NotificationTypeId = a.Key.NotificationTypeId,
                     Channel = a.Key.Channel,
                     IsActive = item.IsActive,
                     IsFixed = item.IsFixed,
@@ -121,13 +126,13 @@ public class NotificationRuleAppService : CrudAppService<
             a.RecipientId == CurrentUser.UserName &&
             a.IsCustomized &&
             a.Channel == Input.Channel &&
-            a.NotificationType == Input.NotificationType);
+            a.NotificationTypeId == Input.NotificationTypeId);
         if (item is null)
         {
             // insert
             item = new NotificationRule
             {
-                NotificationType = Input.NotificationType,
+                NotificationTypeId = Input.NotificationTypeId,
                 RecipientType = NotificationRecipientTypes.User,
                 RecipientId = CurrentUser.UserName,
                 Channel = Input.Channel,
@@ -144,51 +149,16 @@ public class NotificationRuleAppService : CrudAppService<
         }
     }
 
-    public async Task DeleteMyNotificationRules(string NotificationType)
+    public async Task DeleteMyNotificationRules(Guid NotificationTypeId)
     {
         var query = await CreateFilteredQueryAsync(new PagedAndSortedResultRequestDto());
         var items = await query.Where(a =>
             a.RecipientType == NotificationRecipientTypes.User &&
             a.RecipientId == CurrentUser.UserName &&
             a.IsCustomized &&
-            a.NotificationType == NotificationType)
+            a.NotificationTypeId == NotificationTypeId)
             .ToListAsync();
+
         await Repository.DeleteManyAsync(items);
     }
 }
-
-/*
-var defaultRules = await query.Where(a => !a.IsCustomized && a.IsActive)
-            .GroupBy(a => new { a.NotificationType, a.Channel })
-            .Select(a => new NotificationRuleDto
-            {
-                Id = a.FirstOrDefault(a => a.UserId != null)?.Id ?? a.First().Id,
-                NotificationType = a.Key.NotificationType,
-                Channel = a.Key.Channel,
-                IsActive = a.First().IsActive,
-                IsFixed = a.First().IsFixed,
-                IsCustomized = a.First().IsCustomized,
-            })
-            .ToListAsync();
-var customizedRules = await query.Where(a => a.IsCustomized)
-    .Select(a => new NotificationRuleDto
-    {
-        Id = a.Id,
-        NotificationType = a.NotificationType,
-        Channel = a.Channel,
-        IsActive = a.IsActive,
-        IsFixed = a.IsFixed,
-        IsCustomized = a.IsCustomized
-    })
-    .ToListAsync();
-
-//defaultRules.IsFixed
-//customizedRules - defaultRules.IsFixed
-//!defaultRules.IsFixed - customizedRules
-var list = new List<NotificationRuleDto>();
-list.AddRange(defaultRules.Where(a => a.IsFixed).ToList());
-        list.AddRange(customizedRules.Where(a => !list.Any(b => b.NotificationType == a.NotificationType && b.Channel == a.Channel)).ToList());
-        list.AddRange(defaultRules.Where(a => !a.IsFixed && !list.Any(b => b.NotificationType == a.NotificationType && b.Channel == a.Channel)).ToList());
-
-*/
-

api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/Sozsoft.Notifications.Application.csproj

@@ -3,14 +3,14 @@
   <Import Project="..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Sozsoft.Notifications</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.AutoMapper" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.Ddd.Application" Version="9.0.2" />
+    <PackageReference Include="Volo.Abp.Mapperly" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.Ddd.Application" Version="10.0.0" />
     <ProjectReference Include="..\Sozsoft.Notifications.Application.Contracts\Sozsoft.Notifications.Application.Contracts.csproj" />
     <ProjectReference Include="..\Sozsoft.Notifications.Domain\Sozsoft.Notifications.Domain.csproj" />
   </ItemGroup>

api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain.Shared/Enums/NotificationChannels.cs

@@ -2,13 +2,12 @@
 
 public static class NotificationChannels
 {
-    public const string Sms = "Sms";
-    public const string Mail = "Mail";
-    public const string Rocket = "Rocket";
+    public const string Sms = "Sms"; //SMS (ABP Sms + Posta Guvercini)
+    public const string Mail = "Mail"; //Email (ABP Emailing + Amazon SES)
+    public const string Rocket = "Rocket"; //Rocket.Chat (HTTP API)
     public const string Desktop = "Desktop"; 
-    public const string UiActivity = "UiActivity";
-    public const string UiToast = "UiToast";
-    public const string WhatsApp = "WhatsApp";
-    public const string Telegram = "Telegram";
+    public const string UiActivity = "UiActivity"; //UI Activity (ABP UI Activity)
+    public const string UiToast = "UiToast"; //UI Toast (ABP UI Toast)  Ayarlar/Sistem/Bildirimler/Chrome açık olması gerekiyor.
+    public const string WhatsApp = "WhatsApp"; //WhatsApp (HTTP API, template-based)
+    // public const string Telegram = "Telegram";
 }
-

api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain.Shared/Enums/NotificationTypes.cs

@@ -1,16 +0,0 @@
-using Volo.Abp.Reflection;
-
-namespace Sozsoft.Notifications.Enums;
-
-public static class NotificationTypes
-{
-    // public const string SiparisPasla = "SiparisPasla";
-    // public const string YeniSiparis = "YeniSiparis";
-    // public const string YeniKullanici = "YeniKullanici";
-
-    public static string[] GetAll()
-    {
-        return ReflectionHelper.GetPublicConstantsRecursively(typeof(NotificationTypes));
-    }
-}
-

api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain.Shared/Sozsoft.Notifications.Domain.Shared.csproj

@@ -3,19 +3,19 @@
   <Import Project="..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Sozsoft.Notifications</RootNamespace>
-    <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
+    <GenerateEmbeddedFilesManifest>false</GenerateEmbeddedFilesManifest>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Domain.Shared" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.Validation" Version="9.0.2" />
+    <PackageReference Include="Volo.Abp.Ddd.Domain.Shared" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.Validation" Version="10.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0" />
   </ItemGroup>
 
 </Project>

api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain/Entities/Notification.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using Volo.Abp.Domain.Entities.Auditing;
 
 namespace Sozsoft.Notifications.Entities;
@@ -7,7 +8,8 @@ public class Notification : FullAuditedEntity<Guid>
 {
     public Guid NotificationRuleId { get; set; }
     public required string NotificationChannel { get; set; }
-    public required string NotificationType { get; set; }
+    public required Guid NotificationTypeId { get; set; }
+    public virtual NotificationType NotificationType { get; set; }
 
     // Bildirim tipine göre bildirimi alacak olan hedef bilgisini içerir
     public required string Identifier { get; set; } //UserId, Email, PhoneNumber.. 

api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain/Entities/NotificationRule.cs

@@ -6,7 +6,9 @@ namespace Sozsoft.Notifications.Entities;
 
 public class NotificationRule : FullAuditedEntity<Guid>
 {
-    public required string NotificationType { get; set; }
+    public required Guid NotificationTypeId { get; set; }
+    public NotificationType NotificationType { get; set; } 
+    
     /// <summary>
     /// Alıcı Tipi: User, Role, Organization, All, Custom
     /// User ise RecipientId UserId olacak

api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain/Entities/NotificationType.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace Sozsoft.Notifications.Entities;
+
+public class NotificationType : FullAuditedEntity<Guid>
+{
+    public required string Name { get; set; }
+
+    public virtual ICollection<NotificationRule> NotificationRules { get; set; } = [];
+    public ICollection<Notification> Notifications { get; set; } = [];
+}

api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain/NotificationIdentifierProvider.cs

@@ -40,7 +40,7 @@ public class NotificationIdentifierProvider : INotificationIdentifierProvider
             NotificationChannels.UiActivity => user.Id.ToString(),
             NotificationChannels.UiToast => user.Id.ToString(),
             NotificationChannels.WhatsApp => user.PhoneNumber,
-            NotificationChannels.Telegram => user.PhoneNumber,
+            // NotificationChannels.Telegram => user.PhoneNumber,
             _ => null,
         };
 

api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain/NotificationManager.cs

@@ -13,12 +13,13 @@ namespace Sozsoft.Notifications.Domain;
 
 public interface INotificationManager : ITransientDependency
 {
-    Task SendNotificationAsync(string NotificationType, string NotificationMessage);
+    Task SendNotificationAsync(Guid NotificationTypeId, string NotificationMessage);
     Task SendNotificationAsync(string NotificationType, string NotificationChannel, string NotificationMessage, string Identifier, Guid? UserId = null);
 }
 
 public class NotificationManager : INotificationManager
 {
+    private readonly IReadOnlyRepository<NotificationType> repositoryType;
     private readonly IReadOnlyRepository<NotificationRule> repository;
     private readonly IReadOnlyRepository<IdentityUser> repositoryUser;
     private readonly IReadOnlyRepository<IdentityRole> repositoryRole;
@@ -28,6 +29,7 @@ public class NotificationManager : INotificationManager
     private readonly ICurrentUser currentUser;
 
     public NotificationManager(
+        IReadOnlyRepository<NotificationType> repositoryType,
         IReadOnlyRepository<NotificationRule> repository,
         IReadOnlyRepository<IdentityUser> repositoryUser,
         IReadOnlyRepository<IdentityRole> repositoryRole,
@@ -37,6 +39,7 @@ public class NotificationManager : INotificationManager
         ICurrentUser currentUser
         )
     {
+        this.repositoryType = repositoryType;
         this.repository = repository;
         this.repositoryUser = repositoryUser;
         this.repositoryRole = repositoryRole;
@@ -46,9 +49,9 @@ public class NotificationManager : INotificationManager
         this.currentUser = currentUser;
     }
 
-    public async Task SendNotificationAsync(string NotificationType, string NotificationMessage)
+    public async Task SendNotificationAsync(Guid NotificationTypeId, string NotificationMessage)
     {
-        var list = await repository.GetListAsync(a => a.NotificationType == NotificationType);
+        var list = await repository.GetListAsync(a => a.NotificationTypeId == NotificationTypeId);
         var notificationRules = list
             .GroupBy(a => new { a.NotificationType, a.Channel })
             .Select(a =>
@@ -110,11 +113,12 @@ public class NotificationManager : INotificationManager
             var notifications = new List<Notification>();
 
             //Eğer "Custom" seçildiyse girilen RecipientId dinamik olabilir. Telefon Numarası, Email vs.
-            if  (notificationRule.RecipientType == NotificationRecipientTypes.Custom) {
+            if (notificationRule.RecipientType == NotificationRecipientTypes.Custom)
+            {
                 var notification = new Notification
                 {
+                    NotificationTypeId = notificationRule.NotificationTypeId,
                     NotificationRuleId = notificationRule.Id,
-                    NotificationType = NotificationType,
                     NotificationChannel = notificationRule.Channel,
                     Identifier = notificationRule.RecipientId!,
                     UserId = currentUser.Id,
@@ -124,7 +128,8 @@ public class NotificationManager : INotificationManager
                 };
                 notifications.Add(notification);
             }
-            else {
+            else
+            {
                 if (userIds.IsNullOrEmpty())
                 {
                     continue;
@@ -142,8 +147,8 @@ public class NotificationManager : INotificationManager
 
                     var notification = new Notification
                     {
+                        NotificationTypeId = notificationRule.NotificationTypeId,
                         NotificationRuleId = notificationRule.Id,
-                        NotificationType = NotificationType,
                         NotificationChannel = notificationRule.Channel,
                         Identifier = identifier,
                         UserId = userId,
@@ -163,7 +168,7 @@ public class NotificationManager : INotificationManager
     /// <summary>
     /// Belirtilen Ident
     /// </summary>
-    /// <param name="NotificationType"></param>
+    /// <param name="NotificationTypeId"></param>
     /// <param name="NotificationMessage"></param>
     /// <param name="Identifier"></param>
     /// <param name="UserId"></param>
@@ -187,9 +192,12 @@ public class NotificationManager : INotificationManager
             }
         }
 
+        var notificationType = await repositoryType.FirstOrDefaultAsync(a => a.Name == NotificationType) 
+            ?? throw new Exception($"NotificationType '{NotificationType}' not found.");
+            
         await repositoryNotification.InsertAsync(new Notification
         {
-            NotificationType = NotificationType,
+            NotificationTypeId = notificationType.Id,
             NotificationChannel = NotificationChannel,
             Identifier = Identifier,
             UserId = UserId,

api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain/Sozsoft.Notifications.Domain.csproj

@@ -3,16 +3,15 @@
   <Import Project="..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Sozsoft.Notifications</RootNamespace>
-    <NoWarn>$(NoWarn);CS8632</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.Identity.Domain" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="9.0.2" />
+    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.Identity.Domain" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="10.0.0" />
     <ProjectReference Include="..\Sozsoft.Notifications.Domain.Shared\Sozsoft.Notifications.Domain.Shared.csproj" />
   </ItemGroup>
 

api/modules/Sozsoft.Notifications/Sozsoft.Notifications.EntityFrameworkCore/EntityFrameworkCore/NotificationDbContext.cs

@@ -12,6 +12,7 @@ public class NotificationDbContext : AbpDbContext<NotificationDbContext>, INotif
     /* Add DbSet for each Aggregate Root here. Example:
      * public DbSet<Question> Questions { get; set; }
      */
+    public DbSet<NotificationType> NotificationTypes { get; set; }
     public DbSet<NotificationRule> NotificationRules { get; set; }
     public DbSet<Notification> Notifications { get; set; }
 

api/modules/Sozsoft.Notifications/Sozsoft.Notifications.EntityFrameworkCore/EntityFrameworkCore/NotificationDbContextModelCreatingExtensions.cs

@@ -1,6 +1,7 @@
-using Sozsoft.Notifications.Domain;
-using Sozsoft.Notifications.Entities;
+
 using Microsoft.EntityFrameworkCore;
+using Sozsoft.Notifications.Domain;
+using Sozsoft.Notifications.Entities;
 using Volo.Abp;
 using Volo.Abp.EntityFrameworkCore.Modeling;
 
@@ -13,21 +14,29 @@ public static class NotificationDbContextModelCreatingExtensions
     {
         Check.NotNull(builder, nameof(builder));
 
+        builder.Entity<NotificationType>(b =>
+        {
+            b.ToTable(TablePrefix.ByName(nameof(NotificationType)), Prefix.DbSchema);
+            b.ConfigureByConvention();
+
+            b.Property(x => x.Name).IsRequired().HasMaxLength(128);
+        });
+
         builder.Entity<NotificationRule>(b =>
         {
             b.ToTable(TablePrefix.ByName(nameof(NotificationRule)), Prefix.DbSchema);
             b.ConfigureByConvention();
 
-            b.Property(x => x.NotificationType).IsRequired().HasMaxLength(128);
+            b.Property(x => x.NotificationTypeId).IsRequired();
+
             b.Property(x => x.RecipientType).IsRequired().HasMaxLength(64);
             b.Property(x => x.RecipientId).HasMaxLength(256);
             b.Property(x => x.Channel).IsRequired().HasMaxLength(64);
 
-            // 1:N ilişki NotificationRule -> Notifications
-            b.HasMany(x => x.Notifications)
-             .WithOne(x => x.NotificationRule)
-             .HasForeignKey(x => x.NotificationRuleId)
-             .OnDelete(DeleteBehavior.Cascade);
+            b.HasOne(x => x.NotificationType)
+                .WithMany(x => x.NotificationRules)
+                .HasForeignKey(x => x.NotificationTypeId)
+                .OnDelete(DeleteBehavior.Restrict);
         });
 
         builder.Entity<Notification>(b =>
@@ -35,10 +44,17 @@ public static class NotificationDbContextModelCreatingExtensions
             b.ToTable(TablePrefix.ByName(nameof(Notification)), Prefix.DbSchema);
             b.ConfigureByConvention();
 
+            b.Property(x => x.NotificationTypeId).IsRequired();
+            b.Property(x => x.NotificationRuleId).IsRequired();
+
             b.Property(x => x.NotificationChannel).IsRequired().HasMaxLength(64);
-            b.Property(x => x.NotificationType).IsRequired().HasMaxLength(128);
             b.Property(x => x.Identifier).IsRequired().HasMaxLength(256);
             b.Property(x => x.Message).IsRequired().HasMaxLength(2048);
+
+            b.HasOne(x => x.NotificationType)
+                .WithMany(x => x.Notifications)
+                .HasForeignKey(x => x.NotificationTypeId)
+                .OnDelete(DeleteBehavior.Restrict);
         });
     }
 }

api/modules/Sozsoft.Notifications/Sozsoft.Notifications.EntityFrameworkCore/Sozsoft.Notifications.EntityFrameworkCore.csproj

@@ -3,13 +3,13 @@
   <Import Project="..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Sozsoft.Notifications</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="9.0.2" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="10.0.0" />
     <ProjectReference Include="..\Sozsoft.Notifications.Domain\Sozsoft.Notifications.Domain.csproj" />
   </ItemGroup>
 

api/modules/Sozsoft.Notifications/common.props

@@ -7,11 +7,14 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="ConfigureAwait.Fody" Version="3.3.1" PrivateAssets="All" />
-    <PackageReference Include="Fody" Version="6.5.3">
+    <PackageReference Include="ConfigureAwait.Fody" Version="3.4.0" PrivateAssets="All" />
+    <PackageReference Include="Fody" Version="6.9.3">
       <PrivateAssets>All</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="MailKit" Version="4.16.0" />
+    <PackageReference Include="MimeKit" Version="4.16.0" />
+    <PackageReference Include="Scriban" Version="7.2.3" />
   </ItemGroup>
 
 

api/modules/Sozsoft.Sender/Mail/AmazonSes/AmazonSesEmailSender.cs

@@ -65,6 +65,7 @@ public class AmazonSesEmailSender : EmailSenderBase, ISozsoftEmailSender, ITrans
         await BackgroundJobManager.EnqueueAsync(
             new ErpBackgroundEmailSendingJobArgs
             {
+                TenantId = CurrentTenant.Id,
                 To = to,
                 Sender = sender,
                 Params = @params,

api/modules/Sozsoft.Sender/Mail/SozsoftBackgroundEmailSendingJob.cs

@@ -1,5 +1,6 @@
-using Volo.Abp.BackgroundJobs;
+using Volo.Abp.BackgroundJobs;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.MultiTenancy;
 
 namespace Sozsoft.Sender.Mail;
 
@@ -7,13 +8,19 @@ public class ErpBackgroundEmailSendingJob :
     AsyncBackgroundJob<ErpBackgroundEmailSendingJobArgs>, ITransientDependency
 {
     protected ISozsoftEmailSender EmailSender { get; }
+    protected ICurrentTenant CurrentTenant { get; }
 
-    public ErpBackgroundEmailSendingJob(ISozsoftEmailSender emailSender)
+    public ErpBackgroundEmailSendingJob(
+        ISozsoftEmailSender emailSender,
+        ICurrentTenant currentTenant)
     {
         EmailSender = emailSender;
+        CurrentTenant = currentTenant;
     }
 
     public override async Task ExecuteAsync(ErpBackgroundEmailSendingJobArgs args)
+    {
+        using (CurrentTenant.Change(args.TenantId))
         {
             //await EmailSender.SendEmailAsync(args.Template, args.To, args.Params, args.Subject);
             await EmailSender.SendEmailAsync(
@@ -25,4 +32,4 @@ public class ErpBackgroundEmailSendingJob :
                 args.Attachments);
         }
     }
-
+}

api/modules/Sozsoft.Sender/Mail/SozsoftBackgroundEmailSendingJobArgs.cs

@@ -1,8 +1,12 @@
-namespace Sozsoft.Sender.Mail;
+using Volo.Abp.MultiTenancy;
+
+namespace Sozsoft.Sender.Mail;
 
 [Serializable]
-public class ErpBackgroundEmailSendingJobArgs
+public class ErpBackgroundEmailSendingJobArgs : IMultiTenant
 {
+    public Guid? TenantId { get; set; }
+
     public string[] To { get; set; }
 
     public KeyValuePair<string, string>? Sender { get; set; }
@@ -14,6 +18,4 @@ public class ErpBackgroundEmailSendingJobArgs
     public Dictionary<string, string>? Attachments { get; set; }
 
     public string? TextContent { get; set; }
-
 }
-

api/modules/Sozsoft.Sender/Rocket/RocketSender.cs

@@ -17,15 +17,15 @@ public class RocketSender : ISozsoftRocketSender
 
     public async Task<RocketSendResult> SendAsync(string Username, string Message)
     {
-        logger.LogInformation("Rocket gönderiliyor. {Username}, {Message}", Username, Message);
+        logger.LogInformation("Sending Rocket message. {Username}, {Message}", Username, Message);
         var result = await httpClient.SendMessageAsync(Username, Message);
         if (result.Success)
         {
-            logger.LogInformation("Rocket gönderildi. {Username}, {Message}", Username, Message);
+            logger.LogInformation("Rocket sent successfully. {Username}, {Message}", Username, Message);
         }
         else
         {
-            logger.LogWarning("Rocket gönderilemedi. {Username}, {Message}", Username, Message);
+            logger.LogWarning("Failed to send Rocket message. {Username}, {Message}", Username, Message);
         }
 
         return new RocketSendResult

api/modules/Sozsoft.Sender/Sms/PostaGuvercini/PostaGuverciniSmsSender.cs

@@ -25,15 +25,15 @@ public class PostaGuverciniSmsSender : ISozsoftSmsSender
         Message = Check.NotNullOrWhiteSpace(Message, nameof(Message));
         PhoneNumber = PhoneNumber.StartsWith('0') ? PhoneNumber[1..] : PhoneNumber;
 
-        logger.LogInformation("Sms gönderiliyor. {PhoneNumber}, {Message}", PhoneNumber, Message);
+        logger.LogInformation("Sending SMS message. {PhoneNumber}, {Message}", PhoneNumber, Message);
         var result = await httpClient.SendSmsAsync(PhoneNumber, Message);
         if (result.IsSuccess)
         {
-            logger.LogInformation("Sms gönderildi. {PhoneNumber}, {Message}", PhoneNumber, Message);
+            logger.LogInformation("SMS sent successfully. {PhoneNumber}, {Message}", PhoneNumber, Message);
         }
         else
         {
-            logger.LogWarning("Sms gönderilemedi. {PhoneNumber}, {Message}, {Error}", PhoneNumber, Message, $"{result.ErrNo}:{result.ErrText}");
+            logger.LogWarning("Failed to send SMS message. {PhoneNumber}, {Message}, {Error}", PhoneNumber, Message, $"{result.ErrNo}:{result.ErrText}");
         }
 
         return new SmsSendResult

api/modules/Sozsoft.Sender/Sozsoft.Sender.csproj

@@ -1,17 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AWSSDK.SimpleEmailV2" Version="3.7.406" />
-    <PackageReference Include="Volo.Abp.BackgroundJobs" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.Emailing" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.MailKit" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.Sms" Version="9.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
+    <PackageReference Include="Volo.Abp.BackgroundJobs" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.Emailing" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.MailKit" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.Sms" Version="10.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.0" />
+    <PackageReference Include="MailKit" Version="4.16.0" />
+    <PackageReference Include="MimeKit" Version="4.16.0" />
+    <PackageReference Include="Scriban" Version="7.2.3" />
   </ItemGroup>
 
 </Project>

api/modules/Sozsoft.Sender/WhatsApp/SozsoftWhatsAppSender.cs

@@ -23,16 +23,16 @@ public class SozsoftWhatsAppSender : ISozsoftWhatsAppSender
 
     public async Task<WhatsAppSendResult> SendAsync(string To, string Message, string LanguageCode = "tr")
     {
-        logger.LogInformation("WhatsApp gönderiliyor. {To}, {LanguageCode}, {Message}", To, LanguageCode, Message);
+        logger.LogInformation("Sending WhatsApp message. {To}, {LanguageCode}, {Message}", To, LanguageCode, Message);
         var result = await httpClient.SendMessageAsync(To, Message, LanguageCode);
         var success = !result.messages.IsNullOrEmpty() && result.messages.FirstOrDefault()?.message_status == "accepted";
         if (success)
         {
-            logger.LogInformation("WhatsApp gönderildi. {To}, {LanguageCode}, {Message}", To, LanguageCode, Message);
+            logger.LogInformation("WhatsApp sent successfully. {To}, {LanguageCode}, {Message}", To, LanguageCode, Message);
         }
         else
         {
-            logger.LogWarning("WhatsApp gönderilemedi. {To}, {LanguageCode}, {Message}", To, LanguageCode, Message);
+            logger.LogWarning("Failed to send WhatsApp message. {To}, {LanguageCode}, {Message}", To, LanguageCode, Message);
         }
 
         return new WhatsAppSendResult

api/modules/Sozsoft.Settings/Sozsoft.Settings.Application.Contracts/Permissions/SettingsPermissionDefinitionProvider.cs

@@ -1,6 +1,4 @@
-using Sozsoft.Settings.Localization;
 using Volo.Abp.Authorization.Permissions;
-using Volo.Abp.Localization;
 
 namespace Sozsoft.Settings.Permissions;
 
@@ -8,12 +6,5 @@ public class SettingsPermissionDefinitionProvider : PermissionDefinitionProvider
 {
     public override void Define(IPermissionDefinitionContext context)
     {
-        var myGroup = context.AddGroup(SettingsPermissions.GroupName, L("Permission:Settings"));
-    }
-
-    private static LocalizableString L(string name)
-    {
-        return LocalizableString.Create<SettingsResource>(name);
     }
 }
-

api/modules/Sozsoft.Settings/Sozsoft.Settings.Application.Contracts/Sozsoft.Settings.Application.Contracts.csproj

@@ -3,14 +3,14 @@
   <Import Project="..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>Sozsoft.Settings</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.Authorization" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="9.0.2" />
+    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.Authorization" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="10.0.0" />
     <ProjectReference Include="..\Sozsoft.Settings.Domain.Shared\Sozsoft.Settings.Domain.Shared.csproj" />
   </ItemGroup>
 

api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/SettingUiAppService.cs

@@ -5,10 +5,9 @@ using System.Threading.Tasks;
 using Sozsoft.Languages;
 using Microsoft.AspNetCore.Authorization;
 using Volo.Abp.Application.Services;
-using Volo.Abp.Domain.Repositories;
+using Volo.Abp.MultiTenancy;
 using Volo.Abp.SettingManagement;
 using Volo.Abp.Settings;
-using SettingDefinition = Sozsoft.Settings.Entities.SettingDefinition;
 
 namespace Sozsoft.Settings;
 
@@ -20,17 +19,20 @@ public class SettingUiAppService : ApplicationService, ISettingUiAppService
     private readonly ISettingDefinitionManager settingDefinitionManager;
     private readonly ISettingManager settingManager;
     private readonly ErpSettingDefinitionManager ErpSettingDefinitionManager;
+    private readonly ICurrentTenant currentTenant;
 
     public SettingUiAppService(
         ILanguageKeyIntegrationService languageKeyIntegrationService,
         ISettingDefinitionManager settingDefinitionManager,
         ISettingManager settingManager,
-        ErpSettingDefinitionManager ErpSettingDefinitionManager)
+        ErpSettingDefinitionManager ErpSettingDefinitionManager,
+        ICurrentTenant currentTenant)
     {
         this.languageKeyIntegrationService = languageKeyIntegrationService;
         this.settingDefinitionManager = settingDefinitionManager;
         this.settingManager = settingManager;
         this.ErpSettingDefinitionManager = ErpSettingDefinitionManager;
+        this.currentTenant = currentTenant;
     }
 
     public virtual async Task<List<MainGroupedSettingDto>> GetListAsync()
@@ -95,15 +97,18 @@ public class SettingUiAppService : ApplicationService, ISettingUiAppService
     {
         if (setting.Providers.IsNullOrEmpty())
         {
-            await settingManager.SetForCurrentUserAsync(setting.Name, value);
+            if (currentTenant.Id.HasValue)
+            {
+                await settingManager.SetForCurrentTenantAsync(setting.Name, value);
             }
             else
             {
-            if (setting.Providers.Any(p => p == UserSettingValueProvider.ProviderName))
-            {
-                await settingManager.SetForCurrentUserAsync(setting.Name, value);
+                await settingManager.SetGlobalAsync(setting.Name, value);
             }
-            else if (setting.Providers.Any(p => p == TenantSettingValueProvider.ProviderName))
+        }
+        else
+        {
+            if (setting.Providers.Any(p => p == TenantSettingValueProvider.ProviderName) && currentTenant.Id.HasValue)
             {
                 await settingManager.SetForCurrentTenantAsync(setting.Name, value);
             }
@@ -111,6 +116,10 @@ public class SettingUiAppService : ApplicationService, ISettingUiAppService
             {
                 await settingManager.SetGlobalAsync(setting.Name, value);
             }
+            else if (setting.Providers.Any(p => p == UserSettingValueProvider.ProviderName))
+            {
+                await settingManager.SetForCurrentUserAsync(setting.Name, value);
+            }
         }
     }
 

api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/SettingsApplicationModule.cs

@@ -1,6 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Application;
-using Volo.Abp.AutoMapper;
+using Volo.Abp.Mapperly;
 using Volo.Abp.Modularity;
 using Volo.Abp.SettingManagement;
 
@@ -10,18 +10,14 @@ namespace Sozsoft.Settings;
     typeof(SettingsDomainModule),
     typeof(SettingsApplicationContractsModule),
     typeof(AbpDddApplicationModule),
-    typeof(AbpAutoMapperModule),
+    typeof(AbpMapperlyModule),
     typeof(AbpSettingManagementApplicationModule)
     )]
 public class SettingsApplicationModule : AbpModule
 {
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        context.Services.AddAutoMapperObjectMapper<SettingsApplicationModule>();
-        Configure<AbpAutoMapperOptions>(options =>
-        {
-            options.AddMaps<SettingsApplicationModule>(validate: true);
-        });
+        context.Services.AddMapperlyObjectMapper<SettingsApplicationModule>();
     }
 }
 

api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/SettingsAutoMapperProfile.cs

@@ -1,13 +0,0 @@
-using AutoMapper;
-using Sozsoft.Settings.Entities;
-
-namespace Sozsoft.Settings;
-
-public class SettingsAutoMapperProfile : Profile
-{
-    public SettingsAutoMapperProfile()
-    {
-        CreateMap<SettingDefinition, SettingDefinitionDto>().ReverseMap();
-    }
-}
-

api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/SettingsMappers.cs

@@ -0,0 +1,33 @@
+using Sozsoft.Settings.Entities;
+using Riok.Mapperly.Abstractions;
+using Volo.Abp.Mapperly;
+
+namespace Sozsoft.Settings;
+
+[Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)]
+public partial class SettingDefinitionToSettingDefinitionDtoMapper : TwoWayMapperBase<SettingDefinition, SettingDefinitionDto>
+{
+public override partial SettingDefinitionDto Map(SettingDefinition source);
+
+    public override partial void Map(SettingDefinition source, SettingDefinitionDto destination);
+
+    public override void BeforeMap(SettingDefinition source)
+    {
+    }
+
+    public override void AfterMap(SettingDefinition source, SettingDefinitionDto destination)
+    {
+    }
+
+    public override partial SettingDefinition ReverseMap(SettingDefinitionDto destination);
+
+    public override partial void ReverseMap(SettingDefinitionDto destination, SettingDefinition source);
+
+    public override void BeforeReverseMap(SettingDefinitionDto destination)
+    {
+    }
+
+    public override void AfterReverseMap(SettingDefinitionDto destination, SettingDefinition source)
+    {
+    }
+}

api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/Sozsoft.Settings.Application.csproj

@@ -3,14 +3,14 @@
   <Import Project="..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>Sozsoft.Settings</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.AutoMapper" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.SettingManagement.Application" Version="9.0.2" />
+    <PackageReference Include="Volo.Abp.Mapperly" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Application" Version="10.0.0" />
     <ProjectReference Include="..\..\Sozsoft.Languages\Sozsoft.Languages.Application.Contracts\Sozsoft.Languages.Application.Contracts.csproj" />
     <ProjectReference Include="..\Sozsoft.Settings.Application.Contracts\Sozsoft.Settings.Application.Contracts.csproj" />
     <ProjectReference Include="..\Sozsoft.Settings.Domain\Sozsoft.Settings.Domain.csproj" />

api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain.Shared/Sozsoft.Settings.Domain.Shared.csproj

@@ -3,19 +3,19 @@
   <Import Project="..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>Sozsoft.Settings</RootNamespace>
-    <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
+    <GenerateEmbeddedFilesManifest>false</GenerateEmbeddedFilesManifest>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.Validation" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.Ddd.Domain.Shared" Version="9.0.2" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.Validation" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.Ddd.Domain.Shared" Version="10.0.0" />
    </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0" />
    </ItemGroup>
 
 </Project>

api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain/Settings/SettingsSettingDefinitionProvider.cs

@@ -28,22 +28,38 @@ public class SettingsDefinitionProvider : SettingDefinitionProvider
         foreach (var item in settingDefinitions.OrderBy(a => a.Order))
         {
             var iDescription = item.DescriptionKey.IsNullOrEmpty() ? null : L(item.DescriptionKey);
+            var providers = item.Providers.IsNullOrEmpty()
+                ? []
+                : item.Providers.Split(MultiValueDelimiter, StringSplitOptions.RemoveEmptyEntries);
 
-            var def = new Volo.Abp.Settings.SettingDefinition(
+            var def = context.GetOrNull(item.Code);
+
+            if (def == null)
+            {
+                def = new Volo.Abp.Settings.SettingDefinition(
                     item.Code, item.DefaultValue, L(item.NameKey), iDescription,
-                item.IsVisibleToClients, item.IsInherited, item.IsEncrypted)
-                .WithProperty(SettingsConsts.MainGroup, item.MainGroupKey)
+                    item.IsVisibleToClients, item.IsInherited, item.IsEncrypted);
+
+                context.Add(def);
+            }
+            else
+            {
+                def.DefaultValue = item.DefaultValue;
+                def.DisplayName = L(item.NameKey);
+                def.Description = iDescription;
+                def.IsVisibleToClients = item.IsVisibleToClients;
+                def.IsInherited = item.IsInherited;
+                def.IsEncrypted = item.IsEncrypted;
+                def.Properties.Clear();
+                def.Providers.Clear();
+            }
+
+            def.Providers.AddRange(providers);
+            def.WithProperty(SettingsConsts.MainGroup, item.MainGroupKey)
                 .WithProperty(SettingsConsts.SubGroup, item.SubGroupKey)
                 .WithProperty(SettingsConsts.DataType, item.DataType)
                 .WithProperty(SettingsConsts.RequiredPermission, item.RequiredPermissionName)
                 .WithProperty(SettingsConsts.SelectOptions, item.SelectOptions?.ToDictionary(x => x.Key, x => L(x.Value)));
-
-            if (!item.Providers.IsNullOrEmpty())
-            {
-                def.Providers.AddRange(item.Providers.Split(MultiValueDelimiter));
-            }
-
-            context.Add(def);
         }
     }
 

api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain/SettingsDomainModule.cs

@@ -1,5 +1,6 @@
-using Volo.Abp.Modularity;
+using Volo.Abp.Modularity;
 using Volo.Abp.SettingManagement;
+using Volo.Abp.Settings;
 
 namespace Sozsoft.Settings;
 
@@ -11,7 +12,10 @@ public class SettingsDomainModule : AbpModule
 {
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-
+        Configure<AbpSettingOptions>(options =>
+        {
+            options.DefinitionProviders.Remove<SettingsDefinitionProvider>();
+            options.DefinitionProviders.Add<SettingsDefinitionProvider>();
+        });
     }
 }
-

api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain/Sozsoft.Settings.Domain.csproj

@@ -3,13 +3,13 @@
   <Import Project="..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>Sozsoft.Settings</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Authorization" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="9.0.2" />
+    <PackageReference Include="Volo.Abp.Authorization" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="10.0.0" />
   </ItemGroup>
 
   <ItemGroup>

api/modules/Sozsoft.Settings/Sozsoft.Settings.EntityFrameworkCore/Sozsoft.Settings.EntityFrameworkCore.csproj

@@ -3,12 +3,12 @@
   <Import Project="..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>Sozsoft.Settings</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="9.0.2" />
+    <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="10.0.0" />
     <ProjectReference Include="..\Sozsoft.Settings.Domain\Sozsoft.Settings.Domain.csproj" />
   </ItemGroup>
 

api/modules/Sozsoft.Settings/common.props

@@ -7,11 +7,14 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="ConfigureAwait.Fody" Version="3.3.1" PrivateAssets="All" />
-    <PackageReference Include="Fody" Version="6.5.3">
+    <PackageReference Include="ConfigureAwait.Fody" Version="3.4.0" PrivateAssets="All" />
+    <PackageReference Include="Fody" Version="6.9.3">
       <PrivateAssets>All</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="MailKit" Version="4.16.0" />
+    <PackageReference Include="MimeKit" Version="4.16.0" />
+    <PackageReference Include="Scriban" Version="7.2.3" />
   </ItemGroup>
 
 

api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/DatabaseObjectDto.cs

@@ -4,7 +4,10 @@ public class DatabaseTableDto
 {
     public string SchemaName { get; set; }
     public string TableName { get; set; }
-    public string FullName => $"{SchemaName}.{TableName}";
+    public string DataSourceType { get; set; }
+    public string FullName => DataSourceType == "Postgresql"
+        ? $"\"{SchemaName}\".\"{TableName}\""
+        : $"[{SchemaName}].[{TableName}]";
 }
 
 public class DatabaseColumnDto

api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/ISqlObjectManagerAppService.cs

@@ -22,6 +22,7 @@ public interface ISqlObjectManagerAppService : IApplicationService
 
     // Database Metadata Operations
     Task<List<DatabaseColumnDto>> GetTableColumnsAsync(string dataSourceCode, string schemaName, string tableName);
+    Task<string> GetTableCreateScriptAsync(string dataSourceCode, string schemaName, string tableName);
 
     /// <summary>
     /// Gets the SQL definition/body of a native SQL Server object (Stored Procedure, View, or Function)
@@ -43,5 +44,15 @@ public interface ISqlObjectManagerAppService : IApplicationService
     /// <summary>
     /// Lists .sql files currently available under DbMigrator Seeds/SqlData.
     /// </summary>
-    Task<List<SqlDataFileDto>> GetSqlDataFilesAsync();
+    Task<List<SqlDataFileDto>> GetSqlDataFilesAsync(string dataDirectoryName = "SqlData", string relativePath = "");
+
+    /// <summary>
+    /// Reads a .sql seed file content from the selected data directory.
+    /// </summary>
+    Task<string> GetSqlDataFileContentAsync(string dataDirectoryName = "SqlData", string relativePath = "");
+
+    /// <summary>
+    /// Moves a SQL seed file between the selected data directory root and HostData.
+    /// </summary>
+    Task MoveSqlDataFileAsync(MoveSqlDataFileDto input);
 }

api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/Sozsoft.SqlQueryManager.Application.Contracts.csproj

@@ -1,15 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>Sozsoft.SqlQueryManager</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.Authorization" Version="9.0.2" />
+    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.Authorization" Version="10.0.0" />
     <ProjectReference Include="..\Sozsoft.SqlQueryManager.Domain.Shared\Sozsoft.SqlQueryManager.Domain.Shared.csproj" />
   </ItemGroup>
 

api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/SqlDataFileDto.cs

@@ -5,5 +5,8 @@ namespace Sozsoft.SqlQueryManager.Application.Contracts;
 public class SqlDataFileDto
 {
     public string FileName { get; set; } = string.Empty;
+    public string Name { get; set; } = string.Empty;
+    public string RelativePath { get; set; } = string.Empty;
+    public bool IsDirectory { get; set; }
     public DateTime CreatedAt { get; set; }
 }

api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/SqlExecutionDto.cs

@@ -46,3 +46,10 @@ public class DeleteSqlDataFilesDto
     /// </summary>
     public List<string> FileNames { get; set; } = new();
 }
+
+public class MoveSqlDataFileDto
+{
+    public string DataDirectoryName { get; set; } = string.Empty;
+    public string SourceRelativePath { get; set; } = string.Empty;
+    public string TargetRelativePath { get; set; } = string.Empty;
+}

api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/SqlObjectExplorerDto.cs

@@ -9,7 +9,10 @@ public class SqlNativeObjectDto
 {
     public string SchemaName { get; set; } = "dbo";
     public string ObjectName { get; set; } = "";
-    public string FullName => $"[{SchemaName}].[{ObjectName}]";
+    public string DataSourceType { get; set; } = "";
+    public string FullName => DataSourceType == "Postgresql"
+        ? $"\"{SchemaName}\".\"{ObjectName}\""
+        : $"[{SchemaName}].[{ObjectName}]";
 }
 
 /// <summary>

api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/Sozsoft.SqlQueryManager.Application.csproj

@@ -1,16 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>Sozsoft.SqlQueryManager</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.AutoMapper" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.Ddd.Application" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="9.0.2" />
+    <PackageReference Include="Volo.Abp.Mapperly" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.Ddd.Application" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="10.0.0" />
     <ProjectReference Include="..\Sozsoft.SqlQueryManager.Application.Contracts\Sozsoft.SqlQueryManager.Application.Contracts.csproj" />
     <ProjectReference Include="..\Sozsoft.SqlQueryManager.Domain\Sozsoft.SqlQueryManager.Domain.csproj" />
   </ItemGroup>

api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/SqlObjectManagerAppService.cs

@@ -13,6 +13,8 @@ using Microsoft.Extensions.Logging;
 using Volo.Abp.Application.Services;
 using Volo.Abp.MultiTenancy;
 using System.Text.RegularExpressions;
+using Sozsoft.Platform.Enums;
+using Sozsoft.Platform.Queries;
 
 namespace Sozsoft.SqlQueryManager.Application;
 
@@ -43,6 +45,7 @@ public class SqlObjectManagerAppService : ApplicationService, ISqlObjectManagerA
 
     private readonly ISqlExecutorService _sqlExecutorService;
     private readonly ISqlTemplateProvider _templateProvider;
+    private readonly IDataSourceManager _dataSourceManager;
     private readonly ICurrentTenant _currentTenant;
     private readonly IHttpContextAccessor _httpContextAccessor;
     private readonly IHostEnvironment _hostEnvironment;
@@ -51,6 +54,7 @@ public class SqlObjectManagerAppService : ApplicationService, ISqlObjectManagerA
     public SqlObjectManagerAppService(
         ISqlExecutorService sqlExecutorService,
         ISqlTemplateProvider templateProvider,
+        IDataSourceManager dataSourceManager,
         ICurrentTenant currentTenant,
         IHttpContextAccessor httpContextAccessor,
         IHostEnvironment hostEnvironment,
@@ -58,6 +62,7 @@ public class SqlObjectManagerAppService : ApplicationService, ISqlObjectManagerA
     {
         _sqlExecutorService = sqlExecutorService;
         _templateProvider = templateProvider;
+        _dataSourceManager = dataSourceManager;
         _currentTenant = currentTenant;
         _httpContextAccessor = httpContextAccessor;
         _hostEnvironment = hostEnvironment;
@@ -90,11 +95,12 @@ public class SqlObjectManagerAppService : ApplicationService, ISqlObjectManagerA
     {
         ValidateTenantAccess();
         var result = new SqlObjectExplorerDto();
+        var dataSourceType = await GetDataSourceTypeAsync(dataSourceCode);
 
-        result.Tables = await GetTablesAsync(dataSourceCode);
-        result.Views = await GetNativeObjectsAsync(dataSourceCode, "V");
-        result.StoredProcedures = await GetNativeObjectsAsync(dataSourceCode, "P");
-        result.Functions = await GetNativeObjectsAsync(dataSourceCode, "FN", "IF", "TF");
+        result.Tables = await GetTablesAsync(dataSourceCode, dataSourceType);
+        result.Views = await GetNativeObjectsAsync(dataSourceCode, dataSourceType, "V");
+        result.StoredProcedures = await GetNativeObjectsAsync(dataSourceCode, dataSourceType, "P");
+        result.Functions = await GetNativeObjectsAsync(dataSourceCode, dataSourceType, "FN", "IF", "TF");
 
         result.Templates = _templateProvider.GetAvailableQueryTemplates()
             .Select(t => new SqlTemplateDto
@@ -109,20 +115,25 @@ public class SqlObjectManagerAppService : ApplicationService, ISqlObjectManagerA
         return result;
     }
 
-    private async Task<List<SqlNativeObjectDto>> GetNativeObjectsAsync(string dataSourceCode, params string[] objectTypes)
+    private async Task<DataSourceTypeEnum> GetDataSourceTypeAsync(string dataSourceCode)
     {
-        var typeList = string.Join(",", objectTypes.Select(t => $"'{t}'"));
-        var query = $@"
-            SELECT 
-                SCHEMA_NAME(o.schema_id) AS SchemaName,
-                o.name AS ObjectName
-            FROM 
-                sys.objects o
-            WHERE 
-                o.type IN ({typeList})
-                AND o.is_ms_shipped = 0
-            ORDER BY 
-                SCHEMA_NAME(o.schema_id), o.name";
+        var dataSource = await _dataSourceManager.GetDataSourceAsync(_currentTenant.IsAvailable, dataSourceCode);
+        if (dataSource == null)
+        {
+            throw new Volo.Abp.UserFriendlyException($"Data source '{dataSourceCode}' was not found.");
+        }
+
+        return dataSource.DataSourceType;
+    }
+
+    private async Task<List<SqlNativeObjectDto>> GetNativeObjectsAsync(
+        string dataSourceCode,
+        DataSourceTypeEnum dataSourceType,
+        params string[] objectTypes)
+    {
+        var query = dataSourceType == DataSourceTypeEnum.Postgresql
+            ? BuildPostgreSqlNativeObjectsQuery(objectTypes)
+            : BuildSqlServerNativeObjectsQuery(objectTypes);
 
         var result = await _sqlExecutorService.ExecuteQueryAsync(query, dataSourceCode);
 
@@ -136,8 +147,9 @@ public class SqlObjectManagerAppService : ApplicationService, ISqlObjectManagerA
                 {
                     objects.Add(new SqlNativeObjectDto
                     {
-                        SchemaName = dict["SchemaName"]?.ToString() ?? "dbo",
-                        ObjectName = dict["ObjectName"]?.ToString() ?? ""
+                        SchemaName = GetDictionaryValue(dict, "SchemaName")?.ToString() ?? GetDefaultSchemaName(dataSourceType),
+                        ObjectName = GetDictionaryValue(dict, "ObjectName")?.ToString() ?? "",
+                        DataSourceType = dataSourceType.ToString()
                     });
                 }
             }
@@ -146,9 +158,73 @@ public class SqlObjectManagerAppService : ApplicationService, ISqlObjectManagerA
         return objects;
     }
 
-    private async Task<List<DatabaseTableDto>> GetTablesAsync(string dataSourceCode)
+    private static string BuildSqlServerNativeObjectsQuery(params string[] objectTypes)
     {
-        var query = @"
+        var typeList = string.Join(",", objectTypes.Select(t => $"'{t}'"));
+        return $@"
+            SELECT 
+                SCHEMA_NAME(o.schema_id) AS SchemaName,
+                o.name AS ObjectName
+            FROM 
+                sys.objects o
+            WHERE 
+                o.type IN ({typeList})
+                AND o.is_ms_shipped = 0
+            ORDER BY 
+                SCHEMA_NAME(o.schema_id), o.name";
+    }
+
+    private static string BuildPostgreSqlNativeObjectsQuery(params string[] objectTypes)
+    {
+        var wantsViews = objectTypes.Contains("V");
+        var wantsProcedures = objectTypes.Contains("P");
+        var wantsFunctions = objectTypes.Any(t => t is "FN" or "IF" or "TF");
+
+        if (wantsViews)
+        {
+            return @"
+                SELECT 
+                    table_schema AS ""SchemaName"",
+                    table_name AS ""ObjectName""
+                FROM information_schema.views
+                WHERE table_schema NOT IN ('pg_catalog', 'information_schema')
+                ORDER BY table_schema, table_name";
+        }
+
+        var proKinds = new List<string>();
+        if (wantsProcedures)
+        {
+            proKinds.Add("'p'");
+        }
+
+        if (wantsFunctions)
+        {
+            proKinds.Add("'f'");
+        }
+
+        return $@"
+            SELECT 
+                n.nspname AS ""SchemaName"",
+                p.proname AS ""ObjectName""
+            FROM pg_proc p
+            INNER JOIN pg_namespace n ON n.oid = p.pronamespace
+            WHERE n.nspname NOT IN ('pg_catalog', 'information_schema')
+              AND p.prokind IN ({string.Join(",", proKinds)})
+            ORDER BY n.nspname, p.proname";
+    }
+
+    private async Task<List<DatabaseTableDto>> GetTablesAsync(string dataSourceCode, DataSourceTypeEnum dataSourceType)
+    {
+        var query = dataSourceType == DataSourceTypeEnum.Postgresql
+            ? @"
+            SELECT 
+                table_schema AS ""SchemaName"",
+                table_name AS ""TableName""
+            FROM information_schema.tables
+            WHERE table_type = 'BASE TABLE'
+              AND table_schema NOT IN ('pg_catalog', 'information_schema')
+            ORDER BY table_schema, table_name"
+            : @"
             SELECT 
                 SCHEMA_NAME(t.schema_id) AS SchemaName,
                 t.name AS TableName
@@ -171,8 +247,9 @@ public class SqlObjectManagerAppService : ApplicationService, ISqlObjectManagerA
                 {
                     tables.Add(new DatabaseTableDto
                     {
-                        SchemaName = dict["SchemaName"]?.ToString() ?? "dbo",
-                        TableName = dict["TableName"]?.ToString() ?? ""
+                        SchemaName = GetDictionaryValue(dict, "SchemaName")?.ToString() ?? GetDefaultSchemaName(dataSourceType),
+                        TableName = GetDictionaryValue(dict, "TableName")?.ToString() ?? "",
+                        DataSourceType = dataSourceType.ToString()
                     });
                 }
             }
@@ -229,12 +306,9 @@ public class SqlObjectManagerAppService : ApplicationService, ISqlObjectManagerA
     public async Task<string> GetNativeObjectDefinitionAsync(string dataSourceCode, string schemaName, string objectName)
     {
         ValidateTenantAccess();
-        var query = @"
-            SELECT OBJECT_DEFINITION(OBJECT_ID(@ObjectName)) AS Definition";
-
-        var fullObjectName = $"[{schemaName}].[{objectName}]";
+        var dataSourceType = await GetDataSourceTypeAsync(dataSourceCode);
         var result = await _sqlExecutorService.ExecuteQueryAsync(
-            query.Replace("@ObjectName", $"'{fullObjectName}'"),
+            BuildNativeObjectDefinitionQuery(dataSourceType, schemaName, objectName),
             dataSourceCode);
 
         if (result.Success && result.Data != null)
@@ -243,15 +317,18 @@ public class SqlObjectManagerAppService : ApplicationService, ISqlObjectManagerA
             if (dataList.Count > 0)
             {
                 var row = dataList[0] as IDictionary<string, object>;
-                if (row != null && row.ContainsKey("Definition"))
+                if (row != null)
                 {
-                    var definition = row["Definition"]?.ToString() ?? string.Empty;
+                    var definition = GetDictionaryValue(row, "Definition")?.ToString() ?? string.Empty;
                     // Always open object script as CREATE OR ALTER in editor.
+                    if (dataSourceType == DataSourceTypeEnum.Mssql)
+                    {
                         definition = Regex.Replace(
                             definition,
                             @"^\s*(?:CREATE|ALTER)\s+(?:OR\s+ALTER\s+)?",
                             "CREATE OR ALTER ",
                             RegexOptions.IgnoreCase);
+                    }
                     return definition;
                 }
             }
@@ -260,10 +337,59 @@ public class SqlObjectManagerAppService : ApplicationService, ISqlObjectManagerA
         return string.Empty;
     }
 
+    private static string BuildNativeObjectDefinitionQuery(
+        DataSourceTypeEnum dataSourceType,
+        string schemaName,
+        string objectName)
+    {
+        if (dataSourceType == DataSourceTypeEnum.Postgresql)
+        {
+            var schema = ToSqlLiteral(schemaName);
+            var name = ToSqlLiteral(objectName);
+
+            return $@"
+                SELECT ""Definition""
+                FROM (
+                    SELECT pg_get_viewdef(c.oid, true) AS ""Definition""
+                    FROM pg_class c
+                    INNER JOIN pg_namespace n ON n.oid = c.relnamespace
+                    WHERE n.nspname = {schema}
+                      AND c.relname = {name}
+                      AND c.relkind IN ('v', 'm')
+
+                    UNION ALL
+
+                    SELECT pg_get_functiondef(p.oid) AS ""Definition""
+                    FROM pg_proc p
+                    INNER JOIN pg_namespace n ON n.oid = p.pronamespace
+                    WHERE n.nspname = {schema}
+                      AND p.proname = {name}
+                      AND p.prokind IN ('f', 'p')
+                ) d
+                LIMIT 1";
+        }
+
+        var fullObjectName = $"[{schemaName.Replace("]", "]]")}].[{objectName.Replace("]", "]]")}]";
+        return $@"
+            SELECT OBJECT_DEFINITION(OBJECT_ID({ToSqlLiteral(fullObjectName)})) AS Definition";
+    }
+
     public async Task<List<DatabaseColumnDto>> GetTableColumnsAsync(string dataSourceCode, string schemaName, string tableName)
     {
         ValidateTenantAccess();
-        var query = $@"
+        var dataSourceType = await GetDataSourceTypeAsync(dataSourceCode);
+        var query = dataSourceType == DataSourceTypeEnum.Postgresql
+            ? $@"
+            SELECT 
+                column_name AS ""ColumnName"",
+                COALESCE(NULLIF(udt_name, ''), data_type) AS ""DataType"",
+                CASE WHEN is_nullable = 'YES' THEN TRUE ELSE FALSE END AS ""IsNullable"",
+                character_maximum_length AS ""MaxLength""
+            FROM information_schema.columns
+            WHERE table_schema = {ToSqlLiteral(schemaName)}
+              AND table_name = {ToSqlLiteral(tableName)}
+            ORDER BY ordinal_position"
+            : $@"
             SELECT 
                 c.name AS ColumnName,
                 TYPE_NAME(c.user_type_id) AS DataType,
@@ -274,8 +400,8 @@ public class SqlObjectManagerAppService : ApplicationService, ISqlObjectManagerA
                 INNER JOIN sys.tables t ON c.object_id = t.object_id
                 INNER JOIN sys.schemas s ON t.schema_id = s.schema_id
             WHERE 
-                s.name = '{schemaName}'
-                AND t.name = '{tableName}'
+                s.name = {ToSqlLiteral(schemaName)}
+                AND t.name = {ToSqlLiteral(tableName)}
             ORDER BY 
                 c.column_id";
 
@@ -291,10 +417,10 @@ public class SqlObjectManagerAppService : ApplicationService, ISqlObjectManagerA
                 {
                     columns.Add(new DatabaseColumnDto
                     {
-                        ColumnName = dict["ColumnName"]?.ToString() ?? "",
-                        DataType = dict["DataType"]?.ToString() ?? "",
-                        IsNullable = dict["IsNullable"] is bool b && b,
-                        MaxLength = dict["MaxLength"] != null ? int.Parse(dict["MaxLength"].ToString()) : null
+                        ColumnName = GetDictionaryValue(dict, "ColumnName")?.ToString() ?? "",
+                        DataType = GetDictionaryValue(dict, "DataType")?.ToString() ?? "",
+                        IsNullable = ToBoolean(GetDictionaryValue(dict, "IsNullable")),
+                        MaxLength = ToNullableInt(GetDictionaryValue(dict, "MaxLength"))
                     });
                 }
             }
@@ -303,6 +429,218 @@ public class SqlObjectManagerAppService : ApplicationService, ISqlObjectManagerA
         return columns;
     }
 
+    [HttpGet("api/app/sql-object-manager/table-create-script")]
+    public async Task<string> GetTableCreateScriptAsync(string dataSourceCode, string schemaName, string tableName)
+    {
+        ValidateTenantAccess();
+        var dataSourceType = await GetDataSourceTypeAsync(dataSourceCode);
+
+        var result = await _sqlExecutorService.ExecuteQueryAsync(
+            BuildTableCreateScriptQuery(dataSourceType, schemaName, tableName),
+            dataSourceCode);
+
+        if (!result.Success || result.Data == null)
+        {
+            return string.Empty;
+        }
+
+        var row = result.Data.FirstOrDefault() as IDictionary<string, object>;
+        return GetDictionaryValue(row, "Script")?.ToString() ?? string.Empty;
+    }
+
+    private static string BuildTableCreateScriptQuery(
+        DataSourceTypeEnum dataSourceType,
+        string schemaName,
+        string tableName)
+    {
+        if (dataSourceType == DataSourceTypeEnum.Postgresql)
+        {
+            return BuildPostgreSqlTableCreateScriptQuery(schemaName, tableName);
+        }
+
+        return BuildSqlServerTableCreateScriptQuery(schemaName, tableName);
+    }
+
+    private static string BuildSqlServerTableCreateScriptQuery(string schemaName, string tableName)
+    {
+        var fullName = $"[{schemaName.Replace("]", "]]")}].[{tableName.Replace("]", "]]")}]";
+        var escapedFullName = ToSqlLiteral(fullName);
+
+        return $@"
+DECLARE @ObjectId INT = OBJECT_ID({escapedFullName});
+
+IF @ObjectId IS NULL
+BEGIN
+    SELECT CAST('' AS NVARCHAR(MAX)) AS Script;
+    RETURN;
+END;
+
+;WITH cols AS
+(
+    SELECT
+        c.column_id,
+        '        ' + QUOTENAME(c.name) + ' ' +
+        CASE
+            WHEN t.name IN ('varchar', 'char', 'varbinary', 'binary') THEN
+                t.name + '(' + CASE WHEN c.max_length = -1 THEN 'MAX' ELSE CAST(c.max_length AS VARCHAR(10)) END + ')'
+            WHEN t.name IN ('nvarchar', 'nchar') THEN
+                t.name + '(' + CASE WHEN c.max_length = -1 THEN 'MAX' ELSE CAST(c.max_length / 2 AS VARCHAR(10)) END + ')'
+            WHEN t.name IN ('decimal', 'numeric') THEN
+                t.name + '(' + CAST(c.precision AS VARCHAR(10)) + ',' + CAST(c.scale AS VARCHAR(10)) + ')'
+            WHEN t.name IN ('datetime2', 'datetimeoffset', 'time') THEN
+                t.name + '(' + CAST(c.scale AS VARCHAR(10)) + ')'
+            ELSE t.name
+        END +
+        CASE
+            WHEN ic.object_id IS NOT NULL
+                THEN ' IDENTITY(' + CAST(ic.seed_value AS VARCHAR(30)) + ',' + CAST(ic.increment_value AS VARCHAR(30)) + ')'
+            ELSE ''
+        END +
+        CASE WHEN c.is_nullable = 1 THEN ' NULL' ELSE ' NOT NULL' END +
+        ISNULL(' DEFAULT ' + dc.definition, '') AS line
+    FROM sys.columns c
+    INNER JOIN sys.types t ON c.user_type_id = t.user_type_id
+    LEFT JOIN sys.identity_columns ic ON c.object_id = ic.object_id AND c.column_id = ic.column_id
+    LEFT JOIN sys.default_constraints dc ON c.default_object_id = dc.object_id
+    WHERE c.object_id = @ObjectId
+),
+pk AS
+(
+    SELECT
+        '        CONSTRAINT ' + QUOTENAME(k.name) + ' PRIMARY KEY ' +
+        CASE WHEN i.type = 1 THEN 'CLUSTERED' ELSE 'NONCLUSTERED' END +
+        CHAR(13) + CHAR(10) + '    (' + CHAR(13) + CHAR(10) +
+        (
+            SELECT '        ' + QUOTENAME(c.name) + CASE WHEN ic.is_descending_key = 1 THEN ' DESC' ELSE ' ASC' END + CHAR(13) + CHAR(10)
+            FROM sys.index_columns ic
+            INNER JOIN sys.columns c ON ic.object_id = c.object_id AND ic.column_id = c.column_id
+            WHERE ic.object_id = i.object_id
+              AND ic.index_id = i.index_id
+              AND ic.is_included_column = 0
+            ORDER BY ic.key_ordinal
+            FOR XML PATH(''), TYPE
+        ).value('.', 'NVARCHAR(MAX)') +
+        '    )' AS line
+    FROM sys.key_constraints k
+    INNER JOIN sys.indexes i ON k.parent_object_id = i.object_id AND k.unique_index_id = i.index_id
+    WHERE k.parent_object_id = @ObjectId
+      AND k.type = 'PK'
+)
+SELECT
+    'IF OBJECT_ID(N''{fullName.Replace("'", "''")}'', ''U'') IS NULL' + CHAR(13) + CHAR(10) +
+    'BEGIN' + CHAR(13) + CHAR(10) +
+    '    CREATE TABLE {fullName}' + CHAR(13) + CHAR(10) +
+    '    (' + CHAR(13) + CHAR(10) +
+    STUFF(
+        (
+            SELECT ',' + CHAR(13) + CHAR(10) + line
+            FROM cols
+            ORDER BY column_id
+            FOR XML PATH(''), TYPE
+        ).value('.', 'NVARCHAR(MAX)')
+    ,1,3,'') +
+    ISNULL(
+        (
+            SELECT ',' + CHAR(13) + CHAR(10) + line
+            FROM pk
+        ),
+        ''
+    ) + CHAR(13) + CHAR(10) + '    )' + CHAR(13) + CHAR(10) + 'END' + CHAR(13) + CHAR(10) + 'GO' AS Script;";
+    }
+
+    private static string BuildPostgreSqlTableCreateScriptQuery(string schemaName, string tableName)
+    {
+        return $@"
+WITH cols AS (
+    SELECT
+        c.ordinal_position,
+        '    ' || quote_ident(c.column_name) || ' ' ||
+        CASE
+            WHEN c.data_type = 'character varying' THEN 'varchar(' || c.character_maximum_length || ')'
+            WHEN c.data_type = 'character' THEN 'char(' || c.character_maximum_length || ')'
+            WHEN c.data_type = 'numeric' AND c.numeric_precision IS NOT NULL THEN 'numeric(' || c.numeric_precision || ',' || c.numeric_scale || ')'
+            WHEN c.data_type = 'USER-DEFINED' THEN c.udt_name
+            ELSE c.data_type
+        END ||
+        CASE WHEN c.is_nullable = 'NO' THEN ' NOT NULL' ELSE '' END ||
+        COALESCE(' DEFAULT ' || c.column_default, '') AS line
+    FROM information_schema.columns c
+    WHERE c.table_schema = {ToSqlLiteral(schemaName)}
+      AND c.table_name = {ToSqlLiteral(tableName)}
+),
+pk AS (
+    SELECT
+        '    CONSTRAINT ' || quote_ident(tc.constraint_name) || ' PRIMARY KEY (' ||
+        string_agg(quote_ident(kcu.column_name), ', ' ORDER BY kcu.ordinal_position) || ')' AS line
+    FROM information_schema.table_constraints tc
+    JOIN information_schema.key_column_usage kcu
+      ON tc.constraint_name = kcu.constraint_name
+     AND tc.table_schema = kcu.table_schema
+     AND tc.table_name = kcu.table_name
+    WHERE tc.constraint_type = 'PRIMARY KEY'
+      AND tc.table_schema = {ToSqlLiteral(schemaName)}
+      AND tc.table_name = {ToSqlLiteral(tableName)}
+    GROUP BY tc.constraint_name
+)
+SELECT
+    'CREATE TABLE IF NOT EXISTS ' || quote_ident({ToSqlLiteral(schemaName)}) || '.' || quote_ident({ToSqlLiteral(tableName)}) || E'\n(\n' ||
+    string_agg(line, E',\n' ORDER BY sort_order) ||
+    E'\n);' AS ""Script""
+FROM (
+    SELECT ordinal_position AS sort_order, line FROM cols
+    UNION ALL
+    SELECT 100000 AS sort_order, line FROM pk
+) s;";
+    }
+
+    private static object GetDictionaryValue(IDictionary<string, object> row, string key)
+    {
+        if (row == null)
+        {
+            return null;
+        }
+
+        if (row.TryGetValue(key, out var value))
+        {
+            return value;
+        }
+
+        var match = row.FirstOrDefault(x => string.Equals(x.Key, key, StringComparison.OrdinalIgnoreCase));
+        return string.IsNullOrEmpty(match.Key) ? null : match.Value;
+    }
+
+    private static string GetDefaultSchemaName(DataSourceTypeEnum dataSourceType)
+    {
+        return dataSourceType == DataSourceTypeEnum.Postgresql ? "public" : "dbo";
+    }
+
+    private static string ToSqlLiteral(string value)
+    {
+        return $"'{(value ?? string.Empty).Replace("'", "''")}'";
+    }
+
+    private static bool ToBoolean(object value)
+    {
+        return value switch
+        {
+            bool boolValue => boolValue,
+            short shortValue => shortValue != 0,
+            int intValue => intValue != 0,
+            long longValue => longValue != 0,
+            _ => bool.TryParse(value?.ToString(), out var parsed) && parsed
+        };
+    }
+
+    private static int? ToNullableInt(object value)
+    {
+        if (value == null)
+        {
+            return null;
+        }
+
+        return int.TryParse(value.ToString(), out var parsed) ? parsed : null;
+    }
+
     private SqlQueryExecutionResultDto MapExecutionResult(SqlExecutionResult result, bool isDeployed = false)
     {
         return new SqlQueryExecutionResultDto
@@ -617,27 +955,48 @@ public class SqlObjectManagerAppService : ApplicationService, ISqlObjectManagerA
     }
 
     [HttpGet("api/app/sql-object-manager/sql-data-files")]
-    public Task<List<SqlDataFileDto>> GetSqlDataFilesAsync()
+    public Task<List<SqlDataFileDto>> GetSqlDataFilesAsync(
+        [FromQuery] string dataDirectoryName = "SqlData",
+        [FromQuery] string relativePath = "")
     {
         ValidateTenantAccess();
 
         try
         {
-            var outputPath = ResolveSqlDataOutputPath();
+            var rootPath = ResolveSqlDataOutputPath(dataDirectoryName);
+            var outputPath = ResolveSqlDataChildPath(rootPath, relativePath);
             if (!Directory.Exists(outputPath))
                 return Task.FromResult(new List<SqlDataFileDto>());
 
+            var directories = Directory.GetDirectories(outputPath, "*", SearchOption.TopDirectoryOnly)
+                .Where(d => string.Equals(Path.GetFileName(d), "HostData", StringComparison.OrdinalIgnoreCase))
+                .Select(d => new SqlDataFileDto
+                {
+                    FileName = Path.GetFileName(d)!,
+                    Name = Path.GetFileName(d)!,
+                    RelativePath = BuildSqlDataRelativePath(relativePath, Path.GetFileName(d)!),
+                    IsDirectory = true,
+                    CreatedAt = Directory.GetCreationTime(d)
+                });
+
             var files = Directory.GetFiles(outputPath, "*.sql", SearchOption.TopDirectoryOnly)
                 .Select(f => new SqlDataFileDto
                 {
                     FileName = Path.GetFileName(f)!,
+                    Name = Path.GetFileName(f)!,
+                    RelativePath = BuildSqlDataRelativePath(relativePath, Path.GetFileName(f)!),
+                    IsDirectory = false,
                     CreatedAt = File.GetCreationTime(f)
                 })
-                .Where(x => !string.IsNullOrWhiteSpace(x.FileName))
-                .OrderBy(x => x.FileName, StringComparer.OrdinalIgnoreCase)
+                .Where(x => !string.IsNullOrWhiteSpace(x.Name));
+
+            var entries = directories
+                .Concat(files)
+                .OrderByDescending(x => x.IsDirectory)
+                .ThenBy(x => x.Name, StringComparer.OrdinalIgnoreCase)
                 .ToList();
 
-            return Task.FromResult(files);
+            return Task.FromResult(entries);
         }
         catch (Exception ex)
         {
@@ -646,24 +1005,140 @@ public class SqlObjectManagerAppService : ApplicationService, ISqlObjectManagerA
         }
     }
 
+    [HttpGet("api/app/sql-object-manager/sql-data-file-content")]
+    public async Task<string> GetSqlDataFileContentAsync(
+        [FromQuery] string dataDirectoryName = "SqlData",
+        [FromQuery] string relativePath = "")
+    {
+        ValidateTenantAccess();
+
+        var rootPath = ResolveSqlDataOutputPath(dataDirectoryName);
+        var filePath = ResolveSqlDataChildPath(rootPath, relativePath);
+
+        if (!File.Exists(filePath))
+            throw new Volo.Abp.UserFriendlyException("SQL seed file was not found.");
+
+        if (!string.Equals(Path.GetExtension(filePath), ".sql", StringComparison.OrdinalIgnoreCase))
+            throw new Volo.Abp.UserFriendlyException("Only .sql files can be previewed.");
+
+        return await File.ReadAllTextAsync(filePath);
+    }
+
+    [HttpPost("api/app/sql-object-manager/move-sql-data-file")]
+    public Task MoveSqlDataFileAsync(MoveSqlDataFileDto input)
+    {
+        ValidateTenantAccess();
+
+        if (input == null)
+            throw new Volo.Abp.UserFriendlyException("Invalid move request.");
+
+        var rootPath = ResolveSqlDataOutputPath(input.DataDirectoryName);
+        var sourcePath = ResolveSqlDataChildPath(rootPath, input.SourceRelativePath);
+        var targetPath = ResolveSqlDataChildPath(rootPath, input.TargetRelativePath);
+
+        if (!File.Exists(sourcePath))
+            throw new Volo.Abp.UserFriendlyException("Source file was not found.");
+
+        if (!string.Equals(Path.GetExtension(sourcePath), ".sql", StringComparison.OrdinalIgnoreCase) ||
+            !string.Equals(Path.GetExtension(targetPath), ".sql", StringComparison.OrdinalIgnoreCase))
+        {
+            throw new Volo.Abp.UserFriendlyException("Only .sql files can be moved.");
+        }
+
+        Directory.CreateDirectory(Path.GetDirectoryName(targetPath)!);
+
+        if (File.Exists(targetPath))
+            throw new Volo.Abp.UserFriendlyException("A file with the same name already exists in the target folder.");
+
+        File.Move(sourcePath, targetPath);
+        _logger.LogInformation("SQL seed file moved from {SourcePath} to {TargetPath}", sourcePath, targetPath);
+
+        return Task.CompletedTask;
+    }
+
     private string ResolveSqlDataOutputPath()
+    {
+        return ResolveSqlDataOutputPath("SqlData");
+    }
+
+    private string ResolveSqlDataOutputPath(string dataDirectoryName)
     {
         const string dbMigratorName = "Sozsoft.Platform.DbMigrator";
+        var safeDirectoryName = NormalizeSqlDataDirectoryName(dataDirectoryName);
         var dir = new DirectoryInfo(_hostEnvironment.ContentRootPath);
 
         while (dir != null)
         {
             var candidate = Path.Combine(dir.FullName, "src", dbMigratorName, "Seeds");
             if (Directory.Exists(candidate))
-                return Path.Combine(candidate, "SqlData");
+                return Path.Combine(candidate, safeDirectoryName);
 
             candidate = Path.Combine(dir.FullName, dbMigratorName, "Seeds");
             if (Directory.Exists(candidate))
-                return Path.Combine(candidate, "SqlData");
+                return Path.Combine(candidate, safeDirectoryName);
 
             dir = dir.Parent;
         }
 
-        return Path.Combine(_hostEnvironment.ContentRootPath, "Seeds", "SqlData");
+        return Path.Combine(_hostEnvironment.ContentRootPath, "Seeds", safeDirectoryName);
+    }
+
+    private static string NormalizeSqlDataDirectoryName(string dataDirectoryName)
+    {
+        return string.Equals(dataDirectoryName, "PostgresData", StringComparison.OrdinalIgnoreCase)
+            ? "PostgresData"
+            : "SqlData";
+    }
+
+    private static string ResolveSqlDataChildPath(string rootPath, string relativePath)
+    {
+        var normalized = NormalizeSqlDataRelativePath(relativePath);
+        var fullPath = Path.GetFullPath(Path.Combine(rootPath, normalized));
+        var fullRoot = Path.GetFullPath(rootPath);
+        var fullRootWithSeparator = fullRoot.EndsWith(Path.DirectorySeparatorChar)
+            ? fullRoot
+            : fullRoot + Path.DirectorySeparatorChar;
+
+        if (!string.Equals(fullPath, fullRoot, StringComparison.OrdinalIgnoreCase) &&
+            !fullPath.StartsWith(fullRootWithSeparator, StringComparison.OrdinalIgnoreCase))
+        {
+            throw new Volo.Abp.UserFriendlyException("Invalid path.");
+        }
+
+        return fullPath;
+    }
+
+    private static string NormalizeSqlDataRelativePath(string relativePath)
+    {
+        if (string.IsNullOrWhiteSpace(relativePath))
+            return string.Empty;
+
+        var normalized = relativePath.Replace('\\', '/').Trim('/');
+        var parts = normalized.Split('/', StringSplitOptions.RemoveEmptyEntries);
+
+        if (parts.Length == 0)
+            return string.Empty;
+
+        if (parts.Any(p => p == "." || p == ".." || p.IndexOfAny(Path.GetInvalidFileNameChars()) >= 0))
+            throw new Volo.Abp.UserFriendlyException("Invalid path.");
+
+        var isRootFile = parts.Length == 1 && parts[0].EndsWith(".sql", StringComparison.OrdinalIgnoreCase);
+        var isHostDataFolder = parts.Length == 1 && string.Equals(parts[0], "HostData", StringComparison.OrdinalIgnoreCase);
+        var isHostDataFile = parts.Length == 2 &&
+            string.Equals(parts[0], "HostData", StringComparison.OrdinalIgnoreCase) &&
+            parts[1].EndsWith(".sql", StringComparison.OrdinalIgnoreCase);
+
+        if (!isRootFile && !isHostDataFolder && !isHostDataFile)
+            throw new Volo.Abp.UserFriendlyException("Invalid path.");
+
+        return Path.Combine(parts);
+    }
+
+    private static string BuildSqlDataRelativePath(string parentRelativePath, string name)
+    {
+        if (string.IsNullOrWhiteSpace(parentRelativePath))
+            return name;
+
+        return $"{parentRelativePath.Trim('/', '\\')}/{name}";
     }
 }

api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/SqlQueryManagerApplicationModule.cs

@@ -1,6 +1,6 @@
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Application;
-using Volo.Abp.AutoMapper;
+using Volo.Abp.Mapperly;
 using Volo.Abp.Modularity;
 
 namespace Sozsoft.SqlQueryManager;
@@ -9,17 +9,12 @@ namespace Sozsoft.SqlQueryManager;
     typeof(SqlQueryManagerDomainModule),
     typeof(SqlQueryManagerApplicationContractsModule),
     typeof(AbpDddApplicationModule),
-    typeof(AbpAutoMapperModule)
+    typeof(AbpMapperlyModule)
 )]
 public class SqlQueryManagerApplicationModule : AbpModule
 {
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        context.Services.AddAutoMapperObjectMapper<SqlQueryManagerApplicationModule>();
-
-        Configure<AbpAutoMapperOptions>(options =>
-        {
-            options.AddMaps<SqlQueryManagerApplicationModule>(validate: true);
-        });
+        context.Services.AddMapperlyObjectMapper<SqlQueryManagerApplicationModule>();
     }
 }

api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/SqlQueryManagerAutoMapperProfile.cs

@@ -1,12 +0,0 @@
-using AutoMapper;
-
-namespace Sozsoft.SqlQueryManager.Application;
-
-// No entity-to-DTO mappings needed; SQL objects are no longer persisted in this module.
-public class SqlQueryManagerAutoMapperProfile : Profile
-{
-    public SqlQueryManagerAutoMapperProfile()
-    {
-        // intentionally empty
-    }
-}

api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/SqlQueryManagerMappers.cs

@@ -0,0 +1 @@
+namespace Sozsoft.SqlQueryManager.Application;

api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain.Shared/Sozsoft.SqlQueryManager.Domain.Shared.csproj

@@ -1,20 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
+    <TargetFramework>net10.0</TargetFramework>
+    <GenerateEmbeddedFilesManifest>false</GenerateEmbeddedFilesManifest>
     <RootNamespace>Sozsoft.SqlQueryManager</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Domain.Shared" Version="9.0.2" />
-    <PackageReference Include="Volo.Abp.Validation" Version="9.0.2" />
+    <PackageReference Include="Volo.Abp.Ddd.Domain.Shared" Version="10.0.0" />
+    <PackageReference Include="Volo.Abp.Validation" Version="10.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0" />
   </ItemGroup>
 
   <ItemGroup>

api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain/Services/SqlExecutorService.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Sozsoft.Platform.DynamicData;
+using Sozsoft.Platform.Enums;
 using Sozsoft.Platform.Queries;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp;
@@ -38,14 +39,25 @@ public class SqlExecutorService : DomainService, ISqlExecutorService
                 .WithData("DataSourceCode", dataSourceCode);
         }
 
-        // Get appropriate repository based on database type
-        // For now, using MS SQL Server repository
-        var repository = _serviceProvider.GetKeyedService<IDynamicDataRepository>("Ms");
+        var repositoryKey = dataSource.DataSourceType switch
+        {
+            DataSourceTypeEnum.Mssql => "Ms",
+            DataSourceTypeEnum.Postgresql => "Pg",
+            _ => null
+        };
+
+        if (repositoryKey == null)
+        {
+            throw new BusinessException("SqlQueryManager:DataSourceTypeNotSupported")
+                .WithData("DatabaseType", dataSource.DataSourceType);
+        }
+
+        var repository = _serviceProvider.GetKeyedService<IDynamicDataRepository>(repositoryKey);
         
         if (repository == null)
         {
             throw new BusinessException("SqlQueryManager:RepositoryNotFound")
-                .WithData("DatabaseType", "Ms");
+                .WithData("DatabaseType", repositoryKey);
         }
 
         return repository;

api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain/Sozsoft.SqlQueryManager.Domain.csproj

@@ -1,14 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>Sozsoft.SqlQueryManager</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="9.0.2" />
+    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="10.0.0" />
     <ProjectReference Include="..\Sozsoft.SqlQueryManager.Domain.Shared\Sozsoft.SqlQueryManager.Domain.Shared.csproj" />
     <ProjectReference Include="..\..\..\src\Sozsoft.Platform.Domain\Sozsoft.Platform.Domain.csproj" />
   </ItemGroup>

api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.EntityFrameworkCore/Sozsoft.SqlQueryManager.EntityFrameworkCore.csproj

@@ -1,14 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>Sozsoft.SqlQueryManager</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="9.0.2" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="10.0.0" />
     <ProjectReference Include="..\Sozsoft.SqlQueryManager.Domain\Sozsoft.SqlQueryManager.Domain.csproj" />
   </ItemGroup>
 

api/modules/Sozsoft.SqlQueryManager/common.props

@@ -7,11 +7,14 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="ConfigureAwait.Fody" Version="3.3.1" PrivateAssets="All" />
-    <PackageReference Include="Fody" Version="6.5.3">
+    <PackageReference Include="ConfigureAwait.Fody" Version="3.4.0" PrivateAssets="All" />
+    <PackageReference Include="Fody" Version="6.9.3">
       <PrivateAssets>All</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="MailKit" Version="4.16.0" />
+    <PackageReference Include="MimeKit" Version="4.16.0" />
+    <PackageReference Include="Scriban" Version="7.2.3" />
   </ItemGroup>
 
 

api/src/Sozsoft.Platform.Application.Contracts/AuditLogs/AuditLogActionDto.cs

@@ -5,11 +5,11 @@ namespace Sozsoft.Platform.AuditLogs;
 
 public class AuditLogActionDto : EntityDto<Guid>
 {
-    public virtual Guid AuditLogId { get; protected set; }
-    public virtual string ServiceName { get; protected set; }
-    public virtual string MethodName { get; protected set; }
-    public virtual string Parameters { get; protected set; }
-    public virtual DateTime ExecutionTime { get; protected set; }
-    public virtual int ExecutionDuration { get; protected set; }
+    public virtual Guid AuditLogId { get; set; }
+    public virtual string ServiceName { get; set; }
+    public virtual string MethodName { get; set; }
+    public virtual string Parameters { get; set; }
+    public virtual DateTime ExecutionTime { get; set; }
+    public virtual int ExecutionDuration { get; set; }
 
 }

api/src/Sozsoft.Platform.Application.Contracts/AuditLogs/AuditLogDto.cs

@@ -13,24 +13,24 @@ public class AuditLogDto : EntityDto<Guid>
     }
 
     public string ApplicationName { get; set; }
-    public Guid? UserId { get; protected set; }
-    public string UserName { get; protected set; }
-    public Guid? TenantId { get; protected set; }
-    public string TenantName { get; protected set; }
-    public DateTime ExecutionTime { get; protected set; }
-    public int ExecutionDuration { get; protected set; }
-    public string ClientIpAddress { get; protected set; }
-    public string ClientName { get; protected set; }
+    public Guid? UserId { get; set; }
+    public string UserName { get; set; }
+    public Guid? TenantId { get; set; }
+    public string TenantName { get; set; }
+    public DateTime ExecutionTime { get; set; }
+    public int ExecutionDuration { get; set; }
+    public string ClientIpAddress { get; set; }
+    public string ClientName { get; set; }
     public string ClientId { get; set; }
     public string CorrelationId { get; set; }
-    public string BrowserInfo { get; protected set; }
-    public string HttpMethod { get; protected set; }
-    public string Url { get; protected set; }
-    public string Exceptions { get; protected set; }
-    public string Comments { get; protected set; }
+    public string BrowserInfo { get; set; }
+    public string HttpMethod { get; set; }
+    public string Url { get; set; }
+    public string Exceptions { get; set; }
+    public string Comments { get; set; }
     public int? HttpStatusCode { get; set; }
-    public ICollection<EntityChangeDto> EntityChanges { get; protected set; }
-    public ICollection<AuditLogActionDto> Actions { get; protected set; }
+    public ICollection<EntityChangeDto> EntityChanges { get; set; }
+    public ICollection<AuditLogActionDto> Actions { get; set; }
 
     public int? EntityChangeCount { get; set; }
 

api/src/Sozsoft.Platform.Application.Contracts/AuditLogs/AuditLogListRequestDto.cs

@@ -0,0 +1,9 @@
+using Volo.Abp.Application.Dtos;
+
+namespace Sozsoft.Platform.AuditLogs;
+
+public class AuditLogListRequestDto : PagedAndSortedResultRequestDto
+{
+    public string ListFormCode { get; set; }
+    public string EntityId { get; set; }
+}

api/src/Sozsoft.Platform.Application.Contracts/AuditLogs/EntityChangeDto.cs

@@ -12,12 +12,12 @@ public class EntityChangeDto : EntityDto<Guid>
         PropertyChanges = new List<EntityPropertyChangeDto>();
     }
 
-    public virtual Guid AuditLogId { get; protected set; }
-    public virtual DateTime ChangeTime { get; protected set; }
-    public virtual EntityChangeType ChangeType { get; protected set; }
-    public virtual Guid? EntityTenantId { get; protected set; }
-    public virtual string EntityId { get; protected set; }
-    public virtual string EntityTypeFullName { get; protected set; }
-    public virtual ICollection<EntityPropertyChangeDto> PropertyChanges { get; protected set; }
+    public virtual Guid AuditLogId { get; set; }
+    public virtual DateTime ChangeTime { get; set; }
+    public virtual EntityChangeType ChangeType { get; set; }
+    public virtual Guid? EntityTenantId { get; set; }
+    public virtual string EntityId { get; set; }
+    public virtual string EntityTypeFullName { get; set; }
+    public virtual ICollection<EntityPropertyChangeDto> PropertyChanges { get; set; }
 }
 

api/src/Sozsoft.Platform.Application.Contracts/AuditLogs/EntityPropertyChangeDto.cs

@@ -5,10 +5,10 @@ namespace Sozsoft.Platform.AuditLogs;
 
 public class EntityPropertyChangeDto : EntityDto<Guid>
 {
-    public virtual Guid EntityChangeId { get; protected set; }
-    public virtual string NewValue { get; protected set; }
-    public virtual string OriginalValue { get; protected set; }
-    public virtual string PropertyName { get; protected set; }
-    public virtual string PropertyTypeFullName { get; protected set; }
+    public virtual Guid EntityChangeId { get; set; }
+    public virtual string NewValue { get; set; }
+    public virtual string OriginalValue { get; set; }
+    public virtual string PropertyName { get; set; }
+    public virtual string PropertyTypeFullName { get; set; }
 }
 

api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/UserAvatarUpdateInput.cs

@@ -0,0 +1,11 @@
+using System;
+using Volo.Abp.Content;
+
+namespace Sozsoft.Platform.Identity.Dto;
+
+public class UserAvatarUpdateInput
+{
+    public Guid UserId { get; set; }
+
+    public IRemoteStreamContent Avatar { get; set; }
+}

api/src/Sozsoft.Platform.Application.Contracts/Intranet/AnnouncementDto.cs

@@ -8,16 +8,16 @@ public class AnnouncementDto : FullAuditedEntityDto<Guid>
 {
     public Guid? TenantId { get; set; }
 
-    public string Title { get; set; }
-    public string Excerpt { get; set; }
-    public string Content { get; set; }
-    public string ImageUrl { get; set; }
-    public string Category { get; set; }
+    public string Title { get; set; } = string.Empty;
+    public string Excerpt { get; set; } = string.Empty;
+    public string Content { get; set; } = string.Empty;
+    public string ImageUrl { get; set; } = string.Empty;
+    public string Category { get; set; } = string.Empty;
     public Guid? UserId { get; set; }
-    public UserInfoViewModel User { get; set; } 
+    public UserInfoViewModel? User { get; set; } 
     public DateTime PublishDate { get; set; }
     public DateTime? ExpiryDate { get; set; }
     public bool IsPinned { get; set; }
     public int ViewCount { get; set; }
-    public string Attachments { get; set; }
+    public string Attachments { get; set; } = string.Empty;
 }

api/src/Sozsoft.Platform.Application.Contracts/Intranet/SocialPostDto.cs

@@ -9,7 +9,7 @@ public class SocialPostDto : FullAuditedEntityDto<Guid>
 {
     public Guid? UserId { get; set; }
     public UserInfoViewModel? User { get; set; }
-    public string Content { get; set; }
+    public string Content { get; set; } = string.Empty;
 
     public int LikeCount { get; set; }
     public bool IsLiked { get; set; }
@@ -17,14 +17,14 @@ public class SocialPostDto : FullAuditedEntityDto<Guid>
 
     public SocialLocationDto? Location { get; set; }
     public SocialMediaDto? Media { get; set; }
-    public List<SocialCommentDto> Comments { get; set; }
-    public List<SocialLikeDto> Likes { get; set; }
+    public List<SocialCommentDto> Comments { get; set; } = [];
+    public List<SocialLikeDto> Likes { get; set; } = [];
 }
 
 public class SocialLocationDto : FullAuditedEntityDto<Guid>
 {
     public Guid SocialPostId { get; set; }
-    public string Name { get; set; }
+    public string Name { get; set; } = string.Empty;
     public string? Address { get; set; }
     public double? Lat { get; set; }
     public double? Lng { get; set; }
@@ -34,8 +34,8 @@ public class SocialLocationDto : FullAuditedEntityDto<Guid>
 public class SocialMediaDto : FullAuditedEntityDto<Guid>
 {
     public Guid SocialPostId { get; set; }
-    public string Type { get; set; } // image | video | poll
-    public string[] Urls { get; set; }
+    public string Type { get; set; } = string.Empty; // image | video | poll
+    public string[] Urls { get; set; } = [];
 
     // Poll Fields
     public string? PollQuestion { get; set; }
@@ -43,13 +43,13 @@ public class SocialMediaDto : FullAuditedEntityDto<Guid>
     public DateTime? PollEndsAt { get; set; }
     public string? PollUserVoteId { get; set; }
 
-    public List<SocialPollOptionDto> PollOptions { get; set; }
+    public List<SocialPollOptionDto> PollOptions { get; set; } = [];
 }
 
 public class SocialPollOptionDto : FullAuditedEntityDto<Guid>
 {
     public Guid SocialMediaId { get; set; }
-    public string Text { get; set; }
+    public string Text { get; set; } = string.Empty;
     public int Votes { get; set; }
 }
 
@@ -58,7 +58,7 @@ public class SocialCommentDto : FullAuditedEntityDto<Guid>
     public Guid SocialPostId { get; set; }
     public Guid? UserId { get; set; }
     public UserInfoViewModel? User { get; set; }
-    public string Content { get; set; }
+    public string Content { get; set; } = string.Empty;
 }
 
 public class SocialLikeDto : FullAuditedEntityDto<Guid>

api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/ColumnFormatDto.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using Sozsoft.Platform.Enums;
 using Volo.Abp.Application.Dtos;
 
 namespace Sozsoft.Platform.ListForms;
@@ -222,6 +223,7 @@ public class ColumnFormatDto : AuditedEntityDto<Guid>
     public bool CanExport { get; set; }
 
     public object DefaultValue { get; set; }
+    public FieldCustomValueTypeEnum DefaultValueType { get; set; }
 
     [JsonIgnore]
     public string PivotSettingsJson { get; set; }

api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/ListFormImportLogDto.cs

@@ -3,7 +3,7 @@ using Volo.Abp.Application.Dtos;
 
 namespace Sozsoft.Platform.ListForms;
 
-public class ListFormImportExecuteDto : AuditedEntityDto<Guid>
+public class ListFormImportLogDto : AuditedEntityDto<Guid>
 {
     public Guid ImportId { get; set; }
     public string BlobName { get; set; }

api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/LookupDto.cs

@@ -26,6 +26,6 @@ public class LookupDto
     /// Not:    FieldName alaninin veritabani turu int+ turunde ise {key:1:, name:"nn"} seklide olmali
     ///         FieldName alaninin veritabani turu string+ turunde ise {key:"1", name:"nn"} seklide olmali
     /// </summary>
-    public string LookupQuery { get; set; }
+    public string LookupQuery { get; set; } //"GET;notification-rule/notification-types;{};a;a;null",
 }
 

api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/GridOptionsDto.cs

@@ -394,6 +394,19 @@ public class GridOptionsDto : AuditedEntityDto<Guid>
         set { LayoutJson = JsonSerializer.Serialize(value); }
     }
 
+    [JsonIgnore]
+    public string WorkflowJson { get; set; }
+    public WorkflowDto WorkflowDto
+    {
+        get
+        {
+            if (!string.IsNullOrEmpty(WorkflowJson))
+                return JsonSerializer.Deserialize<WorkflowDto>(WorkflowJson);
+            return new WorkflowDto();
+        }
+        set { WorkflowJson = JsonSerializer.Serialize(value); }
+    }
+
     /// <summary> Chart a yetkili kullanıcı. UserId ve RoleId boş ise herkes yetkilidir
     /// </summary>
     public string UserId { get; set; }

api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/WorkflowDto.cs

@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+
+namespace Sozsoft.Platform.ListForms;
+
+public class WorkflowDto
+{
+    public string ApprovalUserFieldName { get; set; }
+    public bool IsFilterUserName { get; set; }
+    public string ApprovalDateFieldName { get; set; }
+    public string ApprovalStatusFieldName { get; set; }
+    public string ApprovalDescriptionFieldName { get; set; }
+
+    public List<ListFormWorkflowCriteriaDto> Criteria { get; set; } = [];
+}

api/src/Sozsoft.Platform.Application.Contracts/ListForms/IListFormSelectAppService.cs

@@ -6,5 +6,6 @@ public interface IListFormSelectAppService
 {
     Task<SelectDto> GetSelectAsync(SelectRequestDto input);
     Task<GridDto> GetGridAsync(string ListFormCode);
+    Task<string> GetNextSequenceValueAsync(string SequenceName);
 }
 

api/src/Sozsoft.Platform.Application.Contracts/ListForms/ImportManager/IImportAppService.cs

@@ -11,7 +11,7 @@ public interface IImportAppService
     Task<ListFormsImportDto> GetAsync(Guid sessionId);
     Task<List<ListFormsImportDto>> GetListByListFormCodeAsync(string name);
     Task<ListFormsImportDto> UpdateAsync(Guid sessionId, ListFormsImportDto input);
-    Task<ListFormImportExecuteDto> ExecuteAsync(ExecuteImportRequest request);
+    Task<ListFormImportLogDto> ExecuteAsync(ImportExecuteRequest request);
     Task DeleteAsync(Guid id);
 }
 

api/src/Sozsoft.Platform.Application.Contracts/ListForms/ImportManager/ImportExecuteRequest.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Sozsoft.Platform.ListForms.ImportManager;
 
-public class ExecuteImportRequest
+public class ImportExecuteRequest
 {
     public Guid SessionId { get; set; }
     public string ListFormCode { get; set; }