From 104d92fbc8edaeb78dfdf7410b068a201b55819b 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, 15 Aug 2025 15:21:22 +0300 Subject: [PATCH] Report App Service2 --- .../Reports/CreateReportTemplateDto.cs | 22 +++--------------- .../Reports/GenerateReportDto.cs | 2 +- .../Reports/GeneratedReportDto.cs | 6 +---- .../Reports/GetReportsInput.cs | 1 - .../Reports/ReportParameterDto.cs | 13 +---------- .../Reports/ReportParameterType.cs | 13 ----------- .../Reports/ReportTemplateDto.cs | 7 ------ .../Reports/UpdateReportTemplateDto.cs | 22 +++--------------- .../Reports/ReportAppService.cs | 6 ++--- .../Reports/ReportAutoMapperProfile.cs | 5 +--- .../Entities/ReportParameter.cs | 23 ++----------------- .../Entities/ReportTemplate.cs | 9 +------- 12 files changed, 16 insertions(+), 113 deletions(-) delete mode 100644 api/src/Kurs.Platform.Application.Contracts/Reports/ReportParameterType.cs diff --git a/api/src/Kurs.Platform.Application.Contracts/Reports/CreateReportTemplateDto.cs b/api/src/Kurs.Platform.Application.Contracts/Reports/CreateReportTemplateDto.cs index 3b24097e..350a46a4 100644 --- a/api/src/Kurs.Platform.Application.Contracts/Reports/CreateReportTemplateDto.cs +++ b/api/src/Kurs.Platform.Application.Contracts/Reports/CreateReportTemplateDto.cs @@ -7,46 +7,30 @@ namespace Kurs.Platform.Reports public class CreateReportTemplateDto { [Required] - [StringLength(256)] public string Name { get; set; } - - [StringLength(1000)] public string Description { get; set; } [Required] public string HtmlContent { get; set; } - - [StringLength(100)] public string Category { get; set; } - public List Tags { get; set; } - public List Parameters { get; set; } public CreateReportTemplateDto() { - Tags = new List(); - Parameters = new List(); + Tags = []; + Parameters = []; } } public class CreateReportParameterDto { [Required] - [StringLength(100)] public string Name { get; set; } - - [StringLength(200)] public string Placeholder { get; set; } - - public ReportParameterType Type { get; set; } - - [StringLength(500)] + public string Type { get; set; } public string DefaultValue { get; set; } - public bool Required { get; set; } - - [StringLength(1000)] public string Description { get; set; } } } diff --git a/api/src/Kurs.Platform.Application.Contracts/Reports/GenerateReportDto.cs b/api/src/Kurs.Platform.Application.Contracts/Reports/GenerateReportDto.cs index 03d2960f..d0c61dd1 100644 --- a/api/src/Kurs.Platform.Application.Contracts/Reports/GenerateReportDto.cs +++ b/api/src/Kurs.Platform.Application.Contracts/Reports/GenerateReportDto.cs @@ -13,7 +13,7 @@ namespace Kurs.Platform.Reports public GenerateReportDto() { - Parameters = new Dictionary(); + Parameters = []; } } } diff --git a/api/src/Kurs.Platform.Application.Contracts/Reports/GeneratedReportDto.cs b/api/src/Kurs.Platform.Application.Contracts/Reports/GeneratedReportDto.cs index 926bfac5..0e256e75 100644 --- a/api/src/Kurs.Platform.Application.Contracts/Reports/GeneratedReportDto.cs +++ b/api/src/Kurs.Platform.Application.Contracts/Reports/GeneratedReportDto.cs @@ -10,21 +10,17 @@ namespace Kurs.Platform.Reports public Guid? TemplateId { get; set; } [Required] - [StringLength(256)] public string TemplateName { get; set; } [Required] public string GeneratedContent { get; set; } - public Dictionary Parameters { get; set; } - public DateTime GeneratedAt { get; set; } - public ReportTemplateDto Template { get; set; } public GeneratedReportDto() { - Parameters = new Dictionary(); + Parameters = []; GeneratedAt = DateTime.UtcNow; } } diff --git a/api/src/Kurs.Platform.Application.Contracts/Reports/GetReportsInput.cs b/api/src/Kurs.Platform.Application.Contracts/Reports/GetReportsInput.cs index c67916da..fa7c44f1 100644 --- a/api/src/Kurs.Platform.Application.Contracts/Reports/GetReportsInput.cs +++ b/api/src/Kurs.Platform.Application.Contracts/Reports/GetReportsInput.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using Volo.Abp.Application.Dtos; namespace Kurs.Platform.Reports diff --git a/api/src/Kurs.Platform.Application.Contracts/Reports/ReportParameterDto.cs b/api/src/Kurs.Platform.Application.Contracts/Reports/ReportParameterDto.cs index 24ea9c5c..cf353817 100644 --- a/api/src/Kurs.Platform.Application.Contracts/Reports/ReportParameterDto.cs +++ b/api/src/Kurs.Platform.Application.Contracts/Reports/ReportParameterDto.cs @@ -6,24 +6,13 @@ namespace Kurs.Platform.Reports public class ReportParameterDto { public Guid Id { get; set; } - public Guid ReportTemplateId { get; set; } - [Required] - [StringLength(100)] public string Name { get; set; } - - [StringLength(200)] public string Placeholder { get; set; } - - public ReportParameterType Type { get; set; } - - [StringLength(500)] + public string Type { get; set; } public string DefaultValue { get; set; } - public bool Required { get; set; } - - [StringLength(1000)] public string Description { get; set; } } } diff --git a/api/src/Kurs.Platform.Application.Contracts/Reports/ReportParameterType.cs b/api/src/Kurs.Platform.Application.Contracts/Reports/ReportParameterType.cs deleted file mode 100644 index b69009d3..00000000 --- a/api/src/Kurs.Platform.Application.Contracts/Reports/ReportParameterType.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; - -namespace Kurs.Platform.Reports -{ - public enum ReportParameterType - { - Text = 0, - Number = 1, - Date = 2, - Email = 3, - Url = 4 - } -} diff --git a/api/src/Kurs.Platform.Application.Contracts/Reports/ReportTemplateDto.cs b/api/src/Kurs.Platform.Application.Contracts/Reports/ReportTemplateDto.cs index 8b50ac88..d298831c 100644 --- a/api/src/Kurs.Platform.Application.Contracts/Reports/ReportTemplateDto.cs +++ b/api/src/Kurs.Platform.Application.Contracts/Reports/ReportTemplateDto.cs @@ -8,20 +8,13 @@ namespace Kurs.Platform.Reports public class ReportTemplateDto : FullAuditedEntityDto { [Required] - [StringLength(256)] public string Name { get; set; } - - [StringLength(1000)] public string Description { get; set; } [Required] public string HtmlContent { get; set; } - - [StringLength(100)] public string Category { get; set; } - public List Tags { get; set; } - public List Parameters { get; set; } public ReportTemplateDto() diff --git a/api/src/Kurs.Platform.Application.Contracts/Reports/UpdateReportTemplateDto.cs b/api/src/Kurs.Platform.Application.Contracts/Reports/UpdateReportTemplateDto.cs index 2eb21e4e..064acc60 100644 --- a/api/src/Kurs.Platform.Application.Contracts/Reports/UpdateReportTemplateDto.cs +++ b/api/src/Kurs.Platform.Application.Contracts/Reports/UpdateReportTemplateDto.cs @@ -7,26 +7,19 @@ namespace Kurs.Platform.Reports public class UpdateReportTemplateDto { [Required] - [StringLength(256)] public string Name { get; set; } - - [StringLength(1000)] public string Description { get; set; } [Required] public string HtmlContent { get; set; } - - [StringLength(100)] public string Category { get; set; } - public List Tags { get; set; } - public List Parameters { get; set; } public UpdateReportTemplateDto() { - Tags = new List(); - Parameters = new List(); + Tags = []; + Parameters = []; } } @@ -35,20 +28,11 @@ namespace Kurs.Platform.Reports public Guid? Id { get; set; } [Required] - [StringLength(100)] public string Name { get; set; } - - [StringLength(200)] public string Placeholder { get; set; } - - public ReportParameterType Type { get; set; } - - [StringLength(500)] + public string Type { get; set; } public string DefaultValue { get; set; } - public bool Required { get; set; } - - [StringLength(1000)] public string Description { get; set; } } } diff --git a/api/src/Kurs.Platform.Application/Reports/ReportAppService.cs b/api/src/Kurs.Platform.Application/Reports/ReportAppService.cs index bc7246e8..8768a1ce 100644 --- a/api/src/Kurs.Platform.Application/Reports/ReportAppService.cs +++ b/api/src/Kurs.Platform.Application/Reports/ReportAppService.cs @@ -100,7 +100,7 @@ public class ReportAppService : PlatformAppService, IReportAppService template.Id, paramDto.Name, paramDto.Placeholder, - (Entities.ReportParameterType)paramDto.Type, + paramDto.Type, paramDto.Required) { DefaultValue = paramDto.DefaultValue, @@ -140,7 +140,7 @@ public class ReportAppService : PlatformAppService, IReportAppService template.Id, paramDto.Name, paramDto.Placeholder, - (Entities.ReportParameterType)paramDto.Type, + paramDto.Type, paramDto.Required); parameter.DefaultValue = paramDto.DefaultValue; @@ -288,7 +288,7 @@ public class ReportAppService : PlatformAppService, IReportAppService ReportTemplateId = p.ReportTemplateId, Name = p.Name, Placeholder = p.Placeholder, - Type = (Reports.ReportParameterType)p.Type, + Type = p.Type, DefaultValue = p.DefaultValue, Required = p.Required, Description = p.Description diff --git a/api/src/Kurs.Platform.Application/Reports/ReportAutoMapperProfile.cs b/api/src/Kurs.Platform.Application/Reports/ReportAutoMapperProfile.cs index fb6979af..7ef5df88 100644 --- a/api/src/Kurs.Platform.Application/Reports/ReportAutoMapperProfile.cs +++ b/api/src/Kurs.Platform.Application/Reports/ReportAutoMapperProfile.cs @@ -22,16 +22,13 @@ namespace Kurs.Platform.Reports .ForMember(dest => dest.Tags, opt => opt.MapFrom(src => ConvertTagsToJson(src.Tags))) .ForMember(dest => dest.Parameters, opt => opt.Ignore()); - CreateMap() - .ForMember(dest => dest.Type, opt => opt.MapFrom(src => (ReportParameterType)src.Type)); + CreateMap(); CreateMap() - .ForMember(dest => dest.Type, opt => opt.MapFrom(src => (Entities.ReportParameterType)src.Type)) .ForMember(dest => dest.Id, opt => opt.Ignore()) .ForMember(dest => dest.ReportTemplateId, opt => opt.Ignore()); CreateMap() - .ForMember(dest => dest.Type, opt => opt.MapFrom(src => (Entities.ReportParameterType)src.Type)) .ForMember(dest => dest.ReportTemplateId, opt => opt.Ignore()); CreateMap() diff --git a/api/src/Kurs.Platform.Domain/Entities/ReportParameter.cs b/api/src/Kurs.Platform.Domain/Entities/ReportParameter.cs index 7e901159..c05a14aa 100644 --- a/api/src/Kurs.Platform.Domain/Entities/ReportParameter.cs +++ b/api/src/Kurs.Platform.Domain/Entities/ReportParameter.cs @@ -4,37 +4,18 @@ using Volo.Abp.Domain.Entities.Auditing; namespace Kurs.Platform.Entities { - public enum ReportParameterType - { - Text = 0, - Number = 1, - Date = 2, - Email = 3, - Url = 4 - } - public class ReportParameter : FullAuditedEntity { public Guid ReportTemplateId { get; set; } [Required] - [StringLength(100)] public string Name { get; set; } - - [StringLength(200)] public string Placeholder { get; set; } - - public ReportParameterType Type { get; set; } - - [StringLength(500)] + public string Type { get; set; } public string DefaultValue { get; set; } - public bool Required { get; set; } - - [StringLength(1000)] public string Description { get; set; } - // Navigation property public virtual ReportTemplate ReportTemplate { get; set; } public ReportParameter() @@ -46,7 +27,7 @@ namespace Kurs.Platform.Entities Guid reportTemplateId, string name, string placeholder, - ReportParameterType type, + string type, bool required = false ) : base(id) { diff --git a/api/src/Kurs.Platform.Domain/Entities/ReportTemplate.cs b/api/src/Kurs.Platform.Domain/Entities/ReportTemplate.cs index 8981ab1f..1edbd5b6 100644 --- a/api/src/Kurs.Platform.Domain/Entities/ReportTemplate.cs +++ b/api/src/Kurs.Platform.Domain/Entities/ReportTemplate.cs @@ -8,26 +8,19 @@ namespace Kurs.Platform.Entities public class ReportTemplate : FullAuditedAggregateRoot { [Required] - [StringLength(256)] public string Name { get; set; } - - [StringLength(1000)] public string Description { get; set; } [Required] public string HtmlContent { get; set; } - - [StringLength(100)] public string Category { get; set; } - public string Tags { get; set; } // JSON string array - // Navigation property public virtual ICollection Parameters { get; set; } public ReportTemplate() { - Parameters = new List(); + Parameters = []; } public ReportTemplate(