Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Streetcode/Streetcode.BLL/DTO/Partners/GetAllPartnersDto.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace Streetcode.BLL.DTO.Partners;

public class GetAllPartnersDto
{
public int TotalAmount { get; set; }

public IEnumerable<PartnerDto> Partners { get; set; } = new List<PartnerDto>();
}

This file was deleted.

15 changes: 11 additions & 4 deletions Streetcode/Streetcode.BLL/DTO/Partners/PartnerCreateUpdateDto.cs
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
using System.ComponentModel.DataAnnotations;
using Streetcode.BLL.DTO.Partners.Create;
using Streetcode.BLL.DTO.Partners.Create;
using Streetcode.BLL.DTO.Streetcode;

namespace Streetcode.BLL.DTO.Partners;

public abstract class PartnerCreateUpdateDto
{
public bool IsKeyPartner { get; set; }

public bool IsVisibleEverywhere { get; set; }

public string Title { get; set; } = null!;

public string? Description { get; set; }

public string? TargetUrl { get; set; }

public int LogoId { get; set; }

public string? UrlTitle { get; set; }

public List<CreatePartnerSourceLinkDTO>? PartnerSourceLinks { get; set; }
public List<StreetcodeShortDTO> Streetcodes { get; set; } = new List<StreetcodeShortDTO>();
}

public List<StreetcodeShortDto> Streetcodes { get; set; } = new List<StreetcodeShortDto>();
}
Original file line number Diff line number Diff line change
@@ -1,17 +1,28 @@
using Streetcode.BLL.DTO.AdditionalContent;
using Streetcode.BLL.DTO.Media.Images;
using Streetcode.BLL.DTO.Streetcode;

namespace Streetcode.BLL.DTO.Partners;

public class PartnerDTO
public class PartnerDto
{
public int Id { get; set; }

public bool IsKeyPartner { get; set; }

public bool IsVisibleEverywhere { get; set; }

public string Title { get; set; } = null!;

public string? Description { get; set; }

public int LogoId { get; set; }

public UrlDTO? TargetUrl { get; set; }

public List<PartnerSourceLinkDTO> PartnerSourceLinks { get; set; } = new List<PartnerSourceLinkDTO>();
public List<StreetcodeShortDTO> Streetcodes { get; set; } = new List<StreetcodeShortDTO>();
}

public List<StreetcodeShortDto> Streetcodes { get; set; } = new List<StreetcodeShortDto>();

public ImageDTO? Logo { get; set; }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace Streetcode.BLL.DTO.Streetcode;

public class GetAllStreetcodesShortDto
{
public int TotalAmount { get; set; }

public IEnumerable<StreetcodeShortDto> StreetcodesShort { get; set; } = new List<StreetcodeShortDto>();
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace Streetcode.BLL.DTO.Streetcode;

public class StreetcodeShortDto
{
public int Id { get; set; }

public string Title { get; set; } = null!;
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
using Streetcode.BLL.DTO.Streetcode.TextContent.Term;
namespace Streetcode.BLL.DTO.Streetcode.TextContent
{
public class GetAllTermsResponseDto
{
public int TotalAmount { get; set; }
public IEnumerable<TermDTO> Terms { get; set; } = new List<TermDTO>();
public IEnumerable<TermDto> Terms { get; set; } = new List<TermDto>();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace Streetcode.BLL.DTO.Streetcode.TextContent.Term;

public class GetAllTermsDto
{
public int TotalAmount { get; set; }

public IEnumerable<TermDto> Terms { get; set; } = new List<TermDto>();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace Streetcode.BLL.DTO.Streetcode.TextContent.Term;

public class TermCreateDto
{
public string Title { get; set; } = null!;

public string Description { get; set; } = null!;
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
namespace Streetcode.BLL.DTO.Streetcode.TextContent;
namespace Streetcode.BLL.DTO.Streetcode.TextContent.Term;

public class TermDTO
public class TermDto
{
public int Id { get; set; }

public string Title { get; set; } = null!;

public string Description { get; set; } = null!;
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public class PartnerProfile : Profile
{
public PartnerProfile()
{
CreateMap<Partner, PartnerDTO>()
CreateMap<Partner, PartnerDto>()
.ForPath(dto => dto.TargetUrl!.Title, conf => conf.MapFrom(ol => ol.UrlTitle))
.ForPath(dto => dto.TargetUrl!.Href, conf => conf.MapFrom(ol => ol.TargetUrl));
CreateMap<Partner, CreatePartnerDTO>().ReverseMap();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public StreetcodeProfile()
.ForMember(x => x.StreetcodeType, conf => conf.MapFrom(s => GetStreetcodeType(s)))
.ForMember(x => x.CreatedBy, conf => conf.MapFrom<UserNameResolver>())
.ReverseMap();
CreateMap<StreetcodeContent, StreetcodeShortDTO>().ReverseMap();
CreateMap<StreetcodeContent, StreetcodeShortDto>().ReverseMap();
CreateMap<StreetcodeContent, StreetcodeMainPageDTO>()
.ForPath(dto => dto.Text, conf => conf
.MapFrom(e => e.Text!.Title))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using AutoMapper;
using Streetcode.BLL.DTO.Streetcode.TextContent;
using Streetcode.BLL.DTO.Streetcode.TextContent.Term;
using Streetcode.DAL.Entities.Streetcode.TextContent;

namespace Streetcode.BLL.Mapping.Streetcode.TextContent;
Expand All @@ -8,7 +8,7 @@ public class TermProfile : Profile
{
public TermProfile()
{
CreateMap<Term, TermDTO>().ReverseMap();
CreateMap<TermCreateDTO, Term>();
CreateMap<Term, TermDto>().ReverseMap();
CreateMap<TermCreateDto, Term>();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,14 @@
using AutoMapper;
using FluentResults;
using MediatR;
using Microsoft.Extensions.Localization;
using Streetcode.BLL.DTO.Partners;
using Streetcode.BLL.Interfaces.Logging;
using Streetcode.BLL.SharedResource;
using Streetcode.DAL.Entities.Partners;
using Streetcode.DAL.Repositories.Interfaces.Base;

namespace Streetcode.BLL.MediatR.Partners.Create
{
public class CreatePartnerHandler : IRequestHandler<CreatePartnerQuery, Result<PartnerDTO>>
public class CreatePartnerHandler : IRequestHandler<CreatePartnerQuery, Result<PartnerDto>>
{
private readonly IMapper _mapper;
private readonly IRepositoryWrapper _repositoryWrapper;
Expand All @@ -29,7 +27,7 @@ public CreatePartnerHandler(

// If you use Rider instead of Visual Studio, for example, "SuppressMessage" attribute suppresses PossibleMultipleEnumeration warning
[SuppressMessage("ReSharper", "PossibleMultipleEnumeration", Justification = "Here is no sense to do materialization of query because of nested ToListAsync method in GetAllAsync method")]
public async Task<Result<PartnerDTO>> Handle(CreatePartnerQuery request, CancellationToken cancellationToken)
public async Task<Result<PartnerDto>> Handle(CreatePartnerQuery request, CancellationToken cancellationToken)
{
var newPartner = _mapper.Map<Partner>(request.newPartner);
newPartner.Streetcodes.Clear();
Expand All @@ -50,7 +48,7 @@ public async Task<Result<PartnerDTO>> Handle(CreatePartnerQuery request, Cancell
newPartner.Streetcodes.AddRange(existingStreetcodes);

await _repositoryWrapper.SaveChangesAsync();
return Result.Ok(_mapper.Map<PartnerDTO>(newPartner));
return Result.Ok(_mapper.Map<PartnerDto>(newPartner));
}
catch(Exception ex)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
namespace Streetcode.BLL.MediatR.Partners.Create
{
public record CreatePartnerQuery(CreatePartnerDTO newPartner)
: IRequest<Result<PartnerDTO>>;
: IRequest<Result<PartnerDto>>;
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Streetcode.BLL.MediatR.Partners.Delete
{
public class DeletePartnerHandler : IRequestHandler<DeletePartnerQuery, Result<PartnerDTO>>
public class DeletePartnerHandler : IRequestHandler<DeletePartnerQuery, Result<PartnerDto>>
{
private readonly IMapper _mapper;
private readonly IRepositoryWrapper _repositoryWrapper;
Expand All @@ -24,7 +24,7 @@ public DeletePartnerHandler(IRepositoryWrapper repositoryWrapper, IMapper mapper
_stringLocalizerNo = stringLocalizerNo;
}

public async Task<Result<PartnerDTO>> Handle(DeletePartnerQuery request, CancellationToken cancellationToken)
public async Task<Result<PartnerDto>> Handle(DeletePartnerQuery request, CancellationToken cancellationToken)
{
var partner = await _repositoryWrapper.PartnersRepository.GetFirstOrDefaultAsync(p => p.Id == request.id);
if (partner == null)
Expand All @@ -38,8 +38,8 @@ public async Task<Result<PartnerDTO>> Handle(DeletePartnerQuery request, Cancell
_repositoryWrapper.PartnersRepository.Delete(partner);
try
{
await _repositoryWrapper.SaveChangesAsync();
return Result.Ok(_mapper.Map<PartnerDTO>(partner));
_repositoryWrapper.SaveChanges();
return Result.Ok(_mapper.Map<PartnerDto>(partner));
}
catch(Exception ex)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
namespace Streetcode.BLL.MediatR.Partners.Delete
{
public record DeletePartnerQuery(int id)
: IRequest<Result<PartnerDTO>>;
: IRequest<Result<PartnerDto>>;
}
Loading