feat(admin-ui): added possibility to add draws, minor text color chan…

kabinizer-back-end/kabinizer-api/Controllers/DrawController.cs

@@ -43,16 +43,35 @@ public async Task<ActionResult<DrawEntity>> GetDraw([Required] Guid drawId)
     }
 
     [HttpPost]
-    public async Task<ActionResult<DrawEntity>> CreateDraw([Required] CreateDrawDto draw)
+    public async Task<ActionResult<ReadDrawDto>>  CreateDraw([Required] CreateDrawDto draw)
     {
         var createdDraw = await drawService.CreateDraw(draw);
-        return CreatedAtAction(nameof(GetDraws), new { drawId = createdDraw.Id }, createdDraw);
+        return Ok(ReadDrawDto.FromEntity(createdDraw));
     }
 
-    [HttpDelete("{drawId:guid}")]
+
+
+
+    [HttpPut]
+
+    public IActionResult UpdateDraw([Required] UpdateDrawDto draw)
+    {
+        try
+        {
+            drawService.UpdateDraw(draw);
+            return new NoContentResult();
+        }
+        catch (Exception)
+        {
+            return new NotFoundResult();
+        }
+    }
+
+    [HttpDelete]
     public async Task<IActionResult> DeleteDraw([Required] Guid drawId)
     {
         await drawService.DeleteDraw(drawId);
         return NoContent();
     }
+
 }

kabinizer-back-end/kabinizer-api/Dtos/Draw/ReadDrawDto.cs

@@ -0,0 +1,31 @@
+using kabinizer_data.Entities;
+
+namespace kabinizer_api.Dtos.Draw;
+
+public class ReadDrawDto
+{
+    public DateTime DeadlineStart { get; set; }
+    public DateTime DeadlineEnd { get; set; }
+    public required string Title { get; set; }
+    public required List<DrawPeriod> DrawPeriods { get; set; }
+    public bool IsSpecial { get; set; }
+
+    internal static object? FromEntity(DrawEntity createdDraw)
+
+    {
+        return new ReadDrawDto
+        {
+            DeadlineStart = createdDraw.DeadlineStart,
+            DeadlineEnd = createdDraw.DeadlineEnd,
+            Title = createdDraw.Title,
+            DrawPeriods = createdDraw.Periods.Select(p => new DrawPeriod
+            {
+                Start = p.PeriodStart,
+                End = p.PeriodEnd,
+                Title = p.Title
+            }).ToList(),
+            IsSpecial = createdDraw.IsSpecial
+        };
+    }
+
+}

kabinizer-back-end/kabinizer-api/Dtos/Draw/UpdateDrawDto.cs

@@ -0,0 +1,12 @@
+namespace kabinizer_api.Dtos.Draw;
+
+public class UpdateDrawDto
+{
+    public required string Id { get; set; }
+    public DateTime Start { get; set; }
+    public DateTime End { get; set; }
+    public required string Title { get; set; }
+    public bool IsSpecial { get; set; }
+
+    public List<UpdatePeriod>? Periods { get; set; }
+}

kabinizer-back-end/kabinizer-api/Dtos/Draw/UpdatePeriod.cs

@@ -0,0 +1,11 @@
+namespace kabinizer_api.Dtos.Draw;
+
+public class UpdatePeriod {
+
+    public required string Id { get; set; }
+    public DateTime PeriodStart { get; set; }
+    public DateTime PeriodEnd { get; set; }
+    public  required string Title { get; set; }
+
+    public required string DrawId { get; set; }
+}

kabinizer-back-end/kabinizer-api/Services/Draw/DrawService.cs

@@ -40,9 +40,17 @@ public async Task<DrawEntity> GetDraw(Guid drawId)
     /**
      * Update a draw
      */
-    public Task UpdateDraw(Guid drawId)
+      public void UpdateDraw(UpdateDrawDto draw)
     {
-        throw new NotImplementedException();
+        var drawToUpdate = entityContext.Draws.Include(d => d.Periods).FirstOrDefault(d => d.Id == Guid.Parse(draw.Id)) 
+            ?? throw new Exception("Draw not found");
+
+        drawToUpdate.DeadlineStart = draw.Start;
+        drawToUpdate.DeadlineEnd = draw.End;
+        drawToUpdate.Title = draw.Title;
+        drawToUpdate.IsSpecial = draw.IsSpecial;
+        drawToUpdate.Periods = periodService.UpdatePeriods(drawToUpdate.Id, draw.Periods);
+        entityContext.SaveChanges();
     }
 
     /**
@@ -102,4 +110,4 @@ public async Task DeleteDraw(Guid drawId)
             .ToListAsync();
         return draws.Select(Model.Draw.FromObject);
     }
-}
+}

kabinizer-back-end/kabinizer-api/Services/Period/PeriodService.cs

@@ -24,6 +24,25 @@ public List<PeriodEntity> CreatePeriods(Guid drawId, List<DrawPeriod> drawPeriod
         return periodEntities;
     }
 
+    internal List<PeriodEntity>? UpdatePeriods(Guid id, List<UpdatePeriod>? periods)
+    {
+     ArgumentNullException.ThrowIfNull(periods);
+
+        List<PeriodEntity> periodEntities = new();
+        foreach (UpdatePeriod updatePeriod in periods) {
+            PeriodEntity periodEntity = new()
+            {
+                PeriodStart = updatePeriod.PeriodStart,
+                PeriodEnd = updatePeriod.PeriodEnd,
+                Title = updatePeriod.Title,
+                DrawId = Guid.Parse(updatePeriod.DrawId)
+            };
+            periodEntities.Add(periodEntity);
+        }
+        return periodEntities;
+    }
+
+
     private PeriodEntity CreateSinglePeriod(DrawPeriod drawPeriod, Guid drawId)
     {
         if (drawPeriod.Title?.Trim().Length == 0)
@@ -80,4 +99,4 @@ public async Task<List<PeriodEntity>> GetPastPeriods() =>
         await entityContext.Periods.Where(p => p.PeriodEnd < DateTime.Now).ToListAsync();
 
     public async Task<IEnumerable<PeriodEntity>> GetAllPeriods() => await entityContext.Periods.ToListAsync();
-}
+}

kabinizer-back-end/kabinizer-data/Entities/DrawEntity.cs

@@ -1,10 +1,12 @@
-using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace kabinizer_data.Entities;
 
 [Table("Draw")]
 public class DrawEntity
 {
+    [Key]
     public Guid Id { get; set; }
     public DateTime DeadlineStart { get; set; }
     public DateTime DeadlineEnd { get; set; }

kabinizer-front-end/api/index.ts

@@ -7,16 +7,15 @@ export { CancelablePromise, CancelError } from "./core/CancelablePromise";
 export { OpenAPI } from "./core/OpenAPI";
 export type { OpenAPIConfig } from "./core/OpenAPI";
 
-export type { BookingRequestDto } from "./models/BookingRequestDto";
+export type { BookingRequest } from "./models/BookingRequest";
 export type { CreateBookingRequestDto } from "./models/CreateBookingRequestDto";
 export type { CreateDrawDto } from "./models/CreateDrawDto";
 export type { Draw } from "./models/Draw";
-export type { DrawEntity } from "./models/DrawEntity";
 export type { DrawPeriod } from "./models/DrawPeriod";
 export type { Period } from "./models/Period";
-export type { PeriodEntity } from "./models/PeriodEntity";
-export type { ProblemDetails } from "./models/ProblemDetails";
-export type { ReadPeriodDto } from "./models/ReadPeriodDto";
+export type { UpdateDrawDto } from "./models/UpdateDrawDto";
+export type { UpdatePeriod } from "./models/UpdatePeriod";
+export type { User } from "./models/User";
 
 export { BookingRequestService } from "./services/BookingRequestService";
 export { DrawService } from "./services/DrawService";

kabinizer-front-end/api/models/BookingRequest.ts

@@ -0,0 +1,13 @@
+/* generated using openapi-typescript-codegen -- do no edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { Period } from "./Period";
+import type { User } from "./User";
+
+export type BookingRequest = {
+  bookingRequestId?: string;
+  period?: Period;
+  user?: User;
+};

kabinizer-front-end/api/models/UpdateDrawDto.ts

@@ -0,0 +1,14 @@
+/* generated using openapi-typescript-codegen -- do no edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { UpdatePeriod } from "./UpdatePeriod";
+
+export type UpdateDrawDto = {
+  id?: string | null;
+  end?: string;
+  title?: string | null;
+  isSpecial?: boolean;
+  periods?: Array<UpdatePeriod> | null;
+};

kabinizer-front-end/api/models/UpdatePeriod.ts

@@ -0,0 +1,12 @@
+/* generated using openapi-typescript-codegen -- do no edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+
+export type UpdatePeriod = {
+  id?: string | null;
+  periodStart?: string;
+  periodEnd?: string;
+  title?: string | null;
+  drawId?: string | null;
+};

kabinizer-front-end/api/models/ProblemDetails.ts → kabinizer-front-end/api/models/User.ts

@@ -3,4 +3,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-export type ProblemDetails = Record<string, any>;
+export type User = {
+  id?: string;
+  name?: string | null;
+};