diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs index f79dbd33..48811ec2 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs @@ -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 == "PREM") || (x.Profile.ProfileType == "OFFICER")) + .Where(x => (x.Profile.ProfileType == "employee" && x.Profile.EmployeeClass == "perm") || (x.Profile.ProfileType == "officer")) .OrderByDescending(x => x.CreatedAt) .Select(p => new { @@ -124,7 +124,7 @@ namespace BMA.EHR.Placement.Service.Controllers public async Task> GetDetailByUser(Guid id) { var data = await _context.PlacementAppointments.AsQueryable() - .Where(x => (x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeClass == "PREM") || (x.Profile.ProfileType == "OFFICER")) + .Where(x => (x.Profile.ProfileType == "employee" && x.Profile.EmployeeClass == "perm") || (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 == "PREM") || (x.ProfileType == "OFFICER")) + .Where(x => (x.ProfileType == "employee" && x.EmployeeClass == "perm") || (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> UpdatePositionPlacementAppointment([FromBody] PersonSelectPositionAppointmentRequest req, Guid id) { var uppdated = await _context.PlacementAppointments - .Where(x => (x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeClass == "PREM") || (x.Profile.ProfileType == "OFFICER")) + .Where(x => (x.Profile.ProfileType == "employee" && x.Profile.EmployeeClass == "perm") || (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> Put([FromBody] PlacementAppointmentEditRequest req, Guid id) { var uppdated = await _context.PlacementAppointments - .Where(x => (x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeClass == "PREM") || (x.Profile.ProfileType == "OFFICER")) + .Where(x => (x.Profile.ProfileType == "employee" && x.Profile.EmployeeClass == "perm") || (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 == "PREM") || (x.Profile.ProfileType == "OFFICER")) + .Where(x => (x.Profile.ProfileType == "employee" && x.Profile.EmployeeClass == "perm") || (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 == "PREM") || (x.Profile.ProfileType == "OFFICER")) + .Where(x => (x.Profile.ProfileType == "employee" && x.Profile.EmployeeClass == "perm") || (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 == "PREM") || (x.Profile.ProfileType == "OFFICER")) + .Where(x => (x.Profile.ProfileType == "employee" && x.Profile.EmployeeClass == "perm") || (x.Profile.ProfileType == "officer")) .Select(x => x.PositionNumber.Id) .ToListAsync(); diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs index 796ea9bc..18595896 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs @@ -64,7 +64,7 @@ namespace BMA.EHR.Placement.Service.Controllers var placementAppointments = await _context.PlacementAppointments.AsQueryable() .OrderByDescending(x => x.CreatedAt) - .Where(x => x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeClass == "TEMP") + .Where(x => x.Profile.ProfileType == "employee" && x.Profile.EmployeeClass == "perm") .Select(p => new { p.Id, @@ -127,7 +127,7 @@ namespace BMA.EHR.Placement.Service.Controllers { var data = await _context.PlacementAppointments.AsQueryable() .Where(x => x.Id == id) - .Where(x => x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeClass == "TEMP") + .Where(x => x.Profile.ProfileType == "employee" && x.Profile.EmployeeClass == "perm") .Select(p => new { p.Id, @@ -246,7 +246,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 == "TEMP") + .Where(x => x.ProfileType == "employee" && x.EmployeeClass == "perm") .FirstOrDefaultAsync(x => x.Id == req.Id); if (profile == null) return Error(GlobalMessages.DataNotFound, 404); @@ -328,7 +328,7 @@ namespace BMA.EHR.Placement.Service.Controllers public async Task> UpdatePositionPlacementAppointment([FromBody] PersonSelectPositionAppointmentRequest req, Guid id) { var uppdated = await _context.PlacementAppointments - .Where(x => x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeClass == "TEMP") + .Where(x => x.Profile.ProfileType == "employee" && x.Profile.EmployeeClass == "perm") .FirstOrDefaultAsync(x => x.Id == id); if (uppdated == null) return Error(GlobalMessages.PlacementAppointmentNotFound, 404); @@ -408,7 +408,7 @@ namespace BMA.EHR.Placement.Service.Controllers public async Task> Put([FromBody] PlacementAppointmentEditRequest req, Guid id) { var uppdated = await _context.PlacementAppointments - .Where(x => x.Profile.ProfileType == "EMPLOYEE" && x.Profile.EmployeeClass == "TEMP") + .Where(x => x.Profile.ProfileType == "employee" && x.Profile.EmployeeClass == "perm") .FirstOrDefaultAsync(x => x.Id == id); if (uppdated == null) return Error(GlobalMessages.PlacementAppointmentNotFound, 404); @@ -491,7 +491,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 == "TEMP") + .Where(x => x.Profile.ProfileType == "employee" && x.Profile.EmployeeClass == "perm") .FirstOrDefaultAsync(x => x.Id == id); if (deleted == null) return NotFound(); @@ -528,7 +528,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 == "TEMP") + .Where(x => x.Profile.ProfileType == "employee" && x.Profile.EmployeeClass == "perm") .FirstOrDefaultAsync(x => x.Id == item); if (uppdated == null) continue; @@ -558,7 +558,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 == "TEMP") + .Where(x => x.Profile.ProfileType == "employee" && x.Profile.EmployeeClass == "perm") .Select(x => x.PositionNumber.Id) .ToListAsync();