[feat/#49] follow api

src/main/java/com/clokey/server/domain/follow/dao/FollowRepository.java

@@ -3,8 +3,12 @@
 import com.clokey.server.domain.model.mapping.Follow;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.Optional;
+
 public interface FollowRepository extends JpaRepository<Follow, Long> {
 
     boolean existsByFollowing_IdAndFollowed_Id(Long followingId, Long followedId);
 
+
+    Optional<Follow> findByFollowing_IdAndFollowed_Id(Long followingId, Long followedId);
 }

src/main/java/com/clokey/server/domain/member/api/MemberRestController.java

@@ -1,15 +1,16 @@
 package com.clokey.server.domain.member.api;
 
+import com.clokey.server.domain.member.application.FollowCommandService;
 import com.clokey.server.domain.member.application.GetUserQueryService;
-import com.clokey.server.domain.member.dto.MemberResponseDTO;
+import com.clokey.server.domain.member.dto.MemberDTO;
 import com.clokey.server.domain.member.application.ProfileCommandService;
 import com.clokey.server.domain.member.exception.annotation.IdExist;
 import com.clokey.server.domain.member.exception.annotation.IdValid;
+import com.clokey.server.domain.member.exception.annotation.NotFollowMyself;
 import com.clokey.server.global.common.response.BaseResponse;
 import com.clokey.server.global.error.code.status.SuccessStatus;
 import io.swagger.v3.oas.annotations.Operation;
 import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -21,14 +22,15 @@ public class MemberRestController {
 
     private final ProfileCommandService profileCommandService;
     private final GetUserQueryService getUserQueryService;
+    private final FollowCommandService followCommandService;
 
     @Operation(summary = "프로필 수정 API", description = "사용자의 프로필 정보를 수정하는 API입니다.")
     @PatchMapping("users/{user_id}/profile")
-    public BaseResponse<MemberResponseDTO.ProfileRP> updateProfile(
+    public BaseResponse<MemberDTO.ProfileRP> updateProfile(
             @PathVariable("user_id") Long userId,
-            @RequestBody @Valid MemberResponseDTO.ProfileRQ request) {
+            @RequestBody @Valid MemberDTO.ProfileRQ request) {
 
-        MemberResponseDTO.ProfileRP response = profileCommandService.updateProfile(userId, request);
+        MemberDTO.ProfileRP response = profileCommandService.updateProfile(userId, request);
 
         return BaseResponse.onSuccess(SuccessStatus.MEMBER_ACTION_SUCCESS, response);
     }
@@ -47,10 +49,34 @@ public BaseResponse<Object> checkID(
     public BaseResponse<Object> getUser(
             @IdValid @PathVariable("clokey_id") String clokeyId) {
 
-        MemberResponseDTO.GetUserRP response = getUserQueryService.getUser(clokeyId);
+        MemberDTO.GetUserRP response = getUserQueryService.getUser(clokeyId);
 
         return BaseResponse.onSuccess(SuccessStatus.MEMBER_SUCCESS, response);
     }
 
+
+    @Operation(summary = "팔로우 조회 API", description = "내가 다른 사용자를 팔로우하고있는지 확인하는 API입니다.")
+    @PostMapping("users/follow/check")
+    public BaseResponse<MemberDTO.FollowRP> followCheck(
+            @RequestBody @Valid MemberDTO.FollowRQ request){
+
+        MemberDTO.FollowRP response= followCommandService.followCheck(request);
+
+        return BaseResponse.onSuccess(SuccessStatus.MEMBER_SUCCESS, response);
+    }
+
+
+
+    @Operation(summary = "팔로우 API", description = "다른 사용자를 팔로우/언팔로우하는 API입니다. 호출시마다 기존 상태와 반대로 변경됩니다.")
+    @PostMapping("users/follow")
+    public BaseResponse<Object> follow(
+        @NotFollowMyself @RequestBody @Valid MemberDTO.FollowRQ request) {
+
+        followCommandService.follow(request);
+
+        return BaseResponse.onSuccess(SuccessStatus.MEMBER_ACTION_SUCCESS, null);
+    }
+
+
 }
 

src/main/java/com/clokey/server/domain/member/application/FollowCommandService.java

@@ -0,0 +1,10 @@
+package com.clokey.server.domain.member.application;
+
+import com.clokey.server.domain.member.dto.MemberDTO;
+
+public interface FollowCommandService {
+    void follow(MemberDTO.FollowRQ request);
+
+    MemberDTO.FollowRP followCheck(MemberDTO.FollowRQ request);
+}
+

src/main/java/com/clokey/server/domain/member/application/FollowCommandServiceImpl.java

@@ -0,0 +1,58 @@
+package com.clokey.server.domain.member.application;
+
+import com.clokey.server.domain.follow.dao.FollowRepository;
+import com.clokey.server.domain.member.dto.MemberDTO;
+import com.clokey.server.domain.model.Member;
+import com.clokey.server.domain.model.mapping.Follow;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+
+@Service
+@RequiredArgsConstructor
+public class FollowCommandServiceImpl implements FollowCommandService {
+
+    private final MemberRepositoryService memberRepositoryService;
+    private final FollowRepository followRepository;
+
+    @Override
+    public MemberDTO.FollowRP followCheck(MemberDTO.FollowRQ request) {
+        Long myUserId = memberRepositoryService.findMemberByClokeyId(request.getMyClokeyId()).getId();
+        Long yourUserId = memberRepositoryService.findMemberByClokeyId(request.getYourClokeyId()).getId();
+
+        boolean isFollow = followRepository.existsByFollowing_IdAndFollowed_Id(myUserId, yourUserId);
+
+        return new MemberDTO.FollowRP(isFollow);
+    }
+
+    @Override
+    @Transactional
+    public void follow(MemberDTO.FollowRQ request) {
+        // myClokeyId로 사용자 조회
+        Long myUserId = memberRepositoryService.findMemberByClokeyId(request.getMyClokeyId()).getId();
+        Long yourUserId = memberRepositoryService.findMemberByClokeyId(request.getYourClokeyId()).getId();
+
+        // 팔로우 관계가 존재하는지 확인
+        boolean isFollow = followRepository.existsByFollowing_IdAndFollowed_Id(myUserId, yourUserId);
+
+        if (isFollow) {
+            // 팔로우가 이미 존재하면 언팔로우 처리
+            Follow follow = followRepository.findByFollowing_IdAndFollowed_Id(myUserId, yourUserId)
+                    .orElseThrow(() -> new IllegalStateException("팔로우 관계가 존재하지 않습니다."));
+
+            // 팔로우 삭제 (언팔로우)
+            followRepository.delete(follow);
+        } else {
+            // 팔로우가 존재하지 않으면 팔로우 처리
+            Follow follow = Follow.builder()
+                    .following(memberRepositoryService.findMemberById(myUserId))
+                    .followed(memberRepositoryService.findMemberById(yourUserId))
+                    .build();
+
+            // 팔로우 저장
+            followRepository.save(follow);
+        }
+    }
+
+}

src/main/java/com/clokey/server/domain/member/application/GetUserQueryService.java

@@ -1,9 +1,9 @@
 package com.clokey.server.domain.member.application;
 
-import com.clokey.server.domain.member.dto.MemberResponseDTO;
+import com.clokey.server.domain.member.dto.MemberDTO;
 
 public interface GetUserQueryService {
 
-    MemberResponseDTO.GetUserRP getUser(String clokeyId);
+    MemberDTO.GetUserRP getUser(String clokeyId);
 
 }

src/main/java/com/clokey/server/domain/member/application/GetUserQueryServiceImpl.java

@@ -1,7 +1,7 @@
 package com.clokey.server.domain.member.application;
 
 import com.clokey.server.domain.member.converter.GetUserConverter;
-import com.clokey.server.domain.member.dto.MemberResponseDTO;
+import com.clokey.server.domain.member.dto.MemberDTO;
 import com.clokey.server.domain.model.Member;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
@@ -21,8 +21,8 @@ public class GetUserQueryServiceImpl implements GetUserQueryService {
     private EntityManager entityManager;
 
     @Override
-    @Transactional
-    public MemberResponseDTO.GetUserRP getUser(String clokeyId) {
+    @Transactional(readOnly = true) // 트랜잭션 읽기 전용으로 설정
+    public MemberDTO.GetUserRP getUser(String clokeyId) {
         Member member = memberRepositoryService.findMemberByClokeyId(clokeyId);
 
         Long recordCount = countHistoryByMember(member);
@@ -32,21 +32,24 @@ public MemberResponseDTO.GetUserRP getUser(String clokeyId) {
         return GetUserConverter.toGetUserResponseDTO(member, recordCount, followerCount, followingCount);
     }
 
-    private Long countHistoryByMember(Member member) {
+    @Transactional(readOnly = true) // 트랜잭션 읽기 전용으로 설정
+    public Long countHistoryByMember(Member member) {
         String jpql = "SELECT COUNT(h) FROM History h WHERE h.member = :member";
         TypedQuery<Long> query = entityManager.createQuery(jpql, Long.class);
         query.setParameter("member", member);
         return query.getSingleResult();
     }
 
-    private Long countFollowersByMember(Member member) {
+    @Transactional(readOnly = true) // 트랜잭션 읽기 전용으로 설정
+    public Long countFollowersByMember(Member member) {
         String jpql = "SELECT COUNT(f) FROM Follow f WHERE f.followed = :member";
         TypedQuery<Long> query = entityManager.createQuery(jpql, Long.class);
         query.setParameter("member", member);
         return query.getSingleResult();
     }
 
-    private Long countFollowingByMember(Member member) {
+    @Transactional(readOnly = true) // 트랜잭션 읽기 전용으로 설정
+    public Long countFollowingByMember(Member member) {
         String jpql = "SELECT COUNT(f) FROM Follow f WHERE f.following = :member";
         TypedQuery<Long> query = entityManager.createQuery(jpql, Long.class);
         query.setParameter("member", member);
@@ -56,3 +59,4 @@ private Long countFollowingByMember(Member member) {
 
 
 
+

src/main/java/com/clokey/server/domain/member/application/MemberRepositoryServiceImpl.java

@@ -10,6 +10,7 @@
 import jakarta.persistence.TypedQuery;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Optional;
 
@@ -23,28 +24,32 @@ public class MemberRepositoryServiceImpl implements MemberRepositoryService {
     private EntityManager entityManager;
 
     @Override
+    @Transactional(readOnly = true) // 읽기 전용 트랜잭션
     public boolean memberExist(Long memberId) {
         return memberRepository.existsById(memberId);
     }
 
     @Override
+    @Transactional(readOnly = true) // 읽기 전용 트랜잭션
     public Optional<Member> getMember(Long memberId) {
         return memberRepository.findById(memberId);
     }
 
-
     @Override
+    @Transactional(readOnly = true) // 읽기 전용 트랜잭션
     public Member findMemberById(Long memberId) {
         return memberRepository.findById(memberId)
                 .orElseThrow(() -> new MemberException(ErrorStatus.NO_SUCH_MEMBER));
     }
 
     @Override
+    @Transactional // 쓰기 트랜잭션
     public Member saveMember(Member member) {
         return memberRepository.save(member);
     }
 
     @Override
+    @Transactional(readOnly = true) // 읽기 전용 트랜잭션
     public boolean idExist(String clokeyId) {
         String jpql = "SELECT COUNT(m) > 0 FROM Member m WHERE m.clokeyId = :clokeyId";
         TypedQuery<Boolean> query = entityManager.createQuery(jpql, Boolean.class);
@@ -53,6 +58,7 @@ public boolean idExist(String clokeyId) {
     }
 
     @Override
+    @Transactional(readOnly = true) // 읽기 전용 트랜잭션
     public Member findMemberByClokeyId(String clokeyId) {
         String jpql = "SELECT m FROM Member m WHERE m.clokeyId = :clokeyId";
         TypedQuery<Member> query = entityManager.createQuery(jpql, Member.class);
@@ -62,5 +68,4 @@ public Member findMemberByClokeyId(String clokeyId) {
                 .findFirst()
                 .orElseThrow(() -> new IllegalArgumentException("클로키 아이디에 해당하는 사용자가 없습니다."));
     }
-
-}
+}

src/main/java/com/clokey/server/domain/member/application/ProfileCommandService.java

@@ -1,9 +1,9 @@
 package com.clokey.server.domain.member.application;
 
 
-import com.clokey.server.domain.member.dto.MemberResponseDTO;
+import com.clokey.server.domain.member.dto.MemberDTO;
 
 
 public interface ProfileCommandService {
-    MemberResponseDTO.ProfileRP updateProfile(Long userId, MemberResponseDTO.ProfileRQ request);
+    MemberDTO.ProfileRP updateProfile(Long userId, MemberDTO.ProfileRQ request);
 }

src/main/java/com/clokey/server/domain/member/application/ProfileCommandServiceImpl.java

@@ -1,7 +1,7 @@
 package com.clokey.server.domain.member.application;
 
 import com.clokey.server.domain.member.converter.ProfileConverter;
-import com.clokey.server.domain.member.dto.MemberResponseDTO;
+import com.clokey.server.domain.member.dto.MemberDTO;
 import com.clokey.server.domain.model.Member;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -15,7 +15,7 @@ public class ProfileCommandServiceImpl implements ProfileCommandService {
 
     @Override
     @Transactional
-    public MemberResponseDTO.ProfileRP updateProfile(Long userId, MemberResponseDTO.ProfileRQ request) {
+    public MemberDTO.ProfileRP updateProfile(Long userId, MemberDTO.ProfileRQ request) {
         // 사용자 확인
         Member member = memberRepositoryService.findMemberById(userId);
 

src/main/java/com/clokey/server/domain/member/converter/GetUserConverter.java

@@ -1,12 +1,12 @@
 package com.clokey.server.domain.member.converter;
 
-import com.clokey.server.domain.member.dto.MemberResponseDTO;
+import com.clokey.server.domain.member.dto.MemberDTO;
 import com.clokey.server.domain.model.Member;
 
 public class GetUserConverter {
 
-    public static MemberResponseDTO.GetUserRP toGetUserResponseDTO(Member member, Long recordCount, Long followerCount, Long followingCount) {
-        return MemberResponseDTO.GetUserRP.builder()
+    public static MemberDTO.GetUserRP toGetUserResponseDTO(Member member, Long recordCount, Long followerCount, Long followingCount) {
+        return MemberDTO.GetUserRP.builder()
                 .clokeyId(member.getClokeyId())
                 .profileImageUrl(member.getProfileImageUrl())
                 .recordCount(recordCount)

src/main/java/com/clokey/server/domain/member/converter/ProfileConverter.java

@@ -1,15 +1,15 @@
 package com.clokey.server.domain.member.converter;
 
-import com.clokey.server.domain.member.dto.MemberResponseDTO;
+import com.clokey.server.domain.member.dto.MemberDTO;
 import com.clokey.server.domain.model.Member;
 
 import java.time.LocalDateTime;
 
 
 public class ProfileConverter {
 
-    public static MemberResponseDTO.ProfileRP toProfileRPDTO(Member member) {
-        return MemberResponseDTO.ProfileRP.builder()
+    public static MemberDTO.ProfileRP toProfileRPDTO(Member member) {
+        return MemberDTO.ProfileRP.builder()
                 .id(member.getId())
                 .bio(member.getBio())
                 .email(member.getEmail())