24.03.26 prod 서버 배포

README.md

@@ -14,7 +14,7 @@
 [이길 로그](https://yigil.co.kr) 
 
 ## 주요 기능 
-
+ 
 ### 별점 기능
 redis 캐싱을 활용하여 사용자들이 빠르게 볼 수 있도록 구현되어있다. 추후에 batch를 통해 실시간이 아닌 
 주기적인 갱신을 진행하려고 합니다. 혹시 여기서 비효율적이거나 더 나은 방법이 있는지 궁금합니다.

backend/place-region-batch/src/main/java/kr/co/yigil/batch/job/DailyTotalFavorCountJobConfig.java

@@ -0,0 +1,93 @@
+package kr.co.yigil.batch.job;
+
+import jakarta.persistence.EntityManagerFactory;
+import kr.co.yigil.favor.domain.DailyTotalFavorCount;
+import kr.co.yigil.favor.infrastructure.DailyTotalFavorCountRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.batch.core.Job;
+import org.springframework.batch.core.Step;
+import org.springframework.batch.core.job.builder.JobBuilder;
+import org.springframework.batch.core.launch.support.RunIdIncrementer;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.step.builder.StepBuilder;
+import org.springframework.batch.item.ItemProcessor;
+import org.springframework.batch.item.ItemReader;
+import org.springframework.batch.item.ItemWriter;
+import org.springframework.batch.item.data.builder.RepositoryItemWriterBuilder;
+import org.springframework.batch.item.database.JpaPagingItemReader;
+import org.springframework.batch.item.database.builder.JpaPagingItemReaderBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.PlatformTransactionManager;
+
+import java.time.LocalDate;
+import java.util.HashMap;
+
+@Configuration
+@RequiredArgsConstructor
+public class DailyTotalFavorCountJobConfig {
+    private final EntityManagerFactory em;
+    private final DailyTotalFavorCountRepository dailyTotalFavorCountRepository;
+
+    @Bean
+    public Job totalCountJob(
+            JobRepository jobRepository,
+            Step calculateTotalCountStep
+    ) {
+        return new JobBuilder("DailyTotalCountJob", jobRepository)
+                .start(calculateTotalCountStep)
+                .incrementer(new RunIdIncrementer())
+                .build();
+    }
+
+    @Bean
+    public Step calculateTotalCountStep(
+            JobRepository jobRepository,
+            PlatformTransactionManager platformTransactionManager,
+            ItemReader<Object[]> totalCountItemReader,
+            ItemProcessor<Object[], DailyTotalFavorCount> totalFavorCountItemProcessor,
+            ItemWriter<DailyTotalFavorCount> dailyTotalFavorCountItemWriter
+    ) {
+        return new StepBuilder("calculateTotalCountStep", jobRepository)
+                .<Object[], DailyTotalFavorCount>chunk(30, platformTransactionManager)
+                .reader(totalCountItemReader)
+                .processor(totalFavorCountItemProcessor)
+                .writer(dailyTotalFavorCountItemWriter)
+                .build();
+    }
+
+    @Bean
+    public JpaPagingItemReader<Object[]> totalCountItemReader() {
+        LocalDate yesterday = LocalDate.now().minusDays(1);
+        LocalDate today = LocalDate.now();
+
+        HashMap<String, Object> parameters = new HashMap<>();
+        parameters.put("yesterday", yesterday);
+        parameters.put("today", today);
+
+        return new JpaPagingItemReaderBuilder<Object[]>()
+                .queryString("SELECT count(f.id), f.createdAt FROM DailyFavorCount f WHERE f.createdAt >= :yesterday AND f.createdAt < :today GROUP BY f.createdAt")
+                .entityManagerFactory(em)
+                .name("totalCountItemReader")
+                .parameterValues(parameters)
+                .pageSize(100)
+                .build();
+    }
+
+    @Bean
+    public ItemProcessor<Object[], DailyTotalFavorCount> totalFavorCountItemProcessor() {
+        return item ->{
+            Long count = (Long) item[0];
+            LocalDate createdAt = (LocalDate) item[1];
+          return new DailyTotalFavorCount(count, createdAt);
+        };
+    }
+
+    @Bean
+    public ItemWriter<DailyTotalFavorCount> dailyTotalFavorCountItemWriter() {
+        return new RepositoryItemWriterBuilder<DailyTotalFavorCount>()
+                .repository(dailyTotalFavorCountRepository)
+                .methodName("save")
+                .build();
+    }
+}

backend/place-region-batch/src/main/java/kr/co/yigil/batch/job/DemographicPlaceJobConfig.java

@@ -1,8 +1,10 @@
 package kr.co.yigil.batch.job;
 
 import java.time.LocalDateTime;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import kr.co.yigil.member.Ages;
 import kr.co.yigil.member.Gender;
 import kr.co.yigil.place.domain.DemographicPlace;
@@ -34,6 +36,7 @@ public class DemographicPlaceJobConfig {
 
     private final SpotRepository spotRepository;
     private final DemographicPlaceRepository demographicPlaceRepository;
+    private final Set<String> processedCombination = new HashSet<>();
 
     @Bean
     public Job demographicPlaceJob(
@@ -96,6 +99,11 @@ public ItemProcessor<Object[], DemographicPlace> demographicPlaceItemProcessor()
             long referenceCount = (long) item[1];
             Ages ages = (Ages) item[2];
             Gender gender = (Gender) item[3];
+
+            String uniqueKey = place.getId() + "-" + ages.toString() + "-" + gender.toString();
+            if (!processedCombination.add(uniqueKey)) {
+                return null;
+            }
             return new DemographicPlace(place, referenceCount, ages, gender);
         };
     }

backend/place-region-batch/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 spring:
   batch:
     job:
-      enabled: true
+      enabled: false
   jpa:
     database: postgresql
     database-platform: org.hibernate.spatial.dialect.postgis.PostgisPG95Dialect

backend/support/domain/src/main/java/kr/co/yigil/favor/domain/DailyTotalFavorCount.java

@@ -0,0 +1,30 @@
+package kr.co.yigil.favor.domain;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+
+@Entity
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class DailyTotalFavorCount {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private Long count;
+
+    private LocalDate date;
+
+    public DailyTotalFavorCount(Long count, LocalDate date) {
+        this.count = count;
+        this.date = date;
+    }
+}

backend/support/domain/src/main/java/kr/co/yigil/favor/infrastructure/DailyFavorCountRepository.java

@@ -1,16 +1,13 @@
 package kr.co.yigil.favor.infrastructure;
 
 import kr.co.yigil.favor.domain.DailyFavorCount;
-import kr.co.yigil.travel.TravelType;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-
-import java.time.LocalDate;
 
 public interface DailyFavorCountRepository extends JpaRepository<DailyFavorCount, Long>, DailyFavorCountRepositoryCustom {
-    @Query("SELECT d FROM DailyFavorCount d WHERE d.createdAt BETWEEN :startDate AND :endDate AND (d.travelType = :travelType OR :travelType = 'ALL') ORDER BY d.count DESC")
-    Page<DailyFavorCount> findAllByCreatedAtBetweenAndTravelTypeOrAllOrderByCountDesc(@Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate, @Param("travelType") TravelType travelType, Pageable pageable);
+
+    @Query("SELECT d.createdAt, SUM(d.count) FROM DailyFavorCount d GROUP BY d.createdAt")
+    Page<Object[]> findTotalLikesPerDay(Pageable pageable);
 }

backend/support/domain/src/main/java/kr/co/yigil/favor/infrastructure/DailyFavorCountRepositoryCustom.java

@@ -7,5 +7,5 @@
 import java.util.List;
 
 public interface DailyFavorCountRepositoryCustom {
-    List<DailyFavorCount> findTopByTravelTypeOrderByCountDesc(LocalDate startDate, LocalDate endDate, TravelType travelType, Integer limit);
+    List<DailyFavorCount> findTopByTravelTypeOrderByCountDesc(LocalDate startDate, LocalDate endDate);
 }

backend/support/domain/src/main/java/kr/co/yigil/favor/infrastructure/DailyFavorCountRepositoryCustomImpl.java

@@ -19,27 +19,21 @@ public class DailyFavorCountRepositoryCustomImpl implements DailyFavorCountRepos
     private final JPAQueryFactory queryFactory;
 
     @Override
-    public List<DailyFavorCount> findTopByTravelTypeOrderByCountDesc(LocalDate startDate, LocalDate endDate, TravelType travelType, Integer limit){
+    public List<DailyFavorCount> findTopByTravelTypeOrderByCountDesc(LocalDate startDate, LocalDate endDate){
         QDailyFavorCount dailyFavorCount = QDailyFavorCount.dailyFavorCount;
 
         BooleanExpression expression;
-        if (travelType == TravelType.ALL) {
-            expression = dailyFavorCount.travelType.eq(TravelType.SPOT)
-                    .or(dailyFavorCount.travelType.eq(TravelType.COURSE));
-        } else {
-            expression = dailyFavorCount.travelType.eq(travelType);
-        }
+        expression = dailyFavorCount.travelType.eq(TravelType.SPOT)
+                .or(dailyFavorCount.travelType.eq(TravelType.COURSE));
+
 
         BooleanExpression dateExpression = dailyFavorCount.createdAt.between(startDate, endDate);
 
-        if(limit == null){
-            limit = 10;
-        }
 
         return queryFactory.selectFrom(dailyFavorCount)
                 .where(expression.and(dateExpression))
                 .orderBy(dailyFavorCount.count.desc())
-                .limit(limit)
+                .limit(5)
                 .fetch();
     }
 }

backend/support/domain/src/main/java/kr/co/yigil/favor/infrastructure/DailyTotalFavorCountRepository.java

@@ -0,0 +1,13 @@
+package kr.co.yigil.favor.infrastructure;
+
+import java.time.LocalDate;
+import java.util.List;
+import kr.co.yigil.favor.domain.DailyTotalFavorCount;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+public interface DailyTotalFavorCountRepository extends JpaRepository<DailyTotalFavorCount, Long>{
+    @Query("SELECT new kr.co.yigil.favor.domain.DailyTotalFavorCount(dtf.count, dtf.date) FROM DailyTotalFavorCount dtf WHERE dtf.date >= :startDate AND dtf.date <= :endDate")
+    List<DailyTotalFavorCount> findBetweenDates(@Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
+}

backend/support/domain/src/main/java/kr/co/yigil/favor/domain/repository/FavorRepository.java → backend/support/domain/src/main/java/kr/co/yigil/favor/infrastructure/FavorRepository.java

@@ -1,11 +1,12 @@
-package kr.co.yigil.favor.domain.repository;
+package kr.co.yigil.favor.infrastructure;
 
-import java.util.Optional;
 import kr.co.yigil.favor.domain.Favor;
 import kr.co.yigil.member.Member;
 import kr.co.yigil.travel.domain.Travel;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.Optional;
+
 public interface FavorRepository extends JpaRepository<Favor, Long> {
     int countByTravelId(Long travelId);
 

backend/support/domain/src/main/java/kr/co/yigil/follow/domain/Follow.java

@@ -1,16 +1,14 @@
 package kr.co.yigil.follow.domain;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import java.util.Objects;
+import jakarta.persistence.*;
 import kr.co.yigil.member.Member;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.CreatedDate;
+
+import java.time.LocalDateTime;
+import java.util.Objects;
 
 @Entity
 @Getter
@@ -28,6 +26,9 @@ public class Follow {
     @JoinColumn(name = "following_id")
     private Member following;
 
+    @CreatedDate
+    private LocalDateTime createdAt;
+
     public Follow(final Member follower, final Member following) {
         this.follower = follower;
         this.following = following;

backend/support/domain/src/main/java/kr/co/yigil/global/SortBy.java

@@ -8,8 +8,10 @@
 public enum SortBy {
     CREATED_AT("createdAt"),
     RATE("rate"),
+    TITLE("title"),
     ID("id"),
     PLACE_NAME("place.name"),
+    NAME("name"),
     LATEST_UPLOADED_TIME("latestUploadedTime");
 
     private String value;

backend/support/domain/src/main/java/kr/co/yigil/member/Member.java

@@ -1,5 +1,6 @@
 package kr.co.yigil.member;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
@@ -19,6 +20,7 @@
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 import kr.co.yigil.file.AttachFile;
 import kr.co.yigil.region.domain.MemberRegion;
 import kr.co.yigil.region.domain.Region;
@@ -71,6 +73,7 @@ public class Member {
     private Ages ages = Ages.NONE;
 
     @OneToMany(mappedBy = "member", fetch = FetchType.LAZY, cascade = CascadeType.PERSIST, orphanRemoval = true)
+    @JsonIgnore
     private final List<MemberRegion> favoriteRegions = new ArrayList<>();
 
     @JsonSerialize(using = LocalDateTimeSerializer.class)
@@ -163,7 +166,7 @@ public void updateMemberInfo(final String nickname, final String age, final Stri
     public List<Long> getFavoriteRegionIds() {
         return favoriteRegions.stream().map(
             memberRegion -> memberRegion.getRegion().getId()
-        ).toList();
+        ).collect(Collectors.toList());
     }
 
     public boolean isFavoriteRegion(Region region) {

backend/support/domain/src/main/java/kr/co/yigil/member/repository/MemberRepository.java

@@ -32,4 +32,6 @@ public interface MemberRepository extends JpaRepository <Member, Long> {
     void unbanMemberById(@Param("memberId") Long memberId);
 
 	boolean existsByNickname(String nickname);
+
+    boolean existsByEmail(String email);
 }