Merge pull request #60 from HearDay/feat/profile

jih023 · web-flow · commit 1897251eb477 · 2025-11-25T20:06:16.000+09:00
feat: 프로필 화면에서 사용자 정보 조회 API
diff --git a/src/main/java/HearDay/spring/domain/article/service/ArticleService.java b/src/main/java/HearDay/spring/domain/article/service/ArticleService.java
@@ -9,6 +9,8 @@
 import HearDay.spring.domain.article.exception.ArticleException;
 import HearDay.spring.domain.article.repository.ArticleRepository;
 import HearDay.spring.domain.user.entity.User;
+import HearDay.spring.domain.user.repository.UserRepository;
+import HearDay.spring.domain.usercalendar.service.UserCalendarService;
 import HearDay.spring.domain.userrecentarticle.service.UserRecentArticleService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -32,6 +34,8 @@ public class ArticleService {
     private final ArticleRepository articleRepository;
     private final UserRecentArticleService recentArticleService;
     private final ArticleViewCountService articleViewCountService;
+    private final UserCalendarService userCalendarService;
+    private final UserRepository userRepository;
     private final WebClient webClient;
 
     @Value("${ai.api.url}")
@@ -54,6 +58,10 @@ public ArticleResponseDto getArticle(User user, Long id) {
             recentArticleService.addRecentArticle(user.getId(), article);
             AgeGroup ageGroup = AgeGroup.fromAge(user.getAge());
             articleViewCountService.incrementViewCount(user.getId(), article.getId(), ageGroup, user.getGender());
+
+            userCalendarService.checkAttendance(user);
+            user.addPoint(5);
+            userRepository.save(user);
         }
 
         return ArticleResponseDto.fromWithDetail(article);
diff --git a/src/main/java/HearDay/spring/domain/articlequiz/service/ArticleQuizService.java b/src/main/java/HearDay/spring/domain/articlequiz/service/ArticleQuizService.java
@@ -7,6 +7,7 @@
 import HearDay.spring.domain.articlequiz.repository.ArticleQuizRepository;
 import HearDay.spring.domain.articlequiz.repository.ArticleQuizUserResultRepository;
 import HearDay.spring.domain.user.entity.User;
+import HearDay.spring.domain.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,6 +21,7 @@ public class ArticleQuizService {
 
     private final ArticleQuizRepository articleQuizRepository;
     private final ArticleQuizUserResultRepository articleQuizUserResultRepository;
+    private final UserRepository userRepository;
 
     public ArticleQuizDto getArticleQuiz(Long articleId, Long userId) {
         ArticleQuiz quiz = articleQuizRepository.findByArticleId(articleId)
@@ -49,5 +51,8 @@ public void submitQuizAnswer(Long quizId, User user) {
                 .build();
 
         articleQuizUserResultRepository.save(result);
+
+        user.addPoint(5);
+        userRepository.save(user);
     }
 }
diff --git a/src/main/java/HearDay/spring/domain/discussion/dto/response/VoiceResponseDto.java b/src/main/java/HearDay/spring/domain/discussion/dto/response/VoiceResponseDto.java
@@ -2,6 +2,7 @@
 
 public record VoiceResponseDto(
         String reply,
-        Long discussionId
+        Long discussionId,
+        String title
 ) {
 }
diff --git a/src/main/java/HearDay/spring/domain/discussion/service/ChatCommandServiceImpl.java b/src/main/java/HearDay/spring/domain/discussion/service/ChatCommandServiceImpl.java
@@ -16,6 +16,7 @@
 import HearDay.spring.domain.discussion.repository.DiscussionContentRepository;
 import HearDay.spring.domain.discussion.repository.DiscussionRepository;
 import HearDay.spring.domain.user.entity.User;
+import HearDay.spring.domain.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -39,6 +40,7 @@ public class ChatCommandServiceImpl implements ChatCommandService {
     private final DiscussionRepository discussionRepository;
     private final SpeechToTextService sttService;
     private final TextToSpeechService ttsService;
+    private final UserRepository userRepository;
 
     @Value("${ai.api.url}")
     private String aiUrl;
@@ -60,6 +62,9 @@ public ChatResponseDto getAiReply(ChatRequestDto request, Long articleId, Long d
                             .build()
             );
             mode = AiChatModeEnum.OPEN;
+
+            user.addPoint(10);
+            userRepository.save(user);
         } else {
             discussion = discussionRepository.findById(discussionId)
                     .orElseThrow(() -> new DiscussionException.DiscussionNotFoundException(discussionId));
@@ -148,6 +153,9 @@ public VoiceResponseDto getAiVoiceReply(Long discussionId, Long articleId, Multi
                             .build()
             );
             mode = AiChatModeEnum.OPEN;
+
+            user.addPoint(10);
+            userRepository.save(user);
         } else {
             discussion = discussionRepository.findById(discussionId)
                     .orElseThrow(() -> new DiscussionException.DiscussionNotFoundException(discussionId));
@@ -190,7 +198,8 @@ public VoiceResponseDto getAiVoiceReply(Long discussionId, Long articleId, Multi
 
         return new VoiceResponseDto(
                 outputAudio,
-                discussion.getId()
+                discussion.getId(),
+                article.getTitle()
         );
     }
 }
diff --git a/src/main/java/HearDay/spring/domain/user/controller/UserController.java b/src/main/java/HearDay/spring/domain/user/controller/UserController.java
@@ -3,11 +3,7 @@
 import HearDay.spring.common.dto.response.CommonApiResponse;
 import HearDay.spring.common.enums.CategoryEnum;
 import HearDay.spring.domain.user.dto.request.*;
-import HearDay.spring.domain.user.dto.response.AlarmTimeResponse;
-import HearDay.spring.domain.user.dto.response.HomeResponseDto;
-import HearDay.spring.domain.user.dto.response.UserGenderAgeResponseDto;
-import HearDay.spring.domain.user.dto.response.UserLoginResponseDto;
-import HearDay.spring.domain.user.dto.response.UserResponseDto;
+import HearDay.spring.domain.user.dto.response.*;
 import HearDay.spring.domain.user.entity.User;
 import HearDay.spring.domain.user.service.MailService;
 import HearDay.spring.domain.user.service.RefreshTokenService;
@@ -199,4 +195,17 @@ public ResponseEntity<CommonApiResponse<Void>> updateAlarmTime(
         return ResponseEntity.status(HttpStatus.OK)
                 .body(CommonApiResponse.success("알람 시간 설정에 성공했습니다.", null));
     }
+
+    @GetMapping("/profile")
+    @Operation(summary = "프로필 정보 조회 API")
+    public ResponseEntity<CommonApiResponse<?>> getProfile(
+            @AuthUser User user,
+            @RequestParam int year,
+            @RequestParam int month
+    ) {
+        UserProfileResponseDto result = userQueryService.getUserProfile(user, year, month);
+
+        return ResponseEntity.status(HttpStatus.OK)
+                .body(CommonApiResponse.success("조회에 성공했습니다.", result));
+    }
 }
diff --git a/src/main/java/HearDay/spring/domain/user/dto/response/UserProfileResponseDto.java b/src/main/java/HearDay/spring/domain/user/dto/response/UserProfileResponseDto.java
@@ -0,0 +1,16 @@
+package HearDay.spring.domain.user.dto.response;
+
+import java.time.LocalDate;
+import java.util.List;
+
+public record UserProfileResponseDto(
+        String nickname,
+        String email,
+        Integer level,
+        Integer point,
+        List<Attendance> attendance
+) {
+    public record Attendance(
+            LocalDate date
+    ) {}
+}
diff --git a/src/main/java/HearDay/spring/domain/user/entity/User.java b/src/main/java/HearDay/spring/domain/user/entity/User.java
@@ -36,7 +36,7 @@ public class User extends BaseEntity {
     private String phone;
 
     @Column(nullable = false)
-    private Integer level;
+    private Integer point;
 
     @Enumerated(EnumType.STRING)
     private Gender gender;
@@ -87,4 +87,8 @@ public void updateAlarmTime(Integer hour, Integer minute, AlarmDayType dayType)
         this.alarmMinute = minute;
         this.alarmDayType = dayType;
     }
+
+    public void addPoint(int amount) {
+        this.point += amount;
+    }
 }
diff --git a/src/main/java/HearDay/spring/domain/user/service/UserCommandServiceImpl.java b/src/main/java/HearDay/spring/domain/user/service/UserCommandServiceImpl.java
@@ -45,7 +45,7 @@ public UserLoginResponseDto registerUser(UserRequestDto request) {
                 .password(passwordEncoder.encode(request.password()))
                 .email(request.email())
                 .phone(request.phone())
-                .level(1)
+                .point(0)
                 .build();
 
         userRepository.save(user);
@@ -132,7 +132,7 @@ private User createNewUser(KakaoRequestDto kakaoProfile) {
                 .password(null)
                 .email(kakaoProfile.kakao_account().email())
                 .phone(null)
-                .level(1)
+                .point(0)
                 .userCategory(null)
                 .build();
         return userRepository.save(user);
diff --git a/src/main/java/HearDay/spring/domain/user/service/UserQueryService.java b/src/main/java/HearDay/spring/domain/user/service/UserQueryService.java
@@ -2,11 +2,13 @@
 
 import HearDay.spring.domain.user.dto.response.HomeResponseDto;
 import HearDay.spring.domain.user.dto.response.UserGenderAgeResponseDto;
+import HearDay.spring.domain.user.dto.response.UserProfileResponseDto;
 import HearDay.spring.domain.user.entity.User;
 
 public interface UserQueryService {
     void checkId(String userLoginId);
     User getUserEntity(Long userId);
     HomeResponseDto getHomeInformation(User user);
     UserGenderAgeResponseDto getGenderAndAge(User user);
+    UserProfileResponseDto getUserProfile(User user, int year, int month);
 }
diff --git a/src/main/java/HearDay/spring/domain/user/service/UserQueryServiceImpl.java b/src/main/java/HearDay/spring/domain/user/service/UserQueryServiceImpl.java
@@ -4,9 +4,12 @@
 import HearDay.spring.domain.article.repository.ArticleRepository;
 import HearDay.spring.domain.user.dto.response.HomeResponseDto;
 import HearDay.spring.domain.user.dto.response.UserGenderAgeResponseDto;
+import HearDay.spring.domain.user.dto.response.UserProfileResponseDto;
 import HearDay.spring.domain.user.entity.User;
 import HearDay.spring.domain.user.exception.UserException;
 import HearDay.spring.domain.user.repository.UserRepository;
+import HearDay.spring.domain.usercalendar.entity.UserCalendar;
+import HearDay.spring.domain.usercalendar.repository.UserCalendarRepository;
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import lombok.RequiredArgsConstructor;
@@ -18,6 +21,7 @@
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
 
+import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Locale;
@@ -31,6 +35,7 @@ public class UserQueryServiceImpl implements UserQueryService {
     private final UserRepository userRepository;
     private final ArticleRepository articleRepository;
     private final WebClient webClient;
+    private final UserCalendarRepository userCalendarRepository;
 
     @Value("${ai.api.url}")
     private String aiUrl;
@@ -59,8 +64,11 @@ public HomeResponseDto getHomeInformation(User user) {
 
         List<HomeResponseDto.ArticleDto> recommendedArticles = fetchRecommendedArticlesFromAiServer(user.getId());
 
+        int point = user.getPoint();
+        int level = calculateLevel(point);
+
         return new HomeResponseDto(
-                user.getLevel(),
+                level,
                 user.getNickname(),
                 formattedDate,
                 recommendedArticles
@@ -126,4 +134,37 @@ public String getImageUrl() {
     public UserGenderAgeResponseDto getGenderAndAge(User user) {
         return UserGenderAgeResponseDto.from(user);
     }
+
+    @Override
+    public UserProfileResponseDto getUserProfile(User user, int year, int month) {
+        LocalDate startDate = LocalDate.of(year, month, 1);
+        LocalDate endDate = startDate.withDayOfMonth(startDate.lengthOfMonth());
+
+        List<UserProfileResponseDto.Attendance> attendanceList =
+                userCalendarRepository.findAllByUserAndAttendanceDateBetween(user, startDate, endDate)
+                        .stream()
+                        .map(UserCalendar::getAttendanceDate)
+                        .map(UserProfileResponseDto.Attendance::new)
+                        .toList();
+
+        int point = user.getPoint();
+        int level = calculateLevel(point);
+
+        return new UserProfileResponseDto(
+                user.getNickname(),
+                user.getEmail(),
+                level,
+                point,
+                attendanceList
+        );
+    }
+
+    private int calculateLevel(int point) {
+        if (point < 50) return 1;
+        if (point < 130) return 2;
+        if (point < 250) return 3;
+        if (point < 430) return 4;
+        if (point < 680) return 5;
+        return 6;
+    }
 }
diff --git a/src/main/java/HearDay/spring/domain/usercalendar/entity/UserCalendar.java b/src/main/java/HearDay/spring/domain/usercalendar/entity/UserCalendar.java
@@ -0,0 +1,32 @@
+package HearDay.spring.domain.usercalendar.entity;
+
+import HearDay.spring.common.entity.BaseEntity;
+import HearDay.spring.domain.user.entity.User;
+import jakarta.persistence.*;
+import lombok.*;
+
+import java.time.LocalDate;
+
+@Entity
+@Getter
+@Builder
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+@Table(
+        name = "user_calendar",
+        uniqueConstraints = {
+                @UniqueConstraint(columnNames = {"user_id", "attendance_date"})
+        }
+)
+public class UserCalendar extends BaseEntity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", nullable = false)
+    private User user;
+
+    @Column(name = "attendance_date", nullable = false)
+    private LocalDate attendanceDate;
+}
diff --git a/src/main/java/HearDay/spring/domain/usercalendar/repository/UserCalendarRepository.java b/src/main/java/HearDay/spring/domain/usercalendar/repository/UserCalendarRepository.java
@@ -0,0 +1,21 @@
+package HearDay.spring.domain.usercalendar.repository;
+
+import HearDay.spring.domain.user.entity.User;
+import HearDay.spring.domain.usercalendar.entity.UserCalendar;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Repository
+public interface UserCalendarRepository extends JpaRepository<UserCalendar, Long> {
+
+    boolean existsByUserAndAttendanceDate(User user, LocalDate attendanceDate);
+
+    List<UserCalendar> findAllByUserAndAttendanceDateBetween(
+            User user,
+            LocalDate startDate,
+            LocalDate endDate
+    );
+}
diff --git a/src/main/java/HearDay/spring/domain/usercalendar/service/UserCalendarService.java b/src/main/java/HearDay/spring/domain/usercalendar/service/UserCalendarService.java
@@ -0,0 +1,30 @@
+package HearDay.spring.domain.usercalendar.service;
+
+import HearDay.spring.domain.user.entity.User;
+import HearDay.spring.domain.usercalendar.entity.UserCalendar;
+import HearDay.spring.domain.usercalendar.repository.UserCalendarRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+
+@Service
+@RequiredArgsConstructor
+public class UserCalendarService {
+    private final UserCalendarRepository userCalendarRepository;
+
+    public void checkAttendance(User user) {
+        LocalDate today = LocalDate.now();
+
+        if (userCalendarRepository.existsByUserAndAttendanceDate(user, today)) {
+            return; // 오늘 이미 출석
+        }
+
+        UserCalendar attendance = UserCalendar.builder()
+                .user(user)
+                .attendanceDate(today)
+                .build();
+
+        userCalendarRepository.save(attendance);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`public record VoiceResponseDto(`
`4`	`4`	`String reply,`
`5`		`- Long discussionId`
	`5`	`+ Long discussionId,`
	`6`	`+ String title`
`6`	`7`	`) {`
`7`	`8`	`}`