forked from MDCPS/DamageAssessment_Backend
Merged new dev changes
This commit is contained in:
@ -19,7 +19,7 @@ namespace DamageAssesment.Api.Employees.Providers
|
||||
this.EmployeeDbContext = EmployeeDbContext;
|
||||
this.logger = logger;
|
||||
this.mapper = mapper;
|
||||
SeedData();
|
||||
// SeedData();
|
||||
}
|
||||
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.Employee> Employees, string ErrorMessage)> GetEmployeesAsync()
|
||||
@ -45,12 +45,12 @@ namespace DamageAssesment.Api.Employees.Providers
|
||||
|
||||
}
|
||||
|
||||
public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> GetEmployeeByIdAsync(string Id)
|
||||
public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> GetEmployeeByIdAsync(int Id)
|
||||
{
|
||||
try
|
||||
{
|
||||
logger?.LogInformation("Query Employee");
|
||||
var Employee = await EmployeeDbContext.Employees.AsNoTracking().FirstOrDefaultAsync(q => q.Id.ToLower() == Id.ToLower());
|
||||
var Employee = await EmployeeDbContext.Employees.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id);
|
||||
if (Employee != null)
|
||||
{
|
||||
logger?.LogInformation($"{Employee} customer(s) found");
|
||||
@ -65,19 +65,21 @@ namespace DamageAssesment.Api.Employees.Providers
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> PostEmployeeAsync(Db.Employee Employee)
|
||||
public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> PostEmployeeAsync(Models.Employee Employee)
|
||||
{
|
||||
try
|
||||
{
|
||||
Db.Employee _employee = mapper.Map<Models.Employee, Db.Employee>(Employee);
|
||||
|
||||
logger?.LogInformation("Query Employee");
|
||||
if (!EmployeeExists(Employee.Id))
|
||||
if (!EmployeeCodeExists(Employee.EmployeeCode))
|
||||
{
|
||||
EmployeeDbContext.Employees.Add(Employee);
|
||||
EmployeeDbContext.Employees.Add(_employee);
|
||||
Employee.Id = _employee.Id;
|
||||
EmployeeDbContext.SaveChanges();
|
||||
var result = mapper.Map<Db.Employee, Models.Employee>(Employee);
|
||||
return (true, result, null);
|
||||
return (true, Employee, null);
|
||||
}
|
||||
return (false, null, "Employee is already exits");
|
||||
return (false, null, "Employee code is already exits");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@ -85,19 +87,21 @@ namespace DamageAssesment.Api.Employees.Providers
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> UpdateEmployeeAsync(Db.Employee Employee)
|
||||
public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> UpdateEmployeeAsync(int Id, Models.Employee Employee)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (Employee != null)
|
||||
{
|
||||
var _employee = await EmployeeDbContext.Employees.AsNoTracking().Where(s => s.Id.ToLower() == Employee.Id.ToLower()).FirstOrDefaultAsync();
|
||||
var _employee = await EmployeeDbContext.Employees.AsNoTracking().Where(s => s.Id == Id).FirstOrDefaultAsync();
|
||||
|
||||
if (_employee != null)
|
||||
{
|
||||
EmployeeDbContext.Employees.Update(Employee);
|
||||
Db.Employee vEmployee = mapper.Map<Models.Employee, Db.Employee>(Employee);
|
||||
EmployeeDbContext.Employees.Update(vEmployee);
|
||||
EmployeeDbContext.SaveChanges();
|
||||
return (true, mapper.Map<Db.Employee, Models.Employee>(Employee), "Successful");
|
||||
Employee.Id = Id;
|
||||
return (true, Employee, "Successful");
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -118,11 +122,11 @@ namespace DamageAssesment.Api.Employees.Providers
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> DeleteEmployeeAsync(string Id)
|
||||
public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> DeleteEmployeeAsync(int Id)
|
||||
{
|
||||
try
|
||||
{
|
||||
Db.Employee Employee = EmployeeDbContext.Employees.AsNoTracking().Where(a => a.Id.ToLower() == Id.ToLower()).FirstOrDefault();
|
||||
Db.Employee Employee = EmployeeDbContext.Employees.AsNoTracking().Where(a => a.Id == Id).FirstOrDefault();
|
||||
if (Employee == null)
|
||||
{
|
||||
return (false, null, "Not Found");
|
||||
@ -135,24 +139,29 @@ namespace DamageAssesment.Api.Employees.Providers
|
||||
{
|
||||
|
||||
logger?.LogError(ex.ToString());
|
||||
return (false,null, ex.Message);
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
private bool EmployeeExists(string id)
|
||||
private bool EmployeeExists(int id)
|
||||
{
|
||||
return EmployeeDbContext.Employees.AsNoTracking().Count(e => e.Id.ToLower() == id.ToLower()) > 0;
|
||||
return EmployeeDbContext.Employees.AsNoTracking().Count(e => e.Id == id) > 0;
|
||||
}
|
||||
|
||||
private void SeedData()
|
||||
private bool EmployeeCodeExists(string employeeCode)
|
||||
{
|
||||
return EmployeeDbContext.Employees.AsNoTracking().Count(e => e.EmployeeCode.ToLower() == employeeCode.ToLower()) > 0;
|
||||
}
|
||||
|
||||
public void SeedData()
|
||||
{
|
||||
if (!EmployeeDbContext.Employees.Any())
|
||||
{
|
||||
EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp1", Name = "ABC1", Email = "abc1@gmail.com", OfficePhoneNumber = "12345678",BirthDate=DateTime.Now.AddYears(-18), IsActive = true,PreferredLanguage="en" });
|
||||
EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp2", Name = "ABC2", Email = "abc2@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-22), IsActive = true, PreferredLanguage = "fr" });
|
||||
EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp3", Name = "ABC3", Email = "abc3@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-30) ,IsActive = true, PreferredLanguage = "fr" });
|
||||
EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp4", Name = "ABC4", Email = "abc4@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-20) ,IsActive = true, PreferredLanguage = "en" });
|
||||
EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp5", Name = "ABC5", Email = "abc5@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-23) ,IsActive = true, PreferredLanguage = "sp" });
|
||||
EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp6", Name = "ABC6", Email = "abc6@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-32) ,IsActive = true, PreferredLanguage = "sp" });
|
||||
EmployeeDbContext.Employees.Add(new Db.Employee() { EmployeeCode = "Emp1", Name = "ABC1", Email = "abc1@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18), IsActive = true, PreferredLanguage = "en" });
|
||||
EmployeeDbContext.Employees.Add(new Db.Employee() { EmployeeCode = "Emp2", Name = "ABC2", Email = "abc2@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-22), IsActive = true, PreferredLanguage = "fr" });
|
||||
EmployeeDbContext.Employees.Add(new Db.Employee() { EmployeeCode = "Emp3", Name = "ABC3", Email = "abc3@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-30), IsActive = true, PreferredLanguage = "fr" });
|
||||
EmployeeDbContext.Employees.Add(new Db.Employee() { EmployeeCode = "Emp4", Name = "ABC4", Email = "abc4@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-20), IsActive = true, PreferredLanguage = "en" });
|
||||
EmployeeDbContext.Employees.Add(new Db.Employee() { EmployeeCode = "Emp5", Name = "ABC5", Email = "abc5@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-23), IsActive = true, PreferredLanguage = "es" });
|
||||
EmployeeDbContext.Employees.Add(new Db.Employee() { EmployeeCode = "Emp6", Name = "ABC6", Email = "abc6@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-32), IsActive = true, PreferredLanguage = "es" });
|
||||
EmployeeDbContext.SaveChanges();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user