From 0de41a2ce82860e5c57eb5cfe98d39cf7ba96898 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karol=20G=C3=B3rzy=C5=84ski?= <kargor8@st.amu.edu.pl>
Date: Mon, 21 Dec 2020 13:30:59 +0100
Subject: [PATCH] Changed method to return characters

---
 .../Intefraces/ICharacterService.cs                |  2 +-
 .../Services/CharacterService.cs                   | 14 +++++++-------
 .../Controllers/CharacterController.cs             |  7 ++-----
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/SessionCompanion/SessionCompanion.Services/Intefraces/ICharacterService.cs b/SessionCompanion/SessionCompanion.Services/Intefraces/ICharacterService.cs
index 10a23bd..4f33dba 100644
--- a/SessionCompanion/SessionCompanion.Services/Intefraces/ICharacterService.cs
+++ b/SessionCompanion/SessionCompanion.Services/Intefraces/ICharacterService.cs
@@ -10,7 +10,7 @@ namespace SessionCompanion.Services.Interfaces
 {
     public interface ICharacterService : IServiceBase<CharacterViewModel, Character>
     {
-        Task<CharacterBasicStatsViewModel> GetBasicCharacterData(int characterId);
+        Task<IEnumerable<CharacterBasicStatsViewModel>> GetBasicCharactersData(List<int> charactersId);
         Task<IEnumerable<CharacterForLoginViewModel>> GetUserLoginCharacters(int userId);
     }
 }
diff --git a/SessionCompanion/SessionCompanion.Services/Services/CharacterService.cs b/SessionCompanion/SessionCompanion.Services/Services/CharacterService.cs
index 1a1a176..a336d42 100644
--- a/SessionCompanion/SessionCompanion.Services/Services/CharacterService.cs
+++ b/SessionCompanion/SessionCompanion.Services/Services/CharacterService.cs
@@ -40,14 +40,14 @@ namespace SessionCompanion.Services.Services
         /// <summary>
         /// Funkcja zwraca podstawowy widok postaci na podstawie ich id
         /// </summary>
-        /// <param name="characterId">identyfikator postaci</param>
-        /// <returns>Podstawowy widok danej postaci</returns>
-        public async Task<CharacterBasicStatsViewModel> GetBasicCharacterData(int characterId)
+        /// <param name="charactersId">Lista identyfikatorów postaci</param>
+        /// <returns>Podstawowy widok podanych postaci</returns>
+        public async Task<IEnumerable<CharacterBasicStatsViewModel>> GetBasicCharactersData(List<int> charactersId)
         {
-            var characters = await Repository.Get(c => c.Id == characterId)
-                                    .Include(x => x.Biography)
-                                    .Include(x => x.Statistics).ToListAsync();
-            var result = Mapper.Map<CharacterBasicStatsViewModel>(characters);
+            var characters = await Repository.Get(c => charactersId.Contains(c.Id))
+                                                .Include(x => x.Biography)
+                                                .Include(x => x.Statistics).ToListAsync();
+            var result = Mapper.Map<IEnumerable<CharacterBasicStatsViewModel>>(characters);
             return result;
         }
 
diff --git a/SessionCompanion/SessionCompanion/Controllers/CharacterController.cs b/SessionCompanion/SessionCompanion/Controllers/CharacterController.cs
index 1fcb3d9..d35eb6f 100644
--- a/SessionCompanion/SessionCompanion/Controllers/CharacterController.cs
+++ b/SessionCompanion/SessionCompanion/Controllers/CharacterController.cs
@@ -71,13 +71,10 @@ namespace SessionCompanion.Controllers
         [HttpGet("loggedCharacters")]
         public async Task<Either<List<CharacterBasicStatsViewModel>, ErrorResponse>> GetLoggedUsersCharacters()
         {
-            List<CharacterBasicStatsViewModel> characters = new List<CharacterBasicStatsViewModel>();
             var connectedCharacters = _sessionHubData.ConnectedCharacters_Prop;
+            var characters = await _service.GetBasicCharactersData(connectedCharacters.Values.ToList());
 
-            foreach (var characterId in connectedCharacters.Values)
-                characters.Add(await _service.GetBasicCharacterData(characterId));
-
-            return characters;
+            return characters.ToList();
         }
     }
 }
\ No newline at end of file