michele/sledgemapper
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 4 Wiki Activity

cleanup and fixes

Browse source
This commit is contained in:
Michele Scandura 2021-09-20 16:30:42 +01:00
parent 4fd77a1f17
commit 77befef8e0
16 changed files with 78 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Sledgemapper.Api/Handlers/BaseCommandHandler.cs
View file

@ -7,6 +7,8 @@ using System.Threading.Tasks;
using System;
using Microsoft.EntityFrameworkCore;
using Sledgemapper.Api.Models;
using System.Collections.Generic;
using Sledgemapper.Api.Core.Entities;
namespace Sledgemapper.Api.Handlers
{
@ -32,13 +34,7 @@ namespace Sledgemapper.Api.Handlers
Dbcontext.Attach(user);
var campaign = await Dbcontext
.Campaigns
.Where(campaign => campaign.CampaignId == command.Campaign)
.Include(c => c.InvitedUsers)
.Include(c => c.Maps)
.Include(c => c.Owner)
.Where(campaign => campaign.OwnerId == command.UserId || campaign.InvitedUsers.Contains(user)).FirstAsync();
var campaign = await GetCampaignForUser(command);
var maps = campaign.Maps.Any(s => s.SessionId == command.SessionId);
@ -48,6 +44,20 @@ namespace Sledgemapper.Api.Handlers
}
}
protected async Task<Campaign> GetCampaignForUser(TRequest command)
{
var user = await Dbcontext.Users.FindAsync(command.UserId);
Dbcontext.Attach(user);
var campaign = await Dbcontext
.Campaigns
.Where(campaign => campaign.CampaignId == command.Campaign)
.Include(c => c.InvitedUsers)
.Include(c => c.Maps)
.Include(c => c.Owner)
.Where(campaign => campaign.OwnerId == command.UserId || campaign.InvitedUsers.Contains(user)).FirstAsync();
return campaign;
}
protected async Task<Session> SaveLog(TRequest command, string operation, string type, string data, CancellationToken cancellationToken)
{
var session = Dbcontext.Sessions.First(m => m.SessionId == command.SessionId);