mmr/moadiran
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cus end

Browse Source
This commit is contained in:
mmrbnjd
2024-05-08 17:25:02 +03:30
parent d74f3dadf3
commit 716f02baa1
14 changed files with 376 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Back/Back.csproj
View File

@@ -6,6 +6,13 @@
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Common\DTOs\**" />
<Content Remove="Common\DTOs\**" />
<EmbeddedResource Remove="Common\DTOs\**" />
<None Remove="Common\DTOs\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Melipayamak.RestClient" Version="1.0.0" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
@@ -24,10 +31,6 @@
</PackageReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Common\DTOs\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Shared\Shared.csproj" />
</ItemGroup>

8
Back/Common/eActionValidation.cs Normal file
View File

@@ -0,0 +1,8 @@
namespace Back.Common
{
public enum eActionValidation
{
add,
update
}
}

72
Back/Controllers/CustomerController.cs
View File

@@ -1,8 +1,12 @@
using Back.Services;
using Back.Common;
using Back.Services;
using Back.Validations;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Service;
using Shared.DTOs;
using System.Net;
using System.Reflection.Emit;
namespace Back.Controllers
{
@@ -14,11 +18,11 @@ namespace Back.Controllers
private readonly CheckPermission _checkPermission;
private readonly servUser _servUser;
private readonly servCustomer _servCus;
private readonly AddCustomerValidation _addCustomerValidation;
private readonly AddOrCustomerValidation _addorupdateCustomerValidation;
public CustomerController(CheckPermission checkPermission, servUser servUser
, servCustomer servCus, AddCustomerValidation addCustomerValidation)
, servCustomer servCus, AddOrCustomerValidation addorupdateCustomerValidation)
{
_addCustomerValidation = addCustomerValidation;
_addorupdateCustomerValidation = addorupdateCustomerValidation;
_checkPermission = checkPermission;
_servUser = servUser;
_servCus = servCus;
@@ -30,7 +34,7 @@ namespace Back.Controllers
var UserID = claim.Value;
var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID));
if (!await _checkPermission.AllowSYSGetCustomer(Convert.ToInt32(UserID), user.RolUsers.First().CompanyID)) return Forbid( "شما دسترسی به خواندن اطلاعات مشتری را نداربد");
if (!await _checkPermission.AllowSYSGetCustomer(Convert.ToInt32(UserID), user.RolUsers.First().CompanyID)) return Forbid("شما دسترسی به خواندن اطلاعات مشتری را نداربد");
return Ok(await _servCus.GetCustomers(user.RolUsers.First().CompanyID, itemSerch));
@@ -43,11 +47,11 @@ namespace Back.Controllers
var UserID = claim.Value;
var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID));
var resultValidationmodel = await _addCustomerValidation.ValidateAsync(Tuple.Create(user.RolUsers.First().CompanyID,item));
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());
return Ok(_servCus.AddCustomer(new Data.Models.Customer
return Ok(await _servCus.AddOrUpdateCustomer(new Data.Models.Customer
{
Address = item.Address,
BranchID = item.BranchID,
@@ -62,7 +66,59 @@ namespace Back.Controllers
Phone = item.Phone,
ZipCode = item.ZipCode,
IsDeleted = false
})) ;
}));
}
[HttpPut("Update")]
public async Task<ActionResult<bool>> Update(RCustomer item)
{
//-----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());
//-----Get Cus
var cus = await _servCus.GetCustomerByCustomerID(item.ID.Value, user.RolUsers.First().CompanyID);
if (cus == null)
return BadRequest(new List<string> { "Cus 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;
//----Update and sendResult
return Ok(await _servCus.AddOrUpdateCustomer(cus));
}
[HttpDelete("Delete/{ID}")]
public async Task<ActionResult<bool>> Delete(int ID)
{
//-----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();
//----Update and sendResult
return Ok(await _servCus.DeleteCustomer(cus));
}
}
}

2
Back/Program.cs
View File

@@ -39,7 +39,7 @@ builder.Services.AddScoped<servUser>();
builder.Services.AddScoped<servTaxPayer>();
builder.Services.AddScoped<servCustomer>();
builder.Services.AddScoped<CompanyRegistrationValidation>();
builder.Services.AddScoped<AddCustomerValidation>();
builder.Services.AddScoped<AddOrCustomerValidation>();
builder.Services.AddScoped(c => new mpNuget.RestClient("09119660045", "C54S2"));
string origins = "OriginTaxPayer";

91
Back/Services/servCustomer.cs
View File

@@ -58,24 +58,24 @@ namespace Back.Services
PassportNumber = s.PassportNumber,
CustomerType= s.CustomerType
// CompanyID=s.CompanyID
})
}).OrderByDescending(o=>o.ID)
.Paging(itemSerch.PageIndex, itemSerch.PageSize);
}
//public async Task<Customer> GetCustomerByCustomerID(int CustomerID, int CompanyID)
//{
// return await _repositores.GET<Customer>()
// .Where(w => w.ID == CustomerID && w.CompanyID==CompanyID && !w.IsDeleted).FirstOrDefaultAsync();
//}
public async Task<Customer?> GetCustomerByCustomerID(int CustomerID, int CompanyID)
{
return await _repoCus
.Get(w => w.ID == CustomerID && w.CompanyID == CompanyID && !w.IsDeleted).FirstOrDefaultAsync();
}
//public async Task<Customer> GetCustomerByCustomerID(int CustomerID)
//{
// return await _repositores.GET<Customer>()
// .Where(w => w.ID == CustomerID && !w.IsDeleted).FirstOrDefaultAsync();
//}
//public async Task<bool> ExistCustomerByCustomerID(int CustomerID, int CompanyID)
//{
// return await _repositores.GET<Customer>()
// .AnyAsync(w => w.ID == CustomerID && w.CompanyID == CompanyID && !w.IsDeleted);
//}
public async Task<bool> ExistCustomerByCustomerID(int CustomerID, int CompanyID)
{
return await _repoCus
.Get(w => w.ID == CustomerID && w.CompanyID == CompanyID && !w.IsDeleted).AnyAsync();
}
//public async Task<CUCustomer> GetCustomerByCustomerIDByDTO(int CustomerID)
//{
// return await _repositores.GET<Customer>()
@@ -98,7 +98,7 @@ namespace Back.Services
// })
// .FirstOrDefaultAsync();
//}
public async Task<bool> AddCustomer(Customer item)
public async Task<bool> AddOrUpdateCustomer(Customer item)
{
try
{
@@ -113,7 +113,7 @@ namespace Back.Services
//};
//_contextMongodb.InsertItem(log);
if (item.ID == null || item.ID == 0)
if (item.ID == null || item.ID <= 0)
{
var ret = await _repoCus.AddBoolResultAsync(item);
await _checkPermission.ExtensionofAccess(item.CompanyID, 5, "-1");
@@ -140,41 +140,40 @@ namespace Back.Services
}
}
//public async Task<bool> DeleteCustomer(Customer item)
//{
public async Task<bool> DeleteCustomer(Customer item)
{
// try
// {
// item.IsDeleted = true;
// _repositores.UPDATE(item);
// SysLog log = new SysLog()
// {
// TraceIdentifierID = _httpContextAccessor.HttpContext.TraceIdentifier,
// Datetime = DateTime.Now.ConvertMiladiToShamsi(),
// Method = $"{_httpContextAccessor.HttpContext.Request.Method}/{this.GetType().FullName}/DeleteCustomer",
// Value = JsonConvert.SerializeObject(item.ID),
// Route = _httpContextAccessor.HttpContext.Request.Path,
// Type = "User"
// };
// _contextMongodb.InsertItem(log);
// return true;
// }
// catch (Exception ex)
// {
// SysLog log = new SysLog()
// {
// TraceIdentifierID = _httpContextAccessor.HttpContext.TraceIdentifier,
// Datetime = DateTime.Now.ConvertMiladiToShamsi(),
// Method = $"{_httpContextAccessor.HttpContext.Request.Method}/{this.GetType().FullName}/DeleteCustomer",
// Value = ex.Message,
// Route = _httpContextAccessor.HttpContext.Request.Path,
// Type = "catch"
// };
// _contextMongodb.InsertItem(log);
// return false;
try
{
item.IsDeleted = true;
return await _repoCus.UpdateAsync(item);
//SysLog log = new SysLog()
//{
// TraceIdentifierID = _httpContextAccessor.HttpContext.TraceIdentifier,
// Datetime = DateTime.Now.ConvertMiladiToShamsi(),
// Method = $"{_httpContextAccessor.HttpContext.Request.Method}/{this.GetType().FullName}/DeleteCustomer",
// Value = JsonConvert.SerializeObject(item.ID),
// Route = _httpContextAccessor.HttpContext.Request.Path,
// Type = "User"
//};
//_contextMongodb.InsertItem(log);
}
catch (Exception ex)
{
//SysLog log = new SysLog()
//{
// TraceIdentifierID = _httpContextAccessor.HttpContext.TraceIdentifier,
// Datetime = DateTime.Now.ConvertMiladiToShamsi(),
// Method = $"{_httpContextAccessor.HttpContext.Request.Method}/{this.GetType().FullName}/DeleteCustomer",
// Value = ex.Message,
// Route = _httpContextAccessor.HttpContext.Request.Path,
// Type = "catch"
//};
//_contextMongodb.InsertItem(log);
return false;
// }
//}
}
}
}

61
Back/Validations/AddCustomerValidation.cs
View File

@@ -1,61 +0,0 @@
using Back.Services;
using FluentValidation;
using Shared.DTOs;
namespace Back.Validations
{
public class AddCustomerValidation : AbstractValidator<Tuple<int, RCustomer>>
{
public AddCustomerValidation(CheckPermission _checkPermission)
{
CascadeMode = CascadeMode.Stop;
RuleFor(r => r.Item1)
.Custom((CompanyID, context) => {
if (! _checkPermission.AllowAddCustomerInCompany(CompanyID).Result)
context.AddFailure("اضافه کردن مشتری محدود شده است");
});
RuleFor(r => r.Item2.FullName)
.NotNull().WithMessage("نام نمی تواند خالی باشذ")
.NotEmpty().WithMessage("نام نمی تواند خالی باشذ")
.MinimumLength(5).WithMessage("حداقل کارکتر مجار نام 5 می باشد");
RuleFor(r => r.Item2.Phone)
.NotNull().WithMessage("تلفن نمی تواند خالی باشذ")
.NotEmpty().WithMessage("تلفن نمی تواند خالی باشذ")
.MinimumLength(8).WithMessage("حداقل کارکتر مجار تلفن 8 می باشد");
RuleFor(r => r.Item2.Email)
.Custom((model, context) => {
if (!string.IsNullOrEmpty(model) && (!model.Contains("@") || !model.Contains(".")))
context.AddFailure("فرمت پست الکترونیک صحبح نمی باشد");
});
RuleFor(r => r.Item2.EconomicCode)
.Custom((model, context) => {
if (!string.IsNullOrEmpty(model) && (model.Length<11 || model.Length > 14))
context.AddFailure("تعداد شماره اقتصادی صحبح نمی باشد");
});
RuleFor(r => r.Item2.BranchID)
.Custom((model, context) => {
if (!string.IsNullOrEmpty(model) && (model.Length > 10 ))
context.AddFailure("تعداد کد شعبه صحبح نمی باشد");
});
RuleFor(r => r.Item2.ZipCode)
.Custom((model, context) => {
if (!string.IsNullOrEmpty(model) && (model.Length !=10))
context.AddFailure("تعداد کد پستی صحبح نمی باشد");
});
RuleFor(r => r.Item2.MeliCode)
.Custom((model, context) => {
if (!string.IsNullOrEmpty(model) && (model.Length < 10 || model.Length > 12))
context.AddFailure("تعداد شناسه ملی صحبح نمی باشد");
});
RuleFor(r => r.Item2.PassportNumber)
.Custom((model, context) => {
if (!string.IsNullOrEmpty(model) && (model.Length!=9))
context.AddFailure("تعداد شماره گذرنامه صحبح نمی باشد");
});
}
}
}

97
Back/Validations/AddOrCustomerValidation.cs Normal file
View File

@@ -0,0 +1,97 @@
using Back.Common;
using Back.Services;
using FluentValidation;
using Shared.DTOs;
namespace Back.Validations
{
public class AddOrCustomerValidation : AbstractValidator<Tuple<int, RCustomer, eActionValidation>>
{
public AddOrCustomerValidation(CheckPermission _checkPermission, servCustomer servCustomer)
{
CascadeMode = CascadeMode.Stop;
When(r => r.Item3 == eActionValidation.add, () =>
{
RuleFor(r => r.Item1)
.Custom((CompanyID, context) =>
{
if (!_checkPermission.AllowAddCustomerInCompany(CompanyID).Result)
context.AddFailure("اضافه کردن مشتری محدود شده است");
});
});
When(r => r.Item3 == eActionValidation.update, () =>
{
RuleFor(r => r)
.Custom((model, context) =>
{
var companyid = model.Item1;
if (!model.Item2.ID.HasValue || model.Item2.ID <= 0)
context.AddFailure("شناسه مشتری نمی تواند خالی باشذ");
else
{
var customerid = model.Item2.ID.Value;
if (!servCustomer.ExistCustomerByCustomerID(customerid, companyid).Result)
context.AddFailure("مشتری با این شناسه یافت نشد");
}
});
});
RuleFor(r => r.Item2.FullName)
.NotNull().WithMessage("نام نمی تواند خالی باشذ")
.NotEmpty().WithMessage("نام نمی تواند خالی باشذ")
.MinimumLength(5).WithMessage("حداقل کارکتر مجار نام 5 می باشد");
RuleFor(r => r.Item2.Phone)
.Custom((model, context) =>
{
if (!string.IsNullOrEmpty(model) && model.Length <8)
context.AddFailure("حداقل کارکتر مجار تلفن 8 می باشد");
});
RuleFor(r => r.Item2.Email)
.Custom((model, context) =>
{
if (!string.IsNullOrEmpty(model) && (!model.Contains("@") || !model.Contains(".")))
context.AddFailure("فرمت پست الکترونیک صحبح نمی باشد");
});
RuleFor(r => r.Item2.EconomicCode)
.Custom((model, context) =>
{
if (!string.IsNullOrEmpty(model) && (model.Length < 11 || model.Length > 14))
context.AddFailure("تعداد کارکتر شماره اقتصادی صحبح نمی باشد");
});
RuleFor(r => r.Item2.BranchID)
.Custom((model, context) =>
{
if (!string.IsNullOrEmpty(model) && (model.Length > 10))
context.AddFailure("تعداد کارکتر کد شعبه صحبح نمی باشد");
});
RuleFor(r => r.Item2.ZipCode)
.Custom((model, context) =>
{
if (!string.IsNullOrEmpty(model) && (model.Length != 10))
context.AddFailure("تعداد کارکتر کد پستی صحبح نمی باشد");
});
RuleFor(r => r.Item2.MeliCode)
.Custom((model, context) =>
{
if (!string.IsNullOrEmpty(model) && (model.Length < 10 || model.Length > 12))
context.AddFailure("تعداد کارکتر شناسه ملی صحبح نمی باشد");
});
RuleFor(r => r.Item2.PassportNumber)
.Custom((model, context) =>
{
if (!string.IsNullOrEmpty(model) && (model.Length != 9))
context.AddFailure("تعداد کارکتر شماره گذرنامه صحبح نمی باشد");
});
RuleFor(r => r.Item2.Info)
.Custom((model, context) =>
{
if (!string.IsNullOrEmpty(model) && model.Length > 50)
context.AddFailure("تعداد کارکتر توضیحات بیش از 50 می باشد");
});
}
}
}