DrinkRateAPI/ApiModels/UserProfile/UserProfileGet.cs

@@ -1,6 +0,0 @@
-namespace DrinkRateAPI.ApiModels.UserProfile;
-
-public class UserProfileGet
-{
-
-}

DrinkRateAPI/ApiModels/UserProfile/UserProfilePut.cs

@@ -1,6 +0,0 @@
-namespace DrinkRateAPI.ApiModels.UserProfile;
-
-public class UserProfilePut
-{
-    public string UserName { get; set; }
-}

DrinkRateAPI/Controllers/AdminController.cs

@@ -0,0 +1,30 @@
+using DrinkRateAPI.ApiModels.UserProfile;
+using DrinkRateAPI.Services;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace DrinkRateAPI.Controllers;
+
+[ApiController]
+[Route("admin")]
+[Authorize(Policy = "AdminOnly")]
+public class AdminController : ControllerBase
+{
+    private readonly ILogger<AdminController> _logger;
+    private readonly UserProfileService _userProfileService;
+
+    public AdminController(ILogger<AdminController> logger, UserProfileService userProfileService)
+    {
+        _logger = logger;
+        _userProfileService = userProfileService;
+    }
+
+    [HttpPut("users/{userId}/adminStatus")]
+    [Produces("application/json")]
+    public async Task<IActionResult> PutUserAdminStatus(string userId, [FromBody] ChangeAdminStatusBody body)
+    {
+        var changedProfile = await _userProfileService.ChangeUserAdminStatusAsync(userId, body.ChangeStatusTo);
+
+        return Ok(changedProfile);
+    }
+}

DrinkRateAPI/Controllers/UserProfileController.cs

@@ -1,39 +0,0 @@
-using System.Security.Claims;
-using DrinkRateAPI.ApiModels.UserProfile;
-using DrinkRateAPI.Services;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
-namespace DrinkRateAPI.Controllers;
-
-[ApiController]
-[Route("userProfile")]
-public class UserProfileController : ControllerBase
-{
-    private readonly ILogger<UserProfileController> _logger;
-    private readonly UserProfileService _userProfileService;
-
-    public UserProfileController(ILogger<UserProfileController> logger, UserProfileService userProfileService)
-    {
-        _logger = logger;
-        _userProfileService = userProfileService;
-    }
-    
-    [HttpPut(Name = "user_profile")]
-    public UserProfileGet PutUserProfile(UserProfilePut userProfile)
-    {
-        throw new ApplicationException();
-        var x = User.FindFirst(ClaimTypes.NameIdentifier)?.Value; //HttpContext.User.Identities.First();
-        return new();
-    }
-    
-    [HttpPut("{userId}/adminStatus")]
-    [Authorize(Policy = "AdminOnly")]
-    [Produces("application/json")]
-    public async Task<IActionResult> PutUserAdminStatus(string userId, [FromBody] ChangeAdminStatusBody body)
-    {
-        var changedProfile = await _userProfileService.PutUserProfileAdminStatusAsync(userId, body.ChangeStatusTo);
-
-        return Ok(changedProfile);
-    }
-}

DrinkRateAPI/Services/UserProfileService.cs

@@ -1,27 +1,21 @@
 using System.Security.Claims;
-using DrinkRateAPI.ApiModels.UserProfile;
 using DrinkRateAPI.Contexts;
 using DrinkRateAPI.DbEntities;
-using DrinkRateAPI.DbEntities;
 using DrinkRateAPI.Exceptions;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
 
 namespace DrinkRateAPI.Services;
 
-public class UserProfileService(ApplicationDbContext context, ApplicationUserService applicationUserService)
+public class UserProfileService(ApplicationDbContext context)
 {
     private ApplicationDbContext _context = context;
-    private ApplicationUserService _applicationUserService = applicationUserService;
 
     public bool IsUserProfileAdmin(DbUserProfile userProfile)
     {
         return userProfile.IsAdmin;
     }
 
-    public async Task<DbUserProfile> PutUserProfileAdminStatusAsync(string userId, bool changeStatusTo)
+    public async Task<DbUserProfile> ChangeUserAdminStatusAsync(string userId, bool changeStatusTo)
     {
         var userProfile = GetUserProfileById(userId);
         userProfile.IsAdmin = changeStatusTo;
@@ -31,15 +25,6 @@ public class UserProfileService(ApplicationDbContext context, ApplicationUserSer
         return userProfile;
     }
 
-    public async Task<UserProfileGet> PutUserProfileAsync(UserProfilePut userProfile, ClaimsPrincipal identity)
-    {
-        var profile = _applicationUserService.UserProfileByApplicationUserAsync(identity);
-
-
-
-        return new();
-    }
-
     public DbUserProfile GetUserProfileById(string userId)
     {
         var userProfile = _context.UserProfiles.FirstOrDefault(x => x.Id.ToString() == userId);