forked from AcaMate/AcaMate_API
[🐛] user/academy API EF 로직 수정
This commit is contained in:
parent
4e7130ea63
commit
6ef2a32d24
|
@ -28,6 +28,8 @@ namespace Back.Program.Controllers.V1
|
||||||
private readonly ILogger<UserController> _logger = logger;
|
private readonly ILogger<UserController> _logger = logger;
|
||||||
private readonly SessionManager _sessionManager = sessionManager;
|
private readonly SessionManager _sessionManager = sessionManager;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
[CustomOperation("회원 정보 조회", "회원 정보 조회 (자기자신)", "사용자")]
|
[CustomOperation("회원 정보 조회", "회원 정보 조회 (자기자신)", "사용자")]
|
||||||
public async Task<IActionResult> GetUserData(string token)
|
public async Task<IActionResult> GetUserData(string token)
|
||||||
|
@ -35,6 +37,7 @@ namespace Back.Program.Controllers.V1
|
||||||
if (string.IsNullOrEmpty(token)) return BadRequest(APIResponse.InvalidInputError());
|
if (string.IsNullOrEmpty(token)) return BadRequest(APIResponse.InvalidInputError());
|
||||||
if (!ModelState.IsValid) return BadRequest(APIResponse.InvalidInputError());
|
if (!ModelState.IsValid) return BadRequest(APIResponse.InvalidInputError());
|
||||||
string summary = repositoryService.ReadSummary(typeof(UserController), "GetUserData");
|
string summary = repositoryService.ReadSummary(typeof(UserController), "GetUserData");
|
||||||
|
|
||||||
if (token == "VO00")
|
if (token == "VO00")
|
||||||
{
|
{
|
||||||
var (code, WebAuthResult) = await dedicateWeb.GetAuthToken();
|
var (code, WebAuthResult) = await dedicateWeb.GetAuthToken();
|
||||||
|
@ -58,7 +61,6 @@ namespace Back.Program.Controllers.V1
|
||||||
string summary = repositoryService.ReadSummary(typeof(UserController), "Login");
|
string summary = repositoryService.ReadSummary(typeof(UserController), "Login");
|
||||||
var result = await userService.Login(summary, accType, snsId);
|
var result = await userService.Login(summary, accType, snsId);
|
||||||
return Ok(result);
|
return Ok(result);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[HttpPost("register")]
|
[HttpPost("register")]
|
||||||
|
@ -80,6 +82,13 @@ namespace Back.Program.Controllers.V1
|
||||||
if (!ModelState.IsValid) return BadRequest(APIResponse.InvalidInputError());
|
if (!ModelState.IsValid) return BadRequest(APIResponse.InvalidInputError());
|
||||||
string summary = repositoryService.ReadSummary(typeof(UserController), "Logout");
|
string summary = repositoryService.ReadSummary(typeof(UserController), "Logout");
|
||||||
|
|
||||||
|
if (token == "VO00")
|
||||||
|
{
|
||||||
|
var (code, WebAuthResult) = await dedicateWeb.GetAuthToken();
|
||||||
|
if (code != "000") return Ok(APIResponse.Send(code, $"{WebAuthResult}", new { }));
|
||||||
|
token = WebAuthResult;
|
||||||
|
}
|
||||||
|
|
||||||
var result = await userService.Logout(summary, token);
|
var result = await userService.Logout(summary, token);
|
||||||
return Ok(result);
|
return Ok(result);
|
||||||
}
|
}
|
||||||
|
@ -92,6 +101,14 @@ namespace Back.Program.Controllers.V1
|
||||||
if (string.IsNullOrEmpty(token)) return BadRequest(APIResponse.InvalidInputError());
|
if (string.IsNullOrEmpty(token)) return BadRequest(APIResponse.InvalidInputError());
|
||||||
if (!ModelState.IsValid) return BadRequest(APIResponse.InvalidInputError());
|
if (!ModelState.IsValid) return BadRequest(APIResponse.InvalidInputError());
|
||||||
string summary = repositoryService.ReadSummary(typeof(UserController), "Cancel");
|
string summary = repositoryService.ReadSummary(typeof(UserController), "Cancel");
|
||||||
|
|
||||||
|
if (token == "VO00")
|
||||||
|
{
|
||||||
|
var (code, WebAuthResult) = await dedicateWeb.GetAuthToken();
|
||||||
|
if (code != "000") return Ok(APIResponse.Send(code, $"{WebAuthResult}", new { }));
|
||||||
|
token = WebAuthResult;
|
||||||
|
}
|
||||||
|
|
||||||
var result = await userService.Cancel(summary, token);
|
var result = await userService.Cancel(summary, token);
|
||||||
return Ok(result);
|
return Ok(result);
|
||||||
}
|
}
|
||||||
|
@ -103,12 +120,18 @@ namespace Back.Program.Controllers.V1
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(token)) return BadRequest(APIResponse.InvalidInputError());
|
if (string.IsNullOrEmpty(token)) return BadRequest(APIResponse.InvalidInputError());
|
||||||
if (!ModelState.IsValid) return BadRequest(APIResponse.InvalidInputError());
|
if (!ModelState.IsValid) return BadRequest(APIResponse.InvalidInputError());
|
||||||
string summary = repositoryService.ReadSummary(typeof(UserController), "ReadAcademyInfo");
|
string summary = repositoryService.ReadSummary(typeof(UserController), "GetAcademyData");
|
||||||
|
|
||||||
|
if (token == "VO00")
|
||||||
|
{
|
||||||
|
var (code, WebAuthResult) = await dedicateWeb.GetAuthToken();
|
||||||
|
if (code != "000") return Ok(APIResponse.Send(code, $"{WebAuthResult}", new { }));
|
||||||
|
token = WebAuthResult;
|
||||||
|
}
|
||||||
|
|
||||||
var result = await userService.GetAcademy(summary, token);
|
var result = await userService.GetAcademy(summary, token);
|
||||||
return Ok(result);
|
return Ok(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@ namespace Back.Program.Repositories.V1
|
||||||
public Task<List<AcademyName>> FindAcademies(string uid)
|
public Task<List<AcademyName>> FindAcademies(string uid)
|
||||||
{
|
{
|
||||||
var academyList = _context.UserAcademy
|
var academyList = _context.UserAcademy
|
||||||
.Join(_context.Academy, ua => ua.uid, a => a.uid, (ua, a) => new { ua, a })
|
.Join(_context.Academy, ua => ua.bid, a => a.bid, (ua, a) => new { ua, a })
|
||||||
.Where(s => s.ua.uid == uid)
|
.Where(s => s.ua.uid == uid)
|
||||||
.Select(s => new AcademyName { bid = s.a.bid, name = s.a.business_name })
|
.Select(s => new AcademyName { bid = s.a.bid, name = s.a.business_name })
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
|
|
|
@ -236,10 +236,8 @@ namespace Back.Program.Services.V1
|
||||||
var uid = validToken.FindFirst(ClaimTypes.NameIdentifier)?.Value ?? string.Empty;
|
var uid = validToken.FindFirst(ClaimTypes.NameIdentifier)?.Value ?? string.Empty;
|
||||||
var user = await _userRepository.FindUser(uid);
|
var user = await _userRepository.FindUser(uid);
|
||||||
if (user == null) return APIResponse.Send<object>("001", $"[{summary}], 회원 정보 확인 오류", new { });
|
if (user == null) return APIResponse.Send<object>("001", $"[{summary}], 회원 정보 확인 오류", new { });
|
||||||
|
|
||||||
var academyList = await _userRepository.FindAcademies(uid);
|
var academyList = await _userRepository.FindAcademies(uid);
|
||||||
|
_logger.LogInformation($"[{summary}]: 성공 - {System.Text.Json.JsonSerializer.Serialize(academyList)}");
|
||||||
_logger.LogInformation($"[{summary}]: 성공");
|
|
||||||
return APIResponse.Send<object>("000", $"[{summary}], 정상.", academyList);
|
return APIResponse.Send<object>("000", $"[{summary}], 정상.", academyList);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user