Skip to content

Commit b026c70

Browse files
committed
Doing a bit of code cleanup.
1 parent e9b892a commit b026c70

3 files changed

Lines changed: 37 additions & 38 deletions

File tree

eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Controllers/TimePlanningPlanningController.cs

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,47 +18,46 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
1818
SOFTWARE.
1919
*/
2020

21-
namespace TimePlanning.Pn.Controllers
21+
namespace TimePlanning.Pn.Controllers;
22+
23+
using System.Collections.Generic;
24+
using System.Threading.Tasks;
25+
using Infrastructure.Models.Planning;
26+
using Microsoft.AspNetCore.Mvc;
27+
using Microting.eFormApi.BasePn.Infrastructure.Models.API;
28+
using Services.TimePlanningPlanningService;
29+
30+
[Route("api/time-planning-pn/plannings")]
31+
public class TimePlanningPlanningController(ITimePlanningPlanningService planningService) : Controller
2232
{
23-
using System.Collections.Generic;
24-
using System.Threading.Tasks;
25-
using Infrastructure.Models.Planning;
26-
using Microsoft.AspNetCore.Mvc;
27-
using Microting.eFormApi.BasePn.Infrastructure.Models.API;
28-
using Services.TimePlanningPlanningService;
33+
private readonly ITimePlanningPlanningService _planningService = planningService;
2934

30-
[Route("api/time-planning-pn/plannings")]
31-
public class TimePlanningPlanningController(ITimePlanningPlanningService planningService) : Controller
35+
[HttpPost]
36+
[Route("index")]
37+
public async Task<OperationDataResult<List<TimePlanningPlanningModel>>> Index(
38+
[FromBody] TimePlanningPlanningRequestModel model)
3239
{
33-
private readonly ITimePlanningPlanningService _planningService = planningService;
34-
35-
[HttpPost]
36-
[Route("index")]
37-
public async Task<OperationDataResult<List<TimePlanningPlanningModel>>> Index(
38-
[FromBody] TimePlanningPlanningRequestModel model)
39-
{
40-
return await _planningService.Index(model);
41-
}
40+
return await _planningService.Index(model);
41+
}
4242

43-
[HttpPut]
44-
[Route("{id}")]
45-
public async Task<OperationResult> Update(int id, [FromBody] TimePlanningPlanningPrDayModel model)
46-
{
47-
return await _planningService.Update(id, model);
48-
}
43+
[HttpPut]
44+
[Route("{id}")]
45+
public async Task<OperationResult> Update(int id, [FromBody] TimePlanningPlanningPrDayModel model)
46+
{
47+
return await _planningService.Update(id, model);
48+
}
4949

50-
[HttpPut]
51-
[Route("update-by-current-user")]
52-
public async Task<OperationResult> UpdateByCurrentUserNam([FromBody] TimePlanningPlanningPrDayModel model)
53-
{
54-
return await _planningService.UpdateByCurrentUserNam(model);
55-
}
50+
[HttpPut]
51+
[Route("update-by-current-user")]
52+
public async Task<OperationResult> UpdateByCurrentUserNam([FromBody] TimePlanningPlanningPrDayModel model)
53+
{
54+
return await _planningService.UpdateByCurrentUserNam(model);
55+
}
5656

57-
[HttpGet]
58-
[Route("get-by-user")]
59-
public async Task<OperationDataResult<TimePlanningPlanningModel>> IndexByCurrentUserNam(TimePlanningPlanningRequestModel obj, string? softwareVersion, string? model, string? manufacturer, string? osVersion)
60-
{
61-
return await _planningService.IndexByCurrentUserNam(obj, softwareVersion, model, manufacturer, osVersion);
62-
}
57+
[HttpGet]
58+
[Route("get-by-user")]
59+
public async Task<OperationDataResult<TimePlanningPlanningModel>> IndexByCurrentUserNam(TimePlanningPlanningRequestModel obj, string? softwareVersion, string? model, string? manufacturer, string? osVersion)
60+
{
61+
return await _planningService.IndexByCurrentUserName(obj, softwareVersion, model, manufacturer, osVersion);
6362
}
6463
}

eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Services/TimePlanningPlanningService/ITimePlanningPlanningService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public interface ITimePlanningPlanningService
3535
//
3636
// Task<OperationResult> UpdateCreatePlanning(TimePlanningPlanningUpdateModel model);
3737
Task<OperationResult> Update(int id, TimePlanningPlanningPrDayModel model);
38-
Task<OperationDataResult<TimePlanningPlanningModel>> IndexByCurrentUserNam(TimePlanningPlanningRequestModel obj, string? softwareVersion, string? model, string? manufacturer, string? osVersion);
38+
Task<OperationDataResult<TimePlanningPlanningModel>> IndexByCurrentUserName(TimePlanningPlanningRequestModel obj, string? softwareVersion, string? model, string? manufacturer, string? osVersion);
3939

4040
Task<OperationResult> UpdateByCurrentUserNam(TimePlanningPlanningPrDayModel model);
4141
}

eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Services/TimePlanningPlanningService/TimePlanningPlanningService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ await dbContext.PlanRegistrations.AsNoTracking()
203203
}
204204
}
205205

206-
public async Task<OperationDataResult<TimePlanningPlanningModel>> IndexByCurrentUserNam(
206+
public async Task<OperationDataResult<TimePlanningPlanningModel>> IndexByCurrentUserName(
207207
TimePlanningPlanningRequestModel obj, string? softwareVersion, string? model, string? manufacturer, string? osVersion)
208208
{
209209
var sdkCore = await core.GetCore();

0 commit comments

Comments
 (0)