Merge pull request #145 from LeadOn/develop

Fixed issues with LoL routes + updated way to store pictures for players and tournaments

Author: LeadOn

GameOn.Application/Common/Changelogs/Commands/CreateChangelog/CreateChangelogCommand.cs

@@ -7,7 +7,7 @@ namespace GameOn.Application.Common.Changelogs.Commands.CreateChangelog
     using GameOn.Common.DTOs;
     using GameOn.Domain;
     using MediatR;
-    
+
     /// <summary>
     /// CreateChangelogCommand class.
     /// </summary>

GameOn.Application/Common/Changelogs/Commands/DeleteChangelog/DeleteChangelogCommandHandler.cs

@@ -2,14 +2,11 @@
 // Copyright (c) LeadOn's Corp'. All rights reserved.
 // </copyright>
 
-using AutoMapper;
-using Microsoft.EntityFrameworkCore;
-
 namespace GameOn.Application.Common.Changelogs.Commands.DeleteChangelog
 {
     using GameOn.Common.Interfaces;
-    using GameOn.Domain;
     using MediatR;
+    using Microsoft.EntityFrameworkCore;
 
     /// <summary>
     /// DeleteChangelogCommandHandler class.

GameOn.Application/Common/Changelogs/Commands/UpdateChangelog/UpdateChangelogCommand.cs

@@ -7,7 +7,7 @@ namespace GameOn.Application.Common.Changelogs.Commands.UpdateChangelog
     using GameOn.Common.DTOs;
     using GameOn.Domain;
     using MediatR;
-    
+
     /// <summary>
     /// UpdateChangelogCommand class.
     /// </summary>

GameOn.Application/Common/Changelogs/Commands/UpdateChangelog/UpdateChangelogCommandHandler.cs

@@ -2,14 +2,13 @@
 // Copyright (c) LeadOn's Corp'. All rights reserved.
 // </copyright>
 
-using AutoMapper;
-using Microsoft.EntityFrameworkCore;
-
 namespace GameOn.Application.Common.Changelogs.Commands.UpdateChangelog
 {
+    using AutoMapper;
     using GameOn.Common.Interfaces;
     using GameOn.Domain;
     using MediatR;
+    using Microsoft.EntityFrameworkCore;
 
     /// <summary>
     /// UpdateChangelogCommandHandler class.

GameOn.Application/Common/Changelogs/Queries/GetLatestChangelog/GetLatestChangelogQuery.cs

@@ -1,4 +1,4 @@
-// <copyright file="GetLatestChangelog.cs" company="LeadOn's Corp'">
+// <copyright file="GetLatestChangelogQuery.cs" company="LeadOn's Corp'">
 // Copyright (c) LeadOn's Corp'. All rights reserved.
 // </copyright>
 

GameOn.Application/Common/Home/Queries/GetHomeData/GetHomeDataQueryHandler.cs

@@ -2,10 +2,9 @@
 // Copyright (c) LeadOn's Corp'. All rights reserved.
 // </copyright>
 
-using GameOn.Application.Common.Changelogs.Queries.GetLatestChangelog;
-
 namespace GameOn.Application.Common.Home.Queries.GetHomeData
 {
+    using GameOn.Application.Common.Changelogs.Queries.GetLatestChangelog;
     using GameOn.Application.FIFA.Seasons.Queries.GetCurrentSeason;
     using GameOn.Application.FIFA.Tournaments.Queries.GetFeaturedTournaments;
     using GameOn.Common.DTOs.Common;

GameOn.Application/Common/Players/Commands/UpdateConnectedPlayer/UpdateConnectedPlayerCommandHandler.cs

@@ -45,21 +45,12 @@ public async Task<Player> Handle(UpdateConnectedPlayerCommand request, Cancellat
             playerInDb.FullName = request.Player.FullName;
             playerInDb.Nickname = request.Player.Nickname;
 
-            if (request.Player.ProfilePictureUrl is not null && request.Player.ProfilePictureUrl != string.Empty)
-            {
-                playerInDb.ProfilePictureUrl = request.Player.ProfilePictureUrl;
-            }
-            else
-            {
-                playerInDb.ProfilePictureUrl = "https://gameon.valentinvirot.fr/assets/img/gameon-logo.webp";
-            }
-
             if (request.Player.RiotGamesNickname is not null && request.Player.RiotGamesTagLine is not null)
             {
                 // First, checking if player isn't already present in DB
                 var playersWithRiotCombo = await this.context.Players.FirstOrDefaultAsync(x => x.RiotGamesNickname == request.Player.RiotGamesNickname && x.RiotGamesTagLine == request.Player.RiotGamesTagLine, cancellationToken);
 
-                if (playersWithRiotCombo is not null)
+                if (playersWithRiotCombo is not null && playersWithRiotCombo.Id != playerInDb.Id)
                 {
                     return playerInDb;
                 }
@@ -79,7 +70,9 @@ public async Task<Player> Handle(UpdateConnectedPlayerCommand request, Cancellat
 
                         if (summonerIdFromRiot is not null)
                         {
-                            playerInDb.LolSummonerId = summonerIdFromRiot.SummonerId;
+                            playerInDb.LolSummonerLevel = summonerIdFromRiot.SummonerLevel;
+                            playerInDb.LolIconId = summonerIdFromRiot.ProfileIconId;
+                            playerInDb.LolRefreshedOn = DateTime.Now;
                         }
                     }
                 }

GameOn.Application/Common/Players/Commands/UpdatePlayer/UpdatePlayerCommandHandler.cs

@@ -28,7 +28,7 @@ public UpdatePlayerCommandHandler(IApplicationDbContext context)
         /// <inheritdoc />
         public async Task<Player> Handle(UpdatePlayerCommand request, CancellationToken cancellationToken)
         {
-            var playerInDb = await this.context.Players.FirstOrDefaultAsync(x => x.Id == request.Player.Id);
+            var playerInDb = await this.context.Players.FirstOrDefaultAsync(x => x.Id == request.Player.Id, cancellationToken);
 
             if (playerInDb == null)
             {
@@ -37,7 +37,6 @@ public async Task<Player> Handle(UpdatePlayerCommand request, CancellationToken
 
             playerInDb.FullName = request.Player.FullName;
             playerInDb.Nickname = request.Player.Nickname;
-            playerInDb.ProfilePictureUrl = request.Player.ProfilePictureUrl ?? "https://gameon.valentinvirot.fr/assets/img/gameon-logo.webp";
             playerInDb.KeycloakId = request.Player.KeycloakId;
             playerInDb.Archived = request.Player.Archived;
 

GameOn.Application/Common/Players/Commands/UpdatePlayerProfilePicture/UpdatePlayerProfilePictureCommand.cs

@@ -0,0 +1,29 @@
+// <copyright file="UpdatePlayerProfilePictureCommand.cs" company="LeadOn's Corp'">
+// Copyright (c) LeadOn's Corp'. All rights reserved.
+// </copyright>
+
+namespace GameOn.Application.Common.Players.Commands.UpdatePlayerProfilePicture
+{
+    using GameOn.Common.DTOs;
+    using GameOn.Domain;
+    using MediatR;
+    using Microsoft.AspNetCore.Http;
+
+    /// <summary>
+    /// UpdatePlayerProfilePictureCommand class.
+    /// </summary>
+    public class UpdatePlayerProfilePictureCommand : IRequest<bool>
+    {
+        /// <summary>
+        /// Gets or sets Player ID.
+        /// </summary>
+        public int PlayerId { get; set; }
+
+        /// <summary>
+        /// Gets or sets File.
+        /// </summary>
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
+        public IFormFile File { get; set; }
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
+    }
+}

GameOn.Application/Common/Players/Commands/UpdatePlayerProfilePicture/UpdatePlayerProfilePictureCommandHandler.cs

@@ -0,0 +1,64 @@
+// <copyright file="UpdatePlayerProfilePictureCommandHandler.cs" company="LeadOn's Corp'">
+// Copyright (c) LeadOn's Corp'. All rights reserved.
+// </copyright>
+
+namespace GameOn.Application.Common.Players.Commands.UpdatePlayerProfilePicture
+{
+    using GameOn.Application.Common.Players.Queries.GetPlayerById;
+    using GameOn.Common.Exceptions;
+    using GameOn.Common.Interfaces;
+    using GameOn.Domain;
+    using GameOn.External.NetworkStorage.Interfaces;
+    using MediatR;
+    using Microsoft.EntityFrameworkCore;
+
+    /// <summary>
+    /// UpdatePlayerProfilePictureCommandHandler class.
+    /// </summary>
+    public class UpdatePlayerProfilePictureCommandHandler : IRequestHandler<UpdatePlayerProfilePictureCommand, bool>
+    {
+        private readonly IMediator mediator;
+        private readonly IApplicationDbContext context;
+        private readonly INetworkStorageService nsService;
+        private readonly string bucketName = Environment.GetEnvironmentVariable("S3_BUCKET_NAME") ?? throw new MissingEnvironmentVariableException("S3_BUCKET_NAME");
+        private readonly string ppBasePath = Environment.GetEnvironmentVariable("S3_PP_BASE_PATH") ?? throw new MissingEnvironmentVariableException("S3_PP_BASE_PATH");
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UpdatePlayerProfilePictureCommandHandler"/> class.
+        /// </summary>
+        /// <param name="context">DbContext, injected.</param>
+        /// <param name="nsService">NetworkStorageService, injected.</param>
+        /// <param name="mediator">Mediator, injected.</param>
+        public UpdatePlayerProfilePictureCommandHandler(IApplicationDbContext context, INetworkStorageService nsService, IMediator mediator)
+        {
+            this.context = context;
+            this.nsService = nsService;
+            this.mediator = mediator;
+        }
+
+        /// <inheritdoc />
+        public async Task<bool> Handle(UpdatePlayerProfilePictureCommand request, CancellationToken cancellationToken)
+        {
+            try
+            {
+                await this.nsService.UploadFile(this.bucketName, this.ppBasePath + "/" + request.PlayerId + Path.GetExtension(request.File.FileName), request.File);
+
+                // now that file is uploaded, updating user
+                var playerInDb = await this.mediator.Send(new GetPlayerByIdQuery { PlayerId = request.PlayerId }, cancellationToken);
+
+                if (playerInDb is not null)
+                {
+                    playerInDb.ProfilePictureUrl = request.PlayerId + Path.GetExtension(request.File.FileName);
+                    this.context.Players.Update(playerInDb);
+                    await this.context.SaveChangesAsync(cancellationToken);
+                }
+
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+    }
+}