From 97e6ac51ac4df58cd1229e7974d2b846b192558a Mon Sep 17 00:00:00 2001 From: crupest Date: Thu, 7 Jan 2021 20:12:00 +0800 Subject: refactor: Make mapper a service. Fix #202. --- BackEnd/Timeline/Services/UserService.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'BackEnd/Timeline/Services/UserService.cs') diff --git a/BackEnd/Timeline/Services/UserService.cs b/BackEnd/Timeline/Services/UserService.cs index d341759c..288d208c 100644 --- a/BackEnd/Timeline/Services/UserService.cs +++ b/BackEnd/Timeline/Services/UserService.cs @@ -115,7 +115,7 @@ namespace Timeline.Services public async Task GetUser(long id) { - var user = await _databaseContext.Users.Where(u => u.Id == id).Include(u => u.Permissions).SingleOrDefaultAsync(); + var user = await _databaseContext.Users.Where(u => u.Id == id).SingleOrDefaultAsync(); if (user == null) throw new UserNotExistException(id); @@ -125,7 +125,7 @@ namespace Timeline.Services public async Task> GetUsers() { - return await _databaseContext.Users.Include(u => u.Permissions).ToListAsync(); + return await _databaseContext.Users.ToListAsync(); } public async Task CreateUser(string username, string password) @@ -153,8 +153,6 @@ namespace Timeline.Services _logger.LogInformation(Log.Format(LogDatabaseCreate, ("Id", newEntity.Id), ("Username", username))); - await _databaseContext.Entry(newEntity).Collection(e => e.Permissions).LoadAsync(); - return newEntity; } @@ -172,7 +170,7 @@ namespace Timeline.Services CheckNicknameFormat(param.Nickname, nameof(param)); } - var entity = await _databaseContext.Users.Where(u => u.Id == id).Include(u => u.Permissions).SingleOrDefaultAsync(); + var entity = await _databaseContext.Users.Where(u => u.Id == id).SingleOrDefaultAsync(); if (entity == null) throw new UserNotExistException(id); -- cgit v1.2.3