Skip to content

Migrate from Automapper to Mapster #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Externius merged 1 commit into from
Jul 27, 2025
Merged

Migrate from Automapper to Mapster #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="AutoMapper" Version="14.0.0" />
<PackageVersion Include="BuildBundlerMinifier" Version="3.2.449" />
<PackageVersion Include="IdentityModel" Version="7.0.0" />
<PackageVersion Include="Mapster" Version="7.4.0" />
<PackageVersion Include="Mapster.DependencyInjection" Version="1.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.7" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="9.0.7" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.7" />
Expand All @@ -20,11 +21,11 @@
<PackageVersion Include="Serilog.Settings.Configuration" Version="9.0.0" />
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageVersion Include="Serilog.Sinks.MSSqlServer" Version="8.2.2" />
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.12.1" />
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.13.0" />
<PackageVersion Include="System.Text.Json" Version="9.0.7" />
<PackageVersion Include="Shouldly" Version="4.3.0" />
<PackageVersion Include="xunit.v3" Version="2.0.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1" />
<PackageVersion Include="xunit.v3" Version="3.0.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" />
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
<PackageVersion Include="X.PagedList" Version="10.5.7" />
<PackageVersion Include="X.PagedList.Mvc.Core" Version="10.5.7" />
Expand Down
35 changes: 32 additions & 3 deletions src/Open5ETools.Core/ConfigureServices.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
using Microsoft.Extensions.DependencyInjection;
using Mapster;
using Microsoft.Extensions.DependencyInjection;
using Open5ETools.Core.Common.Enums.SM;
using Open5ETools.Core.Common.Helpers;
using Open5ETools.Core.Common.Interfaces.Services;
using Open5ETools.Core.Common.Interfaces.Services.DM;
using Open5ETools.Core.Common.Interfaces.Services.DM.Generator;
using Open5ETools.Core.Common.Interfaces.Services.EG;
using Open5ETools.Core.Common.Interfaces.Services.SM;
using Open5ETools.Core.Common.Models.EG;
using Open5ETools.Core.Common.Models.Json;
using Open5ETools.Core.Services;
using Open5ETools.Core.Services.Automapper;
using Open5ETools.Core.Services.DM;
using Open5ETools.Core.Services.DM.Generator;
using Open5ETools.Core.Services.EG;
Expand All @@ -31,7 +34,33 @@ this IServiceCollection services
.AddScoped<IDungeonService, DungeonService>()
.AddScoped<ISpellService, SpellService>();

services.AddAutoMapper(cfg => { cfg.AllowNullCollections = true; }, typeof(UserProfile));
services.ConfigureMapster();
return services;
}


private static IServiceCollection ConfigureMapster(this IServiceCollection services)
{
services.AddMapster();
TypeAdapterConfig<Spell, Open5ETools.Core.Domain.SM.Spell>
.NewConfig()
.Map(dest => dest.Concentration,
src => string.IsNullOrWhiteSpace(src.Concentration) ||
!src.Concentration.Equals("no", StringComparison.InvariantCultureIgnoreCase))
.Map(dest => dest.Ritual,
src => string.IsNullOrWhiteSpace(src.Ritual) ||
!src.Ritual.Equals("no", StringComparison.InvariantCultureIgnoreCase))
.Map(dest => dest.School,
src => Enum.Parse<School>(src.School ?? string.Empty));

TypeAdapterConfig<Monster, JsonMonsterModel>
.NewConfig()
.Map(dest => dest.Hp, src => src.HitPoints)
.Map(dest => dest.Ac, src => src.ArmorClass);

TypeAdapterConfig<Open5ETools.Core.Domain.EG.Monster, MonsterModel>
.NewConfig()
.Map(dest => dest.JsonMonsterModel, src => src.JsonMonster);

return services;
}
Expand Down
3 changes: 2 additions & 1 deletion src/Open5ETools.Core/Open5ETools.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="AutoMapper" />
<PackageReference Include="Mapster" />
<PackageReference Include="Mapster.DependencyInjection" />
<PackageReference Include="Microsoft.EntityFrameworkCore" />
<PackageReference Include="System.Text.Json" />
<PackageReference Include="Serilog.AspNetCore" />
Expand Down
8 changes: 4 additions & 4 deletions src/Open5ETools.Core/Services/AuthService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using AutoMapper;
using MapsterMapper;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Open5ETools.Core.Common.Helpers;
Expand All @@ -19,9 +19,9 @@ public class AuthService(IMapper mapper, IAppDbContext context, ILogger<AuthServ
try
{
var user = await _context.Users
.AsNoTracking()
.Where(u => u.IsDeleted == false)
.FirstOrDefaultAsync(u => u.Username == model.Username, cancellationToken);
.AsNoTracking()
.Where(u => u.IsDeleted == false)
.FirstOrDefaultAsync(u => u.Username == model.Username, cancellationToken);

if (user is null)
return null;
Expand Down
14 changes: 0 additions & 14 deletions src/Open5ETools.Core/Services/Automapper/DM/DungeonProfile.cs
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions src/Open5ETools.Core/Services/Automapper/DM/OptionProfile.cs
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions src/Open5ETools.Core/Services/Automapper/EG/EncounterProfile.cs
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions src/Open5ETools.Core/Services/Automapper/EG/MonsterProfile.cs
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions src/Open5ETools.Core/Services/Automapper/SM/SpellProfile.cs
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions src/Open5ETools.Core/Services/Automapper/UserProfile.cs
View file
Open in desktop

This file was deleted.

23 changes: 14 additions & 9 deletions src/Open5ETools.Core/Services/DM/DungeonService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.Text.Json;
using AutoMapper;
using MapsterMapper;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Open5ETools.Core.Common.Exceptions;
Expand Down Expand Up @@ -218,11 +218,12 @@ public async Task<IEnumerable<DungeonOptionModel>> GetAllDungeonOptionsForUserAs
{
try
{
return _mapper.Map<DungeonOptionModel>(await _context.DungeonOptions
var dungeonOption = await _context.DungeonOptions
.Include(d => d.Dungeons)
.AsNoTracking()
.Where(d => d.DungeonName.Equals(dungeonName) && d.UserId == userId)
.FirstOrDefaultAsync(cancellationToken));
.FirstOrDefaultAsync(cancellationToken);
return dungeonOption is not null ? _mapper.Map<DungeonOptionModel>(dungeonOption) : null;
}
catch (Exception ex)
{
Expand Down Expand Up @@ -341,8 +342,9 @@ public async Task<DungeonModel> GetDungeonAsync(int id, CancellationToken cancel
try
{
return _mapper.Map<DungeonModel>(await _context.Dungeons
.AsNoTracking()
.FirstOrDefaultAsync(d => d.Id == id, cancellationToken));
.AsNoTracking()
.FirstOrDefaultAsync(d => d.Id == id, cancellationToken) ??
throw new ServiceException(Error.NotFound));
}
catch (Exception ex)
{
Expand Down Expand Up @@ -375,7 +377,8 @@ public async Task<DungeonOptionModel> GetDungeonOptionAsync(int id, Cancellation
try
{
return _mapper.Map<DungeonOptionModel>(
await _context.DungeonOptions.FirstOrDefaultAsync(d => d.Id == id, cancellationToken));
await _context.DungeonOptions.FirstOrDefaultAsync(d => d.Id == id, cancellationToken) ??
throw new ServiceException(Error.NotFound));
}
catch (Exception ex)
{
Expand Down Expand Up @@ -408,10 +411,12 @@ public async Task<string> ExportToJsonAsync(int dungeonId, CancellationToken can
try
{
var dungeon = _mapper.Map<DungeonModel>(await _context.Dungeons
.AsNoTracking()
.FirstOrDefaultAsync(d => d.Id == dungeonId, cancellationToken));
.AsNoTracking()
.FirstOrDefaultAsync(d => d.Id == dungeonId,
cancellationToken) ??
throw new ServiceException(Error.NotFound));

return dungeon is not null ? JsonSerializer.Serialize(dungeon) : string.Empty;
return JsonSerializer.Serialize(dungeon);
}
catch (Exception ex)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Open5ETools.Core/Services/DM/OptionService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using AutoMapper;
using MapsterMapper;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.Logging;
Expand Down
9 changes: 6 additions & 3 deletions src/Open5ETools.Core/Services/EG/EncounterService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using AutoMapper;
using MapsterMapper;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Open5ETools.Core.Common;
Expand All @@ -10,6 +10,8 @@
using Open5ETools.Core.Common.Interfaces.Services.EG;
using Open5ETools.Core.Common.Models.EG;
using Open5ETools.Core.Domain.EG;
using Open5ETools.Resources;
using Enum = System.Enum;

namespace Open5ETools.Core.Services.EG;

Expand Down Expand Up @@ -202,8 +204,9 @@ private MonsterModel GetEncounterDetail(Difficulty difficulty, Monster currentMo
public async Task<MonsterModel> GetMonsterByIdAsync(int id)
{
var monster = await _context.Monsters
.AsNoTracking()
.FirstOrDefaultAsync(m => m.Id == id);
.AsNoTracking()
.FirstOrDefaultAsync(m => m.Id == id) ??
throw new ServiceException(Error.NotFound);

return _mapper.Map<MonsterModel>(monster);
}
Expand Down
24 changes: 14 additions & 10 deletions src/Open5ETools.Core/Services/SM/SpellService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
using AutoMapper;
using MapsterMapper;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Open5ETools.Core.Common.Exceptions;
using Open5ETools.Core.Common.Interfaces.Data;
using Open5ETools.Core.Common.Interfaces.Services.SM;
using Open5ETools.Core.Common.Models.SM;
using Open5ETools.Resources;

namespace Open5ETools.Core.Services.SM;

public class SpellService(
IMapper mapper,
IAppDbContext context,
ILogger<SpellService> logger
) : ISpellService
) : ISpellService
{
private readonly IMapper _mapper = mapper;
private readonly IAppDbContext _context = context;
Expand All @@ -22,8 +24,9 @@ public async Task<SpellModel> GetAsync(int id, CancellationToken cancellationTok
try
{
var spell = await _context.Spells
.AsNoTracking()
.FirstOrDefaultAsync(u => u.Id == id, cancellationToken);
.AsNoTracking()
.FirstOrDefaultAsync(u => u.Id == id, cancellationToken) ??
throw new ServiceException(Error.NotFound);

return _mapper.Map<SpellModel>(spell);
}
Expand All @@ -34,19 +37,20 @@ public async Task<SpellModel> GetAsync(int id, CancellationToken cancellationTok
}
}

public async Task<IEnumerable<SpellModel>> ListAsync(string? search = null, CancellationToken cancellationToken = default)
public async Task<IEnumerable<SpellModel>> ListAsync(string? search = null,
CancellationToken cancellationToken = default)
{
try
{
var query = _context.Spells.AsNoTracking();

if (!string.IsNullOrWhiteSpace(search))
query = query.Where(s => EF.Functions.Like(s.Name, $"%{search}%")
|| EF.Functions.Like(s.Class, $"%{search}%")
|| EF.Functions.Like(s.Level, $"%{search}%")
|| EF.Functions.Like(s.CastingTime, $"%{search}%")
|| EF.Functions.Like(s.Range, $"%{search}%")
|| EF.Functions.Like(s.Components, $"%{search}%")
|| EF.Functions.Like(s.Class, $"%{search}%")
|| EF.Functions.Like(s.Level, $"%{search}%")
|| EF.Functions.Like(s.CastingTime, $"%{search}%")
|| EF.Functions.Like(s.Range, $"%{search}%")
|| EF.Functions.Like(s.Components, $"%{search}%")
);

var items = await query.ToListAsync(cancellationToken);
Expand Down
Loading