diff --git a/ServiceHost/Areas/Client/Controllers/FineController.cs b/ServiceHost/Areas/Client/Controllers/FineController.cs index bdf60832..c06f90d7 100644 --- a/ServiceHost/Areas/Client/Controllers/FineController.cs +++ b/ServiceHost/Areas/Client/Controllers/FineController.cs @@ -1,5 +1,6 @@ using _0_Framework.Application; using CompanyManagment.App.Contracts.Fine; +using CompanyManagment.App.Contracts.FineSubject; using Microsoft.AspNetCore.Mvc; using ServiceHost.BaseControllers; @@ -8,15 +9,21 @@ namespace ServiceHost.Areas.Client.Controllers; public class FineController:ClientBaseController { private readonly IFineApplication _fineApplication; + private readonly IFineSubjectApplication _fineSubjectApplication; + private readonly long _workshopId; - public FineController(IFineApplication fineApplication) + public FineController(IFineApplication fineApplication, IFineSubjectApplication fineSubjectApplication, + IAuthHelper authHelper) { _fineApplication = fineApplication; + _fineSubjectApplication = fineSubjectApplication; + _workshopId = authHelper.GetWorkshopId(); } [HttpGet] public ActionResult GetList([FromQuery]FineSearchViewModel searchModel) { + searchModel.WorkshopId = _workshopId; var res = _fineApplication.GetSearchListAsGrouped(searchModel); return res; } @@ -24,6 +31,7 @@ public class FineController:ClientBaseController [HttpPost] public ActionResult Create([FromBody]CreateFineViewModel command) { + command.WorkshopId = _workshopId; var res =_fineApplication.Create(command); return res; } @@ -31,6 +39,7 @@ public class FineController:ClientBaseController [HttpPut] public ActionResult Edit([FromBody]EditFineViewModel command) { + command.WorkshopId = _workshopId; var res = _fineApplication.Edit(command); return res; } @@ -48,4 +57,37 @@ public class FineController:ClientBaseController var res = _fineApplication.Remove(id); return res; } + + #region FineSubject + + [HttpGet("subject")] + public ActionResult> GetList() + { + var res = _fineSubjectApplication.GetAll(_workshopId); + return res; + } + + [HttpPost("subject/{id:long}")] + public ActionResult CreateSubject(CreateFineSubjectViewModel command) + { + var res = _fineSubjectApplication.Create(command); + return res; + } + + [HttpPut("subject/{id:long}")] + public ActionResult EditSubject(EditFineSubjectViewModel command) + { + var res = _fineSubjectApplication.Edit(command); + return res; + } + + [HttpDelete("subject/{id:long}")] + public ActionResult RemoveSubject(long id) + { + var res = _fineSubjectApplication.Delete(id); + return res; + } + + #endregion + } \ No newline at end of file