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

🔀 :: (#208) 이미지 추가 전으로 롤백 #209

Merged
merged 2 commits into from
Mar 21, 2023
Merged

🔀 :: (#208) 이미지 추가 전으로 롤백 #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7a8265
⚡️ :: 다시 롤백
lyutvs Mar 20, 2023
58639b7
♻️ :: response명 변경
lyutvs Mar 20, 2023
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: 0 additions & 2 deletions notification-domain/src/main/kotlin/io/github/v1servicenotification/category/Category.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,4 @@ class Category(
val destination: String,

val defaultActivated: Boolean,

val categoryImageUrl: String,
)
2 changes: 1 addition & 1 deletion ...cation-domain/src/main/kotlin/io/github/v1servicenotification/category/api/CategoryApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ import java.util.UUID

interface CategoryApi {
fun queryNotificationCategory(defaultActivated: Boolean): CategoryListResponse
fun createCategory(name: String, destination: String, defaultActivated: Boolean, categoryImage: String)
fun createCategory(name: String, destination: String, defaultActivated: Boolean)
fun removeCategory(categoryId: UUID)
}
1 change: 0 additions & 1 deletion .../src/main/kotlin/io/github/v1servicenotification/category/api/response/CategoryElement.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ class CategoryElement(
val id: UUID,
val name: String,
val destination: String,
val categoryImage: String,
)
5 changes: 2 additions & 3 deletions ...omain/src/main/kotlin/io/github/v1servicenotification/category/service/CategoryApiImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,17 @@ class CategoryApiImpl(
override fun queryNotificationCategory(defaultActivated: Boolean): CategoryListResponse {
return CategoryListResponse(
queryCategoryRepositorySpi.findAllByDefaultActivated(defaultActivated)
.map { CategoryElement(it.id, it.name, it.destination, it.categoryImageUrl) }
.map { CategoryElement(it.id, it.name, it.destination) }
.toList()
)
}

override fun createCategory(name: String, destination: String, defaultActivated: Boolean, categoryImage: String) {
override fun createCategory(name: String, destination: String, defaultActivated: Boolean) {
updateCategoryRepositorySpi.saveCategory(
Category(
name = name,
destination = destination,
defaultActivated = defaultActivated,
categoryImageUrl = categoryImage
)
)
}
Expand Down
3 changes: 1 addition & 2 deletions .../src/main/kotlin/io/github/v1servicenotification/detail/api/dto/response/DetailElement.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ class DetailElement(
val sentAt: LocalDateTime,
val isRead: Boolean,
val userId: UUID,
val name: String,
val categoryName: String,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Q) 요쪽 name -> categoryName은 Client랑 다 이야기된 부분이죠?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

넵 상의후 변경한 부분입니다

val destination: String,
val categoryImage: String,
)
3 changes: 1 addition & 2 deletions ...on-domain/src/main/kotlin/io/github/v1servicenotification/detail/service/DetailApiImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,8 @@ class DetailApiImpl(
sentAt = it.sentAt,
isRead = it.isRead,
userId = it.userId,
name = it.name,
categoryName = it.name,
destination = it.destination,
categoryImage = it.categoryImage
)
}
.toList()
Expand Down
2 changes: 0 additions & 2 deletions ...tion-domain/src/main/kotlin/io/github/v1servicenotification/detail/spi/dto/DetailModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ class DetailModel(
val name: String,

val destination: String,

val categoryImage: String,
) {
var isRead: Boolean = isRead
private set
Expand Down
1 change: 0 additions & 1 deletion ...-domain/src/main/kotlin/io/github/v1servicenotification/setting/service/SettingApiImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ class SettingApiImpl(
id = it.id,
name = it.name,
destination = it.destination,
categoryImage = it.categoryImageUrl
)
}
.toList()
Expand Down
1 change: 0 additions & 1 deletion ...-domain/src/main/kotlin/io/github/v1servicenotification/stubs/InMemoryDetailRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ class InMemoryDetailRepository(
it.value.userId,
category.name,
category.destination,
category.categoryImageUrl
)
}
}
Expand Down
10 changes: 0 additions & 10 deletions ...ation-domain/src/test/kotlin/io/github/v1servicenotification/category/CategoryImplTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@ class CategoryImplTest {
val name = "Test name"
val destination = "Test destination"
val defaultActivated = true
val categoryImage = "https://~~"

category.createCategory(
name = name,
destination = destination,
defaultActivated = defaultActivated,
categoryImage = categoryImage,
)

updateCategorySpi.findAllByDefaultActivated(true)
Expand All @@ -45,13 +43,11 @@ class CategoryImplTest {
val name = "Test name"
val destination = "Test destination"
val defaultActivated = false
val categoryImage = "https://~~"

category.createCategory(
name = name,
destination = destination,
defaultActivated = defaultActivated,
categoryImage = categoryImage,
)

Assertions.assertThat(updateCategorySpi.findAllByDefaultActivated(true).size).isEqualTo(0)
Expand All @@ -65,7 +61,6 @@ class CategoryImplTest {
"Test category",
"Test destination",
true,
"https://~~"
)
)
assertThat(category.queryNotificationCategory(true).categories.size)
Expand All @@ -80,7 +75,6 @@ class CategoryImplTest {
"Test category",
"Test destination",
false,
"https://~~"
)
)

Expand All @@ -96,7 +90,6 @@ class CategoryImplTest {
"Test category",
"Test destination",
false,
"https://~~"
)
)
assertThat(category.queryNotificationCategory(false).categories.size)
Expand All @@ -111,7 +104,6 @@ class CategoryImplTest {
"Test category",
"Test destination",
true,
"https://~~"
)
)

Expand All @@ -125,15 +117,13 @@ class CategoryImplTest {
val name = "Test name"
val destination = "Test destination"
val defaultActivated = false
val categoryImage = "https://~~"

updateCategorySpi.saveCategory(
Category(
id = id,
name = name,
destination = destination,
defaultActivated = defaultActivated,
categoryImageUrl = categoryImage,
)
)

Expand Down
8 changes: 0 additions & 8 deletions ...cation-domain/src/test/kotlin/io/github/v1servicenotification/detail/DetailApiImplTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ class DetailApiImplTest {
"Test category",
"Test destination",
true,
"https://~~"
)
val userId = UUID.randomUUID()

Expand Down Expand Up @@ -60,14 +59,12 @@ class DetailApiImplTest {
val content = "Test Content"
val destination = "/test"
val categoryName = "Test Category"
val categoryImage = "https://~~"

val category = Category(
id = UUID.randomUUID(),
name = categoryName,
destination = destination,
defaultActivated = true,
categoryImageUrl = categoryImage,
)

categorySpi.saveCategory(category)
Expand Down Expand Up @@ -105,7 +102,6 @@ class DetailApiImplTest {
name = categoryName,
destination = destination,
defaultActivated = true,
categoryImageUrl = categoryImage
)

categorySpi.saveCategory(category)
Expand Down Expand Up @@ -134,14 +130,12 @@ class DetailApiImplTest {
val content = "Test Content"
val destination = "/test"
val categoryName = "Test Category"
val categoryImage = "https://~~"

val category = Category(
id = UUID.randomUUID(),
name = categoryName,
destination = destination,
defaultActivated = false,
categoryImageUrl = categoryImage
)

categorySpi.saveCategory(category)
Expand Down Expand Up @@ -180,14 +174,12 @@ class DetailApiImplTest {
val content = "Test Content"
val destination = "/test"
val categoryName = "Test Category"
val categoryImage = "https://~~"

val category = Category(
id = UUID.randomUUID(),
name = categoryName,
destination = destination,
defaultActivated = true,
categoryImageUrl = categoryImage
)

categorySpi.saveCategory(category)
Expand Down
6 changes: 3 additions & 3 deletions ...tion-domain/src/test/kotlin/io/github/v1servicenotification/setting/SettingApiImplTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class SettingApiImplTest {
val userId = UUID.randomUUID()
val categoryId = UUID.randomUUID()

val category = Category(categoryId, "Test name", "Test destination", false, "https://~~")
val category = Category(categoryId, "Test name", "Test destination", false)

settingSpi.saveCategory(category)

Expand All @@ -45,7 +45,7 @@ class SettingApiImplTest {
val userId = UUID.randomUUID()
val categoryId = UUID.randomUUID()
categorySpi.saveCategory(
Category(categoryId, "Test name", "Test destination", false, "https://~~")
Category(categoryId, "Test name", "Test destination", false)
)
Assertions.assertThat(settingApi.deActivateCategory(categoryId, userId))
.isEqualTo(201)
Expand All @@ -58,7 +58,7 @@ class SettingApiImplTest {
val userId = UUID.randomUUID()
val categoryId = UUID.randomUUID()
categorySpi.saveCategory(
Category(categoryId, "Test name", "Test destination", false, "https://~~")
Category(categoryId, "Test name", "Test destination", false)
)
assertThat(settingApi.activateCategory(categoryId, userId))
.isEqualTo(201)
Expand Down
9 changes: 1 addition & 8 deletions .../src/main/kotlin/io/github/v1servicenotification/domain/category/domain/CategoryEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,4 @@ class CategoryEntity(
@OneToMany(mappedBy = "settingId.categoryEntity", fetch = FetchType.LAZY)
val settingList: List<SettingEntity> = emptyList(),

categoryImageUrl: String,

) : BaseUUIDEntity(id) {

@field:NotNull
var categoryImageUrl = categoryImageUrl
protected set
}
) : BaseUUIDEntity(id)
2 changes: 0 additions & 2 deletions .../main/kotlin/io/github/v1servicenotification/domain/category/mapper/CategoryMapperImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ class CategoryMapperImpl: CategoryMapper {
name = category.name,
destination = category.destination,
defaultActivated = category.defaultActivated,
categoryImageUrl = category.categoryImageUrl
)
}

Expand All @@ -23,7 +22,6 @@ class CategoryMapperImpl: CategoryMapper {
name = categoryEntity.name,
destination = categoryEntity.destination,
defaultActivated = categoryEntity.defaultActivated,
categoryImageUrl = categoryEntity.categoryImageUrl
)
}
}
1 change: 0 additions & 1 deletion ...kotlin/io/github/v1servicenotification/domain/category/presentation/CategoryController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ class CategoryController(
name = request.name,
destination = request.destination,
defaultActivated = request.defaultActivated,
categoryImage = request.categoryImage
)
}

Expand Down
4 changes: 0 additions & 4 deletions ...b/v1servicenotification/domain/category/presentation/dto/request/CreateCategoryRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,4 @@ class CreateCategoryRequest {

var defaultActivated by Delegates.notNull<Boolean>()
private set

@NotNull
lateinit var categoryImage: String
private set
}
2 changes: 0 additions & 2 deletions ...ithub/v1servicenotification/domain/detail/domain/repository/CustomDetailRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ class CustomDetailRepositoryImpl(
detailEntity.userId,
categoryEntity.name,
categoryEntity.destination,
categoryEntity.categoryImageUrl
)
)
.from(detailEntity)
Expand All @@ -47,7 +46,6 @@ class CustomDetailRepositoryImpl(
userId = it.userId,
name = it.name,
destination = it.destination,
categoryImage = it.categoryImage
)
}
.toList()
Expand Down
1 change: 0 additions & 1 deletion ...ain/kotlin/io/github/v1servicenotification/domain/detail/domain/repository/vo/DetailVO.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ class DetailVO @QueryProjection constructor(

val destination: String,

val categoryImage: String,
) {
var isRead: Boolean = isRead
private set
Expand Down