-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of https://github.com/Codiary-UMC-6th/Backend-…
- Loading branch information
Showing
19 changed files
with
280 additions
and
142 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
src/main/java/com/codiary/backend/global/repository/TeamRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,17 @@ | ||
| package com.codiary.backend.global.repository; | ||
|
|
||
| import com.codiary.backend.global.domain.entity.Project; | ||
| import com.codiary.backend.global.domain.entity.Team; | ||
| import org.springframework.data.jpa.repository.JpaRepository; | ||
| import org.springframework.data.jpa.repository.Query; | ||
| import org.springframework.data.repository.query.Param; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Optional; | ||
|
|
||
| public interface TeamRepository extends JpaRepository<Team, Long> { | ||
| @Query("SELECT t FROM Team t LEFT JOIN FETCH t.followers WHERE t.teamId = :teamId") | ||
| Optional<Team> findByIdWithFollowers(@Param("teamId") Long teamId); | ||
|
|
||
| List<Team> findAllByOrderByTeamIdDesc(); | ||
| } |
108 changes: 5 additions & 103 deletions
108
src/main/java/com/codiary/backend/global/service/MemberService/FollowService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,112 +1,14 @@ | ||
| package com.codiary.backend.global.service.MemberService; | ||
|
|
||
| import com.codiary.backend.global.apiPayload.code.status.ErrorStatus; | ||
| import com.codiary.backend.global.apiPayload.exception.GeneralException; | ||
| import com.codiary.backend.global.domain.entity.Follow; | ||
| import com.codiary.backend.global.domain.entity.Member; | ||
| import com.codiary.backend.global.repository.FollowRepository; | ||
| import com.codiary.backend.global.repository.MemberRepository; | ||
|
|
||
| import jakarta.transaction.Transactional; | ||
| import lombok.RequiredArgsConstructor; | ||
| import org.springframework.stereotype.Service; | ||
|
|
||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| @Service | ||
| @RequiredArgsConstructor | ||
| public class FollowService { | ||
| private final FollowRepository followRepository; | ||
| private final MemberRepository memberRepository; | ||
|
|
||
| @Transactional | ||
| public Follow follow(Long toId, Member fromMember) { | ||
| if (fromMember == null) { | ||
| throw new GeneralException(ErrorStatus.MEMBER_NOT_FOUND); | ||
| } | ||
| if (toId.equals(fromMember.getMemberId())) { | ||
| throw new GeneralException(ErrorStatus.MEMBER_SELF_FOLLOW); | ||
| } | ||
|
|
||
| fromMember = memberRepository.findByToIdWithFollowings(fromMember.getMemberId()) | ||
| .orElseThrow(() -> new GeneralException(ErrorStatus.MEMBER_NOT_FOUND)); | ||
| Member toMember = memberRepository.findByToIdWithFollowers(toId) | ||
| .orElseThrow(() -> new GeneralException(ErrorStatus.MEMBER_NOT_FOUND)); | ||
|
|
||
| Follow follow = followRepository.findByFromMemberAndToMember(fromMember, toMember) | ||
| .orElse(null); | ||
|
|
||
| if (follow == null) { | ||
| follow = Follow.builder() | ||
| .fromMember(fromMember) | ||
| .toMember(toMember) | ||
| .followStatus(true) | ||
| .build(); | ||
| fromMember.getFollowings().add(follow); | ||
| toMember.getFollowers().add(follow); | ||
| } else { | ||
| if (follow.getFollowStatus()) { | ||
| follow.update(false); | ||
| fromMember.getFollowings().remove(follow); | ||
| toMember.getFollowers().remove(follow); | ||
| } else { | ||
| follow.update(true); | ||
| fromMember.getFollowings().add(follow); | ||
| toMember.getFollowers().add(follow); | ||
| } | ||
| } | ||
| followRepository.save(follow); | ||
|
|
||
| return follow; | ||
| } | ||
|
|
||
| @Transactional | ||
| public Boolean isFollowing(Long toId, Member fromMember) { | ||
| if(fromMember == null){ | ||
| throw new GeneralException(ErrorStatus.MEMBER_NOT_FOUND); | ||
| } | ||
| if (toId.equals(fromMember.getMemberId())) { | ||
| throw new GeneralException(ErrorStatus.MEMBER_SELF_FOLLOW); | ||
| } | ||
| Member toMember = memberRepository.findById(toId) | ||
| .orElseThrow(() -> new GeneralException(ErrorStatus.MEMBER_NOT_FOUND)); | ||
|
|
||
| return followRepository.findByFromMemberAndToMember(fromMember, toMember) | ||
| .map(Follow::getFollowStatus) | ||
| .orElse(false); | ||
| } | ||
|
|
||
|
|
||
| @Transactional | ||
| public List<Member> getFollowings(Member member) { | ||
| if (member == null) { | ||
| throw new GeneralException(ErrorStatus.MEMBER_NOT_FOUND); | ||
| } | ||
|
|
||
| member = memberRepository.findByToIdWithFollowings(member.getMemberId()) | ||
| .orElseThrow(() -> new GeneralException(ErrorStatus.MEMBER_NOT_FOUND)); | ||
|
|
||
| List<Follow> followings = followRepository.findByFromMemberAndFollowStatusTrueOrderByUpdatedAt(member); | ||
|
|
||
| return followings.stream() | ||
| .map(Follow::getToMember) | ||
| .collect(Collectors.toList()); | ||
| } | ||
|
|
||
| @Transactional | ||
| public List<Member> getFollowers(Member member) { | ||
| if (member == null) { | ||
| throw new GeneralException(ErrorStatus.MEMBER_NOT_FOUND); | ||
| } | ||
|
|
||
| member = memberRepository.findByToIdWithFollowers(member.getMemberId()) | ||
| .orElseThrow(() -> new GeneralException(ErrorStatus.MEMBER_NOT_FOUND)); | ||
|
|
||
| List<Follow> followers = followRepository.findByToMemberAndFollowStatusTrueOrderByUpdatedAt(member); | ||
| public interface FollowService { | ||
|
|
||
| return followers.stream() | ||
| .map(Follow::getFromMember) | ||
| .collect(Collectors.toList()); | ||
| } | ||
| Follow follow(Long toId, Member fromMember); | ||
| Boolean isFollowing(Long toId, Member fromMember); | ||
| List<Member> getFollowings(Member member); | ||
| List<Member> getFollowers(Member member); | ||
| } |
Oops, something went wrong.