Merge pull request #83 from BackEndSchoolPlus3th/revert-82-refactor/ElasticSearch

Revert "Feat: MySQL VS ElasticSearch Performance Test Comparison - 기존 코드 fork 후 이동"

Author: ces0135-hub

build.gradle.kts

@@ -104,10 +104,6 @@ dependencies {
     // AOP
     implementation("org.springframework.boot:spring-boot-starter-aop")
 
-    // JMX 및 시스템 모니터링
-    implementation("org.springframework.boot:spring-boot-starter-actuator")
-    implementation("io.micrometer:micrometer-core")
-
 }
 
 tasks.withType<Test> {
@@ -138,7 +134,3 @@ tasks.withType<JavaCompile> {
 tasks.withType<Test> {
     systemProperty("file.encoding", "UTF-8")
 }
-
-tasks.named<org.springframework.boot.gradle.tasks.run.BootRun>("bootRun") {
-    mainClass.set("org.com.stocknote.StockNoteApplication")
-}

docker-compose.yml

@@ -1,71 +1,21 @@
-version: '3.8'
+version: '3.4'
 
 services:
-  # Redis
-  redis:
-    image: redis:7-alpine
-    container_name: stocknote-redis
-    restart: always
+  influxdb:
+    image: influxdb:1.8
     ports:
-      - "6379:6379"
-    command: >
-      redis-server 
-      --appendonly yes 
-      --maxmemory 256mb
-      --maxmemory-policy allkeys-lru
-    volumes:
-      - redis_data:/data
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 10s
-      timeout: 5s
-      retries: 3
-
-  # ElasticSearch
-  elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0
-    container_name: stocknote-elasticsearch
-    restart: always
+      - "8086:8086"
     environment:
-      - node.name=stocknote-es
-      - cluster.name=stocknote-cluster
-      - discovery.type=single-node
-      - bootstrap.memory_lock=true
-      - "ES_JAVA_OPTS=-Xms1g -Xmx1g"
-      - xpack.security.enabled=false
-      - xpack.security.enrollment.enabled=false
-    ulimits:
-      memlock:
-        soft: -1
-        hard: -1
-    ports:
-      - "9200:9200"
-      - "9300:9300"
-    volumes:
-      - es_data:/usr/share/elasticsearch/data
-    healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:9200/_cluster/health || exit 1"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
+      - INFLUXDB_HTTP_AUTH_ENABLED=false
+      - INFLUXDB_DB=k6
 
-  # Kibana (선택사항 - ElasticSearch 관리도구)
-  kibana:
-    image: docker.elastic.co/kibana/kibana:8.12.0
-    container_name: stocknote-kibana
-    restart: always
+  grafana:
+    image: grafana/grafana:latest
     ports:
-      - "5601:5601"
+      - "3000:3000"
     environment:
-      - ELASTICSEARCH_HOSTS=http://elasticsearch:9200
-    depends_on:
-      elasticsearch:
-        condition: service_healthy
-    profiles:
-      - monitoring  # 필요할 때만 실행
-
-volumes:
-  redis_data:
-    driver: local
-  es_data:
-    driver: local
+      - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
+      - GF_AUTH_ANONYMOUS_ENABLED=true
+      - GF_AUTH_BASIC_ENABLED=false
+    volumes:
+      - ./grafana:/etc/grafana/provisioning/

src/main/java/org/com/stocknote/StockNoteApplication.java

@@ -2,19 +2,17 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableJpaAuditing
 @EnableScheduling
-@EnableElasticsearchRepositories(basePackages = "org.com.stocknote.domain.searchDoc.repository")
-@EnableJpaRepositories(basePackages = "org.com.stocknote.domain")
 public class StockNoteApplication {
 
-    public static void main(String[] args) {
+    public static void main (String[] args) {
         SpringApplication.run(StockNoteApplication.class, args);
     }
 }
+
+

src/main/java/org/com/stocknote/config/RedisConfig.java

@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
@@ -16,23 +16,30 @@
 
 @Configuration
 public class RedisConfig {
-
-    private final RedisProperties redisProperties;
-
-    public RedisConfig(RedisProperties redisProperties) {
-        this.redisProperties = redisProperties;
-    }
+    @Value("${spring.data.redis.host}")
+    private String redisHost;
+    @Value("${spring.data.redis.port}")
+    private int redisPort;
 
     @Bean
     public RedisConnectionFactory redisConnectionFactory() {
-        return new LettuceConnectionFactory(redisProperties.getHost(), redisProperties.getPort());
+        return new LettuceConnectionFactory(redisHost, redisPort);
     }
 
     @Bean
     public StringRedisTemplate stringRedisTemplate(RedisConnectionFactory connectionFactory) {
         return new StringRedisTemplate(connectionFactory);
     }
 
+    @Bean
+    public RedisTemplate<Object, Object> redisObjectTemplate() {
+        RedisTemplate<Object, Object> redisTemplate = new RedisTemplate<>();
+        redisTemplate.setConnectionFactory(redisConnectionFactory());
+        redisTemplate.setKeySerializer(new StringRedisSerializer());
+        redisTemplate.setValueSerializer(new StringRedisSerializer());
+        return redisTemplate;
+    }
+
     @Bean
     public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory connectionFactory) {
         RedisTemplate<String, Object> template = new RedisTemplate<>();

src/main/java/org/com/stocknote/config/WebConfig.java

@@ -8,8 +8,9 @@
 public class WebConfig implements WebMvcConfigurer {
     @Override
     public void addCorsMappings(CorsRegistry registry) {
+
         registry.addMapping("/**").allowedOrigins(AppConfig.getSiteFrontUrl())
                 .allowedMethods("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS")
                 .allowedHeaders("*").allowCredentials(true);
     }
-}
+}

src/main/java/org/com/stocknote/config/elasticsearch/ElasticsearchConfig.java

@@ -9,7 +9,7 @@
 public interface KeywordRepository extends JpaRepository<Keyword, Long> {
     void deleteByMemberId(Long id);
 
-    List<Keyword> findByMemberId(Long id);
+    List<org.com.stocknote.domain.keyword.entity.Keyword> findByMemberId(Long id);
 
     List<Keyword> findAllByPostCategory(PostCategory category);
 }

src/main/java/org/com/stocknote/config/jpa/JpaConfig.java

@@ -14,22 +14,6 @@
 
 @Repository
 public interface PostRepository extends JpaRepository<Post, Long> {
-    // PerformanceTestService에서 사용하는 메서드 추가
-    @Query("SELECT DISTINCT p FROM Post p " +
-            "WHERE (p.title LIKE %:title% OR p.body LIKE %:body%) " +
-            "AND p.deletedAt IS NULL " +
-            "ORDER BY p.createdAt DESC")
-    Page<Post> findByTitleContainingOrBodyContaining(
-            @Param("title") String title,
-            @Param("body") String body,
-            Pageable pageable
-    );
-
-    // 또는 Spring Data JPA 자동 메서드 사용
-    Page<Post> findByTitleContainingOrBodyContainingAndDeletedAtIsNull(
-            String title, String body, Pageable pageable
-    );
-
     @Query("SELECT DISTINCT p FROM Post p " +
             "LEFT JOIN FETCH p.member m " +
             "LEFT JOIN FETCH p.comments c " +

src/main/java/org/com/stocknote/domain/keyword/repository/KeywordRepository.java

@@ -10,6 +10,4 @@
 @Repository
 public interface PostSearchRepository {
     Page<Post> search(PostSearchConditionDto condition, Pageable pageable);
-
-
 }