[PPN-13] Deal with new page board structure

build.gradle

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = 'com.myoa.engineering.crawl.ppomppu'
-version = '1.0.1'
+version = '1.1.1'
 sourceCompatibility = '11'
 
 configurations {
@@ -21,7 +21,7 @@ repositories {
 
 allprojects {
     group = 'com.myoa.engineering.crawl.ppomppu'
-    version = '1.0.1'
+    version = '1.1.1'
 
     apply plugin: 'java'
     apply plugin: 'idea'

copy.bat

@@ -0,0 +1,3 @@
+xcopy /y .\processor\build\libs\*.jar .\
+xcopy /y .\receiver\build\libs\*.jar .\
+xcopy /y .\sender\build\libs\*.jar .\

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

@@ -1,11 +1,13 @@
 package com.myoa.engineering.crawl.ppomppu.processor.controller;
 
-import org.springframework.web.bind.annotation.GetMapping;
+import java.util.List;
+
 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.processor.domain.PpomppuArticle;
 import com.myoa.engineering.crawl.ppomppu.processor.dto.FeedParsedResult;
 import com.myoa.engineering.crawl.ppomppu.processor.service.MessageSenderService;
 import com.myoa.engineering.crawl.ppomppu.processor.service.PpomppuArticleService;
@@ -48,9 +50,21 @@ public class CrawlAPIController {
             ppomppuRSSFeedService.getArticles(boardName)
                                  .map(e -> ppomppuArticleService.filterOnlyNewArticles(boardName, e))
                                  .map(e -> ppomppuArticleService.save(boardName, e))
-                                 .flatMap(messageSenderService::sendMessageToSlack);
+                                 .filter(e -> !e.isEmpty())
+                                 .flatMap(e -> messageSenderService.sendBlockMessageToSlack(boardName, e));
 
         return publishedMessages.then(Mono.just(APIResponse.success(result.done())));
     }
 
+    @PostMapping("/exploit/boards/{boardName}")
+    public Mono<APIResponse<String>> crawlBoardDryRun(
+        @PathVariable("boardName") PpomppuBoardName boardName) {
+        log.info("got request... {}", boardName);
+        Mono<String> publishedMessages =
+            ppomppuRSSFeedService.getArticles(boardName)
+                                 .flatMap(e -> messageSenderService.sendBlockMessageToSlack(boardName, e));
+
+        return publishedMessages.map(APIResponse::success);
+    }
+
 }

processor/src/main/java/com/myoa/engineering/crawl/ppomppu/processor/domain/PpomppuArticle.java

@@ -34,6 +34,9 @@ public class PpomppuArticle extends Auditable {
     @Column
     private String articleUrl;
 
+    @Column
+    private String thumbnailUrl;
+
     @Column
     private String title;
 
@@ -48,11 +51,13 @@ public class PpomppuArticle extends Auditable {
 
     @Builder
     public PpomppuArticle(Long id, Long articleId, PpomppuBoardName boardName, String articleUrl,
-                          String title, Integer recommended, Integer hit, Instant registeredAt) {
+                          String thumbnailUrl, String title, Integer recommended, Integer hit,
+                          Instant registeredAt) {
         this.id = id;
         this.articleId = articleId;
         this.boardName = boardName;
         this.articleUrl = articleUrl;
+        this.thumbnailUrl = thumbnailUrl;
         this.title = title;
         this.recommended = recommended;
         this.hit = hit;

processor/src/main/java/com/myoa/engineering/crawl/ppomppu/processor/dto/PpomppuArticleDTO.java

@@ -1,10 +0,0 @@
-package com.myoa.engineering.crawl.ppomppu.processor.dto;
-
-/**
- * PpomppuArticle
- *
- * @author Shin Woo-jin (woozu.shin@kakaoent.com)
- * @since 2021-09-08
- */
-public class PpomppuArticleDTO {
-}

processor/src/main/java/com/myoa/engineering/crawl/ppomppu/processor/dto/PpomppuArticleParseDTO.java

@@ -0,0 +1,66 @@
+package com.myoa.engineering.crawl.ppomppu.processor.dto;
+
+import java.time.Instant;
+
+import com.myoa.engineering.crawl.ppomppu.processor.domain.PpomppuArticle;
+import com.myoa.engineering.crawl.ppomppu.support.util.DateUtil;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+/**
+ * PpomppuArticleParseDTO
+ *
+ * @author Shin Woo-jin (woozu.shin@kakaoent.com)
+ * @since 2021-09-08
+ */
+@Getter
+@NoArgsConstructor
+public class PpomppuArticleParseDTO {
+
+    private String id;
+    private String articleId;
+    private String boardName;
+    private String articleUrl;
+    private String thumbnailUrl;
+    private String title;
+    private String hit;
+    private Integer recommended;
+    private String registeredAt;
+
+    @Builder
+    public PpomppuArticleParseDTO(String id, String articleId, String boardName, String articleUrl,
+                                  String thumbnailUrl, String title, String hit, Integer recommended,
+                                  String registeredAt) {
+        this.id = id;
+        this.articleId = articleId;
+        this.boardName = boardName;
+        this.articleUrl = articleUrl;
+        this.thumbnailUrl = thumbnailUrl;
+        this.title = title;
+        this.hit = hit;
+        this.recommended = recommended;
+        this.registeredAt = registeredAt;
+    }
+
+    public boolean isInValidated() {
+        return articleId == null || articleId.isEmpty()
+               || hit == null || hit.isEmpty();
+    }
+
+    public PpomppuArticle convert() {
+        if (isInValidated()) {
+            throw new IllegalArgumentException("PpomppuArticleParseDTO was invalidated");
+        }
+        return PpomppuArticle.builder()
+                             .articleId(Long.parseLong(articleId))
+                             .title(title)
+                             .articleUrl(articleUrl)
+                             .thumbnailUrl(thumbnailUrl)
+                             .recommended(recommended)
+                             .hit(Integer.parseInt(hit))
+                             .registeredAt(DateUtil.DATE_TIME_FORMATTER.parse(registeredAt, Instant::from))
+                             .build();
+    }
+}

processor/src/main/java/com/myoa/engineering/crawl/ppomppu/processor/dto/PpomppuArticleParser.java

@@ -1,9 +1,5 @@
 package com.myoa.engineering.crawl.ppomppu.processor.dto;
 
-import java.time.Instant;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
@@ -18,41 +14,45 @@ import com.myoa.engineering.crawl.ppomppu.support.dto.code.PpomppuBoardName;
  */
 public final class PpomppuArticleParser {
 
-    private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yy.MM.dd HH:mm:ss")
-                                                                                  .withZone(ZoneId.of("Asia/Seoul"));
-
     private PpomppuArticleParser() {}
 
     public static PpomppuArticle toArticle(Elements articleElement) {
-        final long articleId = PpomppuArticleParser.parseArticleId(articleElement.get(0));
+        final String articleIdString = PpomppuArticleParser.parseArticleId(articleElement.get(0));
         final String title = PpomppuArticleParser.parseTitle(articleElement.get(2));
         final String articleUrl = PpomppuArticleParser.parseArticleUrl(articleElement.get(2));
-        final int recommended = PpomppuArticleParser.parseRecommended(articleElement.get(6));
+        final String thumbnailUrl = PpomppuArticleParser.parseThumbnailUrl(articleElement.get(3));
-        final int hit = PpomppuArticleParser.parseHit(articleElement.get(7));
+        final Integer recommended = PpomppuArticleParser.parseRecommended(articleElement.get(6));
-        final Instant registeredAt = PpomppuArticleParser.parseRegisteredAt(articleElement.get(5));
+        final String hitString = PpomppuArticleParser.parseHit(articleElement.get(7));
+        final String registeredAtString = PpomppuArticleParser.parseRegisteredAt(articleElement.get(5));
 
-        return PpomppuArticle.builder()
+        return PpomppuArticleParseDTO.builder()
-                             .articleId(articleId)
+                                     .articleId(articleIdString)
                                      .title(title)
                                      .articleUrl(articleUrl)
+                                     .thumbnailUrl(thumbnailUrl)
                                      .recommended(recommended)
-                             .hit(hit)
+                                     .hit(hitString)
-                             .registeredAt(registeredAt)
+                                     .registeredAt(registeredAtString)
-                             .build();
+                                     .build()
+                                     .convert();
     }
 
-    public static Long parseArticleId(Element td) {
+    public static String parseArticleId(Element td) {
-        return Long.parseLong(td.text().trim());
+        return td.text().trim();
     }
 
     public static String parseTitle(Element td) {
-        return td.getElementsByTag("a").text(); // TODO cdn image extracting
+        return td.getElementsByTag("a").text();
     }
 
     public static String parseArticleUrl(Element td) {
         return PpomppuBoardName.ofViewPageUrl(td.getElementsByTag("a").attr("href"));
     }
 
+    public static String parseThumbnailUrl(Element td) {
+        return "https:" + td.getElementsByTag("img").get(0).attr("src");
+    }
+
     public static Integer parseRecommended(Element td) {
         final String voteString = td.text();
         final int recommended;
@@ -67,13 +67,12 @@ public final class PpomppuArticleParser {
         return recommended;
     }
 
-    public static Integer parseHit(Element td) {
+    public static String parseHit(Element td) {
-        return Integer.parseInt(td.text());
+        return td.text();
     }
 
-    public static Instant parseRegisteredAt(Element td) {
+    public static String parseRegisteredAt(Element td) {
-        final String registeredAtString = td.attr("title");
+        return td.attr("title");
-        return DATE_TIME_FORMATTER.parse(registeredAtString, Instant::from);
     }
 
 }

processor/src/main/java/com/myoa/engineering/crawl/ppomppu/processor/dto/PpomppuArticleTransformer.java

@@ -1,14 +1,15 @@
 package com.myoa.engineering.crawl.ppomppu.processor.dto;
 
 import java.time.Instant;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import com.myoa.engineering.crawl.ppomppu.processor.domain.PpomppuArticle;
+import com.myoa.engineering.crawl.ppomppu.support.dto.BlockMessageDTO;
 import com.myoa.engineering.crawl.ppomppu.support.dto.SimpleMessageDTO;
+import com.myoa.engineering.crawl.ppomppu.support.dto.code.PpomppuBoardName;
+import com.myoa.engineering.crawl.ppomppu.support.util.DateUtil;
 
 /**
  * PpomppuArticleTransformer
@@ -20,34 +21,50 @@ public final class PpomppuArticleTransformer {
 
     private PpomppuArticleTransformer() {}
 
-    private static final String MESSAGE_FORMAT_V1 = "%s)) `%s` <%s:LINK>";
+    private static final String MESSAGE_FORMAT_V1 = "%s)) <%s|LINK> `%s` ";
+    private static final String MESSAGE_FORMAT_V2 = "%s *<%s|LINK>*\n%s";
+    private static final String TITLE_FORMAT_V1 = "_*:hearts: %s | %s*_";
 
-    private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
+    public static final Function<PpomppuArticle, SimpleMessageDTO> TRANSFORM_TO_MESSAGE_DTO = article ->
-                                                                                  .withZone(ZoneId.of("Asia/Seoul"));
-
-    public static final Function<PpomppuArticle, SimpleMessageDTO> TRANSFORM_TO_MESSAGE_DTO = entity ->
         SimpleMessageDTO.builder()
                         .requestedAt(Instant.now())
-                        .publishedAt(entity.getRegisteredAt())
+                        .publishedAt(article.getRegisteredAt())
-                        .title(String.format(MESSAGE_FORMAT_V1, entity.getBoardName().getMenuName(), entity.getTitle()))
+                        .title(String.format(MESSAGE_FORMAT_V1,
-                        .body(entity.getArticleUrl())
+                                             article.getBoardName().getMenuName(), article.getArticleUrl(),
+                                             article.getTitle()))
+                        .body(article.getArticleUrl())
                         .build();
 
     // https://stackoverflow.com/questions/24882927/using-streams-to-convert-a-list-of-objects-into-a-string-obtained-from-the-tostr
-    public static SimpleMessageDTO transform(List<PpomppuArticle> articles) {
+    public static SimpleMessageDTO transformToSimpleMessage(List<PpomppuArticle> articles) {
         Instant requestedAt = Instant.now();
         String body = articles.stream()
                               .map(PpomppuArticleTransformer::convertToInlineMessage)
                               .collect(Collectors.joining("\n\n"));
         return SimpleMessageDTO.builder()
                                .requestedAt(requestedAt)
-                               .title(DATE_TIME_FORMATTER.format(requestedAt))
+                               .title(DateUtil.DATE_TIME_FORMATTER.format(requestedAt))
                                .body(body)
                                .build();
     }
 
+    public static BlockMessageDTO transformToBlockMessage(PpomppuBoardName boardName, List<PpomppuArticle> articles) {
+        Instant requestedAt = Instant.now();
+        List<BlockMessageDTO.Block> body = articles.stream()
+                                                   .map(e -> BlockMessageDTO.createBlock(convertToInlineMessage(e),
+                                                                                         e.getThumbnailUrl()))
+                                                   .collect(Collectors.toList());
+        return BlockMessageDTO.builder()
+                              .requestedAt(requestedAt)
+                              .title(String.format(TITLE_FORMAT_V1,
+                                                   boardName.getMenuName(),
+                                                   DateUtil.DATE_TIME_FORMATTER.format(requestedAt)))
+                              .blocks(body)
+                              .build();
+    }
+
     public static String convertToInlineMessage(PpomppuArticle article) {
-        return String.format(MESSAGE_FORMAT_V1,
+        return String.format(MESSAGE_FORMAT_V2,
-                             article.getBoardName().getMenuName(), article.getTitle(), article.getArticleUrl());
+                             article.getBoardName().getMenuName(), article.getArticleUrl(), article.getTitle());
     }
 }

processor/src/main/java/com/myoa/engineering/crawl/ppomppu/processor/infrastructure/client/MessageSenderAPIClient.java

@@ -8,6 +8,7 @@ import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.reactive.function.client.WebClientRequestException;
 
 import com.myoa.engineering.crawl.ppomppu.processor.dto.constant.WebClientPropertiesUnitName;
+import com.myoa.engineering.crawl.ppomppu.support.dto.BlockMessageDTO;
 import com.myoa.engineering.crawl.ppomppu.support.dto.SimpleMessageDTO;
 import com.myoa.engineering.crawl.ppomppu.support.webclient.factory.WebClientFilterFactory;
 import com.myoa.engineering.crawl.ppomppu.support.webclient.factory.WebFluxExchangeStragiesFactory;
@@ -42,9 +43,22 @@ public class MessageSenderAPIClient {
                                   .build();
     }
 
-    public Mono<String> sendMessageToSlack(SimpleMessageDTO dto) {
+    public Mono<String> sendSimpleMessageToSlack(SimpleMessageDTO dto) {
         return webClient.post()
-                        .uri("/api/v1/messages/sendMessage/messengers/slack")
+                        .uri("/api/v1/messages/sendSimpleMessage/messengers/slack")
+                        .bodyValue(dto)
+                        .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();
+                        });
+    }
+
+
+    public Mono<String> sendBlockMessageToSlack(BlockMessageDTO dto) {
+        return webClient.post()
+                        .uri("/api/v1/messages/sendBlockMessage/messengers/slack")
                         .bodyValue(dto)
                         .exchangeToMono(e -> e.bodyToMono(new ParameterizedTypeReference<String>() {}))
                         .publishOn(Schedulers.boundedElastic())

processor/src/main/java/com/myoa/engineering/crawl/ppomppu/processor/service/MessageSenderService.java

@@ -7,6 +7,7 @@ import org.springframework.stereotype.Service;
 import com.myoa.engineering.crawl.ppomppu.processor.domain.PpomppuArticle;
 import com.myoa.engineering.crawl.ppomppu.processor.dto.PpomppuArticleTransformer;
 import com.myoa.engineering.crawl.ppomppu.processor.infrastructure.client.MessageSenderAPIClient;
+import com.myoa.engineering.crawl.ppomppu.support.dto.code.PpomppuBoardName;
 
 import lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Mono;
@@ -27,12 +28,17 @@ public class MessageSenderService {
         this.messageSenderAPIClient = messageSenderAPIClient;
     }
 
-    public Mono<String> sendMessageToSlack(PpomppuArticle article) {
+    public Mono<String> sendSimpleMessageToSlack(PpomppuArticle article) {
-        return messageSenderAPIClient.sendMessageToSlack(PpomppuArticleTransformer.TRANSFORM_TO_MESSAGE_DTO.apply(article));
+        return messageSenderAPIClient.sendSimpleMessageToSlack(PpomppuArticleTransformer.TRANSFORM_TO_MESSAGE_DTO.apply(article));
     }
 
-    public Mono<String> sendMessageToSlack(List<PpomppuArticle> articles) {
+    public Mono<String> sendSimpleMessageToSlack(List<PpomppuArticle> articles) {
-        return messageSenderAPIClient.sendMessageToSlack(PpomppuArticleTransformer.transform(articles));
+        return messageSenderAPIClient.sendSimpleMessageToSlack(PpomppuArticleTransformer.transformToSimpleMessage(articles));
+    }
+
+    public Mono<String> sendBlockMessageToSlack(PpomppuBoardName boardName, List<PpomppuArticle> articles) {
+        return messageSenderAPIClient.sendBlockMessageToSlack(
+            PpomppuArticleTransformer.transformToBlockMessage(boardName, articles));
     }
 
 }

processor/src/main/java/com/myoa/engineering/crawl/ppomppu/processor/service/PpomppuArticleService.java

@@ -50,7 +50,10 @@ public class PpomppuArticleService {
 
         // save PpomppuBoardFeedStatus
         Optional<PpomppuBoardFeedStatus> boardFeedStatus = ppomppuBoardFeedStatusRepository.findByBoardName(boardName);
-        log.info("boardName: {}, isPresent?: {}", boardName, boardFeedStatus.isPresent());
+        log.info("[save] boardName: {}, isPresent?: {}, latestArticleId: {}",
+                 boardName, boardFeedStatus.isPresent(), latestArticleId);
+        log.info("[save] articles count: {}, article ids: {}",
+                 articles.size(), articles.stream().map(PpomppuArticle::getArticleId).toArray());
         boardFeedStatus.ifPresentOrElse(e -> {
                                             if (latestArticleId.longValue() > 0L) {
                                                 e.updateArticleId(latestArticleId);

processor/src/main/java/com/myoa/engineering/crawl/ppomppu/processor/service/PpomppuFeedService.java

@@ -1,14 +1,18 @@
 package com.myoa.engineering.crawl.ppomppu.processor.service;
 
+import java.util.Comparator;
+import java.util.List;
+
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Element;
+import org.springframework.stereotype.Component;
+
 import com.myoa.engineering.crawl.ppomppu.processor.domain.PpomppuArticle;
 import com.myoa.engineering.crawl.ppomppu.processor.dto.PpomppuArticleParser;
 import com.myoa.engineering.crawl.ppomppu.processor.infrastructure.client.PpomppuBoardFeedRetriever;
 import com.myoa.engineering.crawl.ppomppu.support.dto.code.PpomppuBoardName;
-import java.util.List;
+
 import lombok.extern.slf4j.Slf4j;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Element;
-import org.springframework.stereotype.Component;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -33,7 +37,10 @@ public class PpomppuFeedService {
         final Mono<Element> tbody = extractTbodyFromHtml(html);
         // .doOnNext(e -> log.info("pre tbody - {}", e.html()));
         return extractArticlesFromTbody(tbody).map(this::convertFromElement)
+                                              .onErrorContinue((t, e) -> log.error("Error occured : {}, value: {}",
+                                                                                   e, t.getLocalizedMessage()))
                                               .map(e -> e.updateBoardName(boardName))
+                                              .sort(Comparator.comparing(PpomppuArticle::getArticleId))
                                               // .doOnNext(e -> log.info("parsed Result: {}", e))
                                               .collectList();
     }

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

@@ -3,7 +3,7 @@ spring:
     activate:
       on-profile: development
     import:
-      - "configserver:http://192.168.0.100:20085"
+      - "configserver:http://192.168.0.100:11080"
 
 
 server:

processor/src/main/resources/application.yml

@@ -8,7 +8,7 @@ spring:
     group:
       local: "local,datasource-local,webclient-local"
       development: "development,datasource-development,webclient-development"
-      production: "production, datasource-production,webclient-production"
+      production: "production,datasource-production,webclient-production"
   freemarker:
     enabled: false
 
@@ -22,4 +22,4 @@ management:
   endpoints:
     web:
       exposure:
-        include: refresh
+        include: refresh,health

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

@@ -1,5 +1,7 @@
 package com.myoa.engineering.crawl.ppomppu.receiver.scheduler;
 
+import java.util.Arrays;
+
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -26,11 +28,11 @@ public class ParseEventEmitter {
         this.processorAPIService = processorAPIService;
     }
 
-    @Scheduled(fixedRate = 300 * 1000L)
+    @Scheduled(fixedRate = 600 * 1000L)
     public void emitBoards() {
         log.info("[emitDomesticBoard] trigger fired!");
-        for (PpomppuBoardName boardName : PpomppuBoardName.values()) {
+        Arrays.stream(PpomppuBoardName.values())
-            processorAPIService.emitParseEvent(boardName).block();
+              .filter(PpomppuBoardName::isCrawlWithDefaultTimer)
-        }
+              .forEach(boardName -> processorAPIService.emitParseEvent(boardName).block());
     }
 }

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

@@ -3,5 +3,4 @@ spring:
     activate:
       on-profile: production
     import:
-      - classpath:/production/webclient.yml
       - "configserver:http://ppn-config-server:20080"

receiver/src/main/resources/application.yml

@@ -22,4 +22,4 @@ management:
   endpoints:
     web:
       exposure:
-        include: refresh
+        include: refresh,health

sender/src/main/java/com/myoa/engineering/crawl/ppomppu/sender/controller/MessageSenderAPIController.java

@@ -1,13 +1,19 @@
 package com.myoa.engineering.crawl.ppomppu.sender.controller;
 
-import com.myoa.engineering.crawl.ppomppu.sender.infrastructure.client.MongeShoppingBotSlackMessageSender;
-import com.myoa.engineering.crawl.ppomppu.support.dto.APIResponse;
-import com.myoa.engineering.crawl.ppomppu.support.dto.SimpleMessageDTO;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
+import com.myoa.engineering.crawl.ppomppu.sender.dto.SlackBaseMessageBlock;
+import com.myoa.engineering.crawl.ppomppu.sender.dto.SlackMessageDTO;
+import com.myoa.engineering.crawl.ppomppu.sender.infrastructure.client.MongeShoppingBotSlackMessageSender;
+import com.myoa.engineering.crawl.ppomppu.support.dto.APIResponse;
+import com.myoa.engineering.crawl.ppomppu.support.dto.BlockMessageDTO;
+import com.myoa.engineering.crawl.ppomppu.support.dto.SimpleMessageDTO;
+import com.myoa.engineering.crawl.ppomppu.support.util.ObjectMapperFactory;
+
+import lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Mono;
 
 /**
@@ -27,9 +33,30 @@ public class MessageSenderAPIController {
         this.sender = sender;
     }
 
-    @PostMapping("/messages/sendMessage/messengers/slack")
+    @PostMapping("/messages/sendSimpleMessage/messengers/slack")
-    public Mono<APIResponse<SimpleMessageDTO>> sendMessageToSlack(@RequestBody SimpleMessageDTO dto) {
+    public Mono<APIResponse<SimpleMessageDTO>> sendSimpleMessageToSlack(@RequestBody SimpleMessageDTO dto) {
         return sender.sendMessage(sender.ofMessage(dto.getBody()))
                      .then(Mono.just(APIResponse.success(dto)));
     }
+
+    @PostMapping("/messages/sendBlockMessage/messengers/slack")
+    public Mono<APIResponse<BlockMessageDTO>> sendBlockMessageToSlack(@RequestBody BlockMessageDTO dto) {
+        if (dto.getBlocks().isEmpty()) {
+            return Mono.just(APIResponse.fail(dto, "empty blocks"));
+        }
+
+
+        return sender.sendMessage(buildSlackMessageDTO(dto))
+//                     .doOnNext(e -> log.info("[sendBlockMessageToSlack] slackMessageDTO: {}",
+//                                             ObjectMapperFactory.writeAsString(buildSlackMessageDTO(dto))))
+                     .then(Mono.just(APIResponse.success(dto)));
+    }
+
+    private SlackMessageDTO buildSlackMessageDTO(BlockMessageDTO dto) {
+        SlackMessageDTO slackMessageDTO = sender.ofBlockMessageBased();
+        slackMessageDTO.addSectionBlock(dto.getTitle());
+        dto.getBlocks().forEach(slackMessageDTO::addSectionBlock);
+        slackMessageDTO.addBlock(SlackBaseMessageBlock.ofDivider());
+        return slackMessageDTO;
+    }
 }

sender/src/main/java/com/myoa/engineering/crawl/ppomppu/sender/dto/SlackBaseMessageBlock.java

@@ -0,0 +1,47 @@
+package com.myoa.engineering.crawl.ppomppu.sender.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+/**
+ * MessageBlock
+ * @author Shin Woo-jin (woo-jin.shin@linecorp.com)
+ * @since 2021-11-30
+ *
+ */
+@Getter
+@NoArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SlackBaseMessageBlock implements SlackMessageBlock {
+    private static final long serialVersionUID = 1597984001727808419L;
+
+    private SlackMessageBlockType type;
+    private String text;
+
+    @Builder
+    private SlackBaseMessageBlock(SlackMessageBlockType type, String text) {
+        this.type = type;
+        this.text = text;
+    }
+
+    public static SlackBaseMessageBlock ofMarkDown(String message) {
+        return SlackBaseMessageBlock.builder()
+                                    .type(SlackMessageBlockType.MARKDOWN)
+                                    .text(message)
+                                    .build();
+    }
+
+    public static SlackBaseMessageBlock ofDivider() {
+        return SlackBaseMessageBlock.builder()
+                                    .type(SlackMessageBlockType.DIVIDER)
+                                    .build();
+    }
+
+    @Override
+    public String getType() {
+        return type.getType();
+    }
+}

sender/src/main/java/com/myoa/engineering/crawl/ppomppu/sender/dto/SlackImageMessageBlock.java

@@ -0,0 +1,49 @@
+package com.myoa.engineering.crawl.ppomppu.sender.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+/**
+ * SlackImageMessageBlock
+ * @author Shin Woo-jin (woo-jin.shin@linecorp.com)
+ * @since 2021-11-30
+ *
+ */
+@Getter
+@NoArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SlackImageMessageBlock implements SlackMessageBlock {
+    private static final long serialVersionUID = 1597984001727808419L;
+
+    private SlackMessageBlockType type;
+
+    @JsonProperty(value = "image_url", required = true)
+    private String imageUrl;
+
+    @JsonProperty(value = "alt_text", required = true)
+    private String altText;
+
+    @Builder
+    private SlackImageMessageBlock(SlackMessageBlockType type, String imageUrl, String altText) {
+        this.type = type;
+        this.imageUrl = imageUrl;
+        this.altText = altText;
+    }
+
+    public static SlackImageMessageBlock of(String imageUrl, String altText) {
+        return SlackImageMessageBlock.builder()
+                                     .type(SlackMessageBlockType.IMAGE)
+                                     .imageUrl(imageUrl)
+                                     .altText(altText)
+                                     .build();
+    }
+
+    @Override
+    public String getType() {
+        return type.getType();
+    }
+}

sender/src/main/java/com/myoa/engineering/crawl/ppomppu/sender/dto/SlackMessageBlock.java

@@ -0,0 +1,15 @@
+package com.myoa.engineering.crawl.ppomppu.sender.dto;
+
+import java.io.Serializable;
+
+/**
+ * SlackMessageBlock
+ * @author Shin Woo-jin (woo-jin.shin@linecorp.com)
+ * @since 2021-12-01
+ *
+ */
+public interface SlackMessageBlock extends Serializable {
+
+    String getType();
+
+}

sender/src/main/java/com/myoa/engineering/crawl/ppomppu/sender/dto/SlackMessageBlockType.java

@@ -0,0 +1,22 @@
+package com.myoa.engineering.crawl.ppomppu.sender.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * BlockType
+ * @author Shin Woo-jin (woo-jin.shin@linecorp.com)
+ * @since 2021-11-30
+ *
+ */
+@Getter
+@AllArgsConstructor
+public enum SlackMessageBlockType {
+    SECTION("section"),
+    MARKDOWN("mrkdwn"),
+    DIVIDER("divider"),
+    IMAGE("image"),
+    ;
+
+    private String type;
+}

sender/src/main/java/com/myoa/engineering/crawl/ppomppu/sender/dto/SlackMessageDTO.java

@@ -1,6 +1,11 @@
 package com.myoa.engineering.crawl.ppomppu.sender.dto;
 
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.myoa.engineering.crawl.ppomppu.support.dto.BlockMessageDTO;
+import com.myoa.engineering.crawl.ppomppu.support.dto.BlockMessageDTO.Block;
 
 import lombok.Builder;
 import lombok.Getter;
@@ -14,6 +19,7 @@ import lombok.NoArgsConstructor;
  */
 @Getter
 @NoArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class SlackMessageDTO implements MessageDTO {
 
     private final static long serialVersionUID = 4737608709660494713L;
@@ -21,19 +27,36 @@ public class SlackMessageDTO implements MessageDTO {
     private String text;
     private String channel;
     private String username;
+    private List<SlackMessageBlock> blocks;
 
     @JsonProperty("icon_emoji")
     private String iconEmoji;
 
     @Builder
-    public SlackMessageDTO(String text, String channel, String username, String iconEmoji) {
+    public SlackMessageDTO(String text, String channel, String username,
+                           List<SlackMessageBlock> blocks, String iconEmoji) {
         this.text = text;
         this.channel = channel;
         this.username = username;
+        this.blocks = blocks;
         this.iconEmoji = iconEmoji;
     }
 
     public void applyText(String text) {
         this.text = text;
     }
+
+    public void addSectionBlock(BlockMessageDTO.Block block) {
+        SlackSectionMessageBlock slackSectionMessageBlock = SlackSectionMessageBlock.ofMarkDown(block.getText());
+        slackSectionMessageBlock.applyImageaccessory(block.getImageUrl(), block.getAltText());
+        addBlock(slackSectionMessageBlock);
+    }
+    public void addSectionBlock(String rawBlockMessage) {
+        addBlock(SlackSectionMessageBlock.ofMarkDown(rawBlockMessage));
+    }
+
+    public void addBlock(SlackMessageBlock block) {
+        blocks.add(block);
+    }
+
 }

sender/src/main/java/com/myoa/engineering/crawl/ppomppu/sender/dto/SlackSectionMessageBlock.java

@@ -0,0 +1,49 @@
+package com.myoa.engineering.crawl.ppomppu.sender.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+/**
+ * SectionBlock
+ * @author Shin Woo-jin (woo-jin.shin@linecorp.com)
+ * @since 2021-11-30
+ *
+ */
+@Getter
+@NoArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SlackSectionMessageBlock implements SlackMessageBlock {
+    private static final long serialVersionUID = -7600944576753160168L;
+
+    private SlackMessageBlockType type;
+    private SlackBaseMessageBlock text;
+    private SlackImageMessageBlock accessory;
+
+    @Builder
+    private SlackSectionMessageBlock(SlackMessageBlockType type, SlackBaseMessageBlock text,
+                                     SlackImageMessageBlock accessory) {
+        this.type = type;
+        this.text = text;
+        this.accessory = accessory;
+    }
+
+    public static SlackSectionMessageBlock ofMarkDown(String message) {
+        return SlackSectionMessageBlock.builder()
+                                       .type(SlackMessageBlockType.SECTION)
+                                       .text(SlackBaseMessageBlock.ofMarkDown(message))
+                                       .build();
+    }
+
+    public SlackSectionMessageBlock applyImageaccessory(String imageUrl, String altText) {
+        this.accessory = SlackImageMessageBlock.of(imageUrl, altText);
+        return this;
+    }
+
+    @Override
+    public String getType() {
+        return type.getType();
+    }
+}

sender/src/main/java/com/myoa/engineering/crawl/ppomppu/sender/infrastructure/client/MongeShoppingBotSlackMessageSender.java

@@ -1,10 +1,14 @@
 package com.myoa.engineering.crawl.ppomppu.sender.infrastructure.client;
 
+import java.util.ArrayList;
+
+import org.springframework.stereotype.Component;
+
 import com.myoa.engineering.crawl.ppomppu.sender.configuration.properties.SlackSecretProperties;
 import com.myoa.engineering.crawl.ppomppu.sender.configuration.properties.SlackSecretProperties.SlackSecretPropertiesUnit;
 import com.myoa.engineering.crawl.ppomppu.sender.dto.SlackMessageDTO;
+
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
 
 @Slf4j
 @Component
@@ -35,4 +39,14 @@ public class MongeShoppingBotSlackMessageSender extends SlackMessageSender {
                               .text(text)
                               .build();
     }
+
+    public SlackMessageDTO ofBlockMessageBased() {
+        return SlackMessageDTO.builder()
+                              .channel(slackProperties.getChannel())
+                              .iconEmoji(slackProperties.getIconEmoji())
+                              .username(slackProperties.getUsername())
+                              .blocks(new ArrayList<>())
+                              .build();
+    }
+
 }

sender/src/main/java/com/myoa/engineering/crawl/ppomppu/sender/infrastructure/client/SlackMessageSender.java

@@ -33,6 +33,7 @@ public class SlackMessageSender implements MessageSender<SlackMessageDTO> {
                                   .exchangeStrategies(WebFluxExchangeStragiesFactory.ofDefault())
                                   .defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_UTF8_VALUE)
                                   .defaultHeader(HttpHeaders.ACCEPT_CHARSET, "UTF-8")
+                                  .filter(WebClientFilterFactory.logRequest())
                                   .filter(WebClientFilterFactory.logResponse())
                                   .build();
     }
@@ -47,7 +48,8 @@ public class SlackMessageSender implements MessageSender<SlackMessageDTO> {
                         .onErrorResume(WebClientRequestException.class, t -> {
                             log.info("Exception occured, ignoring. : {}", t.getClass().getSimpleName());
                             return Mono.empty();
-                        });
+                        })
+                        .doOnNext(e -> log.info("[sendMessage] {}", e));
     }
 
 }

sender/src/main/resources/application.yml

@@ -22,4 +22,4 @@ management:
   endpoints:
     web:
       exposure:
-        include: refresh, env
+        include: refresh,health

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

@@ -0,0 +1,68 @@
+package com.myoa.engineering.crawl.ppomppu.support.dto;
+
+import java.io.Serializable;
+import java.time.Instant;
+import java.util.List;
+
+import com.myoa.engineering.crawl.ppomppu.support.dto.code.PpomppuBoardName;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+/**
+ * SimpleMessageDTO
+ * @author Shin Woo-jin (woo-jin.shin@linecorp.com)
+ * @since 2021-11-21
+ *
+ */
+@Getter
+@NoArgsConstructor
+public class BlockMessageDTO implements Serializable {
+
+    private static final long serialVersionUID = -6992039884035135523L;
+
+    private PpomppuBoardName boardName;
+    private String title;
+    private List<Block> blocks;
+    private String url;
+    private Instant publishedAt;
+    private Instant requestedAt;
+
+    @Builder
+    public BlockMessageDTO(PpomppuBoardName boardName, String title,
+                           List<Block> blocks, String url, Instant publishedAt,
+                           Instant requestedAt) {
+        this.boardName = boardName;
+        this.title = title;
+        this.blocks = blocks;
+        this.url = url;
+        this.publishedAt = publishedAt;
+        this.requestedAt = requestedAt;
+    }
+
+    @Getter
+    @NoArgsConstructor
+    public static class Block implements Serializable {
+        private static final long serialVersionUID = 3633781631892663709L;
+
+        private String text;
+        private String imageUrl;
+        private String altText;
+
+        public Block(String text, String imageUrl, String altText) {
+            this.text = text;
+            this.imageUrl = imageUrl;
+            this.altText = altText;
+        }
+    }
+
+    public static Block createBlock(String text, String imageUrl) {
+        return new Block(text, imageUrl, "");
+    }
+
+    public static Block createBlock(String text, String imageUrl, String altText) {
+        return new Block(text, imageUrl, altText);
+    }
+
+}

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

@@ -12,30 +12,30 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum PpomppuBoardName {
-    PPOMPPU_DOMESTIC_ALL("/zboard/zboard.php?id=ppomppu", "전체", false),
+    PPOMPPU_DOMESTIC_ALL("/zboard/zboard.php?id=ppomppu", "국내-전체", false),
-    PPOMPPU_DOMESTIC_ETC("/zboard/zboard.php?id=ppomppu&category=1", "기타", true),
+    PPOMPPU_DOMESTIC_ETC("/zboard/zboard.php?id=ppomppu&category=1", "국내-기타", true),
-    PPOMPPU_DOMESTIC_COMPUTER("/zboard/zboard.php?id=ppomppu&category=4", "컴퓨터", true),
+    PPOMPPU_DOMESTIC_COMPUTER("/zboard/zboard.php?id=ppomppu&category=4", "국내-컴퓨터", true),
-    PPOMPPU_DOMESTIC_DIGITAL("/zboard/zboard.php?id=ppomppu&category=5", "디지털", true),
+    PPOMPPU_DOMESTIC_DIGITAL("/zboard/zboard.php?id=ppomppu&category=5", "국내-디지털", true),
-    PPOMPPU_DOMESTIC_FOOD("/zboard/zboard.php?id=ppomppu&category=6", "식품/건강", true),
+    PPOMPPU_DOMESTIC_FOOD("/zboard/zboard.php?id=ppomppu&category=6", "국내-식품/건강", true),
-    PPOMPPU_DOMESTIC_BOOK("/zboard/zboard.php?id=ppomppu&category=8", "서적", true),
+    PPOMPPU_DOMESTIC_BOOK("/zboard/zboard.php?id=ppomppu&category=8", "국내-서적", true),
-    PPOMPPU_DOMESTIC_APPLIANCES("/zboard/zboard.php?id=ppomppu&category=9", "가전/가구", true),
+    PPOMPPU_DOMESTIC_APPLIANCES("/zboard/zboard.php?id=ppomppu&category=9", "국내-가전/가구", true),
-    PPOMPPU_DOMESTIC_PARENTING("/zboard/zboard.php?id=ppomppu&category=10", "육아", true),
+    PPOMPPU_DOMESTIC_PARENTING("/zboard/zboard.php?id=ppomppu&category=10", "국내-육아", true),
-    PPOMPPU_DOMESTIC_GIFTCARD("/zboard/zboard.php?id=ppomppu&category=11", "상품권", true),
+    PPOMPPU_DOMESTIC_GIFTCARD("/zboard/zboard.php?id=ppomppu&category=11", "국내-상품권", true),
-    PPOMPPU_DOMESTIC_CLOTHES("/zboard/zboard.php?id=ppomppu&category=12", "의류/잡화", true),
+    PPOMPPU_DOMESTIC_CLOTHES("/zboard/zboard.php?id=ppomppu&category=12", "국내-의류/잡화", true),
-    PPOMPPU_DOMESTIC_COSMETIC("/zboard/zboard.php?id=ppomppu&category=13", "화장품", true),
+    PPOMPPU_DOMESTIC_COSMETIC("/zboard/zboard.php?id=ppomppu&category=13", "국내-화장품", true),
-    PPOMPPU_DOMESTIC_OUTDOOR("/zboard/zboard.php?id=ppomppu&category=15", "등산/캠핑", true),
+    PPOMPPU_DOMESTIC_OUTDOOR("/zboard/zboard.php?id=ppomppu&category=15", "국내-등산/캠핑", true),
-    PPOMPPU_OVERSEA_ALL("/zboard/zboard.php?id=ppomppu4", "전체", false),
+    PPOMPPU_OVERSEA_ALL("/zboard/zboard.php?id=ppomppu4", "해외-전체", false),
-    PPOMPPU_OVERSEA_ETC("/zboard/zboard.php?id=ppomppu4&category=1", "기타", true),
+    PPOMPPU_OVERSEA_ETC("/zboard/zboard.php?id=ppomppu4&category=1", "해외-기타", true),
-    PPOMPPU_OVERSEA_APPLIANCES("/zboard/zboard.php?id=ppomppu4&category=7", "가전", true),
+    PPOMPPU_OVERSEA_APPLIANCES("/zboard/zboard.php?id=ppomppu4&category=7", "해외-가전", true),
-    PPOMPPU_OVERSEA_TVAV("/zboard/zboard.php?id=ppomppu4&category=8", "TV/영상", true),
+    PPOMPPU_OVERSEA_TVAV("/zboard/zboard.php?id=ppomppu4&category=8", "해외-TV/영상", true),
-    PPOMPPU_OVERSEA_COMPUTER("/zboard/zboard.php?id=ppomppu4&category=3", "컴퓨터", true),
+    PPOMPPU_OVERSEA_COMPUTER("/zboard/zboard.php?id=ppomppu4&category=3", "해외-컴퓨터", true),
-    PPOMPPU_OVERSEA_DIGITAL("/zboard/zboard.php?id=ppomppu4&category=4", "디지털", true),
+    PPOMPPU_OVERSEA_DIGITAL("/zboard/zboard.php?id=ppomppu4&category=4", "해외-디지털", true),
-    PPOMPPU_OVERSEA_MOBILEACCESSORY("/zboard/zboard.php?id=ppomppu4&category=9", "액세서리", true),
+    PPOMPPU_OVERSEA_MOBILEACCESSORY("/zboard/zboard.php?id=ppomppu4&category=9", "해외-액세서리", true),
-    PPOMPPU_OVERSEA_CLOTHES("/zboard/zboard.php?id=ppomppu4&category=5", "의류/잡화", true),
+    PPOMPPU_OVERSEA_CLOTHES("/zboard/zboard.php?id=ppomppu4&category=5", "해외-의류/잡화", true),
-    PPOMPPU_OVERSEA_WATCH("/zboard/zboard.php?id=ppomppu4&category=2", "시계", true),
+    PPOMPPU_OVERSEA_WATCH("/zboard/zboard.php?id=ppomppu4&category=2", "해외-시계", true),
-    PPOMPPU_OVERSEA_SHOES("/zboard/zboard.php?id=ppomppu4&category=11", "신발", true),
+    PPOMPPU_OVERSEA_SHOES("/zboard/zboard.php?id=ppomppu4&category=11", "해외-신발", true),
-    PPOMPPU_OVERSEA_FOOD("/zboard/zboard.php?id=ppomppu4&category=10", "식품/건강", true),
+    PPOMPPU_OVERSEA_FOOD("/zboard/zboard.php?id=ppomppu4&category=10", "해외-식품/건강", true),
-    PPOMPPU_OVERSEA_PARENTING("/zboard/zboard.php?id=ppomppu4&category=6", "육아", true),
+    PPOMPPU_OVERSEA_PARENTING("/zboard/zboard.php?id=ppomppu4&category=6", "해외-육아", true),
     ;
 
     private String resourcePath;

support/src/main/java/com/myoa/engineering/crawl/ppomppu/support/util/DateUtil.java

@@ -0,0 +1,18 @@
+package com.myoa.engineering.crawl.ppomppu.support.util;
+
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * DateUtil
+ * @author Shin Woo-jin (woo-jin.shin@linecorp.com)
+ * @since 2022-01-02
+ *
+ */
+public final class DateUtil {
+
+    private DateUtil() {    }
+
+    public static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yy.MM.dd HH:mm:ss")
+                                                                                  .withZone(ZoneId.of("Asia/Seoul"));
+}

support/src/main/java/com/myoa/engineering/crawl/ppomppu/support/util/ObjectMapperFactory.java

@@ -2,6 +2,7 @@ package com.myoa.engineering.crawl.ppomppu.support.util;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser.Feature;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
@@ -58,6 +59,15 @@ public final class ObjectMapperFactory {
         return objectMapper;
     }
 
+    public static String writeAsString(Object o) {
+        try {
+            return defaultMapper().writeValueAsString(o);
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
 
     /**
      * Copy from {@link GenericJackson2JsonRedisSerializer.NullValueSerializer}.