Feat#11 조회수

backend/build.gradle

@@ -48,6 +48,18 @@ dependencies {
     annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta"
     annotationProcessor "jakarta.annotation:jakarta.annotation-api"
     annotationProcessor "jakarta.persistence:jakarta.persistence-api"
+
+    implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+
+
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testImplementation 'org.testcontainers:testcontainers'
+    testImplementation 'org.springframework.boot:spring-boot-testcontainers'
+    testImplementation 'org.testcontainers:junit-jupiter'
+    testImplementation 'com.redis:testcontainers-redis:2.2.2'
+
+    implementation 'org.redisson:redisson-spring-boot-starter:3.27.0'
+
 }
 
 tasks.named('test') {

backend/src/main/java/org/juniortown/backend/BackendApplication.java

@@ -4,9 +4,11 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableJpaAuditing
+@EnableScheduling
 public class BackendApplication {
 
 	public static void main(String[] args) {

backend/src/main/java/org/juniortown/backend/config/RedisConfig.java

@@ -0,0 +1,43 @@
+package org.juniortown.backend.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+@Configuration
+@Profile("!test") // test 프로파일이 아닐 때만 활성화
+public class RedisConfig {
+	@Value("${spring.data.redis.host}")
+	private String host;
+	@Value("${spring.data.redis.port}")
+	private int port;
+
+	@Bean
+	public RedisConnectionFactory redisConnectionFactory() {
+		return new LettuceConnectionFactory(host, port);
+	}
+
+	@Bean
+	public RedisTemplate<String, Boolean> keyCheckRedisTemplate(RedisConnectionFactory redisConnectionFactory) {
+		RedisTemplate<String,Boolean> redisTemplate = new RedisTemplate<>();
+		redisTemplate.setConnectionFactory(redisConnectionFactory);
+		redisTemplate.setKeySerializer(new StringRedisSerializer());
+		redisTemplate.setValueSerializer(new Jackson2JsonRedisSerializer<>(Boolean.class));
+		return redisTemplate;
+	}
+
+	@Bean
+	public RedisTemplate<String, Long> readCountRedisTemplate(RedisConnectionFactory redisConnectionFactory) {
+		RedisTemplate<String,Long> redisTemplate = new RedisTemplate<>();
+		redisTemplate.setConnectionFactory(redisConnectionFactory);
+		redisTemplate.setKeySerializer(new StringRedisSerializer());
+		redisTemplate.setValueSerializer(new Jackson2JsonRedisSerializer<>(Long.class));
+		return redisTemplate;
+	}
+}

backend/src/main/java/org/juniortown/backend/config/SecurityConfig.java

@@ -76,7 +76,7 @@ public CorsConfiguration getCorsConfiguration(HttpServletRequest request) {
 		//경로별 인가 작업
 		http
 			.authorizeHttpRequests((auth) -> auth
-				.requestMatchers("/api/auth/login", "/", "/api/auth/signup","/swagger-ui/**","/v3/api-docs/**").permitAll()
+				.requestMatchers("/api/auth/login", "/", "/api/auth/signup","/swagger-ui/**","/v3/api-docs/**","/api/posts/details/**").permitAll()
 				.requestMatchers("/admin").hasRole("ADMIN")
 				.anyRequest().authenticated());
 

backend/src/main/java/org/juniortown/backend/config/WebMvcConfig.java

@@ -1,9 +1,23 @@
 package org.juniortown.backend.config;
 
+import org.juniortown.backend.interceptor.GuestCookieInterceptor;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+import lombok.RequiredArgsConstructor;
+
+@Configuration
+@RequiredArgsConstructor
 public class WebMvcConfig implements WebMvcConfigurer {
+	private final GuestCookieInterceptor guestCookieInterceptor;
+	@Override
+	public void addInterceptors(InterceptorRegistry registry) {
+		registry.addInterceptor(guestCookieInterceptor)
+			.addPathPatterns("/**");
+	}
+
 	@Override
 	public void addCorsMappings(CorsRegistry registry) {
 		registry.addMapping("/**")

backend/src/main/java/org/juniortown/backend/interceptor/GuestCookieInterceptor.java

@@ -0,0 +1,36 @@
+package org.juniortown.backend.interceptor;
+
+import java.util.UUID;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+@Component
+public class GuestCookieInterceptor implements HandlerInterceptor {
+	private static final String COOKIE_NAME = "guestId";
+	@Override
+	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
+		Cookie[] cookies = request.getCookies();
+		boolean hasGuestId = false;
+		if (cookies != null) {
+			for(Cookie c : cookies) {
+				if (COOKIE_NAME.equals(c.getName())) {
+					hasGuestId = true;
+					break;
+				}
+			}
+		}
+		if(!hasGuestId) {
+			String guestId = UUID.randomUUID().toString();
+			Cookie cookie = new Cookie(COOKIE_NAME, guestId);
+			cookie.setPath("/");
+			cookie.setMaxAge(60 * 60 * 24 * 365); // 1 year
+			response.addCookie(cookie);
+		}
+		return true;
+	}
+}

backend/src/main/java/org/juniortown/backend/like/repository/LikeRepository.java

@@ -9,4 +9,5 @@
 @Repository
 public interface LikeRepository extends JpaRepository<Like, Long> {
 	Optional<Like> findByUserIdAndPostId(Long userId, Long postId);
+	Long countByPostId(Long postId);
 }

backend/src/main/java/org/juniortown/backend/like/service/LikeService.java

@@ -34,7 +34,7 @@ public LikeResponse likePost(Long userId, Long postId) {
 					.post(post)
 					.build();
 				likeRepository.save(newLike);
-				
+
 				return LikeResponse.builder()
 					.userId(userId)
 					.postId(postId)

backend/src/main/java/org/juniortown/backend/post/controller/PostController.java

@@ -1,16 +1,21 @@
 package org.juniortown.backend.post.controller;
 
+import java.util.stream.Collectors;
+
 import org.juniortown.backend.post.dto.request.PostCreateRequest;
 import org.juniortown.backend.post.dto.response.PageResponse;
+import org.juniortown.backend.post.dto.response.PostDetailResponse;
 import org.juniortown.backend.post.dto.response.PostWithLikeCount;
 import org.juniortown.backend.post.dto.response.PostResponse;
 import org.juniortown.backend.post.dto.response.PostWithLikeCountProjection;
 import org.juniortown.backend.post.service.PostService;
+import org.juniortown.backend.post.service.ViewCountService;
 import org.juniortown.backend.user.dto.CustomUserDetails;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
@@ -28,6 +33,7 @@
 @RequestMapping("/api")
 public class PostController {
 	private final PostService postService;
+	private final ViewCountService viewCountService;
 	@PostMapping("/posts")
 	public ResponseEntity<PostResponse> create(@AuthenticationPrincipal CustomUserDetails customUserDetails,
 		@Valid @RequestBody PostCreateRequest postCreateRequest) {
@@ -55,19 +61,35 @@ public ResponseEntity<PostResponse> update(@AuthenticationPrincipal CustomUserDe
 
 	// 게시글 목록 조회, 페이지네이션 적용
 	@GetMapping("/posts/{page}")
-	public ResponseEntity<PageResponse<PostWithLikeCountProjection>> getPosts(@AuthenticationPrincipal CustomUserDetails customUserDetails, @PathVariable int page) {
+	public ResponseEntity<PageResponse<PostResponse>> getPosts(@AuthenticationPrincipal CustomUserDetails customUserDetails, @PathVariable int page) {
 		Long userId = customUserDetails.getUserId();
 		// null체크
 
-	 	Page<PostWithLikeCountProjection> posts = postService.getPosts(userId, page);
-		PageResponse<PostWithLikeCountProjection> response = new PageResponse<>(posts);
+	 	Page<PostResponse> posts = postService.getPosts(userId, page);
+		PageResponse<PostResponse> response = new PageResponse<>(posts);
 		return ResponseEntity.ok(response);
 	}
 
 	@GetMapping("/posts/details/{postId}")
-	public ResponseEntity<PostResponse> getPost(@PathVariable Long postId) {
-		PostResponse postResponse = postService.getPost(postId);
-		return ResponseEntity.ok(postResponse);
+	public ResponseEntity<PostDetailResponse> getPost(@AuthenticationPrincipal CustomUserDetails customUserDetails
+		,@PathVariable Long postId
+		,@CookieValue(value = "guestId", required = false) String guestId
+	) {
+		Long redisReadCount = 0L;
+		if(customUserDetails == null) {
+			// 비회원인 경우
+			// 쿠키값을 레디스에 등록
+			redisReadCount = viewCountService.readCountUp(guestId, String.valueOf(postId));
+		} else {
+			// 회원인 경우
+			// userId,postId를 조합해서 레디스에 등록
+			Long userId = customUserDetails.getUserId();
+			redisReadCount = viewCountService.readCountUp(String.valueOf(userId), String.valueOf(postId));
+		}
+
+		PostDetailResponse postDetailResponse = postService.getPost(postId);
+		postDetailResponse.addReadCount(redisReadCount);
+		return ResponseEntity.ok(postDetailResponse);
 	}
 
 }

backend/src/main/java/org/juniortown/backend/post/dto/response/PostDetailResponse.java

@@ -0,0 +1,55 @@
+package org.juniortown.backend.post.dto.response;
+
+import java.time.LocalDateTime;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+public class PostDetailResponse {
+	private Long id;
+	private String title;
+	private String content;
+	private Long userId;
+	private String userName;
+	private Long likeCount;
+	private Boolean isLiked;
+	private Long readCount;
+	private LocalDateTime createdAt;
+	private LocalDateTime updatedAt;
+	private LocalDateTime deletedAt;
+
+	@Builder
+	public PostDetailResponse(Long id, String title, String content, Long userId, String userName, Long likeCount,
+			Boolean isLiked, Long readCount, LocalDateTime createdAt, LocalDateTime updatedAt, LocalDateTime deletedAt) {
+		this.id = id;
+		this.title = title;
+		this.content = content;
+		this.userId = userId;
+		this.userName = userName;
+		this.likeCount = likeCount;
+		this.isLiked = isLiked;
+		this.readCount = readCount;
+		this.createdAt = createdAt;
+		this.updatedAt = updatedAt;
+		this.deletedAt = deletedAt;
+	}
+	public static PostDetailResponse from(PostResponse postResponse) {
+		return PostDetailResponse.builder()
+			.id(postResponse.getId())
+			.title(postResponse.getTitle())
+			.content(postResponse.getContent())
+			.userId(postResponse.getUserId())
+			.userName(postResponse.getUserName())
+			.likeCount(postResponse.getLikeCount())
+			.isLiked(postResponse.getIsLiked())
+			.readCount(postResponse.getReadCount())
+			.createdAt(postResponse.getCreatedAt())
+			.updatedAt(postResponse.getUpdatedAt())
+			.deletedAt(postResponse.getDeletedAt())
+			.build();
+	}
+	public void addReadCount(Long redisReadCount) {
+		this.readCount += redisReadCount;
+	}
+}

backend/src/main/java/org/juniortown/backend/post/dto/response/PostResponse.java

@@ -4,7 +4,9 @@
 
 import org.juniortown.backend.post.entity.Post;
 
+import lombok.Builder;
 import lombok.Getter;
+import lombok.Setter;
 
 @Getter
 public class PostResponse {
@@ -13,18 +15,39 @@ public class PostResponse {
 	private final String content;
 	private final Long userId;
 	private final String userName;
+	private final Long likeCount;
+	private Long readCount;
+	private Boolean isLiked;
 	private final LocalDateTime createdAt;
 	private final LocalDateTime updatedAt;
 	private final LocalDateTime deletedAt;
 
-	public PostResponse(Post post) {
-		this.id = post.getId();
-		this.title = post.getTitle();
-		this.content = post.getContent();
-		this.userId = post.getUser().getId();
-		this.userName = post.getUser().getName();
-		this.createdAt = post.getCreatedAt();
-		this.updatedAt = post.getUpdatedAt();
-		this.deletedAt = post.getDeletedAt();
+	@Builder
+	public PostResponse(Long id, String title, String content, Long userId, String userName, Long likeCount,
+			Boolean isLiked, Long readCount, LocalDateTime createdAt, LocalDateTime updatedAt, LocalDateTime deletedAt) {
+		this.id = id;
+		this.title = title;
+		this.content = content;
+		this.userId = userId;
+		this.userName = userName;
+		this.likeCount = likeCount;
+		this.isLiked = isLiked;
+		this.readCount = readCount;
+		this.createdAt = createdAt;
+		this.updatedAt = updatedAt;
+		this.deletedAt = deletedAt;
+	}
+	public static PostResponse from(Post post) {
+		return PostResponse.builder()
+			.id(post.getId())
+			.title(post.getTitle())
+			.content(post.getContent())
+			.userId(post.getUser().getId())
+			.userName(post.getUser().getName())
+			.readCount(post.getReadCount())
+			.createdAt(post.getCreatedAt())
+			.updatedAt(post.getUpdatedAt())
+			.deletedAt(post.getDeletedAt())
+			.build();
 	}
 }

backend/src/main/java/org/juniortown/backend/post/dto/response/PostWithLikeCountProjection.java

@@ -2,13 +2,15 @@
 
 import java.time.LocalDateTime;
 
+
 public interface PostWithLikeCountProjection {
 	Long getId();
 	String getTitle();
 	String getUsername();
 	Long getUserId();
 	Long getLikeCount();
 	Boolean getIsLiked();
+	Long getReadCount();
 	LocalDateTime getCreatedAt();
 	LocalDateTime getUpdatedAt();
 }

backend/src/main/java/org/juniortown/backend/post/entity/Post.java

@@ -40,6 +40,9 @@ public class Post extends BaseTimeEntity {
 	@Column(name = "deleted_at")
 	private LocalDateTime deletedAt;
 
+	@Column(name = "read_count", nullable = false)
+	private Long readCount = 0L;
+
 	@Builder
 	public Post(String title, String content, User user) {
 		this.title = title;
@@ -49,11 +52,14 @@ public Post(String title, String content, User user) {
 
 	public void softDelete(Clock clock) {
 		this.deletedAt = LocalDateTime.now(clock);
-
 	}
 
 	public void update(PostCreateRequest postCreateRequest, Clock clock) {
 		this.title = postCreateRequest.getTitle();
 		this.content = postCreateRequest.getContent();
 	}
+
+	public void addReadCount(Long redisReadCount) {
+		this.readCount += redisReadCount;
+	}
 }