Merge pull request #79 from ezraroi/78-when-viewing-a-user-profile-it…

…-is-displayed-as-first-place-in-the-table fixed bug
ezraroi · Jul 11, 2024 · c9acb9c · c9acb9c
2 parents 4102556 + fbaa437
commit c9acb9c
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 6 deletions.
diff --git a/Mundialito/Client/src/app.js b/Mundialito/Client/src/app.js
@@ -39,6 +39,7 @@
                     teams: ['TeamsManager', (TeamsManager) => TeamsManager.loadAllTeams()],
                     generalBetsAreOpen: ['GeneralBetsManager', (GeneralBetsManager) => GeneralBetsManager.canSubmtiGeneralBet()],
                     players: ['PlayersManager', (PlayersManager) => PlayersManager.loadAllPlayers()],
+                    allUsers: ['UsersManager', (UsersManager) => UsersManager.loadAllUsers()]
                 }
             }).
             when('/manage_users', {

diff --git a/Mundialito/Controllers/UsersController.cs b/Mundialito/Controllers/UsersController.cs
@@ -133,18 +133,21 @@ public async Task<IList<UserModel>> GetFollowersAsync()
     }
 
     [HttpGet("{username}")]
-    public async Task<ActionResult<UserWithPointsModel>> GetUserByUsername(string username)
+    public async Task<ActionResult<UserModel>> GetUserByUsername(string username)
     {
         var user = await userManager.FindByNameAsync(username);
         if (user == null)
             return NotFound(new ErrorMessage { Message = string.Format("No such user '{0}'", username) });
-        var res = GetTableDetails(new List<MundialitoUser>{user}).ToList();
-        res.ForEach(user => IsAdmin(user));
-        return Ok(res.First());
+        var userModel = new UserModel(user);
+        betsRepository.GetUserBets(user.UserName).Where(bet => httpContextAccessor.HttpContext?.User.Identity.Name == username || !bet.IsOpenForBetting(dateTimeProvider.UTCNow)).ToList().ForEach(bet => userModel.AddBet(new BetViewModel(bet, dateTimeProvider.UTCNow)));
+        var generalBet = generalBetsRepository.GetUserGeneralBet(username);
+        if (generalBet != null)
+            userModel.SetGeneralBet(new GeneralBetViewModel(generalBet, tournamentTimesUtils.GetGeneralBetsCloseTime()));
+        return await IsAdmin(userModel);
     }
 
     [HttpGet("me")]
-    public async Task<ActionResult<UserWithPointsModel>> GetMe()
+    public async Task<ActionResult<UserModel>> GetMe()
     {
         return await GetUserByUsername(httpContextAccessor.HttpContext?.User.Identity.Name);
     }

diff --git a/Mundialito/Models/UserModel.cs b/Mundialito/Models/UserModel.cs
@@ -11,6 +11,7 @@ public UserModel(MundialitoUser user)
         Name = string.Format("{0} {1}", user.FirstName, user.LastName);
         Id = user.Id;
         Email = user.Email;
+        Points = 0;
     }
 
     [JsonPropertyName("Id")]
@@ -27,6 +28,21 @@ public UserModel(MundialitoUser user)
 
     [JsonPropertyName("Name")]
     public string Name { get; set; }
+
+    [JsonPropertyName("GeneralBet")]
+    public GeneralBetViewModel? GeneralBet { get; set; }
+
+    [JsonPropertyName("Points")]
+    public int Points { get; set; }
+
+    public void SetGeneralBet(GeneralBetViewModel generalBet)
+    {
+        GeneralBet = generalBet;
+        if (generalBet.IsResolved)
+        {
+            Points += generalBet.Points;
+        }
+    }
 
 }
 

diff --git a/Mundialito/wwwroot/js/app-min.js b/Mundialito/wwwroot/js/app-min.js
diff --git a/Mundialito/wwwroot/js/app.js b/Mundialito/wwwroot/js/app.js
@@ -39,6 +39,7 @@ angular.module('mundialitoApp', ['key-value-editor', 'security', 'ngSanitize', '
                     teams: ['TeamsManager', (TeamsManager) => TeamsManager.loadAllTeams()],
                     generalBetsAreOpen: ['GeneralBetsManager', (GeneralBetsManager) => GeneralBetsManager.canSubmtiGeneralBet()],
                     players: ['PlayersManager', (PlayersManager) => PlayersManager.loadAllPlayers()],
+                    allUsers: ['UsersManager', (UsersManager) => UsersManager.loadAllUsers()]
                 }
             }).
             when('/manage_users', {