Compare commits
7 Commits
feature/NO
...
08737664f4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
08737664f4 | ||
| 4738b930df | |||
|
|
6d315e2a9f | ||
|
|
8eb431a812 | ||
|
|
520a651a70 | ||
|
|
7b230fdb74 | ||
|
|
b204b70b79 |
15
build.gradle
15
build.gradle
@@ -1,14 +1,13 @@
|
||||
plugins {
|
||||
id 'org.springframework.boot' version '2.5.4'
|
||||
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
|
||||
id 'java'
|
||||
id 'idea'
|
||||
id 'org.springframework.boot' version '3.2.5'
|
||||
id 'io.spring.dependency-management' version '1.1.4'
|
||||
}
|
||||
|
||||
group = 'com.myoa.engineering.crawl.ppomppu'
|
||||
version = '1.0.1'
|
||||
sourceCompatibility = JavaVersion.VERSION_21
|
||||
targetCompatibility = JavaVersion.VERSION_21
|
||||
version = '1.1.1'
|
||||
sourceCompatibility = '11'
|
||||
|
||||
configurations {
|
||||
compileOnly {
|
||||
@@ -21,8 +20,8 @@ repositories {
|
||||
}
|
||||
|
||||
allprojects {
|
||||
group = 'com.myoa.engineering.crawl.shopping'
|
||||
version = '2.0.0'
|
||||
group = 'com.myoa.engineering.crawl.ppomppu'
|
||||
version = '1.1.1'
|
||||
|
||||
apply plugin: 'java'
|
||||
apply plugin: 'idea'
|
||||
@@ -37,7 +36,7 @@ allprojects {
|
||||
}
|
||||
|
||||
ext {
|
||||
set('springCloudVersion', "2023.0.1")
|
||||
set('springCloudVersion', "2020.0.4")
|
||||
}
|
||||
|
||||
dependencyManagement {
|
||||
|
||||
3
copy.bat
Normal file
3
copy.bat
Normal file
@@ -0,0 +1,3 @@
|
||||
xcopy /y .\processor\build\libs\*.jar .\
|
||||
xcopy /y .\receiver\build\libs\*.jar .\
|
||||
xcopy /y .\sender\build\libs\*.jar .\
|
||||
@@ -0,0 +1,70 @@
|
||||
package com.myoa.engineering.crawl.ppomppu.processor.controller;
|
||||
|
||||
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;
|
||||
import com.myoa.engineering.crawl.ppomppu.processor.service.PpomppuFeedService;
|
||||
import com.myoa.engineering.crawl.ppomppu.support.dto.APIResponse;
|
||||
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 {
|
||||
|
||||
private final PpomppuFeedService ppomppuRSSFeedService;
|
||||
private final PpomppuArticleService ppomppuArticleService;
|
||||
private final MessageSenderService messageSenderService;
|
||||
|
||||
public CrawlAPIController(PpomppuFeedService ppomppuRSSFeedService,
|
||||
PpomppuArticleService ppomppuArticleService,
|
||||
MessageSenderService messageSenderService) {
|
||||
this.ppomppuRSSFeedService = ppomppuRSSFeedService;
|
||||
this.ppomppuArticleService = ppomppuArticleService;
|
||||
this.messageSenderService = messageSenderService;
|
||||
}
|
||||
|
||||
@PostMapping("/boards/{boardName}")
|
||||
public Mono<APIResponse<FeedParsedResult>> crawlBoard(@PathVariable("boardName") PpomppuBoardName boardName) {
|
||||
log.info("got request... {}", boardName);
|
||||
FeedParsedResult result = FeedParsedResult.of(boardName);
|
||||
|
||||
Mono<String> publishedMessages =
|
||||
ppomppuRSSFeedService.getArticles(boardName)
|
||||
.map(e -> ppomppuArticleService.filterOnlyNewArticles(boardName, e))
|
||||
.map(e -> ppomppuArticleService.save(boardName, e))
|
||||
.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);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,78 @@
|
||||
package com.myoa.engineering.crawl.ppomppu.processor.dto;
|
||||
|
||||
import org.jsoup.nodes.Element;
|
||||
import org.jsoup.select.Elements;
|
||||
|
||||
import com.myoa.engineering.crawl.ppomppu.processor.domain.PpomppuArticle;
|
||||
import com.myoa.engineering.crawl.ppomppu.support.dto.code.PpomppuBoardName;
|
||||
|
||||
/**
|
||||
* PpomppuArticleTransformer
|
||||
*
|
||||
* @author Shin Woo-jin (woozu.shin@kakaoent.com)
|
||||
* @since 2021-09-08
|
||||
*/
|
||||
public final class PpomppuArticleParser {
|
||||
|
||||
private PpomppuArticleParser() {}
|
||||
|
||||
public static PpomppuArticle toArticle(Elements articleElement) {
|
||||
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 String thumbnailUrl = PpomppuArticleParser.parseThumbnailUrl(articleElement.get(3));
|
||||
final Integer recommended = PpomppuArticleParser.parseRecommended(articleElement.get(6));
|
||||
final String hitString = PpomppuArticleParser.parseHit(articleElement.get(7));
|
||||
final String registeredAtString = PpomppuArticleParser.parseRegisteredAt(articleElement.get(5));
|
||||
|
||||
return PpomppuArticleParseDTO.builder()
|
||||
.articleId(articleIdString)
|
||||
.title(title)
|
||||
.articleUrl(articleUrl)
|
||||
.thumbnailUrl(thumbnailUrl)
|
||||
.recommended(recommended)
|
||||
.hit(hitString)
|
||||
.registeredAt(registeredAtString)
|
||||
.build()
|
||||
.convert();
|
||||
}
|
||||
|
||||
public static String parseArticleId(Element td) {
|
||||
return td.text().trim();
|
||||
}
|
||||
|
||||
public static String parseTitle(Element td) {
|
||||
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;
|
||||
|
||||
if (voteString.isEmpty()) {
|
||||
recommended = 0;
|
||||
} else {
|
||||
final int voteUp = Integer.parseInt(td.text().split(" - ")[0]);
|
||||
final int voteDown = Integer.parseInt(td.text().split(" - ")[1]);
|
||||
recommended = voteUp - voteDown;
|
||||
}
|
||||
return recommended;
|
||||
}
|
||||
|
||||
public static String parseHit(Element td) {
|
||||
return td.text();
|
||||
}
|
||||
|
||||
public static String parseRegisteredAt(Element td) {
|
||||
return td.attr("title");
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
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;
|
||||
|
||||
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 = 600 * 1000L)
|
||||
public void emitBoards() {
|
||||
log.info("[emitDomesticBoard] trigger fired!");
|
||||
Arrays.stream(PpomppuBoardName.values())
|
||||
.filter(PpomppuBoardName::isCrawlWithDefaultTimer)
|
||||
.forEach(boardName -> processorAPIService.emitParseEvent(boardName).block());
|
||||
}
|
||||
}
|
||||
6
receiver/src/main/resources/application-production.yml
Normal file
6
receiver/src/main/resources/application-production.yml
Normal file
@@ -0,0 +1,6 @@
|
||||
spring:
|
||||
config:
|
||||
activate:
|
||||
on-profile: production
|
||||
import:
|
||||
- "configserver:http://ppn-config-server:20080"
|
||||
25
receiver/src/main/resources/application.yml
Normal file
25
receiver/src/main/resources/application.yml
Normal file
@@ -0,0 +1,25 @@
|
||||
spring:
|
||||
application:
|
||||
name: ppn-receiver
|
||||
main:
|
||||
allow-bean-definition-overriding: true
|
||||
profiles:
|
||||
active: ${SPRING_ACTIVE_PROFILE:local}
|
||||
group:
|
||||
local: "local,webclient-local"
|
||||
development: "development,webclient-development"
|
||||
production: "production,webclient-production"
|
||||
freemarker:
|
||||
enabled: false
|
||||
|
||||
server:
|
||||
port: 20080
|
||||
error:
|
||||
whitelabel:
|
||||
enabled: false
|
||||
|
||||
management:
|
||||
endpoints:
|
||||
web:
|
||||
exposure:
|
||||
include: refresh,health
|
||||
@@ -0,0 +1,62 @@
|
||||
package com.myoa.engineering.crawl.ppomppu.sender.controller;
|
||||
|
||||
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;
|
||||
|
||||
/**
|
||||
* MessageSenderAPIController
|
||||
* @author Shin Woo-jin (woo-jin.shin@linecorp.com)
|
||||
* @since 2021-11-21
|
||||
*
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequestMapping("/api/v1")
|
||||
public class MessageSenderAPIController {
|
||||
|
||||
private final MongeShoppingBotSlackMessageSender sender;
|
||||
|
||||
public MessageSenderAPIController(MongeShoppingBotSlackMessageSender sender) {
|
||||
this.sender = sender;
|
||||
}
|
||||
|
||||
@PostMapping("/messages/sendSimpleMessage/messengers/slack")
|
||||
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;
|
||||
}
|
||||
}
|
||||
25
sender/src/main/resources/application.yml
Normal file
25
sender/src/main/resources/application.yml
Normal file
@@ -0,0 +1,25 @@
|
||||
spring:
|
||||
application:
|
||||
name: ppn-sender
|
||||
main:
|
||||
allow-bean-definition-overriding: true
|
||||
profiles:
|
||||
active: ${SPRING_ACTIVE_PROFILE:local}
|
||||
group:
|
||||
local: "local,slackapi-local,webclient-local"
|
||||
development: "development,slackapi-development,webclient-development"
|
||||
production: "production,slackapi-production,webclient-production"
|
||||
freemarker:
|
||||
enabled: false
|
||||
|
||||
server:
|
||||
port: 20080
|
||||
error:
|
||||
whitelabel:
|
||||
enabled: false
|
||||
|
||||
management:
|
||||
endpoints:
|
||||
web:
|
||||
exposure:
|
||||
include: refresh,health
|
||||
@@ -1,16 +1,19 @@
|
||||
package com.myoa.engineering.crawl.shopping.domain.entity.v1;
|
||||
package com.myoa.engineering.crawl.ppomppu.processor.domain;
|
||||
|
||||
import com.myoa.engineering.crawl.shopping.domain.entity.Auditable;
|
||||
import com.myoa.engineering.crawl.shopping.support.dto.constant.PpomppuBoardName;
|
||||
import jakarta.persistence.*;
|
||||
import com.myoa.engineering.crawl.ppomppu.support.dto.code.PpomppuBoardName;
|
||||
import java.time.Instant;
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.EnumType;
|
||||
import javax.persistence.Enumerated;
|
||||
import javax.persistence.GeneratedValue;
|
||||
import javax.persistence.GenerationType;
|
||||
import javax.persistence.Id;
|
||||
import javax.persistence.Table;
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.ToString;
|
||||
|
||||
import java.time.ZonedDateTime;
|
||||
|
||||
@ToString
|
||||
@Getter
|
||||
@NoArgsConstructor
|
||||
@Entity
|
||||
@@ -31,6 +34,9 @@ public class PpomppuArticle extends Auditable {
|
||||
@Column
|
||||
private String articleUrl;
|
||||
|
||||
@Column
|
||||
private String thumbnailUrl;
|
||||
|
||||
@Column
|
||||
private String title;
|
||||
|
||||
@@ -41,19 +47,25 @@ public class PpomppuArticle extends Auditable {
|
||||
private Integer recommended;
|
||||
|
||||
@Column
|
||||
private ZonedDateTime registeredAt;
|
||||
private Instant registeredAt;
|
||||
|
||||
@Builder
|
||||
public PpomppuArticle(Long id, Long articleId, PpomppuBoardName boardName, String articleUrl,
|
||||
String title, Integer recommended, Integer hit, ZonedDateTime 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;
|
||||
this.registeredAt = registeredAt;
|
||||
}
|
||||
|
||||
public PpomppuArticle updateBoardName(PpomppuBoardName boardName) {
|
||||
this.boardName = boardName;
|
||||
return this;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
package com.myoa.engineering.crawl.shopping.dto;
|
||||
|
||||
/**
|
||||
* PpomppuArticle
|
||||
*
|
||||
* @author Shin Woo-jin (woozu.shin@kakaoent.com)
|
||||
* @since 2021-09-08
|
||||
*/
|
||||
public class PpomppuArticleDTO {
|
||||
}
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
@@ -1,53 +1,70 @@
|
||||
package com.myoa.engineering.crawl.shopping.dto;
|
||||
|
||||
import com.myoa.engineering.crawl.shopping.domain.entity.v1.PpomppuArticle;
|
||||
import com.myoa.engineering.crawl.shopping.support.dto.SimpleMessageDTO;
|
||||
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
|
||||
*
|
||||
* @author Shin Woo-jin (woo-jin.shin@linecorp.com)
|
||||
* @since 2021-11-21
|
||||
*
|
||||
*/
|
||||
public final class PpomppuArticleTransformer {
|
||||
|
||||
private 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*_";
|
||||
|
||||
public static final Function<PpomppuArticle, SimpleMessageDTO> TRANSFORM_TO_MESSAGE_DTO = article ->
|
||||
SimpleMessageDTO.builder()
|
||||
.requestedAt(Instant.now())
|
||||
.publishedAt(article.getRegisteredAt())
|
||||
.title(String.format(MESSAGE_FORMAT_V1,
|
||||
article.getBoardName().getMenuName(), article.getArticleUrl(),
|
||||
article.getTitle()))
|
||||
.body(article.getArticleUrl())
|
||||
.build();
|
||||
|
||||
private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
|
||||
.withZone(ZoneId.of("Asia/Seoul"));
|
||||
/*
|
||||
public static final Function<PpomppuArticle, SimpleMessageDTO> TRANSFORM_TO_MESSAGE_DTO = entity ->
|
||||
SimpleMessageDTO.builder()
|
||||
.requestedAt(Instant.now())
|
||||
.publishedAt(entity.getRegisteredAt())
|
||||
.title(String.format(MESSAGE_FORMAT_V1, entity.getBoardName().getMenuName(), entity.getTitle()))
|
||||
.body(entity.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,
|
||||
article.getBoardName().getMenuName(), article.getTitle(), article.getArticleUrl());
|
||||
return String.format(MESSAGE_FORMAT_V2,
|
||||
article.getBoardName().getMenuName(), article.getArticleUrl(), article.getTitle());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
@@ -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();
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
@@ -1,6 +1,11 @@
|
||||
package com.myoa.engineering.crawl.shopping.dto.slack;
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,23 @@
|
||||
package com.myoa.engineering.crawl.shopping.infra.client;
|
||||
package com.myoa.engineering.crawl.ppomppu.processor.infrastructure.client;
|
||||
|
||||
import org.springframework.core.ParameterizedTypeReference;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import org.springframework.http.MediaType;
|
||||
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.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;
|
||||
import com.myoa.engineering.crawl.ppomppu.support.webclient.properties.WebClientProperties;
|
||||
import com.myoa.engineering.crawl.ppomppu.support.webclient.properties.WebClientProperties.WebClientPropertiesUnit;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Component;
|
||||
import reactor.core.publisher.Mono;
|
||||
import reactor.core.scheduler.Schedulers;
|
||||
|
||||
/**
|
||||
* PpomppuNotifierSenderAPIClient
|
||||
@@ -12,7 +28,7 @@ import org.springframework.stereotype.Component;
|
||||
@Slf4j
|
||||
@Component
|
||||
public class MessageSenderAPIClient {
|
||||
/*
|
||||
|
||||
private final WebClient webClient;
|
||||
|
||||
public MessageSenderAPIClient(WebClientProperties webClientProperties) {
|
||||
@@ -27,9 +43,9 @@ 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())
|
||||
@@ -39,5 +55,16 @@ public class MessageSenderAPIClient {
|
||||
});
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
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())
|
||||
.onErrorResume(WebClientRequestException.class, t -> {
|
||||
log.info("Exception occured, ignoring. : {}", t.getClass().getSimpleName());
|
||||
return Mono.empty();
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -1,25 +1,26 @@
|
||||
package com.myoa.engineering.crawl.shopping.infra.client.slack;
|
||||
package com.myoa.engineering.crawl.ppomppu.sender.infrastructure.client;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import com.myoa.engineering.crawl.shopping.configuration.slack.properties.SlackSecretProperties;
|
||||
import com.myoa.engineering.crawl.shopping.dto.slack.SlackMessageDTO;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
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;
|
||||
|
||||
@Slf4j
|
||||
@Component
|
||||
public class MongeShoppingBotSlackMessageSender {
|
||||
public class MongeShoppingBotSlackMessageSender extends SlackMessageSender {
|
||||
|
||||
private static final String SLACK_SECRET_UNIT_NAME = "shopping-crawler";
|
||||
private static final String SLACK_SECRET_UNIT_NAME = "monge_shopping_bot";
|
||||
|
||||
private final SlackSecretProperties.SlackSecretPropertiesUnit slackProperties;
|
||||
private final SlackAPIClient slackAPIClient;
|
||||
private final String token;
|
||||
private final SlackSecretPropertiesUnit slackProperties;
|
||||
|
||||
public MongeShoppingBotSlackMessageSender(SlackAPIClient slackAPIClient,
|
||||
SlackSecretProperties slackSecretProperties) {
|
||||
this.slackAPIClient = slackAPIClient;
|
||||
public MongeShoppingBotSlackMessageSender(SlackSecretProperties slackSecretProperties) {
|
||||
super(slackSecretProperties.find(SLACK_SECRET_UNIT_NAME).getToken());
|
||||
this.slackProperties = slackSecretProperties.find(SLACK_SECRET_UNIT_NAME);
|
||||
this.token = slackProperties.getToken();
|
||||
}
|
||||
|
||||
public SlackMessageDTO ofMessageTemplate() {
|
||||
@@ -38,4 +39,14 @@ public class MongeShoppingBotSlackMessageSender {
|
||||
.text(text)
|
||||
.build();
|
||||
}
|
||||
|
||||
public SlackMessageDTO ofBlockMessageBased() {
|
||||
return SlackMessageDTO.builder()
|
||||
.channel(slackProperties.getChannel())
|
||||
.iconEmoji(slackProperties.getIconEmoji())
|
||||
.username(slackProperties.getUsername())
|
||||
.blocks(new ArrayList<>())
|
||||
.build();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -23,6 +23,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();
|
||||
}
|
||||
@@ -37,7 +38,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));
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
@@ -1,7 +1,16 @@
|
||||
package com.myoa.engineering.crawl.shopping.service;
|
||||
package com.myoa.engineering.crawl.ppomppu.processor.service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
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 org.springframework.stereotype.Service;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
/**
|
||||
* MessageSenderService
|
||||
@@ -13,20 +22,23 @@ import org.springframework.stereotype.Service;
|
||||
@Service
|
||||
public class MessageSenderService {
|
||||
|
||||
/*
|
||||
private final MessageSenderAPIClient messageSenderAPIClient;
|
||||
|
||||
public MessageSenderService(MessageSenderAPIClient messageSenderAPIClient) {
|
||||
this.messageSenderAPIClient = messageSenderAPIClient;
|
||||
}
|
||||
|
||||
public String sendMessageToSlack(PpomppuArticle article) {
|
||||
return messageSenderAPIClient.sendMessageToSlack(PpomppuArticleTransformer.TRANSFORM_TO_MESSAGE_DTO.apply(article));
|
||||
public Mono<String> sendSimpleMessageToSlack(PpomppuArticle article) {
|
||||
return messageSenderAPIClient.sendSimpleMessageToSlack(PpomppuArticleTransformer.TRANSFORM_TO_MESSAGE_DTO.apply(article));
|
||||
}
|
||||
|
||||
public String sendMessageToSlack(List<PpomppuArticle> articles) {
|
||||
return messageSenderAPIClient.sendMessageToSlack(PpomppuArticleTransformer.transform(articles));
|
||||
public Mono<String> sendSimpleMessageToSlack(List<PpomppuArticle> articles) {
|
||||
return messageSenderAPIClient.sendSimpleMessageToSlack(PpomppuArticleTransformer.transformToSimpleMessage(articles));
|
||||
}
|
||||
|
||||
public Mono<String> sendBlockMessageToSlack(PpomppuBoardName boardName, List<PpomppuArticle> articles) {
|
||||
return messageSenderAPIClient.sendBlockMessageToSlack(
|
||||
PpomppuArticleTransformer.transformToBlockMessage(boardName, articles));
|
||||
}
|
||||
*/
|
||||
|
||||
}
|
||||
|
||||
@@ -48,7 +48,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);
|
||||
|
||||
@@ -1,12 +1,20 @@
|
||||
package com.myoa.engineering.crawl.shopping.service;
|
||||
package com.myoa.engineering.crawl.ppomppu.processor.service;
|
||||
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
|
||||
import com.myoa.engineering.crawl.shopping.support.dto.constant.PpomppuBoardName;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.jsoup.Jsoup;
|
||||
import org.jsoup.nodes.Element;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.List;
|
||||
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 lombok.extern.slf4j.Slf4j;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
/**
|
||||
* PpomppuFeedService
|
||||
@@ -17,7 +25,7 @@ import java.util.List;
|
||||
@Slf4j
|
||||
@Component
|
||||
public class PpomppuFeedService {
|
||||
/*
|
||||
|
||||
private final PpomppuBoardFeedRetriever ppomppuBoardFeedRetriever;
|
||||
|
||||
public PpomppuFeedService(PpomppuBoardFeedRetriever ppomppuBoardFeedRetriever) {
|
||||
@@ -27,9 +35,12 @@ public class PpomppuFeedService {
|
||||
public Mono<List<PpomppuArticle>> getArticles(PpomppuBoardName boardName) {
|
||||
final Mono<String> html = ppomppuBoardFeedRetriever.getHtml(boardName.getResourcePath());
|
||||
final Mono<Element> tbody = extractTbodyFromHtml(html);
|
||||
// .doOnNext(e -> log.info("pre tbody - {}", e.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();
|
||||
}
|
||||
@@ -52,6 +63,4 @@ public class PpomppuFeedService {
|
||||
private PpomppuArticle convertFromElement(Element element) {
|
||||
return PpomppuArticleParser.toArticle(element.getElementsByTag("td"));
|
||||
}
|
||||
|
||||
*/
|
||||
}
|
||||
|
||||
@@ -2,11 +2,11 @@ spring:
|
||||
config:
|
||||
activate:
|
||||
on-profile: development
|
||||
# import:
|
||||
# - "configserver:http://192.168.0.100:20085"
|
||||
import:
|
||||
- "configserver:http://192.168.0.100:11080"
|
||||
|
||||
|
||||
server:
|
||||
port: 20080
|
||||
port: 20081
|
||||
|
||||
# import: optional:configserver:http://localhost:11080 # can be start up even config server was not found.
|
||||
@@ -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
|
||||
cloud:
|
||||
@@ -25,4 +25,4 @@ management:
|
||||
endpoints:
|
||||
web:
|
||||
exposure:
|
||||
include: refresh
|
||||
include: refresh,health
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
package com.myoa.engineering.crawl.ppomppu.support.dto.code;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
/**
|
||||
* PpomppuBoardName
|
||||
*
|
||||
* @author Shin Woo-jin (woo-jin.shin@linecorp.com)
|
||||
* @since 2021-09-05
|
||||
*/
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public enum PpomppuBoardName {
|
||||
PPOMPPU_DOMESTIC_ALL("/zboard/zboard.php?id=ppomppu", "국내-전체", false),
|
||||
PPOMPPU_DOMESTIC_ETC("/zboard/zboard.php?id=ppomppu&category=1", "국내-기타", 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_FOOD("/zboard/zboard.php?id=ppomppu&category=6", "국내-식품/건강", 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_PARENTING("/zboard/zboard.php?id=ppomppu&category=10", "국내-육아", 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_COSMETIC("/zboard/zboard.php?id=ppomppu&category=13", "국내-화장품", true),
|
||||
PPOMPPU_DOMESTIC_OUTDOOR("/zboard/zboard.php?id=ppomppu&category=15", "국내-등산/캠핑", true),
|
||||
PPOMPPU_OVERSEA_ALL("/zboard/zboard.php?id=ppomppu4", "해외-전체", false),
|
||||
PPOMPPU_OVERSEA_ETC("/zboard/zboard.php?id=ppomppu4&category=1", "해외-기타", 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_COMPUTER("/zboard/zboard.php?id=ppomppu4&category=3", "해외-컴퓨터", 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_CLOTHES("/zboard/zboard.php?id=ppomppu4&category=5", "해외-의류/잡화", 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_FOOD("/zboard/zboard.php?id=ppomppu4&category=10", "해외-식품/건강", true),
|
||||
PPOMPPU_OVERSEA_PARENTING("/zboard/zboard.php?id=ppomppu4&category=6", "해외-육아", true),
|
||||
;
|
||||
|
||||
private String resourcePath;
|
||||
private String menuName;
|
||||
private boolean crawlWithDefaultTimer;
|
||||
|
||||
public static final String PPOMPPU_URL = "https://www.ppomppu.co.kr";
|
||||
|
||||
public static String ofViewPageUrl(String articleUrl) {
|
||||
return PPOMPPU_URL + "/zboard/" + articleUrl;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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"));
|
||||
}
|
||||
@@ -2,6 +2,7 @@ package com.myoa.engineering.crawl.shopping.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}.
|
||||
|
||||
Reference in New Issue
Block a user