fix: partially fixed endpoint routes.

SoftTeam-Emergentes · Nov 14, 2023 · cc244a2 · cc244a2
1 parent 7f018f6
commit cc244a2
Show file tree

Hide file tree

Showing 15 changed files with 103 additions and 28 deletions.
diff --git a/...RS/ArtEventManagement/Application/ArtEvents/Queries/GetArtEventsByHobbyistQueryHandler.cs b/...RS/ArtEventManagement/Application/ArtEvents/Queries/GetArtEventsByHobbyistQueryHandler.cs
@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using MediatR;
+using PERUSTARS.ArtEventManagement.Domain.Model.Queries;
+using PERUSTARS.ArtEventManagement.Domain.Model.Repositories;
+using PERUSTARS.ArtEventManagement.Interfaces.REST.Resources;
+using PERUSTARS.ProfileManagement.Domain.Repositories;
+
+namespace PERUSTARS.ArtEventManagement.Application.ArtEvents.Queries;
+
+public class GetArtEventsByHobbyistQueryHandler: IRequestHandler<GetArtEventsByHobbyistQuery, IEnumerable<ArtEventResource>>
+{
+    private readonly IArtEventRepository _artEventRepository;
+    private readonly IParticipantRepository _participantRepository;
+    private readonly IHobbyistRepository _hobbyistRepository;
+
+    public Task<IEnumerable<ArtEventResource>> Handle(GetArtEventsByHobbyistQuery request, CancellationToken cancellationToken)
+    {
+        throw new System.NotImplementedException();
+    }
+}
diff --git a/...S/PERUSTARS/ArtEventManagement/Application/Participant/Queries/ParticipantQueryService.cs b/...S/PERUSTARS/ArtEventManagement/Application/Participant/Queries/ParticipantQueryService.cs
@@ -9,7 +9,7 @@ public class ParticipantQueryService: IParticipantQueryService
         private readonly IParticipantRepository _participantRepository;
         public ParticipantQueryService(IParticipantRepository participantRepository)
         {
-            this._participantRepository = participantRepository;
+            _participantRepository = participantRepository;
         }
 
         public IEnumerable<Domain.Model.Aggregates.Participant> getParticipantByEventId(long id)

diff --git a/PERUSTARS/PERUSTARS/ArtEventManagement/Domain/Model/Queries/GetArtEventsByHobbyistQuery.cs b/PERUSTARS/PERUSTARS/ArtEventManagement/Domain/Model/Queries/GetArtEventsByHobbyistQuery.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using MediatR;
+using PERUSTARS.ArtEventManagement.Interfaces.REST.Resources;
+
+namespace PERUSTARS.ArtEventManagement.Domain.Model.Queries;
+
+public class GetArtEventsByHobbyistQuery: IRequest<IEnumerable<ArtEventResource>>
+{
+    public long HobbyistId { get; set; }
+}
diff --git a/PERUSTARS/PERUSTARS/ArtEventManagement/Interfaces/REST/ArtEventsController.cs b/PERUSTARS/PERUSTARS/ArtEventManagement/Interfaces/REST/ArtEventsController.cs
@@ -6,14 +6,14 @@
 using PERUSTARS.ArtEventManagement.Domain.Model.Commads;
 using PERUSTARS.ArtEventManagement.Domain.Model.ValueObjects;
 using PERUSTARS.ArtEventManagement.Domain.Services.ArtEvent;
-using PERUSTARS.ArtEventManagement.Interfaces.Resources;
+using PERUSTARS.ArtEventManagement.Interfaces.REST.Resources;
 using PERUSTARS.IdentityAndAccountManagement.Domain.Model.Attributes;
 
 namespace PERUSTARS.ArtEventManagement.Interfaces.REST
 {
     [ApiController]
     [Authorize]
-    [Route("/api/v1/[controller]")]
+    [Route("/api/v1")]
     public class ArtEventsController : ControllerBase
     {
         private readonly IMapper _mapper;
@@ -34,52 +34,51 @@ public async Task<IActionResult> RegisterArtEvent([FromBody] RegisterArtEventRes
             return Ok(response);
         }
 
-        [HttpGet("{id}")]
+        [HttpGet("artevents/{id}")]
         public async Task<IActionResult> GetArtEvent(int id)
         {
             ArtEvent artEvent = _artEventQueryService.getArtEventById(id);
             return Ok(artEvent);
         }
 
-        [HttpPost("cancel/{id}")]
+        [HttpPatch("artevents/{id}/cancel")]
         public async Task<IActionResult> cancelArtEvent(int id) {
             CancelArtEventCommand cancelArtEventCommand = new CancelArtEventCommand();
             cancelArtEventCommand.id= id;
             string response = await _artEventCommandService.cancelArtEvent(cancelArtEventCommand);
             return Ok(response);
         }
-        [HttpPost("start/{id}")]
+        [HttpPatch("artevents/{id}/start")]
         public async Task<IActionResult> startArtEvent(int id) {
             StartArtEventCommand startArtEventCommand = new StartArtEventCommand();
             startArtEventCommand.id= id;
             string response= await _artEventCommandService.startArtEventCommand(startArtEventCommand);
             return Ok(response);
-
         }
-
-        [HttpPut]
-        public async Task<IActionResult> editArtEvent([FromBody] EditArtEventCommand editArtEventCommand)
+        [HttpPut("artevents/{id}")]
+        public async Task<IActionResult> editArtEvent([FromBody] UpdateArtEventResource updateArtEventResource)
         {
+            var editArtEventCommand = _mapper.Map<UpdateArtEventResource, EditArtEventCommand>(updateArtEventResource);
             string response= await _artEventCommandService.editArtEvent(editArtEventCommand);
             return Ok(response);
         }
-        [HttpGet]
+        [HttpGet("artevents")]
         public async Task<IActionResult> getALlEvents(){
             IEnumerable<ArtEvent> events= _artEventQueryService.getArtEvents();
             return Ok(events);
         }
-        [HttpGet("artist/{id}")]
+        [HttpGet("artists/{id}/artevents")]
         public async Task<IActionResult> getByArtist(int id) { 
             IEnumerable<ArtEvent> events= _artEventQueryService.getArtEventByArtistId(id);
             return Ok(events);
         }
-        [HttpPost("participant")]
+        [HttpPost("artevents/{id}/participant")]
         public async Task<IActionResult> createParticipant([FromBody] RegisterParticipantToArtEventCommand registerParticipantToArtEvent) { 
             string response= await _artEventCommandService.registerParticipantToArtEvent(registerParticipantToArtEvent);
             return Ok(response);
         }
 
-        [HttpDelete("id")]
+        [HttpDelete("artevents/{id}")]
         public async Task<IActionResult> deleteArtEvent(int id) {
             DeleteArtEventCommand deleteArtEventCommand = new DeleteArtEventCommand();
             deleteArtEventCommand.id=id;

diff --git a/PERUSTARS/PERUSTARS/ArtEventManagement/Interfaces/REST/ParticipantsController.cs b/PERUSTARS/PERUSTARS/ArtEventManagement/Interfaces/REST/ParticipantsController.cs
@@ -10,7 +10,7 @@
 namespace PERUSTARS.ArtEventManagement.Interfaces.REST
 {
     [ApiController]
-    [Route("/api/v1/[controller]")]
+    [Route("/api/v1")]
     [Authorize]
     public class ParticipantsController : ControllerBase
     {
@@ -31,20 +31,20 @@ public async Task<IActionResult> getParticipants()
             return Ok(participants);
         }
 
-        [HttpGet("hobbyist/{id}")]
+        [HttpGet("participants/hobbyist/{id}")]
         public async Task<IActionResult> getParticipantsByHobbyistId(int id)
         {
             IEnumerable<Participant> participants = _participantQueryService.getParticipantByHobbyistId(id);
             return Ok(participants);
         }
-        [HttpGet("artevent/{id}")]
+        [HttpGet("participants/artevent/{id}")]
         public async Task<IActionResult> getParticipantsByArtEventId(int id)
         {
             IEnumerable<Participant> participants = _participantQueryService.getParticipantByEventId(id);
             return Ok(participants);
         }
 
-        [HttpDelete("{id}")]
+        [HttpDelete("participants/{id}")]
         public async Task<IActionResult> deleteParticipant(int id) {
             DeleteParticipantCommand d = new DeleteParticipantCommand();
             d.id = id;

diff --git a/PERUSTARS/PERUSTARS/ArtEventManagement/Interfaces/REST/Resources/ArtEventResource.cs b/PERUSTARS/PERUSTARS/ArtEventManagement/Interfaces/REST/Resources/ArtEventResource.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using PERUSTARS.ArtEventManagement.Domain.Model.Aggregates;
+using PERUSTARS.ArtEventManagement.Domain.Model.ValueObjects;
+using PERUSTARS.ProfileManagement.Domain.Model.Aggregates;
+
+namespace PERUSTARS.ArtEventManagement.Interfaces.REST.Resources;
+
+public class ArtEventResource
+{
+    public long? Id { get; set; }
+    public string Title { get; set; }
+    public string Description { get; set; }
+    public DateTime? StartDateTime { get; set; }
+    public Location Location { get; set; }
+    public bool? IsOnline { get; set; }
+    public long? ArtistId { get; set; }
+    public string? CurrentStatus { get; set; }
+    public IEnumerable<Participant> Participants { get; set; }
+    public bool Collected { get; set; }
+}
diff --git a/...ces/Resources/RegisterArtEventResource.cs → ...EST/Resources/RegisterArtEventResource.cs b/...ces/Resources/RegisterArtEventResource.cs → ...EST/Resources/RegisterArtEventResource.cs
@@ -1,7 +1,7 @@
 using System;
 using PERUSTARS.ArtEventManagement.Domain.Model.ValueObjects;
 
-namespace PERUSTARS.ArtEventManagement.Interfaces.Resources
+namespace PERUSTARS.ArtEventManagement.Interfaces.REST.Resources
 {
     public class RegisterArtEventResource
     {

diff --git a/PERUSTARS/PERUSTARS/ArtEventManagement/Interfaces/REST/Resources/UpdateArtEventResource.cs b/PERUSTARS/PERUSTARS/ArtEventManagement/Interfaces/REST/Resources/UpdateArtEventResource.cs
@@ -0,0 +1,12 @@
+using PERUSTARS.ArtEventManagement.Domain.Model.ValueObjects;
+
+namespace PERUSTARS.ArtEventManagement.Interfaces.REST.Resources;
+
+public class UpdateArtEventResource
+{
+    public int id { get; set; }
+    public string title { get; set; }
+    public string description { get; set; }
+    public Location location { get; set; }
+    public bool isOnline { get; set; }
+}
diff --git a/...RUSTARS/CommunicationAndNotificationManagement/Interfaces/REST/NotificationsController.cs b/...RUSTARS/CommunicationAndNotificationManagement/Interfaces/REST/NotificationsController.cs
@@ -14,14 +14,20 @@
   namespace PERUSTARS.CommunicationAndNotificationManagement.Interfaces.REST
 {
     [Authorize]
-    [Route("api/v1/[controller]")]
+    [Route("api/v1")]
     [ApiController]
     public class NotificationsController : ControllerBase
     {
         private readonly INotificationCommandService _notificationCommandService;
         private readonly IMapper _mapper;
 
-        [HttpGet("artist/{artistId}")]
+        public NotificationsController(INotificationCommandService notificationCommandService, IMapper mapper)
+        {
+            _notificationCommandService = notificationCommandService;
+            _mapper = mapper;
+        }
+
+        [HttpGet("artists/{artistId}/notifications")]
         public async Task<IActionResult> GetNotificationsByArtistId(long artistId)
         {
             var notifications = await _notificationCommandService.ListNotificationsReceivedBydArtistIdAsync(artistId);
@@ -30,10 +36,10 @@ public async Task<IActionResult> GetNotificationsByArtistId(long artistId)
             return Ok(result);
         }
 
-        [HttpGet("hobbyist/{hoobyistId}")]
-        public async Task<IActionResult> GetNotificationsByHobbyistId(long hoobyistId)
+        [HttpGet("hobbyists/{hobbyistId}/notifications")]
+        public async Task<IActionResult> GetNotificationsByHobbyistId(long hobbyistId)
         {
-            var notifications = await _notificationCommandService.ListNotificationsReceivedByHobbyistIdAsync(hoobyistId);
+            var notifications = await _notificationCommandService.ListNotificationsReceivedByHobbyistIdAsync(hobbyistId);
             var result = _mapper.Map<IEnumerable<NotificationResource>>(notifications);
 
             return Ok(result);

diff --git a/PERUSTARS/PERUSTARS/ProfileManagement/Interface/REST/ArtistsController.cs b/PERUSTARS/PERUSTARS/ProfileManagement/Interface/REST/ArtistsController.cs
@@ -5,6 +5,8 @@
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using PERUSTARS.CommunicationAndNotificationManagement.Domain.Services;
+using PERUSTARS.CommunicationAndNotificationManagement.Interfaces.REST.Resources;
 using PERUSTARS.IdentityAndAccountManagement.Domain.Model.Attributes;
 using PERUSTARS.ProfileManagement.Application.Exceptions;
 using PERUSTARS.ProfileManagement.Domain.Model.Aggregates;

diff --git a/PERUSTARS/PERUSTARS/Shared/Profiles/ResourceToCommandProfile.cs b/PERUSTARS/PERUSTARS/Shared/Profiles/ResourceToCommandProfile.cs
@@ -1,4 +1,6 @@
 using AutoMapper;
+using PERUSTARS.ArtEventManagement.Domain.Model.Commads;
+using PERUSTARS.ArtEventManagement.Interfaces.REST.Resources;
 using PERUSTARS.ArtworkManagement.Domain.Model.Commands;
 using PERUSTARS.ArtworkManagement.Interfaces.REST.Resources;
 using PERUSTARS.CommunicationAndNotificationManagement.Domain.Model.Commands;
@@ -30,6 +32,7 @@ public ResourceToCommandProfile()
             CreateMap<NotificationResource, NotifyArtEventFinishedCommand>();
             CreateMap<NotificationResource, NotifyArtEventCancelledCommand>();
             CreateMap<NotificationResource, NotifyArtEventRescheduledCommand>();
+            CreateMap<UpdateArtEventResource, EditArtEventCommand>();
         }
     }
 }
diff --git a/PERUSTARS/PERUSTARS/Startup.cs b/PERUSTARS/PERUSTARS/Startup.cs
@@ -105,8 +105,8 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddDbContext<AppDbContext>(options =>
             {
-                //options.UseNpgsql(Configuration.GetConnectionString("PostgresSQLConnection"));
-                options.UseMySQL(Configuration.GetConnectionString("DefaultConnection"));
+                options.UseNpgsql(Configuration.GetConnectionString("PostgresSQLConnection"));
+                //options.UseMySQL(Configuration.GetConnectionString("DefaultConnection"));
             });
 
             services.AddMediatR(cfg => cfg.RegisterServicesFromAssembly(Assembly.GetExecutingAssembly()));

diff --git a/PERUSTARS/PERUSTARS/appsettings.json b/PERUSTARS/PERUSTARS/appsettings.json
@@ -13,10 +13,10 @@
 
 
     //"DefaultConnection1ssssss": "server=localhost;port=3306;database=perustars;uid=root;password=admin",
-    "DefaultConnection": "server=perustars-main-db.mysql.database.azure.com;port=3306;database=perustars;uid=perustarsAdmin;password=Admin123"
+    //"DefaultConnection": "server=perustars-main-db.mysql.database.azure.com;port=3306;database=perustars;uid=perustarsAdmin;password=Admin123"
     //"DefaultConnection3": "Server=MYSQL5047.site4now.net;Database=db_a758df_perusta;Uid=a758df_perusta;Pwd=password1",
     //"DefaultConnection": "Server=bufyroukqdunhwcivvpo-mysql.services.clever-cloud.com;Database=bufyroukqdunhwcivvpo;Uid=ubcldvvxbrtlhp2d;Pwd=FltJthiJHLXaKDmKT11O"
-    //"PostgresSQLConnection": "host=localhost;port=5432;username=postgres;password=12345;database=perustars"
+    "PostgresSQLConnection": "host=localhost;port=5432;username=postgres;password=12345;database=perustars"
     //"DefaultConnection":  "host=localhost;port=3306;username=root;password=password;database=perustars"
     // "DefaultConnection": "server=localhost;port=3306;database=perustars;uid=root;password=root"
   },

diff --git a/PERUSTARS/PERUSTARS/bin/Debug/net5.0/PERUSTARS.dll b/PERUSTARS/PERUSTARS/bin/Debug/net5.0/PERUSTARS.dll
diff --git a/PERUSTARS/PERUSTARS/bin/Debug/net5.0/PERUSTARS.pdb b/PERUSTARS/PERUSTARS/bin/Debug/net5.0/PERUSTARS.pdb