Skip to content

[deploy] admin-v1.0.9 #570

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

Merged
Whale0928 merged 15 commits into from
Mar 11, 2026
Merged

[deploy] admin-v1.0.9 #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
67c0b34
feat: Quartz 클러스터링 설정 추가
Whale0928 Feb 17, 2026
c1d7a6a
fix: Testcontainers 1.21.4 업그레이드 및 Docker Engine 29 호환 설정 추가
Whale0928 Feb 17, 2026
0891a9c
feat: 테스트 환경에서 Quartz 비활성화 설정 추가
Whale0928 Feb 17, 2026
f1b93a2
chore: 버전 정보 1.0.8로 업데이트
Whale0928 Feb 17, 2026
c4de714
feat: refactor dto formatting and improve review sorting logic
hgkim-openerd Feb 20, 2026
d37ebc6
fix: 통합 테스트에서 외부 비속어 필터 API 의존 제거
hgkim-openerd Feb 20, 2026
979f1ba
feat: AdminAlcoholItem에 deletedAt 필드 추가
hgkim-openerd Feb 20, 2026
eaa84c3
feat: 어드민 위스키 목록 조회 시 삭제 데이터 필터링 추가
hgkim-openerd Feb 20, 2026
46c8b47
test: 어드민 위스키 삭제 데이터 필터링 통합 테스트 추가
hgkim-openerd Feb 20, 2026
a20f092
docs: RestDocs 스니펫에 deletedAt 필드 문서화 추가
hgkim-openerd Feb 20, 2026
2b868d2
feat: 어드민 위스키 등록/수정 시 테이스팅 태그 지원 추가
hgkim-openerd Feb 24, 2026
6e918eb
docs: RestDocs 스니펫에 tastingTagIds 필드 문서화 추가
hgkim-openerd Feb 24, 2026
43d4c2c
test: 어드민 위스키 테이스팅 태그 통합 테스트 추가
hgkim-openerd Feb 24, 2026
293b1f1
docs: 테이스팅 태그 지원 구현 계획 문서 완료 처리
hgkim-openerd Feb 24, 2026
e5c8e3a
feat: 위스키 생성 및 수정 API 추가, 버전 업데이트
hgkim-openerd Mar 11, 2026
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
2 changes: 1 addition & 1 deletion bottlenote-admin-api/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.8
1.0.9
12 changes: 8 additions & 4 deletions bottlenote-admin-api/src/test/kotlin/app/docs/alcohols/AdminAlcoholsControllerDocsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ class AdminAlcoholsControllerDocsTest {
fieldWithPath("data[].imageUrl").type(JsonFieldType.STRING).description("술 이미지 URL"),
fieldWithPath("data[].createdAt").type(JsonFieldType.STRING).description("생성일시"),
fieldWithPath("data[].modifiedAt").type(JsonFieldType.STRING).description("수정일시"),
fieldWithPath("data[].deletedAt").type(JsonFieldType.STRING).description("삭제일시").optional(),
fieldWithPath("errors").type(JsonFieldType.ARRAY).description("에러 목록"),
fieldWithPath("meta").type(JsonFieldType.OBJECT).description("메타 정보"),
fieldWithPath("meta.page").type(JsonFieldType.NUMBER).description("현재 페이지 번호"),
Expand Down Expand Up @@ -203,7 +204,7 @@ class AdminAlcoholsControllerDocsTest {
code = AdminResultResponse.ResultCode.ALCOHOL_CREATED,
targetId = 1L
)
val request = AlcoholsHelper.createAlcoholUpsertRequestMap()
val request = AlcoholsHelper.createAlcoholUpsertRequestMap(tastingTagIds = listOf(1L, 2L))

given(adminAlcoholCommandService.createAlcohol(any(AdminAlcoholUpsertRequest::class.java)))
.willReturn(response)
Expand Down Expand Up @@ -234,7 +235,8 @@ class AdminAlcoholsControllerDocsTest {
fieldWithPath("cask").type(JsonFieldType.STRING).description("캐스크 타입"),
fieldWithPath("imageUrl").type(JsonFieldType.STRING).description("이미지 URL"),
fieldWithPath("description").type(JsonFieldType.STRING).description("설명"),
fieldWithPath("volume").type(JsonFieldType.STRING).description("용량")
fieldWithPath("volume").type(JsonFieldType.STRING).description("용량"),
fieldWithPath("tastingTagIds").type(JsonFieldType.ARRAY).optional().description("테이스팅 태그 ID 목록")
),
responseFields(
fieldWithPath("success").type(JsonFieldType.BOOLEAN).description("응답 성공 여부"),
Expand Down Expand Up @@ -265,7 +267,8 @@ class AdminAlcoholsControllerDocsTest {
)
val request = AlcoholsHelper.createAlcoholUpsertRequestMap(
korName = "수정된 위스키",
engName = "Updated Whisky"
engName = "Updated Whisky",
tastingTagIds = listOf(1L, 2L)
)

given(adminAlcoholCommandService.updateAlcohol(anyLong(), any(AdminAlcoholUpsertRequest::class.java)))
Expand Down Expand Up @@ -300,7 +303,8 @@ class AdminAlcoholsControllerDocsTest {
fieldWithPath("cask").type(JsonFieldType.STRING).description("캐스크 타입"),
fieldWithPath("imageUrl").type(JsonFieldType.STRING).description("이미지 URL"),
fieldWithPath("description").type(JsonFieldType.STRING).description("설명"),
fieldWithPath("volume").type(JsonFieldType.STRING).description("용량")
fieldWithPath("volume").type(JsonFieldType.STRING).description("용량"),
fieldWithPath("tastingTagIds").type(JsonFieldType.ARRAY).optional().description("테이스팅 태그 ID 목록")
),
responseFields(
fieldWithPath("success").type(JsonFieldType.BOOLEAN).description("응답 성공 여부"),
Expand Down
3 changes: 2 additions & 1 deletion bottlenote-admin-api/src/test/kotlin/app/docs/alcohols/AdminTastingTagControllerDocsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ class AdminTastingTagControllerDocsTest {
val alcoholItem = AdminAlcoholItem(
1L, "글렌피딕 12년", "Glenfiddich 12", "싱글몰트", "Single Malt",
"https://example.com/image.jpg",
LocalDateTime.of(2024, 1, 1, 0, 0), LocalDateTime.of(2024, 6, 1, 0, 0)
LocalDateTime.of(2024, 1, 1, 0, 0), LocalDateTime.of(2024, 6, 1, 0, 0), null
)

val response = AdminTastingTagDetailResponse.of(tagNode, listOf(alcoholItem))
Expand Down Expand Up @@ -176,6 +176,7 @@ class AdminTastingTagControllerDocsTest {
fieldWithPath("data.alcohols[].imageUrl").type(JsonFieldType.STRING).description("이미지 URL").optional(),
fieldWithPath("data.alcohols[].createdAt").type(JsonFieldType.STRING).description("생성일시"),
fieldWithPath("data.alcohols[].modifiedAt").type(JsonFieldType.STRING).description("수정일시"),
fieldWithPath("data.alcohols[].deletedAt").type(JsonFieldType.STRING).description("삭제일시").optional(),
fieldWithPath("errors").type(JsonFieldType.ARRAY).description("에러 목록"),
fieldWithPath("meta").type(JsonFieldType.OBJECT).description("메타 정보"),
fieldWithPath("meta.serverVersion").type(JsonFieldType.STRING).ignored(),
Expand Down
1 change: 1 addition & 0 deletions bottlenote-admin-api/src/test/kotlin/app/docs/curation/AdminCurationControllerDocsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ class AdminCurationControllerDocsTest {
fieldWithPath("data.alcohols[].imageUrl").type(JsonFieldType.STRING).description("이미지 URL"),
fieldWithPath("data.alcohols[].createdAt").type(JsonFieldType.STRING).description("생성일시"),
fieldWithPath("data.alcohols[].modifiedAt").type(JsonFieldType.STRING).description("수정일시"),
fieldWithPath("data.alcohols[].deletedAt").type(JsonFieldType.STRING).description("삭제일시").optional(),
fieldWithPath("data.createdAt").type(JsonFieldType.STRING).description("생성일시"),
fieldWithPath("data.modifiedAt").type(JsonFieldType.STRING).description("수정일시"),
fieldWithPath("errors").type(JsonFieldType.ARRAY).description("에러 목록"),
Expand Down
41 changes: 22 additions & 19 deletions bottlenote-admin-api/src/test/kotlin/app/helper/alcohols/AlcoholsHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ object AlcoholsHelper {
engCategoryName: String = "Single Malt",
imageUrl: String = "https://example.com/image.jpg",
createdAt: LocalDateTime = LocalDateTime.of(2024, 1, 1, 0, 0),
modifiedAt: LocalDateTime = LocalDateTime.of(2024, 6, 1, 0, 0)
modifiedAt: LocalDateTime = LocalDateTime.of(2024, 6, 1, 0, 0),
deletedAt: LocalDateTime? = null
): AdminAlcoholItem = AdminAlcoholItem(
id, korName, engName, korCategoryName, engCategoryName, imageUrl, createdAt, modifiedAt
id, korName, engName, korCategoryName, engCategoryName, imageUrl, createdAt, modifiedAt, deletedAt
)

fun createAdminAlcoholItems(count: Int = 2): List<AdminAlcoholItem> =
Expand Down Expand Up @@ -190,21 +191,23 @@ object AlcoholsHelper {
cask: String = "American Oak",
imageUrl: String = "https://example.com/test.jpg",
description: String = "테스트 설명",
volume: String = "700ml"
): Map<String, Any> = mapOf(
"korName" to korName,
"engName" to engName,
"abv" to abv,
"type" to type.name,
"korCategory" to korCategory,
"engCategory" to engCategory,
"categoryGroup" to categoryGroup.name,
"regionId" to regionId,
"distilleryId" to distilleryId,
"age" to age,
"cask" to cask,
"imageUrl" to imageUrl,
"description" to description,
"volume" to volume
)
volume: String = "700ml",
tastingTagIds: List<Long>? = null
): Map<String, Any> = buildMap {
put("korName", korName)
put("engName", engName)
put("abv", abv)
put("type", type.name)
put("korCategory", korCategory)
put("engCategory", engCategory)
put("categoryGroup", categoryGroup.name)
put("regionId", regionId)
put("distilleryId", distilleryId)
put("age", age)
put("cask", cask)
put("imageUrl", imageUrl)
put("description", description)
put("volume", volume)
tastingTagIds?.let { put("tastingTagIds", it) }
}
}
Loading
Loading