로컬 환경에서 구동

.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

@@ -52,6 +52,7 @@ dependencies {
 	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/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/config/Redis/RedisCacheConfig.java

@@ -4,10 +4,12 @@
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.CachingConfigurerSupport;
 import org.springframework.cache.annotation.EnableCaching;
+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;
@@ -33,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/dbReplica/ReplicationRoutingDataSource.java

@@ -15,7 +15,7 @@
 //        this.replicaDataSourceNames = new ReplicaDataSourceNames(names);
 //    }
 //
-//    @Override
+//
 //    protected Object determineCurrentLookupKey() {
 //        final boolean isReadOnly = TransactionSynchronizationManager.isCurrentTransactionReadOnly();
 //        if (isReadOnly) {

src/main/java/com/HappyScrolls/config/elastic/ArticleDocCustomRepository.java

@@ -0,0 +1,7 @@
+package com.HappyScrolls.config.elastic;
+
+import java.util.List;
+
+public interface ArticleDocCustomRepository {
+    List<ArticleDoc> find(String parameter);
+}

src/main/java/com/HappyScrolls/config/elastic/ArticleDocCustomRepositoryImpl.java

@@ -0,0 +1,75 @@
+package com.HappyScrolls.config.elastic;
+
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
+import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
+import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FieldValueFactorFunctionBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Repository;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Repository
+public class ArticleDocCustomRepositoryImpl implements ArticleDocCustomRepository {
+
+    @Autowired
+    private ElasticsearchOperations elasticsearchOperations;
+    @Override
+    public List<ArticleDoc> find(String  parameter) {
+
+//        NativeSearchQueryBuilder queryBuilder = new NativeSearchQueryBuilder()
+//                .withQuery(
+//                        QueryBuilders.functionScoreQuery(
+//                                QueryBuilders.matchQuery("title", "부하테스트"),
+//                                ScoreFunctionBuilders.fieldValueFactorFunction("view_count")
+//                                        .modifier(FieldValueFactorFunctionBuilder.DEFAULT_MODIFIER.LOG1P)
+//                                        .factor(1)
+//                        ).boostMode(FunctionScoreQueryBuilder.DEFAULT_BOOST_MODE.MULTIPLY)
+//                );
+
+        BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
+        for (String term : inputList(parameter)) {
+            boolQueryBuilder.should(QueryBuilders.multiMatchQuery(term, "title", "body"));
+        }
+
+        FunctionScoreQueryBuilder functionScoreQueryBuilder = QueryBuilders.functionScoreQuery(
+                boolQueryBuilder,
+                ScoreFunctionBuilders.fieldValueFactorFunction("view_count")
+                        .modifier(FieldValueFactorFunctionBuilder.DEFAULT_MODIFIER.LOG1P)
+                        .factor(1)
+        ).boostMode(FunctionScoreQueryBuilder.DEFAULT_BOOST_MODE.MULTIPLY);
+
+        NativeSearchQuery searchQuery = new NativeSearchQueryBuilder()
+                .withQuery(functionScoreQueryBuilder)
+                .build();
+        System.out.println(searchQuery.getQuery().toString());
+        return  elasticsearchOperations.search(searchQuery, ArticleDoc.class).getSearchHits()
+                .stream()
+                .map(hit -> hit.getContent())
+                .collect(Collectors.toList());
+    }
+
+    public static List<String> inputList(String input) {
+        String[] words = input.split(" ");
+        List<String> combinations = new ArrayList<>();
+
+        for (int i = 0; i < words.length; i++) {
+                StringBuilder sb = new StringBuilder();
+                for (int j = i; j < words.length; j++) {
+                    sb.append(words[j]);
+                    combinations.add(sb.toString());
+                    if (j != words.length) sb.append(" ");
+                }
+        }
+
+        return combinations;
+    }
+}

src/main/java/com/HappyScrolls/config/elastic/ArticleDocRepository.java

@@ -1,6 +1,7 @@
 package com.HappyScrolls.config.elastic;
 
 import com.HappyScrolls.domain.article.entity.Article;
+import com.HappyScrolls.domain.article.repository.ArticleCustomRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
@@ -9,7 +10,7 @@
 import java.util.List;
 import java.util.Optional;
 
-public interface ArticleDocRepository extends ElasticsearchRepository<ArticleDoc, Long>, CrudRepository<ArticleDoc, Long> {
+public interface ArticleDocRepository extends ElasticsearchRepository<ArticleDoc, Long>, CrudRepository<ArticleDoc, Long>, ArticleDocCustomRepository {
     List<ArticleDoc> findAllByTitle(String title);
 
     List<ArticleDoc> findAllByTitleContaining(String title);

src/main/java/com/HappyScrolls/config/elastic/ElasticSearchConfig.java

@@ -12,8 +12,9 @@
 public class ElasticSearchConfig extends AbstractElasticsearchConfiguration {
     @Override
     public RestHighLevelClient elasticsearchClient() {
-        // http port 와 통신할 주소
-        ClientConfiguration configuration = ClientConfiguration.builder().connectedTo("localhost:9200").build();
+        ClientConfiguration configuration = ClientConfiguration.builder().connectedTo("localhost:9200")
+                .withBasicAuth("elastic", "changeme")  // Add this line
+                 .build();
         return RestClients.create(configuration).rest();
     }
 }

src/main/java/com/HappyScrolls/domain/article/adaptor/ArticleAdaptor.java

@@ -88,4 +88,9 @@ public List<Article> search(Long lastindex, Integer limit,String param) {
 
     }
 
+    //로그인 한 유저가 작성한 게시글 페이징 조회
+    public List<Article> usersearch(Member member, Long lastindex, Integer limit) {
+        return articleRepository.usersearch(member,lastindex,limit);
+    }
+
 }

src/main/java/com/HappyScrolls/domain/article/controller/ArticleController.java

@@ -105,6 +105,9 @@ public ResponseEntity<List<ArticleDTO.ListResponse>> retrieveUserArticle(@Reques
         return  ResponseEntity.ok(articleService.userArticleRetrieve(email));
     }
 
+
+
+
     @ApiOperation(value = "게시글 작성")
     @PostMapping("")
     public ResponseEntity<Long> createArticle(@AuthenticationPrincipal Member member, @RequestBody ArticleDTO.Request request) {
@@ -132,4 +135,10 @@ public ResponseEntity<List<ArticleDTO.ListResponse>> search(@RequestParam Long l
         return ResponseEntity.ok( articleService.search(lastindex,limit,param));
     }
 
-}
+    //로그인 한 유저가 작성한 게시글 페이징 조회
+    @GetMapping("/usersearch")
+    public ResponseEntity<List<ArticleDTO.ListResponse>> usersearch(@AuthenticationPrincipal Member member, @RequestParam Long lastindex, @RequestParam Integer limit){
+        return ResponseEntity.ok(articleService.usersearch(member,lastindex,limit));
+    }
+
+    }

src/main/java/com/HappyScrolls/domain/article/controller/ArticleDocController.java

@@ -39,8 +39,9 @@ public class ArticleDocController {
     private ArticleService articleService;
 
     @GetMapping("/elk")
-    public List<ArticleDoc> get() {
-        return articleDocRepository.findAllByTitle("제목20");
+    public ResponseEntity<List<ArticleDTO.ListResponse>> get(@RequestParam String parameter) {
+
+        return ResponseEntity.ok(ArticleDTO.ListResponse.toResponseDtoListFromArticleDocs(articleDocRepository.find(parameter)));
     }
 
     @Autowired

src/main/java/com/HappyScrolls/domain/article/repository/ArticleCustomRepository.java

@@ -1,6 +1,7 @@
 package com.HappyScrolls.domain.article.repository;
 
 import com.HappyScrolls.domain.article.entity.Article;
+import com.HappyScrolls.domain.member.entity.Member;
 import com.HappyScrolls.domain.tag.entity.Tag;
 
 import java.time.LocalDate;
@@ -19,4 +20,6 @@ public interface ArticleCustomRepository {
     List<Article> findByTagListPaging(Long lastindex, List<Tag> tags);
 
     List<Article> search(Long lastindex, Integer limit, String param);
+
+    List<Article> usersearch(Member member, Long lastindex, Integer limit);
 }

src/main/java/com/HappyScrolls/domain/article/repository/ArticleCustomRepositoryImpl.java

@@ -1,6 +1,7 @@
 package com.HappyScrolls.domain.article.repository;
 
 import com.HappyScrolls.domain.article.entity.Article;
+import com.HappyScrolls.domain.member.entity.Member;
 import com.HappyScrolls.domain.tag.entity.ArticleTag;
 import com.HappyScrolls.domain.tag.entity.Tag;
 import com.querydsl.jpa.impl.JPAQueryFactory;
@@ -107,4 +108,16 @@ public List<Article> search(Long lastindex, Integer limit, String param) {
                 .limit(limit)
                 .fetch();
     }
+
+    //로그인 한 유저가 작성한 게시글 페이징 조회
+    @Override
+    public List<Article> usersearch(Member memberA, Long lastindex, Integer limit) {
+        return jpaQueryFactory
+                .selectFrom(article)
+                .innerJoin(article.member, member)
+                .fetchJoin()
+                .where(article.member.eq(memberA),article.id.gt(lastindex))
+                .limit(limit)
+                .fetch();
+    }
 }

src/main/java/com/HappyScrolls/domain/article/service/ArticleService.java

@@ -49,7 +49,9 @@ public Long articleCreate(Member member, ArticleDTO.Request request) {
     }
 
     public ArticleDTO.DetailResponse articleRetrieve(Long id) {
-        return ArticleDTO.DetailResponse.toResponseDto(articleAdaptor.retrieveArticle(id));
+        Article article = articleAdaptor.retrieveArticle(id);
+        article.increaseViewCount();
+        return ArticleDTO.DetailResponse.toResponseDto(article);
     }
 
     public Long articleEdit(Member member, ArticleDTO.Edit request) {
@@ -137,4 +139,12 @@ public List<ArticleDTO.ListResponse> articleRetrievePaging(PageRequest pageReque
 
     }
 
+    //로그인 한 유저가 작성한 게시글 페이징 조회
+    public List<ArticleDTO.ListResponse> usersearch(Member member, Long lastindex, Integer limit) {
+        return ArticleDTO.ListResponse.toResponseDtoList(articleAdaptor.usersearch(member,lastindex, limit));
+    }
+
+
+
+
 }

src/main/java/com/HappyScrolls/domain/product/repository/ProductRepository.java

@@ -4,20 +4,27 @@
 import com.HappyScrolls.domain.product.entity.Product;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Lock;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.query.Param;
 
 import javax.persistence.LockModeType;
 import java.util.List;
 import java.util.Optional;
 
 public interface ProductRepository extends Repository<Product, Long> {
 
-    @Lock(LockModeType.PESSIMISTIC_WRITE)
+    //@Lock(LockModeType.PESSIMISTIC_WRITE)
     Optional<Product> findById(Long id);
 
     Product save(Product entity);
 
     List<Product> findAll();
 
     Product saveAndFlush(Product entity);
+
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
+    @Query(value = "update Product p set p.quantity = p.quantity - 1 where p.id = :id")
+    void test(Long id);
 }

src/main/java/com/HappyScrolls/domain/product/service/ProductService.java

@@ -4,11 +4,14 @@
 import com.HappyScrolls.domain.product.dto.ProductDTO;
 import com.HappyScrolls.domain.product.entity.Product;
 import com.HappyScrolls.domain.product.repository.ProductRepository;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.transaction.Transactional;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 @Service
 public class ProductService {
@@ -19,6 +22,9 @@ public class ProductService {
     @Autowired
     private ProductAdaptor productAdaptor;
 
+    @Autowired
+    private RedissonClient redissonClient;
+
     public Long productCreate(ProductDTO.Request request) {
         return productAdaptor.productCreate(request.toEntity());
     }
@@ -33,11 +39,25 @@ public List<Long> productAllRetrieve() {
 
 
     @Transactional
-    public synchronized void test() {
-        Product product= productRepository.findById(1l).get();
-        if (product.getQuantity() > 0) {
-            product.decreaseQuantity();
-            productRepository.saveAndFlush(product);
+    public void test(Long id) {
+        RLock lock = redissonClient.getLock(id.toString());
+
+            try {
+                lock.tryLock(10, 1, TimeUnit.SECONDS);
+
+            Product product= productRepository.findById(1l).get();
+            if (product.getQuantity() > 0) {
+                product.decreaseQuantity();
+                productRepository.saveAndFlush(product);
+            }
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        } finally {
+            lock.unlock();
         }
     }
+    @Transactional
+    public void test2() {
+        productRepository.test(1l);
+    }
 }