feat(account)!: switch to Bohemia id #96

- temporary create account if not found on request, later to be replaced, see #96

src/Api/Accounts/AccountEndpoints.cs

@@ -20,7 +20,7 @@ public static WebApplication MapAccountEndpoints(this WebApplication app)
             .MapPost(
                 "/sessions",
                 async ([FromBody] SessionRequestDto sessionRequest, IMediator mediator, IMapper mapper, CancellationToken cancellationToken)
-                    => Results.Ok(mapper.Map<ResultDto<SessionDto>>(await mediator.Send(new CreateSessionRequest(sessionRequest.SteamId), cancellationToken))))
+                    => Results.Ok(mapper.Map<ResultDto<SessionDto>>(await mediator.Send(new CreateSessionRequest(sessionRequest.BohemiaId), cancellationToken))))
             .Produces<ResultDto<SessionDto>>();
 
         return app;

src/Api/Accounts/CreateSessionRequestDto.cs

@@ -2,5 +2,5 @@
 
 public class SessionRequestDto
 {
-    public long SteamId { get; init; }
+    public Guid BohemiaId { get; init; }
 }

src/Api/Accounts/SessionDto.cs

@@ -3,4 +3,6 @@
 public class SessionDto : SessionRequestDto
 {
     public Guid AccountId { get; init; }
+
+    public bool Locked { get; init; }
 }

src/Api/Accounts/SessionProfile.cs

@@ -3,6 +3,7 @@
 using ELifeRPG.Application.Sessions;
 using ELifeRPG.Core.Api.Characters;
 using ELifeRPG.Core.Api.Models;
+using ELifeRPG.Domain.Accounts;
 
 namespace ELifeRPG.Core.Api.Accounts;
 
@@ -11,7 +12,8 @@ public class SessionProfile : Profile
     public SessionProfile()
     {
         CreateMap<CreateSessionResult, SessionDto>()
-            .ForMember(d => d.AccountId, o => o.MapFrom(s => s.AccountId));
+            .ForMember(d => d.AccountId, o => o.MapFrom(s => s.AccountId))
+            .ForMember(d => d.Locked, o => o.MapFrom(s => s.AccountStatus == AccountStatus.Locked));
 
         CreateMap<CreateSessionResult, ResultDto<SessionDto>>()
             .ForMember(d => d.Data, o => o.MapFrom(s => s));

src/Application/Sessions/CreateSession.cs

@@ -7,22 +7,19 @@ namespace ELifeRPG.Application.Sessions;
 
 public class CreateSessionResult : AbstractResult
 {
-    public CreateSessionResult(Guid accountId)
-    {
-        AccountId = accountId;
-    }
+    public required Guid AccountId { get; init; }
 
-    public Guid AccountId { get; }
+    public required AccountStatus AccountStatus { get; init; }
 }
 
 public class CreateSessionRequest : IRequest<CreateSessionResult>
 {
-    public CreateSessionRequest(long steamId)
+    public CreateSessionRequest(Guid bohemiaId)
     {
-        SteamId = steamId;
+        BohemiaId = bohemiaId;
     }
 
-    public long SteamId { get; }
+    public Guid BohemiaId { get; }
 }
 
 public class CreateSessionHandler : IRequestHandler<CreateSessionRequest, CreateSessionResult>
@@ -37,16 +34,21 @@ public CreateSessionHandler(IDatabaseContext databaseContext)
     public async Task<CreateSessionResult> Handle(CreateSessionRequest request, CancellationToken cancellationToken)
     {
         var account = await _databaseContext.Accounts
-            .SingleOrDefaultAsync(x => x.SteamId == request.SteamId, cancellationToken);
+            .SingleOrDefaultAsync(x => x.BohemiaId == request.BohemiaId, cancellationToken);
 
         if (account is null)
         {
-            account = new Account(request.SteamId);
+            // temporary until ingame account linking is finished, then blocking this case -> https://github.com/ELifeRPG/Core/issues/96
+            account = new Account(request.BohemiaId);
             _databaseContext.Accounts.Add(account);
             await _databaseContext.SaveChangesAsync(cancellationToken);
         }
 
-        var response = new CreateSessionResult(account.Id);
+        var response = new CreateSessionResult
+        {
+            AccountId = account.Id,
+            AccountStatus = account.Status,
+        };
 
         if (account.Status == AccountStatus.Locked)
         {

src/Domain/Accounts/Account.cs

@@ -20,9 +20,19 @@ public Account(long steamId)
         DomainEvents.Add(new AccountCreatedEvent(this));
     }
 
+    public Account(Guid bohemiaId)
+    {
+        Id = Guid.NewGuid();
+        BohemiaId = bohemiaId;
+
+        DomainEvents.Add(new AccountCreatedEvent(this));
+    }
+
     public Guid Id { get; init; }
 
     public long SteamId { get; init; }
+
+    public Guid? BohemiaId { get; init; }
 
     public AccountStatus Status
     {

src/Infrastructure/Accounts/AccountTypeConfiguration.cs

@@ -18,6 +18,9 @@ public void Configure(EntityTypeBuilder<Account> builder)
         builder.Property(x => x.SteamId).HasColumnName("SteamId").IsRequired();
         builder.HasIndex(x => x.SteamId).HasDatabaseName("IDX_Account_SteamId");
 
+        builder.Property(x => x.BohemiaId).HasColumnName("BohemiaId");
+        builder.HasIndex(x => x.BohemiaId).HasDatabaseName("IDX_Account_BohemiaId");
+
         builder.Property(x => x.Status).HasColumnName("Status").IsRequired();
     }
 }