Merge pull request #12 from ProjectVG/feature/refactoring

Feature/refactoring

Author: ImGdevel

.gitignore

@@ -114,6 +114,12 @@ Thumbs.db
 .DS_Store
 Desktop.ini
 
+# Shell configuration files
+.zshrc
+.bashrc
+.bash_profile
+.profile
+
 # Crash dumps
 *.dmp
 

ProjectVG.Api/ApiServiceCollectionExtensions.cs

@@ -70,7 +70,7 @@ public static IServiceCollection AddDevelopmentCors(this IServiceCollection serv
             services.AddCors(options => {
                 options.AddPolicy("AllowAll",
                     policy => policy.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader()
-                        .WithExposedHeaders("X-Access-Token", "X-Refresh-Token", "X-Expires-In", "X-UID"));
+                        .WithExposedHeaders("X-Access-Credit", "X-Refresh-Credit", "X-Expires-In", "X-UID"));
             });
 
             return services;

ProjectVG.Api/Controllers/AuthController.cs

@@ -1,10 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
 using ProjectVG.Application.Services.Auth;
+using ProjectVG.Common.Constants;
+using ProjectVG.Common.Exceptions;
 
 namespace ProjectVG.Api.Controllers
 {
     [ApiController]
-    [Route("api/v1/[controller]")]
+    [Route("api/v1/auth")]
     public class AuthController : ControllerBase
     {
         private readonly IAuthService _authService;
@@ -14,14 +16,16 @@ public AuthController(IAuthService authService)
             _authService = authService;
         }
 
+        /// <summary>
+        /// Access Token 갱신
+        /// </summary>
         [HttpPost("refresh")]
         public async Task<IActionResult> RefreshToken()
         {
             var refreshToken = GetRefreshTokenFromHeader();
-            var result = await _authService.RefreshTokenAsync(refreshToken);
-            
-            return Ok(new
-            {
+            var result = await _authService.RefreshAccessTokenAsync(refreshToken);
+
+            return Ok(new {
                 success = true,
                 tokens = result.Tokens,
                 user = result.User
@@ -33,9 +37,8 @@ public async Task<IActionResult> Logout()
         {
             var refreshToken = GetRefreshTokenFromHeader();
             var success = await _authService.LogoutAsync(refreshToken);
-            
-            return Ok(new
-            {
+
+            return Ok(new {
                 success = success,
                 message = success ? "Logout successful" : "Logout failed"
             });
@@ -44,15 +47,13 @@ public async Task<IActionResult> Logout()
         [HttpPost("guest-login")]
         public async Task<IActionResult> GuestLogin([FromBody] string guestId)
         {
-            if (string.IsNullOrEmpty(guestId))
-            {
+            if (string.IsNullOrEmpty(guestId)) {
                 throw new ValidationException(ErrorCode.GUEST_ID_INVALID);
             }
 
-            var result = await _authService.LoginWithOAuthAsync("guest", guestId);
-            
-            return Ok(new
-            {
+            var result = await _authService.GuestLoginAsync(guestId);
+
+            return Ok(new {
                 success = true,
                 tokens = result.Tokens,
                 user = result.User
@@ -61,7 +62,7 @@ public async Task<IActionResult> GuestLogin([FromBody] string guestId)
 
         private string GetRefreshTokenFromHeader()
         {
-            return Request.Headers["X-Refresh-Token"].FirstOrDefault() ?? string.Empty;
+            return Request.Headers["X-Refresh-Credit"].FirstOrDefault() ?? string.Empty;
         }
     }
-} 
+}

ProjectVG.Api/Controllers/CharacterController.cs

@@ -3,6 +3,8 @@
 using ProjectVG.Application.Models.Character;
 using ProjectVG.Api.Models.Character.Request;
 using ProjectVG.Api.Models.Character.Response;
+using ProjectVG.Api.Filters;
+using System.Security.Claims;
 
 namespace ProjectVG.Api.Controllers
 {
@@ -19,6 +21,16 @@ public CharacterController(ICharacterService characterService, ILogger<Character
             _logger = logger;
         }
 
+        private Guid? GetCurrentUserId()
+        {
+            var userIdClaim = User.FindFirst("user_id")?.Value;
+            if (Guid.TryParse(userIdClaim, out var userId))
+            {
+                return userId;
+            }
+            return null;
+        }
+
         [HttpGet]
         public async Task<ActionResult<IEnumerable<CharacterResponse>>> GetAllCharacters()
         {
@@ -35,29 +47,81 @@ public async Task<ActionResult<CharacterResponse>> GetCharacterById(Guid id)
             return Ok(response);
         }
 
-        [HttpPost]
-        public async Task<ActionResult<CharacterResponse>> CreateCharacter([FromBody] CreateCharacterRequest request)
+        [HttpPost("individual")]
+        [JwtAuthentication]
+        public async Task<ActionResult<CharacterResponse>> CreateCharacterWithFields([FromBody] CreateCharacterWithFieldsRequest request)
         {
-            var command = request.ToCreateCharacterCommand();
-            var characterDto = await _characterService.CreateCharacterAsync(command);
+            var userId = GetCurrentUserId();
+            var command = request.ToCommand(userId);
+            var characterDto = await _characterService.CreateCharacterWithFieldsAsync(command);
             var response = CharacterResponse.ToResponseDto(characterDto);
             return CreatedAtAction(nameof(GetCharacterById), new { id = response.Id }, response);
         }
 
-        [HttpPut("{id}")]
-        public async Task<ActionResult<CharacterResponse>> UpdateCharacter(Guid id, [FromBody] UpdateCharacterRequest request)
+        [HttpPost("systemprompt")]
+        [JwtAuthentication]
+        public async Task<ActionResult<CharacterResponse>> CreateCharacterWithSystemPrompt([FromBody] CreateCharacterWithSystemPromptRequest request)
+        {
+            var userId = GetCurrentUserId();
+            var command = request.ToCommand(userId);
+            var characterDto = await _characterService.CreateCharacterWithSystemPromptAsync(command);
+            var response = CharacterResponse.ToResponseDto(characterDto);
+            return CreatedAtAction(nameof(GetCharacterById), new { id = response.Id }, response);
+        }
+
+        [HttpPut("{id}/individual")]
+        public async Task<ActionResult<CharacterResponse>> UpdateCharacterToIndividual(Guid id, [FromBody] UpdateCharacterToIndividualRequest request)
+        {
+            var command = request.ToCommand(id);
+            var characterDto = await _characterService.UpdateCharacterToIndividualAsync(command);
+            var response = CharacterResponse.ToResponseDto(characterDto);
+            return Ok(response);
+        }
+
+        [HttpPut("{id}/systemprompt")]
+        public async Task<ActionResult<CharacterResponse>> UpdateCharacterToSystemPrompt(Guid id, [FromBody] UpdateCharacterToSystemPromptRequest request)
         {
-            var command = request.ToUpdateCharacterCommand();
-            var characterDto = await _characterService.UpdateCharacterAsync(id, command);
+            var command = request.ToCommand(id);
+            var characterDto = await _characterService.UpdateCharacterToSystemPromptAsync(command);
             var response = CharacterResponse.ToResponseDto(characterDto);
             return Ok(response);
         }
 
         [HttpDelete("{id}")]
+        [JwtAuthentication]
         public async Task<ActionResult> DeleteCharacter(Guid id)
         {
-            await _characterService.DeleteCharacterAsync(id);
+            var userId = GetCurrentUserId();
+            if (!userId.HasValue)
+            {
+                return Unauthorized();
+            }
+
+            await _characterService.DeleteCharacterAsync(id, userId.Value);
             return NoContent();
         }
+
+        [HttpGet("my")]
+        [JwtAuthentication]
+        public async Task<ActionResult<IEnumerable<CharacterResponse>>> GetMyCharacters([FromQuery] string orderBy = "latest")
+        {
+            var userId = GetCurrentUserId();
+            if (!userId.HasValue)
+            {
+                return Unauthorized();
+            }
+
+            var characterDtos = await _characterService.GetMyCharactersAsync(userId.Value, orderBy);
+            var responses = characterDtos.Select(CharacterResponse.ToResponseDto);
+            return Ok(responses);
+        }
+
+        [HttpGet("public")]
+        public async Task<ActionResult<IEnumerable<CharacterResponse>>> GetPublicCharacters([FromQuery] string orderBy = "latest")
+        {
+            var characterDtos = await _characterService.GetPublicCharactersAsync(orderBy);
+            var responses = characterDtos.Select(CharacterResponse.ToResponseDto);
+            return Ok(responses);
+        }
     }
 } 

ProjectVG.Api/Controllers/ChatController.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using ProjectVG.Application.Models.Chat;
-using ProjectVG.Application.Models.API.Request;
+using ProjectVG.Api.Models.Chat.Request;
 using ProjectVG.Application.Services.Chat;
 using System.Security.Claims;