admin/Backend-Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: comment out unused methods and clean up repository interfaces

Browse Source
This commit is contained in:
mahan
2025-12-30 11:37:33 +03:30
parent 836e721b6f
commit 12318a6a51
7 changed files with 44 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AccountManagement.Application.Contracts/Account/IAccountApplication.cs
View File

@@ -34,7 +34,7 @@ public interface IAccountApplication
OperationResult DeActive(long id);
OperationResult DirectLogin(long id);
AccountLeftWorkViewModel WorkshopList(long accountId);
// AccountLeftWorkViewModel WorkshopList(long accountId);
OperationResult SaveWorkshopAccount(
List<WorkshopAccountlistViewModel> workshopAccountList,
string startDate,

38
AccountManagement.Application/AccountApplication.cs
View File

@@ -745,25 +745,25 @@ public class AccountApplication : IAccountApplication
}
public AccountLeftWorkViewModel WorkshopList(long accountId)
{
string fullname = this._accountRepository.GetById(accountId).Fullname;
List<WorkshopAccountlistViewModel> source = _accountLeftworkRepository.WorkshopList(accountId);
List<long> userWorkshopIds = source.Select(x => x.WorkshopId).ToList();
List<WorkshopSelectList> allWorkshops = this._accountLeftworkRepository.GetAllWorkshops();
List<AccountViewModel> accountSelectList = this._accountRepository.GetAdminAccountSelectList();
(string StartWorkFa, string LeftWorkFa) byAccountId = this._accountLeftworkRepository.GetByAccountId(accountId);
return new AccountLeftWorkViewModel()
{
AccountId = accountId,
AccountFullName = fullname,
StartDateFa = byAccountId.StartWorkFa,
LeftDateFa = byAccountId.LeftWorkFa,
WorkshopAccountlist = source,
WorkshopSelectList = new SelectList(allWorkshops.Where(x => !userWorkshopIds.Contains(x.Id)), "Id", "WorkshopFullName"),
AccountSelectList = new SelectList(accountSelectList, "Id", "Fullname")
};
}
// public AccountLeftWorkViewModel WorkshopList(long accountId)
// {
// string fullname = this._accountRepository.GetById(accountId).Fullname;
// List<WorkshopAccountlistViewModel> source = _accountLeftworkRepository.WorkshopList(accountId);
// List<long> userWorkshopIds = source.Select(x => x.WorkshopId).ToList();
// List<WorkshopSelectList> allWorkshops = this._accountLeftworkRepository.GetAllWorkshops();
// List<AccountViewModel> accountSelectList = this._accountRepository.GetAdminAccountSelectList();
// (string StartWorkFa, string LeftWorkFa) byAccountId = this._accountLeftworkRepository.GetByAccountId(accountId);
// return new AccountLeftWorkViewModel()
// {
// AccountId = accountId,
// AccountFullName = fullname,
// StartDateFa = byAccountId.StartWorkFa,
// LeftDateFa = byAccountId.LeftWorkFa,
// WorkshopAccountlist = source,
// WorkshopSelectList = new SelectList(allWorkshops.Where(x => !userWorkshopIds.Contains(x.Id)), "Id", "WorkshopFullName"),
// AccountSelectList = new SelectList(accountSelectList, "Id", "Fullname")
// };
// }
public OperationResult SaveWorkshopAccount(
List<WorkshopAccountlistViewModel> workshopAccountList,

2
AccountManagement.Domain/AccountLeftWorkAgg/IAccountLeftworkRepository.cs
View File

@@ -10,7 +10,7 @@ public interface IAccountLeftworkRepository : IRepository<long, AccountLeftWork>
{
(string StartWorkFa, string LeftWorkFa) GetByAccountId(long accountId);
List<WorkshopAccountlistViewModel> WorkshopList(long accountId);
List<WorkshopSelectList> GetAllWorkshops();
// List<WorkshopSelectList> GetAllWorkshops();
OperationResult CopyWorkshopToNewAccount(long currentAccountId, long newAccountId);

23
AccountMangement.Infrastructure.EFCore/Repository/AccountLeftworkRepository.cs
View File

@@ -18,14 +18,13 @@ public class AccountLeftworkRepository : RepositoryBase<long, AccountLeftWork>,
{
private readonly AccountContext _accountContext;
private readonly IWorkshopAccountRepository _workshopAccountRepository;
private readonly IWorkshopApplication _workshopApplication;
public AccountLeftworkRepository(AccountContext accountContext, IWorkshopAccountRepository workshopAccountRepository, IWorkshopApplication workshopApplication) : base(accountContext)
public AccountLeftworkRepository(AccountContext accountContext,
IWorkshopAccountRepository workshopAccountRepository) : base(accountContext)
{
_accountContext = accountContext;
_workshopAccountRepository = workshopAccountRepository;
_workshopApplication = workshopApplication;
}
}
public (string StartWorkFa, string LeftWorkFa) GetByAccountId(long accountId)
{
@@ -58,14 +57,14 @@ public class AccountLeftworkRepository : RepositoryBase<long, AccountLeftWork>,
}).ToList();
}
public List<WorkshopSelectList> GetAllWorkshops()
{
return this._workshopApplication.GetWorkshopAll().Select(x => new WorkshopSelectList()
{
Id = x.Id,
WorkshopFullName = x.WorkshopFullName
}).ToList();
}
// public List<WorkshopSelectList> GetAllWorkshops()
// {
// return this._workshopApplication.GetWorkshopAll().Select(x => new WorkshopSelectList()
// {
// Id = x.Id,
// WorkshopFullName = x.WorkshopFullName
// }).ToList();
// }
public OperationResult CopyWorkshopToNewAccount(long currentAccountId, long newAccountId)
{

8
ServiceHost/Areas/Admin/Pages/Accounts/Account/Index.cshtml
View File

@@ -268,10 +268,10 @@
href="#showmodal=@Url.Page("./Index", "Edit", new { Id = item.Id })">
<i class="fa fa-edit faSize"></i>
</a>
<a class="btn btn-success pull-right m-rl-5 red"
href="#showmodal=@Url.Page("./Index", "AccountWorkshop", new { item.Id })">
<i class="fa fa-edit faSize"></i>
</a>
@* <a class="btn btn-success pull-right m-rl-5 red" *@
@* href="#showmodal=@Url.Page("./Index", "AccountWorkshop", new { item.Id })"> *@
@* <i class="fa fa-edit faSize"></i> *@
@* </a> *@
@if (item.IsActiveString == "true" && item.Role != "مدیر سیستم")
{
<a onclick="deActive(@item.Id,'@item.Fullname')" class="btn btn-danger pull-right m-rl-5 red"> <i class="fa faSize fa-trash"></i></a>

16
ServiceHost/Areas/Admin/Pages/Accounts/Account/Index.cshtml.cs
View File

@@ -316,14 +316,14 @@ public class IndexModel : PageModel
});
}
public IActionResult OnGetAccountWorkshop(long id)
{
var res = _accountApplication.WorkshopList(id);
return Partial("AccountLeftWork", res);
}
// public IActionResult OnGetAccountWorkshop(long id)
// {
// var res = _accountApplication.WorkshopList(id);
//
//
//
// return Partial("AccountLeftWork", res);
// }
public IActionResult OnPostCreateAccountLeftWork(
List<WorkshopAccountlistViewModel> workshopAccountlistViewModel,

1
ServiceHost/Program.cs
View File

@@ -415,7 +415,6 @@ if (app.Environment.IsDevelopment())
}
#endregion
//Create Http Pipeline
#region Create Http Pipeline