Extend data service

This commit is contained in:
hydrant
2020-03-08 20:12:37 +01:00
parent 7c2c5ce04e
commit 22e5115f3b
6 changed files with 41 additions and 10 deletions

View File

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.DataService.Types;
@@ -31,7 +32,7 @@ namespace ReallifeGamemode.DataService.Controllers
[ProducesResponseType(StatusCodes.Status404NotFound)]
public ActionResult<GetUserDataResponse> Data()
{
User user = dbContext.Users.Where(u => u.Id == UserId).FirstOrDefault();
User user = dbContext.Users.Include(u => u.Faction).Include(u => u.FactionRank).Where(u => u.Id == UserId).FirstOrDefault();
if (user == null)
{
@@ -42,7 +43,15 @@ namespace ReallifeGamemode.DataService.Controllers
{
Name = user.Name,
AdminLevel = user.AdminLevel,
RegistrationDate = user.RegistrationDate
RegistrationDate = user.RegistrationDate,
BankMoney = user.GetBankAccount().Balance,
HandMoney = user.Handmoney,
FactionName = user.Faction?.Name,
FactionRankName = user.FactionRank?.RankName,
WantedLevel = user.Wanteds,
CarDrivingLicense = user.DriverLicenseVehicle,
BikeDrivingLicense = user.DriverLicenseBike,
PlaneLicense = user.FlyingLicensePlane
};
}