This commit is contained in:
mmrbnjd
2024-05-09 23:55:22 +03:30
parent 5674b71052
commit 4349d6da09
7 changed files with 235 additions and 73 deletions

View File

@@ -5,6 +5,7 @@ using Shared.DTOs.Serch;
using Shared.DTOs;
using System.Xml.Linq;
using Back.Common;
using Back.Validations;
namespace Back.Controllers
{
@@ -14,10 +15,12 @@ namespace Back.Controllers
{
private readonly ServCOD _servCOD;
private readonly servUser _servUser;
public CODController(ServCOD servCOD, servUser servUser)
private readonly AddOrCodValidation _addorupdateCodValidation;
public CODController(ServCOD servCOD, servUser servUser, AddOrCodValidation addorupdateCodValidation)
{
_servCOD = servCOD;
_servUser = servUser;
_servUser = servUser;
_addorupdateCodValidation = addorupdateCodValidation;
}
[HttpPost("GetAll")]
public async Task<ActionResult<PagingDto<RCOD>?>> GetAll([FromBody] ItemSerchGetCOD itemSerch)
@@ -36,85 +39,69 @@ namespace Back.Controllers
[HttpPost("Add")]
public async Task<ActionResult<bool>> Add(RCOD item)
{
return Ok();
//var claim = HttpContext.User.Claims.First(c => c.Type == "UserID");
//var UserID = claim.Value;
//var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID));
var claim = HttpContext.User.Claims.First(c => c.Type == "UserID");
var UserID = claim.Value;
var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID));
//var resultValidationmodel = await _addorupdateCustomerValidation.ValidateAsync(Tuple.Create(user.RolUsers.First().CompanyID, item, eActionValidation.add));
//if (!resultValidationmodel.IsValid)
// return BadRequest(resultValidationmodel.Errors.Select(s => s.ErrorMessage).ToList());
var resultValidationmodel = await _addorupdateCodValidation.ValidateAsync(Tuple.Create(user.RolUsers.First().CompanyID, item, eActionValidation.add));
if (!resultValidationmodel.IsValid)
return BadRequest(resultValidationmodel.Errors.Select(s => s.ErrorMessage).ToList());
//return Ok(await _servCus.AddOrUpdateCustomer(new Data.Models.Customer
//{
// Address = item.Address,
// BranchID = item.BranchID,
// CompanyID = user.RolUsers.First().CompanyID,
// CustomerType = item.CustomerType,
// EconomicCode = item.EconomicCode,
// Email = item.Email,
// FullName = item.FullName,
// Info = item.Info,
// MeliCode = item.MeliCode,
// PassportNumber = item.PassportNumber,
// Phone = item.Phone,
// ZipCode = item.ZipCode,
// IsDeleted = false
//}));
return Ok(await _servCOD.AddOrUpdateCod(new Data.Models.CODItem
{
CompanyID = user.RolUsers.First().CompanyID,
TaxRate = item.TaxRate,
Title = item.Title,
UnitID=item.UnitID,
ItemTaxID=item.TaxID,
IsDeleted = false
}));
}
[HttpPut("Update")]
public async Task<ActionResult<bool>> Update(RCOD item)
{
return Ok();
////-----GetUserAndCompany
//var claim = HttpContext.User.Claims.First(c => c.Type == "UserID");
//var UserID = claim.Value;
//var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID));
//-----GetUserAndCompany
var claim = HttpContext.User.Claims.First(c => c.Type == "UserID");
var UserID = claim.Value;
var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID));
////-----Validaton
//var resultValidationmodel = await _addorupdateCustomerValidation.ValidateAsync(Tuple.Create(user.RolUsers.First().CompanyID, item, eActionValidation.update));
//if (!resultValidationmodel.IsValid)
// return BadRequest(resultValidationmodel.Errors.Select(s => s.ErrorMessage).ToList());
//-----Validaton
var resultValidationmodel = await _addorupdateCodValidation.ValidateAsync(Tuple.Create(user.RolUsers.First().CompanyID, item, eActionValidation.update));
if (!resultValidationmodel.IsValid)
return BadRequest(resultValidationmodel.Errors.Select(s => s.ErrorMessage).ToList());
////-----Get Cus
//var cus = await _servCus.GetCustomerByCustomerID(item.ID.Value, user.RolUsers.First().CompanyID);
//if (cus == null)
// return BadRequest(new List<string> { "Cus notFound..." });
//-----Get Cod
var Cod = await _servCOD.GetCodByCodID(item.ID.Value, user.RolUsers.First().CompanyID);
if (Cod == null)
return BadRequest(new List<string> { "Cod notFound..." });
////-----change Cus
//cus.Address = item.Address;
//cus.BranchID = item.BranchID;
//cus.CompanyID = user.RolUsers.First().CompanyID;
//cus.CustomerType = item.CustomerType;
//cus.EconomicCode = item.EconomicCode;
//cus.Email = item.Email;
//cus.FullName = item.FullName;
//cus.Info = item.Info;
//cus.MeliCode = item.MeliCode;
//cus.PassportNumber = item.PassportNumber;
//cus.Phone = item.Phone;
//cus.ZipCode = item.ZipCode;
//cus.IsDeleted = false;
////-----change Cod
Cod.TaxRate = item.TaxRate;
Cod.Title = item.Title;
Cod.UnitID = item.UnitID;
Cod.ItemTaxID = item.TaxID;
Cod.IsDeleted = false;
////----Update and sendResult
//return Ok(await _servCus.AddOrUpdateCustomer(cus));
//----Update and sendResult
return Ok(await _servCOD.AddOrUpdateCod(Cod));
}
[HttpDelete("Delete/{ID}")]
public async Task<ActionResult<bool>> Delete(int ID)
{
return Ok();
////-----GetUserAndCompany
//var claim = HttpContext.User.Claims.First(c => c.Type == "UserID");
//var UserID = claim.Value;
//var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID));
//-----GetUserAndCompany
var claim = HttpContext.User.Claims.First(c => c.Type == "UserID");
var UserID = claim.Value;
var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID));
////-----Get Cus
//var cus = await _servCus.GetCustomerByCustomerID(ID, user.RolUsers.First().CompanyID);
//if (cus == null)
// return NotFound();
//-----Get Cus
var cod = await _servCOD.GetCodByCodID(ID, user.RolUsers.First().CompanyID);
if (cod == null)
return NotFound();
////----Update and sendResult
//return Ok(await _servCus.DeleteCustomer(cus));
//----Update and sendResult
return Ok(await _servCOD.DeleteCod(cod));
}
}
}