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.

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

feta : develop_back_core -> develop_back #599

Merged
merged 215 commits into from
Jul 30, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
215 commits
Select commit Hold shift + click to select a range
c8a1614
fix : api docs 수정
seokho-1116 Jun 20, 2024
b275397
refact : auth manager추가, oauth2 url 이동
seokho-1116 Jun 20, 2024
9f8c055
refact : 임시 토큰 재발급 로직 이동
seokho-1116 Jun 20, 2024
b798c99
refact : 토큰 재발급 로직 이동
seokho-1116 Jun 20, 2024
a160a35
refact : 회원가입 로직 이동
seokho-1116 Jun 20, 2024
3fc1414
refact : final 추가, 로그인 로직 이동
seokho-1116 Jun 20, 2024
da1cd0a
refact : 메시지 인증 서비스 응답 변경, 로직 이동
seokho-1116 Jun 20, 2024
83beaf3
refact : 문자 인증 서비스 응답 수정, 로직 이동
seokho-1116 Jun 20, 2024
4656dc7
refact : 이메일 회원가입 로직 이동
seokho-1116 Jun 20, 2024
d928760
refact : 이메일 로그인 로직 이동
seokho-1116 Jun 20, 2024
9506465
fix : 필요 없는 의존성 제거
seokho-1116 Jun 20, 2024
487dabf
refact : dto to response로 변경
seokho-1116 Jun 20, 2024
31f4515
fix : refresh token 생성 로직 변경
seokho-1116 Jun 21, 2024
519d670
fix : repository 이름, PREFIX 변경
seokho-1116 Jun 21, 2024
d95f88a
fix : 주석 삭제
seokho-1116 Jun 22, 2024
3e78582
fix : 주석 변경
seokho-1116 Jun 22, 2024
c867aa7
test : jwt, 인증 관련 테스트 코드 추가
seokho-1116 Jun 23, 2024
e54708a
Merge pull request #510 from tukcomCD2024/fix/api_docs-B-#499
GaBaljaintheroom Jun 23, 2024
914b95b
feat : 사용자 데이터 수정 기능 구현
GaBaljaintheroom Jun 23, 2024
9745f97
feat : 로그아웃 API, 블랙리스트 추가
seokho-1116 Jun 23, 2024
078e792
test : 관련 테스트 추가
seokho-1116 Jun 23, 2024
14080bd
Merge branch 'develop_back_core' into refact/auth_service-B-#511
seokho-1116 Jun 23, 2024
586838c
Merge branch 'refact/auth_service-B-#511' into fix/token-B-#512
seokho-1116 Jun 23, 2024
a360476
Merge branch 'fix/token-B-#512' into feat/logout-B-#513
seokho-1116 Jun 23, 2024
73a7a87
fix : 이메일 인증 로직 삭제
GaBaljaintheroom Jun 23, 2024
c861fc1
refact : member 도메인 mapper 의존성 삭제
GaBaljaintheroom Jun 23, 2024
7c26a4e
fix : 알림 목록 조회 쿼리 수정
GaBaljaintheroom Jun 23, 2024
a4e0422
test : 멤버 서비스 테스트
GaBaljaintheroom Jun 23, 2024
5a4fbb9
refact : 그룹 초대 목록 조회 순서 내림차순 정렬
GaBaljaintheroom Jun 23, 2024
03561a5
refact : 주소록 기반 친구 검색시 본인 조회 안되도록 수정
GaBaljaintheroom Jun 23, 2024
3d2edd7
test : 주소록 기반 조회 시 본인은 조회되지 않는 테스트
GaBaljaintheroom Jun 23, 2024
2024831
fix : 보물 캡슐 열람 알림 전송 삭제
GaBaljaintheroom Jun 23, 2024
4edb6f7
test : 캡슐 개봉 테스트
GaBaljaintheroom Jun 23, 2024
e67b462
test : 테스트 오류 수정
GaBaljaintheroom Jun 23, 2024
949ed60
refact : wrapper로 감싸기
GaBaljaintheroom Jun 23, 2024
822edd5
fix : request Valid 추가
GaBaljaintheroom Jun 23, 2024
88b4181
fix : is_delete 추가
seokho-1116 Jun 23, 2024
04f5e33
fix : deleted_at으로 변경
seokho-1116 Jun 29, 2024
17d9696
feat : soft delete 쿼리 추가
seokho-1116 Jun 29, 2024
a57b77f
feat : 멤버 삭제를 위한 연관 엔티티 삭제 서비스 추가
seokho-1116 Jun 29, 2024
939c5ca
feat : member facade 추가
seokho-1116 Jun 29, 2024
9e12363
feat : member api 추가
seokho-1116 Jun 29, 2024
4ae61c5
fix : 쿼리 오류 수정
seokho-1116 Jun 29, 2024
c3b699a
fix : 쿼리 로직 및 메서드 이름 변경
seokho-1116 Jun 29, 2024
abb2c77
feat : capsule cascade type 수정
seokho-1116 Jun 29, 2024
88ecccc
Merge pull request #521 from tukcomCD2024/fix/error-B-520
GaBaljaintheroom Jul 1, 2024
45814dc
chore: 머지 충돌 해결
GaBaljaintheroom Jul 1, 2024
63b8b2f
chore : 머지 충돌 해결
GaBaljaintheroom Jul 1, 2024
c8b9350
Merge branch 'develop_back_core' into feat/update_member_date-B-#514
GaBaljaintheroom Jul 1, 2024
2a381ef
fix : build 실패 수정
GaBaljaintheroom Jul 1, 2024
b939656
Merge pull request #519 from tukcomCD2024/feat/update_member_date-B-#514
GaBaljaintheroom Jul 1, 2024
641323f
feat : custom argument resolver 추가
seokho-1116 Jul 1, 2024
714ec5c
feat : custom argument resolver 추가
seokho-1116 Jul 1, 2024
09618bc
Merge remote-tracking branch 'origin/feat/logout-B-#513' into feat/lo…
seokho-1116 Jul 1, 2024
211e41f
fix : is_delete 추가
seokho-1116 Jun 23, 2024
587ac82
fix : deleted_at으로 변경
seokho-1116 Jun 29, 2024
74bf4c6
Merge branch 'fix/deleted_at-B-#522' into feat/delete_member-B-#515
seokho-1116 Jul 1, 2024
d00ea8e
refact : notification 도메인 이동
seokho-1116 Jun 30, 2024
7b98cd7
Merge pull request #525 from tukcomCD2024/refact/notification-B-#515
seokho-1116 Jul 1, 2024
0a0f471
Merge pull request #524 from tukcomCD2024/feat/delete_member-B-#515
seokho-1116 Jul 1, 2024
aa4777f
Merge pull request #523 from tukcomCD2024/fix/deleted_at-B-#522
seokho-1116 Jul 1, 2024
0b9c7f2
Merge pull request #518 from tukcomCD2024/feat/logout-B-#513
seokho-1116 Jul 1, 2024
8c1e180
Merge pull request #517 from tukcomCD2024/fix/token-B-#512
seokho-1116 Jul 1, 2024
6416568
Merge remote-tracking branch 'refs/remotes/origin/develop_back_core' …
seokho-1116 Jul 1, 2024
0fbb08e
fix : 이메일 부분 삭제
seokho-1116 Jul 1, 2024
6ab869d
fix : 테스트 변수 이름 수정
seokho-1116 Jul 1, 2024
ae35fed
fix : 메서드 이름 변경 수정
seokho-1116 Jul 1, 2024
da9fe01
Merge pull request #516 from tukcomCD2024/refact/auth_service-B-#511
seokho-1116 Jul 1, 2024
470498e
fix : url 수정
seokho-1116 Jul 1, 2024
55b0784
fix : api docs에서 값 무시 추가
seokho-1116 Jul 2, 2024
993041e
Merge pull request #530 from tukcomCD2024/fix/notification_url-B-#529
seokho-1116 Jul 2, 2024
3fb6590
fix : 블랙리스트 토큰 로직 수정
seokho-1116 Jul 2, 2024
2e4387e
test : 블랙리스트 토큰 접근 로직 테스트 수정
seokho-1116 Jul 2, 2024
379a019
Merge branch 'develop_back_core' into fix/logout-B-#536
seokho-1116 Jul 2, 2024
d2784d6
Merge pull request #537 from tukcomCD2024/fix/logout-B-#536
GaBaljaintheroom Jul 3, 2024
1653c7a
fix : 메서드 이름, API 문서화 수정
seokho-1116 Jul 3, 2024
a29bef6
feat : 사용자가 속한 그룹 조회 쿼리 추가
seokho-1116 Jul 4, 2024
09e44cd
feat : 사용자가 속한 그룹의 그룹 캡슐 목록 조회 쿼리 추가
seokho-1116 Jul 4, 2024
eb2b5bd
feat : 사용자가 속한 그룹 캡슐 목록 조회 서비스 추가
seokho-1116 Jul 4, 2024
d792b8f
feat : 사용자가 속한 그룹의 그룹 캡슐 목록 조회 컨트롤러, api 추가
seokho-1116 Jul 4, 2024
71b3e28
test : 사용자가 속한 그룹 캡슐 목록 테스트 추가
seokho-1116 Jul 4, 2024
00ec049
fix : phone_hash 오타 수정 -> phoneHash
seokho-1116 Jul 3, 2024
b58722a
feat : 태그, 전화번호 검색 비허용 상태 추가
seokho-1116 Jul 3, 2024
05cc1aa
feat : 태그 검색 허용, 전화번호 검색 허용 업데이트 쿼리 추가
seokho-1116 Jul 3, 2024
9afce1e
feat : 검색 허용 상태들 업데이트 서비스 추가
seokho-1116 Jul 3, 2024
4fbe012
feat : 태그 검색, 전화번호 검색 업데이트 컨트롤러 추가
seokho-1116 Jul 3, 2024
9ce6e0a
test : 태그, 핸드폰 검색 테스트 케이스 추가
seokho-1116 Jul 3, 2024
6fb1d70
refact : 캡슐 스킨 레포지토리 개선
seokho-1116 Jul 3, 2024
5e3634d
fix : 보물 캡슐 중복 필터링
seokho-1116 Jul 3, 2024
85031be
fix : 보물 캡슐 개봉 상태 추가
seokho-1116 Jul 4, 2024
aa511e8
refact : MessageVerificationService 역할 분리
seokho-1116 Jul 4, 2024
8ee1dc0
test : 리팩토링으로 인한 테스트 수정
seokho-1116 Jul 4, 2024
ac3aac5
fix : 회원 상태에 삭제 여부 추가
seokho-1116 Jul 4, 2024
7e884e2
test : 회원 삭제 여부 추가에 의한 테스트 수정
seokho-1116 Jul 4, 2024
0f350db
feat : 전화번호 해시, 전화번호 업데이트 쿼리 추가
seokho-1116 Jul 4, 2024
d964dfe
feat : 회원 전화번호 업데이트 서비스 추가
seokho-1116 Jul 4, 2024
fea6e9c
feat : 전화번호 인증번호 전송, 인증번호 검증 메서드 추가
seokho-1116 Jul 4, 2024
9fc8b20
feat : 전화번호 변경을 위한 인증번호 전송, 검증 api 추가
seokho-1116 Jul 4, 2024
f743503
fix : 인증 성공 시 인증 문자 삭제 로직 추가
seokho-1116 Jul 4, 2024
afb74a5
feat : 공개, 그룹 캡슐 신고 기능 구현
GaBaljaintheroom Jul 5, 2024
d5f0fbb
test : 공개, 그룹 캡슐 신고 테스트
GaBaljaintheroom Jul 5, 2024
9b8bc73
refact : 공개, 그룹 캡슐 신고 문서화 수정
GaBaljaintheroom Jul 5, 2024
cea4943
refact : 공개, 그룹 캡슐 신고 문서화 설명 수정
GaBaljaintheroom Jul 5, 2024
e731767
feat : 사용자 신고 긴으 구현
GaBaljaintheroom Jul 5, 2024
173d10e
feat : 캡슐, 멤버 테이블 신고 필드 추가
GaBaljaintheroom Jul 5, 2024
11db59e
feat : 멤버 조회 응답 타입 수정
GaBaljaintheroom Jul 5, 2024
575db15
test : 멤버 조회 쿼리 테스트 수정
GaBaljaintheroom Jul 5, 2024
01d3408
feat : 사용자 정보 수정 unqiue 제약 조건 예외 처리 추가
GaBaljaintheroom Jul 5, 2024
d51597f
refact : 사용자 회원 가입 저장 로직 수정
GaBaljaintheroom Jul 5, 2024
bb4cca7
fix : 공개 캡슐 문서화 수정
GaBaljaintheroom Jul 5, 2024
2065500
feat : 공개 캡슐 요약, 상세 조회 캡슐 소유 응답 타입 추가
GaBaljaintheroom Jul 5, 2024
4e50f21
feat : 공개 캡슐 상세 조회 캡슐 소유 응답 타입 추가
GaBaljaintheroom Jul 5, 2024
6cce258
feat : 그룹 캡슐 상세 조회 수정, 삭제 응답 타입 추가
GaBaljaintheroom Jul 5, 2024
bce7d52
test : 그룹 캡슐 상세 조회 테스트 실패 수정
GaBaljaintheroom Jul 5, 2024
34e1beb
refactor : 그룹 캡슐 null 체크 추가
GaBaljaintheroom Jul 5, 2024
799f40e
feat : 캡슐 삭제 기능 구현
GaBaljaintheroom Jul 7, 2024
0e5c031
chore : 테스트 실패 수정
GaBaljaintheroom Jul 7, 2024
e6d88b4
fix : 문서화 오타 수정
seokho-1116 Jul 8, 2024
1faaf33
refact : 태그 예외 발생 네이밍 수정
GaBaljaintheroom Jul 8, 2024
83f78f9
refact : PR 리뷰 수정 및 구글 형식 적용
GaBaljaintheroom Jul 8, 2024
8100214
Merge pull request #545 from tukcomCD2024/feat/update_phone-B-#532
seokho-1116 Jul 8, 2024
a6efbc0
Merge pull request #540 from tukcomCD2024/fix/singup-B-#539
seokho-1116 Jul 8, 2024
1b67380
Merge branch 'develop_back_core' into refact/message_verification-B-#532
seokho-1116 Jul 8, 2024
89b811c
Merge pull request #541 from tukcomCD2024/refact/message_verification…
seokho-1116 Jul 8, 2024
e9493bf
Merge branch 'develop_back_core' into fix/treasure_capsule_filter-B-#534
seokho-1116 Jul 8, 2024
6763f07
Merge pull request #542 from tukcomCD2024/fix/treasure_capsule_filter…
seokho-1116 Jul 8, 2024
63efef2
Merge branch 'refs/heads/develop_back_core' into feat/tag_phone_searc…
seokho-1116 Jul 8, 2024
dc1a30b
fix : 머지 충돌 해결
seokho-1116 Jul 8, 2024
30e49df
fix : 테스트 충돌 해결
seokho-1116 Jul 8, 2024
849681e
Merge pull request #543 from tukcomCD2024/feat/tag_phone_search_optio…
seokho-1116 Jul 8, 2024
769fd2f
Merge branch 'develop_back_core' into feat/all_group_capsule-B-#533
seokho-1116 Jul 8, 2024
b01f83a
Merge pull request #544 from tukcomCD2024/feat/all_group_capsule-B-#533
seokho-1116 Jul 8, 2024
c6945b9
chore : 머지 충돌 해결
GaBaljaintheroom Jul 8, 2024
d9832cf
Merge pull request #553 from tukcomCD2024/feat/declation_B-547
GaBaljaintheroom Jul 8, 2024
4e132be
fix : flyway 충돌 해결
GaBaljaintheroom Jul 8, 2024
8434efb
Merge branch 'develop_back_core' into feat/declation_B-547
GaBaljaintheroom Jul 8, 2024
49b807e
Merge pull request #558 from tukcomCD2024/feat/declation_B-547
GaBaljaintheroom Jul 8, 2024
8af48ac
Merge branch 'develop_back_core' into fix/member_find_response-B-#548
GaBaljaintheroom Jul 8, 2024
8c6c7f6
chore : 머지 충돌 해결
GaBaljaintheroom Jul 8, 2024
a3eb85d
chore : 머지 충돌 해결
GaBaljaintheroom Jul 8, 2024
4459233
Merge pull request #554 from tukcomCD2024/fix/member_find_response-B-…
GaBaljaintheroom Jul 8, 2024
acd24ab
chore : 머지 충돌 해결
GaBaljaintheroom Jul 8, 2024
58516e5
chore : 불필요 테스트 삭제
GaBaljaintheroom Jul 8, 2024
f97c1df
Merge pull request #555 from tukcomCD2024/fix/unique_error-B-#549
GaBaljaintheroom Jul 8, 2024
ea5878d
chore : 머지 충돌 해결
GaBaljaintheroom Jul 8, 2024
c87b433
fix : 테스트 실패 수정
GaBaljaintheroom Jul 8, 2024
5936c33
Merge pull request #556 from tukcomCD2024/fix/can_delete_social_capsu…
GaBaljaintheroom Jul 8, 2024
87ec6fc
chore : 머지 충돌 해결
GaBaljaintheroom Jul 8, 2024
b255b4a
chore : 구글 자바 형식 적용
GaBaljaintheroom Jul 8, 2024
07bb758
Merge pull request #557 from tukcomCD2024/feat/delete_capsule-B-#552
GaBaljaintheroom Jul 8, 2024
0b84a26
refactor : 그룹 캡슐 상세 조회 쿼리 수정
GaBaljaintheroom Jul 12, 2024
0027667
feat : 캡슐과 연관된 캡슐 스킨 조회 쿼리 추가
seokho-1116 Jul 20, 2024
f2d9da6
feat : 캡슐 스킨 엔티티 조회 및 삭제 추가
seokho-1116 Jul 20, 2024
09acf87
feat : 캡슐 스킨 삭제 서비스 메서드 추가
seokho-1116 Jul 20, 2024
8f020c8
fix : 소프트 삭제 오타 수정
seokho-1116 Jul 20, 2024
b18268b
feat : 캡슐 스킨 삭제 api 추가
seokho-1116 Jul 20, 2024
dbf7c3f
fix : 문서화 수정
seokho-1116 Jul 20, 2024
e2a1341
Merge branch 'develop_back_core' into feat/delete_capsule_skin-B-#568
seokho-1116 Jul 20, 2024
5bf9f29
build : 테스트 환경 ci-cd 환경 변수 수정
seokho-1116 Jul 22, 2024
6fd8210
test : ci-cd 테스트
seokho-1116 Jul 23, 2024
7717e77
test : github-actions ci/cd
seokho-1116 Jul 23, 2024
bc839e4
test : github-actions-ci/cd
seokho-1116 Jul 23, 2024
79ecee7
test : github-actions ci/cd
seokho-1116 Jul 23, 2024
4446f19
test : github-actions ci/cd
seokho-1116 Jul 23, 2024
b5c754f
test : github-actions ci/cd
seokho-1116 Jul 23, 2024
0f389a5
test : github-actions ci/cd
seokho-1116 Jul 23, 2024
2a6d067
test : github actions ci/cd
seokho-1116 Jul 23, 2024
3d1c697
test : github actions ci/cd
seokho-1116 Jul 23, 2024
8b090ba
test : github-actions ci/cd
seokho-1116 Jul 23, 2024
06d2aca
test : github-actions ci/cd
seokho-1116 Jul 23, 2024
14afdf1
test : github-actions ci/cd
seokho-1116 Jul 23, 2024
fe6a1fe
fix : 폰, 태그 검색 상태 추가
seokho-1116 Jul 25, 2024
67eccf6
feat : 공지사항 테이블 정의 추가
seokho-1116 Jul 25, 2024
e493214
feat : 공지사항 엔티티 추가
seokho-1116 Jul 25, 2024
a096ab8
feat : 공지사항 조회 쿼리 추가
seokho-1116 Jul 25, 2024
20f05ee
feat : 공지사항 조회 서비스 추가
seokho-1116 Jul 25, 2024
ae7f3a1
feat : 공지사항 조회 API 추가
seokho-1116 Jul 25, 2024
61194e9
fix : gitignore 수정
seokho-1116 Jul 25, 2024
65a79b8
feat : url 추가
seokho-1116 Jul 25, 2024
07fc4e6
fix : 문서화 카테고리 수정
seokho-1116 Jul 25, 2024
61cff96
feat : 최신순으로 정렬
seokho-1116 Jul 25, 2024
787faf3
test : 공지사항 조회 시 정렬 테스트 추가
seokho-1116 Jul 25, 2024
4f4ff26
Merge pull request #569 from tukcomCD2024/feat/delete_capsule_skin-B-…
seokho-1116 Jul 28, 2024
981d4e9
fix : branch 이름 제거
seokho-1116 Jul 28, 2024
347d2c9
Merge branch 'develop_back_core' into build/cicd-B-#572
seokho-1116 Jul 28, 2024
9a57d4e
fix : branch 이름 제거
seokho-1116 Jul 28, 2024
b1ee40d
Merge remote-tracking branch 'origin/build/cicd-B-#572' into build/ci…
seokho-1116 Jul 28, 2024
d74a849
Merge branch 'develop_back_core' into feat/announcement-B-#576
GaBaljaintheroom Jul 28, 2024
ac957ee
Merge pull request #573 from tukcomCD2024/build/cicd-B-#572
seokho-1116 Jul 28, 2024
e29d702
Merge branch 'develop_back_core' into fix/member_detail-B-#575
seokho-1116 Jul 28, 2024
0a96dcc
Merge pull request #577 from tukcomCD2024/fix/member_detail-B-#575
seokho-1116 Jul 28, 2024
be22915
Merge branch 'develop_back_core' into feat/announcement-B-#576
seokho-1116 Jul 28, 2024
4e80cff
feat : prod.yml 서브 모듈 업데이트
GaBaljaintheroom Jul 28, 2024
abbdeec
feat : s3 key submodule update
GaBaljaintheroom Jul 28, 2024
72e5430
Merge pull request #578 from tukcomCD2024/feat/announcement-B-#576
seokho-1116 Jul 28, 2024
5c01ed3
feat : 로그 백 설정
GaBaljaintheroom Jul 28, 2024
80ca818
feat : logback hibernate 추가
GaBaljaintheroom Jul 28, 2024
63fb664
feat : sms_limit submodule update
GaBaljaintheroom Jul 28, 2024
fecdff8
feat : actuator 추가
GaBaljaintheroom Jul 28, 2024
745c303
feat : actuator submodule update
GaBaljaintheroom Jul 28, 2024
46311b9
Merge pull request #579 from tukcomCD2024/feat/locki-setting
GaBaljaintheroom Jul 28, 2024
bc50995
Merge pull request #581 from tukcomCD2024/develop_prod_back_core
GaBaljaintheroom Jul 28, 2024
18ee2df
fix : 캡슐 스킨 삭제 오류 수정
seokho-1116 Jul 29, 2024
218c743
fix : logback prod <-> test 분리
seokho-1116 Jul 29, 2024
521f3ea
fix : rabbitmq 설정 변경
seokho-1116 Jul 29, 2024
e97fc37
fix : logback ip 변경
seokho-1116 Jul 29, 2024
c1653ff
feat : submodule update
seokho-1116 Jul 29, 2024
cc31075
build : core ci/cd prod 추가
seokho-1116 Jul 30, 2024
2ef67ca
fix : push 현재 branch 제거
seokho-1116 Jul 30, 2024
5c454c6
feat : 서브 모듈 업데이트
GaBaljaintheroom Jul 30, 2024
f53493b
feat : 서브 모듈 업데이트
GaBaljaintheroom Jul 30, 2024
88c18f7
fix : rabbitmq ssl 설정 추가
seokho-1116 Jul 30, 2024
14cc61e
fix : logback container 환경 loki 제외
seokho-1116 Jul 30, 2024
b2d87ed
Merge pull request #596 from tukcomCD2024/fix/rabbitmq_config-core-B-…
seokho-1116 Jul 30, 2024
0f3dee4
Merge pull request #588 from tukcomCD2024/build/cicd-core-B-#582
seokho-1116 Jul 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix : deleted_at으로 변경
  • Loading branch information
seokho-1116 committed Jun 29, 2024
commit 04f5e3358bf575d968ceb35f5111952b1a5a4ee0
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
@Entity
@Table(name = "capsule")
@Getter
@SQLDelete(sql = "UPDATE `capsule` SET is_deleted = true WHERE capsule_id = ?")
@Where(clause = "is_deleted = false")
@SQLDelete(sql = "UPDATE `capsule` SET deleted_at = now() WHERE capsule_id = ?")
@Where(clause = "deleted_at is null")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class Capsule extends BaseEntity {

Expand Down Expand Up @@ -63,9 +63,6 @@ public class Capsule extends BaseEntity {
@Column(name = "is_opened", nullable = false)
private Boolean isOpened;

@Column(name = "is_deleted")
private boolean is_deleted = Boolean.FALSE;

@Embedded
private Address address;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
@Getter
@Table(name = "group_capsule_open")
@Entity
@SQLDelete(sql = "UPDATE `group_capsule_open` SET is_deleted = true WHERE group_capsule_open_id = ?")
@Where(clause = "is_deleted = false")
@SQLDelete(sql = "UPDATE `group_capsule_open` SET deleted_at = now() WHERE group_capsule_open_id = ?")
@Where(clause = "deleted_at is null")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class GroupCapsuleOpen extends BaseEntity {

Expand All @@ -34,9 +34,6 @@ public class GroupCapsuleOpen extends BaseEntity {
@Column(name = "is_opened", nullable = false)
private Boolean isOpened;

@Column(name = "is_deleted")
private boolean is_deleted = Boolean.FALSE;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "capsule_id", nullable = false)
private Capsule capsule;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
@Entity
@Table(name = "image")
@Getter
@SQLDelete(sql = "UPDATE `image` SET is_deleted = true WHERE image_id = ?")
@Where(clause = "is_deleted = false")
@SQLDelete(sql = "UPDATE `image` SET deleted_at = now() WHERE image_id = ?")
@Where(clause = "deleted_at is null")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class Image extends BaseEntity {

Expand All @@ -35,9 +35,6 @@ public class Image extends BaseEntity {
@Column(name = "image_url", nullable = false)
private String imageUrl;

@Column(name = "is_deleted")
private boolean is_deleted = Boolean.FALSE;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "capsule_id", nullable = false)
private Capsule capsule;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
@Entity
@Table(name = "video")
@Getter
@SQLDelete(sql = "UPDATE `video` SET is_deleted = true WHERE video_id = ?")
@Where(clause = "is_deleted = false")
@SQLDelete(sql = "UPDATE `video` SET deleted_at = now() WHERE video_id = ?")
@Where(clause = "deleted_at is null")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class Video extends BaseEntity {

Expand All @@ -35,9 +35,6 @@ public class Video extends BaseEntity {
@Column(name = "video_url", nullable = false)
private String videoUrl;

@Column(name = "is_deleted")
private boolean is_deleted = Boolean.FALSE;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "capsule_id", nullable = false)
private Capsule capsule;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ public void bulkSave(final List<Image> images) {
jdbcTemplate.batchUpdate(
"""
INSERT INTO image (
image_id, image_url, member_id, capsule_id, created_at, updated_at, is_deleted
) values (?, ?, ?, ?, ?, ?, ?)
image_id, image_url, member_id, capsule_id, created_at, updated_at
) values (?, ?, ?, ?, ?, ?)
""",
new BatchPreparedStatementSetter() {

Expand All @@ -36,7 +36,6 @@ public void setValues(final PreparedStatement ps, final int i) throws SQLExcepti
ps.setLong(4, image.getCapsule().getId());
ps.setTimestamp(5, Timestamp.valueOf(ZonedDateTime.now().toLocalDateTime()));
ps.setTimestamp(6, Timestamp.valueOf(ZonedDateTime.now().toLocalDateTime()));
ps.setBoolean(7, Boolean.FALSE);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ public void bulkSave(final List<Video> videos) {
jdbcTemplate.batchUpdate(
"""
INSERT INTO video (
video_id, video_url, member_id, capsule_id, created_at, updated_at, is_deleted
) values (?, ?, ?, ?, ?, ?, ?)
video_id, video_url, member_id, capsule_id, created_at, updated_at
) values (?, ?, ?, ?, ?, ?)
""",
new BatchPreparedStatementSetter() {

Expand All @@ -36,7 +36,6 @@ public void setValues(final PreparedStatement ps, final int i) throws SQLExcepti
ps.setLong(4, video.getCapsule().getId());
ps.setTimestamp(5, Timestamp.valueOf(ZonedDateTime.now().toLocalDateTime()));
ps.setTimestamp(6, Timestamp.valueOf(ZonedDateTime.now().toLocalDateTime()));
ps.setBoolean(7, Boolean.FALSE);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ public void bulkSave(
jdbcTemplate.batchUpdate(
"""
INSERT INTO group_capsule_open (
group_capsule_open_id, is_opened, member_id, capsule_id, group_id, created_at, updated_at, is_deleted
) values (?, ? ,? ,? ,?, ?, ?, ?)
group_capsule_open_id, is_opened, member_id, capsule_id, group_id, created_at, updated_at
) values (?, ? ,? ,? ,?, ?, ?)
""",
new BatchPreparedStatementSetter() {
@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
@Entity
@Table(name = "capsule_skin")
@Getter
@SQLDelete(sql = "UPDATE `capsule_skin` SET is_deleted = true WHERE caspuel_skin_id = ?")
@Where(clause = "is_deleted = false")
@SQLDelete(sql = "UPDATE `capsule_skin` SET deleted_at = now() WHERE caspuel_skin_id = ?")
@Where(clause = "deleted_at is null")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class CapsuleSkin extends BaseEntity {

Expand All @@ -47,9 +47,6 @@ public class CapsuleSkin extends BaseEntity {
@Enumerated(EnumType.STRING)
private Retarget retarget;

@Column(name = "is_deleted")
private boolean is_deleted = Boolean.FALSE;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "member_id", nullable = false)
private Member member;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
@Entity
@Table(name = "friend_invite")
@Getter
@SQLDelete(sql = "UPDATE `friend_invite` SET is_deleted = true WHERE friend_invite_id = ?")
@Where(clause = "is_deleted = false")
@SQLDelete(sql = "UPDATE `friend_invite` SET deleted_at = now() WHERE friend_invite_id = ?")
@Where(clause = "deleted_at is null")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class FriendInvite extends BaseEntity {

Expand All @@ -30,9 +30,6 @@ public class FriendInvite extends BaseEntity {
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@Column(name = "is_deleted")
private boolean is_deleted = Boolean.FALSE;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "owner_id", nullable = false)
private Member owner;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
@Entity
@Table(name = "member_friend")
@Getter
@SQLDelete(sql = "UPDATE `member_friend` SET is_deleted = true WHERE member_friend_id = ?")
@Where(clause = "is_deleted = false")
@SQLDelete(sql = "UPDATE `member_friend` SET deleted_at = now() WHERE member_friend_id = ?")
@Where(clause = "deleted_at is null")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class MemberFriend extends BaseEntity {

Expand All @@ -31,9 +31,6 @@ public class MemberFriend extends BaseEntity {
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@Column(name = "is_deleted")
private boolean is_deleted = Boolean.FALSE;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "owner_id", nullable = false)
private Member owner;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ public void bulkSave(final Long ownerId, final List<Long> friendIds) {
jdbcTemplate.batchUpdate(
"""
INSERT INTO friend_invite (
friend_invite_id, owner_id, friend_id, created_at, updated_at, is_deleted
) values (?, ?, ?, ?, ?, ?)
friend_invite_id, owner_id, friend_id, created_at, updated_at
) values (?, ?, ?, ?, ?)
""",
new BatchPreparedStatementSetter() {

Expand All @@ -50,7 +50,6 @@ public void setValues(final PreparedStatement ps, final int i) throws SQLExcepti
ps.setLong(3, friendId);
ps.setTimestamp(4, Timestamp.valueOf(ZonedDateTime.now().toLocalDateTime()));
ps.setTimestamp(5, Timestamp.valueOf(ZonedDateTime.now().toLocalDateTime()));
ps.setBoolean(6, Boolean.FALSE);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
@Entity
@Table(name = "group")
@Getter
@SQLDelete(sql = "UPDATE `group` SET is_deleted = true WHERE group_id = ?")
@Where(clause = "is_deleted = false")
@SQLDelete(sql = "UPDATE `group` SET deleted_at = now() WHERE group_id = ?")
@Where(clause = "deleted_at is null")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class Group extends BaseEntity {

Expand All @@ -38,9 +38,6 @@ public class Group extends BaseEntity {
@Column(name = "group_profile_url", nullable = false)
private String groupProfileUrl;

@Column(name = "is_deleted")
private boolean is_deleted = Boolean.FALSE;

@Builder
private Group(String groupName, String groupDescription, String groupProfileUrl) {
if (Objects.isNull(groupName)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
@Entity
@Table(name = "history")
@Getter
@SQLDelete(sql = "UPDATE `history` SET is_deleted = true WHERE hisotry_id = ?")
@Where(clause = "is_deleted = false")
@SQLDelete(sql = "UPDATE `history` SET deleted_at = now() WHERE hisotry_id = ?")
@Where(clause = "deleted_at is null")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class History extends BaseEntity {

Expand All @@ -36,9 +36,6 @@ public class History extends BaseEntity {
@Column(name = "title", nullable = false)
private String title;

@Column(name = "is_deleted")
private boolean is_deleted = Boolean.FALSE;

@OneToMany(mappedBy = "history", cascade = CascadeType.ALL, orphanRemoval = true)
private List<HistoryImage> historyImages;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
@Entity
@Table(name = "history_image")
@Getter
@SQLDelete(sql = "UPDATE `history_image` SET is_deleted = true WHERE history_image_id = ?")
@Where(clause = "is_deleted = false")
@SQLDelete(sql = "UPDATE `history_image` SET deleted_at = now() WHERE history_image_id = ?")
@Where(clause = "deleted_at is null")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class HistoryImage extends BaseEntity {

Expand All @@ -30,9 +30,6 @@ public class HistoryImage extends BaseEntity {
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@Column(name = "is_deleted")
private boolean is_deleted = Boolean.FALSE;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "image_id", nullable = false)
private Image image;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
@Entity
@Table(name = "member")
@Getter
@SQLDelete(sql = "UPDATE member SET is_deleted = true WHERE member_id = ?")
@Where(clause = "is_deleted = false")
@SQLDelete(sql = "UPDATE member SET deleted_at = now() WHERE member_id = ?")
@Where(clause = "deleted_at is null")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class Member extends BaseEntity {

Expand Down Expand Up @@ -70,9 +70,6 @@ public class Member extends BaseEntity {
@Column(name = "tag", nullable = false, unique = true)
private String tag;

@Column(name = "is_deleted")
private boolean is_deleted = Boolean.FALSE;

@Builder
private Member(String profileUrl, String nickname, SocialType socialType, String email,
String authId, String password, String tag, byte[] phone, byte[] phone_hash) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
@Entity
@Table(name = "member_temporary")
@Getter
@SQLDelete(sql = "UPDATE member_temporary SET is_deleted = true WHERE member_temporary_id = ?")
@Where(clause = "is_deleted = false")
@SQLDelete(sql = "UPDATE member_temporary SET deleted_at = now() WHERE member_temporary_id = ?")
@Where(clause = "deleted_at is null")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class MemberTemporary extends BaseEntity {

Expand All @@ -45,6 +45,7 @@ public class MemberTemporary extends BaseEntity {
@Email
@Column(name = "email", nullable = false)
private String email;

@Column(name = "is_verified", nullable = false)
private Boolean isVerified;

Expand All @@ -54,9 +55,6 @@ public class MemberTemporary extends BaseEntity {
@Column(name = "tag", nullable = false, unique = true)
private String tag;

@Column(name = "is_deleted")
private boolean is_deleted = Boolean.FALSE;

@Builder
public MemberTemporary(String profileUrl, String nickname, SocialType socialType, String email,
String authId, String tag) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
@Entity
@Table(name = "notification")
@Getter
@SQLDelete(sql = "UPDATE notification SET is_deleted = true WHERE notification_id = ?")
@Where(clause = "is_deleted = false")
@SQLDelete(sql = "UPDATE notification SET deleted_at = now() WHERE notification_id = ?")
@Where(clause = "deleted_at is null")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class Notification extends BaseEntity {

Expand All @@ -40,9 +40,6 @@ public class Notification extends BaseEntity {
@Column(name = "image_url")
private String imageUrl;

@Column(name = "is_deleted")
private boolean is_deleted = Boolean.FALSE;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "member_id", nullable = false)
private Member member;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
@Entity
@Table(name = "notification_category")
@Getter
@SQLDelete(sql = "UPDATE notification_category SET is_deleted = true WHERE notification_category_id = ?")
@Where(clause = "is_deleted = false")
@SQLDelete(sql = "UPDATE notification_category SET deleted_at = now() WHERE notification_category_id = ?")
@Where(clause = "deleted_at is null")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class NotificationCategory extends BaseEntity {

Expand All @@ -34,8 +34,5 @@ public class NotificationCategory extends BaseEntity {

@Column(name = "category_description", nullable = false)
private String categoryDescription;

@Column(name = "is_deleted")
private boolean is_deleted = Boolean.FALSE;
}

Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
@Entity
@Table(name = "group_invite")
@Getter
@SQLDelete(sql = "UPDATE `group_invite` SET is_deleted = true WHERE group_invite_id = ?")
@Where(clause = "is_deleted = false")
@SQLDelete(sql = "UPDATE `group_invite` SET deleted_at = now() WHERE group_invite_id = ?")
@Where(clause = "deleted_at is null")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class GroupInvite extends BaseEntity {

Expand All @@ -31,9 +31,6 @@ public class GroupInvite extends BaseEntity {
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@Column(name = "is_deleted")
private boolean is_deleted = Boolean.FALSE;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "group_id", nullable = false)
private Group group;
Expand Down
Loading