From 9e362f6671d3cae8e0398a5de34f21a7f4849059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sedat=20=C3=96ZT=C3=9CRK?= <76204082+iamsedatozturk@users.noreply.github.com> Date: Fri, 21 Aug 2026 22:27:59 +0300 Subject: [PATCH] =?UTF-8?q?=C3=96l=C3=BC=20kodlar=20kald=C4=B1r=C4=B1ld?= =?UTF-8?q?=C4=B1.=20Api=20taraf=C4=B1=20i=C3=A7in?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/instructions/ai.instructions.md | 4 +- .github/instructions/dotnet.instructions.md | 135 ++++ api/Directory.Build.props | 8 +- .../LanguagesApplicationContractsModule.cs | 2 +- .../LanguagesRemoteServiceConsts.cs | 9 - .../LanguagesPermissionDefinitionProvider.cs | 2 +- .../LanguageAppService.cs | 6 +- .../LanguageKeyAppService.cs | 6 +- .../LanguageTextAppService.cs | 14 +- .../LanguagesApplicationMappers.cs | 2 +- .../LanguagesErrorCodes.cs | 7 - .../Localization/Languages.cs | 62 +- ...uageTextCacheItemInvalidatorDistributed.cs | 8 +- .../Localization/DatabaseResourceLocalizer.cs | 6 +- .../IDatabaseResourceLocalizer.cs | 4 +- .../EntityFrameworkCore/LanguagesDbContext.cs | 4 +- ...nguagesDbContextModelCreatingExtensions.cs | 4 +- .../Application/MailQueueMappers.cs | 2 +- .../Generators/AttachmentGenerator.cs | 94 +-- .../Generators/MailBodyGenerator.cs | 4 +- .../Generators/TableGenerator.cs | 2 +- .../Domain/MailQueueWorker.cs | 8 +- .../MailTracking/MailTrackingManager.cs | 4 +- .../EntityFrameworkCore/MailQueueDbContext.cs | 4 +- ...ilQueueDbContextModelCreatingExtensions.cs | 4 +- .../EntityFrameworkCore/QueryRepository.cs | 2 +- .../FileGeneration/XLSFileGenerator.cs | 10 +- .../SozsoftMailQueueModule.cs | 8 +- .../NotificationFilterRequestDto.cs | 2 +- .../NotificationRemoteServiceConsts.cs | 9 - ...otificationPermissionDefinitionProvider.cs | 2 +- .../NotificationAppService.cs | 4 +- .../NotificationApplicationMappers.cs | 8 +- .../NotificationApplicationModule.cs | 4 +- .../NotificationRuleAppService.cs | 12 +- .../Enums/NotificationChannels.cs | 2 +- .../NotificationErrorCodes.cs | 7 - .../Entities/Notification.cs | 1 - .../Entities/NotificationRule.cs | 4 +- .../NotificationManager.cs | 6 +- .../NotificationDbContext.cs | 4 +- .../NotificationEntityFrameworkCoreModule.cs | 4 +- .../Localization/SozsoftMailingResource.cs | 9 +- .../Mail/SozsoftBackgroundEmailSendingJob.cs | 2 +- .../SozsoftBackgroundEmailSendingJobArgs.cs | 2 +- .../Sozsoft.Sender/Rocket/RocketHttpClient.cs | 4 - .../PostaGuverciniHttpClient.cs | 6 +- .../Sozsoft.Sender/SozsoftSenderModule.cs | 4 +- .../WhatsApp/WhatsAppHttpClient.cs | 4 - .../SettingsPermissionDefinitionProvider.cs | 2 +- .../SettingsRemoteServiceConsts.cs | 9 - .../SettingUiAppService.cs | 4 - .../SettingsMappers.cs | 4 +- .../SettingsErrorCodes.cs | 7 - .../SettingDefinitionManager.cs | 2 +- .../SettingsDomainModule.cs | 2 +- .../EntityFrameworkCore/SettingsDbContext.cs | 4 +- ...ettingsDbContextModelCreatingExtensions.cs | 4 +- .../DatabaseObjectDto.cs | 2 +- .../SqlExecutionDto.cs | 2 +- .../SqlObjectExplorerDto.cs | 2 +- ...lQueryManagerApplicationContractsModule.cs | 2 +- .../SqlTemplateDto.cs | 11 +- .../SqlObjectManagerAppService.cs | 10 +- .../SqlQueryManagerMappers.cs | 2 +- .../SozsoftSqlQueryManagerResource.cs | 2 +- .../SqlObjectType.cs | 2 +- .../SqlQueryManagerDomainSharedModule.cs | 2 +- .../SqlQueryManagerErrorCodes.cs | 11 - .../SqlQueryManagerPermissions.cs | 2 +- .../Services/ISqlTemplateProvider.cs | 2 +- .../Services/SqlExecutorService.cs | 26 +- .../Services/SqlTemplateProvider.cs | 5 +- .../SqlQueryManagerDomainModule.cs | 3 +- .../SqlQueryManagerDbContext.cs | 2 +- ...qlQueryManagerEntityFrameworkCoreModule.cs | 2 +- .../AuditLogs/AuditLogListRequestDto.cs | 2 +- .../ChangeLogs/ChangeLogDto.cs | 2 +- .../DeveloperKit/CrudEndpointDto.cs | 2 +- .../FileManagement/FileManagementDtos.cs | 16 +- .../Identity/Dto/AssignedBranchViewModel.cs | 4 +- .../Identity/Dto/AssignedClaimViewModel.cs | 6 +- .../Dto/AssignedDepartmentViewModel.cs | 6 +- .../Dto/AssignedJobPoisitionViewModel.cs | 6 +- .../Identity/Dto/AssignedWorkHourViewModel.cs | 6 +- .../Identity/Dto/PermissionGrantedUsersDto.cs | 2 +- .../Identity/Dto/UserAvatarUpdateInput.cs | 2 +- .../Identity/Dto/UserClaimModel.cs | 6 +- .../Intranet/AnnouncementDto.cs | 2 +- .../Intranet/CreateSocialPostInput.cs | 2 +- .../Intranet/EventCommentDto.cs | 2 +- .../ListForms/Chart/ChartJsonItemRowDto.cs | 14 - .../Chart/EditChartAnnotationsDto.cs | 11 - .../ListForms/Chart/EditChartPanesDto.cs | 11 - .../ListForms/Chart/EditChartSeriesDto.cs | 11 - .../ListForms/Chart/EditChartValueAxisDto.cs | 11 - .../ListForms/Dto/ColumnFormatEditDto.cs | 2 +- .../Dto/DeleteColumnValidationRuleItemDto.cs | 9 - .../Dto/DeleteListFormFilterRequestDto.cs | 8 - .../Dto/ListFormFieldPivotSettingsDto.cs | 2 +- .../ListForms/Dto/ListFormsDto.cs | 4 +- .../DynamicApi/CreateTenantFromOrderInput.cs | 2 +- .../DynamicApi/CreateUpdateUserInput.cs | 3 +- .../DynamicApi/DynamicApiBaseInput.cs | 4 +- .../IListFormDynamicApiAppService.cs | 2 +- .../ListForms/DynamicApi/SeedTenantDbInput.cs | 11 - .../GridOptionsDto/EditingFormDto.cs | 4 +- .../GridOptionsDto/GridStateRequestDto.cs | 8 - .../GridOptionsDto/ImageUploadOptionsDto.cs | 2 +- .../GridOptionsDto/StateStoringDto.cs | 2 +- .../ListForms/GridOptionsDto/TodoOptionDto.cs | 2 +- .../ImportManager/GenerateTemplateInput.cs | 22 - .../ImportManager/ImportPreviewDataDto.cs | 17 - .../ImportManager/ImportValidationErrorDto.cs | 2 +- .../ImportManager/PreviewInputDto.cs | 11 - .../DeleteColumnStyleConditionItemDto.cs | 9 - .../DeleteColumnValidationRuleItemDto.cs | 9 - .../Select/DeleteCommandColumnRequestDto.cs | 11 - ...DeleteCrudFieldsDefaultValueJsonItemDto.cs | 10 - .../Select/DeleteEditingFormItemRequestDto.cs | 9 - .../Select/DeleteListFormFieldRequestDto.cs | 8 - .../Select/EditColumnStylingItemDto.cs | 11 - .../Select/EditColumnValidationRuleItemDto.cs | 11 - .../ListForms/Select/WidgetDto.cs | 4 +- .../Wizard/IListFormWizardAppService.cs | 2 +- .../ListForms/Wizard/ListFormWizardDto.cs | 6 +- .../Wizard/WizardColumnGroupInputDto.cs | 2 +- .../Wizard/WizardColumnItemInputDto.cs | 4 +- .../ListForms/Wizard/WizardImportDtos.cs | 2 +- .../ListForms/Workflow/CompareOutcomeDto.cs | 2 +- ...CreateUpdateListFormWorkflowCriteriaDto.cs | 3 +- .../ListForms/Workflow/DecisionWorkflowDto.cs | 2 +- .../Workflow/IListFormWorkflowAppService.cs | 3 +- .../Workflow/ListFormWorkflowCriteriaDto.cs | 3 +- .../Workflow/ListFormWorkflowStateDto.cs | 2 +- .../ListForms/Workflow/StartWorkflowDto.cs | 2 +- .../Workflow/WorkflowConditionDto.cs | 2 +- .../ListForms/Workflow/WorkflowHistoryDto.cs | 11 - .../Workflow/WorkflowRunResultDto.cs | 2 +- .../Messenger/MessengerDtos.cs | 2 +- .../Note/NoteDto.cs | 4 +- .../Note/NoteListRequestDto.cs | 10 +- .../OrgChart/OrgChartDto.cs | 2 +- .../PlatformPermissionDefinitionProvider.cs | 2 +- .../Permissions/PlatformPermissions.cs | 2 +- .../PlatformDtoExtensions.cs | 22 +- .../Public/BlogPostDto.cs | 1 - .../Public/BlogPostListDto.cs | 2 +- .../Public/ContactTagDto.cs | 10 - .../Public/ContactTitleDto.cs | 10 - .../Public/HomeDto.cs | 2 +- .../Public/IBlogAppService.cs | 30 - .../Public/SavePublicPageContentInput.cs | 5 +- .../Sector/SectorDto.cs | 9 - .../Skill/SkillTypeDto.cs | 13 - .../Uom/UomCategoryDto.cs | 9 - .../Uom/UomDto.cs | 16 - .../Videoroom/VideoroomDto.cs | 6 - .../Videoroom/VideoroomFilterInputDto.cs | 4 +- .../AiBots/AiBotAppService.cs | 8 +- .../AiBots/AiBotMappers.cs | 2 +- .../AuditLogs/AuditLogMappers.cs | 10 +- .../BackgroundWorkerAppService.cs | 2 +- .../BackgroundWorkerInitializer.cs | 4 +- .../Blog/BlogAppService.cs | 11 +- .../Branch/BranchMappers.cs | 7 +- .../ChangeLog/ChangeLogAppService.cs | 2 +- .../Dashboard/DashboardAppService.cs | 2 +- .../DataSource/DataSourceAppService.cs | 2 +- .../DataSource/DataSourceMappers.cs | 4 +- .../DeveloperKit/CrudEndpointAppService.cs | 10 +- .../CrudEndpointGenerateAppService.cs | 10 +- .../DeveloperKit/CustomComponentAppService.cs | 4 +- .../DeveloperKit/CustomEndpointAppService.cs | 10 +- .../DeveloperKit/DeveloperKitMappers.cs | 12 +- .../DeveloperKit/DynamicServiceAppService.cs | 4 +- .../DeveloperKit/DynamicServiceCompiler.cs | 6 +- .../FileManagementAppService.cs | 23 +- .../Forum/ForumAppService.cs | 2 +- .../Forum/ForumMappers.cs | 8 +- .../GlobalSearch/GlobalSearchAppService.cs | 2 +- .../GlobalSearch/GlobalSearchMappers.cs | 2 +- .../Hr/HrMappers.cs | 6 +- .../Identity/AvatarProvider.cs | 2 +- .../Identity/IdentityMappers.cs | 6 +- .../Identity/PlatformAccountAppService.cs | 6 +- .../Identity/PlatformIdentityAppService.cs | 8 +- .../Identity/PlatformProfileAppService.cs | 2 +- .../UserInfoViewModelMappingExtensions.cs | 2 +- .../Intranet/IntranetAppService.cs | 16 +- .../Intranet/IntranetMappers.cs | 2 +- .../ListFormCustomizationAppService.cs | 2 +- .../ListFormFieldsAppService.cs | 6 +- .../ListFormJsonRowAppService.cs | 11 +- .../ListFormQueryPreviewAppService.cs | 14 +- .../Administration/ListFormsAppService.cs | 2 +- .../ListFormCustomizationAppService.cs | 6 +- .../ListForms/ListFormDataAppService.cs | 8 +- .../ListForms/ListFormDynamicApiAppService.cs | 19 +- .../ListForms/ListFormImportAppService.cs | 8 +- .../ListForms/ListFormMappers.cs | 2 +- .../ListForms/ListFormSelectAppService.cs | 8 +- .../ListForms/ListFormWizardAppService.cs | 17 +- .../ListForms/ListFormWorkflowAppService.cs | 2 +- .../Menu/MenuAppService.cs | 14 +- .../Menu/MenuMappers.cs | 4 +- .../Messenger/MessengerAppService.cs | 6 +- .../Messenger/MessengerHub.cs | 3 +- .../Messenger/MessengerPresenceStore.cs | 2 +- .../Note/NoteAppService.cs | 36 +- .../Note/NoteMappers.cs | 6 +- .../OrgChart/OrgChartAppService.cs | 6 +- .../OrganizationUnits/PlatformOuAppService.cs | 2 +- .../Permissions/PermissionAppService.cs | 10 +- .../PlatformAppService.cs | 30 +- .../PlatformApplicationModule.cs | 5 +- .../Properties/AssemblyInfo.cs | 2 +- .../Public/PublicAppService.cs | 34 +- .../Public/PublicMappers.cs | 28 +- .../Routes/RouteMappers.cs | 4 +- .../Tenants/PlatformTenantAppService.cs | 4 +- .../Videoroom/VideoroomMappers.cs | 10 +- .../DbMigratorHostedService.cs | 14 +- .../Migrations/CrudDataSeeder.cs | 2 +- .../Migrations/HangfireDbSchemaMigrator.cs | 2 +- .../Migrations/HostDataSeeder.cs | 12 +- .../Migrations/LanguageDataSeeder.cs | 6 +- .../Migrations/LanguagesData.json | 6 + .../ListFormSeeder_Administration.cs | 11 +- .../Migrations/ListFormSeeder_DefaultJsons.cs | 8 +- .../Migrations/ListFormSeeder_Saas.cs | 9 +- .../Migrations/ListFormSeeder_Utils.cs | 8 +- .../Migrations/MenuDataSeeder.cs | 6 +- .../Migrations/PermissionDataSeeder.cs | 6 +- .../Migrations/PlatformIdentityDataSeeder.cs | 10 +- .../PlatformDbMigratorModule.cs | 4 +- .../Sozsoft.Platform.DbMigrator/Program.cs | 3 +- .../Charts/ChartConsts.cs | 428 ----------- .../Enums/ListFormFieldSelectTypeEnum.cs | 9 - .../Enums/ListFormTabTypeEnum.cs | 2 +- .../Enums/SequenceResetPeriodEnum.cs | 4 +- .../Enums/UiColumnFilterType.cs | 10 - .../Enums/UiColumnType.cs | 11 - .../Enums/WizardComponentKindEnum.cs | 2 +- .../Enums/WizardImportEntryStatusEnum.cs | 2 +- .../PlatformConsts.cs | 42 +- .../PlatformGlobalFeatureConfigurator.cs | 14 +- .../PlatformModuleExtensionConfigurator.cs | 5 +- .../WizardConsts.cs | 45 +- .../ISessionCleanupWorker.cs | 2 +- .../BackgroundWorkers/NotificationWorker.cs | 12 +- .../PlatformBackgroundWorker.cs | 12 +- .../PlatformTemplateDynamicStore.cs | 3 +- .../Branch/BranchSeedManager.cs | 7 +- .../Branch/BranchSeederDto.cs | 2 +- .../Data/CrudEndpointSeedFile.cs | 2 +- .../Data/CustomComponentDataSourceResolver.cs | 2 +- .../Data/IAfterAllMigrationsSqlExecutor.cs | 2 +- .../Data/SeedConsts.cs | 8 - .../Data/SeedPathResolver.cs | 1 - .../DynamicData/DynamicDataManager.cs | 4 +- .../Entities/Host/ChangeLog.cs | 2 +- .../Entities/Host/DbTableColumn.cs | 18 +- .../Entities/Host/Definitions/CountryGroup.cs | 3 +- .../Entities/Host/Definitions/SkillLevel.cs | 2 +- .../Entities/Host/Definitions/SkillType.cs | 3 +- .../Entities/Host/Definitions/Uom.cs | 3 +- .../Entities/Tenant/Administration/Agenda.cs | 6 +- .../Entities/Tenant/Administration/Menu.cs | 2 +- .../Tenant/Administration/MenuGroup.cs | 2 +- .../Administration/Report/ReportCategory.cs | 31 +- .../Administration/Report/ReportTemplate.cs | 57 +- .../Tenant/Administration/Website/Home.cs | 2 +- .../Entities/Tenant/Definitions/Sector.cs | 2 +- .../Entities/Tenant/Definitions/WorkHour.cs | 2 +- .../Entities/Tenant/Intranet/Announcement.cs | 2 +- .../Tenant/Intranet/AnnouncementComment.cs | 2 +- .../Tenant/Intranet/AnnouncementLike.cs | 2 +- .../Entities/Tenant/Intranet/EventCategory.cs | 2 +- .../Entities/Tenant/Intranet/EventLike.cs | 2 +- .../Entities/Tenant/Intranet/EventType.cs | 2 +- .../Entities/Tenant/Intranet/SocialPost.cs | 2 +- .../Entities/Tenant/Intranet/Survey.cs | 6 +- .../Entities/Tenant/ListForm/ListForm.cs | 6 +- .../Tenant/ListForm/ListFormCustomization.cs | 4 +- .../Tenant/ListForm/ListFormWorkflow.cs | 3 +- .../Tenant/Messenger/MessengerConversation.cs | 2 +- .../Messenger/MessengerConversationMessage.cs | 2 +- .../Entities/Tenant/Saas/DevRequest.cs | 12 +- .../Entities/Tenant/Saas/Note.cs | 2 +- .../Entities/Tenant/Saas/Sequence.cs | 6 +- .../Extensions/AbpTenantExtensions.cs | 3 +- .../Extensions/StringExtensions.cs | 41 +- .../Identity/TurnstileCaptchaManager.cs | 4 +- .../ListForms/ListFormAuthorizationManager.cs | 4 +- .../ListForms/ListFormCustomizationManager.cs | 2 +- .../ListForms/ListFormFieldManager.cs | 4 +- .../ListForms/ListFormManager.cs | 16 +- .../ListForms/ServerFilterData.cs | 20 - .../OpenIddictDataSeedContributor.cs | 26 +- .../PlatformDomainModule.cs | 10 +- .../PlatformDomainService.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Queries/ChartValueAxis.cs | 1 - .../Queries/CommandColumn.cs | 2 +- .../Queries/DefaultValueManager.cs | 5 +- .../Queries/FieldsDefaultValue.cs | 4 +- .../Queries/QueryManager.cs | 7 +- .../Queries/SelectQueryManager.cs | 2 +- .../Repositories/IReportTemplateRepository.cs | 27 +- .../Sequences/SequenceManager.cs | 4 +- .../DatabaseMigrationEventHandlerBase.cs | 2 +- .../PlatformDynamicEntityManager.cs | 12 +- .../DynamicData/MsDynamicDataRepository.cs | 3 +- .../DynamicData/PgDynamicDataRepository.cs | 3 +- .../DynamicData/SpRepository.cs | 12 +- .../EntityFrameworkCore/PlatformDbContext.cs | 25 +- .../PlatformEfCoreEntityExtensionMappings.cs | 4 +- .../PlatformEntityFrameworkCoreModule.cs | 6 +- ....cs => 20260821153543_Initial.Designer.cs} | 2 +- ...4_Initial.cs => 20260821153543_Initial.cs} | 0 .../OrganizationUnits/PlatformOuRepository.cs | 79 +- .../Properties/AssemblyInfo.cs | 2 +- .../Seeds/TenantDataSeeder.cs | 32 +- .../Seeds/TenantIdentityDataSeeder.cs | 12 +- .../PlatformHttpApiClientModule.cs | 2 +- ...BackgroundWorkerRecurringJobInitializer.cs | 2 +- .../BackgroundWorkerStartupService.cs | 2 +- .../CustomReportDesignerController.cs | 12 +- .../CustomWebDocumentViewerController.cs | 2 +- .../Controllers/SetupController.cs | 2 +- .../DbStartup/DatabaseReadiness.cs | 2 +- .../DbStartup/DatabaseReadinessChecker.cs | 2 +- .../DbStartup/SetupAppRunner.cs | 2 +- .../DbStartup/SetupEventStream.cs | 2 +- .../DbStartup/SetupPasswordValidator.cs | 3 +- .../DbStartup/SetupStatusDto.cs | 2 +- .../DynamicAssemblyRegistrationService.cs | 681 +++++++++--------- .../DynamicControllerActivator.cs | 4 +- .../Extensions/CaptchaMiddleware.cs | 4 +- .../Extensions/ChangeLogStartupService.cs | 2 +- .../Extensions/HttpContextExtensions.cs | 131 ++-- ...formApplicationConfigurationContributor.cs | 2 +- .../Identity/PlatformAccountController.cs | 2 +- .../Identity/PlatformLoginResult.cs | 5 +- .../Identity/PlatformSessionClaimContext.cs | 2 +- .../Identity/PlatformSessionCleanupWorker.cs | 6 +- .../PlatformSessionRevocationHandler.cs | 7 +- .../PlatformSessionValidationMiddleware.cs | 5 +- .../Identity/PlatformSignInManager.cs | 4 +- .../Identity/PlatformTokenController.cs | 8 +- .../PlatformUserClaimsPrincipalFactory.cs | 2 +- .../PlatformBrandingProvider.cs | 10 +- .../PlatformHttpApiHostModule.cs | 80 +- .../PredefinedReports/DynamicFormReport.cs | 2 +- .../PredefinedReports/DynamicGridReport.cs | 3 +- .../PredefinedReports/DynamicReport.cs | 11 +- .../PredefinedReports/DynamicReportColumn.cs | 4 +- .../DynamicReportFontHelper.cs | 2 +- .../DynamicReportGridStateHelper.cs | 2 +- .../DynamicReportImageHelper.cs | 2 +- .../DynamicReportLayoutHelper.cs | 2 +- .../DynamicReportSqlBuilder.cs | 2 +- .../PredefinedReports/DynamicTreeReport.cs | 4 +- .../Sozsoft.Platform.HttpApi.Host/Program.cs | 8 +- .../CustomReportStorageWebExtension.cs | 24 +- .../DevExpressFontConfiguration.cs | 16 +- .../TenantLocalizationInitializer.cs | 81 +-- .../TenantLocalizationMiddleware.cs | 2 +- .../PlatformHttpApiModule.cs | 4 +- .../DynamicDataRepository_Tests.cs | 4 +- .../PlatformEntityFrameworkCoreTestBase.cs | 4 +- .../PlatformTestBase.cs | 2 +- .../docker-compose-app.production.yml | 1 + configs/deployment/docker-compose-app.yml | 2 + .../developerKit/VisualComponentDesigner.tsx | 302 ++++---- 376 files changed, 1659 insertions(+), 2822 deletions(-) create mode 100644 .github/instructions/dotnet.instructions.md delete mode 100644 api/modules/Sozsoft.Languages/Sozsoft.Languages.Application.Contracts/LanguagesRemoteServiceConsts.cs delete mode 100644 api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain.Shared/LanguagesErrorCodes.cs delete mode 100644 api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application.Contracts/NotificationRemoteServiceConsts.cs delete mode 100644 api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain.Shared/NotificationErrorCodes.cs delete mode 100644 api/modules/Sozsoft.Settings/Sozsoft.Settings.Application.Contracts/SettingsRemoteServiceConsts.cs delete mode 100644 api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain.Shared/SettingsErrorCodes.cs delete mode 100644 api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain.Shared/SqlQueryManagerErrorCodes.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/ListForms/Chart/ChartJsonItemRowDto.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/ListForms/Chart/EditChartAnnotationsDto.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/ListForms/Chart/EditChartPanesDto.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/ListForms/Chart/EditChartSeriesDto.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/ListForms/Chart/EditChartValueAxisDto.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/DeleteColumnValidationRuleItemDto.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/DeleteListFormFilterRequestDto.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/ListForms/DynamicApi/SeedTenantDbInput.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/GridStateRequestDto.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/ListForms/ImportManager/GenerateTemplateInput.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/ListForms/ImportManager/ImportPreviewDataDto.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/ListForms/ImportManager/PreviewInputDto.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/DeleteColumnStyleConditionItemDto.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/DeleteColumnValidationRuleItemDto.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/DeleteCommandColumnRequestDto.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/DeleteCrudFieldsDefaultValueJsonItemDto.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/DeleteEditingFormItemRequestDto.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/DeleteListFormFieldRequestDto.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/EditColumnStylingItemDto.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/EditColumnValidationRuleItemDto.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/WorkflowHistoryDto.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/Public/ContactTagDto.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/Public/ContactTitleDto.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/Sector/SectorDto.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/Skill/SkillTypeDto.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/Uom/UomCategoryDto.cs delete mode 100644 api/src/Sozsoft.Platform.Application.Contracts/Uom/UomDto.cs delete mode 100644 api/src/Sozsoft.Platform.Domain.Shared/Charts/ChartConsts.cs delete mode 100644 api/src/Sozsoft.Platform.Domain.Shared/Enums/ListFormFieldSelectTypeEnum.cs delete mode 100644 api/src/Sozsoft.Platform.Domain.Shared/Enums/UiColumnFilterType.cs delete mode 100644 api/src/Sozsoft.Platform.Domain.Shared/Enums/UiColumnType.cs delete mode 100644 api/src/Sozsoft.Platform.Domain/ListForms/ServerFilterData.cs rename api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/{20260818091734_Initial.Designer.cs => 20260821153543_Initial.Designer.cs} (99%) rename api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/{20260818091734_Initial.cs => 20260821153543_Initial.cs} (100%) diff --git a/.github/instructions/ai.instructions.md b/.github/instructions/ai.instructions.md index 72d98e37..a1597157 100644 --- a/.github/instructions/ai.instructions.md +++ b/.github/instructions/ai.instructions.md @@ -20,8 +20,8 @@ Primary principle: Core stack: -- Backend: C# .NET 9 + ABP 9.x -- Frontend: React 18 + DevExtreme +- Backend: C# .NET 10 (C# 14) + ABP 10.x — kod standardı: `dotnet.instructions.md` +- Frontend: React 19 + DevExtreme - Database: SQL Server (dynamic datasource support) - Cache: Redis - Background jobs: Hangfire + ABP Background Workers diff --git a/.github/instructions/dotnet.instructions.md b/.github/instructions/dotnet.instructions.md new file mode 100644 index 00000000..ce9f8c21 --- /dev/null +++ b/.github/instructions/dotnet.instructions.md @@ -0,0 +1,135 @@ +# .NET / ABP Kod Standardı + +Bu doküman `api/` altındaki tüm projeler için bağlayıcıdır. Platform davranışına dair +kurallar için `ai.instructions.md` esastır; çelişki olursa o dosya kazanır. + +Standart derlemede zorlanır: `api/Directory.Build.props` analizörleri açar, +`api/.editorconfig` kural şiddetlerini tanımlar. Bu iki dosya standardın tek +kaynağıdır; proje dosyalarında tekrar edilmez. + +## 1. Hedef sürümler + +| Katman | Sürüm | Nerede tanımlı | +| --- | --- | --- | +| SDK | .NET 10 (`10.0.300`) | `api/global.json` | +| TargetFramework | `net10.0` | proje dosyaları | +| Dil | C# 14 (`LangVersion=latest`) | `api/common.props` | +| ABP | 10.0.0 | `Volo.Abp.*` paket referansları | + +Sürüm yükseltmesi tek noktadan yapılır: `global.json` + `common.props` + paket sürümleri. +Proje dosyalarına TFM/LangVersion tekrar yazılmaz. + +## 2. Nullable + +`Directory.Build.props` içinde **çözüm geneli `Nullable` ayarı yapılmaz.** Sebebi +EF Core: kolonun zorunlu olup olmadığını, entity assembly'sinin nullable annotation +bağlamından türetir. Global bir `enable`/`annotations` anahtarı, bir sonraki +`dotnet ef migrations add` çağrısında tüm `string` özelliklerini sessizce NOT NULL +kolona çevirir — seeder'ın doldurmadığı her alan da o anda kırılır. + +Kural: + +- Nullable, proje bazında ve bilinçli olarak açılır (`enable`). + Şu an açık olanlar: `Sozsoft.Platform.Application`, `Sozsoft.Notifications.*`, + test projeleri. +- **Entity taşıyan projelerde** (`*.Domain`) nullable açılacaksa, aynı PR'da + `dotnet ef migrations add` çıktısı gözden geçirilir; şema değişikliği isteniyorsa + kabul edilir, istenmiyorsa kolon zorunluluğu `PlatformDbContext` içinde + `.IsRequired(false)` ile açıkça sabitlenir. +- Kolon zorunluluğu tercihen NRT'ye değil, `PlatformDbContext` yapılandırmasına + yazılır; böylece derleyici anahtarından bağımsız olur. + +## 3. Ölü kod politikası + +Aşağıdaki kurallar ihlal edilmiş kod merge edilmez: + +| Kural | Anlamı | +| --- | --- | +| IDE0005 | Kullanılmayan `using` | +| IDE0051 | Çağrılmayan private üye | +| IDE0052 | Yazılıp hiç okunmayan private alan (kullanılmayan enjekte bağımlılık) | +| IDE0059 | Gereksiz değer ataması | +| IDE0161 | `namespace X;` (file-scoped) | + +Tarama ve otomatik düzeltme (kalıcı yapılandırma gerektirmez): + +```bash +# Rapor +dotnet build api/Sozsoft.Platform.sln --no-incremental \ + -p:EnforceCodeStyleInBuild=true -p:GenerateDocumentationFile=true + +# Düzeltme +dotnet format api/Sozsoft.Platform.sln --diagnostics IDE0005,IDE0161 --severity warn +``` + +> Kurallar `.editorconfig`'te `warning` seviyesindedir ve `EnforceCodeStyleInBuild` +> açık olduğu için normal `dotnet build` de bunları raporlar. + +IDE0052 düzeltilirken alan ile birlikte **constructor parametresi de** silinir; yoksa +DI hâlâ gereksiz servisi çözer. + +`CS0162` (erişilemez kod) `Directory.Build.props` içinde gerekçesiyle susturulmuştur: +veritabanı sağlayıcısı derleme zamanı sabiti olduğu için diğer sağlayıcının dalları +erişilemez görünür. Bu durum dışında erişilemez kod bırakılmaz. + +Ek kurallar: + +- Bir tip/dosya silinmeden önce **repo genelinde** (api + ui + configs) referans + taraması yapılır. DI ile çözülen tipler (AppService, Manager, Provider, Repository, + Seeder, Localizer, Notification sağlayıcıları) düz metin aramasında "referanssız" + görünür — bunlar yalnızca modül/DI kaydı incelendikten sonra silinir. +- Yorum satırına alınmış kod bloğu bırakılmaz; ihtiyaç varsa git geçmişinden alınır. +- "İleride lazım olur" gerekçesiyle kullanılmayan DTO/Input/Consts tutulmaz. +- `Migrations/` ve `*.g.cs` üretilmiş koddur, bu kuralların dışındadır. + +## 4. Modern C# kullanımı (yeni kod) + +- File-scoped namespace: `namespace Sozsoft.Platform.ListForms;` +- Primary constructor: `public class XAppService(IRepository repo) : PlatformAppService` + — parametre doğrudan kullanılır, `private readonly ... = param;` şeklinde + tekrar tanımlanmaz. +- Koleksiyon ifadeleri (`[]`, `[.. items]`), `is not null`, `switch` ifadesi, + desen eşleme, `Index/Range`, hedefi belli `new()`. +- `out var`, tuple deconstruction; kullanılmayan çıktı için `_`. +- `async` metotlar `Async` ile biter ve `Task`/`Task` döner; `async void` yasak. + ABP'de `ConfigureAwait` kullanılmaz. +- Biçim: `api/.editorconfig` geçerlidir (4 boşluk girinti, `using` blokları namespace + dışında ve System önce, dosya sonunda satır sonu, UTF-8 BOM). + +## 5. ABP kuralları + +- **Katman sınırı**: Domain.Shared → Domain → Application.Contracts → Application → + HttpApi → HttpApi.Host. Ters yönde referans verilmez; `EntityFrameworkCore` yalnızca + Domain'e bakar. +- **AppService**: `PlatformAppService`'ten türer, arayüzü Application.Contracts'ta + tanımlanır. Controller yazılmaz — ABP otomatik API üretir. Controller sadece ABP + konvansiyonunun karşılamadığı durumda (dosya indirme, harici webhook) eklenir. +- **Yetki**: her AppService/metot `[Authorize(PlatformConsts.AppCodes....)]` ile + korunur; izin adları `PermissionDefinitionProvider` içinde tanımlanır. Yetki + kontrolü koda gömülmez, izin adı sabitten okunur. +- **Tenant izolasyonu**: sorgular `ICurrentTenant` bağlamında çalışır; `IMultiTenant` + entity'lerde manuel `TenantId` filtresi yazılmaz, veri filtreleri devre dışı + bırakılacaksa (`ICurrentTenant.Change`, `IDataFilter`) gerekçe yorumla yazılır. +- **Repository**: özel sorgu gerekiyorsa Domain'de arayüz + EntityFrameworkCore'da + implementasyon. AppService içinde `DbContext` doğrudan kullanılmaz. +- **Dinamik SQL**: parametreli çalıştırılır; string birleştirme ile sorgu kurulmaz. +- **Mapping**: Mapperly (`[Mapper]` partial class) kullanılır; AutoMapper eklenmez. + RMG012 uyarısı "hedefte karşılığı olmayan alan" demektir; yeni mapper eklerken bu + uyarı bırakılmaz. +- **Localization**: kullanıcıya görünen metin koda gömülmez, `PlatformResource` + anahtarı üzerinden verilir. +- **Sabitler**: bağlantı dizesi, tenant id, anahtar/secret koda yazılmaz; konfigürasyon + veya `SettingDefinition` üzerinden okunur. + +## 6. Değişiklik öncesi kontrol listesi + +```bash +dotnet build api/Sozsoft.Platform.sln --no-incremental \ + -p:EnforceCodeStyleInBuild=true -p:GenerateDocumentationFile=true # 0 hata, yeni IDE00xx yok +dotnet format api/Sozsoft.Platform.sln --verify-no-changes --diagnostics IDE0005,IDE0161 --severity warn +dotnet test api/test/Sozsoft.Platform.EntityFrameworkCore.Tests +``` + +> Not: EntityFrameworkCore testleri şu an SQLite şema oluşturmada +> (`nvarchar(max)` → `SQLite Error 1`) kırık; bu kırıklık bu standarttan önce de vardı +> ve ayrı bir iş olarak ele alınmalıdır. diff --git a/api/Directory.Build.props b/api/Directory.Build.props index 120c9d0e..5b3ae63a 100644 --- a/api/Directory.Build.props +++ b/api/Directory.Build.props @@ -1,5 +1,9 @@ - + - $(NoWarn);CS0162;CS8321;CS8618;CS8632 + $(NoWarn);CS0162;CS8321;CS8618;CS8632;CS1591;CS1573;CS1572;CS1570;CS1574 + latest + latest + true + true diff --git a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application.Contracts/LanguagesApplicationContractsModule.cs b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application.Contracts/LanguagesApplicationContractsModule.cs index 9afc8dde..92d3a7ee 100644 --- a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application.Contracts/LanguagesApplicationContractsModule.cs +++ b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application.Contracts/LanguagesApplicationContractsModule.cs @@ -1,6 +1,6 @@ using Volo.Abp.Application; -using Volo.Abp.Modularity; using Volo.Abp.Authorization; +using Volo.Abp.Modularity; namespace Sozsoft.Languages; diff --git a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application.Contracts/LanguagesRemoteServiceConsts.cs b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application.Contracts/LanguagesRemoteServiceConsts.cs deleted file mode 100644 index 99a2992f..00000000 --- a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application.Contracts/LanguagesRemoteServiceConsts.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Sozsoft.Languages; - -public class LanguagesRemoteServiceConsts -{ - public const string RemoteServiceName = "Languages"; - - public const string ModuleName = "languages"; -} - diff --git a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application.Contracts/Permissions/LanguagesPermissionDefinitionProvider.cs b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application.Contracts/Permissions/LanguagesPermissionDefinitionProvider.cs index 0fda4bdf..a2d9ab8a 100644 --- a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application.Contracts/Permissions/LanguagesPermissionDefinitionProvider.cs +++ b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application.Contracts/Permissions/LanguagesPermissionDefinitionProvider.cs @@ -1,4 +1,4 @@ -using Volo.Abp.Authorization.Permissions; +using Volo.Abp.Authorization.Permissions; namespace Sozsoft.Languages.Permissions; diff --git a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguageAppService.cs b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguageAppService.cs index 94532771..557246cd 100644 --- a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguageAppService.cs +++ b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguageAppService.cs @@ -1,9 +1,9 @@ -using Sozsoft.Languages.Entities; -using Sozsoft.Languages.Localization; -using System; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Threading.Tasks; +using Sozsoft.Languages.Entities; +using Sozsoft.Languages.Localization; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Volo.Abp.Domain.Entities; diff --git a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguageKeyAppService.cs b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguageKeyAppService.cs index a040119d..4400b9de 100644 --- a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguageKeyAppService.cs +++ b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguageKeyAppService.cs @@ -1,9 +1,9 @@ -using Sozsoft.Languages.Entities; -using Sozsoft.Languages.Localization; -using System; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Threading.Tasks; +using Sozsoft.Languages.Entities; +using Sozsoft.Languages.Localization; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Volo.Abp.Domain.Repositories; diff --git a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguageTextAppService.cs b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguageTextAppService.cs index e5c2735b..2f72b2bc 100644 --- a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguageTextAppService.cs +++ b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguageTextAppService.cs @@ -1,14 +1,14 @@ -using Sozsoft.Languages.Entities; -using Sozsoft.Languages.Localization; -using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Configuration; -using StackExchange.Redis; -using System; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Linq.Dynamic.Core; using System.Threading.Tasks; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Configuration; +using Sozsoft.Languages.Entities; +using Sozsoft.Languages.Localization; +using StackExchange.Redis; using Volo.Abp; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; @@ -136,7 +136,7 @@ public class LanguageTextAppService : CrudAppService< var db = redis.GetDatabase(); await db.ExecuteAsync("FLUSHALL"); } - + protected virtual IQueryable ApplySorting(IQueryable query, LanguageTextTranslatedRequestDto input) { //Try to sort query if available diff --git a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguagesApplicationMappers.cs b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguagesApplicationMappers.cs index acb2ebc9..191b52d4 100644 --- a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguagesApplicationMappers.cs +++ b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Application/LanguagesApplicationMappers.cs @@ -1,6 +1,6 @@ +using Riok.Mapperly.Abstractions; using Sozsoft.Languages.Entities; using Volo.Abp.Localization; -using Riok.Mapperly.Abstractions; using Volo.Abp.Mapperly; namespace Sozsoft.Languages; diff --git a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain.Shared/LanguagesErrorCodes.cs b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain.Shared/LanguagesErrorCodes.cs deleted file mode 100644 index a8631261..00000000 --- a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain.Shared/LanguagesErrorCodes.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Sozsoft.Languages; - -public static class LanguagesErrorCodes -{ - //Add your business exception error codes here... -} - diff --git a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain.Shared/Localization/Languages.cs b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain.Shared/Localization/Languages.cs index 6323d3bb..413bbd09 100644 --- a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain.Shared/Localization/Languages.cs +++ b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain.Shared/Localization/Languages.cs @@ -1,45 +1,23 @@ -namespace Sozsoft.Languages.Languages -{ - public static class LanguageCodes - { - public const string Ar = "ar"; - public const string Cs = "cs"; - public const string De = "de-DE"; - public const string En = "en"; - public const string Es = "es"; - public const string Fi = "fi"; - public const string Fr = "fr"; - public const string Hi = "hi"; - public const string Hr = "hr"; - public const string Hu = "hu"; - public const string It = "it"; - public const string Pt = "pt-BR"; - public const string Ru = "ru"; - public const string Sk = "sk"; - public const string Sl = "sl"; - public const string Tr = "tr"; - public const string Zh = "zh-Hans"; - } +namespace Sozsoft.Languages.Languages; - public static class LanguageNames - { - public const string Ar = "العربية"; - public const string Cs = "Čeština"; - public const string De = "Deutsch"; - public const string En = "English"; - public const string Es = "Español"; - public const string Fi = "Finnish"; - public const string Fr = "Français"; - public const string Hi = "Hindi"; - public const string Hr = "Croatian"; - public const string Hu = "Magyar"; - public const string It = "Italiano"; - public const string Pt = "Português"; - public const string Ru = "Русский"; - public const string Sk = "Slovak"; - public const string Sl = "Slovenščina"; - public const string Tr = "Türkçe"; - public const string Zh = "繁體中文"; - } +public static class LanguageCodes +{ + public const string Ar = "ar"; + public const string Cs = "cs"; + public const string De = "de-DE"; + public const string En = "en"; + public const string Es = "es"; + public const string Fi = "fi"; + public const string Fr = "fr"; + public const string Hi = "hi"; + public const string Hr = "hr"; + public const string Hu = "hu"; + public const string It = "it"; + public const string Pt = "pt-BR"; + public const string Ru = "ru"; + public const string Sk = "sk"; + public const string Sl = "sl"; + public const string Tr = "tr"; + public const string Zh = "zh-Hans"; } diff --git a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain/Languages/LanguageTextCacheItemInvalidatorDistributed.cs b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain/Languages/LanguageTextCacheItemInvalidatorDistributed.cs index 0284b66a..bd96d945 100644 --- a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain/Languages/LanguageTextCacheItemInvalidatorDistributed.cs +++ b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain/Languages/LanguageTextCacheItemInvalidatorDistributed.cs @@ -1,10 +1,7 @@ -using Sozsoft.Languages.Entities; -using System; -using System.Threading.Tasks; +using System.Threading.Tasks; using Volo.Abp.Caching; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Entities.Events.Distributed; -using Volo.Abp.Domain.Repositories; using Volo.Abp.EventBus.Distributed; namespace Sozsoft.Languages; @@ -15,14 +12,11 @@ public class LanguageTextCacheItemInvalidatorDistributed : IDistributedEventHandler>, ITransientDependency { - private readonly IRepository languageTextRepository; private readonly IDistributedCache cache; public LanguageTextCacheItemInvalidatorDistributed( - IRepository languageTextRepository, IDistributedCache cache) { - this.languageTextRepository = languageTextRepository; this.cache = cache; } diff --git a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain/Localization/DatabaseResourceLocalizer.cs b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain/Localization/DatabaseResourceLocalizer.cs index 472b5731..888b913e 100644 --- a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain/Localization/DatabaseResourceLocalizer.cs +++ b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain/Localization/DatabaseResourceLocalizer.cs @@ -1,9 +1,9 @@ -using Sozsoft.Languages.Entities; -using Microsoft.Extensions.Localization; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Microsoft.Extensions.Localization; +using Sozsoft.Languages.Entities; using Volo.Abp.Caching; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Repositories; diff --git a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain/Localization/IDatabaseResourceLocalizer.cs b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain/Localization/IDatabaseResourceLocalizer.cs index e092a85e..47afbd8d 100644 --- a/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain/Localization/IDatabaseResourceLocalizer.cs +++ b/api/modules/Sozsoft.Languages/Sozsoft.Languages.Domain/Localization/IDatabaseResourceLocalizer.cs @@ -1,6 +1,6 @@ -using Microsoft.Extensions.Localization; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; +using Microsoft.Extensions.Localization; using Volo.Abp.Localization; namespace Sozsoft.Languages.Localization; diff --git a/api/modules/Sozsoft.Languages/Sozsoft.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesDbContext.cs b/api/modules/Sozsoft.Languages/Sozsoft.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesDbContext.cs index 3ebca7c6..b5fbec3f 100644 --- a/api/modules/Sozsoft.Languages/Sozsoft.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesDbContext.cs +++ b/api/modules/Sozsoft.Languages/Sozsoft.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesDbContext.cs @@ -1,5 +1,5 @@ -using Sozsoft.Languages.Entities; -using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; +using Sozsoft.Languages.Entities; using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; diff --git a/api/modules/Sozsoft.Languages/Sozsoft.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesDbContextModelCreatingExtensions.cs b/api/modules/Sozsoft.Languages/Sozsoft.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesDbContextModelCreatingExtensions.cs index 292a07a4..dd9175e9 100644 --- a/api/modules/Sozsoft.Languages/Sozsoft.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesDbContextModelCreatingExtensions.cs +++ b/api/modules/Sozsoft.Languages/Sozsoft.Languages.EntityFrameworkCore/EntityFrameworkCore/LanguagesDbContextModelCreatingExtensions.cs @@ -1,5 +1,5 @@ -using Sozsoft.Languages.Entities; -using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; +using Sozsoft.Languages.Entities; using Volo.Abp; using Volo.Abp.EntityFrameworkCore.Modeling; diff --git a/api/modules/Sozsoft.MailQueue/Application/MailQueueMappers.cs b/api/modules/Sozsoft.MailQueue/Application/MailQueueMappers.cs index a2adf994..e1e7dc4c 100644 --- a/api/modules/Sozsoft.MailQueue/Application/MailQueueMappers.cs +++ b/api/modules/Sozsoft.MailQueue/Application/MailQueueMappers.cs @@ -1 +1 @@ -namespace Sozsoft.MailQueue.Application; +namespace Sozsoft.MailQueue.Application; diff --git a/api/modules/Sozsoft.MailQueue/Domain/MailGeneration/Generators/AttachmentGenerator.cs b/api/modules/Sozsoft.MailQueue/Domain/MailGeneration/Generators/AttachmentGenerator.cs index f8652acc..fa9d56f2 100644 --- a/api/modules/Sozsoft.MailQueue/Domain/MailGeneration/Generators/AttachmentGenerator.cs +++ b/api/modules/Sozsoft.MailQueue/Domain/MailGeneration/Generators/AttachmentGenerator.cs @@ -1,6 +1,6 @@ -using Sozsoft.MailQueue.FileGeneration; +using Microsoft.Extensions.Configuration; +using Sozsoft.MailQueue.FileGeneration; using Sozsoft.MailQueue.MailGeneration.Models; -using Microsoft.Extensions.Configuration; using Volo.Abp.DependencyInjection; using Volo.Abp.Guids; using Volo.Abp.TextTemplating; @@ -141,53 +141,53 @@ public class AttachmentGenerator : IAttachmentGenerator, ITransientDependency return null; -// if (model.Filtreler.ContainsKey("QUERY") && model.Filtreler.ContainsKey("QUERYSQL")) -// { -// /* -//Parametrelerden asagidaki sekilde gelen queryleri en alttaki formata donusturuyoruz -//params -//0 => -// QUERY -> qryDepo_Cikis_CekiListesi_Detayli -// QUERYSQL -> Ksp_Depo_Cikis_CekiListesi_Detayli 252993 -// QUERY2 -> qryDepo_Cikis_CekiListesi_Sub -// QUERY2SQL -> KSp_Depo_Cikis_CekiListesi_Sub 252993 - -//SQL olan keyvalue'lari cikar ve sadece querylerde foreach yap -// QUERY -> qryDepo_Cikis_CekiListesi_Detayli -// dict.add(item.Value, params[item.Key + "SQL"].Value) -// QUERY2 -> qryDepo_Cikis_CekiListesi_Sub -// dict.add(item.Value, params[item.Key + "SQL"].Value) + // if (model.Filtreler.ContainsKey("QUERY") && model.Filtreler.ContainsKey("QUERYSQL")) + // { + // /* + //Parametrelerden asagidaki sekilde gelen queryleri en alttaki formata donusturuyoruz + //params + //0 => + // QUERY -> qryDepo_Cikis_CekiListesi_Detayli + // QUERYSQL -> Ksp_Depo_Cikis_CekiListesi_Detayli 252993 + // QUERY2 -> qryDepo_Cikis_CekiListesi_Sub + // QUERY2SQL -> KSp_Depo_Cikis_CekiListesi_Sub 252993 -//Bunlari yeni dict'e ekle -//dict -//qryDepo_Cikis_CekiListesi_Detayli -> Ksp_Depo_Cikis_CekiListesi_Detayli 252993 -//qryDepo_Cikis_CekiListesi_Sub -> KSp_Depo_Cikis_CekiListesi_Sub 252993 -// */ -// //dict -> key (name), value (sql) -// var queries = model.Filtreler -// .Where(a => a.Key.StartsWith("QUERY")) -// .Where(a => !a.Key.EndsWith("SQL")) -// .Where(a => !a.Value.IsNullOrWhiteSpace()) -// .ToDictionary(x => x.Value, x => model.Filtreler.GetValueOrDefault(x.Key + "SQL")); + //SQL olan keyvalue'lari cikar ve sadece querylerde foreach yap + // QUERY -> qryDepo_Cikis_CekiListesi_Detayli + // dict.add(item.Value, params[item.Key + "SQL"].Value) + // QUERY2 -> qryDepo_Cikis_CekiListesi_Sub + // dict.add(item.Value, params[item.Key + "SQL"].Value) -// return MsAccessReportManager.GenerateAccessReport( -// model.DbAdi, -// model.Index, -// model.RaporAdi, -// model.ExportDosyaTipi, -// queries, -// attachmentFolder); -// } -// else -// { -// return MsAccessReportManager.GenerateAccessReport( -// model.DbAdi, -// model.Index, -// model.RaporAdi, -// string.Join(" AND ", model.Filtreler.Select(a => $"{a.Key}={a.Value}")), -// model.ExportDosyaTipi, -// attachmentFolder); -// } + //Bunlari yeni dict'e ekle + //dict + //qryDepo_Cikis_CekiListesi_Detayli -> Ksp_Depo_Cikis_CekiListesi_Detayli 252993 + //qryDepo_Cikis_CekiListesi_Sub -> KSp_Depo_Cikis_CekiListesi_Sub 252993 + // */ + // //dict -> key (name), value (sql) + // var queries = model.Filtreler + // .Where(a => a.Key.StartsWith("QUERY")) + // .Where(a => !a.Key.EndsWith("SQL")) + // .Where(a => !a.Value.IsNullOrWhiteSpace()) + // .ToDictionary(x => x.Value, x => model.Filtreler.GetValueOrDefault(x.Key + "SQL")); + + // return MsAccessReportManager.GenerateAccessReport( + // model.DbAdi, + // model.Index, + // model.RaporAdi, + // model.ExportDosyaTipi, + // queries, + // attachmentFolder); + // } + // else + // { + // return MsAccessReportManager.GenerateAccessReport( + // model.DbAdi, + // model.Index, + // model.RaporAdi, + // string.Join(" AND ", model.Filtreler.Select(a => $"{a.Key}={a.Value}")), + // model.ExportDosyaTipi, + // attachmentFolder); + // } } private async Task ConvertFileToBase64Async(string filePath) diff --git a/api/modules/Sozsoft.MailQueue/Domain/MailGeneration/Generators/MailBodyGenerator.cs b/api/modules/Sozsoft.MailQueue/Domain/MailGeneration/Generators/MailBodyGenerator.cs index b33dbae1..3c65f165 100644 --- a/api/modules/Sozsoft.MailQueue/Domain/MailGeneration/Generators/MailBodyGenerator.cs +++ b/api/modules/Sozsoft.MailQueue/Domain/MailGeneration/Generators/MailBodyGenerator.cs @@ -1,5 +1,5 @@ -using Sozsoft.MailQueue.MailGeneration.Models; -using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Configuration; +using Sozsoft.MailQueue.MailGeneration.Models; using Volo.Abp.DependencyInjection; using Volo.Abp.TextTemplating; diff --git a/api/modules/Sozsoft.MailQueue/Domain/MailGeneration/Generators/TableGenerator.cs b/api/modules/Sozsoft.MailQueue/Domain/MailGeneration/Generators/TableGenerator.cs index 55eecc11..4529bcc2 100644 --- a/api/modules/Sozsoft.MailQueue/Domain/MailGeneration/Generators/TableGenerator.cs +++ b/api/modules/Sozsoft.MailQueue/Domain/MailGeneration/Generators/TableGenerator.cs @@ -1,8 +1,8 @@ using System.Data; +using Microsoft.EntityFrameworkCore; using Sozsoft.MailQueue.Domain.Entities; using Sozsoft.MailQueue.EntityFrameworkCore; using Sozsoft.MailQueue.MailGeneration.Models; -using Microsoft.EntityFrameworkCore; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Repositories; using Volo.Abp.TextTemplating; diff --git a/api/modules/Sozsoft.MailQueue/Domain/MailQueueWorker.cs b/api/modules/Sozsoft.MailQueue/Domain/MailQueueWorker.cs index e5dc6900..0533e3a2 100644 --- a/api/modules/Sozsoft.MailQueue/Domain/MailQueueWorker.cs +++ b/api/modules/Sozsoft.MailQueue/Domain/MailQueueWorker.cs @@ -1,8 +1,8 @@ -using Sozsoft.Sender.Mail; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; using Sozsoft.MailQueue.Domain.MailGeneration; using Sozsoft.MailQueue.Domain.Shared; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; +using Sozsoft.Sender.Mail; using Volo.Abp.BackgroundWorkers; using Volo.Abp.Domain.Repositories; using Volo.Abp.Guids; @@ -182,7 +182,7 @@ public class MailQueueWorker : BackgroundWorkerBase } queue.SendStatus = result.Success; queue.SendTime = Clock.Now; - await Repository.UpdateAsync(queue); + await Repository.UpdateAsync(queue, cancellationToken: cancellationToken); // Attachmentlari silebiliriz try diff --git a/api/modules/Sozsoft.MailQueue/Domain/MailTracking/MailTrackingManager.cs b/api/modules/Sozsoft.MailQueue/Domain/MailTracking/MailTrackingManager.cs index 0163892e..a7f747b9 100644 --- a/api/modules/Sozsoft.MailQueue/Domain/MailTracking/MailTrackingManager.cs +++ b/api/modules/Sozsoft.MailQueue/Domain/MailTracking/MailTrackingManager.cs @@ -2,9 +2,9 @@ using Amazon; using Amazon.SQS; using Amazon.SQS.Model; -using Sozsoft.Sender.Mail.AmazonSes; -using Sozsoft.MailQueue.Domain.Entities; using Microsoft.Extensions.Configuration; +using Sozsoft.MailQueue.Domain.Entities; +using Sozsoft.Sender.Mail.AmazonSes; using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Services; diff --git a/api/modules/Sozsoft.MailQueue/EntityFrameworkCore/MailQueueDbContext.cs b/api/modules/Sozsoft.MailQueue/EntityFrameworkCore/MailQueueDbContext.cs index e1b2c476..27994506 100644 --- a/api/modules/Sozsoft.MailQueue/EntityFrameworkCore/MailQueueDbContext.cs +++ b/api/modules/Sozsoft.MailQueue/EntityFrameworkCore/MailQueueDbContext.cs @@ -1,5 +1,5 @@ -using Sozsoft.MailQueue.Domain; -using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; +using Sozsoft.MailQueue.Domain; using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; diff --git a/api/modules/Sozsoft.MailQueue/EntityFrameworkCore/MailQueueDbContextModelCreatingExtensions.cs b/api/modules/Sozsoft.MailQueue/EntityFrameworkCore/MailQueueDbContextModelCreatingExtensions.cs index 78f855b6..c6547734 100644 --- a/api/modules/Sozsoft.MailQueue/EntityFrameworkCore/MailQueueDbContextModelCreatingExtensions.cs +++ b/api/modules/Sozsoft.MailQueue/EntityFrameworkCore/MailQueueDbContextModelCreatingExtensions.cs @@ -1,6 +1,6 @@ -using Sozsoft.MailQueue.Domain; +using Microsoft.EntityFrameworkCore; +using Sozsoft.MailQueue.Domain; using Sozsoft.MailQueue.Domain.Entities; -using Microsoft.EntityFrameworkCore; using Volo.Abp; using Volo.Abp.EntityFrameworkCore.Modeling; diff --git a/api/modules/Sozsoft.MailQueue/EntityFrameworkCore/QueryRepository.cs b/api/modules/Sozsoft.MailQueue/EntityFrameworkCore/QueryRepository.cs index e03e5eb5..91db2efc 100644 --- a/api/modules/Sozsoft.MailQueue/EntityFrameworkCore/QueryRepository.cs +++ b/api/modules/Sozsoft.MailQueue/EntityFrameworkCore/QueryRepository.cs @@ -1,6 +1,6 @@ using System.Data; -using Sozsoft.MailQueue.Domain.Entities; using Microsoft.EntityFrameworkCore; +using Sozsoft.MailQueue.Domain.Entities; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Repositories; diff --git a/api/modules/Sozsoft.MailQueue/FileGeneration/XLSFileGenerator.cs b/api/modules/Sozsoft.MailQueue/FileGeneration/XLSFileGenerator.cs index 51b46c4d..310d5084 100644 --- a/api/modules/Sozsoft.MailQueue/FileGeneration/XLSFileGenerator.cs +++ b/api/modules/Sozsoft.MailQueue/FileGeneration/XLSFileGenerator.cs @@ -1,5 +1,4 @@ using ClosedXML.Excel; -using DocumentFormat.OpenXml.Spreadsheet; using Sozsoft.MailQueue.MailGeneration.Models; using Volo.Abp.DependencyInjection; @@ -26,7 +25,7 @@ public class XLSFileGenerator : IFileGenerator, ITransientDependency using var stream = new MemoryStream(); workbook.SaveAs(stream); stream.Close(); - + return await Task.FromResult(stream.ToArray()); } @@ -80,8 +79,11 @@ public class XLSFileGenerator : IFileGenerator, ITransientDependency var col = table.TabloSutunlari[j]; var cell = sheet.Cell(i + 2, j + 1); var value = row.GetValueOrDefault(col.SutunAdi); - var dataType = XLDataType.Text; - Enum.TryParse(col.VeriTipi, out dataType); + if (!Enum.TryParse(col.VeriTipi, out XLDataType dataType)) + { + dataType = XLDataType.Text; + } + switch (dataType) { case XLDataType.Number: diff --git a/api/modules/Sozsoft.MailQueue/SozsoftMailQueueModule.cs b/api/modules/Sozsoft.MailQueue/SozsoftMailQueueModule.cs index d2affe6d..14adf6e1 100644 --- a/api/modules/Sozsoft.MailQueue/SozsoftMailQueueModule.cs +++ b/api/modules/Sozsoft.MailQueue/SozsoftMailQueueModule.cs @@ -1,16 +1,16 @@ using System.Reflection; -using Sozsoft.Sender; -using Sozsoft.MailQueue.Domain.Shared; -using Sozsoft.MailQueue.EntityFrameworkCore; using Microsoft.CodeAnalysis; using Microsoft.Extensions.DependencyInjection; +using Sozsoft.MailQueue.Domain.Shared; +using Sozsoft.MailQueue.EntityFrameworkCore; +using Sozsoft.Sender; using Volo.Abp.Application; using Volo.Abp.Authorization; -using Volo.Abp.Mapperly; using Volo.Abp.Domain; using Volo.Abp.EntityFrameworkCore; using Volo.Abp.Localization; using Volo.Abp.Localization.ExceptionHandling; +using Volo.Abp.Mapperly; using Volo.Abp.Modularity; using Volo.Abp.TextTemplating.Razor; using Volo.Abp.VirtualFileSystem; diff --git a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application.Contracts/Notification/NotificationFilterRequestDto.cs b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application.Contracts/Notification/NotificationFilterRequestDto.cs index ded06d39..edab319e 100644 --- a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application.Contracts/Notification/NotificationFilterRequestDto.cs +++ b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application.Contracts/Notification/NotificationFilterRequestDto.cs @@ -10,6 +10,6 @@ public class NotificationFilterRequestDto : PagedAndSortedResultRequestDto /// /// İstek; aktivite sayfasındaki liste ekranından mı geliyor yoksa bildirimleri kontrol etmek için mi /// - public bool IsListRequest { get; set; } = false; + public bool IsListRequest { get; set; } = false; } diff --git a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application.Contracts/NotificationRemoteServiceConsts.cs b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application.Contracts/NotificationRemoteServiceConsts.cs deleted file mode 100644 index bc733186..00000000 --- a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application.Contracts/NotificationRemoteServiceConsts.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Sozsoft.Notifications.Application; - -public class NotificationRemoteServiceConsts -{ - public const string RemoteServiceName = "Notifications"; - - public const string ModuleName = "notifications"; -} - diff --git a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application.Contracts/Permissions/NotificationPermissionDefinitionProvider.cs b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application.Contracts/Permissions/NotificationPermissionDefinitionProvider.cs index cb22dcdf..27c630b9 100644 --- a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application.Contracts/Permissions/NotificationPermissionDefinitionProvider.cs +++ b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application.Contracts/Permissions/NotificationPermissionDefinitionProvider.cs @@ -1,4 +1,4 @@ -using Volo.Abp.Authorization.Permissions; +using Volo.Abp.Authorization.Permissions; namespace Sozsoft.Notifications.Permissions; diff --git a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationAppService.cs b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationAppService.cs index 2a5c5f2c..5f2a628f 100644 --- a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationAppService.cs +++ b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationAppService.cs @@ -2,11 +2,11 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.EntityFrameworkCore; using Sozsoft.Notifications.Domain; using Sozsoft.Notifications.Entities; using Sozsoft.Notifications.Enums; -using Microsoft.AspNetCore.Authorization; -using Microsoft.EntityFrameworkCore; using Volo.Abp; using Volo.Abp.Application.Services; using Volo.Abp.Domain.Entities; diff --git a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationApplicationMappers.cs b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationApplicationMappers.cs index f487a4ea..21aed796 100644 --- a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationApplicationMappers.cs +++ b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationApplicationMappers.cs @@ -1,7 +1,7 @@ -using Sozsoft.Notifications.Entities; +using Riok.Mapperly.Abstractions; using Sozsoft.Notifications.Domain; +using Sozsoft.Notifications.Entities; using Sozsoft.Notifications.NotificationRules; -using Riok.Mapperly.Abstractions; using Volo.Abp.Mapperly; namespace Sozsoft.Notifications.Application; @@ -9,7 +9,7 @@ namespace Sozsoft.Notifications.Application; [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class NotificationTypeToNotificationTypeDtoMapper : MapperBase { -public override partial NotificationTypeDto Map(NotificationType source); + public override partial NotificationTypeDto Map(NotificationType source); public override partial void Map(NotificationType source, NotificationTypeDto destination); @@ -25,7 +25,7 @@ public override partial NotificationTypeDto Map(NotificationType source); [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class NotificationRuleToNotificationRuleDtoMapper : MapperBase { -public override partial NotificationRuleDto Map(NotificationRule source); + public override partial NotificationRuleDto Map(NotificationRule source); public override partial void Map(NotificationRule source, NotificationRuleDto destination); diff --git a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationApplicationModule.cs b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationApplicationModule.cs index 2aea3d35..df266657 100644 --- a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationApplicationModule.cs +++ b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationApplicationModule.cs @@ -1,5 +1,5 @@ -using Sozsoft.Notifications.Domain; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; +using Sozsoft.Notifications.Domain; using Volo.Abp.Application; using Volo.Abp.Mapperly; using Volo.Abp.Modularity; diff --git a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationRuleAppService.cs b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationRuleAppService.cs index 3392a2cd..807fee5e 100644 --- a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationRuleAppService.cs +++ b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Application/NotificationRuleAppService.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Sozsoft.Notifications.Domain; -using Sozsoft.Notifications.Entities; using Microsoft.AspNetCore.Authorization; using Microsoft.EntityFrameworkCore; +using Sozsoft.Notifications.Domain; +using Sozsoft.Notifications.Entities; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Volo.Abp.Domain.Repositories; @@ -23,22 +23,16 @@ public class NotificationRuleAppService : CrudAppService< INotificationRuleAppService { private readonly IRepository repositoryType; - private readonly IOrganizationUnitRepository repositoryOrganizationUnit; - private readonly IdentityUserManager userManager; private readonly IIdentityUserRepository repositoryUser; public NotificationRuleAppService( IRepository repositoryType, IRepository repository, - IdentityUserManager userManager, - IIdentityUserRepository repositoryUser, - IOrganizationUnitRepository repositoryOrganizationUnit + IIdentityUserRepository repositoryUser ) : base(repository) { this.repositoryType = repositoryType; - this.userManager = userManager; this.repositoryUser = repositoryUser; - this.repositoryOrganizationUnit = repositoryOrganizationUnit; } public async Task GetNotificationTypes() diff --git a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain.Shared/Enums/NotificationChannels.cs b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain.Shared/Enums/NotificationChannels.cs index 78dcaf51..9af2dfa7 100644 --- a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain.Shared/Enums/NotificationChannels.cs +++ b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain.Shared/Enums/NotificationChannels.cs @@ -5,7 +5,7 @@ public static class NotificationChannels 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 Desktop = "Desktop"; 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) diff --git a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain.Shared/NotificationErrorCodes.cs b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain.Shared/NotificationErrorCodes.cs deleted file mode 100644 index 2363b82f..00000000 --- a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain.Shared/NotificationErrorCodes.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Sozsoft.Notifications.Domain; - -public static class NotificationErrorCodes -{ - //Add your business exception error codes here... -} - diff --git a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain/Entities/Notification.cs b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain/Entities/Notification.cs index fb3525da..ea64ffda 100644 --- a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain/Entities/Notification.cs +++ b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain/Entities/Notification.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using Volo.Abp.Domain.Entities.Auditing; namespace Sozsoft.Notifications.Entities; diff --git a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain/Entities/NotificationRule.cs b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain/Entities/NotificationRule.cs index 9e46c5dd..6b484f58 100644 --- a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain/Entities/NotificationRule.cs +++ b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain/Entities/NotificationRule.cs @@ -7,8 +7,8 @@ namespace Sozsoft.Notifications.Entities; public class NotificationRule : FullAuditedEntity { public required Guid NotificationTypeId { get; set; } - public NotificationType NotificationType { get; set; } - + public NotificationType NotificationType { get; set; } + /// /// Alıcı Tipi: User, Role, Organization, All, Custom /// User ise RecipientId UserId olacak diff --git a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain/NotificationManager.cs b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain/NotificationManager.cs index 2c02b8dc..3e0f4e98 100644 --- a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain/NotificationManager.cs +++ b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.Domain/NotificationManager.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Sozsoft.Notifications.Entities; using Microsoft.EntityFrameworkCore; +using Sozsoft.Notifications.Entities; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Repositories; using Volo.Abp.Identity; @@ -192,9 +192,9 @@ public class NotificationManager : INotificationManager } } - var notificationType = await repositoryType.FirstOrDefaultAsync(a => a.Name == NotificationType) + var notificationType = await repositoryType.FirstOrDefaultAsync(a => a.Name == NotificationType) ?? throw new Exception($"NotificationType '{NotificationType}' not found."); - + await repositoryNotification.InsertAsync(new Notification { NotificationTypeId = notificationType.Id, diff --git a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.EntityFrameworkCore/EntityFrameworkCore/NotificationDbContext.cs b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.EntityFrameworkCore/EntityFrameworkCore/NotificationDbContext.cs index e9b47dc4..db17f984 100644 --- a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.EntityFrameworkCore/EntityFrameworkCore/NotificationDbContext.cs +++ b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.EntityFrameworkCore/EntityFrameworkCore/NotificationDbContext.cs @@ -1,6 +1,6 @@ -using Sozsoft.Notifications.Domain; +using Microsoft.EntityFrameworkCore; +using Sozsoft.Notifications.Domain; using Sozsoft.Notifications.Entities; -using Microsoft.EntityFrameworkCore; using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; diff --git a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.EntityFrameworkCore/EntityFrameworkCore/NotificationEntityFrameworkCoreModule.cs b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.EntityFrameworkCore/EntityFrameworkCore/NotificationEntityFrameworkCoreModule.cs index f597fc4a..f117a954 100644 --- a/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.EntityFrameworkCore/EntityFrameworkCore/NotificationEntityFrameworkCoreModule.cs +++ b/api/modules/Sozsoft.Notifications/Sozsoft.Notifications.EntityFrameworkCore/EntityFrameworkCore/NotificationEntityFrameworkCoreModule.cs @@ -1,5 +1,5 @@ -using Sozsoft.Notifications.Domain; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; +using Sozsoft.Notifications.Domain; using Volo.Abp.EntityFrameworkCore; using Volo.Abp.Modularity; diff --git a/api/modules/Sozsoft.Sender/Localization/SozsoftMailingResource.cs b/api/modules/Sozsoft.Sender/Localization/SozsoftMailingResource.cs index 40e4fb27..3c08ead5 100644 --- a/api/modules/Sozsoft.Sender/Localization/SozsoftMailingResource.cs +++ b/api/modules/Sozsoft.Sender/Localization/SozsoftMailingResource.cs @@ -1,10 +1,9 @@ using Volo.Abp.Localization; -namespace Sozsoft.Sender.Localization +namespace Sozsoft.Sender.Localization; + +[LocalizationResourceName("SozsoftSender")] +public class ErpSenderResource { - [LocalizationResourceName("SozsoftSender")] - public class ErpSenderResource - { - } } diff --git a/api/modules/Sozsoft.Sender/Mail/SozsoftBackgroundEmailSendingJob.cs b/api/modules/Sozsoft.Sender/Mail/SozsoftBackgroundEmailSendingJob.cs index 9bd313c3..1aa66f0b 100644 --- a/api/modules/Sozsoft.Sender/Mail/SozsoftBackgroundEmailSendingJob.cs +++ b/api/modules/Sozsoft.Sender/Mail/SozsoftBackgroundEmailSendingJob.cs @@ -1,4 +1,4 @@ -using Volo.Abp.BackgroundJobs; +using Volo.Abp.BackgroundJobs; using Volo.Abp.DependencyInjection; using Volo.Abp.MultiTenancy; diff --git a/api/modules/Sozsoft.Sender/Mail/SozsoftBackgroundEmailSendingJobArgs.cs b/api/modules/Sozsoft.Sender/Mail/SozsoftBackgroundEmailSendingJobArgs.cs index c4a128eb..084b7264 100644 --- a/api/modules/Sozsoft.Sender/Mail/SozsoftBackgroundEmailSendingJobArgs.cs +++ b/api/modules/Sozsoft.Sender/Mail/SozsoftBackgroundEmailSendingJobArgs.cs @@ -1,4 +1,4 @@ -using Volo.Abp.MultiTenancy; +using Volo.Abp.MultiTenancy; namespace Sozsoft.Sender.Mail; diff --git a/api/modules/Sozsoft.Sender/Rocket/RocketHttpClient.cs b/api/modules/Sozsoft.Sender/Rocket/RocketHttpClient.cs index ed4d7e3b..5c73f6bd 100644 --- a/api/modules/Sozsoft.Sender/Rocket/RocketHttpClient.cs +++ b/api/modules/Sozsoft.Sender/Rocket/RocketHttpClient.cs @@ -1,5 +1,4 @@ using System.Net.Http.Json; -using Microsoft.Extensions.Logging; using Volo.Abp.Settings; namespace Sozsoft.Sender.Rocket; @@ -12,16 +11,13 @@ public interface IRocketHttpClient public sealed class RocketHttpClient : IRocketHttpClient, IDisposable { private readonly HttpClient httpClient; - private readonly ILogger logger; private readonly ISettingProvider settingProvider; public RocketHttpClient( HttpClient httpClient, - ILogger logger, ISettingProvider settingProvider) { this.httpClient = httpClient; - this.logger = logger; this.settingProvider = settingProvider; } diff --git a/api/modules/Sozsoft.Sender/Sms/PostaGuvercini/PostaGuverciniHttpClient.cs b/api/modules/Sozsoft.Sender/Sms/PostaGuvercini/PostaGuverciniHttpClient.cs index 8667e6c0..1c74eb7a 100644 --- a/api/modules/Sozsoft.Sender/Sms/PostaGuvercini/PostaGuverciniHttpClient.cs +++ b/api/modules/Sozsoft.Sender/Sms/PostaGuvercini/PostaGuverciniHttpClient.cs @@ -1,5 +1,4 @@ -using Microsoft.Extensions.Logging; -using Volo.Abp.Settings; +using Volo.Abp.Settings; namespace Sozsoft.Sender.Sms.PostaGuvercini; @@ -11,16 +10,13 @@ public interface IPostaGuverciniHttpClient public sealed class PostaGuverciniHttpClient : IPostaGuverciniHttpClient, IDisposable { private readonly HttpClient httpClient; - private readonly ILogger logger; private readonly ISettingProvider settingProvider; public PostaGuverciniHttpClient( HttpClient httpClient, - ILogger logger, ISettingProvider settingProvider) { this.httpClient = httpClient; - this.logger = logger; this.settingProvider = settingProvider; } diff --git a/api/modules/Sozsoft.Sender/SozsoftSenderModule.cs b/api/modules/Sozsoft.Sender/SozsoftSenderModule.cs index c08eef7c..902c92d1 100644 --- a/api/modules/Sozsoft.Sender/SozsoftSenderModule.cs +++ b/api/modules/Sozsoft.Sender/SozsoftSenderModule.cs @@ -1,11 +1,11 @@ -using Sozsoft.Sender.Localization; +using Microsoft.Extensions.DependencyInjection; +using Sozsoft.Sender.Localization; using Sozsoft.Sender.Mail; using Sozsoft.Sender.Mail.AmazonSes; using Sozsoft.Sender.Rocket; using Sozsoft.Sender.Sms; using Sozsoft.Sender.Sms.PostaGuvercini; using Sozsoft.Sender.WhatsApp; -using Microsoft.Extensions.DependencyInjection; using Volo.Abp.BackgroundJobs; using Volo.Abp.Emailing; using Volo.Abp.Localization; diff --git a/api/modules/Sozsoft.Sender/WhatsApp/WhatsAppHttpClient.cs b/api/modules/Sozsoft.Sender/WhatsApp/WhatsAppHttpClient.cs index 2a99f52e..f784823f 100644 --- a/api/modules/Sozsoft.Sender/WhatsApp/WhatsAppHttpClient.cs +++ b/api/modules/Sozsoft.Sender/WhatsApp/WhatsAppHttpClient.cs @@ -1,6 +1,5 @@ using System.Net.Http.Headers; using System.Net.Http.Json; -using Microsoft.Extensions.Logging; using Volo.Abp.Settings; namespace Sozsoft.Sender.WhatsApp; @@ -13,16 +12,13 @@ public interface IWhatsAppHttpClient public sealed class WhatsAppHttpClient : IWhatsAppHttpClient, IDisposable { private readonly HttpClient httpClient; - private readonly ILogger logger; private readonly ISettingProvider settingProvider; public WhatsAppHttpClient( HttpClient httpClient, - ILogger logger, ISettingProvider settingProvider) { this.httpClient = httpClient; - this.logger = logger; this.settingProvider = settingProvider; } diff --git a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application.Contracts/Permissions/SettingsPermissionDefinitionProvider.cs b/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application.Contracts/Permissions/SettingsPermissionDefinitionProvider.cs index 32c73a47..283a8729 100644 --- a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application.Contracts/Permissions/SettingsPermissionDefinitionProvider.cs +++ b/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application.Contracts/Permissions/SettingsPermissionDefinitionProvider.cs @@ -1,4 +1,4 @@ -using Volo.Abp.Authorization.Permissions; +using Volo.Abp.Authorization.Permissions; namespace Sozsoft.Settings.Permissions; diff --git a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application.Contracts/SettingsRemoteServiceConsts.cs b/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application.Contracts/SettingsRemoteServiceConsts.cs deleted file mode 100644 index 624e780e..00000000 --- a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application.Contracts/SettingsRemoteServiceConsts.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Sozsoft.Settings; - -public class SettingsRemoteServiceConsts -{ - public const string RemoteServiceName = "Settings"; - - public const string ModuleName = "settings"; -} - diff --git a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/SettingUiAppService.cs b/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/SettingUiAppService.cs index 0a9c75fa..114c568d 100644 --- a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/SettingUiAppService.cs +++ b/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/SettingUiAppService.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Sozsoft.Languages; using Microsoft.AspNetCore.Authorization; using Volo.Abp.Application.Services; using Volo.Abp.MultiTenancy; @@ -15,20 +14,17 @@ namespace Sozsoft.Settings; public class SettingUiAppService : ApplicationService, ISettingUiAppService { //private readonly IRepository repositorySettingDefinition; - private readonly ILanguageKeyIntegrationService languageKeyIntegrationService; 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, ICurrentTenant currentTenant) { - this.languageKeyIntegrationService = languageKeyIntegrationService; this.settingDefinitionManager = settingDefinitionManager; this.settingManager = settingManager; this.ErpSettingDefinitionManager = ErpSettingDefinitionManager; diff --git a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/SettingsMappers.cs b/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/SettingsMappers.cs index 10e806ab..b6baa4fd 100644 --- a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/SettingsMappers.cs +++ b/api/modules/Sozsoft.Settings/Sozsoft.Settings.Application/SettingsMappers.cs @@ -1,5 +1,5 @@ +using Riok.Mapperly.Abstractions; using Sozsoft.Settings.Entities; -using Riok.Mapperly.Abstractions; using Volo.Abp.Mapperly; namespace Sozsoft.Settings; @@ -7,7 +7,7 @@ namespace Sozsoft.Settings; [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class SettingDefinitionToSettingDefinitionDtoMapper : TwoWayMapperBase { -public override partial SettingDefinitionDto Map(SettingDefinition source); + public override partial SettingDefinitionDto Map(SettingDefinition source); public override partial void Map(SettingDefinition source, SettingDefinitionDto destination); diff --git a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain.Shared/SettingsErrorCodes.cs b/api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain.Shared/SettingsErrorCodes.cs deleted file mode 100644 index 3c7498b5..00000000 --- a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain.Shared/SettingsErrorCodes.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Sozsoft.Settings; - -public static class SettingsErrorCodes -{ - //Add your business exception error codes here... -} - diff --git a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain/SettingDefinitionManager.cs b/api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain/SettingDefinitionManager.cs index 75dfce04..af2fdd3b 100644 --- a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain/SettingDefinitionManager.cs +++ b/api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain/SettingDefinitionManager.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Sozsoft.Settings.Localization; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Localization; +using Sozsoft.Settings.Localization; using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Services; using Volo.Abp.Settings; diff --git a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain/SettingsDomainModule.cs b/api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain/SettingsDomainModule.cs index ef26da5b..8c7ddd39 100644 --- a/api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain/SettingsDomainModule.cs +++ b/api/modules/Sozsoft.Settings/Sozsoft.Settings.Domain/SettingsDomainModule.cs @@ -1,4 +1,4 @@ -using Volo.Abp.Modularity; +using Volo.Abp.Modularity; using Volo.Abp.SettingManagement; using Volo.Abp.Settings; diff --git a/api/modules/Sozsoft.Settings/Sozsoft.Settings.EntityFrameworkCore/EntityFrameworkCore/SettingsDbContext.cs b/api/modules/Sozsoft.Settings/Sozsoft.Settings.EntityFrameworkCore/EntityFrameworkCore/SettingsDbContext.cs index ec59baa0..39aec248 100644 --- a/api/modules/Sozsoft.Settings/Sozsoft.Settings.EntityFrameworkCore/EntityFrameworkCore/SettingsDbContext.cs +++ b/api/modules/Sozsoft.Settings/Sozsoft.Settings.EntityFrameworkCore/EntityFrameworkCore/SettingsDbContext.cs @@ -1,5 +1,5 @@ -using Sozsoft.Settings.Entities; -using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; +using Sozsoft.Settings.Entities; using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; using Volo.Abp.SettingManagement.EntityFrameworkCore; diff --git a/api/modules/Sozsoft.Settings/Sozsoft.Settings.EntityFrameworkCore/EntityFrameworkCore/SettingsDbContextModelCreatingExtensions.cs b/api/modules/Sozsoft.Settings/Sozsoft.Settings.EntityFrameworkCore/EntityFrameworkCore/SettingsDbContextModelCreatingExtensions.cs index 97edde2d..c5698d48 100644 --- a/api/modules/Sozsoft.Settings/Sozsoft.Settings.EntityFrameworkCore/EntityFrameworkCore/SettingsDbContextModelCreatingExtensions.cs +++ b/api/modules/Sozsoft.Settings/Sozsoft.Settings.EntityFrameworkCore/EntityFrameworkCore/SettingsDbContextModelCreatingExtensions.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Linq; using System.Text.Json; -using Sozsoft.Settings.Entities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.ChangeTracking; +using Sozsoft.Settings.Entities; using Volo.Abp; using Volo.Abp.EntityFrameworkCore.Modeling; using Volo.Abp.SettingManagement.EntityFrameworkCore; @@ -15,7 +15,7 @@ public static class SettingsDbContextModelCreatingExtensions public static void ConfigureSettings(this ModelBuilder builder) { Check.NotNull(builder, nameof(builder)); - + builder.ConfigureSettingManagement(); builder.Entity(b => diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/DatabaseObjectDto.cs b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/DatabaseObjectDto.cs index f2aa0925..330602e9 100644 --- a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/DatabaseObjectDto.cs +++ b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/DatabaseObjectDto.cs @@ -1,4 +1,4 @@ -namespace Sozsoft.SqlQueryManager.Application.Contracts; +namespace Sozsoft.SqlQueryManager.Application.Contracts; public class DatabaseTableDto { diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/SqlExecutionDto.cs b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/SqlExecutionDto.cs index 6b8dd9af..58b4198d 100644 --- a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/SqlExecutionDto.cs +++ b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/SqlExecutionDto.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; namespace Sozsoft.SqlQueryManager.Application.Contracts; diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/SqlObjectExplorerDto.cs b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/SqlObjectExplorerDto.cs index b3a26832..a5e4246b 100644 --- a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/SqlObjectExplorerDto.cs +++ b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/SqlObjectExplorerDto.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; namespace Sozsoft.SqlQueryManager.Application.Contracts; diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/SqlQueryManagerApplicationContractsModule.cs b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/SqlQueryManagerApplicationContractsModule.cs index cfdaa4f6..7c6cd0e0 100644 --- a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/SqlQueryManagerApplicationContractsModule.cs +++ b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/SqlQueryManagerApplicationContractsModule.cs @@ -1,4 +1,4 @@ -using Volo.Abp.Application; +using Volo.Abp.Application; using Volo.Abp.Authorization; using Volo.Abp.Modularity; diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/SqlTemplateDto.cs b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/SqlTemplateDto.cs index abb21711..b53e0cbd 100644 --- a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/SqlTemplateDto.cs +++ b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application.Contracts/SqlTemplateDto.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - -namespace Sozsoft.SqlQueryManager.Application.Contracts; +namespace Sozsoft.SqlQueryManager.Application.Contracts; public class SqlTemplateDto { @@ -9,10 +7,3 @@ public class SqlTemplateDto public string Description { get; set; } public string Template { get; set; } } - -public class GetTemplateInput -{ - public string TemplateType { get; set; } - public string ObjectName { get; set; } - public string SchemaName { get; set; } -} diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/SqlObjectManagerAppService.cs b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/SqlObjectManagerAppService.cs index 2008d682..636167e9 100644 --- a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/SqlObjectManagerAppService.cs +++ b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/SqlObjectManagerAppService.cs @@ -2,21 +2,21 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using System.Text.RegularExpressions; using System.Threading.Tasks; -using Sozsoft.SqlQueryManager.Application.Contracts; -using Sozsoft.SqlQueryManager.Domain.Services; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -using Volo.Abp.Application.Services; -using Volo.Abp.MultiTenancy; -using System.Text.RegularExpressions; using Sozsoft.Platform.Data.Seeds; using Sozsoft.Platform.Enums; using Sozsoft.Platform.Queries; using Sozsoft.Settings; +using Sozsoft.SqlQueryManager.Application.Contracts; +using Sozsoft.SqlQueryManager.Domain.Services; +using Volo.Abp.Application.Services; +using Volo.Abp.MultiTenancy; namespace Sozsoft.SqlQueryManager.Application; diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/SqlQueryManagerMappers.cs b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/SqlQueryManagerMappers.cs index 44c98654..a0051ff7 100644 --- a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/SqlQueryManagerMappers.cs +++ b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Application/SqlQueryManagerMappers.cs @@ -1 +1 @@ -namespace Sozsoft.SqlQueryManager.Application; +namespace Sozsoft.SqlQueryManager.Application; diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain.Shared/SozsoftSqlQueryManagerResource.cs b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain.Shared/SozsoftSqlQueryManagerResource.cs index 91887362..8b031b94 100644 --- a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain.Shared/SozsoftSqlQueryManagerResource.cs +++ b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain.Shared/SozsoftSqlQueryManagerResource.cs @@ -1,4 +1,4 @@ -using Volo.Abp.Localization; +using Volo.Abp.Localization; namespace Sozsoft.SqlQueryManager.Domain.Shared; diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain.Shared/SqlObjectType.cs b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain.Shared/SqlObjectType.cs index fe90524d..83b43a79 100644 --- a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain.Shared/SqlObjectType.cs +++ b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain.Shared/SqlObjectType.cs @@ -1,4 +1,4 @@ -namespace Sozsoft.SqlQueryManager.Domain.Shared; +namespace Sozsoft.SqlQueryManager.Domain.Shared; // SqlObjectType, SqlFunctionType and SqlQueryStatus enums removed: // The module no longer persists SQL objects and therefore does not need these enums. diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain.Shared/SqlQueryManagerDomainSharedModule.cs b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain.Shared/SqlQueryManagerDomainSharedModule.cs index 85dbe185..d4e3417f 100644 --- a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain.Shared/SqlQueryManagerDomainSharedModule.cs +++ b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain.Shared/SqlQueryManagerDomainSharedModule.cs @@ -1,4 +1,4 @@ -using Sozsoft.SqlQueryManager.Domain.Shared; +using Sozsoft.SqlQueryManager.Domain.Shared; using Volo.Abp.Domain; using Volo.Abp.Localization; using Volo.Abp.Localization.ExceptionHandling; diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain.Shared/SqlQueryManagerErrorCodes.cs b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain.Shared/SqlQueryManagerErrorCodes.cs deleted file mode 100644 index ec3867c8..00000000 --- a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain.Shared/SqlQueryManagerErrorCodes.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Sozsoft.SqlQueryManager.Domain.Shared; - -public static class SqlQueryManagerErrorCodes -{ - public const string InvalidSqlQuery = "SqlQueryManager:InvalidSqlQuery"; - public const string DataSourceNotFound = "SqlQueryManager:DataSourceNotFound"; - public const string ExecutionFailed = "SqlQueryManager:ExecutionFailed"; - public const string PermissionDenied = "SqlQueryManager:PermissionDenied"; - public const string InvalidObjectName = "SqlQueryManager:InvalidObjectName"; - public const string ObjectAlreadyExists = "SqlQueryManager:ObjectAlreadyExists"; -} diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain.Shared/SqlQueryManagerPermissions.cs b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain.Shared/SqlQueryManagerPermissions.cs index a69141a9..fb2a1a91 100644 --- a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain.Shared/SqlQueryManagerPermissions.cs +++ b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain.Shared/SqlQueryManagerPermissions.cs @@ -1,4 +1,4 @@ -using Volo.Abp.Reflection; +using Volo.Abp.Reflection; namespace Sozsoft.SqlQueryManager.Domain.Shared; diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain/Services/ISqlTemplateProvider.cs b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain/Services/ISqlTemplateProvider.cs index 72febdaf..d8f56b2c 100644 --- a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain/Services/ISqlTemplateProvider.cs +++ b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain/Services/ISqlTemplateProvider.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; namespace Sozsoft.SqlQueryManager.Domain.Services; diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain/Services/SqlExecutorService.cs b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain/Services/SqlExecutorService.cs index fdd0be0d..62e569ba 100644 --- a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain/Services/SqlExecutorService.cs +++ b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain/Services/SqlExecutorService.cs @@ -1,13 +1,13 @@ -using System; +using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; using Sozsoft.Platform.DynamicData; using Sozsoft.Platform.Enums; using Sozsoft.Platform.Queries; -using Microsoft.Extensions.DependencyInjection; using Volo.Abp; using Volo.Abp.Domain.Services; @@ -30,7 +30,7 @@ public class SqlExecutorService : DomainService, ISqlExecutorService { // Get DataSource to determine database type var dataSource = await _dataSourceManager.GetDataSourceAsync( - CurrentTenant.IsAvailable, + CurrentTenant.IsAvailable, dataSourceCode); if (dataSource == null) @@ -53,7 +53,7 @@ public class SqlExecutorService : DomainService, ISqlExecutorService } var repository = _serviceProvider.GetKeyedService(repositoryKey); - + if (repository == null) { throw new BusinessException("SqlQueryManager:RepositoryNotFound") @@ -64,8 +64,8 @@ public class SqlExecutorService : DomainService, ISqlExecutorService } public async Task ExecuteQueryAsync( - string sql, - string dataSourceCode, + string sql, + string dataSourceCode, Dictionary parameters = null) { var stopwatch = Stopwatch.StartNew(); @@ -74,7 +74,7 @@ public class SqlExecutorService : DomainService, ISqlExecutorService try { var connectionString = await _dataSourceManager.GetConnectionStringAsync( - CurrentTenant.IsAvailable, + CurrentTenant.IsAvailable, dataSourceCode); if (string.IsNullOrWhiteSpace(connectionString)) @@ -107,8 +107,8 @@ public class SqlExecutorService : DomainService, ISqlExecutorService } public async Task ExecuteNonQueryAsync( - string sql, - string dataSourceCode, + string sql, + string dataSourceCode, Dictionary parameters = null) { var stopwatch = Stopwatch.StartNew(); @@ -117,7 +117,7 @@ public class SqlExecutorService : DomainService, ISqlExecutorService try { var connectionString = await _dataSourceManager.GetConnectionStringAsync( - CurrentTenant.IsAvailable, + CurrentTenant.IsAvailable, dataSourceCode); if (string.IsNullOrWhiteSpace(connectionString)) @@ -149,8 +149,8 @@ public class SqlExecutorService : DomainService, ISqlExecutorService } public async Task ExecuteScalarAsync( - string sql, - string dataSourceCode, + string sql, + string dataSourceCode, Dictionary parameters = null) { var stopwatch = Stopwatch.StartNew(); @@ -159,7 +159,7 @@ public class SqlExecutorService : DomainService, ISqlExecutorService try { var connectionString = await _dataSourceManager.GetConnectionStringAsync( - CurrentTenant.IsAvailable, + CurrentTenant.IsAvailable, dataSourceCode); if (string.IsNullOrWhiteSpace(connectionString)) diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain/Services/SqlTemplateProvider.cs b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain/Services/SqlTemplateProvider.cs index 2255ce0d..3e1f39d7 100644 --- a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain/Services/SqlTemplateProvider.cs +++ b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain/Services/SqlTemplateProvider.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using System.Text; +using System.Collections.Generic; using Volo.Abp.DependencyInjection; namespace Sozsoft.SqlQueryManager.Domain.Services; @@ -48,7 +47,7 @@ GO"; public string GetViewTemplate(string viewName, string schemaName = "dbo", bool withSchemaBinding = false) { var schemaBindingClause = withSchemaBinding ? " WITH SCHEMABINDING" : ""; - + return $@"-- ============================================= -- Author: -- Create date: diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain/SqlQueryManagerDomainModule.cs b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain/SqlQueryManagerDomainModule.cs index b92a8575..d4b15f7c 100644 --- a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain/SqlQueryManagerDomainModule.cs +++ b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.Domain/SqlQueryManagerDomainModule.cs @@ -1,5 +1,4 @@ -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Domain; +using Volo.Abp.Domain; using Volo.Abp.Modularity; namespace Sozsoft.SqlQueryManager; diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.EntityFrameworkCore/SqlQueryManagerDbContext.cs b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.EntityFrameworkCore/SqlQueryManagerDbContext.cs index b874ed11..cffdd8fb 100644 --- a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.EntityFrameworkCore/SqlQueryManagerDbContext.cs +++ b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.EntityFrameworkCore/SqlQueryManagerDbContext.cs @@ -1,4 +1,4 @@ -using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; diff --git a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.EntityFrameworkCore/SqlQueryManagerEntityFrameworkCoreModule.cs b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.EntityFrameworkCore/SqlQueryManagerEntityFrameworkCoreModule.cs index 8a3f4bb3..dad8ad9b 100644 --- a/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.EntityFrameworkCore/SqlQueryManagerEntityFrameworkCoreModule.cs +++ b/api/modules/Sozsoft.SqlQueryManager/Sozsoft.SqlQueryManager.EntityFrameworkCore/SqlQueryManagerEntityFrameworkCoreModule.cs @@ -1,4 +1,4 @@ -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using Volo.Abp.EntityFrameworkCore; using Volo.Abp.Modularity; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/AuditLogs/AuditLogListRequestDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/AuditLogs/AuditLogListRequestDto.cs index e0cc568b..7f4f937c 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/AuditLogs/AuditLogListRequestDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/AuditLogs/AuditLogListRequestDto.cs @@ -1,4 +1,4 @@ -using Volo.Abp.Application.Dtos; +using Volo.Abp.Application.Dtos; namespace Sozsoft.Platform.AuditLogs; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ChangeLogs/ChangeLogDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ChangeLogs/ChangeLogDto.cs index 76a6e66c..c9252afd 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ChangeLogs/ChangeLogDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ChangeLogs/ChangeLogDto.cs @@ -1,4 +1,4 @@ -using System; +using System; using Volo.Abp.Application.Dtos; namespace Sozsoft.Platform.ChangeLogs; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/DeveloperKit/CrudEndpointDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/DeveloperKit/CrudEndpointDto.cs index d59ae8a3..38f0f23c 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/DeveloperKit/CrudEndpointDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/DeveloperKit/CrudEndpointDto.cs @@ -11,7 +11,7 @@ public class CrudEndpointDto : FullAuditedEntityDto public string OperationType { get; set; } = string.Empty; public string CsharpCode { get; set; } = string.Empty; public bool IsActive { get; set; } = true; - + // Navigation property for display purposes public string? EntityDisplayName { get; set; } } diff --git a/api/src/Sozsoft.Platform.Application.Contracts/FileManagement/FileManagementDtos.cs b/api/src/Sozsoft.Platform.Application.Contracts/FileManagement/FileManagementDtos.cs index 7bd5b14e..f56f3f4b 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/FileManagement/FileManagementDtos.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/FileManagement/FileManagementDtos.cs @@ -1,7 +1,7 @@ #nullable enable -using System.ComponentModel.DataAnnotations; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; using Volo.Abp.Content; namespace Sozsoft.Platform.FileManagement; @@ -11,7 +11,7 @@ public class CreateFolderDto [Required] [StringLength(255)] public string Name { get; set; } = string.Empty; - + public string? ParentId { get; set; } public string? TenantId { get; set; } @@ -37,11 +37,11 @@ public class UploadFileDto { [Required] public string FileName { get; set; } = string.Empty; - + public string? ParentId { get; set; } public string? TenantId { get; set; } - + // NoteModal pattern - Files array public IRemoteStreamContent[]? Files { get; set; } } @@ -50,7 +50,7 @@ public class SearchFilesDto { [Required] public string Query { get; set; } = string.Empty; - + public string? ParentId { get; set; } public string? TenantId { get; set; } @@ -64,11 +64,11 @@ public class BulkDeleteDto public string? TenantId { get; set; } } -public class CopyItemsDto +public class CopyItemsDto { [Required] public List ItemIds { get; set; } = new(); - + public string? TargetFolderId { get; set; } public string? TenantId { get; set; } @@ -78,7 +78,7 @@ public class MoveItemsDto { [Required] public List ItemIds { get; set; } = new(); - + public string? TargetFolderId { get; set; } public string? TenantId { get; set; } diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/AssignedBranchViewModel.cs b/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/AssignedBranchViewModel.cs index 5ced8db6..26df205f 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/AssignedBranchViewModel.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/AssignedBranchViewModel.cs @@ -4,8 +4,8 @@ namespace Sozsoft.Platform.Identity.Dto; public class AssignedBranchViewModel { - public Guid Id { get; set; } - + public Guid Id { get; set; } + public string Name { get; set; } public bool IsAssigned { get; set; } diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/AssignedClaimViewModel.cs b/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/AssignedClaimViewModel.cs index 4c96a9a8..9e55475f 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/AssignedClaimViewModel.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/AssignedClaimViewModel.cs @@ -4,12 +4,12 @@ namespace Sozsoft.Platform.Identity.Dto; public class AssignedClaimViewModel { - public Guid Id { get; set; } - + public Guid Id { get; set; } + public string ClaimType { get; set; } public string ClaimValue { get; set; } - + public bool IsAssigned { get; set; } } diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/AssignedDepartmentViewModel.cs b/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/AssignedDepartmentViewModel.cs index 032922db..e03c1eca 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/AssignedDepartmentViewModel.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/AssignedDepartmentViewModel.cs @@ -4,10 +4,10 @@ namespace Sozsoft.Platform.Identity.Dto; public class AssignedDepartmentViewModel { - public Guid Id { get; set; } - + public Guid Id { get; set; } + public string Name { get; set; } - + public bool IsAssigned { get; set; } } diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/AssignedJobPoisitionViewModel.cs b/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/AssignedJobPoisitionViewModel.cs index f8dc5411..4eaaf9bc 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/AssignedJobPoisitionViewModel.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/AssignedJobPoisitionViewModel.cs @@ -4,12 +4,12 @@ namespace Sozsoft.Platform.Identity.Dto; public class AssignedJobPoisitionViewModel { - public Guid Id { get; set; } - + public Guid Id { get; set; } + public string Name { get; set; } public Guid DepartmentId { get; set; } - + public bool IsAssigned { get; set; } } diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/AssignedWorkHourViewModel.cs b/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/AssignedWorkHourViewModel.cs index cc20ca11..c4dad128 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/AssignedWorkHourViewModel.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/AssignedWorkHourViewModel.cs @@ -4,10 +4,10 @@ namespace Sozsoft.Platform.Identity.Dto; public class AssignedWorkHourViewModel { - public Guid Id { get; set; } - + public Guid Id { get; set; } + public string Name { get; set; } - + public bool IsAssigned { get; set; } } diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/PermissionGrantedUsersDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/PermissionGrantedUsersDto.cs index 1a912b05..8dd08924 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/PermissionGrantedUsersDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/PermissionGrantedUsersDto.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; namespace Sozsoft.Platform.Identity.Dto; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/UserAvatarUpdateInput.cs b/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/UserAvatarUpdateInput.cs index 78798277..2044b7f6 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/UserAvatarUpdateInput.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/UserAvatarUpdateInput.cs @@ -1,4 +1,4 @@ -using System; +using System; using Volo.Abp.Content; namespace Sozsoft.Platform.Identity.Dto; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/UserClaimModel.cs b/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/UserClaimModel.cs index c43c123e..76be2891 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/UserClaimModel.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/Identity/Dto/UserClaimModel.cs @@ -6,8 +6,8 @@ namespace Sozsoft.Platform.Identity.Dto; public class UserClaimModel : ExtensibleObject { public Guid Id { get; set; } - public Guid UserId { get; set; } - public string ClaimType { get; set; } - public string ClaimValue { get; set; } + public Guid UserId { get; set; } + public string ClaimType { get; set; } + public string ClaimValue { get; set; } } diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Intranet/AnnouncementDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/Intranet/AnnouncementDto.cs index 85082c9e..dc66d359 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/Intranet/AnnouncementDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/Intranet/AnnouncementDto.cs @@ -14,7 +14,7 @@ public class AnnouncementDto : FullAuditedEntityDto 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; } diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Intranet/CreateSocialPostInput.cs b/api/src/Sozsoft.Platform.Application.Contracts/Intranet/CreateSocialPostInput.cs index 431dd3c9..02606d53 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/Intranet/CreateSocialPostInput.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/Intranet/CreateSocialPostInput.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; namespace Sozsoft.Platform.Intranet; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Intranet/EventCommentDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/Intranet/EventCommentDto.cs index db90c67f..92ca4a5a 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/Intranet/EventCommentDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/Intranet/EventCommentDto.cs @@ -1,4 +1,4 @@ -using System; +using System; using Sozsoft.Platform.Identity.Dto; namespace Sozsoft.Platform.Intranet; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Chart/ChartJsonItemRowDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Chart/ChartJsonItemRowDto.cs deleted file mode 100644 index 30497e77..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Chart/ChartJsonItemRowDto.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace Sozsoft.Platform.ListForms; - -public class ChartJsonItemRowDto -{ - public string Id { get; set; } - public string ListFormCode { get; set; } - public int Index { get; set; } - public string FieldName { get; set; } - public ChartAnnotationDto ItemAnnotation { get; set; } - public ChartPanesDto ItemPane { get; set; } - public ChartSeriesDto ItemSerie { get; set; } - public ChartValueAxisDto ItemAxis { get; set; } -} - diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Chart/EditChartAnnotationsDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Chart/EditChartAnnotationsDto.cs deleted file mode 100644 index 1d3b2cbd..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Chart/EditChartAnnotationsDto.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Sozsoft.Platform.ListForms; - -public class EditChartAnnotationsDto -{ - public string ListFormCode { get; set; } - public string Id { get; set; } - public int Index { get; set; } - public string FieldName { get; set; } - public ChartAnnotationDto Item { get; set; } -} - diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Chart/EditChartPanesDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Chart/EditChartPanesDto.cs deleted file mode 100644 index b9cdf4bb..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Chart/EditChartPanesDto.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Sozsoft.Platform.ListForms; - -public class EditChartPanesDto -{ - public string ListFormCode { get; set; } - public string Id { get; set; } - public int Index { get; set; } - public string FieldName { get; set; } - public ChartPanesDto Item { get; set; } -} - diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Chart/EditChartSeriesDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Chart/EditChartSeriesDto.cs deleted file mode 100644 index 0cbf5fff..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Chart/EditChartSeriesDto.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Sozsoft.Platform.ListForms; - -public class EditChartSeriesDto -{ - public string ListFormCode { get; set; } - public string Id { get; set; } - public int Index { get; set; } - public string FieldName { get; set; } - public ChartSeriesDto Item { get; set; } -} - diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Chart/EditChartValueAxisDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Chart/EditChartValueAxisDto.cs deleted file mode 100644 index 58e32879..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Chart/EditChartValueAxisDto.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Sozsoft.Platform.ListForms; - -public class EditChartValueAxisDto -{ - public string ListFormCode { get; set; } - public string Id { get; set; } - public int Index { get; set; } - public string FieldName { get; set; } - public ChartValueAxisDto Item { get; set; } -} - diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/ColumnFormatEditDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/ColumnFormatEditDto.cs index cf88274e..571442bd 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/ColumnFormatEditDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/ColumnFormatEditDto.cs @@ -13,7 +13,7 @@ public class ColumnFormatEditDto : ColumnFormatDto [JsonIgnore] public string JoinTableJson { get; set; } - public JoinTableDto ColumnJoinTableDto + public JoinTableDto ColumnJoinTableDto { get { diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/DeleteColumnValidationRuleItemDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/DeleteColumnValidationRuleItemDto.cs deleted file mode 100644 index 8d37fdf3..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/DeleteColumnValidationRuleItemDto.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Sozsoft.Platform.ListForms; - -public class DeleteCustomizationDataItemDto -{ - public string ListFormCode { get; set; } - public string Id { get; set; } - public int Index { get; set; } -} - diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/DeleteListFormFilterRequestDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/DeleteListFormFilterRequestDto.cs deleted file mode 100644 index 116b05a5..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/DeleteListFormFilterRequestDto.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Sozsoft.Platform.ListForms; - -public class DeleteListFormFilterRequestDto -{ - public string ListFormCode { get; set; } - public string Id { get; set; } -} - diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/ListFormFieldPivotSettingsDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/ListFormFieldPivotSettingsDto.cs index 9368a2cd..80f4b967 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/ListFormFieldPivotSettingsDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/ListFormFieldPivotSettingsDto.cs @@ -5,7 +5,7 @@ namespace Sozsoft.Platform.ListForms; // Field'in pivot ayarlarını tutan sınıf // PivotGridDataSourceField -public class ListFormFieldPivotSettingsDto +public class ListFormFieldPivotSettingsDto { public bool IsPivot { get; set; } = true; public bool Expanded { get; set; } = false; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/ListFormsDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/ListFormsDto.cs index a43c99b1..cb8e1044 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/ListFormsDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Dto/ListFormsDto.cs @@ -1,5 +1,5 @@ -using Sozsoft.Platform.Enums; -using System; +using System; +using Sozsoft.Platform.Enums; using Volo.Abp.Application.Dtos; namespace Sozsoft.Platform.ListForms; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/DynamicApi/CreateTenantFromOrderInput.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/DynamicApi/CreateTenantFromOrderInput.cs index ff05b79c..0321f20c 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/DynamicApi/CreateTenantFromOrderInput.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/DynamicApi/CreateTenantFromOrderInput.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace Sozsoft.Platform.ListForms.DynamicApi; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/DynamicApi/CreateUpdateUserInput.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/DynamicApi/CreateUpdateUserInput.cs index 2f812459..fe4259e5 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/DynamicApi/CreateUpdateUserInput.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/DynamicApi/CreateUpdateUserInput.cs @@ -1,5 +1,4 @@ -using System; -using static Sozsoft.Platform.PlatformConsts; +using static Sozsoft.Platform.PlatformConsts; namespace Sozsoft.Platform.ListForms.DynamicApi; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/DynamicApi/DynamicApiBaseInput.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/DynamicApi/DynamicApiBaseInput.cs index 2f637ee8..12c574e5 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/DynamicApi/DynamicApiBaseInput.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/DynamicApi/DynamicApiBaseInput.cs @@ -1,6 +1,4 @@ -using System; - -namespace Sozsoft.Platform.ListForms.DynamicApi; +namespace Sozsoft.Platform.ListForms.DynamicApi; public class DynamicApiBaseInput { diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/DynamicApi/IListFormDynamicApiAppService.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/DynamicApi/IListFormDynamicApiAppService.cs index 8c4860ab..f13ada23 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/DynamicApi/IListFormDynamicApiAppService.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/DynamicApi/IListFormDynamicApiAppService.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Threading.Tasks; namespace Sozsoft.Platform.ListForms.DynamicApi; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/DynamicApi/SeedTenantDbInput.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/DynamicApi/SeedTenantDbInput.cs deleted file mode 100644 index 1834e789..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/DynamicApi/SeedTenantDbInput.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; - -namespace Sozsoft.Platform.ListForms.DynamicApi; - -public class SeedTenantDbInput -{ - public Guid TenantId { get; set; } - public string AdminEmail { get; set; } - public string AdminPassword { get; set; } -} - diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/EditingFormDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/EditingFormDto.cs index 1788a407..34f76a29 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/EditingFormDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/EditingFormDto.cs @@ -1,6 +1,4 @@ -using System.Text.Json.Serialization; - -namespace Sozsoft.Platform.ListForms; +namespace Sozsoft.Platform.ListForms; /// popup yada form olarak acilan ekrandaki tasarimi belirtir /// https://js.devexpress.com/Demos/WidgetsGallery/Demo/Form/GroupedFields/jQuery/Light/ diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/GridStateRequestDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/GridStateRequestDto.cs deleted file mode 100644 index 7d79dcd2..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/GridStateRequestDto.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Sozsoft.Platform.ListForms; - -public class GridStateRequestDto -{ - public string ListFormCode { get; set; } - public string GridState { get; set; } -} - diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/ImageUploadOptionsDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/ImageUploadOptionsDto.cs index 715a0d3c..17878adf 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/ImageUploadOptionsDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/ImageUploadOptionsDto.cs @@ -1,4 +1,4 @@ -namespace Sozsoft.Platform.ListForms; +namespace Sozsoft.Platform.ListForms; public class ImageUploadOptionsDto { diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/StateStoringDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/StateStoringDto.cs index 56705f3b..9001e10f 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/StateStoringDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/StateStoringDto.cs @@ -10,7 +10,7 @@ public class StateStoringDto /// Accepted Values: 'custom' | 'localStorage' | 'sessionStorage' /// public string Type { get; set; } = "custom"; - + public string StorageKey { get; set; } /// Bir kullanıcının bir değişiklik yapması ile bu değişikliğin kaydedilmesi arasındaki gecikmeyi milisaniye cinsinden belirtir. /// diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/TodoOptionDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/TodoOptionDto.cs index ac400e03..7d783291 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/TodoOptionDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/GridOptionsDto/TodoOptionDto.cs @@ -1,4 +1,4 @@ -namespace Sozsoft.Platform.ListForms; +namespace Sozsoft.Platform.ListForms; /// /// Dinamik bir listeyi Todo/Kanban panosu olarak gostermek icin alan eslemeleri. diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/ImportManager/GenerateTemplateInput.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/ImportManager/GenerateTemplateInput.cs deleted file mode 100644 index d1d66436..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/ImportManager/GenerateTemplateInput.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using Sozsoft.Platform.ListForms; - -namespace Sozsoft.Platform.ListForms.ImportManager; - -public class GenerateTemplateInput -{ - public string GridName { get; set; } - public string Title { get; set; } - public List ColumnFormats { get; set; } - public string Format { get; set; } // 'excel' or 'csv' -} - -public class ExportDataInput -{ - public string GridName { get; set; } - public List ColumnFormats { get; set; } - public string Format { get; set; } - public Dictionary Filters { get; set; } -} - diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/ImportManager/ImportPreviewDataDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/ImportManager/ImportPreviewDataDto.cs deleted file mode 100644 index 5f1b40eb..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/ImportManager/ImportPreviewDataDto.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Sozsoft.Platform.ListForms.ImportManager; - -public class ImportPreviewDataDto -{ - public Guid SessionId { get; set; } - public List Headers { get; set; } = new(); - public List> Rows { get; set; } = new(); // raw string olarak dönen veri hücreleri - public int TotalRows { get; set; } - public int SampleSize { get; set; } - - public List ColumnMappings { get; set; } = new(); - public List ValidationResults { get; set; } = new(); -} - diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/ImportManager/ImportValidationErrorDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/ImportManager/ImportValidationErrorDto.cs index 8ed2d0c7..3353e893 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/ImportManager/ImportValidationErrorDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/ImportManager/ImportValidationErrorDto.cs @@ -1,4 +1,4 @@ -public class ImportValidationErrorDto +public class ImportValidationErrorDto { public int Row { get; set; } public string Column { get; set; } diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/ImportManager/PreviewInputDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/ImportManager/PreviewInputDto.cs deleted file mode 100644 index c2867d9c..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/ImportManager/PreviewInputDto.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Sozsoft.Platform.ListForms.Select; - -namespace Sozsoft.Platform.ListForms.ImportManager; - -public class PreviewInputDto -{ - public Guid SessionId { get; set; } - public GridDto GridDto { get; set; } -} - diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/DeleteColumnStyleConditionItemDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/DeleteColumnStyleConditionItemDto.cs deleted file mode 100644 index 4c178656..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/DeleteColumnStyleConditionItemDto.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Sozsoft.Platform.ListForms.Select; - -public class DeleteColumnStyleConditionItemDto -{ - public string ListFormCode { get; set; } - public string Id { get; set; } - public int Index { get; set; } -} - diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/DeleteColumnValidationRuleItemDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/DeleteColumnValidationRuleItemDto.cs deleted file mode 100644 index 0b149ea6..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/DeleteColumnValidationRuleItemDto.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Sozsoft.Platform.ListForms.Select; - -public class DeleteColumnValidationRuleItemDto -{ - public string ListFormCode { get; set; } - public string Id { get; set; } - public int Index { get; set; } -} - diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/DeleteCommandColumnRequestDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/DeleteCommandColumnRequestDto.cs deleted file mode 100644 index 746a8538..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/DeleteCommandColumnRequestDto.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Sozsoft.Platform.ListForms.Select; - -public class DeleteCommandColumnRequestDto -{ - /// Yetki kontrolü için gerekli - /// - public string ListFormCode { get; set; } - public string Id { get; set; } - public int Index { get; set; } -} - diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/DeleteCrudFieldsDefaultValueJsonItemDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/DeleteCrudFieldsDefaultValueJsonItemDto.cs deleted file mode 100644 index a644ee10..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/DeleteCrudFieldsDefaultValueJsonItemDto.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Sozsoft.Platform.ListForms.Select; - -public class DeleteCrudFieldsDefaultValueJsonItemDto -{ - public string ListFormCode { get; set; } - public string Id { get; set; } - public string FieldName { get; set; } - public int Index { get; set; } -} - diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/DeleteEditingFormItemRequestDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/DeleteEditingFormItemRequestDto.cs deleted file mode 100644 index 54a506ee..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/DeleteEditingFormItemRequestDto.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Sozsoft.Platform.ListForms.Select; - -public class DeleteEditingFormItemRequestDto -{ - public string ListFormCode { get; set; } - public string Id { get; set; } - public int Index { get; set; } -} - diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/DeleteListFormFieldRequestDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/DeleteListFormFieldRequestDto.cs deleted file mode 100644 index 138087aa..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/DeleteListFormFieldRequestDto.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Sozsoft.Platform.ListForms.Select; - -public class DeleteListFormFieldRequestDto -{ - public string ListFormCode { get; set; } - public string Id { get; set; } -} - diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/EditColumnStylingItemDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/EditColumnStylingItemDto.cs deleted file mode 100644 index b27070cb..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/EditColumnStylingItemDto.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Sozsoft.Platform.ListForms.Select; - -public class EditColumnStylingItemDto -{ - public string ListFormCode { get; set; } - public string Id { get; set; } - public int Index { get; set; } - public string FieldName { get; set; } - public ColumnStylingDto Item { get; set; } -} - diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/EditColumnValidationRuleItemDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/EditColumnValidationRuleItemDto.cs deleted file mode 100644 index c549875f..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/EditColumnValidationRuleItemDto.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Sozsoft.Platform.ListForms.Select; - -public class EditColumnValidationRuleItemDto -{ - public string ListFormCode { get; set; } - public string Id { get; set; } - public int Index { get; set; } - public string FieldName { get; set; } - public ValidationRuleDto Item { get; set; } -} - diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/WidgetDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/WidgetDto.cs index 980d3491..e6112444 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/WidgetDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Select/WidgetDto.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; public class WidgetDto { @@ -18,4 +18,4 @@ public class WidgetItemDto public string Icon { get; set; } public string SubTitle { get; set; } public string OnClick { get; set; } -} \ No newline at end of file +} diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Wizard/IListFormWizardAppService.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Wizard/IListFormWizardAppService.cs index 1452eec0..368133f1 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Wizard/IListFormWizardAppService.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Wizard/IListFormWizardAppService.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; using Volo.Abp.Content; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Wizard/ListFormWizardDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Wizard/ListFormWizardDto.cs index 6c515f41..980bd305 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Wizard/ListFormWizardDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Wizard/ListFormWizardDto.cs @@ -1,7 +1,7 @@ -using Sozsoft.Platform.Enums; -using System.Collections.Generic; +using System.Collections.Generic; using System.Data; using System.Text.Json.Serialization; +using Sozsoft.Platform.Enums; namespace Sozsoft.Platform.ListForms; @@ -73,7 +73,7 @@ public class ListFormWizardDto public string MenuIcon { get; set; } public string DataSourceCode { get; set; } public string DataSourceConnectionString { get; set; } - + public SelectCommandTypeEnum SelectCommandType { get; set; } public string SelectCommand { get; set; } public string KeyFieldName { get; set; } diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Wizard/WizardColumnGroupInputDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Wizard/WizardColumnGroupInputDto.cs index 769cadf8..b50cea74 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Wizard/WizardColumnGroupInputDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Wizard/WizardColumnGroupInputDto.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; namespace Sozsoft.Platform.ListForms; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Wizard/WizardColumnItemInputDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Wizard/WizardColumnItemInputDto.cs index 1f3a0a34..a50db3d5 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Wizard/WizardColumnItemInputDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Wizard/WizardColumnItemInputDto.cs @@ -1,4 +1,4 @@ -using System.Data; +using System.Data; using Sozsoft.Platform.Enums; namespace Sozsoft.Platform.ListForms; @@ -14,7 +14,7 @@ public class WizardColumnItemInputDto public bool IsRequired { get; set; } public bool IncludeInEditingForm { get; set; } = true; public DbType DbSourceType { get; set; } = DbType.String; - public string TurkishCaption { get; set; } + public string TurkishCaption { get; set; } public string EnglishCaption { get; set; } public UiLookupDataSourceTypeEnum LookupDataSourceType { get; set; } public string ValueExpr { get; set; } diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Wizard/WizardImportDtos.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Wizard/WizardImportDtos.cs index b43c3553..8411459c 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Wizard/WizardImportDtos.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Wizard/WizardImportDtos.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using Sozsoft.Platform.Enums; namespace Sozsoft.Platform.ListForms; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/CompareOutcomeDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/CompareOutcomeDto.cs index f0f4a3af..a69ef301 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/CompareOutcomeDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/CompareOutcomeDto.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; namespace Sozsoft.Platform.ListForms; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/CreateUpdateListFormWorkflowCriteriaDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/CreateUpdateListFormWorkflowCriteriaDto.cs index 05f18ff9..b34701c7 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/CreateUpdateListFormWorkflowCriteriaDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/CreateUpdateListFormWorkflowCriteriaDto.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; namespace Sozsoft.Platform.ListForms; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/DecisionWorkflowDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/DecisionWorkflowDto.cs index 8eb27255..f0b7bb47 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/DecisionWorkflowDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/DecisionWorkflowDto.cs @@ -1,4 +1,4 @@ -namespace Sozsoft.Platform.ListForms; +namespace Sozsoft.Platform.ListForms; public class DecisionWorkflowDto { diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/IListFormWorkflowAppService.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/IListFormWorkflowAppService.cs index 019e4986..5d168c53 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/IListFormWorkflowAppService.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/IListFormWorkflowAppService.cs @@ -1,5 +1,4 @@ -using System; -using System.Threading.Tasks; +using System.Threading.Tasks; using Volo.Abp.Application.Services; namespace Sozsoft.Platform.ListForms; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/ListFormWorkflowCriteriaDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/ListFormWorkflowCriteriaDto.cs index 8330f5f4..ff7a1550 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/ListFormWorkflowCriteriaDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/ListFormWorkflowCriteriaDto.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using Volo.Abp.Application.Dtos; namespace Sozsoft.Platform.ListForms; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/ListFormWorkflowStateDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/ListFormWorkflowStateDto.cs index eee7579d..684b49dc 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/ListFormWorkflowStateDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/ListFormWorkflowStateDto.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; namespace Sozsoft.Platform.ListForms; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/StartWorkflowDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/StartWorkflowDto.cs index ec606930..726a7bae 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/StartWorkflowDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/StartWorkflowDto.cs @@ -1,4 +1,4 @@ -namespace Sozsoft.Platform.ListForms; +namespace Sozsoft.Platform.ListForms; public class StartWorkflowDto { diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/WorkflowConditionDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/WorkflowConditionDto.cs index d87f04b6..aefc7d92 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/WorkflowConditionDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/WorkflowConditionDto.cs @@ -1,4 +1,4 @@ -namespace Sozsoft.Platform.ListForms; +namespace Sozsoft.Platform.ListForms; public class WorkflowConditionDto { diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/WorkflowHistoryDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/WorkflowHistoryDto.cs deleted file mode 100644 index 1ef240e0..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/WorkflowHistoryDto.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; - -namespace Sozsoft.Platform.ListForms; - -public class WorkflowHistoryDto -{ - public DateTime Time { get; set; } - public string Action { get; set; } - public string Note { get; set; } -} - diff --git a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/WorkflowRunResultDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/WorkflowRunResultDto.cs index d52efdf6..148b2bb6 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/WorkflowRunResultDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/ListForms/Workflow/WorkflowRunResultDto.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; namespace Sozsoft.Platform.ListForms; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Messenger/MessengerDtos.cs b/api/src/Sozsoft.Platform.Application.Contracts/Messenger/MessengerDtos.cs index 89f75201..b64e664d 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/Messenger/MessengerDtos.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/Messenger/MessengerDtos.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using System; using System.Collections.Generic; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Note/NoteDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/Note/NoteDto.cs index 425f30bf..f8fb28ad 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/Note/NoteDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/Note/NoteDto.cs @@ -12,9 +12,9 @@ public class NoteDto : FullAuditedEntityDto public string Type { get; set; } public string Subject { get; set; } public string Content { get; set; } - public string FilesJson { get; set; } + public string FilesJson { get; set; } public string CreateUserName { get; set; } - + public IRemoteStreamContent[] Files { get; set; } } diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Note/NoteListRequestDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/Note/NoteListRequestDto.cs index 216d3193..8c738d86 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/Note/NoteListRequestDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/Note/NoteListRequestDto.cs @@ -1,7 +1,7 @@ -using Volo.Abp.Application.Dtos; +using Volo.Abp.Application.Dtos; public class NoteListRequestDto : PagedAndSortedResultRequestDto - { - public string EntityName { get; set; } - public string EntityId { get; set; } - } \ No newline at end of file +{ + public string EntityName { get; set; } + public string EntityId { get; set; } +} diff --git a/api/src/Sozsoft.Platform.Application.Contracts/OrgChart/OrgChartDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/OrgChart/OrgChartDto.cs index a11f385b..22b11664 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/OrgChart/OrgChartDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/OrgChart/OrgChartDto.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; namespace Sozsoft.Platform.OrgChart; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Permissions/PlatformPermissionDefinitionProvider.cs b/api/src/Sozsoft.Platform.Application.Contracts/Permissions/PlatformPermissionDefinitionProvider.cs index b1bed991..c2b7d57d 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/Permissions/PlatformPermissionDefinitionProvider.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/Permissions/PlatformPermissionDefinitionProvider.cs @@ -1,4 +1,4 @@ -using Volo.Abp.Authorization.Permissions; +using Volo.Abp.Authorization.Permissions; namespace Sozsoft.Platform.Permissions; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Permissions/PlatformPermissions.cs b/api/src/Sozsoft.Platform.Application.Contracts/Permissions/PlatformPermissions.cs index 5e81d4f1..1a5e38ef 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/Permissions/PlatformPermissions.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/Permissions/PlatformPermissions.cs @@ -1,4 +1,4 @@ -namespace Sozsoft.Platform.Permissions; +namespace Sozsoft.Platform.Permissions; public static class PlatformPermissions { diff --git a/api/src/Sozsoft.Platform.Application.Contracts/PlatformDtoExtensions.cs b/api/src/Sozsoft.Platform.Application.Contracts/PlatformDtoExtensions.cs index b4fbb631..74d7ac65 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/PlatformDtoExtensions.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/PlatformDtoExtensions.cs @@ -10,17 +10,17 @@ public static class PlatformDtoExtensions { OneTimeRunner.Run(() => { - /* You can add extension properties to DTOs - * defined in the depended modules. - * - * Example: - * - * ObjectExtensionManager.Instance - * .AddOrUpdateProperty("Title"); - * - * See the documentation for more: - * https://docs.abp.io/en/abp/latest/Object-Extensions - */ + /* You can add extension properties to DTOs + * defined in the depended modules. + * + * Example: + * + * ObjectExtensionManager.Instance + * .AddOrUpdateProperty("Title"); + * + * See the documentation for more: + * https://docs.abp.io/en/abp/latest/Object-Extensions + */ }); } } diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Public/BlogPostDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/Public/BlogPostDto.cs index 1775421c..856c599f 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/Public/BlogPostDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/Public/BlogPostDto.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using Sozsoft.Platform.Identity.Dto; using Volo.Abp.Application.Dtos; namespace Sozsoft.Platform.Public; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Public/BlogPostListDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/Public/BlogPostListDto.cs index 32ce5808..79a2aa0d 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/Public/BlogPostListDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/Public/BlogPostListDto.cs @@ -17,7 +17,7 @@ public class BlogPostListDto : EntityDto public Guid CategoryId { get; set; } public BlogCategoryDto Category { get; set; } - + public string Author { get; set; } public int ViewCount { get; set; } diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Public/ContactTagDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/Public/ContactTagDto.cs deleted file mode 100644 index 0eb6fe88..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/Public/ContactTagDto.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using Volo.Abp.Application.Dtos; - -namespace Sozsoft.Platform.Public; - -public class ContactTagDto : AuditedEntityDto -{ - public string Name { get; set; } - public string Category { get; set; } -} diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Public/ContactTitleDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/Public/ContactTitleDto.cs deleted file mode 100644 index 16effdc1..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/Public/ContactTitleDto.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using Volo.Abp.Application.Dtos; - -namespace Sozsoft.Platform.Public; - -public class ContactTitleDto : AuditedEntityDto -{ - public string Title { get; set; } - public string Abbreviation { get; set; } -} diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Public/HomeDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/Public/HomeDto.cs index 863c3134..a2e23cd5 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/Public/HomeDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/Public/HomeDto.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Text.Json; using System.Text.Json.Serialization; diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Public/IBlogAppService.cs b/api/src/Sozsoft.Platform.Application.Contracts/Public/IBlogAppService.cs index 4209a66c..ef92074b 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/Public/IBlogAppService.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/Public/IBlogAppService.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Threading.Tasks; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; @@ -27,32 +26,3 @@ public class GetBlogPostsInput : PagedAndSortedResultRequestDto public string Search { get; set; } public Guid? CategoryId { get; set; } } - -public class SearchBlogPostsInput : PagedAndSortedResultRequestDto -{ - public string Query { get; set; } - public Guid? CategoryId { get; set; } - public string Tag { get; set; } - public Guid? UserId { get; set; } - public bool? IsPublished { get; set; } -} - -public class BlogStatsDto -{ - public int TotalPosts { get; set; } - public int PublishedPosts { get; set; } - public int DraftPosts { get; set; } - public int TotalCategories { get; set; } - public int TotalViews { get; set; } - public int TotalLikes { get; set; } - public int TotalComments { get; set; } - public List PopularTags { get; set; } - public BlogPostListDto LatestPost { get; set; } - public BlogPostListDto MostViewedPost { get; set; } - - public BlogStatsDto() - { - PopularTags = new List(); - } -} - diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Public/SavePublicPageContentInput.cs b/api/src/Sozsoft.Platform.Application.Contracts/Public/SavePublicPageContentInput.cs index 30ee4753..c45d19a2 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/Public/SavePublicPageContentInput.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/Public/SavePublicPageContentInput.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; namespace Sozsoft.Platform.Public; @@ -215,4 +214,4 @@ public class SaveContactPageInput public string MapContainerStyleClass { get; set; } public string MapFrameStyleClass { get; set; } public List StyleTexts { get; set; } = []; -} \ No newline at end of file +} diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Sector/SectorDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/Sector/SectorDto.cs deleted file mode 100644 index 6d5556b5..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/Sector/SectorDto.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using Volo.Abp.Application.Dtos; - -namespace Sozsoft.Platform.Sectors; - -public class SectorDto : AuditedEntityDto -{ - public string Name { get; set; } -} diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Skill/SkillTypeDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/Skill/SkillTypeDto.cs deleted file mode 100644 index c8cb2305..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/Skill/SkillTypeDto.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using Volo.Abp.Application.Dtos; - -namespace Sozsoft.Platform.Skills; - -public class SkillTypeDto : AuditedEntityDto -{ - public string Name { get; set; } - - public List Skills { get; set; } - public List Levels { get; set; } -} diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Uom/UomCategoryDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/Uom/UomCategoryDto.cs deleted file mode 100644 index 89ab5cab..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/Uom/UomCategoryDto.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using Volo.Abp.Application.Dtos; - -namespace Sozsoft.Platform.Uoms; - -public class UomCategoryDto : AuditedEntityDto -{ - public string Name { get; set; } -} diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Uom/UomDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/Uom/UomDto.cs deleted file mode 100644 index 1904e9de..00000000 --- a/api/src/Sozsoft.Platform.Application.Contracts/Uom/UomDto.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using Sozsoft.Platform.Enums; -using Volo.Abp.Application.Dtos; - -namespace Sozsoft.Platform.Uoms; - -public class UomDto : AuditedEntityDto -{ - public string Name { get; set; } - public UomType Type { get; set; } - public decimal Ratio { get; set; } - public bool IsActive { get; set; } - public decimal Rounding { get; set; } - public string UomCategoryId { get; set; } - public string UomCategoryName { get; set; } // Listelemede gösterim için opsiyonel -} diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Videoroom/VideoroomDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/Videoroom/VideoroomDto.cs index 6f290310..30792397 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/Videoroom/VideoroomDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/Videoroom/VideoroomDto.cs @@ -47,12 +47,6 @@ public class VideoroomSettingsDto public bool AutoMuteNewParticipants { get; set; } } -public class VideoroomListDto : PagedAndSortedResultRequestDto -{ - public bool? IsActive { get; set; } - public Guid? TeacherId { get; set; } -} - public class VideoroomAttendanceDto : EntityDto { public Guid SessionId { get; set; } diff --git a/api/src/Sozsoft.Platform.Application.Contracts/Videoroom/VideoroomFilterInputDto.cs b/api/src/Sozsoft.Platform.Application.Contracts/Videoroom/VideoroomFilterInputDto.cs index de96191b..9cab5bc6 100644 --- a/api/src/Sozsoft.Platform.Application.Contracts/Videoroom/VideoroomFilterInputDto.cs +++ b/api/src/Sozsoft.Platform.Application.Contracts/Videoroom/VideoroomFilterInputDto.cs @@ -1,4 +1,4 @@ -using Volo.Abp.Application.Dtos; +using Volo.Abp.Application.Dtos; namespace Sozsoft.Platform.VideoRooms; @@ -6,4 +6,4 @@ public class VideoroomFilterInputDto : PagedAndSortedResultRequestDto { public string Search { get; set; } public string Status { get; set; } -} \ No newline at end of file +} diff --git a/api/src/Sozsoft.Platform.Application/AiBots/AiBotAppService.cs b/api/src/Sozsoft.Platform.Application/AiBots/AiBotAppService.cs index 9b2b92e9..b781cf2a 100644 --- a/api/src/Sozsoft.Platform.Application/AiBots/AiBotAppService.cs +++ b/api/src/Sozsoft.Platform.Application/AiBots/AiBotAppService.cs @@ -1,12 +1,12 @@ using System; -using Sozsoft.Platform.Entities; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; +using Sozsoft.Platform.Entities; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Volo.Abp.Domain.Repositories; -using System.Threading.Tasks; -using System.Linq; -using System.Collections.Generic; namespace Sozsoft.Platform.AiBots; diff --git a/api/src/Sozsoft.Platform.Application/AiBots/AiBotMappers.cs b/api/src/Sozsoft.Platform.Application/AiBots/AiBotMappers.cs index b6ba5843..419b8ae0 100644 --- a/api/src/Sozsoft.Platform.Application/AiBots/AiBotMappers.cs +++ b/api/src/Sozsoft.Platform.Application/AiBots/AiBotMappers.cs @@ -1,5 +1,5 @@ +using Riok.Mapperly.Abstractions; using Sozsoft.Platform.Entities; -using Riok.Mapperly.Abstractions; using Volo.Abp.Mapperly; namespace Sozsoft.Platform.AiBots; diff --git a/api/src/Sozsoft.Platform.Application/AuditLogs/AuditLogMappers.cs b/api/src/Sozsoft.Platform.Application/AuditLogs/AuditLogMappers.cs index 1214ad3a..00aaf7c4 100644 --- a/api/src/Sozsoft.Platform.Application/AuditLogs/AuditLogMappers.cs +++ b/api/src/Sozsoft.Platform.Application/AuditLogs/AuditLogMappers.cs @@ -1,5 +1,5 @@ +using Riok.Mapperly.Abstractions; using Volo.Abp.AuditLogging; -using Riok.Mapperly.Abstractions; using Volo.Abp.Mapperly; namespace Sozsoft.Platform.AuditLogs; @@ -7,7 +7,7 @@ namespace Sozsoft.Platform.AuditLogs; [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class AuditLogToAuditLogDtoMapper : MapperBase { -public override partial AuditLogDto Map(AuditLog source); + public override partial AuditLogDto Map(AuditLog source); public override partial void Map(AuditLog source, AuditLogDto destination); @@ -23,7 +23,7 @@ public override partial AuditLogDto Map(AuditLog source); [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class AuditLogActionToAuditLogActionDtoMapper : MapperBase { -public override partial AuditLogActionDto Map(AuditLogAction source); + public override partial AuditLogActionDto Map(AuditLogAction source); public override partial void Map(AuditLogAction source, AuditLogActionDto destination); @@ -39,7 +39,7 @@ public override partial AuditLogActionDto Map(AuditLogAction source); [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class EntityChangeToEntityChangeDtoMapper : MapperBase { -public override partial EntityChangeDto Map(EntityChange source); + public override partial EntityChangeDto Map(EntityChange source); public override partial void Map(EntityChange source, EntityChangeDto destination); @@ -55,7 +55,7 @@ public override partial EntityChangeDto Map(EntityChange source); [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class EntityPropertyChangeToEntityPropertyChangeDtoMapper : MapperBase { -public override partial EntityPropertyChangeDto Map(EntityPropertyChange source); + public override partial EntityPropertyChangeDto Map(EntityPropertyChange source); public override partial void Map(EntityPropertyChange source, EntityPropertyChangeDto destination); diff --git a/api/src/Sozsoft.Platform.Application/BackgroundWorker/BackgroundWorkerAppService.cs b/api/src/Sozsoft.Platform.Application/BackgroundWorker/BackgroundWorkerAppService.cs index 14f290ba..cd5d1576 100644 --- a/api/src/Sozsoft.Platform.Application/BackgroundWorker/BackgroundWorkerAppService.cs +++ b/api/src/Sozsoft.Platform.Application/BackgroundWorker/BackgroundWorkerAppService.cs @@ -26,7 +26,7 @@ public class BackgroundWorkerAppService : PlatformAppService public async Task GetAllBackgroundWorkers() { var defs = await platformTemplateDefinitionManager.GetAllAsync(); - return defs.Select(a=>new { a.Name, a.Properties }).ToList(); + return defs.Select(a => new { a.Name, a.Properties }).ToList(); } public async Task GenerateBackgroundWorkers() diff --git a/api/src/Sozsoft.Platform.Application/BackgroundWorker/BackgroundWorkerInitializer.cs b/api/src/Sozsoft.Platform.Application/BackgroundWorker/BackgroundWorkerInitializer.cs index fdd092e3..d4dbad68 100644 --- a/api/src/Sozsoft.Platform.Application/BackgroundWorker/BackgroundWorkerInitializer.cs +++ b/api/src/Sozsoft.Platform.Application/BackgroundWorker/BackgroundWorkerInitializer.cs @@ -1,14 +1,14 @@ -using System; +using System; using System.Runtime.InteropServices; using System.Text.Json; using System.Threading.Tasks; using Hangfire; using Hangfire.Storage; +using Microsoft.Extensions.Logging; using Sozsoft.MailQueue.Domain.Shared; using Sozsoft.Platform.BackgroundWorkers; using Sozsoft.Platform.Entities; using Sozsoft.Platform.Enums; -using Microsoft.Extensions.Logging; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Repositories; using Volo.Abp.Uow; diff --git a/api/src/Sozsoft.Platform.Application/Blog/BlogAppService.cs b/api/src/Sozsoft.Platform.Application/Blog/BlogAppService.cs index 1d955b5d..e233c645 100644 --- a/api/src/Sozsoft.Platform.Application/Blog/BlogAppService.cs +++ b/api/src/Sozsoft.Platform.Application/Blog/BlogAppService.cs @@ -1,13 +1,11 @@ using System; using System.Linq; using System.Threading.Tasks; -using Sozsoft.Platform.Entities; -using Sozsoft.Platform.Localization; using Microsoft.AspNetCore.Authorization; -using Microsoft.Extensions.Localization; +using Sozsoft.Platform.Entities; using Volo.Abp.Domain.Repositories; -using Volo.Abp.Users; using Volo.Abp.Uow; +using Volo.Abp.Users; using static Sozsoft.Platform.Data.Seeds.SeedConsts; namespace Sozsoft.Platform.Public; @@ -18,18 +16,15 @@ public class BlogAppService : PlatformAppService, IBlogAppService private readonly IRepository _postRepository; private readonly IRepository _categoryRepository; private readonly ICurrentUser _currentUser; - private readonly IStringLocalizer _localizer; public BlogAppService( IRepository postRepository, IRepository categoryRepository, - ICurrentUser currentUser, - IStringLocalizer localizer) + ICurrentUser currentUser) { _postRepository = postRepository; _categoryRepository = categoryRepository; _currentUser = currentUser; - _localizer = localizer; } public async Task CreatePostAsync(CreateUpdateBlogPostDto input) diff --git a/api/src/Sozsoft.Platform.Application/Branch/BranchMappers.cs b/api/src/Sozsoft.Platform.Application/Branch/BranchMappers.cs index 521ac117..e52ed232 100644 --- a/api/src/Sozsoft.Platform.Application/Branch/BranchMappers.cs +++ b/api/src/Sozsoft.Platform.Application/Branch/BranchMappers.cs @@ -1,5 +1,4 @@ -using Sozsoft.Platform.Branchs; -using Riok.Mapperly.Abstractions; +using Riok.Mapperly.Abstractions; using Volo.Abp.Mapperly; namespace Sozsoft.Platform.Branchs; @@ -7,7 +6,7 @@ namespace Sozsoft.Platform.Branchs; [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class BranchSeedResultToBranchSeedResultDtoMapper : MapperBase { -public override partial BranchSeedResultDto Map(BranchSeedResult source); + public override partial BranchSeedResultDto Map(BranchSeedResult source); public override partial void Map(BranchSeedResult source, BranchSeedResultDto destination); @@ -23,7 +22,7 @@ public override partial BranchSeedResultDto Map(BranchSeedResult source); [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class BranchSeedDetailToSeedDetailDtoMapper : MapperBase { -public override partial SeedDetailDto Map(BranchSeedDetail source); + public override partial SeedDetailDto Map(BranchSeedDetail source); public override partial void Map(BranchSeedDetail source, SeedDetailDto destination); diff --git a/api/src/Sozsoft.Platform.Application/ChangeLog/ChangeLogAppService.cs b/api/src/Sozsoft.Platform.Application/ChangeLog/ChangeLogAppService.cs index f573d9ce..bfb6b59a 100644 --- a/api/src/Sozsoft.Platform.Application/ChangeLog/ChangeLogAppService.cs +++ b/api/src/Sozsoft.Platform.Application/ChangeLog/ChangeLogAppService.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; diff --git a/api/src/Sozsoft.Platform.Application/Dashboard/DashboardAppService.cs b/api/src/Sozsoft.Platform.Application/Dashboard/DashboardAppService.cs index dc80050a..a4fa93c3 100644 --- a/api/src/Sozsoft.Platform.Application/Dashboard/DashboardAppService.cs +++ b/api/src/Sozsoft.Platform.Application/Dashboard/DashboardAppService.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; using Sozsoft.Platform.DynamicData; using Sozsoft.Platform.OrganizationUnits; -using Microsoft.AspNetCore.Authorization; namespace Sozsoft.Platform.Dashboard; diff --git a/api/src/Sozsoft.Platform.Application/DataSource/DataSourceAppService.cs b/api/src/Sozsoft.Platform.Application/DataSource/DataSourceAppService.cs index 4af10cd1..e9fd3295 100644 --- a/api/src/Sozsoft.Platform.Application/DataSource/DataSourceAppService.cs +++ b/api/src/Sozsoft.Platform.Application/DataSource/DataSourceAppService.cs @@ -1,6 +1,6 @@ using System; -using Sozsoft.Platform.Entities; using Microsoft.AspNetCore.Authorization; +using Sozsoft.Platform.Entities; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Volo.Abp.Domain.Repositories; diff --git a/api/src/Sozsoft.Platform.Application/DataSource/DataSourceMappers.cs b/api/src/Sozsoft.Platform.Application/DataSource/DataSourceMappers.cs index 835915ac..c209b531 100644 --- a/api/src/Sozsoft.Platform.Application/DataSource/DataSourceMappers.cs +++ b/api/src/Sozsoft.Platform.Application/DataSource/DataSourceMappers.cs @@ -1,5 +1,5 @@ +using Riok.Mapperly.Abstractions; using Sozsoft.Platform.Entities; -using Riok.Mapperly.Abstractions; using Volo.Abp.Mapperly; namespace Sozsoft.Platform.DataSources; @@ -7,7 +7,7 @@ namespace Sozsoft.Platform.DataSources; [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class DataSourceToDataSourceDtoMapper : TwoWayMapperBase { -public override partial DataSourceDto Map(DataSource source); + public override partial DataSourceDto Map(DataSource source); public override partial void Map(DataSource source, DataSourceDto destination); diff --git a/api/src/Sozsoft.Platform.Application/DeveloperKit/CrudEndpointAppService.cs b/api/src/Sozsoft.Platform.Application/DeveloperKit/CrudEndpointAppService.cs index f405b114..1c83d58b 100644 --- a/api/src/Sozsoft.Platform.Application/DeveloperKit/CrudEndpointAppService.cs +++ b/api/src/Sozsoft.Platform.Application/DeveloperKit/CrudEndpointAppService.cs @@ -1,11 +1,11 @@ -using Sozsoft.Platform.Domain.DeveloperKit; -using Sozsoft.Platform.Entities; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using System; +using System; using System.Collections.Generic; using System.Text.Json; using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Sozsoft.Platform.Domain.DeveloperKit; +using Sozsoft.Platform.Entities; using Volo.Abp; using Volo.Abp.Application.Services; using Volo.Abp.Domain.Repositories; diff --git a/api/src/Sozsoft.Platform.Application/DeveloperKit/CrudEndpointGenerateAppService.cs b/api/src/Sozsoft.Platform.Application/DeveloperKit/CrudEndpointGenerateAppService.cs index 1dc74886..a077f294 100644 --- a/api/src/Sozsoft.Platform.Application/DeveloperKit/CrudEndpointGenerateAppService.cs +++ b/api/src/Sozsoft.Platform.Application/DeveloperKit/CrudEndpointGenerateAppService.cs @@ -4,17 +4,17 @@ using System.IO; using System.Linq; using System.Text.Json; using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Logging; +using Sozsoft.Platform; using Sozsoft.Platform.Data.Seeds; using Sozsoft.Platform.DeveloperKit; using Sozsoft.Platform.Entities; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Volo.Abp.Domain.Repositories; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Logging; -using Sozsoft.Platform; namespace Platform.Api.Application; diff --git a/api/src/Sozsoft.Platform.Application/DeveloperKit/CustomComponentAppService.cs b/api/src/Sozsoft.Platform.Application/DeveloperKit/CustomComponentAppService.cs index 865f7fe1..d8d28949 100644 --- a/api/src/Sozsoft.Platform.Application/DeveloperKit/CustomComponentAppService.cs +++ b/api/src/Sozsoft.Platform.Application/DeveloperKit/CustomComponentAppService.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -using System.Linq; using System.IO; +using System.Linq; using System.Text.Encodings.Web; using System.Text.Json; using System.Threading.Tasks; @@ -11,10 +11,10 @@ using Microsoft.Extensions.Logging; using Sozsoft.Platform.Data.Seeds; using Sozsoft.Platform.DeveloperKit; using Sozsoft.Platform.Entities; -using static Sozsoft.Platform.PlatformConsts; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Volo.Abp.Domain.Repositories; +using static Sozsoft.Platform.PlatformConsts; namespace Platform.Api.Application; diff --git a/api/src/Sozsoft.Platform.Application/DeveloperKit/CustomEndpointAppService.cs b/api/src/Sozsoft.Platform.Application/DeveloperKit/CustomEndpointAppService.cs index d6fb262e..dcf441e1 100644 --- a/api/src/Sozsoft.Platform.Application/DeveloperKit/CustomEndpointAppService.cs +++ b/api/src/Sozsoft.Platform.Application/DeveloperKit/CustomEndpointAppService.cs @@ -4,15 +4,14 @@ using System.IO; using System.Linq; using System.Text.Json; using System.Threading.Tasks; -using Sozsoft.Platform.DynamicData; -using Sozsoft.Platform.Entities; -using Sozsoft.Platform.Extensions; -using Sozsoft.Platform.Queries; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; +using Sozsoft.Platform.DynamicData; +using Sozsoft.Platform.Entities; +using Sozsoft.Platform.Extensions; using Volo.Abp.Domain.Repositories; using Volo.Abp.Tracing; using Volo.Abp.Uow; @@ -25,20 +24,17 @@ public class CustomEndpointAppService : PlatformAppService { private readonly IRepository repo; private readonly IHttpContextAccessor httpContextAccessor; - private readonly IDataSourceManager dataSourceManager; private readonly IDynamicDataManager dynamicDataManager; private readonly DefaultValueHelper defaultValueHelper; public CustomEndpointAppService( IRepository repo, IHttpContextAccessor httpContextAccessor, - IDataSourceManager dataSourceManager, IDynamicDataManager dynamicDataManager, DefaultValueHelper defaultValueHelper) { this.repo = repo; this.httpContextAccessor = httpContextAccessor; - this.dataSourceManager = dataSourceManager; this.dynamicDataManager = dynamicDataManager; this.defaultValueHelper = defaultValueHelper; } diff --git a/api/src/Sozsoft.Platform.Application/DeveloperKit/DeveloperKitMappers.cs b/api/src/Sozsoft.Platform.Application/DeveloperKit/DeveloperKitMappers.cs index f2d4fc49..46e6115d 100644 --- a/api/src/Sozsoft.Platform.Application/DeveloperKit/DeveloperKitMappers.cs +++ b/api/src/Sozsoft.Platform.Application/DeveloperKit/DeveloperKitMappers.cs @@ -1,5 +1,5 @@ +using Riok.Mapperly.Abstractions; using Sozsoft.Platform.Entities; -using Riok.Mapperly.Abstractions; using Volo.Abp.Mapperly; namespace Sozsoft.Platform.DeveloperKit; @@ -7,7 +7,7 @@ namespace Sozsoft.Platform.DeveloperKit; [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class CustomComponentToCustomComponentDtoMapper : MapperBase { -public override partial CustomComponentDto Map(CustomComponent source); + public override partial CustomComponentDto Map(CustomComponent source); public override partial void Map(CustomComponent source, CustomComponentDto destination); @@ -23,7 +23,7 @@ public override partial CustomComponentDto Map(CustomComponent source); [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class CreateUpdateCustomComponentDtoToCustomComponentMapper : MapperBase { -public override partial CustomComponent Map(CreateUpdateCustomComponentDto source); + public override partial CustomComponent Map(CreateUpdateCustomComponentDto source); public override partial void Map(CreateUpdateCustomComponentDto source, CustomComponent destination); @@ -39,7 +39,7 @@ public override partial CustomComponent Map(CreateUpdateCustomComponentDto sourc [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class CrudEndpointToCrudEndpointDtoMapper : MapperBase { -public override partial CrudEndpointDto Map(CrudEndpoint source); + public override partial CrudEndpointDto Map(CrudEndpoint source); public override partial void Map(CrudEndpoint source, CrudEndpointDto destination); @@ -55,7 +55,7 @@ public override partial CrudEndpointDto Map(CrudEndpoint source); [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class CreateUpdateCrudEndpointDtoToCrudEndpointMapper : MapperBase { -public override partial CrudEndpoint Map(CreateUpdateCrudEndpointDto source); + public override partial CrudEndpoint Map(CreateUpdateCrudEndpointDto source); public override partial void Map(CreateUpdateCrudEndpointDto source, CrudEndpoint destination); @@ -71,7 +71,7 @@ public override partial CrudEndpoint Map(CreateUpdateCrudEndpointDto source); [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class DynamicServiceToDynamicServiceDtoMapper : MapperBase { -public override partial DynamicServiceDto Map(DynamicService source); + public override partial DynamicServiceDto Map(DynamicService source); public override partial void Map(DynamicService source, DynamicServiceDto destination); diff --git a/api/src/Sozsoft.Platform.Application/DeveloperKit/DynamicServiceAppService.cs b/api/src/Sozsoft.Platform.Application/DeveloperKit/DynamicServiceAppService.cs index 3c8a42f4..11c66cf2 100644 --- a/api/src/Sozsoft.Platform.Application/DeveloperKit/DynamicServiceAppService.cs +++ b/api/src/Sozsoft.Platform.Application/DeveloperKit/DynamicServiceAppService.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Sozsoft.Platform.DynamicServices; -using Sozsoft.Platform.Entities; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; +using Sozsoft.Platform.DynamicServices; +using Sozsoft.Platform.Entities; using Volo.Abp.Application.Dtos; using Volo.Abp.Domain.Repositories; using static Sozsoft.Platform.PlatformConsts; diff --git a/api/src/Sozsoft.Platform.Application/DeveloperKit/DynamicServiceCompiler.cs b/api/src/Sozsoft.Platform.Application/DeveloperKit/DynamicServiceCompiler.cs index a224b0ff..a01cf277 100644 --- a/api/src/Sozsoft.Platform.Application/DeveloperKit/DynamicServiceCompiler.cs +++ b/api/src/Sozsoft.Platform.Application/DeveloperKit/DynamicServiceCompiler.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Concurrent; using System.Collections.Generic; +using System.Diagnostics; using System.IO; using System.Linq; using System.Reflection; @@ -8,10 +10,8 @@ using System.Threading.Tasks; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; using Microsoft.Extensions.Logging; -using Volo.Abp.DependencyInjection; -using System.Diagnostics; -using System.Collections.Concurrent; using Sozsoft.Platform.DeveloperKit; +using Volo.Abp.DependencyInjection; namespace Sozsoft.Platform.DynamicServices; diff --git a/api/src/Sozsoft.Platform.Application/FileManagement/FileManagementAppService.cs b/api/src/Sozsoft.Platform.Application/FileManagement/FileManagementAppService.cs index 97d347ed..31771fc1 100644 --- a/api/src/Sozsoft.Platform.Application/FileManagement/FileManagementAppService.cs +++ b/api/src/Sozsoft.Platform.Application/FileManagement/FileManagementAppService.cs @@ -7,17 +7,16 @@ using System.Linq; using System.Text; using System.Text.Json; using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Logging; using Sozsoft.Platform.BlobStoring; using Sozsoft.Platform.Data.Seeds; using Sozsoft.Platform.Permissions; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; using Volo.Abp; using Volo.Abp.Application.Services; using Volo.Abp.MultiTenancy; -using Microsoft.AspNetCore.Authorization; namespace Sozsoft.Platform.FileManagement; @@ -27,7 +26,6 @@ public class FileManagementAppService : ApplicationService, IFileManagementAppSe private readonly ICurrentTenant _currentTenant; private readonly BlobManager _blobContainer; private readonly IConfiguration _configuration; - private readonly IHostEnvironment _hostEnvironment; private const string FolderMarkerSuffix = ".folder"; private const string IndexFileName = "index.json"; @@ -53,14 +51,12 @@ public class FileManagementAppService : ApplicationService, IFileManagementAppSe public FileManagementAppService( ICurrentTenant currentTenant, BlobManager blobContainer, - IConfiguration configuration, - IHostEnvironment hostEnvironment + IConfiguration configuration ) { _currentTenant = currentTenant; _blobContainer = blobContainer; _configuration = configuration; - _hostEnvironment = hostEnvironment; } private const string HostFolderName = "host"; @@ -1078,12 +1074,6 @@ public class FileManagementAppService : ApplicationService, IFileManagementAppSe return allItems.FirstOrDefault(x => x.Id == id); } - private async Task FindItemByPathAsync(string path, string tenantId) - { - var allItems = await GetAllItemsRecursivelyAsync(tenantId); - return allItems.FirstOrDefault(x => x.Path.Equals(path, StringComparison.OrdinalIgnoreCase)); - } - private async Task> GetAllItemsRecursivelyAsync(string tenantId, string? parentId = null, List? result = null) { result ??= []; @@ -1185,13 +1175,12 @@ public class FileManagementAppService : ApplicationService, IFileManagementAppSe // Split path into parts and build breadcrumb var pathParts = decodedPath.Split('/', StringSplitOptions.RemoveEmptyEntries); - var currentEncodedPath = ""; for (int i = 0; i < pathParts.Length; i++) { // Build the path up to current level var pathUpToCurrent = string.Join("/", pathParts.Take(i + 1)); - currentEncodedPath = EncodePathAsId(pathUpToCurrent); + var currentEncodedPath = EncodePathAsId(pathUpToCurrent); pathItems.Add(new PathItemDto { diff --git a/api/src/Sozsoft.Platform.Application/Forum/ForumAppService.cs b/api/src/Sozsoft.Platform.Application/Forum/ForumAppService.cs index c897e75f..c1ca5a0c 100644 --- a/api/src/Sozsoft.Platform.Application/Forum/ForumAppService.cs +++ b/api/src/Sozsoft.Platform.Application/Forum/ForumAppService.cs @@ -590,7 +590,7 @@ public class ForumAppService : PlatformAppService, IForumAppService await _postRepository.UpdateAsync(post, autoSave: false); var topic = await _topicRepository.GetAsync(post.TopicId); - + // Topic'teki tüm postların toplam like'larını hesapla (optimizasyon) var queryable = await _postRepository.GetQueryableAsync(); var totalLikes = await AsyncExecuter.SumAsync( diff --git a/api/src/Sozsoft.Platform.Application/Forum/ForumMappers.cs b/api/src/Sozsoft.Platform.Application/Forum/ForumMappers.cs index 56b205ad..4f2ecc98 100644 --- a/api/src/Sozsoft.Platform.Application/Forum/ForumMappers.cs +++ b/api/src/Sozsoft.Platform.Application/Forum/ForumMappers.cs @@ -1,5 +1,5 @@ +using Riok.Mapperly.Abstractions; using Sozsoft.Platform.Forum; -using Riok.Mapperly.Abstractions; using Volo.Abp.Mapperly; namespace Sozsoft.Platform; @@ -7,7 +7,7 @@ namespace Sozsoft.Platform; [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class ForumCategoryToForumCategoryDtoMapper : TwoWayMapperBase { -public override partial ForumCategoryDto Map(ForumCategory source); + public override partial ForumCategoryDto Map(ForumCategory source); public override partial void Map(ForumCategory source, ForumCategoryDto destination); @@ -35,7 +35,7 @@ public override partial ForumCategoryDto Map(ForumCategory source); [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class ForumPostToForumPostDtoMapper : TwoWayMapperBase { -public override partial ForumPostDto Map(ForumPost source); + public override partial ForumPostDto Map(ForumPost source); public override partial void Map(ForumPost source, ForumPostDto destination); @@ -63,7 +63,7 @@ public override partial ForumPostDto Map(ForumPost source); [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class ForumTopicToForumTopicDtoMapper : TwoWayMapperBase { -public override partial ForumTopicDto Map(ForumTopic source); + public override partial ForumTopicDto Map(ForumTopic source); public override partial void Map(ForumTopic source, ForumTopicDto destination); diff --git a/api/src/Sozsoft.Platform.Application/GlobalSearch/GlobalSearchAppService.cs b/api/src/Sozsoft.Platform.Application/GlobalSearch/GlobalSearchAppService.cs index ab8eae5c..378eb1a6 100644 --- a/api/src/Sozsoft.Platform.Application/GlobalSearch/GlobalSearchAppService.cs +++ b/api/src/Sozsoft.Platform.Application/GlobalSearch/GlobalSearchAppService.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Sozsoft.Platform.Entities; using Microsoft.AspNetCore.Authorization; using Microsoft.EntityFrameworkCore; +using Sozsoft.Platform.Entities; using Volo.Abp; using Volo.Abp.Application.Dtos; using Volo.Abp.Domain.Repositories; diff --git a/api/src/Sozsoft.Platform.Application/GlobalSearch/GlobalSearchMappers.cs b/api/src/Sozsoft.Platform.Application/GlobalSearch/GlobalSearchMappers.cs index 49ed5aca..ab046c9d 100644 --- a/api/src/Sozsoft.Platform.Application/GlobalSearch/GlobalSearchMappers.cs +++ b/api/src/Sozsoft.Platform.Application/GlobalSearch/GlobalSearchMappers.cs @@ -1,4 +1,4 @@ -using Riok.Mapperly.Abstractions; +using Riok.Mapperly.Abstractions; using Sozsoft.Platform.Entities; using Volo.Abp.Mapperly; diff --git a/api/src/Sozsoft.Platform.Application/Hr/HrMappers.cs b/api/src/Sozsoft.Platform.Application/Hr/HrMappers.cs index 892fc094..dc6deb8c 100644 --- a/api/src/Sozsoft.Platform.Application/Hr/HrMappers.cs +++ b/api/src/Sozsoft.Platform.Application/Hr/HrMappers.cs @@ -1,6 +1,6 @@ +using Riok.Mapperly.Abstractions; using Sozsoft.Platform.Entities; using Sozsoft.Platform.Hr; -using Riok.Mapperly.Abstractions; using Volo.Abp.Mapperly; namespace Sozsoft.Platform.Intranet; @@ -8,7 +8,7 @@ namespace Sozsoft.Platform.Intranet; [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class DepartmentToDepartmentDtoMapper : MapperBase { -public override partial DepartmentDto Map(Department source); + public override partial DepartmentDto Map(Department source); public override partial void Map(Department source, DepartmentDto destination); @@ -24,7 +24,7 @@ public override partial DepartmentDto Map(Department source); [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class JobPositionToJobPositionDtoMapper : MapperBase { -public override partial JobPositionDto Map(JobPosition source); + public override partial JobPositionDto Map(JobPosition source); public override partial void Map(JobPosition source, JobPositionDto destination); diff --git a/api/src/Sozsoft.Platform.Application/Identity/AvatarProvider.cs b/api/src/Sozsoft.Platform.Application/Identity/AvatarProvider.cs index cb92f006..96b5e73b 100644 --- a/api/src/Sozsoft.Platform.Application/Identity/AvatarProvider.cs +++ b/api/src/Sozsoft.Platform.Application/Identity/AvatarProvider.cs @@ -1,4 +1,4 @@ -using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Configuration; namespace Sozsoft.Platform.Identity; diff --git a/api/src/Sozsoft.Platform.Application/Identity/IdentityMappers.cs b/api/src/Sozsoft.Platform.Application/Identity/IdentityMappers.cs index ba89a3e7..c195435f 100644 --- a/api/src/Sozsoft.Platform.Application/Identity/IdentityMappers.cs +++ b/api/src/Sozsoft.Platform.Application/Identity/IdentityMappers.cs @@ -1,11 +1,11 @@ -using Sozsoft.Platform.Identity.Dto; +using Riok.Mapperly.Abstractions; using Sozsoft.Platform.Extensions; +using Sozsoft.Platform.Identity.Dto; using Sozsoft.Platform.OrganizationUnits; using Sozsoft.Platform.Tenants; using Volo.Abp.Identity; -using Volo.Abp.TenantManagement; -using Riok.Mapperly.Abstractions; using Volo.Abp.Mapperly; +using Volo.Abp.TenantManagement; namespace Sozsoft.Platform.Identity; diff --git a/api/src/Sozsoft.Platform.Application/Identity/PlatformAccountAppService.cs b/api/src/Sozsoft.Platform.Application/Identity/PlatformAccountAppService.cs index 122d5680..88183b7e 100644 --- a/api/src/Sozsoft.Platform.Application/Identity/PlatformAccountAppService.cs +++ b/api/src/Sozsoft.Platform.Application/Identity/PlatformAccountAppService.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using System.Text; using System.Threading.Tasks; -using Sozsoft.Sender.Mail; -using Sozsoft.Platform.Data.Seeds; -using Sozsoft.Platform.Extensions; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Options; using Microsoft.IdentityModel.Tokens; +using Sozsoft.Platform.Data.Seeds; +using Sozsoft.Platform.Extensions; +using Sozsoft.Sender.Mail; using Volo.Abp.Account; using Volo.Abp.Account.Emailing; using Volo.Abp.DependencyInjection; diff --git a/api/src/Sozsoft.Platform.Application/Identity/PlatformIdentityAppService.cs b/api/src/Sozsoft.Platform.Application/Identity/PlatformIdentityAppService.cs index c78c1cfe..b865ed15 100644 --- a/api/src/Sozsoft.Platform.Application/Identity/PlatformIdentityAppService.cs +++ b/api/src/Sozsoft.Platform.Application/Identity/PlatformIdentityAppService.cs @@ -3,15 +3,15 @@ using System.Collections.Generic; using System.Linq; using System.Security.Claims; using System.Threading.Tasks; -using Sozsoft.Platform.BlobStoring; -using Sozsoft.Platform.Entities; -using Sozsoft.Platform.Extensions; -using Sozsoft.Platform.Identity.Dto; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Configuration; using OpenIddict.Abstractions; +using Sozsoft.Platform.BlobStoring; +using Sozsoft.Platform.Entities; +using Sozsoft.Platform.Extensions; +using Sozsoft.Platform.Identity.Dto; using Volo.Abp.Application.Services; using Volo.Abp.Domain.Repositories; using Volo.Abp.Guids; diff --git a/api/src/Sozsoft.Platform.Application/Identity/PlatformProfileAppService.cs b/api/src/Sozsoft.Platform.Application/Identity/PlatformProfileAppService.cs index 4844c149..5d5ccda5 100644 --- a/api/src/Sozsoft.Platform.Application/Identity/PlatformProfileAppService.cs +++ b/api/src/Sozsoft.Platform.Application/Identity/PlatformProfileAppService.cs @@ -1,11 +1,11 @@ using System; using System.Threading.Tasks; -using Sozsoft.Platform.BlobStoring; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Options; +using Sozsoft.Platform.BlobStoring; using Sozsoft.Platform.Extensions; using Volo.Abp; using Volo.Abp.Account; diff --git a/api/src/Sozsoft.Platform.Application/Identity/UserInfoViewModelMappingExtensions.cs b/api/src/Sozsoft.Platform.Application/Identity/UserInfoViewModelMappingExtensions.cs index c71e8943..683e6421 100644 --- a/api/src/Sozsoft.Platform.Application/Identity/UserInfoViewModelMappingExtensions.cs +++ b/api/src/Sozsoft.Platform.Application/Identity/UserInfoViewModelMappingExtensions.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using Sozsoft.Platform.Entities; using Sozsoft.Platform.Extensions; diff --git a/api/src/Sozsoft.Platform.Application/Intranet/IntranetAppService.cs b/api/src/Sozsoft.Platform.Application/Intranet/IntranetAppService.cs index 1f699298..03322396 100644 --- a/api/src/Sozsoft.Platform.Application/Intranet/IntranetAppService.cs +++ b/api/src/Sozsoft.Platform.Application/Intranet/IntranetAppService.cs @@ -4,21 +4,21 @@ using System.IO; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; using Sozsoft.Platform.BlobStoring; using Sozsoft.Platform.Entities; +using Sozsoft.Platform.Extensions; using Sozsoft.Platform.FileManagement; using Sozsoft.Platform.Identity; using Sozsoft.Platform.Identity.Dto; -using Sozsoft.Platform.Extensions; using Volo.Abp.Domain.Repositories; using Volo.Abp.Identity; using Volo.Abp.MultiTenancy; using Volo.Abp.Uow; -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Identity; namespace Sozsoft.Platform.Intranet; @@ -28,11 +28,9 @@ public class IntranetAppService : PlatformAppService, IIntranetAppService private const int DashboardItemLimit = 50; private Task<(Dictionary DepartmentDict, Dictionary JobPositionDict)>? _userLookupDictionariesTask; private readonly ICurrentTenant _currentTenant; - private readonly BlobManager _blobContainer; private readonly IConfiguration _configuration; private readonly ILookupNormalizer _lookupNormalizer; private readonly IRepository _eventRepository; - private readonly IIdentityUserAppService _identityUserAppService; private readonly IIdentityUserRepository _identityUserRepository; private readonly IRepository _identityUserEntityRepository; private readonly IRepository _departmentRepository; @@ -53,12 +51,10 @@ public class IntranetAppService : PlatformAppService, IIntranetAppService public IntranetAppService( ICurrentTenant currentTenant, - BlobManager blobContainer, IConfiguration configuration, ILookupNormalizer lookupNormalizer, - + IRepository eventRepository, - IIdentityUserAppService identityUserAppService, IIdentityUserRepository identityUserRepository, IRepository identityUserEntityRepository, IRepository departmentRepository, @@ -79,11 +75,9 @@ public class IntranetAppService : PlatformAppService, IIntranetAppService ) { _currentTenant = currentTenant; - _blobContainer = blobContainer; _configuration = configuration; _lookupNormalizer = lookupNormalizer; _eventRepository = eventRepository; - _identityUserAppService = identityUserAppService; _identityUserRepository = identityUserRepository; _identityUserEntityRepository = identityUserEntityRepository; _departmentRepository = departmentRepository; @@ -172,7 +166,7 @@ public class IntranetAppService : PlatformAppService, IIntranetAppService { var queryable = await _eventRepository .WithDetailsAsync(e => e.Category, e => e.Type); - + var events = await AsyncExecuter.ToListAsync( queryable .Where(e => e.isPublished) diff --git a/api/src/Sozsoft.Platform.Application/Intranet/IntranetMappers.cs b/api/src/Sozsoft.Platform.Application/Intranet/IntranetMappers.cs index 45538aa3..a9aece09 100644 --- a/api/src/Sozsoft.Platform.Application/Intranet/IntranetMappers.cs +++ b/api/src/Sozsoft.Platform.Application/Intranet/IntranetMappers.cs @@ -1,5 +1,5 @@ +using Riok.Mapperly.Abstractions; using Sozsoft.Platform.Entities; -using Riok.Mapperly.Abstractions; using Volo.Abp.Mapperly; namespace Sozsoft.Platform.Intranet; diff --git a/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormCustomizationAppService.cs b/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormCustomizationAppService.cs index 19fb169a..f9506338 100644 --- a/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormCustomizationAppService.cs +++ b/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormCustomizationAppService.cs @@ -2,10 +2,10 @@ using System.Linq; using System.Linq.Dynamic.Core; using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; using Sozsoft.Platform.Entities; using Sozsoft.Platform.Enums; using Sozsoft.Platform.ListForms.Customization; -using Microsoft.AspNetCore.Authorization; using Volo.Abp.Application.Services; using Volo.Abp.Domain.Repositories; using static Sozsoft.Platform.PlatformConsts; diff --git a/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormFieldsAppService.cs b/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormFieldsAppService.cs index 895cbcb7..b84c7767 100644 --- a/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormFieldsAppService.cs +++ b/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormFieldsAppService.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Text.Json; using System.Threading.Tasks; -using Sozsoft.Platform.Entities; using Microsoft.AspNetCore.Authorization; using Microsoft.EntityFrameworkCore; +using Sozsoft.Platform.Entities; using Volo.Abp.Application.Services; using Volo.Abp.Domain.Repositories; using static Sozsoft.Platform.PlatformConsts; @@ -98,13 +98,13 @@ public class ListFormFieldsAppService : CrudAppService< RoleId = input.RoleId, SourceDbType = input.SourceDbType, }); - + var listOrderNo = await query.MaxAsync(a => a.ListOrderNo) ?? 0; input.IsActive = true; input.Visible = true; input.ListOrderNo = listOrderNo + 1; - var listForm = await RepoListForm.FirstOrDefaultAsync(a=> a.ListFormCode == input.ListFormCode); + var listForm = await RepoListForm.FirstOrDefaultAsync(a => a.ListFormCode == input.ListFormCode); if (listForm != null) { var listFormPermissions = JsonSerializer.Deserialize(listForm.PermissionJson); diff --git a/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormJsonRowAppService.cs b/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormJsonRowAppService.cs index 3cbf0f26..0d2e0313 100644 --- a/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormJsonRowAppService.cs +++ b/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormJsonRowAppService.cs @@ -3,13 +3,12 @@ using System.Collections.Generic; using System.Linq; using System.Text.Json; using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; using Sozsoft.Platform.Entities; using Sozsoft.Platform.ListForms.Select; using Sozsoft.Platform.Queries; -using Microsoft.AspNetCore.Authorization; using Volo.Abp; using Volo.Abp.Domain.Repositories; -using Volo.Abp.Users; using static Sozsoft.Platform.PlatformConsts; namespace Sozsoft.Platform.ListForms.Administration; @@ -21,18 +20,12 @@ namespace Sozsoft.Platform.ListForms.Administration; public class ListFormJsonRowAppService : PlatformAppService { private readonly IRepository repository; - private readonly ICurrentUser currentUser; - private readonly string userId; public ListFormJsonRowAppService( - IRepository _repository, - ICurrentUser _currentUser + IRepository _repository ) : base() { repository = _repository; - currentUser = _currentUser; - userId = currentUser.Name; - } public async Task GetAllAsync(Guid id, string field) diff --git a/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormQueryPreviewAppService.cs b/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormQueryPreviewAppService.cs index bc748fb9..1d90ea83 100644 --- a/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormQueryPreviewAppService.cs +++ b/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormQueryPreviewAppService.cs @@ -1,11 +1,10 @@ using System.Data; using System.Linq; using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; using Sozsoft.Platform.DynamicData; using Sozsoft.Platform.Enums; -using Sozsoft.Platform.OrganizationUnits; using Sozsoft.Platform.Queries; -using Microsoft.AspNetCore.Authorization; using Volo.Abp; using Volo.Abp.Uow; using static Sozsoft.Platform.PlatformConsts; @@ -20,9 +19,6 @@ public class ListFormQueryPreviewAppService : PlatformAppService private readonly IListFormManager listFormManager; private readonly IListFormFieldManager listFormFieldManager; private readonly IListFormCustomizationManager listFormCustomizationManager; - private readonly IDefaultValueManager defaultValueManager; - private readonly IDataSourceManager dataSourceManager; - private readonly IPlatformOuRepository ouRepository; private readonly IQueryManager qManager; private readonly IDynamicDataManager dynamicDataManager; @@ -32,9 +28,6 @@ public class ListFormQueryPreviewAppService : PlatformAppService IListFormManager listFormManager, IListFormFieldManager listFormFieldManager, IListFormCustomizationManager listFormCustomizationManager, - IDefaultValueManager defaultValueManager, - IDataSourceManager dataSourceManager, - IPlatformOuRepository ouRepository, IQueryManager qManager, IDynamicDataManager dynamicDataManager ) @@ -44,9 +37,6 @@ public class ListFormQueryPreviewAppService : PlatformAppService this.listFormManager = listFormManager; this.listFormFieldManager = listFormFieldManager; this.listFormCustomizationManager = listFormCustomizationManager; - this.defaultValueManager = defaultValueManager; - this.dataSourceManager = dataSourceManager; - this.ouRepository = ouRepository; this.qManager = qManager; this.dynamicDataManager = dynamicDataManager; } @@ -64,7 +54,7 @@ public class ListFormQueryPreviewAppService : PlatformAppService //kullaniciya ait ListFormField verilerini al var fields = await listFormFieldManager.GetUserListFormFields(listFormCode); - + // Performans: Filtrelemeyi Where ile yap, tek seferde ToList() çağır var readableFields = fields.Where(a => a.CanRead).ToList(); diff --git a/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormsAppService.cs b/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormsAppService.cs index be59a99a..d1a606a3 100644 --- a/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormsAppService.cs +++ b/api/src/Sozsoft.Platform.Application/ListForms/Administration/ListFormsAppService.cs @@ -1,9 +1,9 @@ using System; using System.Text.Json; using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; using Sozsoft.Platform.Entities; using Sozsoft.Platform.Enums; -using Microsoft.AspNetCore.Authorization; using Volo.Abp; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; diff --git a/api/src/Sozsoft.Platform.Application/ListForms/ListFormCustomizationAppService.cs b/api/src/Sozsoft.Platform.Application/ListForms/ListFormCustomizationAppService.cs index 1bebead3..6fd9dfbd 100644 --- a/api/src/Sozsoft.Platform.Application/ListForms/ListFormCustomizationAppService.cs +++ b/api/src/Sozsoft.Platform.Application/ListForms/ListFormCustomizationAppService.cs @@ -2,11 +2,11 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; using Sozsoft.Platform.Entities; using Sozsoft.Platform.Enums; using Sozsoft.Platform.ListForms.Customization; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; using Volo.Abp; using Volo.Abp.Domain.Entities; using Volo.Abp.Domain.Repositories; @@ -128,7 +128,7 @@ public class ListFormCustomizationAppService : PlatformAppService a.UserId == CurrentUser.UserName && a.RoleId == null) ); - + if (item == null) { throw new EntityNotFoundException("Item not found"); diff --git a/api/src/Sozsoft.Platform.Application/ListForms/ListFormDataAppService.cs b/api/src/Sozsoft.Platform.Application/ListForms/ListFormDataAppService.cs index 106a5ffc..f4b585de 100644 --- a/api/src/Sozsoft.Platform.Application/ListForms/ListFormDataAppService.cs +++ b/api/src/Sozsoft.Platform.Application/ListForms/ListFormDataAppService.cs @@ -1,13 +1,13 @@ using System; +using System.Collections.Generic; using System.Linq; +using System.Text.Json; using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; using Sozsoft.Platform.Enums; using Sozsoft.Platform.Localization; using Sozsoft.Platform.Queries; -using Microsoft.AspNetCore.Http; using static Sozsoft.Platform.PlatformConsts; -using System.Collections.Generic; -using System.Text.Json; namespace Sozsoft.Platform.ListForms.Select; @@ -43,7 +43,7 @@ public class ListFormDataAppService : PlatformAppService var queryParameters = httpContext.Request.Query.ToDictionary(x => x.Key, x => x.Value); return await qManager.GenerateAndRunQueryAsync(input.ListFormCode, OperationEnum.Insert, input.Data, queryParameters: queryParameters); } - + public async Task PostDuplicateAsync(DataRequestDto input) { // Izin logic process diff --git a/api/src/Sozsoft.Platform.Application/ListForms/ListFormDynamicApiAppService.cs b/api/src/Sozsoft.Platform.Application/ListForms/ListFormDynamicApiAppService.cs index 1d17da81..79b6056e 100644 --- a/api/src/Sozsoft.Platform.Application/ListForms/ListFormDynamicApiAppService.cs +++ b/api/src/Sozsoft.Platform.Application/ListForms/ListFormDynamicApiAppService.cs @@ -3,21 +3,20 @@ using System.Collections.Generic; using System.IO; using System.Text.RegularExpressions; using System.Threading.Tasks; -using Sozsoft.Platform.Extensions; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Identity; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Options; +using Sozsoft.Platform.BlobStoring; +using Sozsoft.Platform.Entities; +using Sozsoft.Platform.Extensions; +using Sozsoft.Platform.Identity; using Volo.Abp; using Volo.Abp.Domain.Entities; +using Volo.Abp.Domain.Repositories; using Volo.Abp.Identity; using Volo.Abp.TenantManagement; using IdentityUser = Volo.Abp.Identity.IdentityUser; -using Sozsoft.Platform.BlobStoring; -using Sozsoft.Platform.Identity; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; -using Sozsoft.Platform.Entities; -using Volo.Abp.Domain.Repositories; namespace Sozsoft.Platform.ListForms.DynamicApi; @@ -30,35 +29,29 @@ public class ListFormDynamicApiAppService : PlatformAppService, IListFormDynamic private readonly ITenantRepository tenantRepository; private readonly ITenantManager tenantManager; - private readonly IIdentityUserAppService identityUserAppService; private readonly IIdentityRoleAppService identityRoleAppService; private readonly IdentityUserManager userManager; private readonly BlobManager blobCdnManager; private readonly IConfiguration configuration; - private readonly IHostEnvironment hostEnvironment; private readonly IOptions identityOptions; private readonly IRepository orderRepository; public ListFormDynamicApiAppService( ITenantRepository tenantRepository, ITenantManager tenantManager, - IIdentityUserAppService identityUserAppService, IIdentityRoleAppService identityRoleAppService, IdentityUserManager userManager, BlobManager blobCdnManager, IConfiguration configuration, - IHostEnvironment hostEnvironment, IOptions identityOptions, IRepository orderRepository) { this.tenantRepository = tenantRepository; this.tenantManager = tenantManager; - this.identityUserAppService = identityUserAppService; this.identityRoleAppService = identityRoleAppService; this.userManager = userManager; this.blobCdnManager = blobCdnManager; this.configuration = configuration; - this.hostEnvironment = hostEnvironment; this.identityOptions = identityOptions; this.orderRepository = orderRepository; } diff --git a/api/src/Sozsoft.Platform.Application/ListForms/ListFormImportAppService.cs b/api/src/Sozsoft.Platform.Application/ListForms/ListFormImportAppService.cs index c393dbe4..a93aa86f 100644 --- a/api/src/Sozsoft.Platform.Application/ListForms/ListFormImportAppService.cs +++ b/api/src/Sozsoft.Platform.Application/ListForms/ListFormImportAppService.cs @@ -4,13 +4,13 @@ using System.IO; using System.Linq; using System.Text.Json; using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; using Sozsoft.Platform.BlobStoring; using Sozsoft.Platform.Entities; using Sozsoft.Platform.Enums; using Sozsoft.Platform.Queries; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Logging; using Volo.Abp; using Volo.Abp.Content; using Volo.Abp.Domain.Entities; @@ -203,7 +203,7 @@ public class ListFormImportAppService : PlatformAppService, IImportAppService execute.ExecRows = i + 1; execute.ValidRows = validCount; execute.ErrorRows = errorCount; - + await _importSessionExecuteRepository.UpdateAsync(execute, autoSave: false); lastUpdateIndex = i + 1; } diff --git a/api/src/Sozsoft.Platform.Application/ListForms/ListFormMappers.cs b/api/src/Sozsoft.Platform.Application/ListForms/ListFormMappers.cs index bdd7fbe5..0a93c1aa 100644 --- a/api/src/Sozsoft.Platform.Application/ListForms/ListFormMappers.cs +++ b/api/src/Sozsoft.Platform.Application/ListForms/ListFormMappers.cs @@ -1,8 +1,8 @@ +using Riok.Mapperly.Abstractions; using Sozsoft.Platform.Entities; using Sozsoft.Platform.ListForms.Customization; using Sozsoft.Platform.ListForms.Select; using Sozsoft.Platform.Queries; -using Riok.Mapperly.Abstractions; using Volo.Abp.Mapperly; namespace Sozsoft.Platform.ListForms; diff --git a/api/src/Sozsoft.Platform.Application/ListForms/ListFormSelectAppService.cs b/api/src/Sozsoft.Platform.Application/ListForms/ListFormSelectAppService.cs index f02b9240..3f0eac2a 100644 --- a/api/src/Sozsoft.Platform.Application/ListForms/ListFormSelectAppService.cs +++ b/api/src/Sozsoft.Platform.Application/ListForms/ListFormSelectAppService.cs @@ -6,11 +6,11 @@ using System.Linq; using System.Linq.Dynamic.Core; using System.Text.Json; using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; using Sozsoft.Platform.DynamicData; using Sozsoft.Platform.Entities; using Sozsoft.Platform.Queries; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; using Volo.Abp.Domain.Repositories; using Volo.Abp.Users; @@ -167,7 +167,7 @@ public class ListFormSelectAppService : PlatformAppService, IListFormSelectAppSe { var data = await dynamicDataRepository.QueryAsync(selectQueryManager.GroupQuery, connectionString, param); var dataQueryable = data.AsQueryable(); - + var groups = new List<(string, int, List)>(selectQueryManager.GroupTuples.Count); for (int i = 0; i < selectQueryManager.GroupTuples.Count; i++) @@ -327,7 +327,7 @@ public class ListFormSelectAppService : PlatformAppService, IListFormSelectAppSe { var extraFilterList = JsonSerializer.Deserialize(listForm.ExtraFilterJson) ?? []; var activeFilters = extraFilterList.Where(f => !string.IsNullOrWhiteSpace(f.SqlQuery)).ToList(); - + if (activeFilters.Count > 0) { // DataSource connection'ı bir kez al (performans) diff --git a/api/src/Sozsoft.Platform.Application/ListForms/ListFormWizardAppService.cs b/api/src/Sozsoft.Platform.Application/ListForms/ListFormWizardAppService.cs index 0a28c09e..9c0b8179 100644 --- a/api/src/Sozsoft.Platform.Application/ListForms/ListFormWizardAppService.cs +++ b/api/src/Sozsoft.Platform.Application/ListForms/ListFormWizardAppService.cs @@ -7,8 +7,15 @@ using System.Text; using System.Text.Json; using System.Text.RegularExpressions; using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Logging; +using Sozsoft.Languages; using Sozsoft.Languages.Entities; using Sozsoft.Languages.Languages; +using Sozsoft.Platform.Data.Seeds; +using Sozsoft.Platform.DynamicData; using Sozsoft.Platform.Entities; using Sozsoft.Platform.Enums; using Volo.Abp; @@ -17,14 +24,6 @@ using Volo.Abp.Domain.Repositories; using Volo.Abp.MultiTenancy; using Volo.Abp.PermissionManagement; using Volo.Abp.Uow; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; -using Sozsoft.Languages; -using Sozsoft.Platform.Data.Seeds; -using Sozsoft.Platform.DynamicData; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Logging; using static Sozsoft.Platform.PlatformConsts; namespace Sozsoft.Platform.ListForms; @@ -49,7 +48,6 @@ public class ListFormWizardAppService( IRepository repoPermGroup, IRepository repoMenu, IPermissionGrantRepository permissionGrantRepository, - IHostEnvironment hostEnvironment, IConfiguration configuration, LanguageTextAppService languageTextAppService, IDynamicDataManager dynamicDataManager, @@ -66,7 +64,6 @@ public class ListFormWizardAppService( private readonly IRepository repoPermGroup = repoPermGroup; private readonly IRepository repoMenu = repoMenu; private readonly IPermissionGrantRepository permissionGrantRepository = permissionGrantRepository; - private readonly IHostEnvironment _hostEnvironment = hostEnvironment; private readonly IConfiguration _configuration = configuration; private readonly LanguageTextAppService _languageTextAppService = languageTextAppService; private readonly IDynamicDataManager _dynamicDataManager = dynamicDataManager; diff --git a/api/src/Sozsoft.Platform.Application/ListForms/ListFormWorkflowAppService.cs b/api/src/Sozsoft.Platform.Application/ListForms/ListFormWorkflowAppService.cs index 6c86e7cc..e39e4c51 100644 --- a/api/src/Sozsoft.Platform.Application/ListForms/ListFormWorkflowAppService.cs +++ b/api/src/Sozsoft.Platform.Application/ListForms/ListFormWorkflowAppService.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Globalization; using System.Linq; diff --git a/api/src/Sozsoft.Platform.Application/Menu/MenuAppService.cs b/api/src/Sozsoft.Platform.Application/Menu/MenuAppService.cs index ed7e7b3a..07b5a893 100644 --- a/api/src/Sozsoft.Platform.Application/Menu/MenuAppService.cs +++ b/api/src/Sozsoft.Platform.Application/Menu/MenuAppService.cs @@ -3,20 +3,20 @@ using System.Collections.Generic; using System.Linq; using System.Linq.Dynamic.Core; using System.Threading.Tasks; -using Sozsoft.Languages.Entities; -using Sozsoft.Platform.Entities; -using Sozsoft.Platform.Extensions; using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Logging; +using Sozsoft.Languages; +using Sozsoft.Languages.Entities; +using Sozsoft.Languages.Languages; +using Sozsoft.Platform.Entities; +using Sozsoft.Platform.Extensions; +using Sozsoft.Platform.ListForms; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Volo.Abp.Domain.Repositories; using Volo.Abp.PermissionManagement; using Volo.Abp.TenantManagement; using static Sozsoft.Platform.Data.Seeds.SeedConsts; -using Sozsoft.Languages; -using Sozsoft.Languages.Languages; -using Sozsoft.Platform.ListForms; namespace Sozsoft.Platform.Menus; @@ -411,7 +411,7 @@ public class MenuAppService : CrudAppService< // Clear Redis Cache await _languageTextAppService.ClearRedisCacheAsync(); - + return await base.CreateAsync(input); } diff --git a/api/src/Sozsoft.Platform.Application/Menu/MenuMappers.cs b/api/src/Sozsoft.Platform.Application/Menu/MenuMappers.cs index 905e5849..ca057c43 100644 --- a/api/src/Sozsoft.Platform.Application/Menu/MenuMappers.cs +++ b/api/src/Sozsoft.Platform.Application/Menu/MenuMappers.cs @@ -1,5 +1,5 @@ +using Riok.Mapperly.Abstractions; using Sozsoft.Platform.Entities; -using Riok.Mapperly.Abstractions; using Volo.Abp.Mapperly; namespace Sozsoft.Platform.Menus; @@ -7,7 +7,7 @@ namespace Sozsoft.Platform.Menus; [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class MenuToMenuDtoMapper : TwoWayMapperBase { -public override partial MenuDto Map(Menu source); + public override partial MenuDto Map(Menu source); public override partial void Map(Menu source, MenuDto destination); diff --git a/api/src/Sozsoft.Platform.Application/Messenger/MessengerAppService.cs b/api/src/Sozsoft.Platform.Application/Messenger/MessengerAppService.cs index a7a050f9..a5bd3b56 100644 --- a/api/src/Sozsoft.Platform.Application/Messenger/MessengerAppService.cs +++ b/api/src/Sozsoft.Platform.Application/Messenger/MessengerAppService.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using System; using System.Collections.Generic; @@ -7,12 +7,12 @@ using System.Linq; using System.Linq.Dynamic.Core; using System.Text.Json; using System.Threading.Tasks; -using Sozsoft.Platform.BlobStoring; -using Sozsoft.Platform.Entities; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Configuration; +using Sozsoft.Platform.BlobStoring; +using Sozsoft.Platform.Entities; using Volo.Abp; using Volo.Abp.Application.Services; using Volo.Abp.Domain.Repositories; diff --git a/api/src/Sozsoft.Platform.Application/Messenger/MessengerHub.cs b/api/src/Sozsoft.Platform.Application/Messenger/MessengerHub.cs index 504d794a..bcb1b032 100644 --- a/api/src/Sozsoft.Platform.Application/Messenger/MessengerHub.cs +++ b/api/src/Sozsoft.Platform.Application/Messenger/MessengerHub.cs @@ -1,7 +1,6 @@ -#nullable enable +#nullable enable using System; -using System.Security.Claims; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; diff --git a/api/src/Sozsoft.Platform.Application/Messenger/MessengerPresenceStore.cs b/api/src/Sozsoft.Platform.Application/Messenger/MessengerPresenceStore.cs index a5cbf4e0..1b815cb4 100644 --- a/api/src/Sozsoft.Platform.Application/Messenger/MessengerPresenceStore.cs +++ b/api/src/Sozsoft.Platform.Application/Messenger/MessengerPresenceStore.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using System; using System.Collections.Generic; diff --git a/api/src/Sozsoft.Platform.Application/Note/NoteAppService.cs b/api/src/Sozsoft.Platform.Application/Note/NoteAppService.cs index 28fc8b48..9740289e 100644 --- a/api/src/Sozsoft.Platform.Application/Note/NoteAppService.cs +++ b/api/src/Sozsoft.Platform.Application/Note/NoteAppService.cs @@ -5,10 +5,10 @@ using System.Linq; using System.Linq.Dynamic.Core; using System.Text.Json; using System.Threading.Tasks; -using Sozsoft.Platform.BlobStoring; -using Sozsoft.Platform.Entities; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Sozsoft.Platform.BlobStoring; +using Sozsoft.Platform.Entities; using Volo.Abp; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; @@ -61,7 +61,7 @@ public class NoteAppService : CrudAppService< var notes = await AsyncExecuter.ToListAsync( queryable.Where(a => a.FilesJson.Contains(savedFileName)) ); - + var fileDto = notes .SelectMany(a => JsonSerializer.Deserialize>(a.FilesJson ?? "[]")) .FirstOrDefault(f => f.SavedFileName == savedFileName); @@ -98,7 +98,7 @@ public class NoteAppService : CrudAppService< // 3️⃣ Toplam sayı (sayfalama öncesi) var totalCount = await AsyncExecuter.CountAsync(query); - + // 4️⃣ Paging var activities = await AsyncExecuter.ToListAsync( query.Skip(input.SkipCount).Take(input.MaxResultCount) @@ -109,7 +109,7 @@ public class NoteAppService : CrudAppService< .Select(a => a.CreatorId!.Value) .Distinct() .ToList(); - + var userDict = new Dictionary(); if (userIds.Any()) { @@ -176,32 +176,6 @@ public class NoteAppService : CrudAppService< public override async Task DeleteAsync(Guid id) { - // Önce entity'i alıyoruz - var note = await Repository.GetAsync(id); - - // if (!string.IsNullOrEmpty(note.FilesJson)) - // { - // try - // { - // // FilesJson içindeki dosya bilgilerini deserialize ediyoruz - // var files = JsonSerializer.Deserialize>(note.FilesJson); - - // if (files != null) - // { - // foreach (var file in files) - // { - // // Blob storage'dan sil - // await _noteBlobContainer.DeleteAsync(file.SavedFileName, cancellationToken: default); - // } - // } - // } - // catch (Exception ex) - // { - // // Opsiyonel: silme sırasında hata loglayabilirsin - // Logger.LogWarning(ex, "Blob dosyaları silinirken hata oluştu."); - // } - // } - // Sonra veritabanındaki kaydı sil await base.DeleteAsync(id); } diff --git a/api/src/Sozsoft.Platform.Application/Note/NoteMappers.cs b/api/src/Sozsoft.Platform.Application/Note/NoteMappers.cs index 4bba5085..e327be7b 100644 --- a/api/src/Sozsoft.Platform.Application/Note/NoteMappers.cs +++ b/api/src/Sozsoft.Platform.Application/Note/NoteMappers.cs @@ -1,5 +1,5 @@ +using Riok.Mapperly.Abstractions; using Sozsoft.Platform.Entities; -using Riok.Mapperly.Abstractions; using Volo.Abp.Mapperly; namespace Sozsoft.Platform.Notes; @@ -7,7 +7,7 @@ namespace Sozsoft.Platform.Notes; [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class NoteToNoteDtoMapper : MapperBase { -[MapperIgnoreTarget(nameof(NoteDto.Files))] + [MapperIgnoreTarget(nameof(NoteDto.Files))] public override partial NoteDto Map(Note source); [MapperIgnoreTarget(nameof(NoteDto.Files))] @@ -25,7 +25,7 @@ public partial class NoteToNoteDtoMapper : MapperBase [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class NoteDtoToNoteMapper : MapperBase { -public override partial Note Map(NoteDto source); + public override partial Note Map(NoteDto source); public override partial void Map(NoteDto source, Note destination); diff --git a/api/src/Sozsoft.Platform.Application/OrgChart/OrgChartAppService.cs b/api/src/Sozsoft.Platform.Application/OrgChart/OrgChartAppService.cs index 397d6bdc..05754f9a 100644 --- a/api/src/Sozsoft.Platform.Application/OrgChart/OrgChartAppService.cs +++ b/api/src/Sozsoft.Platform.Application/OrgChart/OrgChartAppService.cs @@ -1,11 +1,11 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Sozsoft.Platform.Entities; -using Sozsoft.Platform.Extensions; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Sozsoft.Platform.Entities; +using Sozsoft.Platform.Extensions; using Volo.Abp.Domain.Repositories; using Volo.Abp.Identity; diff --git a/api/src/Sozsoft.Platform.Application/OrganizationUnits/PlatformOuAppService.cs b/api/src/Sozsoft.Platform.Application/OrganizationUnits/PlatformOuAppService.cs index 06dd852e..34a682ab 100644 --- a/api/src/Sozsoft.Platform.Application/OrganizationUnits/PlatformOuAppService.cs +++ b/api/src/Sozsoft.Platform.Application/OrganizationUnits/PlatformOuAppService.cs @@ -138,7 +138,7 @@ public class PlatformOuAppService : CrudAppService< { if (id == organizationUnitId) { - throw new UserFriendlyException(L[AppErrorCodes.SimilarInformationNotCopied]); + throw new UserFriendlyException(L[AppErrorCodes.SimilarInformationNotCopied]); } var entity = await repoOu.GetAsync(id); diff --git a/api/src/Sozsoft.Platform.Application/Permissions/PermissionAppService.cs b/api/src/Sozsoft.Platform.Application/Permissions/PermissionAppService.cs index ab632d8e..a506c53f 100644 --- a/api/src/Sozsoft.Platform.Application/Permissions/PermissionAppService.cs +++ b/api/src/Sozsoft.Platform.Application/Permissions/PermissionAppService.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; -using Microsoft.Extensions.Options; -using Volo.Abp.Authorization.Permissions; -using Volo.Abp.DependencyInjection; -using Volo.Abp.SimpleStateChecking; -using Volo.Abp.PermissionManagement; using System.Linq; using System.Threading.Tasks; +using Microsoft.Extensions.Options; using Volo.Abp; +using Volo.Abp.Authorization.Permissions; +using Volo.Abp.DependencyInjection; +using Volo.Abp.PermissionManagement; +using Volo.Abp.SimpleStateChecking; namespace Sozsoft.Platform.PermissionManagement; diff --git a/api/src/Sozsoft.Platform.Application/PlatformAppService.cs b/api/src/Sozsoft.Platform.Application/PlatformAppService.cs index 6a57173d..fa7c7cad 100644 --- a/api/src/Sozsoft.Platform.Application/PlatformAppService.cs +++ b/api/src/Sozsoft.Platform.Application/PlatformAppService.cs @@ -1,8 +1,4 @@ -using System.Text.Json; -using Sozsoft.Platform.Localization; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Logging; -using Volo.Abp; +using Sozsoft.Platform.Localization; using Volo.Abp.Application.Services; namespace Sozsoft.Platform; @@ -16,27 +12,3 @@ public abstract class PlatformAppService : ApplicationService LocalizationResource = typeof(PlatformResource); } } - - -public class TestAppService : PlatformAppService -{ - public dynamic GetTest() - { - Logger.LogWarning("Sending test message. {Count}", 3); - Logger.LogWarning("Sending test message. {Count} adet kayıt ok.", 3); - throw new UserFriendlyException("Toplam 1000'i geçemez"); - //throw new System.Exception("Toplam 1000'i geçemez"); - - return new OkObjectResult(new { Toplam = 2 }); - } - - [HttpPost] - public dynamic PostTest(dynamic input) - { - var input2 = (string)JsonSerializer.Serialize(input); - Logger.LogInformation(input2); - - return new OkObjectResult(input); - } -} - diff --git a/api/src/Sozsoft.Platform.Application/PlatformApplicationModule.cs b/api/src/Sozsoft.Platform.Application/PlatformApplicationModule.cs index 301aa7fc..ac1c2367 100644 --- a/api/src/Sozsoft.Platform.Application/PlatformApplicationModule.cs +++ b/api/src/Sozsoft.Platform.Application/PlatformApplicationModule.cs @@ -1,10 +1,9 @@ -using Sozsoft.Languages; +using Microsoft.Extensions.DependencyInjection; +using Sozsoft.Languages; using Sozsoft.Notifications.Application; using Sozsoft.Settings; -using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Account; using Volo.Abp.Auditing; -using Volo.Abp.Mapperly; using Volo.Abp.FeatureManagement; using Volo.Abp.Identity; using Volo.Abp.Modularity; diff --git a/api/src/Sozsoft.Platform.Application/Properties/AssemblyInfo.cs b/api/src/Sozsoft.Platform.Application/Properties/AssemblyInfo.cs index 173404ab..c01c6243 100644 --- a/api/src/Sozsoft.Platform.Application/Properties/AssemblyInfo.cs +++ b/api/src/Sozsoft.Platform.Application/Properties/AssemblyInfo.cs @@ -1,3 +1,3 @@ using System.Runtime.CompilerServices; -[assembly:InternalsVisibleToAttribute("Sozsoft.Platform.Application.Tests")] +[assembly: InternalsVisibleToAttribute("Sozsoft.Platform.Application.Tests")] diff --git a/api/src/Sozsoft.Platform.Application/Public/PublicAppService.cs b/api/src/Sozsoft.Platform.Application/Public/PublicAppService.cs index d0e340ea..a9d4897c 100644 --- a/api/src/Sozsoft.Platform.Application/Public/PublicAppService.cs +++ b/api/src/Sozsoft.Platform.Application/Public/PublicAppService.cs @@ -1,22 +1,21 @@ using System; using System.Collections.Generic; -using System.Threading.Tasks; -using Sozsoft.Platform.Entities; -using Volo.Abp.Domain.Repositories; -using Sozsoft.Platform.Data.Seeds; -using Sozsoft.Sender.Mail; -using Volo.Abp.Settings; -using Sozsoft.Platform.Demos; -using Microsoft.Extensions.Logging; -using Volo.Abp.Domain.Entities; using System.Linq; using System.Net; -using Volo.Abp.Application.Dtos; using System.Text.Json; -using Volo.Abp.Identity; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.Extensions.Logging; using Sozsoft.Languages; using Sozsoft.Languages.Entities; -using Microsoft.AspNetCore.Authorization; +using Sozsoft.Platform.Data.Seeds; +using Sozsoft.Platform.Demos; +using Sozsoft.Platform.Entities; +using Sozsoft.Sender.Mail; +using Volo.Abp.Application.Dtos; +using Volo.Abp.Domain.Entities; +using Volo.Abp.Domain.Repositories; +using Volo.Abp.Settings; using static Sozsoft.Platform.Data.Seeds.SeedConsts; namespace Sozsoft.Platform.Public; @@ -44,7 +43,6 @@ public class PublicAppService : PlatformAppService private readonly IRepository _countryRepository; private readonly IRepository _cityRepository; private readonly IRepository _districtRepository; - private readonly IIdentityUserRepository _identityUserRepository; private readonly IRepository _languageKeyRepository; private readonly IRepository _languageTextRepository; private readonly LanguageTextAppService _languageTextAppService; @@ -66,7 +64,6 @@ public class PublicAppService : PlatformAppService IRepository countryRepository, IRepository cityRepository, IRepository districtRepository, - IIdentityUserRepository identityUserRepository, IRepository languageKeyRepository, IRepository languageTextRepository, LanguageTextAppService languageTextAppService @@ -85,7 +82,6 @@ public class PublicAppService : PlatformAppService _aboutRepository = aboutRepository; _homeRepository = homeRepository; _contactRepository = contactRepository; - _identityUserRepository = identityUserRepository; _languageKeyRepository = languageKeyRepository; _languageTextRepository = languageTextRepository; _languageTextAppService = languageTextAppService; @@ -543,7 +539,7 @@ public class PublicAppService : PlatformAppService // ----------- KATEGORİLER (PostCount ile) - Optimize edildi ----------- var categoryQueryable = await _categoryRepository.GetQueryableAsync(); var postQueryableForCount = await _postRepository.GetQueryableAsync(); - + // Kategori listesi ve post sayıları tek sorguda var categoriesWithCounts = await AsyncExecuter.ToListAsync( from category in categoryQueryable @@ -575,16 +571,16 @@ public class PublicAppService : PlatformAppService // Tek sorguda post ve category'yi çek (N+1 önleme) var queryable = await _postRepository.GetQueryableAsync(); var categoryQueryable = await _categoryRepository.GetQueryableAsync(); - + var result = await AsyncExecuter.FirstOrDefaultAsync( from post in queryable.Where(p => p.Id == id) join category in categoryQueryable on post.CategoryId equals category.Id select new { Post = post, Category = category } ); - + if (result == null) throw new EntityNotFoundException(typeof(BlogPost)); - + var dto = ObjectMapper.Map(result.Post); dto.Category = ObjectMapper.Map(result.Category); diff --git a/api/src/Sozsoft.Platform.Application/Public/PublicMappers.cs b/api/src/Sozsoft.Platform.Application/Public/PublicMappers.cs index 4b67c6e6..f726aa05 100644 --- a/api/src/Sozsoft.Platform.Application/Public/PublicMappers.cs +++ b/api/src/Sozsoft.Platform.Application/Public/PublicMappers.cs @@ -1,6 +1,6 @@ +using Riok.Mapperly.Abstractions; using Sozsoft.Platform.Demos; using Sozsoft.Platform.Entities; -using Riok.Mapperly.Abstractions; using Volo.Abp.Mapperly; namespace Sozsoft.Platform.Public; @@ -8,7 +8,7 @@ namespace Sozsoft.Platform.Public; [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class DemoToDemoDtoMapper : TwoWayMapperBase { -public override partial DemoDto Map(Demo source); + public override partial DemoDto Map(Demo source); public override partial void Map(Demo source, DemoDto destination); @@ -36,7 +36,7 @@ public override partial DemoDto Map(Demo source); [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class ServiceToServiceDtoMapper : MapperBase { -public override partial ServiceDto Map(Service source); + public override partial ServiceDto Map(Service source); public override partial void Map(Service source, ServiceDto destination); @@ -52,7 +52,7 @@ public override partial ServiceDto Map(Service source); [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class BlogCategoryToBlogCategoryDtoMapper : MapperBase { -public override partial BlogCategoryDto Map(BlogCategory source); + public override partial BlogCategoryDto Map(BlogCategory source); public override partial void Map(BlogCategory source, BlogCategoryDto destination); @@ -68,7 +68,7 @@ public override partial BlogCategoryDto Map(BlogCategory source); [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class BlogPostToBlogPostDtoMapper : MapperBase { -public override partial BlogPostDto Map(BlogPost source); + public override partial BlogPostDto Map(BlogPost source); public override partial void Map(BlogPost source, BlogPostDto destination); @@ -84,7 +84,7 @@ public override partial BlogPostDto Map(BlogPost source); [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class BlogPostToBlogPostListDtoMapper : MapperBase { -public override partial BlogPostListDto Map(BlogPost source); + public override partial BlogPostListDto Map(BlogPost source); public override partial void Map(BlogPost source, BlogPostListDto destination); @@ -100,7 +100,7 @@ public override partial BlogPostListDto Map(BlogPost source); [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class ProductToProductDtoMapper : TwoWayMapperBase { -public override partial ProductDto Map(Product source); + public override partial ProductDto Map(Product source); public override partial void Map(Product source, ProductDto destination); @@ -128,7 +128,7 @@ public override partial ProductDto Map(Product source); [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class PaymentMethodToPaymentMethodDtoMapper : MapperBase { -public override partial PaymentMethodDto Map(PaymentMethod source); + public override partial PaymentMethodDto Map(PaymentMethod source); public override partial void Map(PaymentMethod source, PaymentMethodDto destination); @@ -144,7 +144,7 @@ public override partial PaymentMethodDto Map(PaymentMethod source); [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class InstallmentOptionToInstallmentOptionDtoMapper : MapperBase { -public override partial InstallmentOptionDto Map(InstallmentOption source); + public override partial InstallmentOptionDto Map(InstallmentOption source); public override partial void Map(InstallmentOption source, InstallmentOptionDto destination); @@ -160,7 +160,7 @@ public override partial InstallmentOptionDto Map(InstallmentOption source); [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class OrderToOrderDtoMapper : MapperBase { -public override partial OrderDto Map(Order source); + public override partial OrderDto Map(Order source); public override partial void Map(Order source, OrderDto destination); @@ -176,7 +176,7 @@ public override partial OrderDto Map(Order source); [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class AboutToAboutDtoMapper : MapperBase { -public override partial AboutDto Map(About source); + public override partial AboutDto Map(About source); public override partial void Map(About source, AboutDto destination); @@ -192,7 +192,7 @@ public override partial AboutDto Map(About source); [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class HomeToHomeDtoMapper : MapperBase { -public override partial HomeDto Map(Home source); + public override partial HomeDto Map(Home source); public override partial void Map(Home source, HomeDto destination); @@ -208,7 +208,7 @@ public override partial HomeDto Map(Home source); [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class ContactToContactDtoMapper : MapperBase { -public override partial ContactDto Map(Contact source); + public override partial ContactDto Map(Contact source); public override partial void Map(Contact source, ContactDto destination); @@ -224,7 +224,7 @@ public override partial ContactDto Map(Contact source); [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class CountryToCountryDtoMapper : MapperBase { -public override partial CountryDto Map(Country source); + public override partial CountryDto Map(Country source); public override partial void Map(Country source, CountryDto destination); diff --git a/api/src/Sozsoft.Platform.Application/Routes/RouteMappers.cs b/api/src/Sozsoft.Platform.Application/Routes/RouteMappers.cs index 0c83a131..632007fd 100644 --- a/api/src/Sozsoft.Platform.Application/Routes/RouteMappers.cs +++ b/api/src/Sozsoft.Platform.Application/Routes/RouteMappers.cs @@ -1,6 +1,6 @@ +using Riok.Mapperly.Abstractions; using Sozsoft.Platform.Entities; using Sozsoft.Platform.Routes; -using Riok.Mapperly.Abstractions; using Volo.Abp.Mapperly; namespace Sozsoft.Platform; @@ -8,7 +8,7 @@ namespace Sozsoft.Platform; [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class RouteToRouteDtoMapper : MapperBase { -public override partial RouteDto Map(Route source); + public override partial RouteDto Map(Route source); public override partial void Map(Route source, RouteDto destination); diff --git a/api/src/Sozsoft.Platform.Application/Tenants/PlatformTenantAppService.cs b/api/src/Sozsoft.Platform.Application/Tenants/PlatformTenantAppService.cs index 52853c4d..f5f614be 100644 --- a/api/src/Sozsoft.Platform.Application/Tenants/PlatformTenantAppService.cs +++ b/api/src/Sozsoft.Platform.Application/Tenants/PlatformTenantAppService.cs @@ -1,9 +1,9 @@ using System; using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; using Sozsoft.Platform.Extensions; using Sozsoft.Platform.ListForms.DynamicApi; using Sozsoft.Platform.Localization; -using Microsoft.AspNetCore.Authorization; using Volo.Abp; using Volo.Abp.Application.Dtos; using Volo.Abp.Data; @@ -22,7 +22,6 @@ public class PlatformTenantAppService : TenantAppService, IPlatformTenantAppServ { private readonly ITenantRepository tenantRepository; private readonly IDistributedEventBus distributedEventBus; - private readonly ILocalEventBus localEventBus; public PlatformTenantAppService( ITenantRepository tenantRepository, @@ -33,7 +32,6 @@ public class PlatformTenantAppService : TenantAppService, IPlatformTenantAppServ { this.tenantRepository = tenantRepository; this.distributedEventBus = distributedEventBus; - this.localEventBus = localEventBus; LocalizationResource = typeof(PlatformResource); } diff --git a/api/src/Sozsoft.Platform.Application/Videoroom/VideoroomMappers.cs b/api/src/Sozsoft.Platform.Application/Videoroom/VideoroomMappers.cs index fee535fb..a4ac7dac 100644 --- a/api/src/Sozsoft.Platform.Application/Videoroom/VideoroomMappers.cs +++ b/api/src/Sozsoft.Platform.Application/Videoroom/VideoroomMappers.cs @@ -1,5 +1,5 @@ +using Riok.Mapperly.Abstractions; using Sozsoft.Platform.Entities; -using Riok.Mapperly.Abstractions; using Volo.Abp.Mapperly; namespace Sozsoft.Platform.VideoRooms; @@ -7,7 +7,7 @@ namespace Sozsoft.Platform.VideoRooms; [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class VideoroomToVideoroomDtoMapper : MapperBase { -public override partial VideoroomDto Map(Videoroom source); + public override partial VideoroomDto Map(Videoroom source); public override partial void Map(Videoroom source, VideoroomDto destination); @@ -23,7 +23,7 @@ public override partial VideoroomDto Map(Videoroom source); [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class VideoroomAttandanceToVideoroomAttendanceDtoMapper : MapperBase { -public override partial VideoroomAttendanceDto Map(VideoroomAttandance source); + public override partial VideoroomAttendanceDto Map(VideoroomAttandance source); public override partial void Map(VideoroomAttandance source, VideoroomAttendanceDto destination); @@ -39,7 +39,7 @@ public override partial VideoroomAttendanceDto Map(VideoroomAttandance source); [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class VideoroomParticipantToVideoroomParticipantDtoMapper : MapperBase { -public override partial VideoroomParticipantDto Map(VideoroomParticipant source); + public override partial VideoroomParticipantDto Map(VideoroomParticipant source); public override partial void Map(VideoroomParticipant source, VideoroomParticipantDto destination); @@ -55,7 +55,7 @@ public override partial VideoroomParticipantDto Map(VideoroomParticipant source) [Mapper(RequiredMappingStrategy = RequiredMappingStrategy.Target)] public partial class VideoroomChatToVideoroomChatDtoMapper : MapperBase { -public override partial VideoroomChatDto Map(VideoroomChat source); + public override partial VideoroomChatDto Map(VideoroomChat source); public override partial void Map(VideoroomChat source, VideoroomChatDto destination); diff --git a/api/src/Sozsoft.Platform.DbMigrator/DbMigratorHostedService.cs b/api/src/Sozsoft.Platform.DbMigrator/DbMigratorHostedService.cs index 15019bb8..7d876033 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/DbMigratorHostedService.cs +++ b/api/src/Sozsoft.Platform.DbMigrator/DbMigratorHostedService.cs @@ -3,8 +3,8 @@ using System.Threading.Tasks; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using Sozsoft.Platform.Data; using Serilog; +using Sozsoft.Platform.Data; using Volo.Abp; using Volo.Abp.Data; @@ -17,7 +17,7 @@ public class DbMigratorHostedService : IHostedService private readonly IHostEnvironment _hostEnvironment; public DbMigratorHostedService( - IHostApplicationLifetime hostApplicationLifetime, + IHostApplicationLifetime hostApplicationLifetime, IConfiguration configuration, IHostEnvironment hostEnvironment) { @@ -30,11 +30,11 @@ public class DbMigratorHostedService : IHostedService { using (var application = await AbpApplicationFactory.CreateAsync(options => { - options.Services.ReplaceConfiguration(_configuration); - options.Services.AddSingleton(_hostEnvironment); - options.UseAutofac(); - options.Services.AddLogging(c => c.AddSerilog()); - options.AddDataMigrationEnvironment(); + options.Services.ReplaceConfiguration(_configuration); + options.Services.AddSingleton(_hostEnvironment); + options.UseAutofac(); + options.Services.AddLogging(c => c.AddSerilog()); + options.AddDataMigrationEnvironment(); })) { await application.InitializeAsync(); diff --git a/api/src/Sozsoft.Platform.DbMigrator/Migrations/CrudDataSeeder.cs b/api/src/Sozsoft.Platform.DbMigrator/Migrations/CrudDataSeeder.cs index ccd8e3bf..11b281d3 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Migrations/CrudDataSeeder.cs +++ b/api/src/Sozsoft.Platform.DbMigrator/Migrations/CrudDataSeeder.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/api/src/Sozsoft.Platform.DbMigrator/Migrations/HangfireDbSchemaMigrator.cs b/api/src/Sozsoft.Platform.DbMigrator/Migrations/HangfireDbSchemaMigrator.cs index e5987ac7..43d36e1f 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Migrations/HangfireDbSchemaMigrator.cs +++ b/api/src/Sozsoft.Platform.DbMigrator/Migrations/HangfireDbSchemaMigrator.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Threading.Tasks; using Hangfire.SqlServer; using Microsoft.Data.SqlClient; diff --git a/api/src/Sozsoft.Platform.DbMigrator/Migrations/HostDataSeeder.cs b/api/src/Sozsoft.Platform.DbMigrator/Migrations/HostDataSeeder.cs index 9e2532c7..88520934 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Migrations/HostDataSeeder.cs +++ b/api/src/Sozsoft.Platform.DbMigrator/Migrations/HostDataSeeder.cs @@ -1,19 +1,19 @@ using System; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Text.Json; using System.Threading.Tasks; +using EFCore.BulkExtensions; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Configuration; using Sozsoft.Platform.Entities; using Sozsoft.Platform.Enums; +using Sozsoft.Platform.Public; using Sozsoft.Settings.Entities; -using Microsoft.Extensions.Configuration; using Volo.Abp.Data; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Repositories; -using Microsoft.EntityFrameworkCore; -using EFCore.BulkExtensions; -using System.Collections.Generic; -using Sozsoft.Platform.Public; using static Sozsoft.Settings.SettingsConsts; namespace Sozsoft.Platform.Data.Seeds; @@ -457,7 +457,7 @@ public class HostDataSeeder : IDataSeedContributor, ITransientDependency IsActive = item.IsActive, DataSourceCode = item.DataSourceCode, BeforeSp = item.BeforeSp, - AfterSp = item.AfterSp + AfterSp = item.AfterSp }); } } diff --git a/api/src/Sozsoft.Platform.DbMigrator/Migrations/LanguageDataSeeder.cs b/api/src/Sozsoft.Platform.DbMigrator/Migrations/LanguageDataSeeder.cs index 434332c3..4ed01ac8 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Migrations/LanguageDataSeeder.cs +++ b/api/src/Sozsoft.Platform.DbMigrator/Migrations/LanguageDataSeeder.cs @@ -1,11 +1,11 @@ -using System; +using System; +using System.Collections.Generic; using System.Globalization; using System.IO; using System.Linq; using System.Threading.Tasks; -using System.Collections.Generic; -using Sozsoft.Languages.Entities; using Microsoft.Extensions.Configuration; +using Sozsoft.Languages.Entities; using Volo.Abp.Data; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Repositories; diff --git a/api/src/Sozsoft.Platform.DbMigrator/Migrations/LanguagesData.json b/api/src/Sozsoft.Platform.DbMigrator/Migrations/LanguagesData.json index aad60032..b32e933c 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Migrations/LanguagesData.json +++ b/api/src/Sozsoft.Platform.DbMigrator/Migrations/LanguagesData.json @@ -20526,6 +20526,12 @@ "en": "No endpoint matches the search.", "tr": "Aramayla eşleşen endpoint yok." }, + { + "resourceName": "Platform", + "key": "App.DeveloperKitComponentDesigner.Attached", + "en": "Attached", + "tr": "Ekli" + }, { "resourceName": "Platform", "key": "App.DeveloperKitComponentDesigner.AttachedOnly", diff --git a/api/src/Sozsoft.Platform.DbMigrator/Migrations/ListFormSeeder_Administration.cs b/api/src/Sozsoft.Platform.DbMigrator/Migrations/ListFormSeeder_Administration.cs index f80d8e75..f6fd3feb 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Migrations/ListFormSeeder_Administration.cs +++ b/api/src/Sozsoft.Platform.DbMigrator/Migrations/ListFormSeeder_Administration.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Data; using System.Text.Json; @@ -12,7 +12,6 @@ using Sozsoft.Platform.Queries; using Volo.Abp.Data; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Repositories; -using Volo.Abp.Identity; using static Sozsoft.Platform.PlatformConsts; using static Sozsoft.Platform.PlatformSeeder.ListFormSeeder_DefaultJsons; using AbpIdentity = Sozsoft.Platform.Data.Seeds.SeedConsts.AbpIdentity; @@ -24,21 +23,15 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep { private readonly IRepository _listFormRepository; private readonly IRepository _listFormFieldRepository; - private readonly IdentityUserManager _identityUserManager; - private readonly IdentityRoleManager _identityRoleManager; private readonly IConfiguration _configuration; public ListFormSeeder_Administration( IRepository listFormRepository, IRepository listFormFieldRepository, - IdentityUserManager userManager, - IdentityRoleManager roleManager, IConfiguration configuration) { _listFormRepository = listFormRepository; _listFormFieldRepository = listFormFieldRepository; - _identityUserManager = userManager; - _identityRoleManager = roleManager; _configuration = configuration; } @@ -6162,7 +6155,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PivotSettingsJson = DefaultPivotSettingsJson, EditorOptions = EditorOptionValues.HtmlEditorOptions }, - + new() { ListFormCode = listForm.ListFormCode, CultureName = LanguageCodes.En, diff --git a/api/src/Sozsoft.Platform.DbMigrator/Migrations/ListFormSeeder_DefaultJsons.cs b/api/src/Sozsoft.Platform.DbMigrator/Migrations/ListFormSeeder_DefaultJsons.cs index 434e3fd7..f3fad547 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Migrations/ListFormSeeder_DefaultJsons.cs +++ b/api/src/Sozsoft.Platform.DbMigrator/Migrations/ListFormSeeder_DefaultJsons.cs @@ -104,7 +104,7 @@ public static class ListFormSeeder_DefaultJsons AutoExpandAll = AutoExpandAll }); public static string DefaultTodoOptionJson( - string TitleExpr = "Title", + string TitleExpr = "Title", string StatusExpr = "Status", string DescriptionExpr = "Description", string DueDateExpr = "DueDate", @@ -130,7 +130,7 @@ public static class ListFormSeeder_DefaultJsons AllowDragging = AllowDragging }); public static string DefaultSchedulerOptionJson( - string TextExpr = "Text", + string TextExpr = "Text", string StartDateExpr = "StartDate", string EndDateExpr = "EndDate", string AllDayExpr = "AllDay", @@ -140,7 +140,7 @@ public static class ListFormSeeder_DefaultJsons { TextExpr = TextExpr, StartDateExpr = StartDateExpr, - EndDateExpr = EndDateExpr, + EndDateExpr = EndDateExpr, AllDayExpr = AllDayExpr, RecurrenceRuleExpr = RecurrenceRuleExpr, RecurrenceExceptionExpr = RecurrenceExceptionExpr, @@ -148,7 +148,7 @@ public static class ListFormSeeder_DefaultJsons CrossScrollingEnabled = true, AllowResizing = true, AllowDragging = true, - AllowDeleting = true, + AllowDeleting = true, AllowEditing = true, AllowAdding = true }); diff --git a/api/src/Sozsoft.Platform.DbMigrator/Migrations/ListFormSeeder_Saas.cs b/api/src/Sozsoft.Platform.DbMigrator/Migrations/ListFormSeeder_Saas.cs index 7709a584..938b1244 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Migrations/ListFormSeeder_Saas.cs +++ b/api/src/Sozsoft.Platform.DbMigrator/Migrations/ListFormSeeder_Saas.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Data; using System.Text.Json; @@ -14,7 +14,6 @@ using Sozsoft.Platform.Queries; using Volo.Abp.Data; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Repositories; -using Volo.Abp.Identity; using Volo.Abp.TenantManagement; using static Sozsoft.Platform.PlatformConsts; using static Sozsoft.Platform.PlatformSeeder.ListFormSeeder_DefaultJsons; @@ -27,8 +26,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency private readonly IRepository _listFormRepository; private readonly IRepository _listFormFieldRepository; private readonly IRepository _listFormWorkflowRepository; - private readonly IdentityUserManager _identityUserManager; - private readonly IdentityRoleManager _identityRoleManager; private readonly IConfiguration _configuration; protected IStringLocalizer _localizer { get; } @@ -36,8 +33,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency IRepository listFormRepository, IRepository listFormFieldRepository, IRepository listFormWorkflowRepository, - IdentityUserManager userManager, - IdentityRoleManager roleManager, IConfiguration configuration, IStringLocalizer localizer ) @@ -45,8 +40,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency _listFormRepository = listFormRepository; _listFormFieldRepository = listFormFieldRepository; _listFormWorkflowRepository = listFormWorkflowRepository; - _identityUserManager = userManager; - _identityRoleManager = roleManager; _configuration = configuration; _localizer = localizer; } diff --git a/api/src/Sozsoft.Platform.DbMigrator/Migrations/ListFormSeeder_Utils.cs b/api/src/Sozsoft.Platform.DbMigrator/Migrations/ListFormSeeder_Utils.cs index e0bfa749..75136872 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Migrations/ListFormSeeder_Utils.cs +++ b/api/src/Sozsoft.Platform.DbMigrator/Migrations/ListFormSeeder_Utils.cs @@ -1,13 +1,13 @@ -using System; +using System; using System.Collections.Generic; using System.Data; using System.Linq; using System.Text.Json; using System.Threading.Tasks; +using Microsoft.EntityFrameworkCore; using Sozsoft.Platform.Entities; using Sozsoft.Platform.Enums; using Sozsoft.Platform.ListForms; -using Microsoft.EntityFrameworkCore; using Volo.Abp.Domain.Repositories; namespace Sozsoft.Platform.Data.Seeds; @@ -48,7 +48,7 @@ public class ListFormSeeder_Utils if (listForm == null) { Console.WriteLine($"ListForm with code {listFormCode} not found!"); - + return null; } @@ -209,4 +209,4 @@ public class ListFormSeeder_Utils await _listFormFieldRepository.InsertAsync(field, autoSave: true); } } -} \ No newline at end of file +} diff --git a/api/src/Sozsoft.Platform.DbMigrator/Migrations/MenuDataSeeder.cs b/api/src/Sozsoft.Platform.DbMigrator/Migrations/MenuDataSeeder.cs index 323e814a..164b1def 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Migrations/MenuDataSeeder.cs +++ b/api/src/Sozsoft.Platform.DbMigrator/Migrations/MenuDataSeeder.cs @@ -1,10 +1,10 @@ -using System; +using System; +using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading.Tasks; -using System.Collections.Generic; -using Sozsoft.Platform.Entities; using Microsoft.Extensions.Configuration; +using Sozsoft.Platform.Entities; using Volo.Abp.Data; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Repositories; diff --git a/api/src/Sozsoft.Platform.DbMigrator/Migrations/PermissionDataSeeder.cs b/api/src/Sozsoft.Platform.DbMigrator/Migrations/PermissionDataSeeder.cs index 46ad6237..ebcde8a3 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Migrations/PermissionDataSeeder.cs +++ b/api/src/Sozsoft.Platform.DbMigrator/Migrations/PermissionDataSeeder.cs @@ -1,14 +1,14 @@ -using System; +using System; +using System.Collections.Generic; using System.IO; using System.Threading.Tasks; -using System.Collections.Generic; using Microsoft.Extensions.Configuration; +using Sozsoft.Platform.Extensions; using Volo.Abp.Data; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Repositories; using Volo.Abp.MultiTenancy; using Volo.Abp.PermissionManagement; -using Sozsoft.Platform.Extensions; namespace Sozsoft.Platform.Data.Seeds; diff --git a/api/src/Sozsoft.Platform.DbMigrator/Migrations/PlatformIdentityDataSeeder.cs b/api/src/Sozsoft.Platform.DbMigrator/Migrations/PlatformIdentityDataSeeder.cs index 54b64e6f..55d0851e 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Migrations/PlatformIdentityDataSeeder.cs +++ b/api/src/Sozsoft.Platform.DbMigrator/Migrations/PlatformIdentityDataSeeder.cs @@ -1,21 +1,21 @@ using System; using System.Threading.Tasks; -using Sozsoft.Platform.Extensions; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Options; +using Sozsoft.Platform.Entities; +using Sozsoft.Platform.Extensions; +using Sozsoft.Platform.Permissions; using Volo.Abp; using Volo.Abp.DependencyInjection; +using Volo.Abp.Domain.Repositories; using Volo.Abp.Guids; using Volo.Abp.Identity; using Volo.Abp.MultiTenancy; using Volo.Abp.PermissionManagement; +using Volo.Abp.TenantManagement; using IdentityRole = Volo.Abp.Identity.IdentityRole; using IdentityUser = Volo.Abp.Identity.IdentityUser; -using Volo.Abp.Domain.Repositories; -using Sozsoft.Platform.Entities; -using Sozsoft.Platform.Permissions; -using Volo.Abp.TenantManagement; namespace Sozsoft.Platform.Data.Seeds; diff --git a/api/src/Sozsoft.Platform.DbMigrator/PlatformDbMigratorModule.cs b/api/src/Sozsoft.Platform.DbMigrator/PlatformDbMigratorModule.cs index 2463393c..6f516136 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/PlatformDbMigratorModule.cs +++ b/api/src/Sozsoft.Platform.DbMigrator/PlatformDbMigratorModule.cs @@ -1,7 +1,7 @@ -using Sozsoft.Platform.EntityFrameworkCore; -using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using Sozsoft.Platform.EntityFrameworkCore; using Volo.Abp.Autofac; using Volo.Abp.Caching; using Volo.Abp.Caching.StackExchangeRedis; diff --git a/api/src/Sozsoft.Platform.DbMigrator/Program.cs b/api/src/Sozsoft.Platform.DbMigrator/Program.cs index 886223b8..4907f4b3 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Program.cs +++ b/api/src/Sozsoft.Platform.DbMigrator/Program.cs @@ -1,5 +1,4 @@ -using System.IO; -using System.Threading.Tasks; +using System.Threading.Tasks; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; diff --git a/api/src/Sozsoft.Platform.Domain.Shared/Charts/ChartConsts.cs b/api/src/Sozsoft.Platform.Domain.Shared/Charts/ChartConsts.cs deleted file mode 100644 index e12cebf6..00000000 --- a/api/src/Sozsoft.Platform.Domain.Shared/Charts/ChartConsts.cs +++ /dev/null @@ -1,428 +0,0 @@ -using System.Collections.Generic; - -namespace Sozsoft.Platform.Charts; - -public static class ChartConsts -{ - public static class ChartOptions - { - public const string ChartPaletteBright = "Bright"; - public const string ChartPaletteHarmonyLight = "Harmony Light"; - public const string ChartPaletteOcean = "Ocean"; - public const string ChartPalettePastel = "Pastel"; - public const string ChartPaletteSoft = "Soft"; - public const string ChartPaletteSoftPastel = "Soft Pastel"; - public const string ChartPaletteVintage = "Vintage"; - public const string ChartPaletteViolet = "Violet"; - public const string ChartPaletteCarmine = "Carmine"; - public const string ChartPaletteDarkMoon = "Dark Moon"; - public const string ChartPaletteDarkViolet = "Dark Violet"; - public const string ChartPaletteGreenMist = "Green Mist"; - public const string ChartPaletteSoftBlue = "Soft Blue"; - public const string ChartPaletteMaterial = "Material"; - public const string ChartPaletteOffice = "Office"; - - public const string ChartThemeGenericDark = "generic.dark"; - public const string ChartThemeGenericLight = "generic.light"; - public const string ChartThemeGenericContrast = "generic.contrast"; - public const string ChartThemeGenericCarmine = "generic.carmine"; - public const string ChartThemeGenericDarkmoon = "generic.darkmoon"; - public const string ChartThemeGenericDarkviolet = "generic.darkviolet"; - public const string ChartThemeGenericGreenmist = "generic.greenmist"; - public const string ChartThemeGenericSoftBlue = "generic.softblue"; - public const string ChartThemeMaterialBlueLight = "material.blue.light"; - public const string ChartThemeMaterialLimeLight = "material.lime.light"; - public const string ChartThemeMaterialOrangeLight = "material.orange.light"; - public const string ChartThemeMaterialPurpleLight = "material.purple.light"; - public const string ChartThemeMaterialTealLight = "material.teal.light"; - - public const string PaletteExtensionModeAlternate = "alternate"; - public const string PaletteExtensionModeBlend = "blend"; - public const string PaletteExtensionModeExtrapolate = "extrapolate"; - - public const string AnimationEasingLinear = "linear"; - public const string AnimationEasingEaseOutCubic = "easeOutCubic"; - - public const string ArgumentAxisLabelDisplayModeRotate = "rotate"; - public const string ArgumentAxisLabelDisplayModeStagger = "stagger"; - public const string ArgumentAxisLabelDisplayModeStandard = "standard"; - - public const string ArgumentAxisLabelOverlappingBehaviorRotate = "standard"; - public const string ArgumentAxisLabelOverlappingBehaviorStagger = "stagger"; - public const string ArgumentAxisLabelOverlappingBehaviorNone = "none"; - public const string ArgumentAxisLabelOverlappingBehaviorHide = "hide"; - - public const string SeriesTypeArea = "area"; - public const string SeriesTypeBar = "bar"; - public const string SeriesTypeBubble = "bubble"; - public const string SeriesTypeCandlestick = "candlestick"; - public const string SeriesTypeFullstackedarea = "fullstackedarea"; - public const string SeriesTypeFullstackedbar = "fullstackedbar"; - public const string SeriesTypeFullstackedline = "fullstackedline"; - public const string SeriesTypeFullstackedspline = "fullstackedspline"; - public const string SeriesTypeFullstackedsplinearea = "fullstackedsplinearea"; - public const string SeriesTypeLine = "line"; - public const string SeriesTypeRangearea = "rangearea"; - public const string SeriesTypeRangebar = "rangebar"; - public const string SeriesTypeScatter = "scatter"; - public const string SeriesTypeSpline = "spline"; - public const string SeriesTypeSplinearea = "splinearea"; - public const string SeriesTypeStackedarea = "stackedarea"; - public const string SeriesTypeStackedbar = "stackedbar"; - public const string SeriesTypeStackedline = "stackedline"; - public const string SeriesTypeStackedspline = "stackedspline"; - public const string SeriesTypeStackedsplinearea = "stackedsplinearea"; - public const string SeriesTypeSteparea = "steparea"; - public const string SeriesTypeStepline = "stepline"; - public const string SeriesTypeStock = "stock"; - - public const string SeriesSelectionModeAllArgumentPoints = "allArgumentPoints"; - public const string SeriesSelectionModeAllSeriesPoints = "allSeriesPoints"; - public const string SeriesSelectionModeExcludePoints = "excludePoints"; - public const string SeriesSelectionModeIncludePoints = "includePoints"; - public const string SeriesSelectionModeNone = "none"; - public const string SeriesSelectionModeOnlyPoint = "onlyPoint"; - - public const string DashStyleDash = "dash"; - public const string DashStyleDot = "dot"; - public const string DashStyleLongDash = "longDash"; - public const string DashStyleDashSolid = "solid"; - - public const string ArgumentTypeNumeric = "numeric"; - public const string ArgumentTypeDatetime = "datetime"; - public const string ArgumentTypeString = "string"; - - public const string ArgumentAxisPositionBottom = "bottom"; - public const string ArgumentAxisPositionLeft = "left"; - public const string ArgumentAxisPositionRight = "right"; - public const string ArgumentAxisPositionTop = "top"; - - public const string ArgumentAxisHoverModeNone = "none"; - public const string ArgumentAxisHoverModeAllArgumentPoints = "allArgumentPoints"; - - public const string AggregationIntervalDay = "day"; - public const string AggregationIntervalHour = "hour"; - public const string AggregationIntervalMillisecond = "millisecond"; - public const string AggregationIntervalMinute = "minute"; - public const string AggregationIntervalMonth = "month"; - public const string AggregationIntervalQuarter = "quarter"; - public const string AggregationIntervalSecond = "second"; - public const string AggregationIntervalWeek = "week"; - public const string AggregationIntervalYear = "year"; - - public const string LegendPositionInside = "inside"; - public const string LegendPositionOutside = "outside"; - - public const string LegendOrientationVertical = "vertical"; - public const string LegendOrientationHorizontal = "horizontal"; - - public const string ScrollBarPositionBottom = "bottom"; - public const string ScrollBarPositionLeft = "left"; - public const string ScrollBarPositionRight = "right"; - public const string ScrollBarPositionTop = "top"; - - public const string TitleHorizontalAlignmentCenter = "center"; - public const string TitleHorizontalAlignmentLeft = "left"; - public const string TitleHorizontalAlignmentRight = "right"; - - public const string TitleVerticalAlignmentBottom = "bottom"; - public const string TitleVerticalAlignmentTop = "top"; - - public const string TooltipLocationCenter = "center"; - public const string TooltipLocationEdge = "edge"; - - public const string ValueTypeNumeric = "numeric"; - public const string ValueTypeDatetime = "datetime"; - public const string ValueTypeString = "string"; - - public const string ValueAxisPositionBottom = "bottom"; - public const string ValueAxisPositionLeft = "left"; - public const string ValueAxisPositionRight = "right"; - public const string ValueAxisPositionTop = "top"; - - public const string ValueAxisTypeContinuous = "continuous"; - public const string ValueAxisTypeDiscrete = "discrete"; - public const string ValueAxisTypeLogarithmic = "logarithmic"; - - public const string ZoomAndPanAxisBoth = "both"; - public const string ZoomAndPanAxisNone = "none"; - public const string ZoomAndPanAxisPan = "pan"; - public const string ZoomAndPanAxisZoom = "zoom"; - - public const string ZoomAndPanKeyAlt = "alt"; - public const string ZoomAndPanKeyCtrl = "ctrl"; - public const string ZoomAndPanKeyMeta = "meta"; - public const string ZoomAndPanKeyShift = "shift"; - - public const string AnnotationTypeText = "text"; - public const string AnnotationTypeImage = "image"; - public const string AnnotationTypeCustom = "custom"; - - public const string WordWrapNormal = "normal"; - public const string WordWrapBreakWord = "breakWord"; - public const string WordWrapNone = "none"; - - public const string TitleTextOverFlowEllipsis = "ellipsis"; - public const string TitleTextOverFlowHide = "hide"; - public const string TitleTextOverFlowNone = "none"; - - public const string BreakStyleLineStraight = "straight"; - public const string BreakStyleLineWaved = "waved"; - - } - - public static class ChartLists - { - public static readonly List PaletteList = new List - { - new SelectListItem { Value = ChartOptions.ChartPaletteBright, Text = "Bright"}, - new SelectListItem { Value = ChartOptions.ChartPaletteCarmine, Text = "Carmine"}, - new SelectListItem { Value = ChartOptions.ChartPaletteDarkMoon, Text = "Dark Moon"}, - new SelectListItem { Value = ChartOptions.ChartPaletteDarkViolet, Text = "Dark Violet"}, - new SelectListItem { Value = ChartOptions.ChartPaletteGreenMist, Text = "Green Mist"}, - new SelectListItem { Value = ChartOptions.ChartPaletteHarmonyLight, Text = "Harmony Light"}, - new SelectListItem { Value = ChartOptions.ChartPaletteMaterial, Text = "Material"}, - new SelectListItem { Value = ChartOptions.ChartPaletteOcean, Text = "Ocean"}, - new SelectListItem { Value = ChartOptions.ChartPaletteOffice, Text = "Office"}, - new SelectListItem { Value = ChartOptions.ChartPalettePastel, Text = "Pastel"}, - new SelectListItem { Value = ChartOptions.ChartPaletteSoft, Text = "Soft"}, - new SelectListItem { Value = ChartOptions.ChartPaletteSoftBlue, Text = "Soft Blue"}, - new SelectListItem { Value = ChartOptions.ChartPaletteSoftPastel, Text = "Soft Pastel"}, - new SelectListItem { Value = ChartOptions.ChartPaletteVintage, Text = "Vintage"}, - new SelectListItem { Value = ChartOptions.ChartPaletteViolet, Text = "Violet"} - }; - - public static readonly List ThemeList = new List - { - new SelectListItem { Value = ChartOptions.ChartThemeGenericDark, Text = "Generic Dark"}, - new SelectListItem { Value = ChartOptions.ChartThemeGenericCarmine, Text = "Generic Carmine"}, - new SelectListItem { Value = ChartOptions.ChartThemeGenericContrast, Text = "Generic Contrast"}, - new SelectListItem { Value = ChartOptions.ChartThemeGenericDarkmoon, Text = "Generic Darkmoon"}, - new SelectListItem { Value = ChartOptions.ChartThemeGenericDarkviolet, Text = "Generic Darkviolet"}, - new SelectListItem { Value = ChartOptions.ChartThemeGenericGreenmist, Text = "Generic Greenmist"}, - new SelectListItem { Value = ChartOptions.ChartThemeGenericLight, Text = "Generic Light"}, - new SelectListItem { Value = ChartOptions.ChartThemeGenericSoftBlue, Text = "Generic Soft Blue"}, - new SelectListItem { Value = ChartOptions.ChartThemeMaterialBlueLight, Text = "Material Blue Light"}, - new SelectListItem { Value = ChartOptions.ChartThemeMaterialLimeLight, Text = "Material Lime Light"}, - new SelectListItem { Value = ChartOptions.ChartThemeMaterialOrangeLight, Text = "Material Orange Light"}, - new SelectListItem { Value = ChartOptions.ChartThemeMaterialPurpleLight, Text = "Material Purple Light"}, - new SelectListItem { Value = ChartOptions.ChartThemeMaterialTealLight, Text = "Material Teal Light"} - }; - - public static readonly List PaletteExtensionModeList = new List - { - new SelectListItem { Value = ChartOptions.PaletteExtensionModeAlternate, Text = "Alternate"}, - new SelectListItem { Value = ChartOptions.PaletteExtensionModeBlend, Text = "Blend"}, - new SelectListItem { Value = ChartOptions.PaletteExtensionModeExtrapolate, Text = "Extrapolate"} - }; - - public static readonly List EasingList = new List - { - new SelectListItem { Value = ChartOptions.AnimationEasingLinear, Text = "Linear"}, - new SelectListItem { Value = ChartOptions.AnimationEasingEaseOutCubic, Text = "Ease Out Cubic"} - }; - - public static readonly List LabelDisplayModeList = new List - { - new SelectListItem { Value = ChartOptions.ArgumentAxisLabelDisplayModeRotate, Text = "Rotate"}, - new SelectListItem { Value = ChartOptions.ArgumentAxisLabelDisplayModeStagger, Text = "Stagger"}, - new SelectListItem { Value = ChartOptions.ArgumentAxisLabelDisplayModeStandard, Text = "Standard"} - }; - - public static readonly List ArgumentAxisLabelOverlappingBehaviorList = new List - { - new SelectListItem { Value = ChartOptions.ArgumentAxisLabelOverlappingBehaviorNone, Text = "None"}, - new SelectListItem { Value = ChartOptions.ArgumentAxisLabelOverlappingBehaviorHide, Text = "Hide"}, - new SelectListItem { Value = ChartOptions.ArgumentAxisLabelOverlappingBehaviorRotate, Text = "Rotate"}, - new SelectListItem { Value = ChartOptions.ArgumentAxisLabelOverlappingBehaviorStagger, Text = "Stagger"} - }; - - public static readonly List SeriesTypeList = new List - { - new SelectListItem { Value = ChartOptions.SeriesTypeLine, Text = "Line"}, - new SelectListItem { Value = ChartOptions.SeriesTypeStepline, Text = "Stepline"}, - new SelectListItem { Value = ChartOptions.SeriesTypeBar, Text = "Bar"}, - new SelectListItem { Value = ChartOptions.SeriesTypeFullstackedbar, Text = "Fullstackedbar"}, - new SelectListItem { Value = ChartOptions.SeriesTypeRangebar, Text = "Rangebar"}, - new SelectListItem { Value = ChartOptions.SeriesTypeRangearea, Text = "Rangearea"}, - new SelectListItem { Value = ChartOptions.SeriesTypeFullstackedarea, Text = "Fullstackedarea"}, - new SelectListItem { Value = ChartOptions.SeriesTypeArea, Text = "Area"}, - new SelectListItem { Value = ChartOptions.SeriesTypeBubble, Text = "Bubble"}, - new SelectListItem { Value = ChartOptions.SeriesTypeCandlestick, Text = "Candlestick"}, - new SelectListItem { Value = ChartOptions.SeriesTypeFullstackedline, Text = "Fullstackedline"}, - new SelectListItem { Value = ChartOptions.SeriesTypeFullstackedspline, Text = "Fullstackedspline"}, - new SelectListItem { Value = ChartOptions.SeriesTypeFullstackedsplinearea, Text = "Fullstackedsplinearea"}, - new SelectListItem { Value = ChartOptions.SeriesTypeScatter, Text = "Scatter"}, - new SelectListItem { Value = ChartOptions.SeriesTypeSpline, Text = "Spline"}, - new SelectListItem { Value = ChartOptions.SeriesTypeSplinearea, Text = "Splinearea"}, - new SelectListItem { Value = ChartOptions.SeriesTypeStackedarea, Text = "Stackedarea"}, - new SelectListItem { Value = ChartOptions.SeriesTypeStackedbar, Text = "Stackedbar"}, - new SelectListItem { Value = ChartOptions.SeriesTypeStackedline, Text = "Stackedline"}, - new SelectListItem { Value = ChartOptions.SeriesTypeStackedspline, Text = "Stackedspline"}, - new SelectListItem { Value = ChartOptions.SeriesTypeStackedsplinearea, Text = "Stackedsplinearea"}, - new SelectListItem { Value = ChartOptions.SeriesTypeSteparea, Text = "Steparea"}, - new SelectListItem { Value = ChartOptions.SeriesTypeStock, Text = "Stock"} - }; - - public static readonly List SeriesSelectionModeList = new List - { - new SelectListItem { Value = ChartOptions.SeriesSelectionModeNone, Text = "None"}, - new SelectListItem { Value = ChartOptions.SeriesSelectionModeAllArgumentPoints, Text = "All Argument Points"}, - new SelectListItem { Value = ChartOptions.SeriesSelectionModeAllSeriesPoints, Text = "All Series Points"}, - new SelectListItem { Value = ChartOptions.SeriesSelectionModeExcludePoints, Text = "Exclude Points"}, - new SelectListItem { Value = ChartOptions.SeriesSelectionModeIncludePoints, Text = "Include Points"}, - new SelectListItem { Value = ChartOptions.SeriesSelectionModeOnlyPoint, Text = "Only Point"} - }; - - public static readonly List DashStyleList = new List - { - new SelectListItem { Value = ChartOptions.DashStyleDash, Text = "Dash"}, - new SelectListItem { Value = ChartOptions.DashStyleDashSolid, Text = "Dash Solid"}, - new SelectListItem { Value = ChartOptions.DashStyleDot, Text = "Dot"}, - new SelectListItem { Value = ChartOptions.DashStyleLongDash, Text = "Long Dash"} - }; - - public static readonly List ArgumentTypeList = new List - { - new SelectListItem { Value = "", Text = "None"}, - new SelectListItem { Value = ChartOptions.ArgumentTypeNumeric, Text = "Numeric"}, - new SelectListItem { Value = ChartOptions.ArgumentTypeDatetime, Text = "Datetime"}, - new SelectListItem { Value = ChartOptions.ArgumentTypeString, Text = "String"} - }; - - public static readonly List ArgumentAxisPositionList = new List - { - new SelectListItem { Value = ChartOptions.ArgumentAxisPositionBottom, Text = "Bottom"}, - new SelectListItem { Value = ChartOptions.ArgumentAxisPositionLeft, Text = "Left"}, - new SelectListItem { Value = ChartOptions.ArgumentAxisPositionRight, Text = "Right"}, - new SelectListItem { Value = ChartOptions.ArgumentAxisPositionTop, Text = "Top"} - }; - - public static readonly List ArgumentAxisHoverModeList = new List - { - new SelectListItem { Value = ChartOptions.ArgumentAxisHoverModeNone, Text = "None"}, - new SelectListItem { Value = ChartOptions.ArgumentAxisHoverModeAllArgumentPoints, Text = "All Argument Points"} - }; - - public static readonly List AggregationIntervalList = new List - { - new SelectListItem { Value = ChartOptions.AggregationIntervalDay, Text = "Day"}, - new SelectListItem { Value = ChartOptions.AggregationIntervalHour, Text = "Hour"}, - new SelectListItem { Value = ChartOptions.AggregationIntervalMillisecond, Text = "Millisecond"}, - new SelectListItem { Value = ChartOptions.AggregationIntervalMinute, Text = "Minute"}, - new SelectListItem { Value = ChartOptions.AggregationIntervalMonth, Text = "Month"}, - new SelectListItem { Value = ChartOptions.AggregationIntervalQuarter, Text = "Quarter"}, - new SelectListItem { Value = ChartOptions.AggregationIntervalSecond, Text = "Second"}, - new SelectListItem { Value = ChartOptions.AggregationIntervalWeek, Text = "Week"}, - new SelectListItem { Value = ChartOptions.AggregationIntervalYear, Text = "Year"} - }; - - public static readonly List LegendPositionList = new List - { - new SelectListItem { Value = ChartOptions.LegendPositionInside, Text = "Inside"}, - new SelectListItem { Value = ChartOptions.LegendPositionOutside, Text = "Outside"} - }; - - public static readonly List LegendOrientationList = new List - { - new SelectListItem { Value = ChartOptions.LegendOrientationHorizontal, Text = "Horizontal"}, - new SelectListItem { Value = ChartOptions.LegendOrientationVertical, Text = "Vertical"} - }; - - public static readonly List ScrollBarPositionList = new List - { - new SelectListItem { Value = ChartOptions.ScrollBarPositionBottom, Text = "Bottom"}, - new SelectListItem { Value = ChartOptions.ScrollBarPositionLeft, Text = "Left"}, - new SelectListItem { Value = ChartOptions.ScrollBarPositionRight, Text = "Right"}, - new SelectListItem { Value = ChartOptions.ScrollBarPositionTop, Text = "Top"} - }; - - public static readonly List TitleHorizontalAlignmentList = new List - { - new SelectListItem { Value = ChartOptions.TitleHorizontalAlignmentCenter, Text = "Center"}, - new SelectListItem { Value = ChartOptions.TitleHorizontalAlignmentLeft, Text = "Left"}, - new SelectListItem { Value = ChartOptions.TitleHorizontalAlignmentRight, Text = "Right"} - }; - - public static readonly List TitleVerticalAlignmentList = new List - { - new SelectListItem { Value = ChartOptions.TitleVerticalAlignmentBottom , Text = "Bottom"}, - new SelectListItem { Value = ChartOptions.TitleVerticalAlignmentTop, Text = "Top"} - }; - - public static readonly List TooltipLocationList = new List - { - new SelectListItem { Value = ChartOptions.TooltipLocationCenter, Text = "Center"}, - new SelectListItem { Value = ChartOptions.TooltipLocationEdge, Text = "Edge"} - }; - - public static readonly List ValueTypeList = new List - { - new SelectListItem { Value = "", Text = "None"}, - new SelectListItem { Value = ChartOptions.ValueTypeNumeric, Text = "Numeric"}, - new SelectListItem { Value = ChartOptions.ValueTypeDatetime, Text = "Datetime"}, - new SelectListItem { Value = ChartOptions.ValueTypeString, Text = "String"} - }; - - public static readonly List ValueAxisPositionList = new List - { - new SelectListItem { Value = ChartOptions.ValueAxisPositionBottom, Text = "Bottom"}, - new SelectListItem { Value = ChartOptions.ValueAxisPositionLeft, Text = "Left"}, - new SelectListItem { Value = ChartOptions.ValueAxisPositionRight, Text = "Right"}, - new SelectListItem { Value = ChartOptions.ValueAxisPositionTop, Text = "Top"} - }; - - public static readonly List ZoomAndPanAxisList = new List - { - new SelectListItem { Value = ChartOptions.ZoomAndPanAxisNone, Text = "None"}, - new SelectListItem { Value = ChartOptions.ZoomAndPanAxisBoth, Text = "Both"}, - new SelectListItem { Value = ChartOptions.ZoomAndPanAxisPan, Text = "Pan"}, - new SelectListItem { Value = ChartOptions.ZoomAndPanAxisZoom, Text = "Zoom"} - }; - - public static readonly List ZoomAndPanKeyList = new List - { - new SelectListItem { Value = ChartOptions.ZoomAndPanKeyAlt, Text = "Alt"}, - new SelectListItem { Value = ChartOptions.ZoomAndPanKeyCtrl, Text = "Ctrl"}, - new SelectListItem { Value = ChartOptions.ZoomAndPanKeyMeta, Text = "Meta"}, - new SelectListItem { Value = ChartOptions.ZoomAndPanKeyShift, Text = "Shift"} - }; - - public static readonly List AnnotationTypeList = new List - { - new SelectListItem { Value = ChartOptions.AnnotationTypeText, Text = "Text"}, - new SelectListItem { Value = ChartOptions.AnnotationTypeImage, Text = "Image"}, - new SelectListItem { Value = ChartOptions.AnnotationTypeCustom, Text = "Custom"} - }; - - public static readonly List WordWrapList = new List - { - new SelectListItem { Value = ChartOptions.WordWrapNone, Text = "None"}, - new SelectListItem { Value = ChartOptions.WordWrapNormal, Text = "Normal"}, - new SelectListItem { Value = ChartOptions.WordWrapBreakWord, Text = "Break Word"} - }; - - public static readonly List TitleTextOverFlowList = new List - { - new SelectListItem { Value = ChartOptions.TitleTextOverFlowNone, Text = "None"}, - new SelectListItem { Value = ChartOptions.TitleTextOverFlowEllipsis, Text = "Ellipsis"}, - new SelectListItem { Value = ChartOptions.TitleTextOverFlowHide, Text = "Hide"} - }; - - public static readonly List BreakStyleLineList = new List - { - new SelectListItem { Value = ChartOptions.BreakStyleLineStraight, Text = "Straight"}, - new SelectListItem { Value = ChartOptions.BreakStyleLineWaved, Text = "Waved"} - }; - - public static readonly List ValueAxisTypeList = new List - { - new SelectListItem { Value = "", Text = "None"}, - new SelectListItem { Value = ChartOptions.ValueAxisTypeContinuous, Text = "Continuous"}, - new SelectListItem { Value = ChartOptions.ValueAxisTypeDiscrete, Text = "Discrete"}, - new SelectListItem { Value = ChartOptions.ValueAxisTypeLogarithmic, Text = "Logarithmic"} - }; - } -} - - diff --git a/api/src/Sozsoft.Platform.Domain.Shared/Enums/ListFormFieldSelectTypeEnum.cs b/api/src/Sozsoft.Platform.Domain.Shared/Enums/ListFormFieldSelectTypeEnum.cs deleted file mode 100644 index fc4f9086..00000000 --- a/api/src/Sozsoft.Platform.Domain.Shared/Enums/ListFormFieldSelectTypeEnum.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Sozsoft.Platform.Enums; - -public enum ListFormFieldSelectTypeEnum -{ - All = 0, - Role = 1, - User = 2 -} - diff --git a/api/src/Sozsoft.Platform.Domain.Shared/Enums/ListFormTabTypeEnum.cs b/api/src/Sozsoft.Platform.Domain.Shared/Enums/ListFormTabTypeEnum.cs index 8e611b25..0e6eccbe 100644 --- a/api/src/Sozsoft.Platform.Domain.Shared/Enums/ListFormTabTypeEnum.cs +++ b/api/src/Sozsoft.Platform.Domain.Shared/Enums/ListFormTabTypeEnum.cs @@ -1,4 +1,4 @@ -namespace Sozsoft.Platform.Enums; +namespace Sozsoft.Platform.Enums; public static class ListFormTabTypeEnum { diff --git a/api/src/Sozsoft.Platform.Domain.Shared/Enums/SequenceResetPeriodEnum.cs b/api/src/Sozsoft.Platform.Domain.Shared/Enums/SequenceResetPeriodEnum.cs index 669eef51..080a1ead 100644 --- a/api/src/Sozsoft.Platform.Domain.Shared/Enums/SequenceResetPeriodEnum.cs +++ b/api/src/Sozsoft.Platform.Domain.Shared/Enums/SequenceResetPeriodEnum.cs @@ -1,4 +1,4 @@ -namespace Sozsoft.Platform.Enums; +namespace Sozsoft.Platform.Enums; public enum SequenceResetPeriod { @@ -8,4 +8,4 @@ public enum SequenceResetPeriod Daily = 3, Hourly = 4, Minutely = 5 -} \ No newline at end of file +} diff --git a/api/src/Sozsoft.Platform.Domain.Shared/Enums/UiColumnFilterType.cs b/api/src/Sozsoft.Platform.Domain.Shared/Enums/UiColumnFilterType.cs deleted file mode 100644 index 3fdd676a..00000000 --- a/api/src/Sozsoft.Platform.Domain.Shared/Enums/UiColumnFilterType.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Sozsoft.Platform.Enums; - -public enum UiColumnFilterTypeEnum -{ - RowFilter = 1, - PanelFilter = 2, - HeaderFilter = 3, - HeaderCustomFilter = 4 -} - diff --git a/api/src/Sozsoft.Platform.Domain.Shared/Enums/UiColumnType.cs b/api/src/Sozsoft.Platform.Domain.Shared/Enums/UiColumnType.cs deleted file mode 100644 index 36dc5c0c..00000000 --- a/api/src/Sozsoft.Platform.Domain.Shared/Enums/UiColumnType.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Sozsoft.Platform.Enums; - -public enum UiColumnTypeEnum -{ - Text = 1, - Number = 2, - DateTime = 3, - DropDown = 4, -} - - diff --git a/api/src/Sozsoft.Platform.Domain.Shared/Enums/WizardComponentKindEnum.cs b/api/src/Sozsoft.Platform.Domain.Shared/Enums/WizardComponentKindEnum.cs index 9e67cf93..e4fc396d 100644 --- a/api/src/Sozsoft.Platform.Domain.Shared/Enums/WizardComponentKindEnum.cs +++ b/api/src/Sozsoft.Platform.Domain.Shared/Enums/WizardComponentKindEnum.cs @@ -1,4 +1,4 @@ -namespace Sozsoft.Platform.Enums; +namespace Sozsoft.Platform.Enums; /// /// Wizard'in hangi yolu urettigini belirler. Varsayilan oldugu icin diff --git a/api/src/Sozsoft.Platform.Domain.Shared/Enums/WizardImportEntryStatusEnum.cs b/api/src/Sozsoft.Platform.Domain.Shared/Enums/WizardImportEntryStatusEnum.cs index d3bfa0a6..8be1bcfe 100644 --- a/api/src/Sozsoft.Platform.Domain.Shared/Enums/WizardImportEntryStatusEnum.cs +++ b/api/src/Sozsoft.Platform.Domain.Shared/Enums/WizardImportEntryStatusEnum.cs @@ -1,4 +1,4 @@ -namespace Sozsoft.Platform.Enums; +namespace Sozsoft.Platform.Enums; /// Import edilen zip girdisinin hedef kapsam klasorundeki dosyayla karsilastirma sonucu. public enum WizardImportEntryStatusEnum diff --git a/api/src/Sozsoft.Platform.Domain.Shared/PlatformConsts.cs b/api/src/Sozsoft.Platform.Domain.Shared/PlatformConsts.cs index 5d39273a..bc3f189f 100644 --- a/api/src/Sozsoft.Platform.Domain.Shared/PlatformConsts.cs +++ b/api/src/Sozsoft.Platform.Domain.Shared/PlatformConsts.cs @@ -195,7 +195,7 @@ public static class PlatformConsts public static readonly DateTime AdminBirthDateDefaultValue = new(1981, 8, 27); public const string AdminBirthPlaceDefaultValue = "Kadıköy, İstanbul"; public const string AdminMaritalStatusDefaultValue = "Evli"; - + public const UserType InternalUserTypeDefaultValue = PlatformConsts.UserType.Internal; public const UserType ExternalUserTypeDefaultValue = PlatformConsts.UserType.External; } @@ -472,7 +472,7 @@ public static class PlatformConsts public const string RecurringJobs = Default + ".RecurringJobs"; public const string Jobs = Default + ".Jobs"; - } + } public static class Menus { @@ -897,44 +897,6 @@ public static class PlatformConsts return TableNameResolver.GetFullViewName($"{TableName}"); } - public static class ListFormFieldAlignment - { - public const string Left = "left"; - public const string Center = "center"; - public const string Right = "right"; - } - - public static class ListFormFieldFormat - { - public const string Billions = "billions"; - public const string Currency = "currency"; - public const string Day = "day"; - public const string Decimal = "decimal"; - public const string Exponential = "exponential"; - public const string FixedPoint = "fixedPoint"; - public const string LargeNumber = "largeNumber"; - public const string LongDate = "longDate"; - public const string LongTime = "longTime"; - public const string Millions = "millions"; - public const string Millisecond = "millisecond"; - public const string Month = "month"; - public const string MonthAndDay = "monthAndDay"; - public const string MonthAndYear = "monthAndYear"; - public const string Percent = "percent"; - public const string Quarter = "quarter"; - public const string QuarterAndYear = "quarterAndYear"; - public const string ShortDate = "shortDate"; - public const string ShortTime = "shortTime"; - public const string Thousands = "thousands"; - public const string Trillions = "trillions"; - public const string Year = "year"; - public const string DayOfWeek = "dayOfWeek"; - public const string Hour = "hour"; - public const string LongDateLongTime = "longDateLongTime"; - public const string Minute = "minute"; - public const string Second = "second"; - public const string ShortDateShortTime = "shortDateShortTime"; - } } diff --git a/api/src/Sozsoft.Platform.Domain.Shared/PlatformGlobalFeatureConfigurator.cs b/api/src/Sozsoft.Platform.Domain.Shared/PlatformGlobalFeatureConfigurator.cs index 59bc9676..d4a8d08c 100644 --- a/api/src/Sozsoft.Platform.Domain.Shared/PlatformGlobalFeatureConfigurator.cs +++ b/api/src/Sozsoft.Platform.Domain.Shared/PlatformGlobalFeatureConfigurator.cs @@ -10,13 +10,13 @@ public static class PlatformGlobalFeatureConfigurator { OneTimeRunner.Run(() => { - /* You can configure (enable/disable) global features of the used modules here. - * - * YOU CAN SAFELY DELETE THIS CLASS AND REMOVE ITS USAGES IF YOU DON'T NEED TO IT! - * - * Please refer to the documentation to lear more about the Global Features System: - * https://docs.abp.io/en/abp/latest/Global-Features - */ + /* You can configure (enable/disable) global features of the used modules here. + * + * YOU CAN SAFELY DELETE THIS CLASS AND REMOVE ITS USAGES IF YOU DON'T NEED TO IT! + * + * Please refer to the documentation to lear more about the Global Features System: + * https://docs.abp.io/en/abp/latest/Global-Features + */ }); } } diff --git a/api/src/Sozsoft.Platform.Domain.Shared/PlatformModuleExtensionConfigurator.cs b/api/src/Sozsoft.Platform.Domain.Shared/PlatformModuleExtensionConfigurator.cs index c0cf95ba..b3ffa029 100644 --- a/api/src/Sozsoft.Platform.Domain.Shared/PlatformModuleExtensionConfigurator.cs +++ b/api/src/Sozsoft.Platform.Domain.Shared/PlatformModuleExtensionConfigurator.cs @@ -1,8 +1,7 @@ -using Sozsoft.Platform.Identity; -using Sozsoft.Platform.Localization; -using System; +using System; using System.ComponentModel; using System.ComponentModel.DataAnnotations; +using Sozsoft.Platform.Localization; using Volo.Abp.Localization; using Volo.Abp.ObjectExtending; using Volo.Abp.Threading; diff --git a/api/src/Sozsoft.Platform.Domain.Shared/WizardConsts.cs b/api/src/Sozsoft.Platform.Domain.Shared/WizardConsts.cs index 3492b111..d304258b 100644 --- a/api/src/Sozsoft.Platform.Domain.Shared/WizardConsts.cs +++ b/api/src/Sozsoft.Platform.Domain.Shared/WizardConsts.cs @@ -1,13 +1,8 @@ -using System; +using System; using System.Data; using System.Text.Json; using Sozsoft.Platform.Enums; using static Sozsoft.Platform.PlatformConsts; -using System.Linq; -using System.Reflection; -using System.ComponentModel.DataAnnotations; -using System.Text.RegularExpressions; -using System.Globalization; public static class WizardConsts { @@ -37,44 +32,6 @@ public static class WizardConsts public static string MenuUrl(string code) => $"/admin/list/{code}"; public static string MenuIcon => "FcList"; - public static class LabelHelper - { - public static string GetCamelCaseLabel(string propertyName) - { - var prop = typeof(T).GetProperty(propertyName); - if (prop == null) - return propertyName; - - // 1. Display varsa direkt onu kullan - var displayAttr = prop.GetCustomAttribute(); - if (displayAttr != null && !string.IsNullOrWhiteSpace(displayAttr.Name)) - return displayAttr.Name; - - // 2. CamelCase → kelimelere ayır - var words = Regex - .Split(propertyName, "(?=[A-Z])") - .Where(x => !string.IsNullOrWhiteSpace(x)) - .ToList(); - - // 3. Türkçe karakter dönüşümü + düzgün büyük harf - var culture = new CultureInfo("tr-TR"); - - words = words.Select(w => - { - w = w.ToLower(culture); - - // Türkçe karakter normalize (genel yaklaşım) - w = w - .Replace("i", "i") // bilinçli bırakıyoruz - .Replace("ı", "ı"); // zaten doğru - - return culture.TextInfo.ToTitleCase(w); - }).ToList(); - - return string.Join(" ", words); - } - } - public static readonly string DefaultExportJson = JsonSerializer.Serialize(new { Enabled = true, diff --git a/api/src/Sozsoft.Platform.Domain/BackgroundWorkers/ISessionCleanupWorker.cs b/api/src/Sozsoft.Platform.Domain/BackgroundWorkers/ISessionCleanupWorker.cs index 56696771..20c439fa 100644 --- a/api/src/Sozsoft.Platform.Domain/BackgroundWorkers/ISessionCleanupWorker.cs +++ b/api/src/Sozsoft.Platform.Domain/BackgroundWorkers/ISessionCleanupWorker.cs @@ -1,4 +1,4 @@ -using System.Threading; +using System.Threading; using System.Threading.Tasks; namespace Sozsoft.Platform.BackgroundWorkers; diff --git a/api/src/Sozsoft.Platform.Domain/BackgroundWorkers/NotificationWorker.cs b/api/src/Sozsoft.Platform.Domain/BackgroundWorkers/NotificationWorker.cs index fa3ef9fd..9ab94eed 100644 --- a/api/src/Sozsoft.Platform.Domain/BackgroundWorkers/NotificationWorker.cs +++ b/api/src/Sozsoft.Platform.Domain/BackgroundWorkers/NotificationWorker.cs @@ -2,6 +2,8 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; using Sozsoft.Notifications.Entities; using Sozsoft.Notifications.Enums; using Sozsoft.Platform.Data.Seeds; @@ -9,8 +11,6 @@ using Sozsoft.Sender.Mail; using Sozsoft.Sender.Rocket; using Sozsoft.Sender.Sms; using Sozsoft.Sender.WhatsApp; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; using Volo.Abp.BackgroundWorkers; using Volo.Abp.Domain.Repositories; using Volo.Abp.Identity; @@ -66,7 +66,7 @@ public class NotificationWorker : BackgroundWorkerBase { notification.IsSent = true; notification.IsRead = true; - await Repository.UpdateAsync(notification, autoSave: true); + await Repository.UpdateAsync(notification, autoSave: true, cancellationToken: cancellationToken); } } catch (Exception ex) @@ -85,7 +85,7 @@ public class NotificationWorker : BackgroundWorkerBase { notification.IsSent = true; notification.IsRead = true; - await Repository.UpdateAsync(notification, autoSave: true); + await Repository.UpdateAsync(notification, autoSave: true, cancellationToken: cancellationToken); } } catch (Exception ex) @@ -112,7 +112,7 @@ public class NotificationWorker : BackgroundWorkerBase { notification.IsSent = true; notification.IsRead = true; - await Repository.UpdateAsync(notification, autoSave: true); + await Repository.UpdateAsync(notification, autoSave: true, cancellationToken: cancellationToken); } } catch (Exception ex) @@ -131,7 +131,7 @@ public class NotificationWorker : BackgroundWorkerBase { notification.IsSent = true; notification.IsRead = true; - await Repository.UpdateAsync(notification, autoSave: true); + await Repository.UpdateAsync(notification, autoSave: true, cancellationToken: cancellationToken); } } catch (Exception ex) diff --git a/api/src/Sozsoft.Platform.Domain/BackgroundWorkers/PlatformBackgroundWorker.cs b/api/src/Sozsoft.Platform.Domain/BackgroundWorkers/PlatformBackgroundWorker.cs index 31aa94af..310b0bf1 100644 --- a/api/src/Sozsoft.Platform.Domain/BackgroundWorkers/PlatformBackgroundWorker.cs +++ b/api/src/Sozsoft.Platform.Domain/BackgroundWorkers/PlatformBackgroundWorker.cs @@ -1,26 +1,26 @@ using System; +using System.IO; using System.Text.Json; using System.Threading; using System.Threading.Tasks; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Localization; +using Microsoft.Extensions.Logging; using Sozsoft.MailQueue.Domain; using Sozsoft.MailQueue.Domain.Shared; using Sozsoft.Platform.DynamicData; using Sozsoft.Platform.Entities; using Sozsoft.Platform.Enums; using Sozsoft.Platform.Localization; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Localization; -using Microsoft.Extensions.Logging; using Volo.Abp.DependencyInjection; using Volo.Abp.DistributedLocking; using Volo.Abp.Domain.Repositories; using Volo.Abp.ExceptionHandling; using Volo.Abp.ObjectMapping; using Volo.Abp.Settings; -using Volo.Abp.Users; -using Microsoft.Extensions.Configuration; -using System.IO; using Volo.Abp.Uow; +using Volo.Abp.Users; namespace Sozsoft.Platform.BackgroundWorkers; diff --git a/api/src/Sozsoft.Platform.Domain/BackgroundWorkers/PlatformTemplateDynamicStore.cs b/api/src/Sozsoft.Platform.Domain/BackgroundWorkers/PlatformTemplateDynamicStore.cs index 38c8632f..e8f2d7dd 100644 --- a/api/src/Sozsoft.Platform.Domain/BackgroundWorkers/PlatformTemplateDynamicStore.cs +++ b/api/src/Sozsoft.Platform.Domain/BackgroundWorkers/PlatformTemplateDynamicStore.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Collections.Immutable; using System.Threading.Tasks; using Volo.Abp; diff --git a/api/src/Sozsoft.Platform.Domain/Branch/BranchSeedManager.cs b/api/src/Sozsoft.Platform.Domain/Branch/BranchSeedManager.cs index 6136cafe..248ef1e6 100644 --- a/api/src/Sozsoft.Platform.Domain/Branch/BranchSeedManager.cs +++ b/api/src/Sozsoft.Platform.Domain/Branch/BranchSeedManager.cs @@ -1,23 +1,18 @@ using System; using System.IO; +using System.Text.Json; using System.Threading.Tasks; using Microsoft.Extensions.Configuration; -using System.Text.Json; using Volo.Abp.Domain.Services; -using Volo.Abp.Domain.Repositories; -using Sozsoft.Platform.Entities; namespace Sozsoft.Platform.Branchs; public class BranchSeedManager : DomainService { - private readonly IRepository _branchRepository; public BranchSeedManager( - IRepository branchRepository ) { - _branchRepository = branchRepository; } public async Task SeedRecordsAsync(Guid? tenantId, Guid branchId) diff --git a/api/src/Sozsoft.Platform.Domain/Branch/BranchSeederDto.cs b/api/src/Sozsoft.Platform.Domain/Branch/BranchSeederDto.cs index d9608390..054697b3 100644 --- a/api/src/Sozsoft.Platform.Domain/Branch/BranchSeederDto.cs +++ b/api/src/Sozsoft.Platform.Domain/Branch/BranchSeederDto.cs @@ -19,4 +19,4 @@ public class BankSeedDto public string PostalCode { get; set; } public string PhoneNumber { get; set; } public string Email { get; set; } -} \ No newline at end of file +} diff --git a/api/src/Sozsoft.Platform.Domain/Data/CrudEndpointSeedFile.cs b/api/src/Sozsoft.Platform.Domain/Data/CrudEndpointSeedFile.cs index 526755db..cf77afb8 100644 --- a/api/src/Sozsoft.Platform.Domain/Data/CrudEndpointSeedFile.cs +++ b/api/src/Sozsoft.Platform.Domain/Data/CrudEndpointSeedFile.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; namespace Sozsoft.Platform.Data.Seeds; diff --git a/api/src/Sozsoft.Platform.Domain/Data/CustomComponentDataSourceResolver.cs b/api/src/Sozsoft.Platform.Domain/Data/CustomComponentDataSourceResolver.cs index a3e1989a..b4926f73 100644 --- a/api/src/Sozsoft.Platform.Domain/Data/CustomComponentDataSourceResolver.cs +++ b/api/src/Sozsoft.Platform.Domain/Data/CustomComponentDataSourceResolver.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text.Json; diff --git a/api/src/Sozsoft.Platform.Domain/Data/IAfterAllMigrationsSqlExecutor.cs b/api/src/Sozsoft.Platform.Domain/Data/IAfterAllMigrationsSqlExecutor.cs index 15f89d0f..80200288 100644 --- a/api/src/Sozsoft.Platform.Domain/Data/IAfterAllMigrationsSqlExecutor.cs +++ b/api/src/Sozsoft.Platform.Domain/Data/IAfterAllMigrationsSqlExecutor.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Threading.Tasks; namespace Sozsoft.Platform.Data; diff --git a/api/src/Sozsoft.Platform.Domain/Data/SeedConsts.cs b/api/src/Sozsoft.Platform.Domain/Data/SeedConsts.cs index a6c05669..4280f7d7 100644 --- a/api/src/Sozsoft.Platform.Domain/Data/SeedConsts.cs +++ b/api/src/Sozsoft.Platform.Domain/Data/SeedConsts.cs @@ -170,14 +170,6 @@ public static class SeedConsts public static class AbpSettings { - public static class AbpLocalization - { - public const string GroupName = $"{Prefix.Abp}.Localization"; - - public const string DefaultLanguage = GroupName + ".DefaultLanguage"; - public const string Timezone = GroupName + ".Timezone"; - } - public static class Mailing { public const string GroupName = $"{Prefix.Abp}.Mailing"; diff --git a/api/src/Sozsoft.Platform.Domain/Data/SeedPathResolver.cs b/api/src/Sozsoft.Platform.Domain/Data/SeedPathResolver.cs index 758743e7..fbae1bd7 100644 --- a/api/src/Sozsoft.Platform.Domain/Data/SeedPathResolver.cs +++ b/api/src/Sozsoft.Platform.Domain/Data/SeedPathResolver.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.IO; using System.Linq; using Microsoft.Extensions.Configuration; diff --git a/api/src/Sozsoft.Platform.Domain/DynamicData/DynamicDataManager.cs b/api/src/Sozsoft.Platform.Domain/DynamicData/DynamicDataManager.cs index 3472d3d5..9aca200d 100644 --- a/api/src/Sozsoft.Platform.Domain/DynamicData/DynamicDataManager.cs +++ b/api/src/Sozsoft.Platform.Domain/DynamicData/DynamicDataManager.cs @@ -1,10 +1,10 @@ using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Localization; using Sozsoft.Platform.Enums; using Sozsoft.Platform.ListForms; using Sozsoft.Platform.Localization; using Sozsoft.Platform.Queries; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Localization; using Volo.Abp; using Volo.Abp.ObjectMapping; using Volo.Abp.Settings; diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Host/ChangeLog.cs b/api/src/Sozsoft.Platform.Domain/Entities/Host/ChangeLog.cs index 6a3d3082..5ac5049d 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Host/ChangeLog.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Host/ChangeLog.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using Volo.Abp.Domain.Entities.Auditing; diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Host/DbTableColumn.cs b/api/src/Sozsoft.Platform.Domain/Entities/Host/DbTableColumn.cs index aab953aa..b19dbed2 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Host/DbTableColumn.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Host/DbTableColumn.cs @@ -1,25 +1,25 @@ -using System; +using System; using Volo.Abp.Domain.Entities; namespace Sozsoft.Platform.Entities; public class DbTableColumn : Entity { - public string TenantName { get; set; } + public string TenantName { get; set; } public string DictionaryType { get; set; } public string DefinitionCultureName { get; set; } public string UiCultureName { get; set; } public string? ListFormCode { get; set; } - public bool OnlyBaseDefinitions { get; set; } + public bool OnlyBaseDefinitions { get; set; } public string? ResourceName { get; set; } - public int MaxForms { get; set; } - public string CacheKey { get; set; } - public string JsonData { get; set; } - public int FormCount { get; set; } + public int MaxForms { get; set; } + public string CacheKey { get; set; } + public string JsonData { get; set; } + public int FormCount { get; set; } public int FieldCount { get; set; } public int JsonLength { get; set; } public bool IsActive { get; set; } - public DateTime RefreshedAt { get; set; } + public DateTime RefreshedAt { get; set; } public string? SourceProcedure { get; set; } public string? Note { get; set; } -} \ No newline at end of file +} diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Host/Definitions/CountryGroup.cs b/api/src/Sozsoft.Platform.Domain/Entities/Host/Definitions/CountryGroup.cs index 2250630f..19ec5dd1 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Host/Definitions/CountryGroup.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Host/Definitions/CountryGroup.cs @@ -1,5 +1,4 @@ -using System; -using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.Domain.Entities.Auditing; namespace Sozsoft.Platform.Entities; diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Host/Definitions/SkillLevel.cs b/api/src/Sozsoft.Platform.Domain/Entities/Host/Definitions/SkillLevel.cs index bb0ceaba..0e8fe483 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Host/Definitions/SkillLevel.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Host/Definitions/SkillLevel.cs @@ -10,7 +10,7 @@ public class SkillLevel : FullAuditedEntity public string Name { get; set; } public int Progress { get; set; } public bool IsDefault { get; set; } - + public SkillLevel(string id) { Id = id; diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Host/Definitions/SkillType.cs b/api/src/Sozsoft.Platform.Domain/Entities/Host/Definitions/SkillType.cs index a28303a1..c339ae6b 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Host/Definitions/SkillType.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Host/Definitions/SkillType.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using Volo.Abp.Domain.Entities.Auditing; namespace Sozsoft.Platform.Entities; diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Host/Definitions/Uom.cs b/api/src/Sozsoft.Platform.Domain/Entities/Host/Definitions/Uom.cs index 4c1f6678..f1157d1a 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Host/Definitions/Uom.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Host/Definitions/Uom.cs @@ -1,5 +1,4 @@ -using System; -using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.Domain.Entities.Auditing; namespace Sozsoft.Platform.Entities; diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/Agenda.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/Agenda.cs index c9286065..051dcf41 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/Agenda.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/Agenda.cs @@ -14,9 +14,9 @@ public class Agenda : FullAuditedEntity, IMultiTenant public DateTime StartDate { get; set; } public DateTime EndDate { get; set; } - public bool? AllDay { get; set; } - public string RecurrenceRule { get; set; } - public string RecurrenceException { get; set; } + public bool? AllDay { get; set; } + public string RecurrenceRule { get; set; } + public string RecurrenceException { get; set; } public Agenda(Guid id) { diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/Menu.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/Menu.cs index 09983ee9..ce0c5db2 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/Menu.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/Menu.cs @@ -22,4 +22,4 @@ public class Menu : Entity public string UserId { get; set; } // External kullanici id (orn: ali.akman. ihtiyaca gore guid veya int de olabilir) public string RoleId { get; set; } // External role id (orn: ihracat) public string CultureName { get; set; } // Bu tanim hangi dil icin "en", "tr" -} \ No newline at end of file +} diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/MenuGroup.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/MenuGroup.cs index 066adbcc..9f521453 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/MenuGroup.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/MenuGroup.cs @@ -6,7 +6,7 @@ public class MenuGroup : Entity { public string Name { get; set; } - public MenuGroup(string id) + public MenuGroup(string id) { Id = id; } diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/Report/ReportCategory.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/Report/ReportCategory.cs index 9f399ba9..7c5dbc14 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/Report/ReportCategory.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/Report/ReportCategory.cs @@ -3,25 +3,24 @@ using System.Collections.Generic; using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.MultiTenancy; -namespace Sozsoft.Platform.Entities +namespace Sozsoft.Platform.Entities; + +public class ReportCategory : FullAuditedEntity, IMultiTenant { - public class ReportCategory : FullAuditedEntity, IMultiTenant + public Guid? TenantId { get; set; } + + public string Name { get; set; } + public string Description { get; set; } + public string Icon { get; set; } + + public ICollection ReportTemplates { get; set; } + + protected ReportCategory() { - public Guid? TenantId { get; set; } + } - public string Name { get; set; } - public string Description { get; set; } - public string Icon { get; set; } - - public ICollection ReportTemplates { get; set; } - - protected ReportCategory() - { - } - - public ReportCategory(Guid id) : base(id) - { - } + public ReportCategory(Guid id) : base(id) + { } } diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/Report/ReportTemplate.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/Report/ReportTemplate.cs index 4d54680d..166e306f 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/Report/ReportTemplate.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/Report/ReportTemplate.cs @@ -2,37 +2,36 @@ using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.MultiTenancy; -namespace Sozsoft.Platform.Entities +namespace Sozsoft.Platform.Entities; + +public class ReportTemplate : FullAuditedEntity, IMultiTenant { - public class ReportTemplate : FullAuditedEntity, IMultiTenant + public Guid? TenantId { get; set; } + + public string Name { get; set; } + public string Description { get; set; } + public string HtmlContent { get; set; } + + public Guid CategoryId { get; set; } + public ReportCategory ReportCategory { get; set; } + + public string Status { get; set; } + + + public ReportTemplate( + Guid id, + string name, + string description, + string htmlContent, + Guid categoryId, + string status + ) : base(id) { - public Guid? TenantId { get; set; } - - public string Name { get; set; } - public string Description { get; set; } - public string HtmlContent { get; set; } - - public Guid CategoryId { get; set; } - public ReportCategory ReportCategory { get; set; } - - public string Status { get; set; } - - - public ReportTemplate( - Guid id, - string name, - string description, - string htmlContent, - Guid categoryId, - string status - ) : base(id) - { - Name = name; - Description = description; - HtmlContent = htmlContent; - CategoryId = categoryId; - Status = status; - } + Name = name; + Description = description; + HtmlContent = htmlContent; + CategoryId = categoryId; + Status = status; } } diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/Website/Home.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/Website/Home.cs index 77732a75..b98ba152 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/Website/Home.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Administration/Website/Home.cs @@ -1,4 +1,4 @@ -using System; +using System; using Volo.Abp.Domain.Entities.Auditing; namespace Sozsoft.Platform.Entities; diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Definitions/Sector.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Definitions/Sector.cs index 68c3ffee..69e3f9f8 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Definitions/Sector.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Definitions/Sector.cs @@ -7,7 +7,7 @@ namespace Sozsoft.Platform.Entities; public class Sector : FullAuditedEntity, IMultiTenant { public Guid? TenantId { get; set; } - + public string Name { get; set; } Guid? IMultiTenant.TenantId => TenantId; diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Definitions/WorkHour.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Definitions/WorkHour.cs index 7278c55f..ea5db75f 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Definitions/WorkHour.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Definitions/WorkHour.cs @@ -4,7 +4,7 @@ using Volo.Abp.MultiTenancy; namespace Sozsoft.Platform.Entities; -public class WorkHour : FullAuditedEntity, IMultiTenant +public class WorkHour : FullAuditedEntity, IMultiTenant { public Guid? TenantId { get; set; } diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/Announcement.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/Announcement.cs index d4ef700f..d24933e6 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/Announcement.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/Announcement.cs @@ -12,7 +12,7 @@ public class Announcement : FullAuditedEntity, IMultiTenant public string Excerpt { get; set; } public string Content { get; set; } public string ImageUrl { get; set; } - public string Category { get; set; } + public string Category { get; set; } public Guid? UserId { get; set; } public DateTime PublishDate { get; set; } public DateTime? ExpiryDate { get; set; } diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/AnnouncementComment.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/AnnouncementComment.cs index a52cc4a4..145e06b9 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/AnnouncementComment.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/AnnouncementComment.cs @@ -1,4 +1,4 @@ -using System; +using System; using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.MultiTenancy; diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/AnnouncementLike.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/AnnouncementLike.cs index 18d3a34c..616cb0f8 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/AnnouncementLike.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/AnnouncementLike.cs @@ -1,4 +1,4 @@ -using System; +using System; using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.MultiTenancy; diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/EventCategory.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/EventCategory.cs index d975018a..0ff4434c 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/EventCategory.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/EventCategory.cs @@ -1,7 +1,7 @@ using System; +using System.Collections.Generic; using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.MultiTenancy; -using System.Collections.Generic; namespace Sozsoft.Platform.Entities; diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/EventLike.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/EventLike.cs index 445b2ac7..439473e2 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/EventLike.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/EventLike.cs @@ -1,4 +1,4 @@ -using System; +using System; using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.MultiTenancy; diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/EventType.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/EventType.cs index 061e2b8b..48b101a7 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/EventType.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/EventType.cs @@ -1,7 +1,7 @@ using System; +using System.Collections.Generic; using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.MultiTenancy; -using System.Collections.Generic; namespace Sozsoft.Platform.Entities; diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/SocialPost.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/SocialPost.cs index 42d18a1b..7d266214 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/SocialPost.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/SocialPost.cs @@ -118,7 +118,7 @@ public class SocialLike : FullAuditedEntity, IMultiTenant public Guid? UserId { get; set; } - public SocialLike(Guid id) + public SocialLike(Guid id) { Id = id; } diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/Survey.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/Survey.cs index e01eae32..09194388 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/Survey.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Intranet/Survey.cs @@ -61,7 +61,7 @@ public class SurveyResponse : FullAuditedEntity, IMultiTenant public SurveyResponse(Guid id) { - Id = id; + Id = id; } protected SurveyResponse() { } @@ -76,13 +76,13 @@ public class SurveyAnswer : FullAuditedEntity, IMultiTenant public Guid QuestionId { get; set; } public SurveyQuestion Question { get; set; } - + public string QuestionType { get; set; } // rating | multiple-choice | text | textarea | yes-no public string Value { get; set; } public SurveyAnswer(Guid id) { - Id = id; + Id = id; } protected SurveyAnswer() { } diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/ListForm/ListForm.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/ListForm/ListForm.cs index bf3c27f4..af8011c8 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/ListForm/ListForm.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/ListForm/ListForm.cs @@ -1,6 +1,6 @@ -using Sozsoft.Platform.Enums; -using System; +using System; using System.Data; +using Sozsoft.Platform.Enums; using Volo.Abp.Domain.Entities; namespace Sozsoft.Platform.Entities; @@ -128,7 +128,7 @@ public class ListForm : Entity /// Subformları hangi layout gösterilecek public string SubFormsListFormType { get; set; } = ListFormTypeEnum.Form; - + /// Bu listform show note gösterilsin mi? public bool ShowNote { get; set; } = true; diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/ListForm/ListFormCustomization.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/ListForm/ListFormCustomization.cs index 7dd3434a..0fd6ac0c 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/ListForm/ListFormCustomization.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/ListForm/ListFormCustomization.cs @@ -1,5 +1,5 @@ -using Sozsoft.Platform.Enums; -using System; +using System; +using Sozsoft.Platform.Enums; using Volo.Abp.Domain.Entities.Auditing; namespace Sozsoft.Platform.Entities; diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/ListForm/ListFormWorkflow.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/ListForm/ListFormWorkflow.cs index 11ae3c39..5ba53a9b 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/ListForm/ListFormWorkflow.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/ListForm/ListFormWorkflow.cs @@ -1,5 +1,4 @@ -using System; -using Volo.Abp.Domain.Entities; +using Volo.Abp.Domain.Entities; namespace Sozsoft.Platform.Entities; diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Messenger/MessengerConversation.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Messenger/MessengerConversation.cs index 3e3a5ef3..11e514e0 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Messenger/MessengerConversation.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Messenger/MessengerConversation.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.MultiTenancy; diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Messenger/MessengerConversationMessage.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Messenger/MessengerConversationMessage.cs index 5a9b6a42..b959c334 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Messenger/MessengerConversationMessage.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Messenger/MessengerConversationMessage.cs @@ -1,4 +1,4 @@ -using System; +using System; using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.MultiTenancy; diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Saas/DevRequest.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Saas/DevRequest.cs index e9858629..a37da81a 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Saas/DevRequest.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Saas/DevRequest.cs @@ -10,14 +10,14 @@ public class DevRequest : FullAuditedEntity public DateTime? RequestDate { get; set; } public string? Title { get; set; } - public string? Status { get; set; } - public string? Description { get; set; } + public string? Status { get; set; } + public string? Description { get; set; } public DateTime? DueDate { get; set; } public string? Tags { get; set; } - public string? Assignees { get; set; } - public string? Priority { get; set; } - public bool? Completed { get; set; } - public int? SortOrder { get; set; } + public string? Assignees { get; set; } + public string? Priority { get; set; } + public bool? Completed { get; set; } + public int? SortOrder { get; set; } public DevRequest(Guid id) diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Saas/Note.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Saas/Note.cs index 0ff4111b..2b92a8b6 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Saas/Note.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Saas/Note.cs @@ -20,6 +20,6 @@ public class Note : FullAuditedEntity, IMultiTenant public string Type { get; set; } public string Subject { get; set; } public string Content { get; set; } - + public string FilesJson { get; set; } } diff --git a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Saas/Sequence.cs b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Saas/Sequence.cs index 29e6bfa8..a238fb84 100644 --- a/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Saas/Sequence.cs +++ b/api/src/Sozsoft.Platform.Domain/Entities/Tenant/Saas/Sequence.cs @@ -1,7 +1,7 @@ -using System; +using System; +using Sozsoft.Platform.Enums; using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.MultiTenancy; -using Sozsoft.Platform.Enums; public class Sequence : FullAuditedEntity, IMultiTenant { @@ -129,4 +129,4 @@ public class Sequence : FullAuditedEntity, IMultiTenant _ => null }; } -} \ No newline at end of file +} diff --git a/api/src/Sozsoft.Platform.Domain/Extensions/AbpTenantExtensions.cs b/api/src/Sozsoft.Platform.Domain/Extensions/AbpTenantExtensions.cs index 7ab3f153..8367f4ae 100644 --- a/api/src/Sozsoft.Platform.Domain/Extensions/AbpTenantExtensions.cs +++ b/api/src/Sozsoft.Platform.Domain/Extensions/AbpTenantExtensions.cs @@ -1,5 +1,4 @@ -using System; -using Volo.Abp.Data; +using Volo.Abp.Data; using Volo.Abp.TenantManagement; namespace Sozsoft.Platform.Extensions; diff --git a/api/src/Sozsoft.Platform.Domain/Extensions/StringExtensions.cs b/api/src/Sozsoft.Platform.Domain/Extensions/StringExtensions.cs index 940366cf..820cec64 100644 --- a/api/src/Sozsoft.Platform.Domain/Extensions/StringExtensions.cs +++ b/api/src/Sozsoft.Platform.Domain/Extensions/StringExtensions.cs @@ -1,29 +1,28 @@ using System; -namespace Sozsoft.Platform.Extensions -{ - public static class StringExtensions - { - public static string RemoveParentheses(this string str) - { - return str?.Replace("(", "").Replace(")", ""); - } +namespace Sozsoft.Platform.Extensions; - public static string GetSegment(this string str, char segment, int index) +public static class StringExtensions +{ + public static string RemoveParentheses(this string str) + { + return str?.Replace("(", "").Replace(")", ""); + } + + public static string GetSegment(this string str, char segment, int index) + { + var start = str.NthIndexOf(segment, index); + if (start == -1) { - var start = str.NthIndexOf(segment, index); - if (start == -1) - { - return null; - } - start += 1; - var end = str.NthIndexOf(segment, index + 1); - if (end == -1) - { - return null; - } - return str[start..end]; + return null; } + start += 1; + var end = str.NthIndexOf(segment, index + 1); + if (end == -1) + { + return null; + } + return str[start..end]; } } diff --git a/api/src/Sozsoft.Platform.Domain/Identity/TurnstileCaptchaManager.cs b/api/src/Sozsoft.Platform.Domain/Identity/TurnstileCaptchaManager.cs index 0ae79022..5d4803cb 100644 --- a/api/src/Sozsoft.Platform.Domain/Identity/TurnstileCaptchaManager.cs +++ b/api/src/Sozsoft.Platform.Domain/Identity/TurnstileCaptchaManager.cs @@ -1,9 +1,9 @@ -using System; +using System; using System.Text.Json.Serialization; using System.Threading.Tasks; using Flurl.Http; -using Sozsoft.Platform.Localization; using Microsoft.Extensions.Localization; +using Sozsoft.Platform.Localization; using Volo.Abp; using Volo.Abp.ObjectMapping; using Volo.Abp.Settings; diff --git a/api/src/Sozsoft.Platform.Domain/ListForms/ListFormAuthorizationManager.cs b/api/src/Sozsoft.Platform.Domain/ListForms/ListFormAuthorizationManager.cs index c9ade36c..5f80c1d5 100644 --- a/api/src/Sozsoft.Platform.Domain/ListForms/ListFormAuthorizationManager.cs +++ b/api/src/Sozsoft.Platform.Domain/ListForms/ListFormAuthorizationManager.cs @@ -1,12 +1,12 @@ using System; using System.Text.Json; using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.Extensions.Localization; using Sozsoft.Platform.Entities; using Sozsoft.Platform.Enums; using Sozsoft.Platform.Localization; using Sozsoft.Platform.Permissions; -using Microsoft.AspNetCore.Authorization; -using Microsoft.Extensions.Localization; using Volo.Abp.Domain.Repositories; using Volo.Abp.ObjectMapping; using Volo.Abp.Settings; diff --git a/api/src/Sozsoft.Platform.Domain/ListForms/ListFormCustomizationManager.cs b/api/src/Sozsoft.Platform.Domain/ListForms/ListFormCustomizationManager.cs index 09c9993f..b8c364f6 100644 --- a/api/src/Sozsoft.Platform.Domain/ListForms/ListFormCustomizationManager.cs +++ b/api/src/Sozsoft.Platform.Domain/ListForms/ListFormCustomizationManager.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Microsoft.Extensions.Localization; using Sozsoft.Platform.Entities; using Sozsoft.Platform.Enums; using Sozsoft.Platform.Localization; -using Microsoft.Extensions.Localization; using Volo.Abp.Domain.Repositories; using Volo.Abp.ObjectMapping; using Volo.Abp.Settings; diff --git a/api/src/Sozsoft.Platform.Domain/ListForms/ListFormFieldManager.cs b/api/src/Sozsoft.Platform.Domain/ListForms/ListFormFieldManager.cs index b58f615b..4d9c6295 100644 --- a/api/src/Sozsoft.Platform.Domain/ListForms/ListFormFieldManager.cs +++ b/api/src/Sozsoft.Platform.Domain/ListForms/ListFormFieldManager.cs @@ -4,12 +4,12 @@ using System.Globalization; using System.Linq; using System.Text.Json; using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.Extensions.Localization; using Sozsoft.Platform.Entities; using Sozsoft.Platform.Enums; using Sozsoft.Platform.Localization; using Sozsoft.Platform.Permissions; -using Microsoft.AspNetCore.Authorization; -using Microsoft.Extensions.Localization; using Volo.Abp.Domain.Repositories; using Volo.Abp.ObjectMapping; using Volo.Abp.Settings; diff --git a/api/src/Sozsoft.Platform.Domain/ListForms/ListFormManager.cs b/api/src/Sozsoft.Platform.Domain/ListForms/ListFormManager.cs index f1cea60c..274f723e 100644 --- a/api/src/Sozsoft.Platform.Domain/ListForms/ListFormManager.cs +++ b/api/src/Sozsoft.Platform.Domain/ListForms/ListFormManager.cs @@ -1,16 +1,16 @@ -using Sozsoft.Platform.Entities; -using Sozsoft.Platform.Enums; -using Sozsoft.Platform.Localization; -using Sozsoft.Platform.OrganizationUnits; -using Sozsoft.Platform.Queries; -using Microsoft.Extensions.Localization; -using Microsoft.Extensions.Primitives; -using System; +using System; using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Text.Json; using System.Threading.Tasks; +using Microsoft.Extensions.Localization; +using Microsoft.Extensions.Primitives; +using Sozsoft.Platform.Entities; +using Sozsoft.Platform.Enums; +using Sozsoft.Platform.Localization; +using Sozsoft.Platform.OrganizationUnits; +using Sozsoft.Platform.Queries; using Volo.Abp.Domain.Entities; using Volo.Abp.Domain.Repositories; using Volo.Abp.ObjectMapping; diff --git a/api/src/Sozsoft.Platform.Domain/ListForms/ServerFilterData.cs b/api/src/Sozsoft.Platform.Domain/ListForms/ServerFilterData.cs deleted file mode 100644 index 177083e9..00000000 --- a/api/src/Sozsoft.Platform.Domain/ListForms/ServerFilterData.cs +++ /dev/null @@ -1,20 +0,0 @@ -using Sozsoft.Platform.Queries; -using System.Collections.Generic; -using Volo.Abp.Domain.Values; - -namespace Sozsoft.Platform.ListForms; - -/// -/// -public class ServerFilterData : ValueObject -{ - public JoinTable JoinTable { get; set; } - public string WhereCondition { get; set; } - public string UiFilterData { get; set; } - - protected override IEnumerable GetAtomicValues() - { - throw new System.NotImplementedException(); - } -} - diff --git a/api/src/Sozsoft.Platform.Domain/OpenIddict/OpenIddictDataSeedContributor.cs b/api/src/Sozsoft.Platform.Domain/OpenIddict/OpenIddictDataSeedContributor.cs index 172fbabf..f8002da9 100644 --- a/api/src/Sozsoft.Platform.Domain/OpenIddict/OpenIddictDataSeedContributor.cs +++ b/api/src/Sozsoft.Platform.Domain/OpenIddict/OpenIddictDataSeedContributor.cs @@ -1,20 +1,20 @@ using System; -using Volo.Abp; -using System.Linq; -using Volo.Abp.Uow; -using Volo.Abp.Data; -using System.Text.Json; -using JetBrains.Annotations; -using System.Threading.Tasks; -using OpenIddict.Abstractions; using System.Collections.Generic; -using Volo.Abp.OpenIddict.Scopes; -using Volo.Abp.DependencyInjection; -using Volo.Abp.PermissionManagement; -using Volo.Abp.OpenIddict.Applications; -using Microsoft.Extensions.Localization; +using System.Linq; +using System.Text.Json; +using System.Threading.Tasks; +using JetBrains.Annotations; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Localization; +using OpenIddict.Abstractions; +using Volo.Abp; using Volo.Abp.Authorization.Permissions; +using Volo.Abp.Data; +using Volo.Abp.DependencyInjection; +using Volo.Abp.OpenIddict.Applications; +using Volo.Abp.OpenIddict.Scopes; +using Volo.Abp.PermissionManagement; +using Volo.Abp.Uow; namespace Sozsoft.Platform.OpenIddict; diff --git a/api/src/Sozsoft.Platform.Domain/PlatformDomainModule.cs b/api/src/Sozsoft.Platform.Domain/PlatformDomainModule.cs index 1e0e52ee..e95fe6ad 100644 --- a/api/src/Sozsoft.Platform.Domain/PlatformDomainModule.cs +++ b/api/src/Sozsoft.Platform.Domain/PlatformDomainModule.cs @@ -1,11 +1,13 @@ -using Sozsoft.Languages; -using Sozsoft.Sender; +using System; +using Sozsoft.Languages; using Sozsoft.MailQueue; using Sozsoft.Notifications.Domain; +using Sozsoft.Sender; using Sozsoft.Settings; -using System; using Volo.Abp.AuditLogging; using Volo.Abp.BackgroundJobs; +using Volo.Abp.BlobStoring; +using Volo.Abp.BlobStoring.FileSystem; using Volo.Abp.FeatureManagement; using Volo.Abp.Identity; using Volo.Abp.Modularity; @@ -14,8 +16,6 @@ using Volo.Abp.OpenIddict; using Volo.Abp.PermissionManagement.Identity; using Volo.Abp.PermissionManagement.OpenIddict; using Volo.Abp.TenantManagement; -using Volo.Abp.BlobStoring; -using Volo.Abp.BlobStoring.FileSystem; using Volo.Abp.Timing; namespace Sozsoft.Platform; diff --git a/api/src/Sozsoft.Platform.Domain/PlatformDomainService.cs b/api/src/Sozsoft.Platform.Domain/PlatformDomainService.cs index c6b0043f..7a27640b 100644 --- a/api/src/Sozsoft.Platform.Domain/PlatformDomainService.cs +++ b/api/src/Sozsoft.Platform.Domain/PlatformDomainService.cs @@ -1,6 +1,6 @@ -using Sozsoft.Platform.ListForms; +using Microsoft.Extensions.Localization; +using Sozsoft.Platform.ListForms; using Sozsoft.Platform.Localization; -using Microsoft.Extensions.Localization; using Volo.Abp.Domain.Services; using Volo.Abp.ObjectMapping; using Volo.Abp.Settings; diff --git a/api/src/Sozsoft.Platform.Domain/Properties/AssemblyInfo.cs b/api/src/Sozsoft.Platform.Domain/Properties/AssemblyInfo.cs index 0ec22d4c..e6293179 100644 --- a/api/src/Sozsoft.Platform.Domain/Properties/AssemblyInfo.cs +++ b/api/src/Sozsoft.Platform.Domain/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ using System.Runtime.CompilerServices; -[assembly:InternalsVisibleToAttribute("Sozsoft.Platform.Domain.Tests")] -[assembly:InternalsVisibleToAttribute("Sozsoft.Platform.TestBase")] +[assembly: InternalsVisibleToAttribute("Sozsoft.Platform.Domain.Tests")] +[assembly: InternalsVisibleToAttribute("Sozsoft.Platform.TestBase")] diff --git a/api/src/Sozsoft.Platform.Domain/Queries/ChartValueAxis.cs b/api/src/Sozsoft.Platform.Domain/Queries/ChartValueAxis.cs index 3e2da961..bcd3c800 100644 --- a/api/src/Sozsoft.Platform.Domain/Queries/ChartValueAxis.cs +++ b/api/src/Sozsoft.Platform.Domain/Queries/ChartValueAxis.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using System.Linq; using System.Text.Json.Serialization; using Volo.Abp.Domain.Values; diff --git a/api/src/Sozsoft.Platform.Domain/Queries/CommandColumn.cs b/api/src/Sozsoft.Platform.Domain/Queries/CommandColumn.cs index 9e7b72b6..3953c28f 100644 --- a/api/src/Sozsoft.Platform.Domain/Queries/CommandColumn.cs +++ b/api/src/Sozsoft.Platform.Domain/Queries/CommandColumn.cs @@ -50,7 +50,7 @@ public class CommandColumn : ValueObject public string DialogName { get; set; } /// UI tarafında çağrılacak dialog component parametrelerier /// - public string DialogParameters { get; set; } + public string DialogParameters { get; set; } /// Url boş ise calisacak 'eval' icerisinde calisacak olan kod /// public string OnClick { get; set; } diff --git a/api/src/Sozsoft.Platform.Domain/Queries/DefaultValueManager.cs b/api/src/Sozsoft.Platform.Domain/Queries/DefaultValueManager.cs index 43ef01d4..d00a39ac 100644 --- a/api/src/Sozsoft.Platform.Domain/Queries/DefaultValueManager.cs +++ b/api/src/Sozsoft.Platform.Domain/Queries/DefaultValueManager.cs @@ -1,16 +1,15 @@ using System; using System.Collections.Generic; -using System.Data; using System.Linq; using System.Text.Json; using System.Threading.Tasks; +using Microsoft.Extensions.Localization; +using Microsoft.Extensions.Primitives; using Sozsoft.Platform.DynamicData; using Sozsoft.Platform.Entities; using Sozsoft.Platform.Enums; using Sozsoft.Platform.ListForms; using Sozsoft.Platform.Localization; -using Microsoft.Extensions.Localization; -using Microsoft.Extensions.Primitives; using Volo.Abp.ObjectMapping; using Volo.Abp.Settings; using Volo.Abp.Users; diff --git a/api/src/Sozsoft.Platform.Domain/Queries/FieldsDefaultValue.cs b/api/src/Sozsoft.Platform.Domain/Queries/FieldsDefaultValue.cs index 967ae4a7..43c33ca5 100644 --- a/api/src/Sozsoft.Platform.Domain/Queries/FieldsDefaultValue.cs +++ b/api/src/Sozsoft.Platform.Domain/Queries/FieldsDefaultValue.cs @@ -1,6 +1,6 @@ -using Sozsoft.Platform.Enums; -using System.Collections.Generic; +using System.Collections.Generic; using System.Data; +using Sozsoft.Platform.Enums; using Volo.Abp.Domain.Values; namespace Sozsoft.Platform.Queries; diff --git a/api/src/Sozsoft.Platform.Domain/Queries/QueryManager.cs b/api/src/Sozsoft.Platform.Domain/Queries/QueryManager.cs index fb91a1f8..bf33028a 100644 --- a/api/src/Sozsoft.Platform.Domain/Queries/QueryManager.cs +++ b/api/src/Sozsoft.Platform.Domain/Queries/QueryManager.cs @@ -2,15 +2,14 @@ using System.Collections.Generic; using System.Data; using System.Linq; -using System.Text.RegularExpressions; using System.Threading.Tasks; +using Microsoft.Extensions.Localization; +using Microsoft.Extensions.Primitives; using Sozsoft.Platform.DynamicData; using Sozsoft.Platform.Entities; using Sozsoft.Platform.Enums; using Sozsoft.Platform.ListForms; using Sozsoft.Platform.Localization; -using Microsoft.Extensions.Localization; -using Microsoft.Extensions.Primitives; using Volo.Abp.ObjectMapping; using Volo.Abp.Settings; using Volo.Abp.Users; @@ -79,7 +78,7 @@ public class QueryManager : PlatformDomainService, IQueryManager var listFormFields = await listFormFieldManager.GetUserListFormFields(listFormCode); var parameters = await listFormManager.GetParametersAsync(listForm, listFormFields, inputParams, op, keys, queryParameters); - + var (dynamicDataRepository, connectionString, dataSourceType) = await dynamicDataManager.GetAsync(listForm.IsTenant, listForm.DataSourceCode); var sql = GenerateQuery(listForm, listFormFields, parameters, op, dataSourceType, keys); diff --git a/api/src/Sozsoft.Platform.Domain/Queries/SelectQueryManager.cs b/api/src/Sozsoft.Platform.Domain/Queries/SelectQueryManager.cs index b29fc984..fb0cd40b 100644 --- a/api/src/Sozsoft.Platform.Domain/Queries/SelectQueryManager.cs +++ b/api/src/Sozsoft.Platform.Domain/Queries/SelectQueryManager.cs @@ -5,13 +5,13 @@ using System.Linq; using System.Text; using System.Text.Json; using System.Threading.Tasks; +using Microsoft.Extensions.Localization; using Sozsoft.Platform.Entities; using Sozsoft.Platform.Enums; using Sozsoft.Platform.Extensions; using Sozsoft.Platform.ListForms; using Sozsoft.Platform.Localization; using Sozsoft.Platform.OrganizationUnits; -using Microsoft.Extensions.Localization; using Volo.Abp.Domain.Repositories; using Volo.Abp.ObjectMapping; using Volo.Abp.Settings; diff --git a/api/src/Sozsoft.Platform.Domain/Repositories/IReportTemplateRepository.cs b/api/src/Sozsoft.Platform.Domain/Repositories/IReportTemplateRepository.cs index d2d6d6ca..958b0264 100644 --- a/api/src/Sozsoft.Platform.Domain/Repositories/IReportTemplateRepository.cs +++ b/api/src/Sozsoft.Platform.Domain/Repositories/IReportTemplateRepository.cs @@ -4,23 +4,22 @@ using System.Threading.Tasks; using Sozsoft.Platform.Entities; using Volo.Abp.Domain.Repositories; -namespace Sozsoft.Platform.Repositories +namespace Sozsoft.Platform.Repositories; + +public interface IReportTemplateRepository : IRepository { - public interface IReportTemplateRepository : IRepository - { - Task> GetListAsync( - int skipCount = 0, - int maxResultCount = int.MaxValue, - string sorting = null, - string filter = null, - string category = null - ); + Task> GetListAsync( + int skipCount = 0, + int maxResultCount = int.MaxValue, + string sorting = null, + string filter = null, + string category = null + ); - Task GetCountAsync(string filter = null, string category = null); + Task GetCountAsync(string filter = null, string category = null); - Task GetByIdWithParametersAsync(Guid id); + Task GetByIdWithParametersAsync(Guid id); - Task> GetByCategoryAsync(string category); - } + Task> GetByCategoryAsync(string category); } diff --git a/api/src/Sozsoft.Platform.Domain/Sequences/SequenceManager.cs b/api/src/Sozsoft.Platform.Domain/Sequences/SequenceManager.cs index d1e61d98..9c639041 100644 --- a/api/src/Sozsoft.Platform.Domain/Sequences/SequenceManager.cs +++ b/api/src/Sozsoft.Platform.Domain/Sequences/SequenceManager.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Threading.Tasks; using Microsoft.Extensions.Localization; using Sozsoft.Platform; @@ -56,4 +56,4 @@ public class SequenceManager : PlatformDomainService return sequence.GetPreviewSequence(DateTime.Now); } -} \ No newline at end of file +} diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/DatabaseMigrationEventHandlerBase.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/DatabaseMigrationEventHandlerBase.cs index d0591bd9..1c7c209c 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/DatabaseMigrationEventHandlerBase.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/DatabaseMigrationEventHandlerBase.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Sozsoft.Platform.EntityFrameworkCore; using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; +using Sozsoft.Platform.EntityFrameworkCore; using Volo.Abp; using Volo.Abp.Data; using Volo.Abp.DependencyInjection; diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/DeveloperKit/PlatformDynamicEntityManager.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/DeveloperKit/PlatformDynamicEntityManager.cs index 22cdec10..2f173d16 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/DeveloperKit/PlatformDynamicEntityManager.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/DeveloperKit/PlatformDynamicEntityManager.cs @@ -1,12 +1,12 @@ -using Sozsoft.Platform.Domain.DeveloperKit; -using Sozsoft.Platform.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Storage; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text.Json; using System.Threading.Tasks; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Storage; +using Sozsoft.Platform.Domain.DeveloperKit; +using Sozsoft.Platform.EntityFrameworkCore; using Volo.Abp; using Volo.Abp.EntityFrameworkCore; @@ -216,7 +216,7 @@ public class DynamicEntityManager : IDynamicEntityManager var values = new List { AddParameter(parameters, newId) }; if (hasCreationTime) { columns.Add(QuoteIdentifier("CreationTime", isPostgreSql)); values.Add(UtcNowExpression(isPostgreSql)); } - if (hasIsDeleted) { columns.Add(QuoteIdentifier("IsDeleted", isPostgreSql)); values.Add(FalseLiteral(isPostgreSql)); } + if (hasIsDeleted) { columns.Add(QuoteIdentifier("IsDeleted", isPostgreSql)); values.Add(FalseLiteral(isPostgreSql)); } foreach (var prop in data.EnumerateObject()) { diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/DynamicData/MsDynamicDataRepository.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/DynamicData/MsDynamicDataRepository.cs index af694de1..2badb946 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/DynamicData/MsDynamicDataRepository.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/DynamicData/MsDynamicDataRepository.cs @@ -7,9 +7,8 @@ using System.Linq; using System.Text.Json; using System.Threading.Tasks; using Dapper; -using Sozsoft.Platform; -using Sozsoft.Platform.DynamicData; using Microsoft.Data.SqlClient; +using Sozsoft.Platform.DynamicData; using Volo.Abp.DependencyInjection; using Volo.Abp.Threading; using Volo.Abp.Uow; diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/DynamicData/PgDynamicDataRepository.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/DynamicData/PgDynamicDataRepository.cs index 97c005de..14db2a15 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/DynamicData/PgDynamicDataRepository.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/DynamicData/PgDynamicDataRepository.cs @@ -7,9 +7,8 @@ using System.Linq; using System.Text.Json; using System.Threading.Tasks; using Dapper; -using Sozsoft.Platform.DynamicData; -using Sozsoft.Platform; using Npgsql; +using Sozsoft.Platform.DynamicData; using Volo.Abp.DependencyInjection; using Volo.Abp.Threading; using Volo.Abp.Uow; diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/DynamicData/SpRepository.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/DynamicData/SpRepository.cs index a715a875..f6a22dfb 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/DynamicData/SpRepository.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/DynamicData/SpRepository.cs @@ -4,11 +4,11 @@ using System.Data; using System.Data.Common; using System.Linq; using System.Threading.Tasks; +using Microsoft.Data.SqlClient; +using Npgsql; using Sozsoft.Platform.DynamicData; using Sozsoft.Platform.EntityFrameworkCore; using Sozsoft.Platform.Enums; -using Microsoft.Data.SqlClient; -using Npgsql; using Volo.Abp.DependencyInjection; using Volo.Abp.EntityFrameworkCore; using Volo.Abp.Uow; @@ -30,11 +30,11 @@ public class SpRepository : ISpRepository } public async Task CallSpAsync( - string sp, - string dataSourceCode, + string sp, + string dataSourceCode, Dictionary parameters = null) { - var (dynamicDataRepository, connectionString, dataSourceType) = await DynamicDataManager.GetAsync(false, dataSourceCode); + var (_, connectionString, dataSourceType) = await DynamicDataManager.GetAsync(false, dataSourceCode); using var uow = LazyServiceProvider.LazyGetRequiredService().Begin(); @@ -60,7 +60,7 @@ public class SpRepository : ISpRepository var command = connection.CreateCommand(); command.CommandTimeout = 300; // 5 dakika timeout command.CommandType = CommandType.Text; - + command.CommandText = dataSourceType switch { DataSourceTypeEnum.Mssql => BuildSqlForMssql(sp, parameters), diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs index b7ec58cd..b44e7f05 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs @@ -1,8 +1,16 @@ -using Sozsoft.Languages.EntityFrameworkCore; -using Sozsoft.Platform.Entities; -using Sozsoft.Settings.EntityFrameworkCore; -using Sozsoft.MailQueue.EntityFrameworkCore; +using System; +using System.Linq; +using System.Text.Json; using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.ChangeTracking; +using Sozsoft.Languages.EntityFrameworkCore; +using Sozsoft.MailQueue.EntityFrameworkCore; +using Sozsoft.Notifications.EntityFrameworkCore; +using Sozsoft.Platform.Entities; +using Sozsoft.Platform.Enums; +using Sozsoft.Platform.Forum; +using Sozsoft.Settings.EntityFrameworkCore; +using Sozsoft.SqlQueryManager.EntityFrameworkCore; using Volo.Abp.AuditLogging.EntityFrameworkCore; using Volo.Abp.BackgroundJobs.EntityFrameworkCore; using Volo.Abp.Data; @@ -16,17 +24,8 @@ using Volo.Abp.OpenIddict.EntityFrameworkCore; using Volo.Abp.PermissionManagement.EntityFrameworkCore; using Volo.Abp.TenantManagement; using Volo.Abp.TenantManagement.EntityFrameworkCore; -using Sozsoft.Notifications.EntityFrameworkCore; -using Sozsoft.Platform.Forum; -using Microsoft.EntityFrameworkCore.ChangeTracking; -using System; -using System.Linq; -using System.Text.Json; - using static Sozsoft.Platform.PlatformConsts; using static Sozsoft.Settings.SettingsConsts; -using Sozsoft.Platform.Enums; -using Sozsoft.SqlQueryManager.EntityFrameworkCore; namespace Sozsoft.Platform.EntityFrameworkCore; diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEfCoreEntityExtensionMappings.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEfCoreEntityExtensionMappings.cs index 17e027e8..bb4e5600 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEfCoreEntityExtensionMappings.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEfCoreEntityExtensionMappings.cs @@ -1,5 +1,5 @@ -using Microsoft.EntityFrameworkCore; -using System; +using System; +using Microsoft.EntityFrameworkCore; using Volo.Abp.Identity; using Volo.Abp.ObjectExtending; using Volo.Abp.PermissionManagement; diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEntityFrameworkCoreModule.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEntityFrameworkCoreModule.cs index 9f4cb342..da5ba5d0 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEntityFrameworkCoreModule.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEntityFrameworkCoreModule.cs @@ -1,15 +1,16 @@ using System; +using Microsoft.Extensions.DependencyInjection; using Sozsoft.Languages.EntityFrameworkCore; using Sozsoft.Notifications.EntityFrameworkCore; +using Sozsoft.Platform.Domain.DeveloperKit; using Sozsoft.Settings.EntityFrameworkCore; using Sozsoft.SqlQueryManager.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AuditLogging.EntityFrameworkCore; using Volo.Abp.BackgroundJobs.EntityFrameworkCore; using Volo.Abp.Dapper; using Volo.Abp.EntityFrameworkCore; -using Volo.Abp.EntityFrameworkCore.SqlServer; using Volo.Abp.EntityFrameworkCore.PostgreSql; +using Volo.Abp.EntityFrameworkCore.SqlServer; using Volo.Abp.FeatureManagement.EntityFrameworkCore; using Volo.Abp.Identity.EntityFrameworkCore; using Volo.Abp.Modularity; @@ -17,7 +18,6 @@ using Volo.Abp.OpenIddict.EntityFrameworkCore; using Volo.Abp.PermissionManagement.EntityFrameworkCore; using Volo.Abp.TenantManagement.EntityFrameworkCore; using static Sozsoft.Settings.SettingsConsts; -using Sozsoft.Platform.Domain.DeveloperKit; namespace Sozsoft.Platform.EntityFrameworkCore; diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260818091734_Initial.Designer.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260821153543_Initial.Designer.cs similarity index 99% rename from api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260818091734_Initial.Designer.cs rename to api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260821153543_Initial.Designer.cs index 9c634510..ae3c5607 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260818091734_Initial.Designer.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260821153543_Initial.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace Sozsoft.Platform.Migrations { [DbContext(typeof(PlatformDbContext))] - [Migration("20260818091734_Initial")] + [Migration("20260821153543_Initial")] partial class Initial { /// diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260818091734_Initial.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260821153543_Initial.cs similarity index 100% rename from api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260818091734_Initial.cs rename to api/src/Sozsoft.Platform.EntityFrameworkCore/Migrations/20260821153543_Initial.cs diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/OrganizationUnits/PlatformOuRepository.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/OrganizationUnits/PlatformOuRepository.cs index e8a1c997..9df5526d 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/OrganizationUnits/PlatformOuRepository.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/OrganizationUnits/PlatformOuRepository.cs @@ -4,61 +4,60 @@ using System.Data; using System.Linq; using System.Linq.Dynamic.Core; using System.Threading.Tasks; -using Sozsoft.Platform.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; +using Sozsoft.Platform.EntityFrameworkCore; using Volo.Abp.Domain.Repositories.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore; using Volo.Abp.Identity; -namespace Sozsoft.Platform.OrganizationUnits +namespace Sozsoft.Platform.OrganizationUnits; + +public class PlatformOuRepository : EfCoreRepository, IPlatformOuRepository { - public class PlatformOuRepository : EfCoreRepository, IPlatformOuRepository + public PlatformOuRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) { - public PlatformOuRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) - { - } + } - public virtual async Task> GetOrganizationUnitIdsWithChildren(Guid userId) - { - var query = await GetQueryableAsync(userId); - var organizationUnitCodes = await query.Select(ou => ou.Code).ToListAsync(); - var dbContext = await GetDbContextAsync(); + public virtual async Task> GetOrganizationUnitIdsWithChildren(Guid userId) + { + var query = await GetQueryableAsync(userId); + var organizationUnitCodes = await query.Select(ou => ou.Code).ToListAsync(); + var dbContext = await GetDbContextAsync(); - return await dbContext.OrganizationUnits - .Where(a => organizationUnitCodes.Any(b => a.Code.StartsWith(b))) - .Select(a => a.Id) - .ToListAsync(); - } + return await dbContext.OrganizationUnits + .Where(a => organizationUnitCodes.Any(b => a.Code.StartsWith(b))) + .Select(a => a.Id) + .ToListAsync(); + } - public virtual async Task> GetOrganizationUnitIds(Guid userId) - { - var query = await GetQueryableAsync(userId); + public virtual async Task> GetOrganizationUnitIds(Guid userId) + { + var query = await GetQueryableAsync(userId); - return await query.Select(ou => ou.Id).ToListAsync(); - } + return await query.Select(ou => ou.Id).ToListAsync(); + } - //Get IQueryable - private async Task> GetQueryableAsync(Guid userId) - { - var dbContext = await GetDbContextAsync(); - var query = from userOu in dbContext.Set() - join ou in dbContext.OrganizationUnits on userOu.OrganizationUnitId equals ou.Id - where userOu.UserId == userId - select ou; + //Get IQueryable + private async Task> GetQueryableAsync(Guid userId) + { + var dbContext = await GetDbContextAsync(); + var query = from userOu in dbContext.Set() + join ou in dbContext.OrganizationUnits on userOu.OrganizationUnitId equals ou.Id + where userOu.UserId == userId + select ou; - return query; - } + return query; + } - public async Task> GetMemberIdsDeepAsync(string code) - { - var dbContext = await GetDbContextAsync(); + public async Task> GetMemberIdsDeepAsync(string code) + { + var dbContext = await GetDbContextAsync(); - return await (from userOu in dbContext.Set() - join user in dbContext.Users on userOu.UserId equals user.Id - join ou in dbContext.OrganizationUnits on userOu.OrganizationUnitId equals ou.Id - where ou.Code.StartsWith(code) - select user.Id).Distinct().ToListAsync(); - } + return await (from userOu in dbContext.Set() + join user in dbContext.Users on userOu.UserId equals user.Id + join ou in dbContext.OrganizationUnits on userOu.OrganizationUnitId equals ou.Id + where ou.Code.StartsWith(code) + select user.Id).Distinct().ToListAsync(); } } diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/Properties/AssemblyInfo.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/Properties/AssemblyInfo.cs index 7b995b25..dcf6efd4 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/Properties/AssemblyInfo.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/Properties/AssemblyInfo.cs @@ -1,3 +1,3 @@ using System.Runtime.CompilerServices; -[assembly:InternalsVisibleToAttribute("Sozsoft.Platform.EntityFrameworkCore.Tests")] +[assembly: InternalsVisibleToAttribute("Sozsoft.Platform.EntityFrameworkCore.Tests")] diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/Seeds/TenantDataSeeder.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/Seeds/TenantDataSeeder.cs index 723aa8b4..ebd64173 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/Seeds/TenantDataSeeder.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/Seeds/TenantDataSeeder.cs @@ -1,22 +1,20 @@ using System; +using System.Collections.Generic; using System.IO; +using System.Linq; using System.Text.Json; using System.Threading.Tasks; +using Microsoft.AspNetCore.Identity; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Configuration; using Sozsoft.Platform.Entities; +using Sozsoft.Platform.Enums; using Sozsoft.Platform.Forum; using Sozsoft.Platform.Public; -using Microsoft.Extensions.Configuration; using Volo.Abp.Data; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Repositories; -using Microsoft.EntityFrameworkCore; using Volo.Abp.Identity; -using Volo.Abp.Timing; -using System.Collections.Generic; -using Volo.Abp.MultiTenancy; -using System.Linq; -using Sozsoft.Platform.Enums; -using Microsoft.AspNetCore.Identity; namespace Sozsoft.Platform.Data.Seeds; @@ -462,7 +460,6 @@ public class ProductSeedDto public class TenantDataSeeder : IDataSeedContributor, ITransientDependency { - private readonly IClock _clock; private readonly ILookupNormalizer _lookupNormalizer; private readonly IRepository _branchRepository; private readonly IRepository _globalSearch; @@ -485,9 +482,6 @@ public class TenantDataSeeder : IDataSeedContributor, ITransientDependency private readonly IRepository _uomRepository; private readonly IRepository _forumCategoryRepository; private readonly IRepository _workHourRepository; - private readonly IRepository _currencyRepository; - private readonly IRepository _organizationUnitRepository; - private readonly OrganizationUnitManager _organizationUnitManager; private readonly IIdentityUserRepository _repositoryUser; private readonly IRepository _productRepository; private readonly IRepository _departmentRepository; @@ -507,10 +501,8 @@ public class TenantDataSeeder : IDataSeedContributor, ITransientDependency private readonly IRepository _eventCategoryRepository; private readonly IRepository _eventRepository; - private readonly ICurrentTenant _currentTenant; public TenantDataSeeder( - IClock clock, ILookupNormalizer lookupNormalizer, IIdentityUserRepository repositoryUser, IRepository branchRepository, @@ -535,8 +527,6 @@ public class TenantDataSeeder : IDataSeedContributor, ITransientDependency IRepository contactRepository, IRepository workHourRepository, IRepository forumCategoryRepository, - IRepository currencyRepository, - IRepository organizationUnitRepository, IRepository departmentRepository, IRepository jobPositionRepository, @@ -552,13 +542,9 @@ public class TenantDataSeeder : IDataSeedContributor, ITransientDependency IRepository eventTypeRepository, IRepository eventCategoryRepository, IRepository eventRepository, - IRepository sequenceRepository, - - OrganizationUnitManager organizationUnitManager, - ICurrentTenant currentTenant + IRepository sequenceRepository ) { - _clock = clock; _lookupNormalizer = lookupNormalizer; _repositoryUser = repositoryUser; _branchRepository = branchRepository; @@ -583,8 +569,6 @@ public class TenantDataSeeder : IDataSeedContributor, ITransientDependency _contactRepository = contactRepository; _workHourRepository = workHourRepository; _forumCategoryRepository = forumCategoryRepository; - _currencyRepository = currencyRepository; - _organizationUnitRepository = organizationUnitRepository; _departmentRepository = departmentRepository; _jobPositionRepository = jobPositionRepository; _announcementRepository = announcementRepository; @@ -600,8 +584,6 @@ public class TenantDataSeeder : IDataSeedContributor, ITransientDependency _eventCategoryRepository = eventCategoryRepository; _eventRepository = eventRepository; _sequenceRepository = sequenceRepository; - _organizationUnitManager = organizationUnitManager; - _currentTenant = currentTenant; } public async Task SeedAsync(DataSeedContext context) diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/Seeds/TenantIdentityDataSeeder.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/Seeds/TenantIdentityDataSeeder.cs index c6fd6d71..40316054 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/Seeds/TenantIdentityDataSeeder.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/Seeds/TenantIdentityDataSeeder.cs @@ -1,20 +1,19 @@ using System; using System.Threading.Tasks; -using Sozsoft.Platform.Extensions; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Options; +using Sozsoft.Platform.Entities; +using Sozsoft.Platform.Extensions; using Volo.Abp; using Volo.Abp.DependencyInjection; +using Volo.Abp.Domain.Repositories; using Volo.Abp.Guids; using Volo.Abp.Identity; using Volo.Abp.MultiTenancy; -using Volo.Abp.PermissionManagement; +using Volo.Abp.TenantManagement; using IdentityRole = Volo.Abp.Identity.IdentityRole; using IdentityUser = Volo.Abp.Identity.IdentityUser; -using Volo.Abp.Domain.Repositories; -using Sozsoft.Platform.Entities; -using Volo.Abp.TenantManagement; namespace Sozsoft.Platform.Data.Seeds; @@ -23,7 +22,6 @@ public class TenantIdentityDataSeeder : IdentityDataSeeder { private readonly IRepository _branchRepository; private readonly IRepository _branchUsersRepository; - private readonly IPermissionGrantRepository _permissionGrantRepository; private readonly ITenantRepository _tenantRepository; private readonly IConfiguration _configuration; @@ -36,7 +34,6 @@ public class TenantIdentityDataSeeder : IdentityDataSeeder ILookupNormalizer lookupNormalizer, IdentityUserManager userManager, IdentityRoleManager roleManager, - IPermissionGrantRepository permissionGrantRepository, ICurrentTenant currentTenant, ITenantRepository tenantRepository, IConfiguration configuration, @@ -45,7 +42,6 @@ public class TenantIdentityDataSeeder : IdentityDataSeeder { this._branchRepository = branchRepository; this._branchUsersRepository = branchUsersRepository; - this._permissionGrantRepository = permissionGrantRepository; this._tenantRepository = tenantRepository; this._configuration = configuration; } diff --git a/api/src/Sozsoft.Platform.HttpApi.Client/PlatformHttpApiClientModule.cs b/api/src/Sozsoft.Platform.HttpApi.Client/PlatformHttpApiClientModule.cs index 6b5be3b3..7b585765 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Client/PlatformHttpApiClientModule.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Client/PlatformHttpApiClientModule.cs @@ -4,8 +4,8 @@ using Volo.Abp.FeatureManagement; using Volo.Abp.Identity; using Volo.Abp.Modularity; using Volo.Abp.PermissionManagement; -using Volo.Abp.TenantManagement; using Volo.Abp.SettingManagement; +using Volo.Abp.TenantManagement; using Volo.Abp.VirtualFileSystem; namespace Sozsoft.Platform; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/AbpBackgroundWorkerRecurringJobInitializer.cs b/api/src/Sozsoft.Platform.HttpApi.Host/AbpBackgroundWorkerRecurringJobInitializer.cs index 78d3d87a..c9e75274 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/AbpBackgroundWorkerRecurringJobInitializer.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/AbpBackgroundWorkerRecurringJobInitializer.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/BackgroundWorkerStartupService.cs b/api/src/Sozsoft.Platform.HttpApi.Host/BackgroundWorkerStartupService.cs index 6ff6903d..7d9df7f9 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/BackgroundWorkerStartupService.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/BackgroundWorkerStartupService.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/Controllers/CustomReportDesignerController.cs b/api/src/Sozsoft.Platform.HttpApi.Host/Controllers/CustomReportDesignerController.cs index 4a47159c..5d197c1f 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/Controllers/CustomReportDesignerController.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/Controllers/CustomReportDesignerController.cs @@ -1,4 +1,4 @@ -using DevExpress.AspNetCore.Reporting.ReportDesigner; +using DevExpress.AspNetCore.Reporting.ReportDesigner; using DevExpress.AspNetCore.Reporting.ReportDesigner.Native.Services; using DevExpress.DataAccess.Sql; using DevExpress.XtraReports.Web.ReportDesigner; @@ -10,15 +10,15 @@ namespace Sozsoft.Platform.Controllers; public class CustomReportDesignerController : ReportDesignerController { - public CustomReportDesignerController(IReportDesignerMvcControllerService controllerService) + public CustomReportDesignerController(IReportDesignerMvcControllerService controllerService) : base(controllerService) { } [HttpPost("[action]")] public IActionResult GetDesignerModel( - [FromForm] string reportUrl, - [FromServices] IReportDesignerModelBuilder designerModelBuilder, + [FromForm] string reportUrl, + [FromServices] IReportDesignerModelBuilder designerModelBuilder, [FromForm] ReportDesignerSettingsBase designerModelSettings) { var ds = new SqlDataSource("SqlServer"); @@ -36,9 +36,9 @@ public class CustomReportDesignerController : ReportDesignerController dataSources.Add("SqlServer", ds); }) .BuildModel(); - + designerModel.Assign(designerModelSettings); - + return DesignerModel(designerModel); } } diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/Controllers/CustomWebDocumentViewerController.cs b/api/src/Sozsoft.Platform.HttpApi.Host/Controllers/CustomWebDocumentViewerController.cs index de6e35c4..a6127710 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/Controllers/CustomWebDocumentViewerController.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/Controllers/CustomWebDocumentViewerController.cs @@ -1,4 +1,4 @@ -using DevExpress.AspNetCore.Reporting.WebDocumentViewer; +using DevExpress.AspNetCore.Reporting.WebDocumentViewer; using DevExpress.AspNetCore.Reporting.WebDocumentViewer.Native.Services; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/Controllers/SetupController.cs b/api/src/Sozsoft.Platform.HttpApi.Host/Controllers/SetupController.cs index 0e53654b..6f627644 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/Controllers/SetupController.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/Controllers/SetupController.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using System.Threading; using System.Threading.Tasks; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/DbStartup/DatabaseReadiness.cs b/api/src/Sozsoft.Platform.HttpApi.Host/DbStartup/DatabaseReadiness.cs index 250dffd0..98d0be98 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/DbStartup/DatabaseReadiness.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/DbStartup/DatabaseReadiness.cs @@ -1,4 +1,4 @@ -namespace Sozsoft.Platform.DbStartup; +namespace Sozsoft.Platform.DbStartup; /// /// Veritabanının o anki hazırlık durumu. diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/DbStartup/DatabaseReadinessChecker.cs b/api/src/Sozsoft.Platform.HttpApi.Host/DbStartup/DatabaseReadinessChecker.cs index 4a4ff0a9..ee0894b9 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/DbStartup/DatabaseReadinessChecker.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/DbStartup/DatabaseReadinessChecker.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Threading; using Microsoft.Data.SqlClient; using Microsoft.Extensions.Configuration; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/DbStartup/SetupAppRunner.cs b/api/src/Sozsoft.Platform.HttpApi.Host/DbStartup/SetupAppRunner.cs index fac93888..39bc0694 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/DbStartup/SetupAppRunner.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/DbStartup/SetupAppRunner.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/DbStartup/SetupEventStream.cs b/api/src/Sozsoft.Platform.HttpApi.Host/DbStartup/SetupEventStream.cs index 6dbf7c28..9b063e5f 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/DbStartup/SetupEventStream.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/DbStartup/SetupEventStream.cs @@ -1,4 +1,4 @@ -using System.Text.Json; +using System.Text.Json; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/DbStartup/SetupPasswordValidator.cs b/api/src/Sozsoft.Platform.HttpApi.Host/DbStartup/SetupPasswordValidator.cs index 3ac035fa..b6f47e9d 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/DbStartup/SetupPasswordValidator.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/DbStartup/SetupPasswordValidator.cs @@ -1,5 +1,4 @@ -using System; -using System.Security.Cryptography; +using System.Security.Cryptography; using System.Text; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Configuration; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/DbStartup/SetupStatusDto.cs b/api/src/Sozsoft.Platform.HttpApi.Host/DbStartup/SetupStatusDto.cs index cfdd29c1..4c4135bf 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/DbStartup/SetupStatusDto.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/DbStartup/SetupStatusDto.cs @@ -1,4 +1,4 @@ -namespace Sozsoft.Platform.DbStartup; +namespace Sozsoft.Platform.DbStartup; /// /// /api/setup/application-status yanıtı. diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/DynamicServices/DynamicAssemblyRegistrationService.cs b/api/src/Sozsoft.Platform.HttpApi.Host/DynamicServices/DynamicAssemblyRegistrationService.cs index 620322bf..1af111a3 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/DynamicServices/DynamicAssemblyRegistrationService.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/DynamicServices/DynamicAssemblyRegistrationService.cs @@ -12,352 +12,351 @@ using Microsoft.Extensions.Options; using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.DependencyInjection; -namespace Sozsoft.Platform.DynamicServices +namespace Sozsoft.Platform.DynamicServices; + +/// +/// Dinamik assembly'leri runtime'da DI ve MVC sistemine kaydeden background service +/// +public class DynamicAssemblyRegistrationService : BackgroundService, ITransientDependency { - /// - /// Dinamik assembly'leri runtime'da DI ve MVC sistemine kaydeden background service - /// - public class DynamicAssemblyRegistrationService : BackgroundService, ITransientDependency + private readonly IServiceProvider _serviceProvider; + private readonly ILogger _logger; + private readonly ApplicationPartManager _partManager; + private readonly IOptions _mvcOptions; + private readonly ActionDescriptorChangeProvider _changeProvider; + + // Bekleyen assembly kayıt istekleri + private static readonly Queue _pendingRegistrations = new(); + // Bekleyen assembly silme istekleri + private static readonly Queue _pendingUnregistrations = new(); + private static readonly object _lock = new(); + + public DynamicAssemblyRegistrationService( + IServiceProvider serviceProvider, + ILogger logger, + ApplicationPartManager partManager, + IOptions mvcOptions, + ActionDescriptorChangeProvider changeProvider) { - private readonly IServiceProvider _serviceProvider; - private readonly ILogger _logger; - private readonly ApplicationPartManager _partManager; - private readonly IOptions _mvcOptions; - private readonly ActionDescriptorChangeProvider _changeProvider; + _serviceProvider = serviceProvider; + _logger = logger; + _partManager = partManager; + _mvcOptions = mvcOptions; + _changeProvider = changeProvider; + } - // Bekleyen assembly kayıt istekleri - private static readonly Queue _pendingRegistrations = new(); - // Bekleyen assembly silme istekleri - private static readonly Queue _pendingUnregistrations = new(); - private static readonly object _lock = new(); - - public DynamicAssemblyRegistrationService( - IServiceProvider serviceProvider, - ILogger logger, - ApplicationPartManager partManager, - IOptions mvcOptions, - ActionDescriptorChangeProvider changeProvider) + /// + /// Yeni assembly kaydı istemi + /// + public static void RequestAssemblyRegistration(Guid tenantId, Assembly assembly, string assemblyName) + { + lock (_lock) { - _serviceProvider = serviceProvider; - _logger = logger; - _partManager = partManager; - _mvcOptions = mvcOptions; - _changeProvider = changeProvider; - } - - /// - /// Yeni assembly kaydı istemi - /// - public static void RequestAssemblyRegistration(Guid tenantId, Assembly assembly, string assemblyName) - { - lock (_lock) + _pendingRegistrations.Enqueue(new AssemblyRegistrationRequest { - _pendingRegistrations.Enqueue(new AssemblyRegistrationRequest - { - TenantId = tenantId, - Assembly = assembly, - AssemblyName = assemblyName, - RequestTime = DateTime.Now - }); - } - } - - /// - /// Bir servis adına ait assembly'nin Swagger/MVC'den kaldırılması istemi. - /// - public static void RequestAssemblyUnregistration(Guid tenantId, string serviceName) - { - lock (_lock) - { - _pendingUnregistrations.Enqueue(new AssemblyUnregistrationRequest - { - TenantId = tenantId, - ServiceName = serviceName, - RequestTime = DateTime.Now - }); - } - } - - protected override async Task ExecuteAsync(CancellationToken stoppingToken) - { - await Task.Delay(3000, stoppingToken); - - await LoadExistingServicesOnStartup(); - - while (!stoppingToken.IsCancellationRequested) - { - try - { - await ProcessPendingRegistrations(); - await Task.Delay(5000, stoppingToken); - } - catch (TaskCanceledException) - { - // Service is shutting down, exit gracefully - _logger.LogInformation("Assembly registration service is shutting down"); - break; - } - catch (OperationCanceledException) - { - // Service is shutting down, exit gracefully - _logger.LogInformation("Assembly registration service operation cancelled"); - break; - } - catch (Exception ex) - { - _logger.LogError(ex, "Assembly registration service error"); - } - } - } - - private async Task LoadExistingServicesOnStartup() - { - try - { - using var scope = _serviceProvider.CreateScope(); - - var repository = scope.ServiceProvider.GetService>(); - var compiler = scope.ServiceProvider.GetService(); - - if (repository == null || compiler == null) - { - return; - } - - var activeServices = await repository.GetListAsync(x => x.IsActive && x.CompilationStatus == Sozsoft.Platform.Entities.CompilationStatus.Success); - - foreach (var service in activeServices) - { - try - { - var assemblyName = $"{service.Name}_{service.Version}"; - await compiler.CompileAndRegisterForTenantAsync( - service.TenantId ?? Guid.Empty, - service.Code, - assemblyName); - } - catch (Exception ex) - { - _logger.LogError(ex, "Failed to load dynamic service: {Name}", service.Name); - } - } - } - catch (Exception ex) - { - _logger.LogError(ex, "Failed to load dynamic services on startup"); - } - } - - private async Task ProcessPendingRegistrations() - { - var registrations = new List(); - var unregistrations = new List(); - - lock (_lock) - { - while (_pendingRegistrations.Count > 0) - registrations.Add(_pendingRegistrations.Dequeue()); - - while (_pendingUnregistrations.Count > 0) - unregistrations.Add(_pendingUnregistrations.Dequeue()); - } - - foreach (var request in unregistrations) - { - try - { - UnregisterAssembly(request); - } - catch (Exception ex) - { - _logger.LogError(ex, "Failed to unregister assembly. Tenant: {TenantId}, Service: {Service}", - request.TenantId, request.ServiceName); - } - } - - if (registrations.Count == 0) - return; - - foreach (var request in registrations) - { - try - { - await RegisterAssembly(request); - } - catch (Exception ex) - { - _logger.LogError(ex, "Failed to register assembly. Tenant: {TenantId}, Assembly: {Assembly}", - request.TenantId, request.AssemblyName); - } - } - } - - private void UnregisterAssembly(AssemblyUnregistrationRequest request) - { - var servicePrefix = $"{request.ServiceName}_"; - - // ApplicationParts'tan kaldır - var partsToRemove = _partManager.ApplicationParts - .OfType() - .Where(p => p.Name.StartsWith(servicePrefix)) - .ToList(); - - foreach (var part in partsToRemove) - { - _partManager.ApplicationParts.Remove(part); - _logger.LogInformation("Assembly unregistered: {Name}", part.Name); - } - - // ConventionalControllerSettings'tan kaldır - var settingsToRemove = _mvcOptions.Value.ConventionalControllers.ConventionalControllerSettings - .Where(s => s.Assembly.GetName().Name?.StartsWith(servicePrefix) == true) - .ToList(); - - foreach (var setting in settingsToRemove) - _mvcOptions.Value.ConventionalControllers.ConventionalControllerSettings.Remove(setting); - - // DynamicServiceTypeRegistry'den kaldır - DynamicServiceTypeRegistry.UnregisterByAssemblyNamePrefix(servicePrefix); - - // DynamicServiceCompiler tenant assembly cache'inden kaldır - DynamicServiceCompiler.UnregisterTenantAssemblyByPrefix(request.TenantId, servicePrefix); - - // MVC/Swagger'ı yenile - _changeProvider.NotifyChanges(); - - _logger.LogInformation( - "Assembly unregistered: {ServiceName} (Tenant: {TenantId})", - request.ServiceName, request.TenantId); - } - - private async Task RegisterAssembly(AssemblyRegistrationRequest request) - { - var lastUnderscoreIndex = request.AssemblyName.LastIndexOf('_'); - if (lastUnderscoreIndex > 0) - { - var servicePrefix = request.AssemblyName.Substring(0, lastUnderscoreIndex + 1); - - var oldParts = _partManager.ApplicationParts - .OfType() - .Where(p => p.Name.StartsWith(servicePrefix) && p.Name != request.AssemblyName) - .ToList(); - - foreach (var oldPart in oldParts) - { - _partManager.ApplicationParts.Remove(oldPart); - } - - var oldSettings = _mvcOptions.Value.ConventionalControllers.ConventionalControllerSettings - .Where(s => s.Assembly.GetName().Name?.StartsWith(servicePrefix) == true && - s.Assembly.GetName().Name != request.AssemblyName) - .ToList(); - - foreach (var oldSetting in oldSettings) - { - _mvcOptions.Value.ConventionalControllers.ConventionalControllerSettings.Remove(oldSetting); - } - } - - var appServiceTypes = request.Assembly.GetTypes() - .Where(t => IsApplicationServiceType(t)) - .ToList(); - - if (appServiceTypes.Count == 0) - { - return; - } - - foreach (var serviceType in appServiceTypes) - { - DynamicServiceTypeRegistry.RegisterType(serviceType); - } - - var existingPart = _partManager.ApplicationParts - .OfType() - .FirstOrDefault(p => p.Assembly == request.Assembly); - - if (existingPart == null) - { - var assemblyPart = new AssemblyPart(request.Assembly); - _partManager.ApplicationParts.Add(assemblyPart); - } - - try - { - var isConfigured = _mvcOptions.Value.ConventionalControllers.ConventionalControllerSettings - .Any(s => s.Assembly == request.Assembly); - - if (!isConfigured) - { - _mvcOptions.Value.ConventionalControllers.Create(request.Assembly, options => - { - options.RootPath = "app"; - options.RemoteServiceName = "Default"; - options.TypePredicate = t => appServiceTypes.Contains(t); - }); - } - } - catch (Exception ex) - { - _logger.LogError(ex, "Failed to configure MVC for assembly: {Assembly}", request.AssemblyName); - } - - try - { - _changeProvider.NotifyChanges(); - } - catch (Exception ex) - { - _logger.LogError(ex, "Failed to notify ActionDescriptor changes"); - } - - await Task.Delay(100); - await Task.CompletedTask; - } - - private bool IsApplicationServiceType(Type type) - { - try - { - return !type.IsAbstract && - !type.IsInterface && - type.IsClass && - (type.Name.EndsWith("AppService") || type.Name.EndsWith("ApplicationService")) && - HasApplicationServiceBase(type); - } - catch - { - return false; - } - } - - private bool HasApplicationServiceBase(Type type) - { - var currentType = type.BaseType; - while (currentType != null) - { - if (currentType.Name.Contains("ApplicationService")) - { - return true; - } - currentType = currentType.BaseType; - } - return false; - } - - private class AssemblyRegistrationRequest - { - public Guid TenantId { get; set; } - public Assembly Assembly { get; set; } - public string AssemblyName { get; set; } - public DateTime RequestTime { get; set; } - } - - private class AssemblyUnregistrationRequest - { - public Guid TenantId { get; set; } - public string ServiceName { get; set; } - public DateTime RequestTime { get; set; } + TenantId = tenantId, + Assembly = assembly, + AssemblyName = assemblyName, + RequestTime = DateTime.Now + }); } } + + /// + /// Bir servis adına ait assembly'nin Swagger/MVC'den kaldırılması istemi. + /// + public static void RequestAssemblyUnregistration(Guid tenantId, string serviceName) + { + lock (_lock) + { + _pendingUnregistrations.Enqueue(new AssemblyUnregistrationRequest + { + TenantId = tenantId, + ServiceName = serviceName, + RequestTime = DateTime.Now + }); + } + } + + protected override async Task ExecuteAsync(CancellationToken stoppingToken) + { + await Task.Delay(3000, stoppingToken); + + await LoadExistingServicesOnStartup(); + + while (!stoppingToken.IsCancellationRequested) + { + try + { + await ProcessPendingRegistrations(); + await Task.Delay(5000, stoppingToken); + } + catch (TaskCanceledException) + { + // Service is shutting down, exit gracefully + _logger.LogInformation("Assembly registration service is shutting down"); + break; + } + catch (OperationCanceledException) + { + // Service is shutting down, exit gracefully + _logger.LogInformation("Assembly registration service operation cancelled"); + break; + } + catch (Exception ex) + { + _logger.LogError(ex, "Assembly registration service error"); + } + } + } + + private async Task LoadExistingServicesOnStartup() + { + try + { + using var scope = _serviceProvider.CreateScope(); + + var repository = scope.ServiceProvider.GetService>(); + var compiler = scope.ServiceProvider.GetService(); + + if (repository == null || compiler == null) + { + return; + } + + var activeServices = await repository.GetListAsync(x => x.IsActive && x.CompilationStatus == Sozsoft.Platform.Entities.CompilationStatus.Success); + + foreach (var service in activeServices) + { + try + { + var assemblyName = $"{service.Name}_{service.Version}"; + await compiler.CompileAndRegisterForTenantAsync( + service.TenantId ?? Guid.Empty, + service.Code, + assemblyName); + } + catch (Exception ex) + { + _logger.LogError(ex, "Failed to load dynamic service: {Name}", service.Name); + } + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Failed to load dynamic services on startup"); + } + } + + private async Task ProcessPendingRegistrations() + { + var registrations = new List(); + var unregistrations = new List(); + + lock (_lock) + { + while (_pendingRegistrations.Count > 0) + registrations.Add(_pendingRegistrations.Dequeue()); + + while (_pendingUnregistrations.Count > 0) + unregistrations.Add(_pendingUnregistrations.Dequeue()); + } + + foreach (var request in unregistrations) + { + try + { + UnregisterAssembly(request); + } + catch (Exception ex) + { + _logger.LogError(ex, "Failed to unregister assembly. Tenant: {TenantId}, Service: {Service}", + request.TenantId, request.ServiceName); + } + } + + if (registrations.Count == 0) + return; + + foreach (var request in registrations) + { + try + { + await RegisterAssembly(request); + } + catch (Exception ex) + { + _logger.LogError(ex, "Failed to register assembly. Tenant: {TenantId}, Assembly: {Assembly}", + request.TenantId, request.AssemblyName); + } + } + } + + private void UnregisterAssembly(AssemblyUnregistrationRequest request) + { + var servicePrefix = $"{request.ServiceName}_"; + + // ApplicationParts'tan kaldır + var partsToRemove = _partManager.ApplicationParts + .OfType() + .Where(p => p.Name.StartsWith(servicePrefix)) + .ToList(); + + foreach (var part in partsToRemove) + { + _partManager.ApplicationParts.Remove(part); + _logger.LogInformation("Assembly unregistered: {Name}", part.Name); + } + + // ConventionalControllerSettings'tan kaldır + var settingsToRemove = _mvcOptions.Value.ConventionalControllers.ConventionalControllerSettings + .Where(s => s.Assembly.GetName().Name?.StartsWith(servicePrefix) == true) + .ToList(); + + foreach (var setting in settingsToRemove) + _mvcOptions.Value.ConventionalControllers.ConventionalControllerSettings.Remove(setting); + + // DynamicServiceTypeRegistry'den kaldır + DynamicServiceTypeRegistry.UnregisterByAssemblyNamePrefix(servicePrefix); + + // DynamicServiceCompiler tenant assembly cache'inden kaldır + DynamicServiceCompiler.UnregisterTenantAssemblyByPrefix(request.TenantId, servicePrefix); + + // MVC/Swagger'ı yenile + _changeProvider.NotifyChanges(); + + _logger.LogInformation( + "Assembly unregistered: {ServiceName} (Tenant: {TenantId})", + request.ServiceName, request.TenantId); + } + + private async Task RegisterAssembly(AssemblyRegistrationRequest request) + { + var lastUnderscoreIndex = request.AssemblyName.LastIndexOf('_'); + if (lastUnderscoreIndex > 0) + { + var servicePrefix = request.AssemblyName.Substring(0, lastUnderscoreIndex + 1); + + var oldParts = _partManager.ApplicationParts + .OfType() + .Where(p => p.Name.StartsWith(servicePrefix) && p.Name != request.AssemblyName) + .ToList(); + + foreach (var oldPart in oldParts) + { + _partManager.ApplicationParts.Remove(oldPart); + } + + var oldSettings = _mvcOptions.Value.ConventionalControllers.ConventionalControllerSettings + .Where(s => s.Assembly.GetName().Name?.StartsWith(servicePrefix) == true && + s.Assembly.GetName().Name != request.AssemblyName) + .ToList(); + + foreach (var oldSetting in oldSettings) + { + _mvcOptions.Value.ConventionalControllers.ConventionalControllerSettings.Remove(oldSetting); + } + } + + var appServiceTypes = request.Assembly.GetTypes() + .Where(t => IsApplicationServiceType(t)) + .ToList(); + + if (appServiceTypes.Count == 0) + { + return; + } + + foreach (var serviceType in appServiceTypes) + { + DynamicServiceTypeRegistry.RegisterType(serviceType); + } + + var existingPart = _partManager.ApplicationParts + .OfType() + .FirstOrDefault(p => p.Assembly == request.Assembly); + + if (existingPart == null) + { + var assemblyPart = new AssemblyPart(request.Assembly); + _partManager.ApplicationParts.Add(assemblyPart); + } + + try + { + var isConfigured = _mvcOptions.Value.ConventionalControllers.ConventionalControllerSettings + .Any(s => s.Assembly == request.Assembly); + + if (!isConfigured) + { + _mvcOptions.Value.ConventionalControllers.Create(request.Assembly, options => + { + options.RootPath = "app"; + options.RemoteServiceName = "Default"; + options.TypePredicate = t => appServiceTypes.Contains(t); + }); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Failed to configure MVC for assembly: {Assembly}", request.AssemblyName); + } + + try + { + _changeProvider.NotifyChanges(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Failed to notify ActionDescriptor changes"); + } + + await Task.Delay(100); + await Task.CompletedTask; + } + + private bool IsApplicationServiceType(Type type) + { + try + { + return !type.IsAbstract && + !type.IsInterface && + type.IsClass && + (type.Name.EndsWith("AppService") || type.Name.EndsWith("ApplicationService")) && + HasApplicationServiceBase(type); + } + catch + { + return false; + } + } + + private bool HasApplicationServiceBase(Type type) + { + var currentType = type.BaseType; + while (currentType != null) + { + if (currentType.Name.Contains("ApplicationService")) + { + return true; + } + currentType = currentType.BaseType; + } + return false; + } + + private class AssemblyRegistrationRequest + { + public Guid TenantId { get; set; } + public Assembly Assembly { get; set; } + public string AssemblyName { get; set; } + public DateTime RequestTime { get; set; } + } + + private class AssemblyUnregistrationRequest + { + public Guid TenantId { get; set; } + public string ServiceName { get; set; } + public DateTime RequestTime { get; set; } + } } diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/DynamicServices/DynamicControllerActivator.cs b/api/src/Sozsoft.Platform.HttpApi.Host/DynamicServices/DynamicControllerActivator.cs index dc6d8aad..943891b2 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/DynamicServices/DynamicControllerActivator.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/DynamicServices/DynamicControllerActivator.cs @@ -71,7 +71,7 @@ public class DynamicControllerActivator : IControllerActivator { // First try to get from DI var instance = _serviceProvider.GetService(controllerType); - + if (instance != null) { return instance; @@ -81,7 +81,7 @@ public class DynamicControllerActivator : IControllerActivator if (DynamicServiceTypeRegistry.IsRegistered(controllerType)) { instance = ActivatorUtilities.CreateInstance(_serviceProvider, controllerType); - + if (instance != null) { return instance; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/Extensions/CaptchaMiddleware.cs b/api/src/Sozsoft.Platform.HttpApi.Host/Extensions/CaptchaMiddleware.cs index 9fe43d4f..c7a580d8 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/Extensions/CaptchaMiddleware.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/Extensions/CaptchaMiddleware.cs @@ -3,10 +3,10 @@ using System.Linq; using System.Net; using System.Text.Json; using System.Threading.Tasks; -using Sozsoft.Platform.Identity; -using Sozsoft.Platform.Localization; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Localization; +using Sozsoft.Platform.Identity; +using Sozsoft.Platform.Localization; using Volo.Abp.DependencyInjection; namespace Sozsoft.Platform.Extensions; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/Extensions/ChangeLogStartupService.cs b/api/src/Sozsoft.Platform.HttpApi.Host/Extensions/ChangeLogStartupService.cs index f16fb723..19b7fc50 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/Extensions/ChangeLogStartupService.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/Extensions/ChangeLogStartupService.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Globalization; using System.IO; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/Extensions/HttpContextExtensions.cs b/api/src/Sozsoft.Platform.HttpApi.Host/Extensions/HttpContextExtensions.cs index 067cd4ea..b258bae8 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/Extensions/HttpContextExtensions.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/Extensions/HttpContextExtensions.cs @@ -1,82 +1,81 @@ -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Primitives; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Net; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Primitives; -namespace Sozsoft.Platform.Extensions +namespace Sozsoft.Platform.Extensions; + +public static class HttpContextExtensions { - public static class HttpContextExtensions + /// + /// Get remote ip address, optionally allowing for x-forwarded-for header check + /// + /// Http context + /// Whether to allow x-forwarded-for header check + /// IPAddress + public static IPAddress? GetRemoteIPAddress(this HttpContext context, bool allowForwarded = true) { - /// - /// Get remote ip address, optionally allowing for x-forwarded-for header check - /// - /// Http context - /// Whether to allow x-forwarded-for header check - /// IPAddress - public static IPAddress? GetRemoteIPAddress(this HttpContext context, bool allowForwarded = true) + if (allowForwarded) { - if (allowForwarded) + // if you are allowing these forward headers, please ensure you are restricting context.Connection.RemoteIpAddress + // to cloud flare ips: https://www.cloudflare.com/ips/ + string? header = ( + GetHeaderValueAs( + context.Request.Headers, + "X-Forwarded-For")?.SplitCsv()?.FirstOrDefault() ?? + GetHeaderValueAs( + context.Request.Headers, + "CF-Connecting-IP")?.SplitCsv()?.FirstOrDefault()); + if (header != null && IPEndPoint.TryParse(header, out IPEndPoint? ip)) { - // if you are allowing these forward headers, please ensure you are restricting context.Connection.RemoteIpAddress - // to cloud flare ips: https://www.cloudflare.com/ips/ - string? header = ( - GetHeaderValueAs( - context.Request.Headers, - "X-Forwarded-For")?.SplitCsv()?.FirstOrDefault() ?? - GetHeaderValueAs( - context.Request.Headers, - "CF-Connecting-IP")?.SplitCsv()?.FirstOrDefault()); - if (header != null && IPEndPoint.TryParse(header, out IPEndPoint? ip)) - { - return ip.Address; - } + return ip.Address; } - if (context.Connection.RemoteIpAddress != null) + } + if (context.Connection.RemoteIpAddress != null) + { + return context.Connection.RemoteIpAddress; + } + else + { + var ip2 = GetHeaderValueAs(context.Request.Headers, "REMOTE_ADDR"); + if (ip2 != null && IPEndPoint.TryParse(ip2, out IPEndPoint? ip2Parsed)) { - return context.Connection.RemoteIpAddress; + return ip2Parsed.Address; } - else - { - var ip2 = GetHeaderValueAs(context.Request.Headers, "REMOTE_ADDR"); - if (ip2 != null && IPEndPoint.TryParse(ip2, out IPEndPoint? ip2Parsed)) - { - return ip2Parsed.Address; - } - } - - return null; - //throw new Exception("Unable to determine caller's IP."); } - public static List? SplitCsv(this string csvList, bool nullOrWhitespaceInputReturnsNull = false) - { - if (string.IsNullOrWhiteSpace(csvList)) - return nullOrWhitespaceInputReturnsNull ? null : new List(); - - return csvList - .TrimEnd(',') - .Split(',') - .AsEnumerable() - .Select(s => s.Trim()) - .ToList(); - } - - public static T? GetHeaderValueAs(IHeaderDictionary headers, string headerName) - { - StringValues values = ""; - if (headers?.TryGetValue(headerName, out values) ?? false) - { - string rawValues = values.ToString(); // writes out as Csv when there are multiple. - - if (!rawValues.IsNullOrWhiteSpace()) - return (T)Convert.ChangeType(rawValues, typeof(T)); - } - return default; - } - - + return null; + //throw new Exception("Unable to determine caller's IP."); } + + public static List? SplitCsv(this string csvList, bool nullOrWhitespaceInputReturnsNull = false) + { + if (string.IsNullOrWhiteSpace(csvList)) + return nullOrWhitespaceInputReturnsNull ? null : new List(); + + return csvList + .TrimEnd(',') + .Split(',') + .AsEnumerable() + .Select(s => s.Trim()) + .ToList(); + } + + public static T? GetHeaderValueAs(IHeaderDictionary headers, string headerName) + { + StringValues values = ""; + if (headers?.TryGetValue(headerName, out values) ?? false) + { + string rawValues = values.ToString(); // writes out as Csv when there are multiple. + + if (!rawValues.IsNullOrWhiteSpace()) + return (T)Convert.ChangeType(rawValues, typeof(T)); + } + return default; + } + + } diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/Extensions/PlatformApplicationConfigurationContributor.cs b/api/src/Sozsoft.Platform.HttpApi.Host/Extensions/PlatformApplicationConfigurationContributor.cs index 4fa601a7..ab6f70a5 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/Extensions/PlatformApplicationConfigurationContributor.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/Extensions/PlatformApplicationConfigurationContributor.cs @@ -1,10 +1,10 @@ using System; using System.Linq; using System.Threading.Tasks; -using Sozsoft.Platform.Entities; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using Sozsoft.Platform.Entities; using Sozsoft.Platform.Identity; using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations; using Volo.Abp.Data; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformAccountController.cs b/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformAccountController.cs index e05f6cab..c5cf1804 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformAccountController.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformAccountController.cs @@ -1,9 +1,9 @@ using System.Threading.Tasks; -using Sozsoft.Platform.Localization; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Localization; using Microsoft.Extensions.Options; +using Sozsoft.Platform.Localization; using Volo.Abp; using Volo.Abp.Account; using Volo.Abp.Account.Web.Areas.Account.Controllers.Models; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformLoginResult.cs b/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformLoginResult.cs index eed1e5fc..b7fbf1fe 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformLoginResult.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformLoginResult.cs @@ -1,5 +1,4 @@ -using Sozsoft.Platform.Data.Seeds; -using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Localization; using Volo.Abp.Account.Web.Areas.Account.Controllers.Models; @@ -18,7 +17,7 @@ public class PlatformLoginResult : AbpLoginResult PResult = result; if (result == PlatformLoginResultType.WrongTwoFactorCode) { - Description = L[PlatformConsts.AbpIdentity.User.TwoFactorWrongCode]; + Description = L[PlatformConsts.AbpIdentity.User.TwoFactorWrongCode]; } } diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformSessionClaimContext.cs b/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformSessionClaimContext.cs index f27592a7..6d4c2828 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformSessionClaimContext.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformSessionClaimContext.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Threading; namespace Sozsoft.Platform.Identity; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformSessionCleanupWorker.cs b/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformSessionCleanupWorker.cs index fd84e9f2..de715abe 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformSessionCleanupWorker.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformSessionCleanupWorker.cs @@ -1,18 +1,18 @@ -using System; +using System; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Sozsoft.Platform.BackgroundWorkers; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using OpenIddict.Server; +using Sozsoft.Platform.BackgroundWorkers; +using Sozsoft.Platform.Extensions; using Volo.Abp.DependencyInjection; using Volo.Abp.Identity; using Volo.Abp.MultiTenancy; using Volo.Abp.TenantManagement; using Volo.Abp.Timing; using Volo.Abp.Uow; -using Sozsoft.Platform.Extensions; namespace Sozsoft.Platform.Identity; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformSessionRevocationHandler.cs b/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformSessionRevocationHandler.cs index 50e0080d..7c7697ed 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformSessionRevocationHandler.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformSessionRevocationHandler.cs @@ -1,16 +1,15 @@ -using System; +using System; +using System.Linq; using System.Threading.Tasks; using Microsoft.Extensions.Logging; using OpenIddict.Abstractions; using OpenIddict.Server; -using static OpenIddict.Server.OpenIddictServerEvents; using Volo.Abp.DependencyInjection; using Volo.Abp.Identity; using Volo.Abp.MultiTenancy; using Volo.Abp.Security.Claims; using Volo.Abp.Uow; -using System.Linq; -using Volo.Abp; +using static OpenIddict.Server.OpenIddictServerEvents; namespace Sozsoft.Platform.Identity; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformSessionValidationMiddleware.cs b/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformSessionValidationMiddleware.cs index 4c35da7f..8d348aa1 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformSessionValidationMiddleware.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformSessionValidationMiddleware.cs @@ -1,11 +1,10 @@ -using System; +using System; using System.Linq; using System.Threading.Tasks; -using Microsoft.Data.SqlClient; using Microsoft.AspNetCore.Http; +using Microsoft.Data.SqlClient; using Microsoft.Extensions.Configuration; using Sozsoft.Platform.DbStartup; -using Volo.Abp; using Volo.Abp.DependencyInjection; using Volo.Abp.Identity; using Volo.Abp.MultiTenancy; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformSignInManager.cs b/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformSignInManager.cs index 8cd04867..31bed0a9 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformSignInManager.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformSignInManager.cs @@ -2,14 +2,14 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Sozsoft.Platform.Entities; -using Sozsoft.Platform.Extensions; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; +using Sozsoft.Platform.Entities; +using Sozsoft.Platform.Extensions; using Volo.Abp.Domain.Repositories; using Volo.Abp.Identity; using Volo.Abp.Identity.AspNetCore; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformTokenController.cs b/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformTokenController.cs index c74f9b2f..ee1f41d8 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformTokenController.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformTokenController.cs @@ -3,18 +3,18 @@ using System.Collections.Generic; using System.Linq; using System.Security.Claims; using System.Threading.Tasks; -using Microsoft.Extensions.Logging; -using Sozsoft.Platform.Extensions; -using Sozsoft.Platform.Localization; -using Sozsoft.Sender.Mail; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Localization; +using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using OpenIddict.Abstractions; using OpenIddict.Server.AspNetCore; +using Sozsoft.Platform.Extensions; +using Sozsoft.Platform.Localization; +using Sozsoft.Sender.Mail; using Volo.Abp; using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.DependencyInjection; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformUserClaimsPrincipalFactory.cs b/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformUserClaimsPrincipalFactory.cs index 4d201cb6..c723fd6d 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformUserClaimsPrincipalFactory.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/Identity/PlatformUserClaimsPrincipalFactory.cs @@ -2,9 +2,9 @@ using System.Security.Claims; using System.Security.Principal; using System.Threading.Tasks; -using Sozsoft.Platform.Extensions; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Options; +using Sozsoft.Platform.Extensions; using Volo.Abp.DependencyInjection; using Volo.Abp.Identity; using Volo.Abp.Security.Claims; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/PlatformBrandingProvider.cs b/api/src/Sozsoft.Platform.HttpApi.Host/PlatformBrandingProvider.cs index 6ab755ee..68965bc0 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/PlatformBrandingProvider.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/PlatformBrandingProvider.cs @@ -1,6 +1,4 @@ -using Sozsoft.Platform.Localization; -using Microsoft.Extensions.Localization; -using Volo.Abp.DependencyInjection; +using Volo.Abp.DependencyInjection; using Volo.Abp.Ui.Branding; namespace Sozsoft.Platform; @@ -8,12 +6,6 @@ namespace Sozsoft.Platform; [Dependency(ReplaceServices = true)] public class PlatformBrandingProvider : DefaultBrandingProvider { - private IStringLocalizer _localizer; - - public PlatformBrandingProvider(IStringLocalizer localizer) - { - _localizer = localizer; - } public override string AppName => PlatformConsts.AppName; //TODO: _localizer["AppName"]; } diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/PlatformHttpApiHostModule.cs b/api/src/Sozsoft.Platform.HttpApi.Host/PlatformHttpApiHostModule.cs index f7b7f2a1..222e8f11 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/PlatformHttpApiHostModule.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/PlatformHttpApiHostModule.cs @@ -2,26 +2,18 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using System.Threading.Tasks; +using DevExpress.AspNetCore; +using DevExpress.AspNetCore.Reporting; +using DevExpress.XtraReports.Web.Extensions; using Hangfire; using Hangfire.PostgreSql; -using Sozsoft.Languages; -using Sozsoft.MailQueue; -using Sozsoft.Notifications.Application; -using Sozsoft.Platform.EntityFrameworkCore; -using Sozsoft.SqlQueryManager; -using Sozsoft.Platform.Extensions; -using Sozsoft.Platform.FileManagement; -using Sozsoft.Platform.Identity; -using Sozsoft.Platform.Localization; -using Sozsoft.Settings; -using Microsoft.AspNetCore.Mvc.Infrastructure; +using Hangfire.SqlServer; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.Extensions.DependencyInjection; using Microsoft.AspNetCore.Http; -using Sozsoft.Platform.DbStartup; using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.ResponseCompression; using Microsoft.Extensions.Caching.StackExchangeRedis; using Microsoft.Extensions.Configuration; @@ -30,10 +22,22 @@ using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Microsoft.OpenApi.Models; -using OpenIddict.Server; using OpenIddict.Server.AspNetCore; using OpenIddict.Validation.AspNetCore; -using static OpenIddict.Server.OpenIddictServerEvents; +using Sozsoft.Languages; +using Sozsoft.MailQueue; +using Sozsoft.Notifications.Application; +using Sozsoft.Platform.DbStartup; +using Sozsoft.Platform.DynamicServices; +using Sozsoft.Platform.EntityFrameworkCore; +using Sozsoft.Platform.Extensions; +using Sozsoft.Platform.FileManagement; +using Sozsoft.Platform.Identity; +using Sozsoft.Platform.Localization; +using Sozsoft.Platform.Messenger; +using Sozsoft.Platform.ReportServices; +using Sozsoft.Settings; +using Sozsoft.SqlQueryManager; using Volo.Abp; using Volo.Abp.Account.Web; using Volo.Abp.AspNetCore.Auditing; @@ -56,16 +60,9 @@ using Volo.Abp.Modularity; using Volo.Abp.Security.Claims; using Volo.Abp.Swashbuckle; using Volo.Abp.UI.Navigation.Urls; -using Volo.Abp.VirtualFileSystem; -using Sozsoft.Platform.DynamicServices; +using static OpenIddict.Server.OpenIddictServerEvents; using static Sozsoft.Platform.PlatformConsts; using static Sozsoft.Settings.SettingsConsts; -using Hangfire.SqlServer; -using DevExpress.AspNetCore; -using DevExpress.AspNetCore.Reporting; -using DevExpress.XtraReports.Web.Extensions; -using Sozsoft.Platform.ReportServices; -using Sozsoft.Platform.Messenger; namespace Sozsoft.Platform; @@ -246,33 +243,6 @@ public class PlatformHttpApiHostModule : AbpModule }); } - private void ConfigureVirtualFileSystem(ServiceConfigurationContext context) - { - var hostingEnvironment = context.Services.GetHostingEnvironment(); - - if (hostingEnvironment.IsDevelopment()) - { - Configure(options => - { - options.FileSets.ReplaceEmbeddedByPhysical( - Path.Combine(hostingEnvironment.ContentRootPath, - $"..{Path.DirectorySeparatorChar}Sozsoft.Platform.Domain.Shared")); - options.FileSets.ReplaceEmbeddedByPhysical( - Path.Combine(hostingEnvironment.ContentRootPath, - $"..{Path.DirectorySeparatorChar}Sozsoft.Platform.Domain")); - options.FileSets.ReplaceEmbeddedByPhysical( - Path.Combine(hostingEnvironment.ContentRootPath, - $"..{Path.DirectorySeparatorChar}Sozsoft.Platform.Application.Contracts")); - options.FileSets.ReplaceEmbeddedByPhysical( - Path.Combine(hostingEnvironment.ContentRootPath, - $"..{Path.DirectorySeparatorChar}Sozsoft.Platform.Application")); - options.FileSets.ReplaceEmbeddedByPhysical( - Path.Combine(hostingEnvironment.ContentRootPath, - $"..{Path.DirectorySeparatorChar}Sozsoft.MailQueue")); - }); - } - } - private void ConfigureCors(ServiceConfigurationContext context, IConfiguration configuration) { context.Services.AddCors(options => @@ -310,7 +280,7 @@ public class PlatformHttpApiHostModule : AbpModule // DevExpress reporting controller'larını Swagger'dan hariç tut if (description.ActionDescriptor.RouteValues.TryGetValue("controller", out var controllerName)) { - if (controllerName == "CustomReportDesigner" || + if (controllerName == "CustomReportDesigner" || controllerName == "CustomWebDocumentViewer" || controllerName == "QueryBuilder") { @@ -387,7 +357,7 @@ public class PlatformHttpApiHostModule : AbpModule new PostgreSqlStorageOptions { PrepareSchemaIfNecessary = true - }); + }); }); } else if (DefaultDatabaseProvider == DatabaseProvider.SqlServer) @@ -405,7 +375,7 @@ public class PlatformHttpApiHostModule : AbpModule QueuePollInterval = TimeSpan.Zero, UseRecommendedIsolationLevel = true, DisableGlobalLocks = true - }); + }); }); } #pragma warning restore CS0162 @@ -453,11 +423,11 @@ public class PlatformHttpApiHostModule : AbpModule private void ConfigureDevExpressReporting(ServiceConfigurationContext context, IConfiguration configuration) { var logger = context.Services.BuildServiceProvider().GetService>(); - + // Configure fonts before initializing DevExpress controls DevExpressFontConfiguration.ConfigureDefaultFonts(logger); DevExpressFontConfiguration.InstallLinuxFonts(logger); - + context.Services.AddDevExpressControls(); context.Services.ConfigureReportingServices(configurator => { diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicFormReport.cs b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicFormReport.cs index e8d2673a..477ea9f1 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicFormReport.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicFormReport.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Data; using System.Globalization; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicGridReport.cs b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicGridReport.cs index bc8f44a1..01274fd9 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicGridReport.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicGridReport.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Data; using System.Linq; @@ -11,7 +11,6 @@ using DevExpress.XtraReports.UI; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Localization; -using Sozsoft.Platform; using Sozsoft.Platform.DynamicData; using Sozsoft.Platform.Entities; using Sozsoft.Platform.Enums; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReport.cs b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReport.cs index ab272110..1d753f0f 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReport.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReport.cs @@ -2,12 +2,11 @@ using System.Collections.Generic; using System.ComponentModel; using System.Linq; -using DevExpress.Drawing; using DevExpress.XtraPrinting; using DevExpress.XtraReports.UI; +using Microsoft.Extensions.DependencyInjection; using Sozsoft.Languages.Entities; using Sozsoft.Platform.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Users; namespace Sozsoft.Reports.PredefinedReports; @@ -35,7 +34,7 @@ public partial class DynamicReport : XtraReport ConfigurePage(); _parameters = new Dictionary(); - + // Language verilerini yükle LoadLanguageParameters(); AddHeaderGeneratedAt(); @@ -101,7 +100,7 @@ public partial class DynamicReport : XtraReport { } } - + private void LoadLanguageParameters() { try @@ -119,7 +118,7 @@ public partial class DynamicReport : XtraReport SetParameter("id", language.Id.ToString()); SetParameter("name", language.DisplayName); } - + SetParameter("date", DynamicReportImageHelper.FormatReportDate(DateTime.Now)); } catch @@ -127,7 +126,7 @@ public partial class DynamicReport : XtraReport SetParameter("date", DynamicReportImageHelper.FormatReportDate(DateTime.Now)); } } - + /// /// Rapor isteğiyle gelen kültüre karşılık gelen dil kaydını döner. /// Eşleşme yoksa etkin dillerden ilki kullanılır. diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportColumn.cs b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportColumn.cs index 8334fb85..946b13ca 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportColumn.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportColumn.cs @@ -1,10 +1,10 @@ -using System.Collections.Generic; +using System.Collections.Generic; using Microsoft.Extensions.Localization; using Sozsoft.Platform; -using Sozsoft.Platform.Localization; using Sozsoft.Platform.Entities; using Sozsoft.Platform.Enums; using Sozsoft.Platform.ListForms; +using Sozsoft.Platform.Localization; using Sozsoft.Platform.Queries; namespace Sozsoft.Reports.PredefinedReports; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportFontHelper.cs b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportFontHelper.cs index 9d40abc8..4ebdcf0d 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportFontHelper.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportFontHelper.cs @@ -1,4 +1,4 @@ -using System; +using System; using DevExpress.Drawing; namespace Sozsoft.Reports.PredefinedReports; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportGridStateHelper.cs b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportGridStateHelper.cs index f6f065f0..68677f5d 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportGridStateHelper.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportGridStateHelper.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Data; using System.Linq; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportImageHelper.cs b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportImageHelper.cs index f10598ad..49b8261a 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportImageHelper.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportImageHelper.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections; using System.Collections.Concurrent; using System.Collections.Generic; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportLayoutHelper.cs b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportLayoutHelper.cs index 1fe14601..f90124f3 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportLayoutHelper.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportLayoutHelper.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text.Json; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportSqlBuilder.cs b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportSqlBuilder.cs index 71d37d08..a64eafda 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportSqlBuilder.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicReportSqlBuilder.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicTreeReport.cs b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicTreeReport.cs index cb19d693..087c9f5a 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicTreeReport.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/PredefinedReports/DynamicTreeReport.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Data; using System.Globalization; @@ -12,10 +12,8 @@ using DevExpress.XtraReports.UI; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Localization; -using Sozsoft.Platform; using Sozsoft.Platform.DynamicData; using Sozsoft.Platform.Entities; -using Sozsoft.Platform.Enums; using Sozsoft.Platform.ListForms; using Sozsoft.Platform.Localization; using Sozsoft.Platform.Queries; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/Program.cs b/api/src/Sozsoft.Platform.HttpApi.Host/Program.cs index 3039ae97..2da9fcd8 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/Program.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/Program.cs @@ -2,17 +2,17 @@ using System.Collections.Generic; using System.IO; using System.Threading.Tasks; -using Sozsoft.Platform.Enums; -using Sozsoft.Platform.DbStartup; -using Sozsoft.Platform.DynamicServices; +using DevExpress.AspNetCore; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Sinks.PostgreSQL; +using Sozsoft.Platform.DbStartup; +using Sozsoft.Platform.DynamicServices; +using Sozsoft.Platform.Enums; using static Sozsoft.Settings.SettingsConsts; -using DevExpress.AspNetCore; namespace Sozsoft.Platform; diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/ReportServices/CustomReportStorageWebExtension.cs b/api/src/Sozsoft.Platform.HttpApi.Host/ReportServices/CustomReportStorageWebExtension.cs index 5873b21a..9658de89 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/ReportServices/CustomReportStorageWebExtension.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/ReportServices/CustomReportStorageWebExtension.cs @@ -1,7 +1,7 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.IO; using System.Linq; -using System; using System.Reflection; using System.Text.Json; using System.Threading.Tasks; @@ -26,21 +26,21 @@ public class CustomReportStorageWebExtension : DevExpress.XtraReports.Web.Extens public CustomReportStorageWebExtension(IServiceScopeFactory scopeFactory) { _scopeFactory = scopeFactory; - + ConfigureDynamicReportScopes(scopeFactory); - + if (!Directory.Exists(reportDirectory)) { Directory.CreateDirectory(reportDirectory); } } - + public CustomReportStorageWebExtension(IServiceScopeFactory scopeFactory, string reportDirectory) { _scopeFactory = scopeFactory; - + ConfigureDynamicReportScopes(scopeFactory); - + if (!Directory.Exists(reportDirectory)) { Directory.CreateDirectory(reportDirectory); @@ -78,7 +78,7 @@ public class CustomReportStorageWebExtension : DevExpress.XtraReports.Web.Extens // Determines whether the URL passed to the current report storage is valid. // Implement your own logic to prohibit URLs that contain spaces or other specific characters. // Return **true** if no validation is required. - + // Query string veya path parametreleri gelse bile sadece rapor adını kontrol et. var reportName = GetStorageReportName(url); return IsSafeReportFileName(reportName); @@ -521,14 +521,14 @@ public class CustomReportStorageWebExtension : DevExpress.XtraReports.Web.Extens var reportsFromFiles = Directory.GetFiles(reportDirectory, "*" + FileExtension) .Select(Path.GetFileNameWithoutExtension); - + var reportsFromCode = Assembly.GetExecutingAssembly() .GetTypes() - .Where(t => t.Namespace == "Sozsoft.Reports.PredefinedReports" && - typeof(XtraReport).IsAssignableFrom(t) && + .Where(t => t.Namespace == "Sozsoft.Reports.PredefinedReports" && + typeof(XtraReport).IsAssignableFrom(t) && !t.IsAbstract) .Select(t => t.Name); - + return reportsFromFiles.Union(reportsFromCode) .ToDictionary(x => x); } diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/ReportServices/DevExpressFontConfiguration.cs b/api/src/Sozsoft.Platform.HttpApi.Host/ReportServices/DevExpressFontConfiguration.cs index 53ace938..0691b81b 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/ReportServices/DevExpressFontConfiguration.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/ReportServices/DevExpressFontConfiguration.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using DevExpress.Drawing; using Microsoft.Extensions.Logging; @@ -14,7 +14,7 @@ public static class DevExpressFontConfiguration // Set default font settings to prevent null font family issues // This ensures a fallback font is always available var defaultFontFamily = "Arial"; - + // Try to verify the font exists in the system try { @@ -24,7 +24,7 @@ public static class DevExpressFontConfiguration catch (Exception ex) { logger?.LogWarning(ex, $"Default font '{defaultFontFamily}' may not be available. Reports may use fallback fonts."); - + // Alternative fonts to try var alternativeFonts = new[] { "Liberation Sans", "DejaVu Sans", "FreeSans", "sans-serif" }; foreach (var fontName in alternativeFonts) @@ -41,7 +41,7 @@ public static class DevExpressFontConfiguration } } } - + logger?.LogInformation("DevExpress font configuration completed successfully"); } catch (Exception ex) @@ -49,7 +49,7 @@ public static class DevExpressFontConfiguration logger?.LogError(ex, "Error configuring DevExpress fonts"); } } - + public static void InstallLinuxFonts(ILogger logger) { try @@ -58,14 +58,14 @@ public static class DevExpressFontConfiguration if (OperatingSystem.IsLinux()) { logger?.LogInformation("Running on Linux - checking font availability..."); - + var fontDirectories = new[] { "/usr/share/fonts", "/usr/local/share/fonts", Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".fonts") }; - + foreach (var dir in fontDirectories) { if (Directory.Exists(dir)) @@ -73,7 +73,7 @@ public static class DevExpressFontConfiguration logger?.LogInformation($"Font directory found: {dir}"); } } - + logger?.LogInformation( "If fonts are missing, install them with: " + "apk add fontconfig ttf-dejavu ttf-liberation font-noto-emoji && fc-cache -f -v"); diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/TenantLocalizationInitializer.cs b/api/src/Sozsoft.Platform.HttpApi.Host/TenantLocalizationInitializer.cs index 68df1bf5..efa731b3 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/TenantLocalizationInitializer.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/TenantLocalizationInitializer.cs @@ -1,59 +1,54 @@ using System; using System.Globalization; using System.Threading.Tasks; +using Microsoft.Extensions.Options; using Volo.Abp.DependencyInjection; using Volo.Abp.Settings; using Volo.Abp.Timing; -using Volo.Abp.MultiTenancy; -using Microsoft.Extensions.Options; -namespace Sozsoft.Platform.Localization +namespace Sozsoft.Platform.Localization; + +public class TenantLocalizationInitializer : ITransientDependency { - public class TenantLocalizationInitializer : ITransientDependency - { - private readonly ISettingProvider _settingProvider; - private readonly ICurrentTenant _currentTenant; - private readonly IOptions _clockOptions; + private readonly ISettingProvider _settingProvider; + private readonly IOptions _clockOptions; - public TenantLocalizationInitializer( - ISettingProvider settingProvider, - ICurrentTenant currentTenant, - IOptions clockOptions) + public TenantLocalizationInitializer( + ISettingProvider settingProvider, + IOptions clockOptions) + { + _settingProvider = settingProvider; + _clockOptions = clockOptions; + } + + public async Task ApplyTenantSettingsAsync() + { + // Dil ayarı + var lang = await _settingProvider.GetOrNullAsync("Abp.Localization.DefaultLanguage") ?? "en"; + try { - _settingProvider = settingProvider; - _currentTenant = currentTenant; - _clockOptions = clockOptions; + var culture = new CultureInfo(lang); + CultureInfo.DefaultThreadCurrentCulture = culture; + CultureInfo.DefaultThreadCurrentUICulture = culture; + } + catch + { + CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture; + CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.InvariantCulture; } - public async Task ApplyTenantSettingsAsync() + // Saat tipi (UTC / Local) + var timeZoneId = await _settingProvider.GetOrNullAsync("Abp.Timing.TimeZone") ?? "UTC"; + try { - // Dil ayarı - var lang = await _settingProvider.GetOrNullAsync("Abp.Localization.DefaultLanguage") ?? "en"; - try - { - var culture = new CultureInfo(lang); - CultureInfo.DefaultThreadCurrentCulture = culture; - CultureInfo.DefaultThreadCurrentUICulture = culture; - } - catch - { - CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture; - CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.InvariantCulture; - } - - // Saat tipi (UTC / Local) - var timeZoneId = await _settingProvider.GetOrNullAsync("Abp.Timing.TimeZone") ?? "UTC"; - try - { - var tz = TimeZoneInfo.FindSystemTimeZoneById(timeZoneId); - _clockOptions.Value.Kind = tz.Id.Contains("UTC", StringComparison.OrdinalIgnoreCase) - ? DateTimeKind.Utc - : DateTimeKind.Local; - } - catch - { - _clockOptions.Value.Kind = DateTimeKind.Utc; - } + var tz = TimeZoneInfo.FindSystemTimeZoneById(timeZoneId); + _clockOptions.Value.Kind = tz.Id.Contains("UTC", StringComparison.OrdinalIgnoreCase) + ? DateTimeKind.Utc + : DateTimeKind.Local; + } + catch + { + _clockOptions.Value.Kind = DateTimeKind.Utc; } } } diff --git a/api/src/Sozsoft.Platform.HttpApi.Host/TenantLocalizationMiddleware.cs b/api/src/Sozsoft.Platform.HttpApi.Host/TenantLocalizationMiddleware.cs index 23a45098..4fa3e6b6 100644 --- a/api/src/Sozsoft.Platform.HttpApi.Host/TenantLocalizationMiddleware.cs +++ b/api/src/Sozsoft.Platform.HttpApi.Host/TenantLocalizationMiddleware.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using Sozsoft.Platform.Localization; using Microsoft.AspNetCore.Http; +using Sozsoft.Platform.Localization; public class TenantLocalizationMiddleware : IMiddleware { diff --git a/api/src/Sozsoft.Platform.HttpApi/PlatformHttpApiModule.cs b/api/src/Sozsoft.Platform.HttpApi/PlatformHttpApiModule.cs index 5a7dddf6..0c01f8dc 100644 --- a/api/src/Sozsoft.Platform.HttpApi/PlatformHttpApiModule.cs +++ b/api/src/Sozsoft.Platform.HttpApi/PlatformHttpApiModule.cs @@ -1,5 +1,5 @@ -using Sozsoft.Platform.Localization; -using Localization.Resources.AbpUi; +using Localization.Resources.AbpUi; +using Sozsoft.Platform.Localization; using Volo.Abp.Account; using Volo.Abp.FeatureManagement; using Volo.Abp.Identity; diff --git a/api/test/Sozsoft.Platform.EntityFrameworkCore.Tests/DynamicDataRepository_Tests.cs b/api/test/Sozsoft.Platform.EntityFrameworkCore.Tests/DynamicDataRepository_Tests.cs index 41702a85..6483d708 100644 --- a/api/test/Sozsoft.Platform.EntityFrameworkCore.Tests/DynamicDataRepository_Tests.cs +++ b/api/test/Sozsoft.Platform.EntityFrameworkCore.Tests/DynamicDataRepository_Tests.cs @@ -1,10 +1,10 @@ using System; using System.Linq; using System.Threading.Tasks; -using Sozsoft.Platform.DynamicData; -using Sozsoft.Platform.Entities; using Microsoft.EntityFrameworkCore; using Shouldly; +using Sozsoft.Platform.DynamicData; +using Sozsoft.Platform.Entities; using Volo.Abp.Domain.Repositories; using Volo.Abp.Identity; using Volo.Abp.Uow; diff --git a/api/test/Sozsoft.Platform.EntityFrameworkCore.Tests/EntityFrameworkCore/PlatformEntityFrameworkCoreTestBase.cs b/api/test/Sozsoft.Platform.EntityFrameworkCore.Tests/EntityFrameworkCore/PlatformEntityFrameworkCoreTestBase.cs index 9d986780..a8fba405 100644 --- a/api/test/Sozsoft.Platform.EntityFrameworkCore.Tests/EntityFrameworkCore/PlatformEntityFrameworkCoreTestBase.cs +++ b/api/test/Sozsoft.Platform.EntityFrameworkCore.Tests/EntityFrameworkCore/PlatformEntityFrameworkCoreTestBase.cs @@ -1,6 +1,4 @@ -using Volo.Abp; - -namespace Sozsoft.Platform.EntityFrameworkCore; +namespace Sozsoft.Platform.EntityFrameworkCore; public abstract class PlatformEntityFrameworkCoreTestBase : PlatformTestBase { diff --git a/api/test/Sozsoft.Platform.TestBase/PlatformTestBase.cs b/api/test/Sozsoft.Platform.TestBase/PlatformTestBase.cs index 76232eee..847e4917 100644 --- a/api/test/Sozsoft.Platform.TestBase/PlatformTestBase.cs +++ b/api/test/Sozsoft.Platform.TestBase/PlatformTestBase.cs @@ -3,8 +3,8 @@ using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; using Volo.Abp; using Volo.Abp.Modularity; -using Volo.Abp.Uow; using Volo.Abp.Testing; +using Volo.Abp.Uow; namespace Sozsoft.Platform; diff --git a/configs/deployment/docker-compose-app.production.yml b/configs/deployment/docker-compose-app.production.yml index 3ff8b14a..90575df6 100644 --- a/configs/deployment/docker-compose-app.production.yml +++ b/configs/deployment/docker-compose-app.production.yml @@ -11,6 +11,7 @@ services: command: --environment=Production environment: - ASPNETCORE_ENVIRONMENT=Production + - DOTNET_ENVIRONMENT=Production ui: image: devops.sozsoft.com/sozsoft/sozsoft-platform-ui:production-latest restart: always diff --git a/configs/deployment/docker-compose-app.yml b/configs/deployment/docker-compose-app.yml index a1e31ea8..8873b1f0 100644 --- a/configs/deployment/docker-compose-app.yml +++ b/configs/deployment/docker-compose-app.yml @@ -20,6 +20,7 @@ services: profiles: ["migrator"] environment: - ASPNETCORE_ENVIRONMENT=Dev + - DOTNET_ENVIRONMENT=Dev - SEED=${SEED:-true} volumes: # Seed dosyalari imaja gomulmez; depodaki configs/seeds klasorunden mount edilir @@ -35,6 +36,7 @@ services: profiles: ["api"] environment: - ASPNETCORE_ENVIRONMENT=Dev + - DOTNET_ENVIRONMENT=Dev ports: - 8080:8080 volumes: diff --git a/ui/src/views/developerKit/VisualComponentDesigner.tsx b/ui/src/views/developerKit/VisualComponentDesigner.tsx index 9abd85fd..403629e6 100644 --- a/ui/src/views/developerKit/VisualComponentDesigner.tsx +++ b/ui/src/views/developerKit/VisualComponentDesigner.tsx @@ -242,9 +242,7 @@ const getPropertyExampleValue = ( if (property.type === 'boolean') return true if (property.type === 'number') return 16 if (property.type === 'array') { - return [ - { label: translate('::App.Platform.Example'), value: 'example' }, - ] + return [{ label: translate('::App.Platform.Example'), value: 'example' }] } if (property.type === 'object') { return property.name === 'style' ? { padding: 16, borderRadius: 8 } : { key: 'value' } @@ -1775,9 +1773,7 @@ const VisualComponentDesigner = () => { * the list arrives the property stays a text box, so a code can still be typed. */ const isPlatformListFormProperty = (propertyName: string) => - propertyName === 'listFormCode' && - selectedNode?.kind === 'platform' && - listFormCodes.length > 0 + propertyName === 'listFormCode' && selectedNode?.kind === 'platform' && listFormCodes.length > 0 /** Per source debounce of the filter preview request. */ const filterPreviewTimers = useRef>({}) @@ -1865,12 +1861,12 @@ const VisualComponentDesigner = () => { ) const selectedIsDataComponent = Boolean( selectedNode && - // A platform view is data driven too: its list form supplies the rows and - // the Data tab is where its filters are configured. - (isDataCategoryComponent(selectedDefinition) || - selectedNode.kind === 'platform' || - selectedIsForm || - sqlScopeNode), + // A platform view is data driven too: its list form supplies the rows and + // the Data tab is where its filters are configured. + (isDataCategoryComponent(selectedDefinition) || + selectedNode.kind === 'platform' || + selectedIsForm || + sqlScopeNode), ) const selectedProperties = useMemo(() => { if (!selectedNode) return [] @@ -1991,23 +1987,25 @@ const VisualComponentDesigner = () => { * somewhere in the name, the URL, the method or the origin. */ const reusableDataSources = useMemo(() => { - const terms = endpointSearch - .toLocaleLowerCase('tr') - .split(/\s+/) - .filter(Boolean) - return dataSourceCatalog - .filter((item) => endpointMethodFilter === 'all' || item.source.method === endpointMethodFilter) - .filter((item) => !endpointAttachedOnly || item.attached) - .filter((item) => { - if (!terms.length) return true - const haystack = `${item.source.name} ${item.source.method} ${item.source.url} ${item.origin}`.toLocaleLowerCase( - 'tr', + const terms = endpointSearch.toLocaleLowerCase('tr').split(/\s+/).filter(Boolean) + return ( + dataSourceCatalog + .filter( + (item) => endpointMethodFilter === 'all' || item.source.method === endpointMethodFilter, ) - return terms.every((term) => haystack.includes(term)) - }) - // Alphabetical rather than catalog order: the operations of one entity are - // named alike, so sorting is what puts them next to each other. - .sort((left, right) => left.source.name.localeCompare(right.source.name, 'tr')) + .filter((item) => !endpointAttachedOnly || item.attached) + .filter((item) => { + if (!terms.length) return true + const haystack = + `${item.source.name} ${item.source.method} ${item.source.url} ${item.origin}`.toLocaleLowerCase( + 'tr', + ) + return terms.every((term) => haystack.includes(term)) + }) + // Alphabetical rather than catalog order: the operations of one entity are + // named alike, so sorting is what puts them next to each other. + .sort((left, right) => left.source.name.localeCompare(right.source.name, 'tr')) + ) }, [dataSourceCatalog, endpointAttachedOnly, endpointMethodFilter, endpointSearch]) const updateSelectedProp = (propertyName: string, value: unknown) => { @@ -2199,7 +2197,10 @@ const VisualComponentDesigner = () => { ...source, filters: (source.filters || []).map((filter) => ({ ...filter, required: false })), } - const probeUrl = buildDesignerPreviewUrl(withPreviewFilterValues(relaxed), urlOverride)?.trim() + const probeUrl = buildDesignerPreviewUrl( + withPreviewFilterValues(relaxed), + urlOverride, + )?.trim() if (!probeUrl || !probeUrl.startsWith('/api/')) return if (!isRunnableDataSourceUrl((urlOverride ?? source.url).trim())) return if (hasFormUrlParams(probeUrl)) return @@ -2276,9 +2277,7 @@ const VisualComponentDesigner = () => { throw new Error(translate('::App.DeveloperKitComponentDesigner.EndpointUrlRequired')) } if (!requestUrl.startsWith('/api/')) { - throw new Error( - translate('::App.DeveloperKitComponentDesigner.EndpointMustStartWithApi'), - ) + throw new Error(translate('::App.DeveloperKitComponentDesigner.EndpointMustStartWithApi')) } if (!isRunnableDataSourceUrl((urlOverride ?? source.url).trim())) { throw new Error(translate('::App.DeveloperKitComponentDesigner.EndpointNotRunnable')) @@ -3004,9 +3003,7 @@ const VisualComponentDesigner = () => { const bound = bindFormUrl(source.url, { [parameterName]: previewKey }, parameterName) previewUrls.set( source.id, - bound.keyBound - ? bound.url - : appendFormQueryParam(bound.url, parameterName, previewKey), + bound.keyBound ? bound.url : appendFormQueryParam(bound.url, parameterName, previewKey), ) }) @@ -3421,7 +3418,8 @@ const VisualComponentDesigner = () => { const renderReusableDataSources = (compact = false) => { const visibleSources = reusableDataSources - const hasFilter = Boolean(endpointSearch.trim()) || endpointMethodFilter !== 'all' || endpointAttachedOnly + const hasFilter = + Boolean(endpointSearch.trim()) || endpointMethodFilter !== 'all' || endpointAttachedOnly return (
{/* Search first, then the list: with a large catalog the filter is the @@ -3479,9 +3477,7 @@ const VisualComponentDesigner = () => { // many columns as fit; the inspector keeps its single narrow column.
{visibleSources.map((item) => ( @@ -3501,7 +3497,7 @@ const VisualComponentDesigner = () => { {item.origin} {item.attached && ( - Ekli + {translate('::App.DeveloperKitComponentDesigner.Attached')} )}
@@ -3602,52 +3598,56 @@ const VisualComponentDesigner = () => { {staticSelectOptions.map((option, index) => (
- - updateStaticSelectOptions( - staticSelectOptions.map((current, optionIndex) => - optionIndex === index ? { ...current, label: event.target.value } : current, - ), - ) - } - /> - - updateStaticSelectOptions( - staticSelectOptions.map((current, optionIndex) => - optionIndex === index ? { ...current, value: event.target.value } : current, - ), - ) - } - /> - + + updateStaticSelectOptions( + staticSelectOptions.map((current, optionIndex) => + optionIndex === index + ? { ...current, label: event.target.value } + : current, + ), + ) + } + /> + + updateStaticSelectOptions( + staticSelectOptions.map((current, optionIndex) => + optionIndex === index + ? { ...current, value: event.target.value } + : current, + ), + ) + } + /> +
{selectedNode?.type === 'Menu' && ( { !selectOptionColumns.includes(field.path)) @@ -3933,7 +3928,9 @@ const VisualComponentDesigner = () => {
{columns.map((column) => { const lookup = gridColumnLookups[column] - const collectionPaths = lookup?.sourceId ? getLookupCollectionPaths(lookup.sourceId) : [] + const collectionPaths = lookup?.sourceId + ? getLookupCollectionPaths(lookup.sourceId) + : [] const rowFields = lookup?.sourceId ? getLookupRowFields(lookup.sourceId, lookup.path) : [] @@ -3976,9 +3973,7 @@ const VisualComponentDesigner = () => { size="xs" className="w-full" isClearable - placeholder={translate( - '::App.DeveloperKitComponentDesigner.SelectEndpoint', - )} + placeholder={translate('::App.DeveloperKitComponentDesigner.SelectEndpoint')} menuPortalTarget={window.document.body} options={bindableDataSources.map((source) => ({ value: source.id, @@ -3987,9 +3982,7 @@ const VisualComponentDesigner = () => { value={bindableDataSources .filter((source) => source.id === lookup.sourceId) .map((source) => ({ value: source.id, label: source.name }))} - onChange={(option) => - selectColumnLookupSource(column, option?.value ?? '') - } + onChange={(option) => selectColumnLookupSource(column, option?.value ?? '')} /> {lookup.sourceId && collectionPaths.length > 1 && ( { className="rounded p-1 text-slate-400 hover:text-red-600" title={translate('::App.Platform.Delete')} type="button" - onClick={() => - writeFilters(filters.filter((entry) => entry.id !== filter.id)) - } + onClick={() => writeFilters(filters.filter((entry) => entry.id !== filter.id))} > @@ -4341,9 +4322,7 @@ const VisualComponentDesigner = () => { maxMenuHeight={200} menuPortalTarget={window.document.body} options={filterSourceOptions} - value={filterSourceOptions.filter( - (option) => option.value === filter.source, - )} + value={filterSourceOptions.filter((option) => option.value === filter.source)} onChange={(option) => option && patchFilter(filter.id, { @@ -4377,9 +4356,7 @@ const VisualComponentDesigner = () => { className="min-w-0 flex-1" isClearable maxMenuHeight={200} - placeholder={translate( - '::App.DeveloperKitComponentDesigner.FilterMaster', - )} + placeholder={translate('::App.DeveloperKitComponentDesigner.FilterMaster')} menuPortalTarget={window.document.body} options={sqlContainerRefs.map((item) => ({ value: item.ref, @@ -4439,9 +4416,7 @@ const VisualComponentDesigner = () => { checked={Boolean(filter.required)} className="h-3 w-3 accent-sky-600" type="checkbox" - onChange={(event) => - patchFilter(filter.id, { required: event.target.checked }) - } + onChange={(event) => patchFilter(filter.id, { required: event.target.checked })} /> {translate('::App.DeveloperKitComponentDesigner.FilterRequired')} @@ -4484,9 +4459,7 @@ const VisualComponentDesigner = () => { const recordFields = record === undefined ? [] : discoverDataFields(record) const selectSource = document.dataSources.find((source) => source.id === selectSourceId) // A GetById URL cannot be sampled at design time without a stand-in key. - const selectNeedsPreviewKey = Boolean( - selectSource && hasFormUrlParams(selectSource.url), - ) + const selectNeedsPreviewKey = Boolean(selectSource && hasFormUrlParams(selectSource.url)) return (
@@ -4591,8 +4564,7 @@ const VisualComponentDesigner = () => { menuPortalTarget={window.document.body} options={collectionPaths.map((path) => ({ value: path, - label: - path || translate('::App.DeveloperKitComponentDesigner.ResponseItself'), + label: path || translate('::App.DeveloperKitComponentDesigner.ResponseItself'), }))} value={{ value: String(selectedNode.props.collectionPath ?? ''), @@ -4600,9 +4572,7 @@ const VisualComponentDesigner = () => { String(selectedNode.props.collectionPath ?? '') || translate('::App.DeveloperKitComponentDesigner.ResponseItself'), }} - onChange={(option) => - updateSelectedProp('collectionPath', option?.value ?? '') - } + onChange={(option) => updateSelectedProp('collectionPath', option?.value ?? '')} />
@@ -4619,9 +4589,7 @@ const VisualComponentDesigner = () => { maxMenuHeight={200} menuPortalTarget={window.document.body} options={keySourceOptions} - value={keySourceOptions.filter( - (item) => item.value === getFormKeySource(selectedNode), - )} + value={keySourceOptions.filter((item) => item.value === getFormKeySource(selectedNode))} onChange={(option) => option && updateSelectedProp('keySource', option.value)} /> { const columnListId = `sql-columns-${sqlScopeNode.id}` // A picker gets a real date editor, unless it holds a token — `@today` is not // a date the browser can render, and typing it needs a plain text field. - const isDateDefault = isDesignerDateComponent(selectedNode.type) && !currentDefault.startsWith('@') + const isDateDefault = + isDesignerDateComponent(selectedNode.type) && !currentDefault.startsWith('@') const defaultInputType = isDateDefault ? isDesignerDateOnlyComponent(selectedNode.type) ? 'date' @@ -4839,17 +4808,11 @@ const VisualComponentDesigner = () => { isClearable isDisabled={!column} maxMenuHeight={200} - placeholder={translate( - '::App.DeveloperKitComponentDesigner.NoDefaultValue', - )} + placeholder={translate('::App.DeveloperKitComponentDesigner.NoDefaultValue')} menuPortalTarget={window.document.body} options={sqlDefaultValueOptions} - value={sqlDefaultValueOptions.filter( - (option) => option.value === currentDefault, - )} - onChange={(option) => - updateSelectedProp(SQL_DEFAULT_VALUE_PROP, option?.value ?? '') - } + value={sqlDefaultValueOptions.filter((option) => option.value === currentDefault)} + onChange={(option) => updateSelectedProp(SQL_DEFAULT_VALUE_PROP, option?.value ?? '')} /> ) : ( { className="w-full" isClearable maxMenuHeight={200} - placeholder={translate( - '::App.DeveloperKitComponentDesigner.SelectEndpoint', - )} + placeholder={translate('::App.DeveloperKitComponentDesigner.SelectEndpoint')} menuPortalTarget={window.document.body} options={inspectorDataSources.map((source) => ({ value: source.id, @@ -5039,15 +5000,12 @@ const VisualComponentDesigner = () => { size="xs" className="w-full" maxMenuHeight={200} - placeholder={translate( - '::App.DeveloperKitComponentDesigner.NoCollectionFound', - )} + placeholder={translate('::App.DeveloperKitComponentDesigner.NoCollectionFound')} menuPortalTarget={window.document.body} options={tabularCollectionPaths.map((path) => ({ value: path, label: - path || - translate('::App.DeveloperKitComponentDesigner.WholeResponseArray'), + path || translate('::App.DeveloperKitComponentDesigner.WholeResponseArray'), }))} value={{ value: tabularItemsBinding.path, @@ -5223,9 +5181,7 @@ const VisualComponentDesigner = () => { )} menuPortalTarget={window.document.body} options={bindingChoiceOptions} - value={bindingChoiceOptions.filter( - (option) => option.value === choice, - )} + value={bindingChoiceOptions.filter((option) => option.value === choice)} onChange={(option) => { const nextChoice = option?.value if (!nextChoice) { @@ -5658,6 +5614,12 @@ const VisualComponentDesigner = () => {

{translate('::App.DeveloperKitComponentDesigner.ApiAuthHint')}

+

+ {translate('::App.DeveloperKitComponentDesigner.GetPostHint')} +

+

+ {translate('::App.DeveloperKitComponentDesigner.EndpointSettingsHint')} +

-
- {translate('::App.DeveloperKitComponentDesigner.GetPostHint')} -
-
- {translate('::App.DeveloperKitComponentDesigner.EndpointSettingsHint')} -
{(dataSourceCatalog.length > 0 || endpointCatalogError) && (
@@ -5843,9 +5799,7 @@ const VisualComponentDesigner = () => { className="min-w-0 truncate" title={ getFormEvent(eventName)?.description - ? translate( - '::' + getFormEvent(eventName)!.description, - ) + ? translate('::' + getFormEvent(eventName)!.description) : undefined } >