Merge pull request #89 from TU-NEBULA/refactor/SCRUM-226

Seungkiii · web-flow · commit 1d2c6acc275a · 2025-06-16T20:25:36.000+09:00
SCRUM 226 : 스타 필드에 조회시간 추가에 따른 기능 수정
diff --git a/data/testdb.mv.db b/data/testdb.mv.db
diff --git a/data/testdb.trace.db b/data/testdb.trace.db
@@ -0,0 +1,21 @@
+2025-03-06 14:29:54.151996+09:00 jdbc[3]: exception
+org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "USERS" not found (this database is empty); SQL statement:
+select u1_0.id,u1_0.email,u1_0.name,u1_0.refresh_token,u1_0.role,u1_0.username from users u1_0 where u1_0.username=? [42104-224]
+2025-03-06 14:30:42.223336+09:00 jdbc[3]: exception
+org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "USERS" not found (this database is empty); SQL statement:
+select u1_0.id,u1_0.email,u1_0.name,u1_0.refresh_token,u1_0.role,u1_0.username from users u1_0 where u1_0.username=? [42104-224]
+2025-03-06 14:30:48.663140+09:00 jdbc[3]: exception
+org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "USERS" not found (this database is empty); SQL statement:
+select u1_0.id,u1_0.email,u1_0.name,u1_0.refresh_token,u1_0.role,u1_0.username from users u1_0 where u1_0.username=? [42104-224]
+2025-03-15 14:11:51.719896+09:00 jdbc[3]: exception
+org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "USERS" not found (this database is empty); SQL statement:
+select u1_0.id,u1_0.email,u1_0.name,u1_0.refresh_token,u1_0.role,u1_0.username from users u1_0 where u1_0.username=? [42104-224]
+2025-03-15 14:11:59.193304+09:00 jdbc[3]: exception
+org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "USERS" not found (this database is empty); SQL statement:
+select u1_0.id,u1_0.email,u1_0.name,u1_0.refresh_token,u1_0.role,u1_0.username from users u1_0 where u1_0.username=? [42104-224]
+2025-03-15 14:57:23.019542+09:00 jdbc[3]: exception
+org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "USERS" not found (this database is empty); SQL statement:
+select u1_0.id,u1_0.email,u1_0.name,u1_0.refresh_token,u1_0.role,u1_0.username from users u1_0 where u1_0.username=? [42104-224]
+2025-03-15 14:58:28.511833+09:00 jdbc[3]: exception
+org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "USERS" not found (this database is empty); SQL statement:
+select u1_0.id,u1_0.email,u1_0.name,u1_0.refresh_token,u1_0.role,u1_0.username from users u1_0 where u1_0.username=? [42104-224]
diff --git a/src/main/java/com/team_nebula/nebula/domain/star/converter/StarConverter.java b/src/main/java/com/team_nebula/nebula/domain/star/converter/StarConverter.java
@@ -2,6 +2,7 @@
 
 import com.team_nebula.nebula.domain.star.dto.response.*;
 
+import java.time.LocalDateTime;
 import java.util.*;
 
 public class StarConverter {
@@ -17,6 +18,7 @@ public static GetStarOneResponseDTO convertToStarOneDto(GetStarOneResponseDTO da
                 .userMemo(data.getUserMemo())
                 .views(data.getViews())
                 .faviconUrl(data.getFaviconUrl())
+                .lastAccessedAt(data.getLastAccessedAt())
                 .keywordList(data.getKeywordList())
                 .build();
     }
diff --git a/src/main/java/com/team_nebula/nebula/domain/star/dto/response/GetStarOneResponseDTO.java b/src/main/java/com/team_nebula/nebula/domain/star/dto/response/GetStarOneResponseDTO.java
@@ -5,6 +5,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.UUID;
 
@@ -22,5 +23,6 @@ public class GetStarOneResponseDTO {
     private String userMemo;
     private int views;
     private String faviconUrl;
+    private LocalDateTime lastAccessedAt;
     private List<String> keywordList;
 }
diff --git a/src/main/java/com/team_nebula/nebula/domain/star/entity/Star.java b/src/main/java/com/team_nebula/nebula/domain/star/entity/Star.java
@@ -13,6 +13,7 @@
 import org.springframework.data.neo4j.core.schema.Property;
 import org.springframework.data.neo4j.core.schema.Relationship;
 
+import java.time.LocalDateTime;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
@@ -44,6 +45,9 @@ public class Star extends BaseEntity {
     @Property("views")
     private Integer views;
 
+    @Property("lastAccessedAt")
+    private LocalDateTime lastAccessedAt;
+
     @Property("html_file_url")
     private String htmlFileUrl;
 
@@ -61,7 +65,7 @@ public class Star extends BaseEntity {
 
     @Builder
     public Star(String title, String siteUrl, String thumbnailUrl, String summaryAI, String userMemo, int views,
-                String htmlFileUrl) {
+                LocalDateTime lastAccessedAt, String htmlFileUrl) {
         this.id = UUID.randomUUID();
         this.title = title;
         this.siteUrl = siteUrl;
@@ -71,6 +75,7 @@ public Star(String title, String siteUrl, String thumbnailUrl, String summaryAI,
         this.views = views;
         this.htmlFileUrl = htmlFileUrl;
         this.isDeletedStatus = false;
+        this.lastAccessedAt = lastAccessedAt;
     }
 
     public void updateStar(String thumbnailUrl, String summaryAI, String userMemo) {
@@ -95,4 +100,6 @@ public void updateUserMemo(String userMemo){
     public void updateIsDeletedStatus(){
         this.isDeletedStatus = true;
     }
+
+    public void updateLastAccessedAt(){ this.lastAccessedAt = LocalDateTime.now(); }
 }
diff --git a/src/main/java/com/team_nebula/nebula/domain/star/repository/StarRepository.java b/src/main/java/com/team_nebula/nebula/domain/star/repository/StarRepository.java
@@ -28,29 +28,34 @@ OPTIONAL MATCH (s)-[:HAS_FAVICON]->(f:Favicon)
 		           s.views AS views,
 		           c.name AS categoryName,
 		           f.faviconUrl AS faviconUrl,
+		           s.lastAccessedAt AS lastAccessedAt,
 		           COLLECT(k.name) AS keywordList
 		""")
 	List<GetStarOneResponseDTO> findStarsByUserId(@Param("userId") Long userId);
 
 	@Query("""
-		    MATCH (s:Star {id: $starId})-[:BELONGS_TO]->(c:Category)
-		    OPTIONAL MATCH (s)-[:TAGGED]->(k:Keyword)
-		    OPTIONAL MATCH (s)-[:HAS_FAVICON]->(f:Favicon)
-		    WHERE s.isDeletedStatus = false
-		
-		    RETURN s.id AS starId,
-		           s.title AS title,
-		           s.siteUrl AS siteUrl,
-		           s.thumbnailUrl AS thumbnailUrl,
-		           s.summaryAI AS summaryAI,
-		           s.userMemo AS userMemo,
-		           s.views AS views,
-		           c.name AS categoryName,
-		           f.faviconUrl AS faviconUrl,
-		           COLLECT(k.name) AS keywordList
+			MATCH (s:Star {id: $starId})
+			WHERE s.isDeletedStatus = false
+			OPTIONAL MATCH (s)-[:BELONGS_TO]->(c:Category)
+			OPTIONAL MATCH (s)-[:TAGGED]->(k:Keyword)
+			OPTIONAL MATCH (s)-[:HAS_FAVICON]->(f:Favicon)
+			SET s.views = s.views + 1,
+				s.lastAccessedAt = datetime()
+			RETURN s.id AS starId,
+				   s.title AS title,
+				   s.siteUrl AS siteUrl,
+				   s.thumbnailUrl AS thumbnailUrl,
+				   s.summaryAI AS summaryAI,
+				   s.userMemo AS userMemo,
+				   s.views AS views,
+				   c.name AS categoryName,
+				   f.faviconUrl AS faviconUrl,
+				   s.lastAccessedAt AS lastAccessedAt,
+				   COLLECT(DISTINCT k.name) AS keywordList
 		""")
 	GetStarOneResponseDTO findStarDetailById(@Param("starId") UUID starId);
 
+
 	@Query("""
 		MATCH (u:UserNode)-[:CREATED]->(s:Star)-[:BELONGS_TO]->(c:Category)
 		WHERE u.userId = $userId AND c.id = $categoryId AND s.isDeletedStatus = false
@@ -65,6 +70,7 @@ OPTIONAL MATCH (s)-[:HAS_FAVICON]->(f:Favicon)
 		       s.views AS views,
 		       c.name AS categoryName,
 		       f.faviconUrl AS faviconUrl,
+		       s.lastAccessedAt AS lastAccessedAt,
 		       COLLECT(k.name) AS keywordList
 		""")
 	List<GetStarOneResponseDTO> findStarsInCategory(@Param("userId") Long userId, @Param("categoryId") UUID categoryId);
@@ -83,6 +89,7 @@ OPTIONAL MATCH (s)-[:HAS_FAVICON]->(f:Favicon)
 		       s.views AS views,
 		       c.name AS categoryName,
 		       f.faviconUrl AS faviconUrl,
+		       s.lastAccessedAt AS lastAccessedAt,
 		       COLLECT(k.name) AS keywordList
 		""")
 	List<GetStarOneResponseDTO> findStarsInKeyword(@Param("userId") Long userId, @Param("keywordId") String keywordId);
@@ -124,6 +131,7 @@ s2, c2, f2, COLLECT(DISTINCT k2.name) AS linkedKeywordList,
 		            userMemo: s.userMemo,
 		            views: s.views,
 		            faviconUrl: f.faviconUrl,
+		            lastAccessedAt: s.lastAccessedAt,
 		            keywordList: keywordList
 		        },
 		        linkData: links,
@@ -143,20 +151,6 @@ s2, c2, f2, COLLECT(DISTINCT k2.name) AS linkedKeywordList,
 		""")
 	List<GetSearchedStarOneResponseDTO> searchStars(@Param("userId") Long userId, @Param("title") String title);
 
-	@Query("""
-		MATCH (s:Star)
-		WHERE s.id = $starId
-		SET s.views = s.views + 1
-		""")
-	void incrementViews(UUID starId);
-
-	@Query("""
-		MATCH (s:Star)
-		WHERE s.id = $starId
-		SET s.views = s.views - 1
-		""")
-	void reduceViews(UUID starId);
-
 	@Query("""
 		MATCH (u:UserNode)-[:CREATED]->(s:Star)
 		WHERE u.userId = $userId AND s.siteUrl IN $urls AND s.isDeletedStatus = false
diff --git a/src/main/java/com/team_nebula/nebula/domain/star/service/StarCommandServiceImpl.java b/src/main/java/com/team_nebula/nebula/domain/star/service/StarCommandServiceImpl.java
@@ -27,6 +27,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.time.LocalDateTime;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -158,6 +159,8 @@ public GetStarOneResponseDTO updateStar(Long userId, UUID starId, UpdateStarOneR
         Optional.ofNullable(requestDTO.getSummaryAI()).ifPresent(latestStar::updateSummaryAI);
         Optional.ofNullable(requestDTO.getUserMemo()).ifPresent(latestStar::updateUserMemo);
 
+        latestStar.updateLastAccessedAt();
+
         // DB에 저장
         Star updatedStar = starRepository.save(latestStar);
 
@@ -174,6 +177,7 @@ public GetStarOneResponseDTO updateStar(Long userId, UUID starId, UpdateStarOneR
                 .userMemo(updatedStar.getUserMemo())
                 .views(updatedStar.getViews())
                 .faviconUrl(updatedStar.getFavicons().toString())
+                .lastAccessedAt(updatedStar.getLastAccessedAt())
                 .keywordList(updatedStar.getKeywords().stream()
                         .map(Keyword::getName)
                         .toList())
@@ -244,6 +248,7 @@ public CreateStarResponseDTO createStar(Long userId, CreateStarRequestDTO reques
                 .thumbnailUrl(requestDTO.getThumbnailUrl())
                 .summaryAI(requestDTO.getSummaryAI())
                 .userMemo(requestDTO.getUserMemo())
+                .lastAccessedAt(LocalDateTime.now())
                 .build();
 
         Star savedStar = starRepository.save(star);
diff --git a/src/main/java/com/team_nebula/nebula/domain/star/service/StarQueryServiceImpl.java b/src/main/java/com/team_nebula/nebula/domain/star/service/StarQueryServiceImpl.java
@@ -62,10 +62,9 @@ public List<GetStarOneResponseDTO> findAllStar(Long userId) {
 	// 단일 스타 조회
 	@Override
 	public GetStarOneResponseDTO getStarOne(UUID starId) {
-		starRepository.incrementViews(starId);
 		GetStarOneResponseDTO data = starRepository.findStarDetailById(starId);
+
 		if (data == null) {
-			starRepository.reduceViews(starId);
 			throw new GeneralException(ErrorStatus._STAR_NOT_FOUND);
 		}
 
