|
@@ -1,33 +1,34 @@
|
|
|
using Microsoft.AspNetCore.Mvc;
|
|
using Microsoft.AspNetCore.Mvc;
|
|
|
using economy.Helpers;
|
|
using economy.Helpers;
|
|
|
using economy.Models;
|
|
using economy.Models;
|
|
|
-using economy.Models.Anniversary;
|
|
|
|
|
-using economy.Models.Holiday;
|
|
|
|
|
-using economy.Models.Seasonal;
|
|
|
|
|
-using economy.Models.Sundry;
|
|
|
|
|
|
|
+using economy.Models.Days;
|
|
|
|
|
+using Anniversary = economy.Models.Days.Anniversary;
|
|
|
|
|
+using Holiday = economy.Models.Days.Holiday;
|
|
|
|
|
+using Seasonal = economy.Models.Days.Seasonal;
|
|
|
|
|
+using Sundry = economy.Models.Days.Sundry;
|
|
|
|
|
|
|
|
namespace economy.Controllers
|
|
namespace economy.Controllers
|
|
|
{
|
|
{
|
|
|
- public class DayController : Controller
|
|
|
|
|
|
|
+ public class DaysController : Controller
|
|
|
{
|
|
{
|
|
|
private readonly DataGoKR _dataGoKR;
|
|
private readonly DataGoKR _dataGoKR;
|
|
|
private Dictionary<string, string> _queryString;
|
|
private Dictionary<string, string> _queryString;
|
|
|
|
|
|
|
|
- public DayController(DataGoKR dataGoKR)
|
|
|
|
|
|
|
+ public DaysController(DataGoKR dataGoKR)
|
|
|
{
|
|
{
|
|
|
_dataGoKR = dataGoKR;
|
|
_dataGoKR = dataGoKR;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 공휴일/국경일
|
|
// 공휴일/국경일
|
|
|
- public async Task<IActionResult> Holiday(Models.Holiday.Request request)
|
|
|
|
|
|
|
+ public async Task<IActionResult> Holiday(Holiday.Request request)
|
|
|
{
|
|
{
|
|
|
if (!ModelState.IsValid)
|
|
if (!ModelState.IsValid)
|
|
|
{
|
|
{
|
|
|
return BadRequest(ModelState);
|
|
return BadRequest(ModelState);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- HolidayModel holiday = new HolidayModel(_dataGoKR);
|
|
|
|
|
- Models.Holiday.Response itemList = await holiday.GetHoliday(request);
|
|
|
|
|
|
|
+ DaysModel holiday = new DaysModel(_dataGoKR);
|
|
|
|
|
+ Holiday.Response itemList = await holiday.GetHoliday(request);
|
|
|
|
|
|
|
|
if (itemList is not null)
|
|
if (itemList is not null)
|
|
|
{
|
|
{
|
|
@@ -39,7 +40,7 @@ namespace economy.Controllers
|
|
|
}).ToList();
|
|
}).ToList();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- var viewModel = new View<Models.Holiday.Request, Models.Holiday.Response>();
|
|
|
|
|
|
|
+ var viewModel = new View<Holiday.Request, Holiday.Response>();
|
|
|
viewModel.Request = request;
|
|
viewModel.Request = request;
|
|
|
viewModel.Response = itemList;
|
|
viewModel.Response = itemList;
|
|
|
|
|
|
|
@@ -51,15 +52,15 @@ namespace economy.Controllers
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 기념일
|
|
// 기념일
|
|
|
- public async Task<IActionResult> Anniversary(Models.Anniversary.Request request)
|
|
|
|
|
|
|
+ public async Task<IActionResult> Anniversary(Anniversary.Request request)
|
|
|
{
|
|
{
|
|
|
if (!ModelState.IsValid)
|
|
if (!ModelState.IsValid)
|
|
|
{
|
|
{
|
|
|
return BadRequest(ModelState);
|
|
return BadRequest(ModelState);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- AnniversaryModel anniversary = new AnniversaryModel(_dataGoKR);
|
|
|
|
|
- Models.Anniversary.Response itemList = await anniversary.GetAnniversary(request);
|
|
|
|
|
|
|
+ DaysModel anniversary = new DaysModel(_dataGoKR);
|
|
|
|
|
+ Anniversary.Response itemList = await anniversary.GetAnniversary(request);
|
|
|
|
|
|
|
|
if (itemList is not null)
|
|
if (itemList is not null)
|
|
|
{
|
|
{
|
|
@@ -71,7 +72,7 @@ namespace economy.Controllers
|
|
|
}).ToList();
|
|
}).ToList();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- var viewModel = new View<Models.Anniversary.Request, Models.Anniversary.Response>();
|
|
|
|
|
|
|
+ var viewModel = new View<Anniversary.Request, Anniversary.Response>();
|
|
|
viewModel.Request = request;
|
|
viewModel.Request = request;
|
|
|
viewModel.Response = itemList;
|
|
viewModel.Response = itemList;
|
|
|
|
|
|
|
@@ -83,15 +84,15 @@ namespace economy.Controllers
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 24절기
|
|
// 24절기
|
|
|
- public async Task<IActionResult> Seasonal(Models.Seasonal.Request request)
|
|
|
|
|
|
|
+ public async Task<IActionResult> Seasonal(Seasonal.Request request)
|
|
|
{
|
|
{
|
|
|
if (!ModelState.IsValid)
|
|
if (!ModelState.IsValid)
|
|
|
{
|
|
{
|
|
|
return BadRequest(ModelState);
|
|
return BadRequest(ModelState);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- SeasonalModel seasonal = new SeasonalModel(_dataGoKR);
|
|
|
|
|
- Models.Seasonal.Response itemList = await seasonal.GetSeasonal(request);
|
|
|
|
|
|
|
+ DaysModel seasonal = new DaysModel(_dataGoKR);
|
|
|
|
|
+ Seasonal.Response itemList = await seasonal.GetSeasonal(request);
|
|
|
|
|
|
|
|
if (itemList is not null)
|
|
if (itemList is not null)
|
|
|
{
|
|
{
|
|
@@ -103,7 +104,7 @@ namespace economy.Controllers
|
|
|
}).ToList();
|
|
}).ToList();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- var viewModel = new View<Models.Seasonal.Request, Models.Seasonal.Response>();
|
|
|
|
|
|
|
+ var viewModel = new View<Seasonal.Request, Seasonal.Response>();
|
|
|
viewModel.Request = request;
|
|
viewModel.Request = request;
|
|
|
viewModel.Response = itemList;
|
|
viewModel.Response = itemList;
|
|
|
|
|
|
|
@@ -116,15 +117,15 @@ namespace economy.Controllers
|
|
|
|
|
|
|
|
|
|
|
|
|
// 잡절
|
|
// 잡절
|
|
|
- public async Task<IActionResult> Sundry(Models.Sundry.Request request)
|
|
|
|
|
|
|
+ public async Task<IActionResult> Sundry(Sundry.Request request)
|
|
|
{
|
|
{
|
|
|
if (!ModelState.IsValid)
|
|
if (!ModelState.IsValid)
|
|
|
{
|
|
{
|
|
|
return BadRequest(ModelState);
|
|
return BadRequest(ModelState);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- SundryModel sundry = new SundryModel(_dataGoKR);
|
|
|
|
|
- Models.Sundry.Response itemList = await sundry.GetSundry(request);
|
|
|
|
|
|
|
+ DaysModel sundry = new DaysModel(_dataGoKR);
|
|
|
|
|
+ Sundry.Response itemList = await sundry.GetSundry(request);
|
|
|
|
|
|
|
|
if (itemList is not null)
|
|
if (itemList is not null)
|
|
|
{
|
|
{
|
|
@@ -136,7 +137,7 @@ namespace economy.Controllers
|
|
|
}).ToList();
|
|
}).ToList();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- var viewModel = new View<Models.Sundry.Request, Models.Sundry.Response>();
|
|
|
|
|
|
|
+ var viewModel = new View<Sundry.Request, Sundry.Response>();
|
|
|
viewModel.Request = request;
|
|
viewModel.Request = request;
|
|
|
viewModel.Response = itemList;
|
|
viewModel.Response = itemList;
|
|
|
|
|
|