Merge branch 'release/v1.1.0' into main

Author: Morasiu

WizardWorldApi/.idea/.idea.WizardWorldApi/.idea/efCoreCommonOptions.xml

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build-env
 WORKDIR /app
 
 # Copy csproj and restore as distinct layers
@@ -10,7 +10,7 @@ COPY . .
 RUN dotnet publish -c Release -o out
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/aspnet:5.0
+FROM mcr.microsoft.com/dotnet/aspnet:9.0
 WORKDIR /app
 COPY --from=build-env /app/out .
 

WizardWorldApi/.idea/.idea.WizardWorldApi/.idea/efCoreDialogsState.xml

@@ -0,0 +1,5 @@
+namespace WizardWorld.Application;
+
+public interface IApplicationMarker
+{
+}

WizardWorldApi/Dockerfile

@@ -1,9 +1,6 @@
 using System.Collections.Generic;
 using MediatR.AspNet;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
 using WizardWorld.Persistance.Models.Elixirs;
-using WizardWorld.Persistance.Models.Ingredients;
-using WizardWorld.Persistance.Models.Wizards;
 
 namespace WizardWorld.Application.Requests.Elixirs.Queries.GetElixirs {
     public class GetElixirsQuery : IQuery<List<ElixirDto>> {

WizardWorldApi/WizardWorld.Application/IApplicationMarker.cs

@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using AutoMapper;
 using MediatR;
-using MediatR.AspNet.Exceptions;
 using WizardWorld.Application.Services.EmailProviders;
 
 namespace WizardWorld.Application.Requests.Feedback.Commands.SendFeedback {
@@ -13,10 +12,10 @@ public SendFeedbackCommandHandler(IMapper mapper, IEmailProvider provider) {
             _mapper = mapper;
             _provider = provider;
         }
-        public async Task<Unit> Handle(SendFeedbackCommand request, CancellationToken cancellationToken) {
+        public async Task Handle(SendFeedbackCommand request, CancellationToken cancellationToken) {
             var response = await _provider.SendFeedbackEmailAsync(_mapper.Map<FeedbackEmail>(request));
-            if (response.StatusCode == System.Net.HttpStatusCode.Accepted) {
-                return Unit.Value;
+            if (response.IsSuccess) {
+                return;
             }
 
             throw new EmailServiceFailureException("Email service failed");

WizardWorldApi/WizardWorld.Application/Requests/Elixirs/Queries/GetElixirs/GetElixirsQuery.cs

@@ -1,18 +1,17 @@
 using System;
 using System.Collections.Generic;
-using WizardWorld.Persistance.Models.Houses;
 
 namespace WizardWorld.Application.Requests.Houses {
     public class HouseDto {
-		public Guid Id { get; set; }
-		public string Name { get; set; }
-		public string HouseColours { get; set; }
-		public string Founder { get; set; }
-		public string Animal { get; set; }
-		public string Element { get; set; }
-		public string Ghost { get; set; }
-		public string CommonRoom { get; set; }
-		public ICollection<HouseHeadDto> Heads { get; set; }
-		public ICollection<TraitDto> Traits { get; set; }
-	}
+        public Guid Id { get; set; }
+        public string Name { get; set; }
+        public string HouseColours { get; set; }
+        public string Founder { get; set; }
+        public string Animal { get; set; }
+        public string Element { get; set; }
+        public string Ghost { get; set; }
+        public string CommonRoom { get; set; }
+        public ICollection<HouseHeadDto> Heads { get; set; }
+        public ICollection<TraitDto> Traits { get; set; }
+    }
 }

WizardWorldApi/WizardWorld.Application/Requests/Feedback/Commands/SendFeedback/SendFeedbackCommandHandler.cs

@@ -1,8 +1,8 @@
-using System;
-using MediatR.AspNet;
+using MediatR.AspNet;
+using System;
 
 namespace WizardWorld.Application.Requests.Houses.Queries.GetHouseById {
     public class GetHouseByIdQuery : IQuery<HouseDto> {
-		public Guid Id { get; set; }
-	}
+        public Guid Id { get; set; }
+    }
 }

WizardWorldApi/WizardWorld.Application/Requests/Houses/HouseDto.cs

@@ -1,21 +1,21 @@
-using System.Threading;
-using System.Threading.Tasks;
-using AutoMapper;
+using AutoMapper;
 using MediatR;
 using MediatR.AspNet.Exceptions;
 using Microsoft.EntityFrameworkCore;
+using System.Threading;
+using System.Threading.Tasks;
 using WizardWorld.Persistance;
 using WizardWorld.Persistance.Models.Houses;
 
 namespace WizardWorld.Application.Requests.Houses.Queries.GetHouseById {
-	public class GetHouseByIdQueryHandler : IRequestHandler<GetHouseByIdQuery, HouseDto> {
-		private readonly ApplicationDbContext _context;
-		private readonly IMapper _mapper;
+    public class GetHouseByIdQueryHandler : IRequestHandler<GetHouseByIdQuery, HouseDto> {
+        private readonly ApplicationDbContext _context;
+        private readonly IMapper _mapper;
 
-		public GetHouseByIdQueryHandler(ApplicationDbContext context, IMapper mapper) {
-			_context = context;
-			_mapper = mapper;
-		}
+        public GetHouseByIdQueryHandler(ApplicationDbContext context, IMapper mapper) {
+            _context = context;
+            _mapper = mapper;
+        }
 
 		public async Task<HouseDto> Handle(GetHouseByIdQuery request, CancellationToken cancellationToken) {
 			var houseEntity = await _context.Houses
@@ -27,7 +27,7 @@ public async Task<HouseDto> Handle(GetHouseByIdQuery request, CancellationToken
 				throw new NotFoundException(typeof(House), request.Id.ToString());
 			}
 
-			return _mapper.Map<HouseDto>(houseEntity);
-		}
-	}
+            return _mapper.Map<HouseDto>(houseEntity);
+        }
+    }
 }

WizardWorldApi/WizardWorld.Application/Requests/Houses/Queries/GetHouseById/GetHouseByIdQuery.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using MediatR.AspNet;
-using WizardWorld.Persistance.Models.Houses;
 
 namespace WizardWorld.Application.Requests.Houses.Queries.GetHouses {
     public class GetHousesQuery : IQuery<List<HouseDto>> { }