.gitignore

@@ -35,5 +35,3 @@ out/
 
 ### VS Code ###
 .vscode/
-
-temppassword.yml

processor/build.gradle

@@ -1,23 +0,0 @@
-dependencies {
-    developmentOnly 'org.springframework.boot:spring-boot-devtools'
-    runtimeOnly 'com.h2database:h2'
-    runtimeOnly 'mysql:mysql-connector-java'
-    compileOnly 'org.projectlombok:lombok'
-
-    implementation project(':support')
-    // https://projectreactor.io/docs/core/release/reference/#debug-activate
-    implementation 'org.springframework.boot:spring-boot-starter-webflux'
-    implementation 'org.telegram:telegrambots:5.3.0'
-
-    annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
-    annotationProcessor 'org.projectlombok:lombok'
-
-    testImplementation 'org.springframework.boot:spring-boot-starter-test'
-}
-
-test {
-    useJUnitPlatform()
-    testLogging {
-        events "passed", "skipped", "failed"
-    }
-}

processor/src/main/java/com/myoa/engineering/crawl/ppomppu/processor/ProcessorApplication.java

@@ -1,19 +1,10 @@
 package com.myoa.engineering.crawl.ppomppu.processor;
 
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
 /**
  * ProcessorApplication
  * @author Shin Woo-jin (woo-jin.shin@linecorp.com)
  * @since 2021-08-20
  *
  */
-@SpringBootApplication
 public class ProcessorApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(ProcessorApplication.class, args);
-    }
-
 }

processor/src/main/java/com/myoa/engineering/crawl/ppomppu/processor/controller/CrawlAPIController.java

@@ -1,30 +0,0 @@
-package com.myoa.engineering.crawl.ppomppu.processor.controller;
-
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.myoa.engineering.crawl.ppomppu.support.dto.code.PpomppuBoardName;
-
-import lombok.extern.slf4j.Slf4j;
-import reactor.core.publisher.Mono;
-
-/**
- * CrawlAPIController
- * @author Shin Woo-jin (woo-jin.shin@linecorp.com)
- * @since 2021-09-05
- *
- */
-@Slf4j
-@RestController
-@RequestMapping("/api/v1/crawl")
-public class CrawlAPIController {
-
-    @PostMapping("/boards/{boardName}")
-    public Mono<String> crawlBoard(@PathVariable("boardName") PpomppuBoardName boardName) {
-        log.info("got request... {}", boardName);
-        return Mono.just(boardName.getBoardPath());
-    }
-
-}

processor/src/main/resources/application-development.yml

@@ -1,6 +0,0 @@
-spring:
-  config:
-    activate:
-      on-profile: development
-    import:
-      - classpath:/development/webclient.yml

processor/src/main/resources/application.yml

@@ -1,14 +0,0 @@
-spring:
-  main:
-    allow-bean-definition-overriding: true
-  profiles:
-    active: development
-  freemarker:
-    enabled: false
-
-
-server:
-  port: 20081
-  error:
-    whitelabel:
-      enabled: false

receiver/build.gradle

@@ -7,7 +7,6 @@ dependencies {
     implementation project(':support')
     // https://projectreactor.io/docs/core/release/reference/#debug-activate
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
-    implementation 'org.springframework.boot:spring-boot-configuration-processor'
     implementation 'org.telegram:telegrambots:5.3.0'
 
     annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'

receiver/src/main/java/com/myoa/engineering/crawl/ppomppu/receiver/ReceiverApplication.java

@@ -2,9 +2,6 @@ package com.myoa.engineering.crawl.ppomppu.receiver;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-
-import com.myoa.engineering.crawl.ppomppu.receiver.configuration.properties.TelegramBotProperties;
 
 /**
  * ReceiverApplication
@@ -13,7 +10,6 @@ import com.myoa.engineering.crawl.ppomppu.receiver.configuration.properties.Tele
  *
  */
 @SpringBootApplication
-@EnableConfigurationProperties({ TelegramBotProperties.class })
 public class ReceiverApplication {
 
     public static void main(String[] args) {

receiver/src/main/java/com/myoa/engineering/crawl/ppomppu/receiver/configuration/TelegramBotConfiguration.java

@@ -8,9 +8,8 @@ import org.telegram.telegrambots.meta.TelegramBotsApi;
 import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
 import org.telegram.telegrambots.updatesreceivers.DefaultBotSession;
 
-import com.myoa.engineering.crawl.ppomppu.receiver.configuration.properties.TelegramBotProperties;
-import com.myoa.engineering.crawl.ppomppu.receiver.dispatch.MessageDispatcher;
 import com.myoa.engineering.crawl.ppomppu.receiver.handler.message.MessageHandler;
+import com.myoa.engineering.crawl.ppomppu.receiver.dispatch.MessageDispatcher;
 
 /**
  * TelegramBotConfiguration
@@ -21,6 +20,9 @@ import com.myoa.engineering.crawl.ppomppu.receiver.handler.message.MessageHandle
 @Configuration
 public class TelegramBotConfiguration {
 
+    private static final String BOT_TOKEN = ""; // TODO extract to property
+    private static final String BOT_NAME = ""; // TODO extract to property
+
     @Bean
     public TelegramBotsApi telegramBotsApi(MessageDispatcher messageDispatcher) throws TelegramApiException {
         TelegramBotsApi api = new TelegramBotsApi(DefaultBotSession.class);
@@ -29,8 +31,7 @@ public class TelegramBotConfiguration {
     }
 
     @Bean
-    public MessageDispatcher messageDispatcher(List<MessageHandler> messageHandlers,
+    public MessageDispatcher messageDispatcher(List<MessageHandler> messageHandlers) {
-                                               TelegramBotProperties botProperties) {
+        return new MessageDispatcher(messageHandlers, BOT_TOKEN, BOT_NAME);
-        return new MessageDispatcher(messageHandlers, botProperties.getName(), botProperties.getToken());
     }
 }

receiver/src/main/java/com/myoa/engineering/crawl/ppomppu/receiver/configuration/properties/TelegramBotProperties.java

@@ -1,25 +0,0 @@
-package com.myoa.engineering.crawl.ppomppu.receiver.configuration.properties;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.ConstructorBinding;
-
-import lombok.Getter;
-
-/**
- * TelegramBotProperties
- * @author Shin Woo-jin (woo-jin.shin@linecorp.com)
- * @since 2021-09-05
- *
- */
-@Getter
-@ConstructorBinding
-@ConfigurationProperties(prefix = "telegram.bot")
-public class TelegramBotProperties {
-    private final String name;
-    private final String token;
-
-    public TelegramBotProperties(final String name, final String token) {
-        this.name = name;
-        this.token = token;
-    }
-}

receiver/src/main/java/com/myoa/engineering/crawl/ppomppu/receiver/controller/v1/EventAPIController.java

@@ -1,33 +0,0 @@
-package com.myoa.engineering.crawl.ppomppu.receiver.controller.v1;
-
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.myoa.engineering.crawl.ppomppu.receiver.service.ProcessorAPIService;
-import com.myoa.engineering.crawl.ppomppu.support.dto.code.PpomppuBoardName;
-
-import reactor.core.publisher.Mono;
-
-/**
- * EventAPIController
- * @author Shin Woo-jin (woo-jin.shin@linecorp.com)
- * @since 2021-09-05
- *
- */
-@RestController
-@RequestMapping("/api/v1/")
-public class EventAPIController {
-
-    private final ProcessorAPIService processorAPIService;
-
-    public EventAPIController(ProcessorAPIService processorAPIService) {
-        this.processorAPIService = processorAPIService;
-    }
-
-    @PostMapping("/exploit/parsePpomppuRSS/{boardName}")
-    public Mono<String> parsePpomppuRSS(@PathVariable("boardName") PpomppuBoardName boardName) {
-        return processorAPIService.emitParseEvent(boardName);
-    }
-}

receiver/src/main/java/com/myoa/engineering/crawl/ppomppu/receiver/dispatch/MessageDispatcher.java

@@ -14,13 +14,13 @@ import lombok.extern.slf4j.Slf4j;
 public class MessageDispatcher extends TelegramLongPollingBot {
 
     private final List<MessageHandler> messageHandlers;
-    private final String botName;
     private final String botToken;
+    private final String botName;
 
-    public MessageDispatcher(List<MessageHandler> messageHandlers, String botName, String botToken) {
+    public MessageDispatcher(List<MessageHandler> messageHandlers, String botToken, String botName) {
         this.messageHandlers = messageHandlers;
-        this.botName = botName;
         this.botToken = botToken;
+        this.botName = botName;
     }
 
     @Override

receiver/src/main/java/com/myoa/engineering/crawl/ppomppu/receiver/handler/message/text/CommonTextHandler.java

@@ -25,6 +25,7 @@ public class CommonTextHandler implements TextMessageHandler {
     @Override
     public void handle(Message message) {
         log.info("CommonTextHandler : {}", message.getText());
+
     }
 
 }

receiver/src/main/java/com/myoa/engineering/crawl/ppomppu/receiver/infrastructure/client/ProcessorAPIWebClient.java

@@ -1,37 +1,22 @@
 package com.myoa.engineering.crawl.ppomppu.receiver.infrastructure.client;
 
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.client.WebClient;
-import org.springframework.web.reactive.function.client.WebClientRequestException;
 
-import com.myoa.engineering.crawl.ppomppu.support.dto.code.PpomppuBoardName;
+import java.util.List;
 
-import lombok.extern.slf4j.Slf4j;
-import reactor.core.publisher.Mono;
-import reactor.core.scheduler.Schedulers;
-
-@Slf4j
 @Component
 public class ProcessorAPIWebClient {
 
+
+    @Value("${webclient.some}")
+    private String baseUrl;
+
     private final WebClient webClient;
 
-    public ProcessorAPIWebClient(WebClient.Builder webClientBuilder,
+    public ProcessorAPIWebClient(WebClient.Builder webClientBuilder) {
-                                 @Value("${webclient.base-url}") String baseUrl) {
+        this.webClient = webClientBuilder.baseUrl("soundhoundfound-processor:20080")
-        this.webClient = webClientBuilder.baseUrl(baseUrl)
+                .build();
-                                         .build();
-    }
-
-    public Mono<String> emitParseEvent(PpomppuBoardName boardName) {
-        return webClient.post()
-                        .uri("/api/v1/crawl/boards/{boardName}", boardName)
-                        .exchangeToMono(e -> e.bodyToMono(new ParameterizedTypeReference<String>() {}))
-                        .publishOn(Schedulers.boundedElastic())
-                        .onErrorResume(WebClientRequestException.class, t -> {
-                            log.info("Exception occured, ignoring. : {}", t.getClass().getSimpleName());
-                            return Mono.empty();
-                        });
     }
 }

receiver/src/main/java/com/myoa/engineering/crawl/ppomppu/receiver/service/ProcessorAPIService.java

@@ -1,30 +0,0 @@
-package com.myoa.engineering.crawl.ppomppu.receiver.service;
-
-import org.springframework.stereotype.Service;
-
-import com.myoa.engineering.crawl.ppomppu.receiver.infrastructure.client.ProcessorAPIWebClient;
-import com.myoa.engineering.crawl.ppomppu.support.dto.code.PpomppuBoardName;
-
-import lombok.extern.slf4j.Slf4j;
-import reactor.core.publisher.Mono;
-
-/**
- * ProcessorAPIService
- * @author Shin Woo-jin (woo-jin.shin@linecorp.com)
- * @since 2021-09-05
- *
- */
-@Slf4j
-@Service
-public class ProcessorAPIService {
-
-    private final ProcessorAPIWebClient processorAPIWebClient;
-
-    public ProcessorAPIService(ProcessorAPIWebClient processorAPIWebClient) {
-        this.processorAPIWebClient = processorAPIWebClient;
-    }
-
-    public Mono<String> emitParseEvent(PpomppuBoardName boardName) {
-        return processorAPIWebClient.emitParseEvent(boardName);
-    }
-}

receiver/src/main/java/com/myoa/engineering/crawl/ppomppu/receiver/shceduler/ParseEventEmitter.java

@@ -1,40 +0,0 @@
-package com.myoa.engineering.crawl.ppomppu.receiver.shceduler;
-
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import com.myoa.engineering.crawl.ppomppu.receiver.service.ProcessorAPIService;
-import com.myoa.engineering.crawl.ppomppu.support.dto.code.PpomppuBoardName;
-
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * ParseEventEmitter
- * @author Shin Woo-jin (woo-jin.shin@linecorp.com)
- * @since 2021-09-05
- *
- */
-@Slf4j
-@Component
-@EnableScheduling
-public class ParseEventEmitter {
-
-    private final ProcessorAPIService processorAPIService;
-
-    public ParseEventEmitter(ProcessorAPIService processorAPIService) {
-        this.processorAPIService = processorAPIService;
-    }
-
-    @Scheduled(fixedRate = 60 * 1000L)
-    public void emitDomesticBoard() {
-        log.info("[emitDomesticBoard] trigger fired!");
-        processorAPIService.emitParseEvent(PpomppuBoardName.PPOMPPU_DOMESTIC).block();
-    }
-
-    @Scheduled(fixedRate = 300 * 1000L)
-    public void emitOverseaBoard() {
-        log.info("[emitOverseaBoard] trigger fired!");
-        processorAPIService.emitParseEvent(PpomppuBoardName.PPOMPPU_OVERSEA).block();
-    }
-}

receiver/src/main/resources/application-development.yml

@@ -3,5 +3,4 @@ spring:
     activate:
       on-profile: development
     import:
-      - classpath:/webclient-development.yml
+      - classpath:/development/webclient.yml
-      - classpath:/temppassword.yml

receiver/src/main/resources/application.yml

@@ -6,5 +6,5 @@ spring:
   freemarker:
     enabled: false
 
-server:
+webclient:
-  port: 20080
+  some: not-test

receiver/src/main/resources/webclient-development.yml

@@ -1,5 +0,0 @@
-webclient:
-  base-url: http://localhost:20081
-  units:
-    - unit-name: processor-api
-      base-url: http://localhost:20081

receiver/src/main/resources/webclient-production.yml

@@ -1,5 +0,0 @@
-webclient:
-  base-url: http://ppomppu_notifier_processor:20080
-  units:
-    - unit-name: processor-api
-      base-url: http://ppomppu_notifier_processor:20080

support/build.gradle

@@ -1,17 +0,0 @@
-dependencies {
-    runtimeOnly 'mysql:mysql-connector-java'
-    compileOnly 'org.projectlombok:lombok'
-
-    // https://projectreactor.io/docs/core/release/reference/#debug-activate
-
-    annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
-    annotationProcessor 'org.projectlombok:lombok'
-
-}
-
-test {
-    useJUnitPlatform()
-    testLogging {
-        events "passed", "skipped", "failed"
-    }
-}

support/src/main/java/com/myoa/engineering/crawl/ppomppu/support/dto/code/PpomppuBoardName.java

@@ -1,24 +0,0 @@
-package com.myoa.engineering.crawl.ppomppu.support.dto.code;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-/**
- * PpomppuBoardName
- * @author Shin Woo-jin (woo-jin.shin@linecorp.com)
- * @since 2021-09-05
- *
- */
-@Getter
-@NoArgsConstructor
-public enum PpomppuBoardName {
-    PPOMPPU_DOMESTIC("ppomppu"),
-    PPOMPPU_OVERSEA("ppomppu4"),
-    ;
-
-    private String boardPath;
-
-    PpomppuBoardName(String boardPath) {
-        this.boardPath = boardPath;
-    }
-}

support/src/main/java/com/myoa/engineering/crawl/ppomppu/support/webclient/WebClientBaseScan.java

@@ -1,4 +0,0 @@
-package com.myoa.engineering.crawl.ppomppu.support.webclient;
-
-public interface WebClientBaseScan {
-}

support/src/main/java/com/myoa/engineering/music/soundhoundfound/support/util/NumberUtil.java

@@ -1,4 +1,4 @@
-package com.myoa.engineering.crawl.ppomppu.support.util;
+package com.myoa.engineering.music.soundhoundfound.support.util;
 
 public final class NumberUtil {
 

support/src/main/java/com/myoa/engineering/music/soundhoundfound/support/util/ObjectUtil.java

@@ -1,4 +1,4 @@
-package com.myoa.engineering.crawl.ppomppu.support.util;
+package com.myoa.engineering.music.soundhoundfound.support.util;
 
 public final class ObjectUtil {
 

support/src/main/java/com/myoa/engineering/music/soundhoundfound/support/webclient/WebClientBaseScan.java

@@ -0,0 +1,4 @@
+package com.myoa.engineering.music.soundhoundfound.support.webclient;
+
+public interface WebClientBaseScan {
+}