Merge pull request #95 from HappyScrolls/feature

Feature

.gitignore

@@ -35,3 +35,6 @@ out/
 
 ### VS Code ###
 .vscode/
+
+
+*.jar

Dockerfile

@@ -1,4 +1,4 @@
 FROM openjdk:11-jdk
 ARG JAR_FILE=build/libs/*.jar
 COPY ${JAR_FILE} app.jar
-ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=test", "/app.jar"]
+ENTRYPOINT ["java", "-jar", "/app.jar"]

build.gradle

@@ -40,8 +40,8 @@ dependencies {
 	implementation 'io.springfox:springfox-swagger-ui:3.0.0'
 	implementation "com.querydsl:querydsl-jpa:5.0.0"
 	implementation "com.querydsl:querydsl-apt:5.0.0"
-//	testImplementation 'com.h2database:h2'
-//	runtimeOnly 'com.h2database:h2'
+	testImplementation 'com.h2database:h2'
+	runtimeOnly 'com.h2database:h2'
 	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 	implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.3'
 	implementation 'org.springframework.boot:spring-boot-starter-jdbc'
@@ -51,6 +51,8 @@ dependencies {
 	testImplementation("org.springframework.security:spring-security-test")
 	implementation 'org.springframework.boot:spring-boot-starter-aop'
 	implementation 'io.github.resilience4j:resilience4j-spring-boot2:1.7.0'
+	implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
+	implementation 'org.redisson:redisson-spring-boot-starter:3.17.7'
 }
 
 tasks.named('test') {

src/main/java/com/HappyScrolls/HappyScrollsApplication.java

@@ -5,6 +5,9 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 

src/main/java/com/HappyScrolls/batch/BatchConfig.java

@@ -1,12 +1,10 @@
 package com.HappyScrolls.batch;
 
-import com.HappyScrolls.entity.Article;
-import com.HappyScrolls.entity.Comment;
-import com.HappyScrolls.entity.Member;
-import com.HappyScrolls.entity.Sticker;
-import com.HappyScrolls.repository.ArticleRepository;
-import com.HappyScrolls.repository.CommentRepository;
-import com.HappyScrolls.repository.MemberRepository;
+import com.HappyScrolls.domain.article.entity.Article;
+import com.HappyScrolls.domain.article.entity.Sticker;
+import com.HappyScrolls.domain.article.repository.ArticleRepository;
+import com.HappyScrolls.domain.comment.repository.CommentRepository;
+import com.HappyScrolls.domain.member.repository.MemberRepository;
 import com.querydsl.core.types.dsl.NumberPath;
 import lombok.RequiredArgsConstructor;
 import org.springframework.batch.core.Job;
@@ -22,14 +20,13 @@
 import org.springframework.batch.item.database.builder.JpaPagingItemReaderBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.repository.CrudRepository;
 
-import static com.HappyScrolls.entity.QArticle.article;
-import static com.HappyScrolls.entity.QComment.comment;
 
 import javax.persistence.EntityManagerFactory;
-import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.time.LocalDate;
+import static com.HappyScrolls.domain.article.entity.QArticle.article;
 
 @Configuration
 @RequiredArgsConstructor
@@ -114,45 +111,9 @@ public ItemProcessor<Article, Article> ArticleProcessor(){
     @StepScope
     public RepositoryItemWriter<Article> articleWriter(){
         return new RepositoryItemWriterBuilder<Article>()
-                .repository(articleRepository)
+                .repository((CrudRepository<Article, Long>) articleRepository)
                 .build();
     }
 
 
-    @Bean
-    public QueryDslPagingItemReader queryDslreader2() throws NoSuchFieldException, NoSuchMethodException ,IllegalAccessException{
-
-        String identifierName = "id";
-        Comment entity = new Comment();
-        NumberPath<Long> identifier= (NumberPath<Long>)   comment.getClass().getDeclaredField(identifierName).get(comment);
-        Method method = entity.getClass().getMethod("getId");
-        Member member = memberRepository.findById(1l).get();
-        return new QueryDslPagingItemReaderBuilder<Comment>()
-                .name("QueryDslZeroOffsetPagingTest")
-                .entityManagerFactory(emf)
-                .pageSize(10)
-                .identifier(identifier)
-                .method(method)
-                .queryFunction(queryFactory -> queryFactory
-                        .selectFrom(comment)
-                        .where(comment.member.eq(member)))
-                .build();
-    }
-
-    @Bean
-    @StepScope
-    public ItemProcessor<Comment, Comment> CommentProcessor(){
-        return comment -> {
-            comment.setIsParent(true);
-            return comment;
-        };
-    }
-
-    @Bean
-    @StepScope
-    public RepositoryItemWriter<Comment> commentWriter(){
-        return new RepositoryItemWriterBuilder<Comment>()
-                .repository(commentRepository)
-                .build();
-    }
 }

src/main/java/com/HappyScrolls/batch/JobScheduler.java

@@ -21,8 +21,8 @@ public class JobScheduler {
     private final JobLauncher jobLauncher;
     private final BatchConfig batchConfig;
 
-    @ExeTimer
-    @Scheduled(cron="0 10 * * * *")
+//    @ExeTimer
+//    @Scheduled(cron="0 10 * * * *")
     public void runJob() throws  NoSuchFieldException, NoSuchMethodException,IllegalAccessException{
 
         Map<String, JobParameter> confMap = new HashMap<>();

src/main/java/com/HappyScrolls/batch/QueryDslPagingItemReader.java

@@ -1,5 +1,4 @@
 package com.HappyScrolls.batch;
-import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.HashMap;
@@ -11,21 +10,15 @@
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
-import javax.persistence.Query;
 
-import com.HappyScrolls.entity.Article;
 import com.querydsl.core.types.dsl.NumberPath;
 import com.querydsl.jpa.impl.JPAQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
-import org.springframework.batch.item.ItemStreamException;
 import org.springframework.batch.item.database.AbstractPagingItemReader;
 import org.springframework.batch.item.database.orm.JpaQueryProvider;
 import org.springframework.dao.DataAccessResourceFailureException;
-import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
-import static com.HappyScrolls.entity.QArticle.article;
-
 
 public class QueryDslPagingItemReader<T> extends AbstractPagingItemReader<T> {
 

src/main/java/com/HappyScrolls/batch/QueryDslPagingItemReaderBuilder.java

@@ -1,17 +1,12 @@
 package com.HappyScrolls.batch;
 
-import com.HappyScrolls.entity.Article;
 import com.querydsl.core.types.dsl.NumberPath;
 import com.querydsl.jpa.impl.JPAQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
-import org.springframework.batch.item.ItemReader;
-import org.springframework.batch.item.database.JpaPagingItemReader;
-import org.springframework.batch.item.database.builder.JpaPagingItemReaderBuilder;
 import org.springframework.batch.item.database.orm.JpaQueryProvider;
 import org.springframework.util.Assert;
 
 import javax.persistence.EntityManagerFactory;
-import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.function.Function;

src/main/java/com/HappyScrolls/adaptor/Adaptor.java → src/main/java/com/HappyScrolls/config/Adaptor.java

@@ -1,4 +1,4 @@
-package com.HappyScrolls.adaptor;
+package com.HappyScrolls.config;
 
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.stereotype.Component;

src/main/java/com/HappyScrolls/config/CustomCacheErrorHandler.java → src/main/java/com/HappyScrolls/config/Redis/CustomCacheErrorHandler.java

@@ -1,9 +1,7 @@
-package com.HappyScrolls.config;
+package com.HappyScrolls.config.Redis;
 
-import io.lettuce.core.RedisConnectionException;
 import org.springframework.cache.Cache;
 import org.springframework.cache.interceptor.CacheErrorHandler;
-import org.springframework.security.core.parameters.P;
 
 public class CustomCacheErrorHandler implements CacheErrorHandler {
 

src/main/java/com/HappyScrolls/config/RedisCacheConfig.java → src/main/java/com/HappyScrolls/config/Redis/RedisCacheConfig.java

@@ -1,15 +1,15 @@
-package com.HappyScrolls.config;
+package com.HappyScrolls.config.Redis;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.CachingConfigurerSupport;
 import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.cache.interceptor.CacheErrorHandler;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.cache.RedisCacheConfiguration;
 import org.springframework.data.redis.cache.RedisCacheManager;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.RedisSerializationContext;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
@@ -35,6 +35,15 @@ public CacheManager cacheManager() {
                 .cacheDefaults(redisCacheConfiguration)
                 .build();
     }
+    @Bean
+    public RedisTemplate<String, Object> redisTemplate() {
+        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+        redisTemplate.setConnectionFactory(cf);
+        redisTemplate.setKeySerializer(new StringRedisSerializer());
+        redisTemplate.setValueSerializer(new GenericJackson2JsonRedisSerializer());
+        return redisTemplate;
+    }
+
 
 
 //    @Override

src/main/java/com/HappyScrolls/config/DatabaseConfig.java → src/main/java/com/HappyScrolls/config/dbReplica/DatabaseConfig.java

@@ -1,4 +1,4 @@
-//package com.HappyScrolls.config;
+//package com.HappyScrolls.config.dbReplica;
 //
 //import com.zaxxer.hikari.HikariDataSource;
 //import org.springframework.beans.factory.annotation.Qualifier;
@@ -20,8 +20,6 @@
 //import java.util.List;
 //import java.util.Map;
 //
-//import static com.HappyScrolls.config.ReplicationRoutingDataSource.DATASOURCE_SOURCE_KEY;
-//
 //
 //@Configuration
 //@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class})
@@ -53,7 +51,7 @@
 //        ReplicationRoutingDataSource routingDataSource = new ReplicationRoutingDataSource();
 //
 //        Map<Object, Object> dataSources = new HashMap<>();
-//        dataSources.put(DATASOURCE_SOURCE_KEY, source);
+//        dataSources.put(ReplicationRoutingDataSource.DATASOURCE_SOURCE_KEY, source);
 //        dataSources.putAll(replicas);
 //
 //        routingDataSource.setTargetDataSources(dataSources);