no message

This commit is contained in:
Kittapath 2023-10-11 23:25:54 +07:00
parent c285b4dd72
commit fb6e71c60c
4 changed files with 42 additions and 8 deletions

View file

@ -63,7 +63,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{
var placementAppointments = await _context.PlacementAppointments.AsQueryable()
.Where(x => (x.Profile.ProfileType == "employee" && x.Profile.EmployeeClass == "perm") || (x.Profile.ProfileType == "officer"))
.Where(x => x.Profile.ProfileType == "officer")
.OrderByDescending(x => x.CreatedAt)
.Select(p => new
{
@ -124,7 +124,7 @@ namespace BMA.EHR.Placement.Service.Controllers
public async Task<ActionResult<ResponseObject>> GetDetailByUser(Guid id)
{
var data = await _context.PlacementAppointments.AsQueryable()
.Where(x => (x.Profile.ProfileType == "employee" && x.Profile.EmployeeClass == "perm") || (x.Profile.ProfileType == "officer"))
.Where(x => x.Profile.ProfileType == "officer")
.Where(x => x.Id == id)
.Select(p => new
{
@ -244,7 +244,7 @@ namespace BMA.EHR.Placement.Service.Controllers
.Include(x => x.Position)
.Include(x => x.Gender)
.Include(x => x.Prefix)
.Where(x => (x.ProfileType == "employee" && x.EmployeeClass == "perm") || (x.ProfileType == "officer"))
.Where(x => x.ProfileType == "officer")
.FirstOrDefaultAsync(x => x.Id == req.Id);
if (profile == null)
return Error(GlobalMessages.DataNotFound, 404);
@ -326,7 +326,7 @@ namespace BMA.EHR.Placement.Service.Controllers
public async Task<ActionResult<ResponseObject>> UpdatePositionPlacementAppointment([FromBody] PersonSelectPositionAppointmentRequest req, Guid id)
{
var uppdated = await _context.PlacementAppointments
.Where(x => (x.Profile.ProfileType == "employee" && x.Profile.EmployeeClass == "perm") || (x.Profile.ProfileType == "officer"))
.Where(x => x.Profile.ProfileType == "officer")
.FirstOrDefaultAsync(x => x.Id == id);
if (uppdated == null)
return Error(GlobalMessages.PlacementAppointmentNotFound, 404);
@ -406,7 +406,7 @@ namespace BMA.EHR.Placement.Service.Controllers
public async Task<ActionResult<ResponseObject>> Put([FromBody] PlacementAppointmentEditRequest req, Guid id)
{
var uppdated = await _context.PlacementAppointments
.Where(x => (x.Profile.ProfileType == "employee" && x.Profile.EmployeeClass == "perm") || (x.Profile.ProfileType == "officer"))
.Where(x => x.Profile.ProfileType == "officer")
.FirstOrDefaultAsync(x => x.Id == id);
if (uppdated == null)
return Error(GlobalMessages.PlacementAppointmentNotFound, 404);
@ -489,7 +489,7 @@ namespace BMA.EHR.Placement.Service.Controllers
var deleted = await _context.PlacementAppointments.AsQueryable()
.Include(x => x.PlacementAppointmentDocs)
.ThenInclude(x => x.Document)
.Where(x => (x.Profile.ProfileType == "employee" && x.Profile.EmployeeClass == "perm") || (x.Profile.ProfileType == "officer"))
.Where(x => x.Profile.ProfileType == "officer")
.FirstOrDefaultAsync(x => x.Id == id);
if (deleted == null)
return NotFound();
@ -526,7 +526,7 @@ namespace BMA.EHR.Placement.Service.Controllers
foreach (var item in req.Id)
{
var uppdated = await _context.PlacementAppointments
.Where(x => (x.Profile.ProfileType == "employee" && x.Profile.EmployeeClass == "perm") || (x.Profile.ProfileType == "officer"))
.Where(x => x.Profile.ProfileType == "officer")
.FirstOrDefaultAsync(x => x.Id == item);
if (uppdated == null)
continue;
@ -556,7 +556,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{
var appointments = await _context.PlacementAppointments
.Where(x => x.PositionNumber != null)
.Where(x => (x.Profile.ProfileType == "employee" && x.Profile.EmployeeClass == "perm") || (x.Profile.ProfileType == "officer"))
.Where(x => x.Profile.ProfileType == "officer")
.Select(x => x.PositionNumber.Id)
.ToListAsync();