Merge pull request #28 from prgrms-web-devcourse-final-project/feature/profile

프로필 기능 구현 앞서 팔로우 기능 간단 구현

Author: sapiens2000

.github/workflows/dev-build.yml

@@ -1,4 +1,4 @@
-name: log4u-dev-build
+name: dev-build
 on:
   pull_request:
     branches:
@@ -8,6 +8,7 @@ on:
 jobs:
   build:
     name: Build and analyze
+    environment: develop-test
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -40,25 +41,52 @@ jobs:
           docker run --name log4u-mysql \
             -e MYSQL_ROOT_PASSWORD=root \
             -e MYSQL_DATABASE=log4u \
-            -e MYSQL_USER=dev \
-            -e MYSQL_PASSWORD=devcos4-team08 \
+            -e MYSQL_USER=${{ secrets.DB_USERNAME }} \
+            -e MYSQL_PASSWORD=${{ secrets.DB_PASSWORD}} \
             -d \
             -p 3307:3306 \
             mysql:8.0.33
 
-      - name: Build and analyze
+      - name: Wait for MySQL to be ready
+        run: |
+          for i in {1..10}; do
+            if docker exec log4u-mysql mysqladmin ping -h "127.0.0.1" --silent; then
+              echo "MySQL is ready!"
+              break
+            fi
+            echo "Waiting for MySQL to start..."
+            sleep 1
+          done
+          if ! docker exec log4u-mysql mysqladmin ping -h "127.0.0.1" --silent; then
+            echo "MySQL did not start in time!"
+            exit 1
+          fi
+
+      - name: Test and analyze
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          #GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          DB_URL: jdbc:mysql://localhost:3307/log4u
-          DB_USERNAME: dev
-          DB_PASSWORD: devcos4-team08
+          DB_URL: ${{ secrets.DB_URL }}
+          DB_USERNAME: ${{ secrets.DB_USERNAME }}
+          DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
+          NAVER_DEV_CLIENT_ID: ${{ secrets.NAVER_DEV_CLIENT_ID }}
+          NAVER_DEV_CLIENT_SECRET: ${{ secrets.NAVER_DEV_CLIENT_SECRET }}
+          NAVER_DEV_REDIRECT_URI: ${{ secrets.NAVER_DEV_REDIRECT_URI }}
+          GOOGLE_DEV_CLIENT_ID: ${{ secrets.GOOGLE_DEV_CLIENT_ID }}
+          GOOGLE_DEV_CLIENT_SECRET: ${{ secrets.GOOGLE_DEV_CLIENT_SECRET }}r
+          GOOGLE_DEV_REDIRECT_URI: ${{ secrets.GOOGLE_DEV_REDIRECT_URI }}
+          KAKAO_DEV_CLIENT_ID: ${{ secrets.KAKAO_DEV_CLIENT_ID }}
+          KAKAO_DEV_CLIENT_SECRET: ${{ secrets.KAKAO_DEV_CLIENT_SECRET }}
+          KAKAO_DEV_REDIRECT_URI: ${{ secrets.KAKAO_DEV_REDIRECT_URI }}
+          JWT_SECRET: ${{ secrets.JWT_SECRET }}
+          JWT_ACCESS_TOKEN_EXPIRE_TIME_SECONDS: ${{ secrets.JWT_ACCESS_TOKEN_EXPIRE_TIME_SECONDS }}
+          JWT_REFRESH_TOKEN_EXPIRE_TIME_SECONDS: ${{ secrets.JWT_ACCESS_TOKEN_EXPIRE_TIME_SECONDS }}
 
         # dev 프로필 사용
         run: |
           chmod +x ./gradlew
           # 소나클라우드 임시 비활성화 ./gradlew build jacocoTestReport sonar --info -Pprofile=dev -Dsonar.branch.name=${{ github.ref_name }}
-          ./gradlew build jacocoTestReport -Pprofile=dev 
+          ./gradlew build -i jacocoTestReport -Pprofile=dev 
 
       - name: Docker MySQL 종료 및 제거
         run: |

src/main/java/com/example/log4u/domain/diary/service/DiaryService.java

@@ -169,7 +169,7 @@ private List<VisibilityType> determineAccessibleVisibilities(Long userId, Long t
 			return List.of(VisibilityType.PUBLIC, VisibilityType.PRIVATE, VisibilityType.FOLLOWER);
 		}
 
-		if (followRepository.existsByFollowerIdAndFollowingId(userId, targetUserId)) {
+		if (followRepository.existsByInitiatorIdAndTargetId(userId, targetUserId)) {
 			return List.of(VisibilityType.PUBLIC, VisibilityType.FOLLOWER);
 		}
 
@@ -186,7 +186,7 @@ private void validateDiaryAccess(Diary diary, Long userId) {
 
 		if (diary.getVisibility() == VisibilityType.FOLLOWER) {
 			if (!diary.getUserId().equals(userId)
-				&& !followRepository.existsByFollowerIdAndFollowingId(userId, diary.getUserId())) {
+				&& !followRepository.existsByInitiatorIdAndTargetId(userId, diary.getUserId())) {
 				throw new NotFoundDiaryException();
 			}
 		}

src/main/java/com/example/log4u/domain/follow/controller/FollowController.java

@@ -0,0 +1,42 @@
+package com.example.log4u.domain.follow.controller;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.example.log4u.common.oauth2.dto.CustomOAuth2User;
+import com.example.log4u.domain.follow.service.FollowService;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+
+@Tag(name = "팔로우 API")
+@Controller
+@RequiredArgsConstructor
+@RequestMapping("/users")
+public class FollowController {
+	private final FollowService followService;
+
+	@PostMapping("/{nickname}/follow")
+	public ResponseEntity<Void> createFollow(
+		@AuthenticationPrincipal CustomOAuth2User customOAuth2User,
+		@PathVariable("nickname") String nickname
+	) {
+		followService.createFollow(customOAuth2User.getUserId(), nickname);
+		return ResponseEntity.ok().build();
+	}
+
+	@DeleteMapping("/{nickname}/follow")
+	public ResponseEntity<Void> deleteFollow(
+		@AuthenticationPrincipal CustomOAuth2User customOAuth2User,
+		@PathVariable("nickname") String nickname
+	) {
+		followService.deleteFollow(customOAuth2User.getUserId(), nickname);
+		return ResponseEntity.ok().build();
+	}
+
+}

src/main/java/com/example/log4u/domain/follow/entitiy/Follow.java

@@ -12,7 +12,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-@Entity
+@Entity(name = "follow")
 @Getter
 @Builder
 @AllArgsConstructor
@@ -22,7 +22,18 @@ public class Follow extends BaseEntity {
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Long id;
 
-	private Long followerId;
+	// 팔로우를 누른 주체
+	private Long initiatorId;
 
-	private Long followingId;
+	// 팔로우를 받은 대상
+	private Long targetId;
+
+	// dto 넣기 애매해서 엔티티 내부에 static 함수 구현
+	public static Follow of(Long initiatorId, Long targetId) {
+		return new Follow(
+			null,
+			initiatorId,
+			targetId
+		);
+	}
 }

src/main/java/com/example/log4u/domain/follow/exception/FollowErrorCode.java

@@ -0,0 +1,29 @@
+package com.example.log4u.domain.follow.exception;
+
+import org.springframework.http.HttpStatus;
+
+import com.example.log4u.common.exception.base.ErrorCode;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum FollowErrorCode implements ErrorCode {
+	FOLLOW_NOT_FOUND(HttpStatus.NOT_FOUND, "팔로우 정보가 존재하지 않습니다."),
+	FOLLOWER_NOT_FOUND(HttpStatus.NOT_FOUND, "팔로워 정보가 존재하지 않습니다.");
+
+	private final HttpStatus httpStatus;
+	private final String message;
+
+	@Override
+	public HttpStatus getHttpStatus() {
+		return httpStatus;
+	}
+
+	@Override
+	public String getErrorMessage() {
+		return message;
+	}
+}
+

src/main/java/com/example/log4u/domain/follow/exception/FollowNotFoundException.java

@@ -0,0 +1,9 @@
+package com.example.log4u.domain.follow.exception;
+
+import com.example.log4u.common.exception.base.ServiceException;
+
+public class FollowNotFoundException extends ServiceException {
+	public FollowNotFoundException() {
+		super(FollowErrorCode.FOLLOW_NOT_FOUND);
+	}
+}

src/main/java/com/example/log4u/domain/follow/repository/FollowRepository.java

@@ -1,10 +1,18 @@
 package com.example.log4u.domain.follow.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
 import com.example.log4u.domain.follow.entitiy.Follow;
 
+@Repository
 public interface FollowRepository extends JpaRepository<Follow, Long> {
+	boolean existsByInitiatorIdAndTargetId(Long initiatorId, Long targetId);
 
-	boolean existsByFollowerIdAndFollowingId(Long followerId, Long followingId);
+	void deleteByInitiatorIdAndTargetId(Long initiatorId, Long targetId);
+
+	// 기능 구현 초기용, 데이터 쌓이면 개선 필요
+	Long countByInitiatorId(Long initiatorId);
+
+	Long countByTargetId(Long targetId);
 }

src/main/java/com/example/log4u/domain/follow/service/FollowService.java

@@ -0,0 +1,60 @@
+package com.example.log4u.domain.follow.service;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.example.log4u.domain.follow.entitiy.Follow;
+import com.example.log4u.domain.follow.exception.FollowNotFoundException;
+import com.example.log4u.domain.follow.repository.FollowRepository;
+import com.example.log4u.domain.user.service.UserService;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class FollowService {
+	private final FollowRepository followRepository;
+	private final UserService userService;
+
+	@Transactional
+	public void createFollow(Long initiatorId, String nickname) {
+		validateTargetUser(nickname);
+		followRepository.save(Follow.of(
+			initiatorId,
+			userService.getUserIdByNickname(nickname)));
+	}
+
+	@Transactional
+	public void deleteFollow(Long userId, String nickname) {
+		Long targetId = userService.getUserIdByNickname(nickname);
+		validateFollow(userId, targetId);
+		followRepository.deleteByInitiatorIdAndTargetId(userId, targetId);
+	}
+
+	private void validateTargetUser(String nickname) {
+		// USER NOT FOUND EXCEPTION
+		userService.getUserByNickname(nickname);
+	}
+
+	private void validateFollow(Long userId, Long targetId) {
+		if (!followRepository.existsByInitiatorIdAndTargetId(userId, targetId)) {
+			throw new FollowNotFoundException();
+		}
+	}
+
+	/**
+	 * 나를 팔로우 하는 사람 수 조회
+	 * */
+	@Transactional(readOnly = true)
+	public Long getFollowerCount(Long userId) {
+		return followRepository.countByTargetId(userId);
+	}
+
+	/**
+	 * 내가 팔로우하는 사람 수 조회
+	 * */
+	@Transactional(readOnly = true)
+	public Long getFollowingCount(Long userId) {
+		return followRepository.countByInitiatorId(userId);
+	}
+}

src/main/java/com/example/log4u/domain/user/controller/UserController.java

@@ -1,11 +1,18 @@
 package com.example.log4u.domain.user.controller;
 
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.example.log4u.common.oauth2.dto.CustomOAuth2User;
+import com.example.log4u.domain.user.dto.NicknameValidationResponseDto;
+import com.example.log4u.domain.user.dto.UserProfileResponseDto;
+import com.example.log4u.domain.user.dto.UserProfileUpdateRequestDto;
+import com.example.log4u.domain.user.service.UserService;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -14,11 +21,54 @@
 @Slf4j
 public class UserController {
 
+	private final UserService userService;
+
+	public UserController(UserService userService) {
+		this.userService = userService;
+	}
+
 	@GetMapping("")
 	public String modifyUserProfile(
 		@AuthenticationPrincipal CustomOAuth2User customOAuth2User
 	) {
 		log.info("테스트 GET DATA user = " + customOAuth2User.getUserId());
 		return "test";
 	}
+
+	@GetMapping("/me")
+	public ResponseEntity<UserProfileResponseDto> getMyProfile(
+		@AuthenticationPrincipal CustomOAuth2User customOAuth2User
+	) {
+		UserProfileResponseDto userProfileResponseDto =
+			userService.getMyProfile(customOAuth2User.getUserId());
+		return ResponseEntity.ok(userProfileResponseDto);
+	}
+
+	@GetMapping("/{nickname}")
+	public ResponseEntity<UserProfileResponseDto> getUserProfile(
+		@AuthenticationPrincipal CustomOAuth2User customOAuth2User,
+		@PathVariable String nickname
+	) {
+		UserProfileResponseDto userProfileResponseDto =
+			userService.getUserProfile(nickname);
+		return ResponseEntity.ok(userProfileResponseDto);
+	}
+
+	@PutMapping("/me")
+	public ResponseEntity<UserProfileResponseDto> updateMyProfile(
+		@AuthenticationPrincipal CustomOAuth2User customOAuth2User,
+		UserProfileUpdateRequestDto userProfileUpdateRequestDto
+	) {
+		UserProfileResponseDto userProfileResponseDto =
+			userService.updateMyProfile(customOAuth2User.getUserId(), userProfileUpdateRequestDto);
+		return ResponseEntity.ok(userProfileResponseDto);
+	}
+
+	@GetMapping("/validation/{nickname}")
+	public ResponseEntity<NicknameValidationResponseDto> validateNickname(
+		@AuthenticationPrincipal CustomOAuth2User customOAuth2User,
+		@PathVariable String nickname
+	) {
+		return ResponseEntity.ok(userService.validateNickname(nickname));
+	}
 }

src/main/java/com/example/log4u/domain/user/dto/NicknameValidationResponseDto.java

@@ -0,0 +1,4 @@
+package com.example.log4u.domain.user.dto;
+
+public record NicknameValidationResponseDto(Boolean available) {
+}