Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDateTime;
Expand All @@ -27,7 +28,7 @@ public class UserDocumentLastOpenedServiceImpl implements UserDocumentLastOpened
private final UserRepository userRepository;

@Override
@Transactional
@Transactional(propagation = Propagation.REQUIRES_NEW)
public void updateLastOpened(UserDocumentId userDocumentId, Long workspaceId, String title) {

UserDocumentLastOpened record = userDocumentLastOpenedRepository.findById(userDocumentId)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ public ApiResponse<MoodTrackerResponseDTO.QuestionResult> getMoodTrackerQuestion

@GetMapping("/{mood-tracker-hashed-Id}/reports")
@Operation(
summary = "๋ถ„์œ„๊ธฐ ํŠธ๋ž˜์ปค ์„ค๋ฌธ ํŒ€๋ถ„์œ„๊ธฐ ๋ฆฌํฌํŠธ ์กฐํšŒ API",
summary = "๋ถ„์œ„๊ธฐ ํŠธ๋ž˜์ปค ์„ค๋ฌธ ํŒ€๋ถ„์œ„๊ธฐ ๋ฆฌํฌํŠธ ์กฐํšŒ API + last opend ์ฒ˜๋ฆฌ",
description = "# [v1.2 (2025-08-05)](https://www.notion.so/2295da7802c580ba8401c449389e8f78) ๋ถ„์œ„๊ธฐ ํŠธ๋ž˜์ปค(moodTrackerId)์— ๋Œ€ํ•œ ํŒ€ ์ „์ฒด ๋ฆฌํฌํŠธ๋ฅผ ์กฐํšŒํ•ฉ๋‹ˆ๋‹ค."
)
@Parameters({
Expand All @@ -214,7 +214,7 @@ public ApiResponse<MoodTrackerResponseDTO.ReportResult> getMoodTrackerReportResu

@GetMapping("/{mood-tracker-hashed-Id}/responses")
@Operation(
summary = "๋ถ„์œ„๊ธฐ ํŠธ๋ž˜์ปค ์„ค๋ฌธ ์‘๋‹ต ์กฐํšŒ API",
summary = "๋ถ„์œ„๊ธฐ ํŠธ๋ž˜์ปค ์„ค๋ฌธ ์‘๋‹ต ์กฐํšŒ API + last opend ์ฒ˜๋ฆฌ",
description = "# [v1.2 (2025-08-05)](https://www.notion.so/2265da7802c5808290adf17d8d4591a4) ๋ถ„์œ„๊ธฐ ํŠธ๋ž˜์ปค(moodTrackerId)์— ๋Œ€ํ•œ ๊ฐœ๋ณ„ ์‘๋‹ต ๋ฐ์ดํ„ฐ๋ฅผ ์กฐํšŒํ•ฉ๋‹ˆ๋‹ค."
)
@Parameters({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.haru.api.domain.moodTracker.service;

import com.haru.api.domain.lastOpened.entity.UserDocumentId;
import com.haru.api.domain.lastOpened.service.UserDocumentLastOpenedService;
import com.haru.api.domain.moodTracker.converter.MoodTrackerConverter;
import com.haru.api.domain.moodTracker.dto.MoodTrackerResponseDTO;
import com.haru.api.domain.moodTracker.entity.MoodTracker;
Expand All @@ -11,7 +13,6 @@
import com.haru.api.domain.userWorkspace.entity.enums.Auth;
import com.haru.api.domain.userWorkspace.repository.UserWorkspaceRepository;
import com.haru.api.domain.workspace.entity.Workspace;
import com.haru.api.global.annotation.TrackLastOpened;
import com.haru.api.global.apiPayload.code.status.ErrorStatus;
import com.haru.api.global.apiPayload.exception.handler.MoodTrackerHandler;
import com.haru.api.global.apiPayload.exception.handler.UserWorkspaceHandler;
Expand All @@ -37,6 +38,8 @@ public class MoodTrackerQueryServiceImpl implements MoodTrackerQueryService {

private final SurveyQuestionRepository surveyQuestionRepository;

private final UserDocumentLastOpenedService userDocumentLastOpenedService;

@Override
public MoodTrackerResponseDTO.PreviewList getPreviewList(User user, Workspace workspace) {

Expand Down Expand Up @@ -85,10 +88,17 @@ public MoodTrackerResponseDTO.QuestionResult getQuestionResult(Long moodTrackerI
}

@Override
@Transactional(readOnly = true)
@TrackLastOpened
@Transactional
public MoodTrackerResponseDTO.ReportResult getReportResult(User user, MoodTracker moodTracker) {

// ์ตœ๊ทผ ๋ฌธ์„œ ์กฐํšŒ ๋™๊ธฐํ™”
Long workspaceId = moodTracker.getWorkspaceId();
String title = moodTracker.getTitle();

UserDocumentId userDocumentId = new UserDocumentId(user.getId(), moodTracker.getId(), moodTracker.getDocumentType());

userDocumentLastOpenedService.updateLastOpened(userDocumentId, workspaceId, title);

// ๊ถŒํ•œ ํ™•์ธ
UserWorkspace userWorkspace = userWorkspaceRepository.findByWorkspaceIdAndUserId(
moodTracker.getWorkspace().getId(), user.getId()
Expand Down Expand Up @@ -117,10 +127,17 @@ public MoodTrackerResponseDTO.ReportResult getReportResult(User user, MoodTracke
}

@Override
@Transactional(readOnly = true)
@TrackLastOpened
@Transactional
public MoodTrackerResponseDTO.ResponseResult getResponseResult(User user, MoodTracker moodTracker) {

// ์ตœ๊ทผ ๋ฌธ์„œ ์กฐํšŒ ๋™๊ธฐํ™”
Long workspaceId = moodTracker.getWorkspaceId();
String title = moodTracker.getTitle();

UserDocumentId userDocumentId = new UserDocumentId(user.getId(), moodTracker.getId(), moodTracker.getDocumentType());

userDocumentLastOpenedService.updateLastOpened(userDocumentId, workspaceId, title);

// ๊ถŒํ•œ ํ™•์ธ
UserWorkspace userWorkspace = userWorkspaceRepository.findByWorkspaceIdAndUserId(
moodTracker.getWorkspace().getId(), user.getId()
Expand Down