Skip to content

Commit ee382d3

Browse files
committed
CLAP-150 Fix: 웹훅 및 이메일 관련 설정들 환경변수화
<footer> - 관련: #123
1 parent 2326a5c commit ee382d3

File tree

5 files changed

+33
-36
lines changed

5 files changed

+33
-36
lines changed

src/main/java/clap/server/adapter/outbound/api/AgitClient.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import clap.server.adapter.outbound.api.dto.SendAgitRequest;
44
import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
55
import clap.server.application.port.outbound.webhook.SendAgitPort;
6-
import clap.server.common.annotation.architecture.PersistenceAdapter;
6+
import clap.server.common.annotation.architecture.ExternalApiAdapter;
77
import lombok.RequiredArgsConstructor;
88
import org.springframework.beans.factory.annotation.Value;
99
import org.springframework.http.HttpEntity;
@@ -12,12 +12,12 @@
1212
import org.springframework.web.client.RestTemplate;
1313

1414

15-
@PersistenceAdapter
15+
@ExternalApiAdapter
1616
@RequiredArgsConstructor
1717
public class AgitClient implements SendAgitPort {
1818

19-
@Value("${agit.url}")
20-
private String AGITWEBHOOK_URL;
19+
@Value("${webhook.agit.url}")
20+
private String AGIT_WEBHOOK_URL;
2121

2222
@Override
2323
public void sendAgit(SendAgitRequest request) {
@@ -48,6 +48,6 @@ else if (request.notificationType() == NotificationType.PROCESSOR_CHANGED) {
4848
HttpEntity<String> entity = new HttpEntity<>(payload, headers);
4949

5050
// Post 요청
51-
restTemplate.exchange(AGITWEBHOOK_URL, HttpMethod.POST, entity, String.class);
51+
restTemplate.exchange(AGIT_WEBHOOK_URL, HttpMethod.POST, entity, String.class);
5252
}
5353
}

src/main/java/clap/server/adapter/outbound/api/EmailClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import clap.server.adapter.outbound.api.dto.SendWebhookRequest;
44
import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
55
import clap.server.application.port.outbound.webhook.SendEmailPort;
6-
import clap.server.common.annotation.architecture.PersistenceAdapter;
6+
import clap.server.common.annotation.architecture.ExternalApiAdapter;
77
import clap.server.exception.ApplicationException;
88
import clap.server.exception.code.NotificationErrorCode;
99
import jakarta.mail.internet.MimeMessage;
@@ -13,7 +13,7 @@
1313
import org.thymeleaf.context.Context;
1414
import org.thymeleaf.spring6.SpringTemplateEngine;
1515

16-
@PersistenceAdapter
16+
@ExternalApiAdapter
1717
@RequiredArgsConstructor
1818
public class EmailClient implements SendEmailPort {
1919

src/main/java/clap/server/adapter/outbound/api/KakaoWorkClient.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import clap.server.adapter.outbound.api.dto.SendKakaoWorkRequest;
44
import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
55
import clap.server.application.port.outbound.webhook.SendKaKaoWorkPort;
6-
import clap.server.common.annotation.architecture.PersistenceAdapter;
6+
import clap.server.common.annotation.architecture.ExternalApiAdapter;
77
import clap.server.exception.ApplicationException;
88
import clap.server.exception.code.NotificationErrorCode;
99
import lombok.RequiredArgsConstructor;
@@ -13,14 +13,14 @@
1313
import org.springframework.http.HttpMethod;
1414
import org.springframework.web.client.RestTemplate;
1515

16-
@PersistenceAdapter
16+
@ExternalApiAdapter
1717
@RequiredArgsConstructor
1818
public class KakaoWorkClient implements SendKaKaoWorkPort {
1919

20-
@Value("${kakaowork.url}")
20+
@Value("${webhook.kakaowork.url}")
2121
private String kakaworkUrl;
2222

23-
@Value("${kakaowork.auth}")
23+
@Value("${webhook.kakaowork.auth}")
2424
private String kakaworkAuth;
2525

2626
private final ObjectBlockService makeObjectBlock;

src/main/resources/application.yml

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,11 @@ spring:
99
- auth.yml
1010
- elasticsearch.yml
1111
- s3.yml
12-
12+
- notifications.yml
1313
application:
1414
name: taskflow
1515
web.resources.add-mappings: false
1616

17-
# 구글 알림 이메일 발신자 정보 설정(논의 필요)
18-
mail:
19-
host: smtp.gmail.com
20-
port: 587
21-
username: leegd120@gmail.com
22-
password: znlictzarqurxlla
23-
properties:
24-
mail:
25-
smtp:
26-
auth: true
27-
starttls:
28-
enable: true
29-
30-
3117

3218
server:
3319
port: ${APPLICATION_PORT:8080}
@@ -45,15 +31,6 @@ web:
4531
local: ${TASKFLOW_LOCAL_WEB:127.0.0.1:5173}
4632
service: ${TASKFLOW_SERVICE_WEB:127.0.0.1:5173}
4733

48-
49-
# 카카오워크 및 agit url, accessKey값 환경 변수로 설정
50-
kakaowork:
51-
url: https://api.kakaowork.com/v1/messages.send_by_email
52-
auth: Bearer 1b01becc.a7f10da76d2e4038948771107cfe5c1d
53-
54-
agit:
55-
url: https://agit.io/webhook/a342181d-fb18-4eb0-a99a-30f4fb5b14b1
56-
5734
local: ${TASKFLOW_LOCAL_WEB:127.0.0.1:5173}
5835
service: ${TASKFLOW_SERVICE_WEB:127.0.0.1:5173}
5936

@@ -83,4 +60,4 @@ logging:
8360
spring.config.activate.on-profile: prod
8461
logging:
8562
level:
86-
root: INFO
63+
root: INFO
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#TODO 구글 알림 이메일 발신자 정보 설정(논의 필요)
2+
spring:
3+
mail:
4+
host: smtp.gmail.com
5+
port: 587
6+
username: ${MAIL_USERNAME}
7+
password: ${MAIL_PASSWORD}
8+
properties:
9+
mail:
10+
smtp:
11+
auth: true
12+
starttls:
13+
enable: true
14+
15+
webhook:
16+
kakaowork:
17+
url: ${KAKAOWORK_WEBHOOK_URL}
18+
auth: ${KAKAOWORK_WEBHOOK_AUTH}
19+
agit:
20+
url: ${AGIT_WEBHOOK_URL}

0 commit comments

Comments
 (0)