-
Notifications
You must be signed in to change notification settings - Fork 0
[Feat/#94] 굿즈별 페이지 API 연동 #101
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 9 commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
eb56720
[Feat/#94] data
sonyerim e25ce4f
[Feat/#94] domain
sonyerim cda926b
[Feat/#94] presentation
sonyerim 797c7e2
Merge branch 'develop' into feat/#94-party-list-api
sonyerim 0d1b8b3
[Feat/#94] title 전달
sonyerim 4d7b6bd
[Feat/#94] 마이페이지 BadgeButton 비활성화
sonyerim 8e2780c
Merge remote-tracking branch 'origin/develop' into feat/#94-party-lis…
jyvnee a278770
[feat/#94] dto 수정
jyvnee 29eecef
Merge remote-tracking branch 'origin/feat/#94-party-list-api' into fe…
jyvnee d0dff85
[feat/#94] title 정보 넘겨주기
jyvnee 7f3392c
[feat/#94] title 정보 넘겨주기
jyvnee 4921883
Merge branch 'develop' into feat/#94-party-list-api
jyvnee d301b78
[feat/#94] 패딩 수정
jyvnee 4f57cee
[feat/#94] string 위치 수정
jyvnee 3d6bcf3
Merge branch 'develop' into feat/#94-party-list-api
jyvnee 019e4ac
[Feat/#94] 굿즈별 페이지 바텀시트 멤버 필터링
doyeon0307 4b62b2c
[Feat/#94] 굿즈별 페이지 정렬 옵션
doyeon0307 ed08062
[Feat/#94] 리로드 시 헤더 유지
doyeon0307 75cba1e
[Merge/#94] develop 병합
doyeon0307 eed3297
[Chore/#94] 오탈자 수정
doyeon0307 cdc789d
[Fix/#94] 멤버 선택 초기화 로직 수정
doyeon0307 ae9f5a1
[Fix/#94] 굿즈별페이지 정렬옵션 수정
doyeon0307 1b8698d
[Fix/#94] 정렬 바텀시트 분리 및 더보기 페이지 옵션 복구
doyeon0307 e21b8f7
[Chore/#94] ktlint 적용
doyeon0307 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
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
26 changes: 26 additions & 0 deletions
26
app/src/main/java/com/poti/android/data/mapper/party/ProductPartyListMapper.kt
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,26 @@ | ||
| package com.poti.android.data.mapper.party | ||
|
|
||
| import com.poti.android.data.remote.dto.response.party.PartyDto | ||
| import com.poti.android.data.remote.dto.response.party.ProductPartyListResponseDto | ||
| import com.poti.android.domain.model.party.PartySummary | ||
| import com.poti.android.domain.model.party.ProductPartyList | ||
|
|
||
| fun ProductPartyListResponseDto.toDomain(): ProductPartyList = | ||
| ProductPartyList( | ||
| partyTitle = postTitle, | ||
| artistName = artist, | ||
| partySummaries = pots.map { it.toDomain() }, | ||
| ) | ||
|
|
||
| private fun PartyDto.toDomain(): PartySummary = | ||
| PartySummary( | ||
| partyId = potId, | ||
| price = price, | ||
| goodsImageUrl = thumbnailUrl.orEmpty(), | ||
| currentCount = currentCount, | ||
| totalCount = totalCount, | ||
| availableMembers = availableMembers, | ||
| profileImageUrl = uploader.profileImage, | ||
| nickname = uploader.nickname, | ||
| rating = uploader.rating, | ||
| ) |
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
52 changes: 52 additions & 0 deletions
52
.../main/java/com/poti/android/data/remote/dto/response/party/ProductPartyListResponseDto.kt
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,52 @@ | ||
| package com.poti.android.data.remote.dto.response.party | ||
|
|
||
| import kotlinx.serialization.SerialName | ||
| import kotlinx.serialization.Serializable | ||
|
|
||
| @Serializable | ||
| data class ProductPartyListResponseDto( | ||
| @SerialName("postTitle") | ||
| val postTitle: String, | ||
| @SerialName("artistId") | ||
| val artistId: Long, | ||
| @SerialName("artist") | ||
| val artist: String, | ||
| @SerialName("currentPage") | ||
| val currentPage: Int, | ||
| @SerialName("hasNext") | ||
| val hasNext: Boolean, | ||
| @SerialName("pots") | ||
| val pots: List<PartyDto>, | ||
| ) | ||
|
|
||
| @Serializable | ||
| data class PartyDto( | ||
| @SerialName("potId") | ||
| val potId: Long, | ||
| @SerialName("price") | ||
| val price: Int, | ||
| @SerialName("thumbnailUrl") | ||
| val thumbnailUrl: String?, | ||
| @SerialName("currentCount") | ||
| val currentCount: Int, | ||
| @SerialName("totalCount") | ||
| val totalCount: Int, | ||
| @SerialName("status") | ||
| val status: String, | ||
| @SerialName("availableMembers") | ||
| val availableMembers: List<String>, | ||
| @SerialName("uploader") | ||
| val uploader: PartyUploaderDto, | ||
| ) | ||
|
|
||
| @Serializable | ||
| data class PartyUploaderDto( | ||
| @SerialName("userId") | ||
| val userId: Long, | ||
| @SerialName("nickname") | ||
| val nickname: String, | ||
| @SerialName("profileImage") | ||
| val profileImage: String?, | ||
| @SerialName("rating") | ||
| val rating: Double, | ||
| ) |
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
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
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
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
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.
Uh oh!
There was an error while loading. Please reload this page.