From 8da81eaa5e77cbbbbd99588f67d8f3f3630232f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20S=C3=B8rensen?= <44672083+sorensenmarius@users.noreply.github.com> Date: Tue, 7 Nov 2023 19:58:21 +0100 Subject: [PATCH] Drawperiod ! (#43) --- .../kabinizer-api/Dtos/Draw/CreateDrawDto.cs | 7 +++---- kabinizer-back-end/kabinizer-api/Dtos/Draw/DrawPeriod.cs | 7 +++++++ .../kabinizer-api/Services/Draw/DrawService.cs | 6 +++--- .../kabinizer-api/Services/Period/PeriodService.cs | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 kabinizer-back-end/kabinizer-api/Dtos/Draw/DrawPeriod.cs diff --git a/kabinizer-back-end/kabinizer-api/Dtos/Draw/CreateDrawDto.cs b/kabinizer-back-end/kabinizer-api/Dtos/Draw/CreateDrawDto.cs index bdc3987..d8de298 100644 --- a/kabinizer-back-end/kabinizer-api/Dtos/Draw/CreateDrawDto.cs +++ b/kabinizer-back-end/kabinizer-api/Dtos/Draw/CreateDrawDto.cs @@ -2,9 +2,8 @@ public class CreateDrawDto { - public DateTime DrawStart { get; set; } - public DateTime DrawEnd { get; set; } + public DateTime DeadlineStart { get; set; } + public DateTime DeadlineEnd { get; set; } public required string Title { get; set; } - public DateTime PeriodStart { get; set; } - public DateTime PeriodEnd { get; set; } + public required List DrawPeriods { get; set; } } diff --git a/kabinizer-back-end/kabinizer-api/Dtos/Draw/DrawPeriod.cs b/kabinizer-back-end/kabinizer-api/Dtos/Draw/DrawPeriod.cs new file mode 100644 index 0000000..be1cf1c --- /dev/null +++ b/kabinizer-back-end/kabinizer-api/Dtos/Draw/DrawPeriod.cs @@ -0,0 +1,7 @@ +namespace kabinizer_api; + +public class DrawPeriod +{ + public DateTime Start { get; set; } + public DateTime End { get; set; } +} diff --git a/kabinizer-back-end/kabinizer-api/Services/Draw/DrawService.cs b/kabinizer-back-end/kabinizer-api/Services/Draw/DrawService.cs index 258f432..e9d0a8b 100644 --- a/kabinizer-back-end/kabinizer-api/Services/Draw/DrawService.cs +++ b/kabinizer-back-end/kabinizer-api/Services/Draw/DrawService.cs @@ -17,10 +17,10 @@ public void CreateDraw(CreateDrawDto draw) { var drawEntity = new DrawEntity { - Start = draw.DrawStart, - End = draw.DrawEnd, + Start = draw.DeadlineStart, + End = draw.DeadlineEnd, Title = draw.Title, - Periods = _periodService.CreatePeriods(draw.PeriodStart, draw.PeriodEnd) + Periods = _periodService.CreatePeriods(draw.DrawPeriods) }; _entityContext.Draws.Add(drawEntity); _entityContext.SaveChanges(); diff --git a/kabinizer-back-end/kabinizer-api/Services/Period/PeriodService.cs b/kabinizer-back-end/kabinizer-api/Services/Period/PeriodService.cs index a99700d..c9fb636 100644 --- a/kabinizer-back-end/kabinizer-api/Services/Period/PeriodService.cs +++ b/kabinizer-back-end/kabinizer-api/Services/Period/PeriodService.cs @@ -4,7 +4,7 @@ namespace kabinizer_api; public class PeriodService { - public List CreatePeriods(DateTime start, DateTime end) + public List CreatePeriods(List drawPeriods) { // TODO: Compute periods from a larger time span // Week by week?