Develop

.github/workflows/deployapi.yml

@@ -0,0 +1,67 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy Resellio Backend
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: windows-latest
+    permissions:
+      contents: read #This is required for actions/checkout
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up .NET Core
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '9.x'
+
+      - name: Build with dotnet
+        run: dotnet build TickAPI/TickAPI/TickAPI.csproj --configuration Release
+
+      - name: dotnet publish
+        run: dotnet publish TickAPI/TickAPI/TickAPI.csproj -c Release -o "${{env.DOTNET_ROOT}}/myapp"
+
+      - name: Upload artifact for deployment job
+        uses: actions/upload-artifact@v4
+        with:
+          name: .net-app
+          path: ${{env.DOTNET_ROOT}}/myapp
+
+  deploy:
+    runs-on: windows-latest
+    needs: build
+    environment:
+      name: 'Production'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+    permissions:
+      id-token: write #This is required for requesting the JWT
+      contents: read #This is required for actions/checkout
+
+    steps:
+      - name: Download artifact from build job
+        uses: actions/download-artifact@v4
+        with:
+          name: .net-app
+
+      - name: Login to Azure
+        uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_F22C931708554F8B83EE4F83C4FED407 }}
+          tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_6CDAC678ACD94858BF3421F606456B8B }}
+          subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_CA368EC8EA37446E96D5DF5F42B650EA }}
+
+      - name: Deploy to Azure Web App
+        id: deploy-to-webapp
+        uses: azure/webapps-deploy@v3
+        with:
+          app-name: 'resellio'
+          slot-name: 'Production'
+          package: .

TickAPI/TickAPI.Tests/Categories/Controllers/CategoryControllerTests.cs → TickAPI/TickAPI.Tests/Categories/Controllers/CategoriesControllerTests.cs

@@ -12,7 +12,7 @@
 
 namespace TickAPI.Tests.Categories.Controllers;
 
-public class CategoryControllerTests
+public class CategoriesControllerTests
 {
     [Fact]
     public async Task GetCategories_WhenDataIsValid_ShouldReturnOk()
@@ -25,7 +25,7 @@ public async Task GetCategories_WhenDataIsValid_ShouldReturnOk()
             Result<PaginatedData<GetCategoryResponseDto>>.Success(new PaginatedData<GetCategoryResponseDto>(new List<GetCategoryResponseDto>(), pageNumber, pageSize, true, true,
                 new PaginationDetails(0, 0))));
 
-        var sut = new CategoryController(categoryServiceMock.Object);
+        var sut = new CategoriesController(categoryServiceMock.Object);
 
         // Act
         var res = await sut.GetCategories(pageSize, pageNumber);
@@ -49,7 +49,7 @@ public async Task CreateCategory_WhenDataIsValid_ShouldReturnSuccess()
             .Setup(m => m.CreateNewCategoryAsync(categoryName))
             .ReturnsAsync(Result<Category>.Success(new Category()));
 
-        var sut = new CategoryController(categoryServiceMock.Object);
+        var sut = new CategoriesController(categoryServiceMock.Object);
 
         // Act
         var res = await sut.CreateCategory(createCategoryDto);

TickAPI/TickAPI.Tests/Customers/Controllers/CustomerControllerTests.cs → TickAPI/TickAPI.Tests/Customers/Controllers/CustomersControllerTests.cs

@@ -14,7 +14,7 @@
 
 namespace TickAPI.Tests.Customers.Controllers;
 
-public class CustomerControllerTests
+public class CustomersControllerTests
 {
     [Fact]
     public async Task GoogleLogin_WhenAuthSuccessAndCustomerExists_ShouldReturnToken()
@@ -38,7 +38,7 @@ public async Task GoogleLogin_WhenAuthSuccessAndCustomerExists_ShouldReturnToken
 
         var claimsServiceMock = new Mock<IClaimsService>();
 
-        var sut = new CustomerController(
+        var sut = new CustomersController(
             googleAuthServiceMock.Object, 
             jwtServiceMock.Object, 
             customerServiceMock.Object,
@@ -83,7 +83,7 @@ public async Task GoogleLogin_WhenAuthSuccessAndCustomerDoesNotExist_ShouldCreat
 
         var claimsServiceMock = new Mock<IClaimsService>();
 
-        var sut = new CustomerController(
+        var sut = new CustomersController(
             googleAuthServiceMock.Object, 
             jwtServiceMock.Object, 
             customerServiceMock.Object,
@@ -137,7 +137,7 @@ public async Task AboutMe_WithValidEmailClaim_ShouldReturnCustomerDetails()
         var claimsServiceMock = new Mock<IClaimsService>();
         claimsServiceMock.Setup(m => m.GetEmailFromClaims(controllerContext.HttpContext.User.Claims)).Returns(Result<string>.Success(email));
 
-        var sut = new CustomerController(
+        var sut = new CustomersController(
             googleAuthServiceMock.Object,
             jwtServiceMock.Object,
             customerServiceMock.Object,
@@ -168,7 +168,7 @@ public async Task AboutMe_WithMissingEmailClaim_ShouldReturnBadRequest()
         claimsServiceMock.Setup(m => m.GetEmailFromClaims(It.IsAny<IEnumerable<Claim>>())).Returns(Result<string>.Failure(StatusCodes.Status400BadRequest, "missing email claim"));
 
 
-        var sut = new CustomerController(
+        var sut = new CustomersController(
             googleAuthServiceMock.Object,
             jwtServiceMock.Object,
             customerServiceMock.Object,
@@ -194,4 +194,4 @@ public async Task AboutMe_WithMissingEmailClaim_ShouldReturnBadRequest()
         Assert.Equal(StatusCodes.Status400BadRequest, objectResult.StatusCode);
         Assert.Equal("missing email claim", objectResult.Value);
     }
-}
+}

TickAPI/TickAPI.Tests/Events/Controllers/EventControllerTests.cs → TickAPI/TickAPI.Tests/Events/Controllers/EventsControllerTests.cs

@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using TickAPI.Addresses.DTOs.Request;
+using TickAPI.Categories.DTOs.Request;
 using TickAPI.Common.Claims.Abstractions;
 using TickAPI.Common.Pagination.Responses;
 using TickAPI.Events.Controllers;
@@ -13,10 +14,11 @@
 using TickAPI.Events.DTOs.Response;
 using TickAPI.Organizers.Abstractions;
 using TickAPI.Organizers.Models;
+using TickAPI.TicketTypes.DTOs.Request;
 
 namespace TickAPI.Tests.Events.Controllers;
 
-public class EventControllerTests
+public class EventsControllerTests
 {
     [Fact]
     public async Task CreateEvent_WhenDataIsValid_ShouldReturnSuccess()
@@ -30,12 +32,22 @@ public async Task CreateEvent_WhenDataIsValid_ShouldReturnSuccess()
         const string email = "123@mail.com";
         const EventStatus eventStatus = EventStatus.TicketsAvailable;
         Guid id = Guid.NewGuid();
+        List<CreateEventCategoryDto> categories =
+        [
+            new CreateEventCategoryDto("concert"),
+            new CreateEventCategoryDto("bear metal")
+        ];
+        List<CreateEventTicketTypeDto> ticketTypes =
+        [
+            new CreateEventTicketTypeDto("normal", 100, 50.9m, "zł",  new DateTime(2025, 5, 1)),
+            new CreateEventTicketTypeDto("V.I.P", 10, 500.9m, "zł",  new DateTime(2025, 5, 10)),
+        ];
         CreateAddressDto createAddress = new CreateAddressDto("United States", "New York", "Main st", 20, null, "00-000");
-        CreateEventDto eventDto = new CreateEventDto(name,  description, startDate,  endDate, minimumAge, eventStatus, createAddress);
+        CreateEventDto eventDto = new CreateEventDto(name,  description, startDate,  endDate, minimumAge, categories, ticketTypes, eventStatus, createAddress);
 
         var eventServiceMock = new Mock<IEventService>();
         eventServiceMock
-            .Setup(m => m.CreateNewEventAsync(name, description, startDate, endDate, minimumAge, createAddress, eventStatus, email))
+            .Setup(m => m.CreateNewEventAsync(name, description, startDate, endDate, minimumAge, createAddress, categories , ticketTypes, eventStatus, email))
             .ReturnsAsync(Result<Event>.Success(new Event()));
 
         var claims = new List<Claim>
@@ -55,7 +67,7 @@ public async Task CreateEvent_WhenDataIsValid_ShouldReturnSuccess()
 
         var organizerServiceMock = new Mock<IOrganizerService>();
 
-        var sut = new EventController(eventServiceMock.Object, claimsServiceMock.Object, organizerServiceMock.Object);
+        var sut = new EventsController(eventServiceMock.Object, claimsServiceMock.Object, organizerServiceMock.Object);
 
         sut.ControllerContext = controllerContext;
 
@@ -79,6 +91,17 @@ public async Task CreateEvent_WhenMissingEmailClaims_ShouldReturnBadRequest()
         DateTime endDate = new DateTime(2025, 6, 1);
         uint? minimumAge = 18;
         const EventStatus eventStatus = EventStatus.TicketsAvailable;
+        string email = "123@mail.com";
+        List<CreateEventCategoryDto> categories =
+        [
+            new CreateEventCategoryDto("concert"),
+            new CreateEventCategoryDto("bear metal")
+        ];
+        List<CreateEventTicketTypeDto> ticketTypes =
+        [
+            new CreateEventTicketTypeDto("normal", 100, 50.9m, "zł",  new DateTime(2025, 5, 1)),
+            new CreateEventTicketTypeDto("V.I.P", 10, 500.9m, "zł",  new DateTime(2025, 5, 10)),
+        ];
         CreateAddressDto createAddress = new CreateAddressDto("United States", "New York", "Main st", 20, null, "00-000");
 
         var eventServiceMock = new Mock<IEventService>();
@@ -87,7 +110,7 @@ public async Task CreateEvent_WhenMissingEmailClaims_ShouldReturnBadRequest()
 
         var organizerServiceMock = new Mock<IOrganizerService>();
 
-        var sut = new EventController(eventServiceMock.Object, claimsServiceMock.Object, organizerServiceMock.Object);
+        var sut = new EventsController(eventServiceMock.Object, claimsServiceMock.Object, organizerServiceMock.Object);
 
         sut.ControllerContext = new ControllerContext
         {
@@ -97,8 +120,8 @@ public async Task CreateEvent_WhenMissingEmailClaims_ShouldReturnBadRequest()
             }
         };
 
-        // Act
-        var res = await sut.CreateEvent(new CreateEventDto(name, description, startDate, endDate, minimumAge, eventStatus, createAddress));
+        // act
+        var res = await sut.CreateEvent(new CreateEventDto(name, description, startDate, endDate, minimumAge, categories, ticketTypes, eventStatus, createAddress));
 
         // Assert
         var result = Assert.IsType<ActionResult<CreateEventResponseDto>>(res);
@@ -158,7 +181,7 @@ public async Task GetOrganizerEvents_WhenAllOperationsSucceed_ShouldReturnOkWith
             .Setup(m => m.GetOrganizerEventsAsync(organizer, page, pageSize))
             .ReturnsAsync(Result<PaginatedData<GetEventResponseDto>>.Success(paginatedData));
 
-        var sut = new EventController(eventServiceMock.Object, claimsServiceMock.Object, organizerServiceMock.Object);
+        var sut = new EventsController(eventServiceMock.Object, claimsServiceMock.Object, organizerServiceMock.Object);
         sut.ControllerContext = controllerContext;
 
         // Act
@@ -195,7 +218,7 @@ public async Task GetOrganizerEvents_WhenEmailClaimIsMissing_ShouldReturnBadRequ
         var eventServiceMock = new Mock<IEventService>();
         var organizerServiceMock = new Mock<IOrganizerService>();
 
-        var sut = new EventController(eventServiceMock.Object, claimsServiceMock.Object, organizerServiceMock.Object);
+        var sut = new EventsController(eventServiceMock.Object, claimsServiceMock.Object, organizerServiceMock.Object);
         sut.ControllerContext = new ControllerContext
         {
             HttpContext = new DefaultHttpContext
@@ -248,7 +271,7 @@ public async Task GetOrganizerEvents_WhenOrganizerIsNotFound_ShouldReturnNotFoun
 
         var eventServiceMock = new Mock<IEventService>();
 
-        var sut = new EventController(eventServiceMock.Object, claimsServiceMock.Object, organizerServiceMock.Object);
+        var sut = new EventsController(eventServiceMock.Object, claimsServiceMock.Object, organizerServiceMock.Object);
         sut.ControllerContext = controllerContext;
 
         // Act
@@ -300,7 +323,7 @@ public async Task GetOrganizerEvents_WhenPaginationFails_ShouldReturnBadRequest(
             .Setup(m => m.GetOrganizerEventsAsync(organizer, page, pageSize))
             .ReturnsAsync(Result<PaginatedData<GetEventResponseDto>>.Failure(StatusCodes.Status400BadRequest, errorMessage));
 
-        var sut = new EventController(eventServiceMock.Object, claimsServiceMock.Object, organizerServiceMock.Object);
+        var sut = new EventsController(eventServiceMock.Object, claimsServiceMock.Object, organizerServiceMock.Object);
         sut.ControllerContext = controllerContext;
 
         // Act
@@ -352,7 +375,7 @@ public async Task GetOrganizerEventsPaginationDetails_WhenAllOperationsSucceed_S
             .Setup(m => m.GetOrganizerEventsPaginationDetailsAsync(organizer, pageSize))
             .ReturnsAsync(Result<PaginationDetails>.Success(paginationDetails));
 
-        var sut = new EventController(eventServiceMock.Object, claimsServiceMock.Object, organizerServiceMock.Object);
+        var sut = new EventsController(eventServiceMock.Object, claimsServiceMock.Object, organizerServiceMock.Object);
         sut.ControllerContext = controllerContext;
 
         // Act
@@ -406,7 +429,7 @@ public async Task GetOrganizerEventsPaginationDetails_WhenPaginationDetailsFails
             .Setup(m => m.GetOrganizerEventsPaginationDetailsAsync(organizer, pageSize))
             .ReturnsAsync(Result<PaginationDetails>.Failure(StatusCodes.Status400BadRequest, errorMessage));
 
-        var sut = new EventController(eventServiceMock.Object, claimsServiceMock.Object, organizerServiceMock.Object);
+        var sut = new EventsController(eventServiceMock.Object, claimsServiceMock.Object, organizerServiceMock.Object);
         sut.ControllerContext = controllerContext;
 
         // Act
@@ -447,7 +470,7 @@ public async Task GetEvents_WhenAllOperationsSucceed_ShouldReturnOkWithPaginated
             .Setup(m => m.GetEventsAsync(page, pageSize))
             .ReturnsAsync(Result<PaginatedData<GetEventResponseDto>>.Success(paginatedData));
 
-        var sut = new EventController(eventServiceMock.Object, claimsServiceMock.Object, organizerServiceMock.Object);
+        var sut = new EventsController(eventServiceMock.Object, claimsServiceMock.Object, organizerServiceMock.Object);
 
         // Act
         var response = await sut.GetEvents(pageSize, page);
@@ -484,7 +507,7 @@ public async Task GetEvents_WhenOperationFails_ShouldReturnErrorWithCorrectStatu
             .Setup(m => m.GetEventsAsync(page, pageSize))
             .ReturnsAsync(Result<PaginatedData<GetEventResponseDto>>.Failure(statusCode, errorMessage));
 
-        var sut = new EventController(eventServiceMock.Object, claimsServiceMock.Object, organizerServiceMock.Object);
+        var sut = new EventsController(eventServiceMock.Object, claimsServiceMock.Object, organizerServiceMock.Object);
 
         // Act
         var response = await sut.GetEvents(pageSize, page);
@@ -512,7 +535,7 @@ public async Task GetEventsPaginationDetails_WhenAllOperationsSucceed_ShouldRetu
             .Setup(m => m.GetEventsPaginationDetailsAsync(pageSize))
             .ReturnsAsync(Result<PaginationDetails>.Success(paginationDetails));
 
-        var sut = new EventController(eventServiceMock.Object, claimsServiceMock.Object, organizerServiceMock.Object);
+        var sut = new EventsController(eventServiceMock.Object, claimsServiceMock.Object, organizerServiceMock.Object);
 
         // Act
         var response = await sut.GetEventsPaginationDetails(pageSize);
@@ -543,7 +566,7 @@ public async Task GetEventsPaginationDetails_WhenOperationFails_ShouldReturnErro
             .Setup(m => m.GetEventsPaginationDetailsAsync(pageSize))
             .ReturnsAsync(Result<PaginationDetails>.Failure(statusCode, errorMessage));
 
-        var sut = new EventController(eventServiceMock.Object, claimsServiceMock.Object, organizerServiceMock.Object);
+        var sut = new EventsController(eventServiceMock.Object, claimsServiceMock.Object, organizerServiceMock.Object);
 
         // Act
         var response = await sut.GetEventsPaginationDetails(pageSize);