Repository navigation
feat: 휴지통 템플릿 영구 삭제 · 비우기 API #78
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
2cef62d
feat: 휴지통 템플릿 영구 삭제 쿼리 추가 (#70)
oTAETAEo 4642ee2
feat: 휴지통 템플릿 영구 삭제·비우기 서비스 추가 (#70)
oTAETAEo 3095f44
feat: 휴지통 템플릿 영구 삭제·비우기 API 추가 (#70)
oTAETAEo 51a3150
fix: 영구 삭제·비우기도 회원을 먼저 잠가 복구와의 교착 방지 (#70)
oTAETAEo d4e6e92
Merge remote-tracking branch 'origin/develop' into feat/70-trash-purge
oTAETAEo d8679ed
test: 동시 복구·영구 삭제 테스트에서 DB 상태도 확인 (#70)
oTAETAEo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
src/main/java/com/sniptext/domain/template/controller/dto/TrashEmptyResponse.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| package com.sniptext.domain.template.controller.dto; | ||
|
|
||
| import com.sniptext.domain.template.service.dto.result.TrashEmptyResult; | ||
|
|
||
| /** 휴지통 비우기 결과 (명세 18번). 비어 있었으면 0 */ | ||
| public record TrashEmptyResponse(int deletedCount) { | ||
|
|
||
| public static TrashEmptyResponse from(TrashEmptyResult result) { | ||
| return new TrashEmptyResponse(result.deletedCount()); | ||
| } | ||
|
|
||
| } |
12 changes: 12 additions & 0 deletions
12
src/main/java/com/sniptext/domain/template/controller/dto/TrashPurgeResponse.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| package com.sniptext.domain.template.controller.dto; | ||
|
|
||
| import com.sniptext.domain.template.service.dto.result.TrashPurgeResult; | ||
|
|
||
| /** 휴지통 템플릿 개별 영구 삭제 결과 (명세 17번) */ | ||
| public record TrashPurgeResponse(Long templateId) { | ||
|
|
||
| public static TrashPurgeResponse from(TrashPurgeResult result) { | ||
| return new TrashPurgeResponse(result.templateId()); | ||
| } | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
src/main/java/com/sniptext/domain/template/service/dto/command/TrashPurgeCommand.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| package com.sniptext.domain.template.service.dto.command; | ||
|
|
||
| public record TrashPurgeCommand(Long userId, Long templateId) { | ||
| } |
5 changes: 5 additions & 0 deletions
5
src/main/java/com/sniptext/domain/template/service/dto/result/TrashEmptyResult.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| package com.sniptext.domain.template.service.dto.result; | ||
|
|
||
| /** 휴지통 비우기로 지운 개수. 비어 있었으면 0 */ | ||
| public record TrashEmptyResult(int deletedCount) { | ||
| } |
5 changes: 5 additions & 0 deletions
5
src/main/java/com/sniptext/domain/template/service/dto/result/TrashPurgeResult.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| package com.sniptext.domain.template.service.dto.result; | ||
|
|
||
| /** 영구 삭제한 템플릿 ID */ | ||
| public record TrashPurgeResult(Long templateId) { | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
교착을 재현까지 해서 PR 설명에 남겨 주셔서 덕분에 배치 설계 방향이 잡혔어요. 정리 배치(00:10)는 스케줄러·셰드락 공통 설정과 함께 제가 맡아서 이슈로 진행해도 될까요?! 설명에 적어 주신 교착 내용과 이 줄의 주석 수정도 그 이슈에 옮겨 두겠습니다.
배치 PR을 올리면 휴지통 잠금 흐름을 가장 잘 아시니 리뷰를 부탁드릴게요!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
네넴 확인 했습니당 PR 올라오면 말씀 주세요 !