Merge pull request #20 from piotrprzybyszdev/matches-and-communications

Matches and communications

Author: piotrprzybyszdev

PoZiomkaApi/Controllers/CommunicationController.cs

@@ -0,0 +1,38 @@
+using MediatR;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using PoZiomkaApi.Requests.Communication;
+using PoZiomkaDomain.Common;
+using PoZiomkaDomain.Communication.Commands.DeleteCommunication;
+using PoZiomkaDomain.Communication.Dtos;
+using PoZiomkaDomain.Communication.Queries.GetStudentCommunications;
+
+namespace PoZiomkaApi.Controllers;
+
+[Route("/communication")]
+[ApiController]
+public class CommunicationController(IMediator mediator) : Controller
+{
+    [HttpGet("get-student")]
+    [Authorize(Roles = Roles.Student)]
+    public async Task<IEnumerable<CommunicationDisplay>> GetStudentCommunications()
+    {
+        return await mediator.Send(new GetStudentCommunicationsQuery(User));
+    }
+
+    [HttpPost("send")]
+    [Authorize(Roles = Roles.Administrator)]
+    public async Task<IActionResult> SendCommunication(CommunicationSendRequest sendRequest)
+    {
+        await mediator.Send(sendRequest.ToSendCommunicationCommand());
+        return Ok();
+    }
+
+    [HttpDelete("delete/{id}")]
+    [Authorize(Roles = Roles.Student)]
+    public async Task<IActionResult> DeleteCommunication(int id)
+    {
+        await mediator.Send(new DeleteCommunicationCommand(id, User));
+        return Ok();
+    }
+}

PoZiomkaApi/Controllers/MatchController.cs

@@ -0,0 +1,33 @@
+using MediatR;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using PoZiomkaApi.Requests.Match;
+using PoZiomkaDomain.Common;
+using PoZiomkaDomain.Match.Commands.UpdateMatchCommand;
+using PoZiomkaDomain.Match.Dtos;
+using PoZiomkaDomain.Match.Queries.StudentMatchesQuery;
+using PoZiomkaDomain.StudentAnswers.Commands.Update;
+
+namespace PoZiomkaApi.Controllers;
+
+[Route("/match")]
+[ApiController]
+public class MatchController(IMediator mediator) : Controller
+{
+    [HttpGet("get-student")]
+    [Authorize(Roles = Roles.Student)]
+    public async Task<IEnumerable<MatchModel>> GetStudentMatches()
+    {
+        StudentMatchQuery query = new(User);
+        return await mediator.Send(query);
+    }
+
+    [HttpPut("update")]
+    [Authorize(Roles = Roles.Student)]
+    public async Task<IActionResult> UpdateMatch(MatchUpdateRequest updateRequest)
+    {
+        UpdateMatchCommand command = new(User, updateRequest.Id, updateRequest.IsAcceptation);
+        await mediator.Send(command);
+        return Ok();
+    }
+}

PoZiomkaApi/Controllers/ReservationController.cs

@@ -0,0 +1,40 @@
+using MediatR;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using PoZiomkaApi.Requests.Reservation;
+using PoZiomkaDomain.Common;
+using PoZiomkaDomain.Reservation.Commands.UpdateReservation;
+using PoZiomkaDomain.Reservation.Dtos;
+using PoZiomkaDomain.Reservation.Queries.GetReservation;
+using PoZiomkaDomain.Reservation.Queries.GetReservations;
+using PoZiomkaDomain.Room.Dtos;
+using PoZiomkaDomain.Student.Dtos;
+
+namespace PoZiomkaApi.Controllers;
+
+[Route("/reservation")]
+[ApiController]
+public class ReservationController(IMediator mediator) : Controller
+{
+    [HttpGet("get")]
+    [Authorize(Roles = Roles.Administrator)]
+    public async Task<IEnumerable<ReservationModel>> GetReservations()
+    {
+        return await mediator.Send(new GetReservationsQuery());
+    }
+
+    [HttpGet("get/{id}")]
+    [Authorize(Roles = $"{Roles.Student},{Roles.Administrator}")]
+    public async Task<ReservationDisplay> GetReservation(int id)
+    {
+        return await mediator.Send(new GetReservationQuery(id, User));
+    }
+
+    [HttpPut("update")]
+    [Authorize(Roles = $"{Roles.Student},{Roles.Administrator}")]
+    public async Task<IActionResult> UpdateReservation(ReservationUpdateRequest updateRequest)
+    {
+        await mediator.Send(updateRequest.ToUpdateReservationCommand(User));
+        return Ok();
+    }
+}

PoZiomkaApi/Controllers/StudentAnswerController.cs

@@ -14,11 +14,11 @@ namespace PoZiomkaApi.Controllers;
 [ApiController]
 public class StudentAnswerController(IMediator mediator) : ControllerBase
 {
-    [HttpGet("get-student")]
+    [HttpGet("get/{studentId}")]
     [Authorize(Roles = Roles.Student)]
-    public async Task<IEnumerable<StudentAnswerStatus>> GetStudent()
+    public async Task<IEnumerable<StudentAnswerStatus>> GetStudent(int studentId)
     {
-        GetStudentAnswersQuery query = new(User);
+        GetStudentAnswersQuery query = new(User, studentId);
         return await mediator.Send(query);
     }
 

PoZiomkaApi/ExceptionMiddleware.cs

@@ -3,12 +3,15 @@
 using PoZiomkaDomain.Admin.Exceptions;
 using PoZiomkaDomain.Application.Exceptions;
 using PoZiomkaDomain.Common.Exceptions;
+using PoZiomkaDomain.Communication.Exceptions;
 using PoZiomkaDomain.Exceptions;
 using PoZiomkaDomain.Form.Exceptions;
+using PoZiomkaDomain.Reservation.Exceptions;
 using PoZiomkaDomain.Room.Exceptions;
 using PoZiomkaDomain.Student.Exceptions;
 using PoZiomkaDomain.StudentAnswers.Exceptions;
 using PoZiomkaInfrastructure.Exceptions;
+using System;
 using System.Text.Json;
 
 namespace PoZiomkaApi;
@@ -232,6 +235,36 @@ public async Task Invoke(HttpContext context)
                 Title = "User can't fill forms"
             };
         }
+        catch (CommunicationNotFoundException exception)
+        {
+            context.Response.StatusCode = StatusCodes.Status404NotFound;
+            problemDetails = new ProblemDetails()
+            {
+                Status = StatusCodes.Status404NotFound,
+                Detail = exception.Message,
+                Title = "Communication not found"
+            };
+        }
+        catch (UnauthorizedDeleteException exception)
+        {
+            context.Response.StatusCode = StatusCodes.Status404NotFound;
+            problemDetails = new ProblemDetails()
+            {
+                Status = StatusCodes.Status401Unauthorized,
+                Detail = exception.Message,
+                Title = "User not authorized to delete this notification"
+            };
+        }
+        catch (ReservationNotFoundException exception)
+        {
+            context.Response.StatusCode = StatusCodes.Status404NotFound;
+            problemDetails = new ProblemDetails()
+            {
+                Status = StatusCodes.Status404NotFound,
+                Detail = exception.Message,
+                Title = "Reservation not found"
+            };
+        }
         catch (DomainException exception)
         {
             context.Response.StatusCode = StatusCodes.Status500InternalServerError;

PoZiomkaApi/Requests/Communication/CommunicationSendRequest.cs

@@ -0,0 +1,8 @@
+using PoZiomkaDomain.Communication.Commands.SendCommunication;
+
+namespace PoZiomkaApi.Requests.Communication;
+
+public record CommunicationSendRequest(IEnumerable<int> StudentIds, string Description)
+{
+    public SendCommunicationCommand ToSendCommunicationCommand() => new(StudentIds, Description);
+};

PoZiomkaApi/Requests/Match/MatchUpdateRequest.cs

@@ -0,0 +1,3 @@
+namespace PoZiomkaApi.Requests.Match;
+
+public record MatchUpdateRequest(int Id, bool IsAcceptation);

PoZiomkaApi/Requests/Reservation/ReservationUpdateRequest.cs

@@ -0,0 +1,9 @@
+using PoZiomkaDomain.Reservation.Commands.UpdateReservation;
+using System.Security.Claims;
+
+namespace PoZiomkaApi.Requests.Reservation;
+
+public record ReservationUpdateRequest(int Id, bool IsAcceptation)
+{
+    public UpdateReservationCommand ToUpdateReservationCommand(ClaimsPrincipal user) => new(Id, IsAcceptation, user);
+};

PoZiomkaApp/src/app/admin/admin.component.html

@@ -4,23 +4,29 @@
             <div class="d-flex flex-column h-100">
                 <div class="bg-white border border-secondary rounded-bottom-4 px-4 py-2">
                     <app-menu logoLink="/admin/dashboard" logoStyle="poziomka-logo-blue">
-                        <li class="nav-item mx-lg-2 my-1 my-lg-0">
+                        <li class="nav-item mx-xl-2 my-1 my-xl-0 ms-xl-5">
+                            <a class="nav-link active btn d-inline" (click)="onCommunicationsClick()">Komunikaty</a>
+                        </li>
+                        <li class="nav-item mx-xl-2 my-1 my-xl-0">
+                            <a class="nav-link active btn d-inline" (click)="onReservationsClick()">Rezerwacje</a>
+                        </li>
+                        <li class="nav-item mx-xl-2 my-1 my-xl-0">
                             <a class="nav-link active btn d-inline" (click)="onFormListClick()">Ankiety</a>
                         </li>
-                        <li class="nav-item mx-lg-2 my-1 my-lg-0">
+                        <li class="nav-item mx-xl-2 my-1 my-xl-0">
                             <a class="nav-link active btn d-inline" (click)="onApplicationListClick()">Wnioski</a>
                         </li>
-                        <li class="nav-item mx-lg-2 my-1 my-lg-0">
+                        <li class="nav-item mx-xl-2 my-1 my-xl-0">
                             <a class="nav-link active btn d-inline" (click)="onRoomListClick()">Pokoje</a>
                         </li>
-                        <li class="nav-item mx-lg-2 my-1 my-lg-0">
+                        <li class="nav-item mx-xl-2 my-1 my-xl-0">
                             <a class="nav-link active btn d-inline" (click)="onStudentListClick()">Studenci</a>
                         </li>
-                        <li class="nav-item mx-lg-2 my-1 my-lg-0">
-                            <a class="nav-link active btn d-inline" (click)="onProfileClick()">Profil</a>
+                        <li class="nav-item mx-xl-2 my-1 my-xl-0">
+                            <a class="nav-link active btn d-inline" (click)="onDashboardClick()">Panel główny</a>
                         </li>
 
-                        <li class="nav-item ms-lg-4 my-1 my-lg-0">
+                        <li class="nav-item my-1 my-xl-0 ms-xl-auto">
                             <a class="nav-link active btn d-inline" (click)="logout()">Wyloguj się</a>
                         </li>
                     </app-menu>

PoZiomkaApp/src/app/admin/admin.component.ts

@@ -17,8 +17,8 @@ export class AdminComponent {
     this.router.navigate(['/admin/applications']);
   }
 
-  onProfileClick(): void {
-    this.router.navigate(['/admin/profile']);
+  onDashboardClick(): void {
+    this.router.navigate(['/admin/dashboard']);
   }
 
   onStudentListClick(): void {
@@ -33,6 +33,14 @@ export class AdminComponent {
     this.router.navigate(['/admin/forms']);
   }
 
+  onReservationsClick(): void {
+    this.router.navigate(['/admin/reservations']);
+  }
+
+  onCommunicationsClick(): void {
+    this.router.navigate(['/admin/communications']);
+  }
+
   logout(): void {
     this.authService.logOut().subscribe({
       next: _ => this.router.navigate(['/login'])