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

정보수정제안 v1 MR #172

Merged
merged 16 commits into from
Dec 19, 2023
Merged

정보수정제안 v1 MR #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ddce006
add: 정보 수정 제안 v1 (#147)
kymjaehong Nov 2, 2023
061f169
정보 수정 제안, 메뉴 read (#147)
kymjaehong Nov 7, 2023
ed97da7
메뉴 수정에서 우측 버튼 클릭 시, 선택 창(#147)
kymjaehong Nov 15, 2023
ced382c
edit: imageview -> spinner (#147)
kymjaehong Nov 25, 2023
48d68ef
popupmenu 구현 (#147)
kymjaehong Dec 4, 2023
e05e4bf
Add: 수정하기, 삭제하기 버튼 클릭 구현 (#147)
kymjaehong Dec 6, 2023
0760300
Add : 페이지 이동 및 다이얼로그 기본 구현 (#147)
kymjaehong Dec 7, 2023
36bfe00
Edit: 메뉴 삭제 화면 재로딩, 다음 수정 반영 (#147)
kymjaehong Dec 11, 2023
3857ff1
Edit: 삭제 부분 피드백 반영 & 수정 시, fragment 데이터 전달(#147)
kymjaehong Dec 12, 2023
0cf856a
정보수정제안 api 구현 #147
kymjaehong Dec 14, 2023
b17a9f0
메뉴 수정 시, 초기 데이터 초기화 (#147)
kymjaehong Dec 17, 2023
4bc4441
edit: manifest && style check
kymjaehong Dec 17, 2023
8bd073a
누락된 navigation animation 추가 및 개행
easyhooon Dec 18, 2023
1abef05
Edit: 피드백 일부 반영 #147
kymjaehong Dec 18, 2023
3ac264e
Merge branch 'feature/update-cafe-place' of github.com:Wedemy/eggeum-…
kymjaehong Dec 18, 2023
1d4f0ec
Edit: 메뉴 수정 완료 화면에서 정보 수정 제안 화면으로 돌아가는 경우 사이에 쌓여 있는 백스택 제거
easyhooon Dec 18, 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
18 changes: 16 additions & 2 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,28 @@

</provider>

<!-- <activity-->
<!-- android:name=".IntroActivity"-->
<!-- android:exported="true"-->
<!-- android:theme="@style/Theme.Eggeum.Splash">-->

<!-- <intent-filter>-->
<!-- <action android:name="android.intent.action.MAIN" />-->
<!-- <category android:name="android.intent.category.LAUNCHER" />-->
<!-- </intent-filter>-->

<!-- </activity>-->

<activity
android:name=".IntroActivity"
android:name=".updatecafe.ui.UpdateCafeActivity"
android:exported="true"
android:theme="@style/Theme.Eggeum.Splash">
android:theme="@style/Theme.Eggeum.UpdateCafe">

<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>

</activity>

</application>
Expand Down
4 changes: 2 additions & 2 deletions data/src/main/kotlin/us/wedemy/eggeum/android/data/mapper/FileMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ public fun FileEntity.toModel(): File =

public fun Image.toEntity(): ImageEntity =
ImageEntity(
files = files.map { it.toEntity() },
files = files?.map { it.toEntity() },
)

public fun ImageEntity.toModel(): Image =
Image(
files = files.map { it.toModel() },
files = files?.map { it.toModel() },
)

internal fun ProfileImage.toEntity() =
Expand Down
8 changes: 4 additions & 4 deletions data/src/main/kotlin/us/wedemy/eggeum/android/data/mapper/PlaceMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ internal fun UpsertPlaceEntity.toModel() =
UpsertPlaceRequest(
address1 = address1,
address2 = address2,
image = image.toModel(),
image = image?.toModel(),
info = info.toModel(),
latitude = latitude,
longitude = longitude,
menu = menu.toModel(),
menu = menu?.toModel(),
name = name,
placeId = placeId,
remarks = remarks,
Expand Down Expand Up @@ -94,12 +94,12 @@ public fun InfoEntity.toModel(): Info =

public fun Menu.toEntity(): MenuEntity =
MenuEntity(
products = products.map { it.toEntity() },
products = products?.map { it.toEntity() },
)

public fun MenuEntity.toModel(): Menu =
Menu(
products = products.map { it.toModel() },
products = products?.map { it.toModel() },
)

public fun Product.toEntity(): ProductEntity =
Expand Down
2 changes: 1 addition & 1 deletion data/src/main/kotlin/us/wedemy/eggeum/android/data/model/place/Image.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ import us.wedemy.eggeum.android.data.model.File
@Serializable
public data class Image(
@SerialName("files")
val files: List<File>,
val files: List<File>?,
)
6 changes: 3 additions & 3 deletions data/src/main/kotlin/us/wedemy/eggeum/android/data/model/place/Info.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ import kotlinx.serialization.Serializable
@Serializable
public data class Info(
@SerialName("areaSize")
val areaSize: String,
val areaSize: String?,

@SerialName("blogUri")
val blogUri: String?,
Expand All @@ -70,13 +70,13 @@ public data class Info(
val existsSmokingArea: Boolean?,

@SerialName("existsWifi")
val existsWifi: Boolean,
val existsWifi: Boolean?,

@SerialName("instagramUri")
val instagramUri: String?,

@SerialName("meetingRoomCount")
val meetingRoomCount: Int,
val meetingRoomCount: Int?,

@SerialName("mobileCharging")
val mobileCharging: String?,
Expand Down
2 changes: 1 addition & 1 deletion data/src/main/kotlin/us/wedemy/eggeum/android/data/model/place/Menu.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ import kotlinx.serialization.Serializable
@Serializable
public data class Menu(
@SerialName("products")
val products: List<Product>,
val products: List<Product>?,
)
33 changes: 0 additions & 33 deletions data/src/main/kotlin/us/wedemy/eggeum/android/data/model/place/PlaceResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,39 +10,6 @@ package us.wedemy.eggeum.android.data.model.place
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable

// @JsonClass(generateAdapter = true)
// public data class PlaceResponse(
// @Json(name = "address1")
// val address1: String,
//
// @Json(name = "address2")
// val address2: String,
//
// @Json(name = "id")
// val id: Int,
//
// @Json(name = "image")
// val image: Image,
//
// @Json(name = "info")
// val info: Info,
//
// @Json(name = "latitude")
// val latitude: Double,
//
// @Json(name = "longitude")
// val longitude: Double,
//
// @Json(name = "menu")
// val menu: Menu,
//
// @Json(name = "name")
// val name: String,
//
// @Json(name = "type")
// val type: String,
// )

@Serializable
public data class PlaceResponse(
@SerialName("address1")
Expand Down
18 changes: 9 additions & 9 deletions data/src/main/kotlin/us/wedemy/eggeum/android/data/model/place/UpsertPlaceRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,35 +49,35 @@ import kotlinx.serialization.Serializable
@Serializable
public data class UpsertPlaceRequest(
@SerialName("address1")
val address1: String,
val address1: String?,

@SerialName("address2")
val address2: String,
val address2: String?,

@SerialName("image")
val image: Image,
val image: Image?,

@SerialName("info")
val info: Info,

@SerialName("latitude")
val latitude: Double,
val latitude: Double?,

@SerialName("longitude")
val longitude: Double,
val longitude: Double?,

@SerialName("menu")
val menu: Menu,
val menu: Menu?,

@SerialName("name")
val name: String,
val name: String?,

@SerialName("placeId")
val placeId: Int,

@SerialName("remarks")
val remarks: String,
val remarks: String?,

@SerialName("type")
val type: String,
val type: String?,
)
3 changes: 2 additions & 1 deletion data/src/main/kotlin/us/wedemy/eggeum/android/data/service/PlaceService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ package us.wedemy.eggeum.android.data.service
import retrofit2.Response
import retrofit2.http.Body
import retrofit2.http.GET
import retrofit2.http.POST
import retrofit2.http.Path
import retrofit2.http.Query
import us.wedemy.eggeum.android.data.model.place.PlaceResponse
Expand Down Expand Up @@ -37,7 +38,7 @@ public interface PlaceService {
@Query("type") type: String? = null,
): PlaceListResponse

@GET("app/place/edits")
@POST("app/place/edits")
public suspend fun upsertPlace(
@Body upsertPlaceRequest: UpsertPlaceRequest,
): Response<Unit>
Expand Down
14 changes: 12 additions & 2 deletions domain/src/main/kotlin/us/wedemy/eggeum/android/domain/model/place/ImageEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,15 @@ package us.wedemy.eggeum.android.domain.model.place
import us.wedemy.eggeum.android.domain.model.FileEntity

public data class ImageEntity(
val files: List<FileEntity>,
)
val files: List<FileEntity>?,
) {
public companion object {
public fun of(
files: List<FileEntity>? = null,
): ImageEntity {
return ImageEntity(
files = files,
)
}
}
}
44 changes: 40 additions & 4 deletions domain/src/main/kotlin/us/wedemy/eggeum/android/domain/model/place/InfoEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,54 @@
package us.wedemy.eggeum.android.domain.model.place

public data class InfoEntity(
val areaSize: String,
val areaSize: String?,
val blogUri: String?,
val businessHours: List<String>?,
val existsSmokingArea: Boolean?,
val existsWifi: Boolean,
val existsWifi: Boolean?,
val instagramUri: String?,
val meetingRoomCount: Int,
val meetingRoomCount: Int?,
val mobileCharging: String?,
val multiSeatCount: Int?,
val parking: String?,
val phone: String?,
val restRoom: String?,
val singleSeatCount: Int?,
val websiteUri: String?,
)
) {
public companion object {
public fun of(
Copy link
Collaborator

@easyhooon easyhooon Dec 18, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

해당 companion object 내에 함수(of) 가 잘 이해가 안되는데 어떤 역할을 하는 함수인가요?
mapper 의 역할이라면 기존의 방식과 동일하게 바꾸면 좋을것 같아요 (mapper 패키지내에 mapper 를 만들어주는)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

viewModel에서 데이터 관리하면, 없어져야 할 부분이라 생각하는데
이렇게 많은 변수를 다뤄본 적이 없어서 그냥 빌더패턴으로 객체 만들어서 넘겼습니다.

areaSize: String? = null,
blogUri: String? = null,
businessHours: List<String>? = null,
existsSmokingArea: Boolean? = null,
existsWifi: Boolean? = null,
instagramUri: String? = null,
meetingRoomCount: Int? = null,
mobileCharging: String? = null,
multiSeatCount: Int? = null,
parking: String? = null,
phone: String? = null,
restRoom: String? = null,
singleSeatCount: Int? = null,
websiteUri: String? = null,
): InfoEntity {
return InfoEntity(
areaSize = areaSize,
blogUri = blogUri,
businessHours = businessHours,
existsSmokingArea = existsSmokingArea,
existsWifi = existsWifi,
instagramUri = instagramUri,
meetingRoomCount = meetingRoomCount,
mobileCharging = mobileCharging,
multiSeatCount = multiSeatCount,
parking = parking,
phone = phone,
restRoom = restRoom,
singleSeatCount = singleSeatCount,
websiteUri = websiteUri,
)
}
}
}
14 changes: 12 additions & 2 deletions domain/src/main/kotlin/us/wedemy/eggeum/android/domain/model/place/MenuEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,15 @@
package us.wedemy.eggeum.android.domain.model.place

public data class MenuEntity(
val products: List<ProductEntity>,
)
var products: List<ProductEntity>?,
) {
public companion object {
public fun of(
products: List<ProductEntity>? = null,
): MenuEntity {
return MenuEntity(
products = products,
)
}
}
}
55 changes: 49 additions & 6 deletions domain/src/main/kotlin/us/wedemy/eggeum/android/domain/model/place/PlaceEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,55 @@ package us.wedemy.eggeum.android.domain.model.place
public data class PlaceEntity(
val address1: String?,
val address2: String?,
val id: Int,
val image: ImageEntity,
val info: InfoEntity,
val id: Int?,
val image: ImageEntity?,
var info: InfoEntity?,
val latitude: Double,
val longitude: Double,
val menu: MenuEntity,
val name: String,
val menu: MenuEntity?,
val name: String?,
val type: String?,
)
) {
public fun toUpsertPlaceEntity(): UpsertPlaceEntity {
return UpsertPlaceEntity(
address1 = address1,
address2 = address2,
placeId = id!!,
image = image,
info = info!!,
latitude = latitude,
longitude = longitude,
menu = menu,
name = name,
remarks = null,
type = type,
)
}
public companion object {
public fun of(
address1: String? = null,
address2: String? = null,
id: Int? = null,
image: ImageEntity? = null,
info: InfoEntity? = null,
latitude: Double? = null,
longitude: Double? = null,
menu: MenuEntity? = null,
name: String? = null,
type: String? = null,
): PlaceEntity {
return PlaceEntity(
address1 = address1,
address2 = address2,
id = id,
image = image,
info = info,
latitude = latitude!!,
longitude = longitude!!,
menu = menu,
name = name,
type = type,
)
}
}
}
4 changes: 2 additions & 2 deletions domain/src/main/kotlin/us/wedemy/eggeum/android/domain/model/place/ProductEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
package us.wedemy.eggeum.android.domain.model.place

public data class ProductEntity(
val name: String,
val price: Int,
var name: String,
Copy link
Collaborator

Choose a reason for hiding this comment

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

entity Paramter 를 var 로 변경하신 이유가 있으신가요

Copy link
Contributor Author

@kymjaehong kymjaehong Dec 18, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

[ProposeCafeInfoViewModel]에서

placeBody.menu?.products.let { productEntities -> productEntities?.forEach { if (it.name == before?.name && it.price == before.price) { it.name = after?.name!! it.price = after.price } } } 여기서 일단 이렇게 구현을 해버려서 그랬습니다. 여기도 수정해야겠네요

Copy link
Contributor Author

Choose a reason for hiding this comment

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

todo

Copy link
Collaborator

Choose a reason for hiding this comment

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

객체를 복사해서 변경 하는 .copy() 같은 함수 사용하면 var로 선언하지 않아도 값 자체를 변경할 수 있습니다. uiState.update { it.copy() 이런식으로 } 내부 값을 변경하는 함수가 main 모듈의 UserInfoViewModel 같은 곳에 사용되고 있는데 참고해보시면 좋을 것 같아요

Copy link
Contributor Author

Choose a reason for hiding this comment

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

다음에 반영해볼게요

var price: Int,
)
Loading