Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: handle proxy error #184

Merged
merged 72 commits into from
Feb 22, 2024
Merged

Fix: handle proxy error #184

merged 72 commits into from
Feb 22, 2024

Conversation

Hejow
Copy link
Member

@Hejow Hejow commented Feb 22, 2024

๐Ÿ” ์–ด๋–ค PR์ธ๊ฐ€์š”?

  • ํ”„๋ก์‹œ ์—๋Ÿฌ ๊ธด๊ธ‰ PR์ž…๋‹ˆ๋‹ค.

kys0411 and others added 30 commits January 31, 2024 18:47
@kys0411
Add: ๋น„์†์–ด ํ•„ํ„ฐ๋ง ๊ธฐ๋Šฅ ์ถ”๊ฐ€
481f4a2
@kys0411
Update: ๋น„์†์–ด ํ•„ํ„ฐ ๊ฒฐ๊ณผ์— ์†์„ฑ๊ฐ’ ์ถ”๊ฐ€
5c7f3b3
@kys0411
Chore: ํ•„๋“œ ๋„ค์ด๋ฐ ์ˆ˜์ •
7dc84bb
@kys0411
Chore: dto ๋„ค์ด๋ฐ ์ˆ˜์ •
d7c0eed
@kys0411
Refactor: banWord static ๋ณ€์ˆ˜๋กœ ์ˆ˜์ •
02115a2
@kys0411
Update: banWord๋ฅผ ๊ฒ€์ฆํ•  ๋•Œ ์ค‘๋ณต๋œ ๋‹จ์–ด ๊ฒ€์‚ฌ ์ ์šฉ
ed01a11
@kys0411
Chore: dependency ์„ค๋ช… ์ฃผ์„ ์ˆ˜์ •
865a2b7
@kys0411
Chore: ๋ถˆํ•„์š”ํ•œ ์–ด๋…ธํ…Œ์ด์…˜ ์ œ๊ฑฐ
fbb3ff5
@kys0411
Chore: ๋น„์†์–ด ํ•„ํ„ฐ๋ง ๋ฆฌํ„ด ํƒ€์ž… ์ˆ˜์ •
3f97107
@kys0411
Chore: ๋น„์†์–ด request ์œ ํšจ์„ฑ ๊ฒ€์ฆ ์ถ”๊ฐ€
32a828f
@kys0411
Test: ValidateContentService ํ…Œ์ŠคํŠธ ์ฝ”๋“œ ์ถ”๊ฐ€
66769da
@kys0411
Chore: ๋น„์†์–ด ๊ฒ€์ฆ ์‘๋‹ต ํ•„๋“œ ์ˆ˜์ •
8d41214
@kys0411
Chore: WordBundle ์ ‘๊ทผ์ง€์ •์ž ๋ณ€๊ฒฝ
4f8e5a9
@kys0411
Add: ๋น„์†์–ด ํ•„ํ„ฐ๋ง ๊ธฐ๋Šฅ ์ถ”๊ฐ€ (#171)
bcc7ac7 
<!-- PR ๋‚ด์šฉ
์–ด๋–ค ์ž‘์—…์„ ํ–ˆ๋Š”์ง€ ์ž‘์„ฑํ•ด์ฃผ์„ธ์š”!
PR์ด ๋„ˆ๋ฌด ํฌ๋ฉด ๋„ˆ๋ฌด ๋งŽ์€ ๋‚ด์šฉ์ด ๋“ค์–ด๊ฐ€๊ฒ ์ฃ ? -->
# ๐Ÿ” ์–ด๋–ค PR์ธ๊ฐ€์š”?
- ๋น„์†์–ด ํ•„ํ„ฐ๋ง ๊ธฐ๋Šฅ์„ ์ถ”๊ฐ€ํ•˜์˜€์Šต๋‹ˆ๋‹ค.
- ๊ณ„ํš ์ž‘์„ฑ ์ค‘ ์ œ๋ชฉ๊ณผ ๋‚ด์šฉ์„ ๊ฒ€์ฆํ•  ์ˆ˜ ์žˆ๋Š” api๋ฅผ ์ถ”๊ฐ€ํ•˜์˜€์Šต๋‹ˆ๋‹ค.

<!-- ๋ฆฌ๋ทฐ์–ด์—๊ฒŒ
์–ด๋–ค ๋ถ€๋ถ„์„ ์ž์„ธํ•˜๊ฒŒ ๋ฆฌ๋ทฐํ• ์ง€ ์„œ์ˆ ํ•ด์ฃผ์„ธ์š”. -->
# ๐Ÿ˜‹ To Reviewer
- ํ—ˆ์šฉ ๋‹จ์–ด๋Š” ์ดํ›„์— ์ถ”๊ฐ€ํ•˜๊ฒ ์Šต๋‹ˆ๋‹ค!
- wordBundle ํด๋ž˜์Šค์˜ ์œ„์น˜๊ฐ€ ๊ณ ๋ฏผ๋ฉ๋‹ˆ๋‹ค,,

<!-- ํ…Œ์ŠคํŠธ 
๋ฐ˜์˜ํ•œ ํ…Œ์ŠคํŠธ ๋ฉ”์„œ๋“œ ์ด๋ฆ„๊ณผ ์–ด๋–ค ํ…Œ์ŠคํŠธ๋ฅผ ํ–ˆ๋Š”์ง€ ์ž‘์„ฑํ•ด์ฃผ์„ธ์š”.
(ex. save_Fail_ByDuplicateEmail) -->
# โœ… ์ž‘์„ฑํ•œ ํ…Œ์ŠคํŠธ
- [x] badWordFilter_Success
- [x] badWordFilter_Success_WithoutBanWord
- [x] badWordFilter_Success_WithIgnoreOverlaps
- [x] validateContent_Success
- [x] validateContent_Success_WithoutBanWord 
- [x] validateContent_Success(controller test)

<!-- ๊ด€๋ จ ์ด์Šˆ
ํ”„๋ก ํŠธ์—์„œ ์ž‘์„ฑํ•ด์ค€ ์ด์Šˆ์™€ ์—ฐ๊ด€๋˜๋Š” PR์ด๋ผ๋ฉด 
์ฃผ์„์„ ํ’€๊ณ  ์ž‘์„ฑํ•ด์ฃผ์„ธ์š”! --> 

[//]: # (# ๐Ÿซก ๊ด€๋ จ Issue )
@Hejow
Merge: up-to-date prod branch
c0c4d87
@Hejow
Add(.util): apply aop, add security util
effa79f
@Hejow
Chore: change root directory path
67ed5b8
@Hejow
Chore(.utils): add java-doc
da65b9e
@Hejow
Chore(.test): change scan root path
83efadf
@Hejow
Merge: add security util, fix authorization AOP, change root directorโ€ฆ
9b5a031 
โ€ฆy path (#175)

Merge: add security util, fix authorization AOP, change root directory path
@kys0411
Refactor: plan ๋„๋ฉ”์ธ ํ—ฅ์‚ฌ๊ณ ๋‚  ์•„ํ‚คํ…์ฒ˜ ์ ์šฉ
2f46f98
@kys0411
Rename: remind ๋„๋ฉ”์ธ์— ๋งž๊ฒŒ ํด๋ž˜์Šค ์ด๋ฆ„ ๋ณ€๊ฒฝ
1053115
@kys0411
Chore: ์‚ฌ์šฉํ•˜์ง€ ์•Š๋Š” ๋ฉ”์„œ๋“œ ์‚ญ์ œ
a5659ad
@kys0411
Delete: ์ปจ๋ฒค์…˜์— ๋งž๊ฒŒ ๋ถˆํ•„์š”ํ•œ ํด๋ž˜์Šค ์‚ญ์ œ
abebc23
@kys0411
Chore: ์‚ฌ์šฉํ•˜์ง€ ์•Š๋Š” ํ•„๋“œ ์‚ญ์ œ
948432e
@kys0411
Delete: ๋ถˆํ•„์š”ํ•œ ํด๋ž˜์Šค ์‚ญ์ œ
5213234
@kys0411
Refactor: validate use case ์ถ”๊ฐ€
405a1a6
@kys0411
Chore: ์ค‘๋ณต ๋ฉ”์„œ๋“œ ์‚ญ์ œ
4b00b9d
@kys0411
Chore: ๋นŒ๋“œ ์˜ค๋ฅ˜ ์ˆ˜์ •
0ea401e
@kys0411
Chore: ํด๋ž˜์Šค ์ ‘๊ทผ์ง€์ •์ž package private ํ•˜๊ฒŒ ๋ณ€๊ฒฝ
7e07297
Hejow and others added 24 commits February 15, 2024 22:50
@Hejow
Chore(.auth): separate mock login api
7aa52b9
@Hejow
Chore(.ses): change email image link
b74add0
@Hejow
Refactor(.auth): separate generating request on oauth authorize
3f9393e
@Hejow
Refactor(.auth): move generating header from disconnect oauth
8ed35d7
@Hejow
Add(.test): custom assertion
874339b
@Hejow
Fix: checkStyle convention error
b783408
@Hejow
Refactor(.jwt): delete validator, add cache interface, rearrange codes
b90cb94
@Hejow
Update(.jwt): rename cache to storage
e801358
@Hejow
Chore(.ses): resize email image
a9a2ec0
@Hejow
Refactor(.user): separate cache dependency from user
b963ab6
@Hejow
Chore(.cache): rename method
fe9ff15
@Hejow
Fix(.test): code too long convention fail
347a1da
@Hejow
Merge: separate cache dependencies on modules, feat custom assertion (#โ€ฆ
7230b01 
โ€ฆ179)

<!-- PR ๋‚ด์šฉ
์–ด๋–ค ์ž‘์—…์„ ํ–ˆ๋Š”์ง€ ์ž‘์„ฑํ•ด์ฃผ์„ธ์š”!
PR์ด ๋„ˆ๋ฌด ํฌ๋ฉด ๋„ˆ๋ฌด ๋งŽ์€ ๋‚ด์šฉ์ด ๋“ค์–ด๊ฐ€๊ฒ ์ฃ ? -->
# ๐Ÿ” ์–ด๋–ค PR์ธ๊ฐ€์š”?
- ์ธ์ฆ ์ชฝ์„ ๋ฆฌํŒฉํ† ๋ง ํ–ˆ์Šต๋‹ˆ๋‹ค.

<!-- ๋ฆฌ๋ทฐ์–ด์—๊ฒŒ
์–ด๋–ค ๋ถ€๋ถ„์„ ์ž์„ธํ•˜๊ฒŒ ๋ฆฌ๋ทฐํ• ์ง€ ์„œ์ˆ ํ•ด์ฃผ์„ธ์š”. -->
# ๐Ÿ˜‹ To Reviewer
- JWT ๊ด€๋ จ ํด๋ž˜์Šค๋“ค์„ ์ •๋ฆฌํ–ˆ์Šต๋‹ˆ๋‹ค. ๊ธฐ์กด์— `JwtValidator`์˜ ์—ญํ• ์ด parsingํ•˜๋Š” ๊ฒƒ์— ๊ฐ€๊นŒ์›Œ
`JwtParse`์—๊ฒŒ ์ฑ…์ž„์„ ๋ชฐ์•„์ฃผ์—ˆ์Šต๋‹ˆ๋‹ค.
- ๊ธฐ์กด์— `JwtParser`์™€ `RawParser`๋ฅผ ๋ง‰ ํ˜ผ๋™ํ•ด์„œ ์“ฐ๋Š”๋“ฏ ํ–ˆ์Šต๋‹ˆ๋‹ค. ๊ทธ๋ž˜์„œ, `RawParser`๋Š” (ํŒจํ‚ค์ง€)
๋‚ด๋ถ€์ ์œผ๋กœ ์‚ฌ์šฉํ•˜๊ณ  `JwtParser`๋Š” ์™ธ๋ถ€์—์„œ ์‚ฌ์šฉํ•˜๋„๋ก ์ˆ˜์ •ํ–ˆ์Šต๋‹ˆ๋‹ค.
- ๊ธฐ์กด์— Redis๋ฅผ ์‚ฌ์šฉํ•˜๊ธฐ ์œ„ํ•ด `CacheUtil`์„ ํ•˜๋‚˜์˜ end-point๋กœ ๋‘๊ณ  ์‚ฌ์šฉํ–ˆ์Šต๋‹ˆ๋‹ค. ๊ธฐ์กด์— **์ง์ ‘์ ์œผ๋กœ
์‚ฌ์šฉํ•ด์„œ ๊ฐ•ํ•œ ์˜์กด์„ฑ์ด ๋ฐœ์ƒ**ํ•œ๋‹ค๊ณ  ํŒ๋‹จํ–ˆ๊ณ , **๋ชจ๋“  ๋ฉ”์„œ๋“œ๊ฐ€ public**์ด๋ผ์„œ ์˜๋„์™€ ๋‹ค๋ฅด๊ฒŒ ์‚ฌ์šฉ๋  ์ˆ˜ ์žˆ๋‹ค๊ณ 
์ƒ๊ฐํ–ˆ์Šต๋‹ˆ๋‹ค. ๊ทธ๋ž˜์„œ, **์•ฝํ•œ ์˜์กด์„ฑ์œผ๋กœ ์ˆ˜์ •**ํ•˜์˜€์Šต๋‹ˆ๋‹ค.
- ๊ทธ ๊ณผ์ •์—์„œ **์ค‘๋ณต๋˜๋Š” ์ฝ”๋“œ๋ฅผ ์ค„์ด๊ธฐ ์œ„ํ•ด์„œ ์ฝ”๋“œ๋ฅผ ์••์ถ•ํ–ˆ๋Š”๋ฐ, ์•ฝ๊ฐ„ ๊ณผํ•˜๋‹ค**๊ณ  ์ƒ๊ฐ์ด ๋“ค์—ˆ์Šต๋‹ˆ๋‹ค. ์—ฌ๋Ÿฌ๋ถ„๋“ค์˜ ์˜๊ฒฌ์ด
๊ถ๊ธˆํ•ฉ๋‹ˆ๋‹ค.
- ์ฝ”ํ‹€๋ฆฐ์—์„œ ์˜๊ฐ์„ ๋ฐ›์•„์„œ **Custom Assertion**์„ ๋งŒ๋“ค์—ˆ์Šต๋‹ˆ๋‹ค.
`assertThatAjajaException`์œผ๋กœ ์˜ˆ์™ธ์˜ ๋ฉ”์‹œ์ง€๊ฐ€ ์ผ์น˜ํ•˜๋Š”์ง€ ์ž๋™์œผ๋กœ ํ™•์ธํ•ฉ๋‹ˆ๋‹ค! ๋งŒ๋“œ๋Š”๋ฐ ์–ด๋ ต์ง€ ์•Š์•„์„œ
ํ•ด๋ดค๋Š”๋ฐ ์“ฐ์‹ค ๋ถ„์€ ์“ฐ์…”๋„ ๋˜๊ณ  ์•ˆ ์“ฐ์…”๋„ ๋  ๊ฒƒ ๊ฐ™์Šต๋‹ˆ๋‹ค!

**Before** 
```java
assertThatExceptionOfType(AjajaException.class)
    .isThrownBy(() -> verifyCertificationService.verify(user.getId(), "certification"))
    .withMessage(CERTIFICATION_NOT_MATCH.getMessage());
```

**After**
```java
assertThatAjajaException(CERTIFICATION_NOT_MATCH).isThrownBy(() ->
    verifyCertificationService.verify(user.getId(), "certification")
);
```
@Hejow
Add(.infra): discord notification web hook
15ed128
@Hejow
Fix(.feign): improper use of naver client headers
67b8645
@Hejow
Chore: exclude discord on jacoco
22a6fdf
@Hejow
Merge: add discord bot, fix feign client configuration error (#181)
299f7c1 
<!-- PR ๋‚ด์šฉ
์–ด๋–ค ์ž‘์—…์„ ํ–ˆ๋Š”์ง€ ์ž‘์„ฑํ•ด์ฃผ์„ธ์š”!
PR์ด ๋„ˆ๋ฌด ํฌ๋ฉด ๋„ˆ๋ฌด ๋งŽ์€ ๋‚ด์šฉ์ด ๋“ค์–ด๊ฐ€๊ฒ ์ฃ ? -->
# ๐Ÿ” ์–ด๋–ค PR์ธ๊ฐ€์š”?
- ๋””์Šค์ฝ”๋“œ ๋ด‡์— ์•Œ๋ฆผ์„ ๋ณด๋‚ด๋Š” ๊ธฐ๋Šฅ์„ ์ถ”๊ฐ€ํ–ˆ์Šต๋‹ˆ๋‹ค.

<!-- ๋ฆฌ๋ทฐ์–ด์—๊ฒŒ
์–ด๋–ค ๋ถ€๋ถ„์„ ์ž์„ธํ•˜๊ฒŒ ๋ฆฌ๋ทฐํ• ์ง€ ์„œ์ˆ ํ•ด์ฃผ์„ธ์š”. -->
# ๐Ÿ˜‹ To Reviewer
- ์ถ”ํ›„์— ๋„์ž…๋  FCM์„ ๋Œ€๋น„ํ•˜์—ฌ EDA๋ฅผ ๊ตฌ์„ฑํ–ˆ๊ณ , ํ˜„์žฌ๋Š” ์น˜๋ช…์ ์ธ ์˜ค๋ฅ˜(Unexpected Exception)์ด ๋ฐœ์ƒํ–ˆ์„ ๋•Œ
์•Œ๋ฆผ์„ ๋ฐ›๋„๋ก ํ•ด๋‘์—ˆ์Šต๋‹ˆ๋‹ค.
- ๋‚˜์ค‘์— ์‹ ๊ทœ ์œ ์ €์˜ ๊ฐ€์ž…, ์™ธ๋ถ€ API ํ˜ธ์ถœ ๋“ฑ์— ๋Œ€ํ•ด์„œ ๋ด‡์œผ๋กœ ์•Œ๋ฆผ์„ ๋ฐ›์„ ์˜ˆ์ •์ž…๋‹ˆ๋‹ค.
- feign์—์„œ ์ž˜๋ชป๋œ ๋นˆ ๋“ฑ๋ก์œผ๋กœ ์ธํ•ด์„œ ๋ชจ๋“  client๊ฐ€ naver header๋ฅผ ์‚ฌ์šฉํ•˜๋Š” ๊ฒƒ์„ ์ˆ˜์ •ํ•˜์˜€์Šต๋‹ˆ๋‹ค.

<!-- ํ…Œ์ŠคํŠธ 
๋ฐ˜์˜ํ•œ ํ…Œ์ŠคํŠธ ๋ฉ”์„œ๋“œ ์ด๋ฆ„๊ณผ ์–ด๋–ค ํ…Œ์ŠคํŠธ๋ฅผ ํ–ˆ๋Š”์ง€ ์ž‘์„ฑํ•ด์ฃผ์„ธ์š”.
(ex. save_Fail_ByDuplicateEmail) -->
# โœ… ์ž‘์„ฑํ•œ ํ…Œ์ŠคํŠธ
- [x] onDiscordEvent_Success
@Hejow
Fix(.plan): handle proxy error
438a655
@Hejow
Add(.util): exception message simplifier
5a85e1b
@Hejow
Chore(.github): update ci flow
24e80fa
@Hejow
Chore(.github): add code owner
1fe3096
@Hejow
Chore(.github): change assign action
66f668d
@Hejow
Fix: handle proxy error (#183)
57488bc 
<!-- PR ๋‚ด์šฉ
์–ด๋–ค ์ž‘์—…์„ ํ–ˆ๋Š”์ง€ ์ž‘์„ฑํ•ด์ฃผ์„ธ์š”!
PR์ด ๋„ˆ๋ฌด ํฌ๋ฉด ๋„ˆ๋ฌด ๋งŽ์€ ๋‚ด์šฉ์ด ๋“ค์–ด๊ฐ€๊ฒ ์ฃ ? -->
# ๐Ÿ” ์–ด๋–ค PR์ธ๊ฐ€์š”?
- proxy ์—๋Ÿฌ ํ•ด๊ฒฐ
@Hejow
Merge: resolve conflicts before PR
c2827a6
@Hejow Hejow self-assigned this Feb 22, 2024
@github-actions GitHub Actions
Copy link

Test Coverage Report

Overall Project 80.72% ๐Ÿ
File Coverage
FindAllPlansAdapter.java 81.45% ๐Ÿ

@Hejow Hejow merged commit 0966232 into prod Feb 22, 2024
1 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@2jie0516 2jie0516 Awaiting requested review from 2jie0516 2jie0516 is a code owner

@kys0411 kys0411 Awaiting requested review from kys0411 kys0411 is a code owner

@JuwoongKim JuwoongKim Awaiting requested review from JuwoongKim JuwoongKim is a code owner

Assignees

@Hejow Hejow

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Hejow @kys0411 @JuwoongKim