Merge pull request #124 from MYONGSIK/develop

main <- dev

README.md

@@ -30,7 +30,7 @@
 <img width="100%" height="45%" src="https://user-images.githubusercontent.com/61505572/220684641-9b041a02-447d-47e5-812b-76d457da5689.png">
 
 <h3>Infra Structure</h3>
-  <img width="100%" height="45%" src="https://user-images.githubusercontent.com/61505572/220687135-a6f83cba-35cd-4895-a72e-ef29f5f4a3a7.png">
+  <img width="100%" height="45%" src="https://user-images.githubusercontent.com/53048655/234185319-d80b3ba2-a144-4df2-91e1-4f68eefdd026.png">
 
 
 <br><br>

build.gradle

@@ -28,6 +28,7 @@ dependencies {
     runtimeOnly 'mysql:mysql-connector-java'
     annotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test:2.7.4'
+    implementation 'org.springframework.boot:spring-boot-starter-logging'
 
     // mongo
 //    implementation 'org.springframework.boot:spring-boot-starter-data-mongodb'
@@ -49,8 +50,33 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'io.micrometer:micrometer-core'
     implementation 'io.micrometer:micrometer-registry-prometheus'
+
+    //QueryDSL
+    implementation "com.querydsl:querydsl-jpa"
+    implementation "com.querydsl:querydsl-core"
+    implementation "com.querydsl:querydsl-collections"
+    annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jpa" // querydsl JPAAnnotationProcessor 사용 지정
+    annotationProcessor "jakarta.annotation:jakarta.annotation-api" // java.lang.NoClassDefFoundError (javax.annotation.Generated) 대응 코드
+    annotationProcessor "jakarta.persistence:jakarta.persistence-api" // java.lang.NoClassDefFoundError (javax.annotation.Entity) 대응 코드
 }
 
 tasks.named('test') {
     useJUnitPlatform()
 }
+// Querydsl 설정부
+def generated = 'build/generated'
+
+// querydsl QClass 파일 생성 위치를 지정
+tasks.withType(JavaCompile) {
+    options.getGeneratedSourceOutputDirectory().set(file(generated))
+}
+
+// java source set 에 querydsl QClass 위치 추가
+sourceSets {
+    main.java.srcDirs += [ generated ]
+}
+
+// gradle clean 시에 QClass 디렉토리 삭제
+clean {
+    delete file(generated)
+}

src/main/java/com/example/myongsick/domain/scrap/dto/ScrapCountResponse.java

@@ -1,17 +1,14 @@
 package com.example.myongsick.domain.scrap.dto;
 
+import com.querydsl.core.annotations.QueryProjection;
 import io.swagger.annotations.ApiModel;
-import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 
 @Getter
-@Setter
 @Builder
 @NoArgsConstructor
-@AllArgsConstructor
 @ApiModel(description = "찜꽁 리스트 응답 객체 ( + 찜꽁수 포함 )")
 public class ScrapCountResponse {
 
@@ -20,12 +17,28 @@ public class ScrapCountResponse {
   private String name;
   private String category;
   private String address;
+  private String contact;
   private String urlAddress;
   private String distance;
-  private String contact;
   private String latitude;
   private String longitude;
   private int scrapCount;
+  @QueryProjection
+  public ScrapCountResponse(Long storeId, String code, String name, String category, String address,
+      String contact, String urlAddress, String distance, String latitude, String longitude,
+      int scrapCount) {
+    this.storeId = storeId;
+    this.code = code;
+    this.name = name;
+    this.category = category;
+    this.address = address;
+    this.contact = contact;
+    this.urlAddress = urlAddress;
+    this.distance = distance;
+    this.latitude = latitude;
+    this.longitude = longitude;
+    this.scrapCount = scrapCount;
+  }
 
   public static ScrapCountResponse toDto(CountResponse countResponse) {
     return ScrapCountResponse.builder()

src/main/java/com/example/myongsick/domain/scrap/repository/ScrapRepositoryCustom.java

@@ -0,0 +1,13 @@
+package com.example.myongsick.domain.scrap.repository;
+
+import com.example.myongsick.domain.scrap.dto.ScrapCountResponse;
+import java.util.Optional;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.repository.query.Param;
+
+public interface ScrapRepositoryCustom {
+  Page<ScrapCountResponse> findAllByCampusWithPaging(@Param("campus") String campus, Pageable pageable);
+
+  Optional<ScrapCountResponse> findByIdCustom(Long storeId);
+}

src/main/java/com/example/myongsick/domain/scrap/repository/ScrapRepositoryImpl.java

@@ -0,0 +1,73 @@
+package com.example.myongsick.domain.scrap.repository;
+
+import static com.example.myongsick.domain.scrap.entity.QScrap.scrap;
+import static com.example.myongsick.domain.scrap.entity.QStore.store;
+
+import com.example.myongsick.domain.scrap.dto.QScrapCountResponse;
+import com.example.myongsick.domain.scrap.dto.ScrapCountResponse;
+import com.example.myongsick.domain.scrap.entity.CampusType;
+import com.example.myongsick.domain.scrap.entity.Store;
+import com.querydsl.core.types.Order;
+import com.querydsl.core.types.OrderSpecifier;
+import com.querydsl.core.types.dsl.PathBuilder;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RequiredArgsConstructor
+public class ScrapRepositoryImpl implements ScrapRepositoryCustom{
+  private final JPAQueryFactory jpaQueryFactory;
+
+  @Override
+  public Page<ScrapCountResponse> findAllByCampusWithPaging(String campus, Pageable pageable) {
+    List<ScrapCountResponse> result =  jpaQueryFactory.select(new QScrapCountResponse(store.id.as("storeId"), store.code, store.name, store.category, store.address, store.contact, store.urlAddress, store.distance, store.latitude, store.longitude, store.scrapList.size().as("scrapCount")))
+        .from(store)
+        .where(store.campus.eq(CampusType.valueOf(campus)))
+        .groupBy(store.code)
+        .orderBy(getOrderSpecifier(pageable.getSort()).stream().toArray(OrderSpecifier[]::new))
+        .offset(pageable.getOffset())
+        .limit(pageable.getPageSize())
+        .fetch();
+
+    Long count = jpaQueryFactory
+        .select(scrap.count())
+        .from(scrap)
+        .fetchOne();
+
+    return new PageImpl<>(result, pageable, count);
+  }
+
+  @Override
+  public Optional<ScrapCountResponse> findByIdCustom(Long storeId) {
+    return Optional.ofNullable(jpaQueryFactory.select(new QScrapCountResponse(store.id.as("storeId"), store.code, store.name, store.category, store.address, store.contact, store.urlAddress, store.distance, store.latitude, store.longitude, store.scrapList.size().as("scrapCount")))
+        .from(store)
+        .where(store.id.eq(storeId))
+        .fetchOne());
+  }
+
+  private List<OrderSpecifier> getOrderSpecifier(Sort sort) {
+    List<OrderSpecifier> orderSpecifiers = new ArrayList<>();
+    sort.stream()
+        .forEach(order -> {
+          Order direction = order.isAscending() ? Order.ASC : Order.DESC;
+          String property = order.getProperty();
+          if(property.equals("scrapCount")) {
+            orderSpecifiers.add(new OrderSpecifier(direction, store.scrapList.size()));
+          } else if(property.equals("distance")) {
+            orderSpecifiers.add(new OrderSpecifier(direction, store.distance.castToNum(Long.class)));
+          } else {
+            PathBuilder orderByExpression = new PathBuilder(Store.class, "store");
+            orderSpecifiers.add(new OrderSpecifier(direction, orderByExpression.get(property)));
+          }
+          });
+    return orderSpecifiers;
+  }
+}

src/main/java/com/example/myongsick/domain/scrap/service/ScrapService.java

@@ -3,7 +3,6 @@
 import com.example.myongsick.domain.scrap.dto.ScrapCountResponse;
 import com.example.myongsick.domain.scrap.dto.ScrapRequest;
 import com.example.myongsick.domain.scrap.dto.ScrapResponse;
-import java.util.Optional;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

src/main/java/com/example/myongsick/domain/scrap/service/ScrapServiceImpl.java

@@ -10,6 +10,7 @@
 import com.example.myongsick.domain.scrap.exception.NotFoundScrapException;
 import com.example.myongsick.domain.scrap.exception.NotFoundStoreException;
 import com.example.myongsick.domain.scrap.repository.ScrapRepository;
+import com.example.myongsick.domain.scrap.repository.ScrapRepositoryCustom;
 import com.example.myongsick.domain.scrap.repository.StoreRepository;
 import com.example.myongsick.domain.user.entity.User;
 import com.example.myongsick.domain.user.exception.NotFoundUserException;
@@ -39,6 +40,7 @@ public class ScrapServiceImpl implements ScrapService{
   private final UserRepository userRepository;
   private final ScrapRepository scrapRepository;
   private final StoreRepository storeRepository;
+  private final ScrapRepositoryCustom scrapRepositoryCustom;
 
   @Value("${kakao.rest-key}")
   private String kakaoRestKey;
@@ -80,7 +82,8 @@ public void deleteScrap(Long scrapId) {
 
   @Override
   public Page<ScrapCountResponse> getScrapCount(String campus, Pageable pageable) {
-    return scrapRepository.findAllCustom(campus, pageable).map(ScrapCountResponse::toDto);
+//    return scrapRepositoryCustom.findAllCustom(campus, pageable).map(ScrapCountResponse::toDto);
+    return scrapRepositoryCustom.findAllByCampusWithPaging(campus, pageable);
   }
 
   @Transactional
@@ -113,6 +116,7 @@ public void updateStore() {
 
   @Override
   public ScrapCountResponse getStoreOne(Long storeId) {
-    return storeRepository.findByIdCustom(storeId).map(ScrapCountResponse::toDto).orElseThrow(NotFoundStoreException::new);
+//    return storeRepository.findByIdCustom(storeId).map(ScrapCountResponse::toDto).orElseThrow(NotFoundStoreException::new);
+    return scrapRepositoryCustom.findByIdCustom(storeId).orElseThrow(NotFoundStoreException::new);
   }
 }

src/main/java/com/example/myongsick/global/config/QueryDslConfig.java

@@ -0,0 +1,19 @@
+package com.example.myongsick.global.config;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class QueryDslConfig {
+
+  @PersistenceContext
+  private EntityManager em;
+
+  @Bean
+  public JPAQueryFactory jpaQueryFactory(EntityManager em) {
+    return new JPAQueryFactory(em);
+  }
+}

src/main/resources/application-dev.yml

@@ -5,4 +5,10 @@ spring:
     url: ENC(jV5Al684UF9ZuGwX0AJ4KaAl2djrcg5+mZe+QMgY1i2Afu6rtj0Cmrj52fkzjiQAP3b31dyhrLvggD+Mold//xi+7WPdEEu7AjoO1XGbMNl5uf5hKMhUh5pmZDpCkubJgj/VFoVUe4s=)
     username: ENC(W14O0+528BmR05t/tOqkJA==)
     password: ENC(8K7aplBAKgyNF7OuP11M6cXlCT1zLzm4)
-    driver-class-name: com.mysql.cj.jdbc.Driver
+    driver-class-name: com.mysql.cj.jdbc.Driver
+log:
+  config:
+    path: ./logs
+    filename: app-dev
+    maxHistory: 7 # 7일
+    totalSizeCap: 10MB # 로그 파일 사이즈

src/main/resources/application-prod.yml

@@ -5,4 +5,10 @@ spring:
     url: ENC(rMxUsofvraIkaMgSRzwu8g6UfnSv1t+I57CAt4Id+qR0Woi/yGJ/dAyT6+KqF/McGN7uSI8aYef1DuWJu13N+1iHbFTfQZbDNalt8A3Lm4MwU0MxUA7o0qf+DU0043KdS8wag3pNGwA=)
     username: ENC(AtyIP2KxL11MVrdq2yBI9Q==)
     password: ENC(dc0+G3VP0z9eZQ+vZZg49KFbrCubCsQj)
-    driver-class-name: com.mysql.cj.jdbc.Driver
+    driver-class-name: com.mysql.cj.jdbc.Driver
+log:
+  config:
+    path: /var/log/app
+    filename: app-dev
+    maxHistory: 3 # 3일
+    totalSizeCap: 50MB # 로그 파일 사이즈

src/main/resources/application.yml

@@ -55,4 +55,4 @@ spring:
 ---
 spring:
   profiles:
-    active: local
+    active: local

src/main/resources/logback-spring.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <!-- 로그 패턴에 색상 적용 %clr(pattern){color}
+        https://logback.qos.ch/manual/layouts.html#coloring
+    -->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+
+    <springProfile name="dev">
+        <property resource="application-dev.yml" />
+    </springProfile>
+
+    <!-- log 변수 값 설정 -->
+    <springProperty name="LOG_PATH" source= "log.config.path" />
+    <springProperty name="LOG_FILE_NAME" source= "log.config.filename" />
+    <springProperty name="LOG_MAX_HISTORY" source= "log.config.maxHistory" />
+    <springProperty name="LOG_TOTAL_SIZE_CAP" source= "log.config.totalSizeCap" />
+
+    <property name="CONSOLE_LOG_PATTERN"
+              value="[%d{yyyy-MM-dd HH:mm:ss}:%-3relative]  %clr(%-5level) %clr(${PID:-}){magenta} %clr(---){faint} %clr([%15.15thread]){faint} %clr(%-40.40logger{36}){cyan} %clr(:){faint} %msg%n"/>
+    <property name="FILE_LOG_PATTERN"
+              value="[%d{yyyy-MM-dd HH:mm:ss}:%-3relative] %-5level ${PID:-} --- [%15.15thread] %-40.40logger{36} : %msg%n"/>
+
+    <!-- 콘솔(STDOUT) -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+        </layout>
+    </appender>
+
+    <!-- 파일(FILE) -->
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!--     log 기록할 파일 위치 설정 -->
+        <file>${LOG_PATH}/${LOG_FILE_NAME}.log</file>
+        <!--     log 기록 타입 인코딩 -->
+        <encoder>
+            <pattern>${FILE_LOG_PATTERN}</pattern>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- daily rollover -->
+            <fileNamePattern>${LOG_PATH}/${LOG_FILE_NAME}.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>${LOG_MAX_HISTORY}</maxHistory>
+            <totalSizeCap>${LOG_TOTAL_SIZE_CAP}</totalSizeCap>
+        </rollingPolicy>
+    </appender>
+
+    <!-- spring profile별 로그 설정 -->
+    <!--  dev 환경  -->
+    <springProfile name="dev">
+        <root level="info">
+            <!-- 참조할 appender - STDOUT -->
+            <appender-ref ref="STDOUT" />
+        </root>
+        <logger name="org.springframework.web" level="debug">
+            <!-- 참조할 appender - FILE -->
+            <appender-ref ref="FILE" />
+        </logger>
+    </springProfile>
+
+</configuration>