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
@@ -1,7 +1,7 @@
package com.divary.domain.logbase.logbook.service;

import com.divary.domain.member.entity.Member;
import com.divary.domain.member.service.MemberServiceImpl;
import com.divary.domain.member.service.MemberService;
import com.divary.domain.logbase.LogBaseInfo;
import com.divary.domain.logbase.LogBaseInfoRepository;
import com.divary.domain.logbase.logbook.dto.request.*;
Expand Down Expand Up @@ -33,7 +33,7 @@ public class LogBookService {
private final LogBaseInfoRepository logBaseInfoRepository;
private final LogBookRepository logBookRepository;
private final CompanionRepository companionRepository;
private final MemberServiceImpl memberService;
private final MemberService memberService;

@Transactional
public LogBaseCreateResultDTO createLogBase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.divary.domain.member.dto.requestDTO.MyPageLevelRequestDTO;
import com.divary.domain.member.dto.response.MyPageImageResponseDTO;
import com.divary.domain.member.dto.response.MyPageProfileResponseDTO;
import com.divary.domain.member.facade.MyPageFacade;
import com.divary.global.config.SwaggerConfig;
import com.divary.global.config.security.CustomUserPrincipal;
import com.divary.global.exception.ErrorCode;
Expand All @@ -22,6 +23,7 @@
@RequiredArgsConstructor
public class MemberController {
private final MemberService memberService;
private final MyPageFacade myPageFacade;

@PatchMapping("/level")
@SwaggerConfig.ApiSuccessResponse(dataType = Void.class)
Expand Down Expand Up @@ -53,7 +55,7 @@ public ApiResponse updateGroup(@AuthenticationPrincipal CustomUserPrincipal user
@SwaggerConfig.ApiSuccessResponse(dataType = Void.class)
@SwaggerConfig.ApiErrorExamples(value = {ErrorCode.AUTHENTICATION_REQUIRED})
public ApiResponse getProfile(@AuthenticationPrincipal CustomUserPrincipal userPrincipal){
MyPageProfileResponseDTO responseDTO = memberService.getMemberProfile(userPrincipal.getId());
MyPageProfileResponseDTO responseDTO = myPageFacade.getMemberProfile(userPrincipal.getId());
return ApiResponse.success(responseDTO);
}

Expand Down
55 changes: 55 additions & 0 deletions src/main/java/com/divary/domain/member/facade/MyPageFacade.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
package com.divary.domain.member.facade;

import com.divary.domain.logbase.logbook.service.LogBookService;
import com.divary.domain.member.dto.response.MyPageProfileResponseDTO;
import com.divary.domain.member.entity.Member;
import com.divary.domain.member.service.MemberService;
import com.divary.global.exception.BusinessException;
import com.divary.global.exception.ErrorCode;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

/**
* MyPage Facade
* μ—¬λŸ¬ 도메인 μ„œλΉ„μŠ€λ₯Ό μ‘°ν•©ν•˜μ—¬ λ§ˆμ΄νŽ˜μ΄μ§€ κ΄€λ ¨ λΉ„μ¦ˆλ‹ˆμŠ€ λ‘œμ§μ„ μ²˜λ¦¬ν•©λ‹ˆλ‹€.
*
* λͺ©μ :
* 1. MemberService와 LogBookService κ°„μ˜ μˆœν™˜μ°Έμ‘° 제거
* 2. μ—¬λŸ¬ λ„λ©”μΈμ˜ 데이터λ₯Ό μ‘°ν•©ν•˜λŠ” μ±…μž„ 뢄리
* 3. ν–₯ν›„ μ†Œμ…œ κΈ°λŠ₯(친ꡬ λ“±) μΆ”κ°€ μ‹œ ν™•μž₯μ„± 확보
*/
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class MyPageFacade {

private final MemberService memberService;
private final LogBookService logBookService;

/**
* λ§ˆμ΄νŽ˜μ΄μ§€ ν”„λ‘œν•„ 정보 쑰회
* Member 정보와 LogBook λˆ„μ  횟수λ₯Ό μ‘°ν•©ν•˜μ—¬ λ°˜ν™˜
*
* @param userId μ‚¬μš©μž ID
* @return λ§ˆμ΄νŽ˜μ΄μ§€ ν”„λ‘œν•„ 정보
*/
public MyPageProfileResponseDTO getMemberProfile(Long userId) {
// 1. Member 도메인 데이터 쑰회
Member member = memberService.findById(userId);

// 2. LogBook 도메인 데이터 쑰회
Integer accumulation = logBookService.getAccumulationById(userId);

// 3. λΉ„μ¦ˆλ‹ˆμŠ€ 둜직: μ΄λ©”μΌμ—μ„œ ID μΆ”μΆœ
String memberIdByEmail = member.getEmail().split("@")[0];

// 4. DTO μ‘°ν•© 및 λ°˜ν™˜
return MyPageProfileResponseDTO.builder()
.memberGroup(member.getMemberGroup())
.level(member.getLevel())
.id(memberIdByEmail)
.accumulations(accumulation)
.build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import com.divary.common.enums.SocialType;
import com.divary.domain.member.dto.requestDTO.MyPageGroupRequestDTO;
import com.divary.domain.member.dto.response.MyPageImageResponseDTO;
import com.divary.domain.member.dto.response.MyPageProfileResponseDTO;
import com.divary.domain.member.entity.Member;
import com.divary.domain.member.dto.requestDTO.MyPageLevelRequestDTO;
import com.divary.global.oauth.dto.response.DeactivateResponse;
Expand All @@ -21,7 +20,5 @@ public interface MemberService {

void updateGroup(Long userId, MyPageGroupRequestDTO requestDTO);

MyPageProfileResponseDTO getMemberProfile(Long userId);

MyPageImageResponseDTO getLicenseImage(Long userId);
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
import com.divary.domain.image.dto.request.ImageUploadRequest;
import com.divary.domain.image.dto.response.ImageResponse;
import com.divary.domain.image.service.ImageService;
import com.divary.domain.logbase.logbook.enums.SaveStatus;
import com.divary.domain.logbase.logbook.service.LogBookService;
import com.divary.domain.member.dto.requestDTO.MyPageGroupRequestDTO;
import com.divary.domain.member.dto.requestDTO.MyPageLevelRequestDTO;
import com.divary.domain.member.dto.response.MyPageImageResponseDTO;
Expand Down Expand Up @@ -41,7 +39,6 @@ public class MemberServiceImpl implements MemberService {
private final MemberRepository memberRepository;
private final ImageService imageService;
private final TokenBlackListService tokenBlackListService;
private final LogBookService logBookService;

@Value("${jobs.user-deletion.grace-period-days}")
private int gracePeriodDays;
Expand Down Expand Up @@ -199,24 +196,6 @@ public void updateGroup(Long userId, MyPageGroupRequestDTO requestDTO){
member.updateGroup(group);
}

@Override
public MyPageProfileResponseDTO getMemberProfile(Long userId){
Member member = memberRepository.findById(userId).orElseThrow(()->new BusinessException(ErrorCode.MEMBER_NOT_FOUND));

Integer accumulation
= logBookService.getAccumulationById(userId);
//ν˜„μž¬κΈ°μ€€μœΌλ‘œ 총 둜그뢁 λˆ„μ νšŸμˆ˜ 계산

String memberIdByEmail = member.getEmail().split("@")[0];
// ν”„λ‘œν•„μ— λ‚˜μ˜€λŠ” 아이디: μ΄λ©”μΌμ—μ„œ @ μ•žλΆ€λΆ„λ§Œ μΆ”μΆœ

return MyPageProfileResponseDTO.builder()
.memberGroup(member.getMemberGroup())
.level(member.getLevel())
.id(memberIdByEmail)
.accumulations(accumulation)
.build();
}

@Override
public MyPageImageResponseDTO getLicenseImage(Long userId){
Expand Down