Skip to content

Commit 20b9a74

Browse files
renemadsenrenemadsen
committed
Code cleanup.
1 parent 58b6f0b commit 20b9a74

29 files changed

Lines changed: 2068 additions & 2154 deletions

‎eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Controllers/TimePlanningFlexController.cs‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,37 +18,36 @@ 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.Flex.Index;
26+
using Infrastructure.Models.Flex.Update;
27+
using Microsoft.AspNetCore.Mvc;
28+
using Microting.eFormApi.BasePn.Infrastructure.Models.API;
29+
using Services.TimePlanningFlexService;
30+
31+
[Route("api/time-planning-pn/flex")]
32+
public class TimePlanningFlexController
2233
{
23-
using System.Collections.Generic;
24-
using System.Threading.Tasks;
25-
using Infrastructure.Models.Flex.Index;
26-
using Infrastructure.Models.Flex.Update;
27-
using Microsoft.AspNetCore.Mvc;
28-
using Microting.eFormApi.BasePn.Infrastructure.Models.API;
29-
using Services.TimePlanningFlexService;
34+
private readonly ITimePlanningFlexService _flexService;
3035

31-
[Route("api/time-planning-pn/flex")]
32-
public class TimePlanningFlexController
36+
public TimePlanningFlexController(ITimePlanningFlexService flexService)
3337
{
34-
private readonly ITimePlanningFlexService _flexService;
35-
36-
public TimePlanningFlexController(ITimePlanningFlexService flexService)
37-
{
38-
_flexService = flexService;
39-
}
38+
_flexService = flexService;
39+
}
4040

41-
[HttpGet]
42-
[Route("index")]
43-
public async Task<OperationDataResult<List<TimePlanningFlexIndexModel>>> Index()
44-
{
45-
return await _flexService.Index();
46-
}
41+
[HttpGet]
42+
[Route("index")]
43+
public async Task<OperationDataResult<List<TimePlanningFlexIndexModel>>> Index()
44+
{
45+
return await _flexService.Index();
46+
}
4747

48-
[HttpPut]
49-
public async Task<OperationResult> Update([FromBody]List<TimePlanningFlexUpdateModel> model)
50-
{
51-
return await _flexService.UpdateCreate(model);
52-
}
48+
[HttpPut]
49+
public async Task<OperationResult> Update([FromBody]List<TimePlanningFlexUpdateModel> model)
50+
{
51+
return await _flexService.UpdateCreate(model);
5352
}
5453
}

‎eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Controllers/TimePlanningSettingsController.cs‎

Lines changed: 82 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -20,128 +20,100 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2020

2121
using System.Collections.Generic;
2222
using Microting.TimePlanningBase.Infrastructure.Const;
23-
using Microting.TimePlanningBase.Infrastructure.Data.Entities;
2423

25-
namespace TimePlanning.Pn.Controllers
26-
{
27-
using System.Threading.Tasks;
28-
using Castle.Core;
29-
using Infrastructure.Models.Settings;
30-
using Microsoft.AspNetCore.Authorization;
31-
using Microsoft.AspNetCore.Mvc;
32-
using Microting.eFormApi.BasePn.Infrastructure.Database.Entities;
33-
using Microting.eFormApi.BasePn.Infrastructure.Models.API;
34-
using Services.TimePlanningSettingService;
35-
36-
[Route("api/time-planning-pn/settings")]
37-
public class TimePlanningSettingsController : Controller
38-
{
39-
private readonly ISettingService _settingService;
40-
41-
public TimePlanningSettingsController(ISettingService settingService)
42-
{
43-
_settingService = settingService;
44-
}
24+
namespace TimePlanning.Pn.Controllers;
4525

46-
[HttpGet]
47-
[Authorize(Roles = EformRole.Admin)]
48-
public async Task<OperationDataResult<TimePlanningSettingsModel>> GetSettings()
49-
{
50-
return await _settingService.GetSettings();
51-
}
26+
using System.Threading.Tasks;
27+
using Infrastructure.Models.Settings;
28+
using Microsoft.AspNetCore.Authorization;
29+
using Microsoft.AspNetCore.Mvc;
30+
using Microting.eFormApi.BasePn.Infrastructure.Database.Entities;
31+
using Microting.eFormApi.BasePn.Infrastructure.Models.API;
32+
using Services.TimePlanningSettingService;
5233

53-
[HttpPut]
54-
[Authorize(Roles = EformRole.Admin)]
55-
public async Task<OperationResult> UpdateSettings([FromBody] TimePlanningSettingsModel timePlanningSettingsModel)
56-
{
57-
return await _settingService.UpdateSettings(timePlanningSettingsModel);
58-
}
59-
60-
[HttpPut]
61-
[Route("folder")]
62-
[Authorize(Roles = EformRole.Admin)]
63-
public async Task<OperationResult> UpdateFolder([FromBody] int folderId)
64-
{
65-
return await _settingService.UpdateFolder(folderId);
66-
}
67-
68-
69-
[HttpPut]
70-
[Route("sites")]
71-
[Authorize(Roles = EformRole.Admin)]
72-
public async Task<OperationResult> AddSite([FromBody] int siteId)
73-
{
74-
return await _settingService.AddSite(siteId);
75-
}
34+
[Route("api/time-planning-pn/settings")]
35+
public class TimePlanningSettingsController(ISettingService settingService) : Controller
36+
{
37+
[HttpGet]
38+
[Authorize(Roles = EformRole.Admin)]
39+
public async Task<OperationDataResult<TimePlanningSettingsModel>> GetSettings()
40+
{
41+
return await settingService.GetSettings();
42+
}
7643

44+
[HttpPut]
45+
[Authorize(Roles = EformRole.Admin)]
46+
public async Task<OperationResult> UpdateSettings([FromBody] TimePlanningSettingsModel timePlanningSettingsModel)
47+
{
48+
return await settingService.UpdateSettings(timePlanningSettingsModel);
49+
}
7750

78-
/* [HttpPut]
79-
[Route("eform")]
80-
[Authorize(Roles = EformRole.Admin)]
81-
public async Task<OperationResult> UpdateEform([FromBody] int eformId)
82-
{
83-
return await _settingService.UpdateEform(eformId);
84-
}*/
51+
[HttpPut]
52+
[Route("sites")]
53+
[Authorize(Roles = EformRole.Admin)]
54+
public async Task<OperationResult> AddSite([FromBody] int siteId)
55+
{
56+
return await settingService.AddSite(siteId);
57+
}
8558

86-
[HttpDelete]
87-
[Route("sites")]
88-
[Authorize(Roles = EformRole.User)]
89-
public async Task<OperationResult> DeleteSite(int siteId)
90-
{
91-
return await _settingService.DeleteSite(siteId);
92-
}
59+
[HttpDelete]
60+
[Route("sites")]
61+
[Authorize(Roles = EformRole.User)]
62+
public async Task<OperationResult> DeleteSite(int siteId)
63+
{
64+
return await settingService.DeleteSite(siteId);
65+
}
9366

94-
[HttpGet]
95-
[Route("sites")]
96-
[Authorize(Policy = TimePlanningClaims.GetWorkingHours)]
97-
public async Task<OperationDataResult<List<Site>>> GetAvailableSites()
98-
{
99-
return await _settingService.GetAvailableSites(null);
100-
}
67+
[HttpGet]
68+
[Route("sites")]
69+
[Authorize(Policy = TimePlanningClaims.GetWorkingHours)]
70+
public async Task<OperationDataResult<List<Site>>> GetAvailableSites()
71+
{
72+
return await settingService.GetAvailableSites(null);
73+
}
10174

102-
[HttpGet]
103-
[Route("registration-sites")]
104-
public async Task<OperationDataResult<List<Site>>> RegistrationSites(string token)
105-
{
106-
return await _settingService.GetAvailableSites(token);
107-
}
75+
[HttpGet]
76+
[Route("registration-sites")]
77+
public async Task<OperationDataResult<List<Site>>> RegistrationSites(string token)
78+
{
79+
return await settingService.GetAvailableSites(token);
80+
}
10881

109-
[HttpGet]
110-
[Route("assigned-sites")]
111-
[Authorize(Policy = TimePlanningClaims.GetWorkingHours)]
112-
public async Task<OperationDataResult<AssignedSite>> GetAssignedSite(int siteId)
113-
{
114-
return await _settingService.GetAssignedSite(siteId);
115-
}
82+
[HttpGet]
83+
[Route("assigned-sites")]
84+
[Authorize(Policy = TimePlanningClaims.GetWorkingHours)]
85+
public async Task<OperationDataResult<AssignedSite>> GetAssignedSite(int siteId)
86+
{
87+
return await settingService.GetAssignedSite(siteId);
88+
}
11689

117-
[HttpGet]
118-
[Route("assigned-site")]
119-
public async Task<OperationDataResult<AssignedSite>> GetAssignedSiteByCurrentUserName()
120-
{
121-
return await _settingService.GetAssignedSiteByCurrentUserName();
122-
}
90+
[HttpGet]
91+
[Route("assigned-site")]
92+
public async Task<OperationDataResult<AssignedSite>> GetAssignedSiteByCurrentUserName()
93+
{
94+
return await settingService.GetAssignedSiteByCurrentUserName();
95+
}
12396

124-
[HttpPut]
125-
[Route("assigned-site")]
126-
[Authorize(Policy = TimePlanningClaims.GetWorkingHours)]
127-
public async Task<OperationResult> UpdateAssignedSite([FromBody] AssignedSite site)
128-
{
129-
return await _settingService.UpdateAssignedSite(site);
130-
}
97+
[HttpPut]
98+
[Route("assigned-site")]
99+
[Authorize(Policy = TimePlanningClaims.GetWorkingHours)]
100+
public async Task<OperationResult> UpdateAssignedSite([FromBody] AssignedSite site)
101+
{
102+
return await settingService.UpdateAssignedSite(site);
103+
}
131104

132-
[HttpGet]
133-
[Route("global-auto-break-settings")]
134-
public async Task<OperationDataResult<GlobalAutoBreakSettings>> GetGlobalAutoBreakSettings()
135-
{
136-
return await _settingService.GetGlobalAutoBreakSettings();
137-
}
105+
[HttpGet]
106+
[Route("global-auto-break-settings")]
107+
public async Task<OperationDataResult<GlobalAutoBreakSettings>> GetGlobalAutoBreakSettings()
108+
{
109+
return await settingService.GetGlobalAutoBreakSettings();
110+
}
138111

139-
[HttpDelete]
140-
[Route("reset-global-auto-break-settings")]
141-
[Authorize(Roles = EformRole.Admin)]
142-
public OperationResult ResetGlobalAutoBreakSettings()
143-
{
144-
return _settingService.ResetGlobalAutoBreakSettings();
145-
}
112+
[HttpDelete]
113+
[Route("reset-global-auto-break-settings")]
114+
[Authorize(Roles = EformRole.Admin)]
115+
public OperationResult ResetGlobalAutoBreakSettings()
116+
{
117+
return settingService.ResetGlobalAutoBreakSettings();
146118
}
147119
}

0 commit comments

Comments
 (0)