Skip to content

deploy 4.3 #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hknhj merged 2 commits into from
Aug 19, 2025
Merged

deploy 4.3 #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
634cd37
fix/#305: meeting, sns event, mood tracker 생성/μ‚­μ œ 였λ₯˜ μˆ˜μ •
hknhj Aug 19, 2025
7db8e78
Merge pull request #306 from HaRu-Developers/fix/#305-document-create…
hknhj Aug 19, 2025
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
9 changes: 7 additions & 2 deletions src/main/java/com/haru/api/domain/moodTracker/service/MoodTrackerCommandServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
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.domain.workspace.repository.WorkspaceRepository;
import com.haru.api.global.annotation.DeleteDocument;
import com.haru.api.global.annotation.UpdateDocumentTitle;
import com.haru.api.global.apiPayload.code.status.ErrorStatus;
Expand Down Expand Up @@ -55,6 +56,7 @@ public class MoodTrackerCommandServiceImpl implements MoodTrackerCommandService
private final HashIdUtil hashIdUtil;

private final UserDocumentLastOpenedService userDocumentLastOpenedService;
private final WorkspaceRepository workspaceRepository;

/**
* λΆ„μœ„κΈ° 트래컀 생성
Expand All @@ -67,8 +69,11 @@ public MoodTrackerResponseDTO.CreateResult create(
MoodTrackerRequestDTO.CreateRequest request
) {

Workspace foundWorkspace = workspaceRepository.findById(workspace.getId())
.orElseThrow(() -> new WorkspaceHandler(ErrorStatus.WORKSPACE_NOT_FOUND));

// λΆ„μœ„κΈ° 트래컀 생성 및 μ €μž₯
MoodTracker moodTracker = MoodTrackerConverter.toMoodTracker(request, user, workspace);
MoodTracker moodTracker = MoodTrackerConverter.toMoodTracker(request, user, foundWorkspace);
MoodTracker savedMoodTracker = moodTrackerRepository.save(moodTracker);

// 선택지 생성 및 μ €μž₯
Expand All @@ -90,7 +95,7 @@ public MoodTrackerResponseDTO.CreateResult create(

// mood tracker 생성 μ‹œ μ›Œν¬μŠ€νŽ˜μ΄μŠ€μ— μ†ν•΄μžˆλŠ” λͺ¨λ“  μœ μ €μ— λŒ€ν•΄
// last opened ν…Œμ΄λΈ”μ— λ§ˆμ§€λ§‰μœΌλ‘œ μ—° μ‹œκ°„μ€ nullλ‘œν•˜μ—¬ μΆ”κ°€
List<User> usersInWorkspace = userWorkspaceRepository.findUsersByWorkspaceId(workspace.getId());
List<User> usersInWorkspace = userWorkspaceRepository.findUsersByWorkspaceId(foundWorkspace.getId());
userDocumentLastOpenedService.createInitialRecordsForWorkspaceUsers(usersInWorkspace, savedMoodTracker);

return MoodTrackerConverter.toCreateResultDTO(moodTracker, hashIdUtil);
Expand Down
15 changes: 11 additions & 4 deletions src/main/java/com/haru/api/domain/snsEvent/service/SnsEventCommandServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,16 @@ public SnsEventResponseDTO.CreateSnsEventResponse createSnsEvent(
Workspace workspace,
SnsEventRequestDTO.CreateSnsRequest request
) {

Workspace foundWorkspace = workspaceRepository.findById(workspace.getId())
.orElseThrow(() -> new WorkspaceHandler(WORKSPACE_NOT_FOUND));

// SNS 이벀트 생성 및 μ €μž₯
SnsEvent createdSnsEvent = SnsEventConverter.toSnsEvent(request, user);
createdSnsEvent.setWorkspace(workspace);
createdSnsEvent.setWorkspace(foundWorkspace);

// Instagram API 호좜 ν›„ μ°Έμ—¬μž 리슀트, λ‹Ήμ²¨μž 리슀트 생성 및 μ €μž₯
String accessToken = workspace.getInstagramAccessToken();
String accessToken = foundWorkspace.getInstagramAccessToken();
if (accessToken == null || accessToken.isEmpty()) {
throw new SnsEventHandler(SNS_EVENT_NO_ACCESS_TOKEN);
}
Expand Down Expand Up @@ -153,7 +157,7 @@ public SnsEventResponseDTO.CreateSnsEventResponse createSnsEvent(

// sns event 생성 μ‹œ μ›Œν¬μŠ€νŽ˜μ΄μŠ€μ— μ†ν•΄μžˆλŠ” λͺ¨λ“  μœ μ €μ— λŒ€ν•΄
// last opened ν…Œμ΄λΈ”μ— λ§ˆμ§€λ§‰μœΌλ‘œ μ—° μ‹œκ°„μ€ nullλ‘œν•˜μ—¬ μΆ”κ°€
List<User> usersInWorkspace = userWorkspaceRepository.findUsersByWorkspaceId(workspace.getId());
List<User> usersInWorkspace = userWorkspaceRepository.findUsersByWorkspaceId(foundWorkspace.getId());
userDocumentLastOpenedService.createInitialRecordsForWorkspaceUsers(usersInWorkspace, savedSnsEvent);

return SnsEventResponseDTO.CreateSnsEventResponse.builder()
Expand Down Expand Up @@ -237,9 +241,12 @@ public void deleteSnsEvent(
if (!foundUserWorkspace.getUser().getId().equals(user.getId()) || !snsEvent.getCreator().getId().equals(user.getId())) {
throw new SnsEventHandler(SNS_EVENT_NO_AUTHORITY);
}
snsEventRepository.delete(snsEvent);

// S3의 λ¬Έμ„œ 및 썸넀일 이미지 μ‚­μ œ
deleteS3FileAndThumnailImage(snsEvent);

snsEventRepository.delete(snsEvent);

}

@Override
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/haru/api/domain/workspace/entity/Workspace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ public class Workspace extends BaseEntity {
@Column(length = 50)
private String instagramAccountName;

@OneToMany(mappedBy = "workspace", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
@OneToMany(mappedBy = "workspace", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
private List<Meeting> meetingList = new ArrayList<>();

@OneToMany(mappedBy = "workspace", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
@OneToMany(mappedBy = "workspace", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
private List<SnsEvent> snsEventList = new ArrayList<>();

@OneToMany(mappedBy = "workspace", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
@OneToMany(mappedBy = "workspace", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
private List<MoodTracker> moodTrackerList = new ArrayList<>();

public void updateTitle(String title) {
Expand Down