NRC migration to mapster

src/OneGround.ZGW.Notificaties.Web/Controllers/v1/AbonnementController.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using AutoMapper;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
@@ -31,18 +30,24 @@ namespace OneGround.ZGW.Notificaties.Web.Controllers.v1;
 [ZgwApiVersion(Api.LatestVersion_1_0)]
 public class AbonnementController : ZGWControllerBase
 {
+    private readonly MapsterMapper.IMapper _mapsterMapper;
+    private readonly IZgwRequestMerger _zgwRequestMerger;
     private readonly IValidatorService _validatorService;
 
     public AbonnementController(
         ILogger<AbonnementController> logger,
         IMediator mediator,
-        IMapper mapper,
-        IRequestMerger requestMerger,
+        AutoMapper.IMapper mapper,
+        MapsterMapper.IMapper mapsterMapper,
+        IRequestMerger requestMerger, // unused here; ZGWControllerBase's constructor still requires it
+        IZgwRequestMerger zgwRequestMerger,
         IErrorResponseBuilder errorResponseBuilder,
         IValidatorService validatorService
     )
         : base(logger, mediator, mapper, requestMerger, errorResponseBuilder)
     {
+        _mapsterMapper = mapsterMapper;
+        _zgwRequestMerger = zgwRequestMerger;
         _validatorService = validatorService;
     }
 
@@ -62,7 +67,7 @@ public async Task<IActionResult> GetAllAsync()
 
         var result = await _mediator.Send(new GetAllAbonnementenQuery());
 
-        var abonnementenResponse = _mapper.Map<IReadOnlyList<AbonnementResponseDto>>(result.Result);
+        var abonnementenResponse = _mapsterMapper.Map<IReadOnlyList<AbonnementResponseDto>>(result.Result);
 
         return Ok(abonnementenResponse);
     }
@@ -89,7 +94,7 @@ public async Task<IActionResult> GetAsync(Guid id)
             return _errorResponseBuilder.NotFound();
         }
 
-        var abonnementResponse = _mapper.Map<AbonnementResponseDto>(result.Result);
+        var abonnementResponse = _mapsterMapper.Map<AbonnementResponseDto>(result.Result);
 
         return Ok(abonnementResponse);
     }
@@ -109,7 +114,7 @@ public async Task<IActionResult> CreateAsync([FromBody] AbonnementRequestDto abo
     {
         _logger.LogDebug("{ControllerMethod} called with {@FromBody}", nameof(CreateAsync), abonnementRequest);
 
-        Abonnement abonnement = _mapper.Map<Abonnement>(abonnementRequest);
+        Abonnement abonnement = _mapsterMapper.Map<Abonnement>(abonnementRequest);
 
         var result = await _mediator.Send(new CreateAbonnementCommand { Abonnement = abonnement });
 
@@ -118,7 +123,7 @@ public async Task<IActionResult> CreateAsync([FromBody] AbonnementRequestDto abo
             return _errorResponseBuilder.BadRequest(result.Errors);
         }
 
-        var abonnementResponse = _mapper.Map<AbonnementResponseDto>(result.Result);
+        var abonnementResponse = _mapsterMapper.Map<AbonnementResponseDto>(result.Result);
 
         return Created(abonnementResponse.Url, abonnementResponse);
     }
@@ -139,7 +144,7 @@ public async Task<IActionResult> UpdateAsync([FromBody] AbonnementRequestDto abo
     {
         _logger.LogDebug("{ControllerMethod} called with {@FromBody}, {Uuid}", nameof(UpdateAsync), abonnementRequest, id);
 
-        Abonnement abonnement = _mapper.Map<Abonnement>(abonnementRequest);
+        Abonnement abonnement = _mapsterMapper.Map<Abonnement>(abonnementRequest);
 
         var result = await _mediator.Send(new UpdateAbonnementCommand { Abonnement = abonnement, Id = id });
 
@@ -153,7 +158,7 @@ public async Task<IActionResult> UpdateAsync([FromBody] AbonnementRequestDto abo
             return _errorResponseBuilder.BadRequest(result.Errors);
         }
 
-        var abonnementResponse = _mapper.Map<AbonnementResponseDto>(result.Result);
+        var abonnementResponse = _mapsterMapper.Map<AbonnementResponseDto>(result.Result);
 
         return Ok(abonnementResponse);
     }
@@ -181,7 +186,7 @@ public async Task<IActionResult> PartialUpdateAsync([FromBody] JObject partialAb
             return _errorResponseBuilder.NotFound();
         }
 
-        AbonnementRequestDto mergedAbonnementRequest = _requestMerger.MergePartialUpdateToObjectRequest<AbonnementRequestDto, Abonnement>(
+        AbonnementRequestDto mergedAbonnementRequest = _zgwRequestMerger.MergePartialUpdateToObjectRequest<AbonnementRequestDto, Abonnement>(
             resultGet.Result,
             partialAbonnementRequest
         );
@@ -191,7 +196,7 @@ public async Task<IActionResult> PartialUpdateAsync([FromBody] JObject partialAb
             return _errorResponseBuilder.BadRequest(validationResult);
         }
 
-        Abonnement mergedAbonnement = _mapper.Map<Abonnement>(mergedAbonnementRequest);
+        Abonnement mergedAbonnement = _mapsterMapper.Map<Abonnement>(mergedAbonnementRequest);
 
         var resultUpd = await _mediator.Send(new UpdateAbonnementCommand { Abonnement = mergedAbonnement, Id = id });
 
@@ -200,7 +205,7 @@ public async Task<IActionResult> PartialUpdateAsync([FromBody] JObject partialAb
             return _errorResponseBuilder.BadRequest(resultUpd.Errors);
         }
 
-        var abonnementResponse = _mapper.Map<AbonnementResponseDto>(resultUpd.Result);
+        var abonnementResponse = _mapsterMapper.Map<AbonnementResponseDto>(resultUpd.Result);
 
         return Ok(abonnementResponse);
     }

src/OneGround.ZGW.Notificaties.Web/Controllers/v1/KanaalController.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using AutoMapper;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
@@ -30,14 +29,20 @@ namespace OneGround.ZGW.Notificaties.Web.Controllers.v1;
 [ZgwApiVersion(Api.LatestVersion_1_0)]
 public class KanaalController : ZGWControllerBase
 {
+    private readonly MapsterMapper.IMapper _mapsterMapper;
+
     public KanaalController(
         ILogger<KanaalController> logger,
         IMediator mediator,
-        IMapper mapper,
+        AutoMapper.IMapper mapper,
+        MapsterMapper.IMapper mapsterMapper,
         IRequestMerger requestMerger,
         IErrorResponseBuilder errorResponseBuilder
     )
-        : base(logger, mediator, mapper, requestMerger, errorResponseBuilder) { }
+        : base(logger, mediator, mapper, requestMerger, errorResponseBuilder)
+    {
+        _mapsterMapper = mapsterMapper;
+    }
 
     /// <summary>
     /// Alle KANAALen opvragen.
@@ -57,7 +62,7 @@ public async Task<IActionResult> GetAllAsync(string naam)
 
         var result = await _mediator.Send(new GetAllKanalenQuery(naam));
 
-        var kanalenResponse = _mapper.Map<IReadOnlyList<KanaalResponseDto>>(result.Result);
+        var kanalenResponse = _mapsterMapper.Map<IReadOnlyList<KanaalResponseDto>>(result.Result);
 
         return Ok(kanalenResponse);
     }
@@ -84,7 +89,7 @@ public async Task<IActionResult> GetAsync(Guid id)
             return _errorResponseBuilder.NotFound();
         }
 
-        var kanaalResponse = _mapper.Map<KanaalResponseDto>(result.Result);
+        var kanaalResponse = _mapsterMapper.Map<KanaalResponseDto>(result.Result);
 
         return Ok(kanaalResponse);
     }
@@ -104,7 +109,7 @@ public async Task<IActionResult> CreateAsync([FromBody] KanaalRequestDto kanaalR
     {
         _logger.LogDebug("{ControllerMethod} called with {@FromBody}", nameof(CreateAsync), kanaalRequest);
 
-        Kanaal kanaal = _mapper.Map<Kanaal>(kanaalRequest);
+        Kanaal kanaal = _mapsterMapper.Map<Kanaal>(kanaalRequest);
 
         var result = await _mediator.Send(new CreateKanaalCommand { Kanaal = kanaal });
 
@@ -113,7 +118,7 @@ public async Task<IActionResult> CreateAsync([FromBody] KanaalRequestDto kanaalR
             return _errorResponseBuilder.BadRequest(result.Errors);
         }
 
-        var kanaalResponse = _mapper.Map<KanaalResponseDto>(result.Result);
+        var kanaalResponse = _mapsterMapper.Map<KanaalResponseDto>(result.Result);
 
         return Created(kanaalResponse.Url, kanaalResponse);
     }

src/OneGround.ZGW.Notificaties.Web/Controllers/v1/NotificatiesController.cs

@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using AutoMapper;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
@@ -32,14 +31,20 @@ namespace OneGround.ZGW.Notificaties.Web.Controllers.v1;
 [ZgwApiVersion(Api.LatestVersion_1_0)]
 public class NotificatiesController : ZGWControllerBase
 {
+    private readonly MapsterMapper.IMapper _mapsterMapper;
+
     public NotificatiesController(
         ILogger<NotificatiesController> logger,
         IMediator mediator,
-        IMapper mapper,
+        AutoMapper.IMapper mapper,
+        MapsterMapper.IMapper mapsterMapper,
         IRequestMerger requestMerger,
         IErrorResponseBuilder errorResponseBuilder
     )
-        : base(logger, mediator, mapper, requestMerger, errorResponseBuilder) { }
+        : base(logger, mediator, mapper, requestMerger, errorResponseBuilder)
+    {
+        _mapsterMapper = mapsterMapper;
+    }
 
     /// <summary>
     /// Publiceer een notificatie.
@@ -57,7 +62,7 @@ public async Task<IActionResult> NotificeerAsync([FromBody] NotificatieDto notif
     {
         _logger.LogDebug("{ControllerMethod} called with {@FromBody}", nameof(NotificeerAsync), notificatieRequest);
 
-        var notificatie = _mapper.Map<Notificatie>(notificatieRequest);
+        var notificatie = _mapsterMapper.Map<Notificatie>(notificatieRequest);
 
         var result = await _mediator.Send(new QueueNotificatieCommand { Notificatie = notificatie });
 

src/OneGround.ZGW.Notificaties.Web/MappingProfiles/v1/DomainToResponseRegister.cs

@@ -0,0 +1,34 @@
+using Mapster;
+using OneGround.ZGW.Common.Web.Mapping.Mapster;
+using OneGround.ZGW.Notificaties.Contracts.v1;
+using OneGround.ZGW.Notificaties.Contracts.v1.Requests;
+using OneGround.ZGW.Notificaties.Contracts.v1.Responses;
+using OneGround.ZGW.Notificaties.DataModel;
+using OneGround.ZGW.Notificaties.Web.Extensions;
+
+namespace OneGround.ZGW.Notificaties.Web.MappingProfiles.v1;
+
+public class DomainToResponseRegister : IRegister
+{
+    public void Register(TypeAdapterConfig config)
+    {
+        config
+            .NewConfig<Abonnement, AbonnementResponseDto>()
+            .Map(dest => dest.Url, src => MapsterUrlResolver.ResolveUrl(src))
+            .Map(dest => dest.Auth, src => "<hidden>")
+            .Map(dest => dest.Kanalen, src => src.AbonnementKanalen);
+
+        config
+            .NewConfig<AbonnementKanaal, AbonnementKanaalDto>()
+            .Map(dest => dest.Naam, src => src.Kanaal.Naam)
+            .Map(dest => dest.Filters, src => src.FiltersToDictionary());
+
+        config.NewConfig<FilterValue, FilterValueDto>();
+
+        config.NewConfig<Kanaal, KanaalResponseDto>().Map(dest => dest.Url, src => MapsterUrlResolver.ResolveUrl(src));
+
+        // Note: These maps are used to merge an existing KANAAL/ABONNEMENT with the PATCH operation
+        config.NewConfig<Kanaal, KanaalRequestDto>();
+        config.NewConfig<Abonnement, AbonnementRequestDto>().Map(dest => dest.Kanalen, src => src.AbonnementKanalen);
+    }
+}