Feat/12 check my profile

.github/workflows/ci-cd.yml

@@ -100,15 +100,15 @@ jobs:
       # 중요: PR이 생성되지 않았을 때만(코드 포맷이 완벽할 때만) 빌드/테스트를 진행합니다.
       - name: Build with Gradle
         if: steps.create_pr.outputs.pull-request-number == ''
-        run: ./gradlew build
         env:
-          DB_URL: ${{ secrets.DB_URL }}
-          DB_USERNAME: ${{ secrets.DB_USERNAME }}
-          DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
-          R2_ENDPOINT: ${{ secrets.R2_ENDPOINT }}
-          R2_BUCKET: ${{ secrets.R2_BUCKET }}
-          R2_ACCESS_KEY: ${{ secrets.R2_ACCESS_KEY }}
-          R2_SECRET_KEY: ${{ secrets.R2_SECRET_KEY }}
+          # Spring Boot는 이 환경 변수(API_TOKEN)를 인식하여
+          # application.properties의 ${API_TOKEN} 플레이스홀더를 치환합니다.
+          API_TOKEN: ${{ secrets.REPLICATE_API_TOKEN }}
+          # 만약 테스트 DB 등 다른 환경 변수가 필요하다면 아래와 같이 추가할 수 있습니다.
+          # DB_URL: ${{ secrets.DB_URL_TEST }}
+          # DB_USERNAME: ${{ secrets.DB_USERNAME_TEST }}
+          # DB_PASSWORD: ${{ secrets.DB_PASSWORD_TEST }}
+        run: ./gradlew build
 
       # 8. 테스트 결과 업로드
       - name: Publish Test Results

.gitignore

@@ -4,6 +4,7 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
+.properties
 
 ### STS ###
 .apt_generated

src/main/java/com/example/cp_main_be/global/GlobalExceptionHandler.java

@@ -0,0 +1,19 @@
+package com.example.cp_main_be.global;
+
+import com.example.cp_main_be.global.exception.UserNotFoundException;
+import com.example.cp_main_be.util.ApiResponse;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+@RestControllerAdvice
+public class GlobalExceptionHandler {
+
+  @ExceptionHandler(UserNotFoundException.class)
+  public ResponseEntity<ApiResponse<Object>> handleUserNotFoundException(UserNotFoundException e) {
+    ApiResponse<Object> response = ApiResponse.failure("USER_NOT_FOUND", e.getMessage());
+
+    return new ResponseEntity<>(response, HttpStatus.NOT_FOUND);
+  }
+}

src/main/java/com/example/cp_main_be/global/exception/UserNotFoundException.java

@@ -0,0 +1,7 @@
+package com.example.cp_main_be.global.exception;
+
+public class UserNotFoundException extends RuntimeException {
+  public UserNotFoundException(String message) {
+    super(message);
+  }
+}

src/main/java/com/example/cp_main_be/user/domain/User.java

@@ -3,15 +3,15 @@
 import jakarta.persistence.*;
 import java.time.LocalDateTime;
 import java.util.UUID;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.*;
 
 @Entity
 @Table(name = "users")
 @Getter
 @Setter
 @NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class User {
 
   @Id
@@ -31,11 +31,9 @@ public class User {
 
   private String profileImageUrl;
 
-  private Long level;
+  @Builder.Default private Long level = 1L; // 기본 레벨 설정
 
-  private Integer experiencePoints;
-
-  private Integer temperatureScore;
+  @Builder.Default private Integer temperatureScore = 0; // 기본 온도 점수 설정
 
   @Column(nullable = false)
   private LocalDateTime createdAt;
@@ -51,9 +49,6 @@ protected void onCreate() {
     this.uuid = UUID.randomUUID();
     this.createdAt = LocalDateTime.now();
     this.updatedAt = LocalDateTime.now(); // 최초 생성 시 updated_at도 설정
-    if (this.level == null) this.level = 1L; // 기본 레벨 설정
-    if (this.experiencePoints == null) this.experiencePoints = 0; // 기본 경험치 설정
-    if (this.temperatureScore == null) this.temperatureScore = 0; // 기본 온도 점수 설정
     if (this.status == null) this.status = UserStatus.ACTIVE; // 기본 상태 설정
   }
 

src/main/java/com/example/cp_main_be/user/domain/repository/UserRepository.java

@@ -2,9 +2,12 @@
 
 import com.example.cp_main_be.user.domain.User;
 import java.util.Optional;
+import java.util.UUID;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface UserRepository extends JpaRepository<User, Long> {
 
   Optional<User> findByUsername(String username);
+
+  Optional<User> findByUuid(UUID uuid);
 }

src/main/java/com/example/cp_main_be/user/dto/request/UserRequest.java

@@ -1,13 +1,14 @@
 package com.example.cp_main_be.user.dto.request;
 
+import java.util.UUID;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
 @Getter
 @RequiredArgsConstructor
 public class UserRequest {
 
-  private final Long userUuid;
+  private final UUID userUuid;
   private final Long userId;
   private final String username;
 }

src/main/java/com/example/cp_main_be/user/presentation/UserController.java

@@ -6,6 +6,7 @@
 import com.example.cp_main_be.user.service.UserService;
 import com.example.cp_main_be.util.ApiResponse;
 import jakarta.validation.Valid;
+import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -37,4 +38,10 @@ public ResponseEntity<ApiResponse<UserResponse>> register(
   //        return ResponseEntity.ok().build();
   //    }
 
+  @GetMapping("/users/{uuid}")
+  public ResponseEntity<ApiResponse<UserResponse>> getUserInfo(@PathVariable UUID uuid) {
+    User user = userService.findUserByUuid(uuid);
+    UserResponse userResponse = new UserResponse(user.getId(), user.getUsername(), user.getUuid());
+    return ResponseEntity.ok(ApiResponse.success(userResponse));
+  }
 }

src/main/java/com/example/cp_main_be/user/service/UserService.java

@@ -1,7 +1,9 @@
 package com.example.cp_main_be.user.service;
 
+import com.example.cp_main_be.global.exception.UserNotFoundException;
 import com.example.cp_main_be.user.domain.User;
 import com.example.cp_main_be.user.domain.repository.UserRepository;
+import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,7 +20,15 @@ public void saveUser(User user) {
   }
 
   public User findUserById(Long id) {
-    return this.userRepository.findById(id).orElse(null);
+    return this.userRepository
+        .findById(id)
+        .orElseThrow(() -> new UserNotFoundException("해당 ID의 사용자를 찾을 수 없습니다 : " + id));
+  }
+
+  public User findUserByUuid(UUID uuid) {
+    return this.userRepository
+        .findByUuid(uuid)
+        .orElseThrow(() -> new UserNotFoundException("해당 UUID의 사용자를 찾을 수 없습니다 : " + uuid));
   }
 
   // 실험용

src/test/java/com/example/cp_main_be/config/AbstractContainerBaseTest.java

@@ -1,34 +1,40 @@
 package com.example.cp_main_be.config;
 
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
 import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
-@SpringBootTest
 @Testcontainers // 1. 이 클래스가 Testcontainers를 사용함을 명시
 public abstract class AbstractContainerBaseTest {
 
   // 2. static으로 컨테이너를 정의합니다. (테스트 전체에 단 하나만 생성)
-  private static final PostgreSQLContainer<?> postgresqlContainer =
+  @Container
+  public static final PostgreSQLContainer<?> postgresqlContainer =
       new PostgreSQLContainer<>("postgres:15-alpine") // 사용할 PostgreSQL 이미지
           .withDatabaseName("testdb") // 사용할 데이터베이스 이름
           .withUsername("testuser") // 사용자 이름
           .withPassword("testpass"); // 비밀번호
 
-  // 3. 컨테이너를 static 블록에서 수동으로 시작합니다. (JUnit 5 확장기능의 자동시작보다 안정적)
-  static {
-    postgresqlContainer.start();
-  }
-
   // 4. Spring 컨텍스트가 로드되기 전에, 동적으로 데이터베이스 연결 정보를 설정합니다.
   @DynamicPropertySource
   static void setProperties(DynamicPropertyRegistry registry) {
+    // 데이터베이스 연결 정보 설정
     registry.add("spring.datasource.url", postgresqlContainer::getJdbcUrl);
     registry.add("spring.datasource.username", postgresqlContainer::getUsername);
     registry.add("spring.datasource.password", postgresqlContainer::getPassword);
     registry.add("spring.datasource.driver-class-name", postgresqlContainer::getDriverClassName);
-    registry.add("spring.jpa.hibernate.ddl-auto", () -> "create-drop"); // 테스트가 끝나면 스키마를 삭제하도록 설정
+    registry.add("spring.jpa.hibernate.ddl-auto", () -> "create-drop");
+
+    // 3. 누락된 다른 프로퍼티들을 여기에 추가해야 합니다!
+    // 이 값들이 없으면 Spring Context가 로드되지 못합니다.
+    registry.add("cloudflare.r2.endpoint", () -> "http://localhost:9000"); // 테스트용 더미값
+    registry.add("cloudflare.r2.bucket", () -> "test-bucket");
+    registry.add("cloudflare.r2.access-key", () -> "test-key");
+    registry.add("cloudflare.r2.secret-key", () -> "test-secret");
+
+    registry.add("replicate.api.token", () -> "dummy-token");
+    registry.add("replicate.api.url", () -> "https://api.replicate.com/test");
   }
 }

src/test/java/com/example/cp_main_be/user/presentation/UserControllerTest.java

@@ -1,70 +1,90 @@
 package com.example.cp_main_be.user.presentation;
 
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+
 import com.example.cp_main_be.config.AbstractContainerBaseTest;
 import com.example.cp_main_be.user.domain.User;
-import com.example.cp_main_be.user.domain.UserStatus;
-import com.example.cp_main_be.user.service.UserService;
-import org.junit.jupiter.api.Assertions;
+import com.example.cp_main_be.user.domain.repository.UserRepository;
+import com.example.cp_main_be.user.dto.request.UserRequest;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.UUID;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.test.context.DynamicPropertyRegistry;
-import org.springframework.test.context.DynamicPropertySource;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.ResultActions;
 import org.springframework.transaction.annotation.Transactional;
 
 @SpringBootTest
+@AutoConfigureMockMvc
 @Transactional
 class UserControllerTest extends AbstractContainerBaseTest {
 
-  @Autowired private UserService userService;
+  @Autowired private MockMvc mockMvc;
 
-  @DynamicPropertySource
-  static void properties(DynamicPropertyRegistry registry) {
-    registry.add("replicate.api.token", () -> "dummy-token-for-user-test");
-  }
+  @Autowired private ObjectMapper objectMapper;
 
+  @Autowired private UserRepository userRepository;
+
+  @DisplayName("닉네임을 받아 유저를 등록한다.")
   @Test
-  public void 회원_생성시_uuid가_자동으로_생기는가() throws Exception {
+  void register() throws Exception {
     // given
-    User user = new User();
+    UserRequest userRequest = new UserRequest(UUID.randomUUID(), 1L, "test");
+    String requestBody = objectMapper.writeValueAsString(userRequest);
+
     // when
-    user.setUsername("test");
-    userService.saveUser(user);
+    ResultActions result =
+        mockMvc.perform(
+            post("/api/v1/register/nickname")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(requestBody));
+
     // then
-    //        System.out.println("user.getUuid = " + user.getUuid());
-    Assertions.assertNotNull(user.getUuid());
+    result
+        .andDo(print())
+        .andExpect(status().isOk())
+        .andExpect(jsonPath("$.success").value(true))
+        .andExpect(jsonPath("$.data.username").value("test"))
+        .andExpect(jsonPath("$.data.uuid").isNotEmpty());
   }
 
+  @DisplayName("UUID로 유저 정보를 조회한다.")
   @Test
-  public void 유저_이름이_없으면_오류() throws Exception {
+  void getUserInfo_success() throws Exception {
     // given
-    User user = new User();
+    // 테스트를 위해 미리 유저를 한 명 저장
+    User savedUser = userRepository.save(User.builder().username("existing-user").build());
+    UUID userUuid = savedUser.getUuid();
+
     // when
-    user.setEmail("test@example.com");
-    user.setPasswordHash("hashedpassword");
-    user.setLevel(1L); // '1L' 대신 '1'로 변경하여 불필요한 경고 제거
-    user.setExperiencePoints(0);
-    user.setTemperatureScore(0);
-    user.setStatus(UserStatus.ACTIVE);
+    ResultActions result = mockMvc.perform(get("/api/v1/users/{uuid}", userUuid));
 
     // then
-    Assertions.assertThrows(
-        DataIntegrityViolationException.class,
-        () -> {
-          userService.saveUser(user);
-        });
+    result
+        .andDo(print())
+        .andExpect(status().isOk())
+        .andExpect(jsonPath("$.success").value(true))
+        .andExpect(jsonPath("$.data.username").value("existing-user"))
+        .andExpect(jsonPath("$.data.uuid").value(userUuid.toString()));
   }
 
+  @DisplayName("존재하지 않는 UUID로 유저 정보를 조회하면 404 에러가 발생한다.")
   @Test
-  public void 유저생성성공() throws Exception {
+  void getUserInfo_fail_whenUserNotFound() throws Exception {
     // given
-    User user = new User();
+    UUID nonExistentUuid = UUID.randomUUID();
+
     // when
-    user.setUsername("test");
-    userService.saveUser(user);
-    User user1 = userService.findUserById(user.getId());
+    ResultActions result = mockMvc.perform(get("/api/v1/users/{uuid}", nonExistentUuid));
+
     // then
-    Assertions.assertEquals(user.getId(), user1.getId());
+    result.andDo(print()).andExpect(status().isNotFound()); // UserNotFoundException이 404로 변환되는지 확인
   }
 }