แก้ Change Request OP 2599

This commit is contained in:
Nakorn Rientrakrunchai
2020-07-22 11:50:27 +07:00
parent 764cd3c398
commit f9a4d7e0b7
5 changed files with 63 additions and 14 deletions

View File

@@ -27,6 +27,7 @@ namespace TodoAPI2.Controllers
private ILogger<eva_adjust_postponement_normalController> _logger;
private Ieva_adjust_postponement_normalService _repository;
private IConfiguration Configuration { get; set; }
private Iexternal_employeeService emp;
#endregion
#region Properties
@@ -37,13 +38,16 @@ namespace TodoAPI2.Controllers
/// Default constructure for dependency injection
/// </summary>
/// <param name="repository"></param>
/// <param name="configuration"></param>
/// <param name="configuration"></param>
/// <param name="inemp"></param>
/// <param name="logger"></param>
public eva_adjust_postponement_normalController(ILogger<eva_adjust_postponement_normalController> logger, Ieva_adjust_postponement_normalService repository, IConfiguration configuration)
public eva_adjust_postponement_normalController(ILogger<eva_adjust_postponement_normalController> logger,
Ieva_adjust_postponement_normalService repository, IConfiguration configuration, Iexternal_employeeService inemp)
{
_logger = logger;
_repository = repository;
Configuration = configuration;
emp = inemp;
}
/// <summary>
@@ -64,9 +68,17 @@ namespace TodoAPI2.Controllers
try
{
if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized();
var result = _repository.GetWithSelection(id);
return Ok(result);
if (!string.IsNullOrEmpty(HttpContext.Request.Cookies["user_id"]))
{
var loginid = Convert.ToInt32(HttpContext.Request.Cookies["user_id"]);
var e = emp.GetEmployeeForLogin(Convert.ToInt32(loginid));
return Ok(_repository.GetWithSelection(id, e.id));
}
else
{
return Unauthorized();
}
}
catch (Exception ex)
{
@@ -93,9 +105,17 @@ namespace TodoAPI2.Controllers
try
{
if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized();
var result = _repository.GetBlankItem();
return Ok(result);
if (!string.IsNullOrEmpty(HttpContext.Request.Cookies["user_id"]))
{
var loginid = Convert.ToInt32(HttpContext.Request.Cookies["user_id"]);
var e = emp.GetEmployeeForLogin(Convert.ToInt32(loginid));
return Ok(_repository.GetBlankItem(e.id));
}
else
{
return Unauthorized();
}
}
catch (Exception ex)
{
@@ -149,7 +169,18 @@ namespace TodoAPI2.Controllers
try
{
if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized();
return Ok(_repository.GetListBySearch(model));
if (!string.IsNullOrEmpty(HttpContext.Request.Cookies["user_id"]))
{
var loginid = Convert.ToInt32(HttpContext.Request.Cookies["user_id"]);
var e = emp.GetEmployeeForLogin(Convert.ToInt32(loginid));
model.emp_id = e.id;
return Ok(_repository.GetListBySearch(model));
}
else
{
return Unauthorized();
}
}
catch (Exception ex)
{