diff --git a/android/app/src/main/java/com/happy/friendogly/data/mapper/ClubMapper.kt b/android/app/src/main/java/com/happy/friendogly/data/mapper/ClubMapper.kt index 4033e9836..98b92dd75 100644 --- a/android/app/src/main/java/com/happy/friendogly/data/mapper/ClubMapper.kt +++ b/android/app/src/main/java/com/happy/friendogly/data/mapper/ClubMapper.kt @@ -16,8 +16,6 @@ fun ClubDto.toDomain(): Club { address = address.toDomain(), status = status.toDomain(), createdAt = createdAt, - allowedSize = allowedSize.map { it.toDomain() }, - allowedGender = allowedGender.map { it.toDomain() }, memberCapacity = memberCapacity, imageUrl = imageUrl, currentMemberCount = currentMemberCount, @@ -34,8 +32,6 @@ fun Club.toData(): ClubDto { address = address.toData(), status = status.toData(), createdAt = createdAt, - allowedSize = allowedSize.map { it.toData() }, - allowedGender = allowedGender.map { it.toData() }, memberCapacity = memberCapacity, imageUrl = imageUrl, currentMemberCount = currentMemberCount, diff --git a/android/app/src/main/java/com/happy/friendogly/data/model/ClubDto.kt b/android/app/src/main/java/com/happy/friendogly/data/model/ClubDto.kt index 1b5908d1c..f7c8e268c 100644 --- a/android/app/src/main/java/com/happy/friendogly/data/model/ClubDto.kt +++ b/android/app/src/main/java/com/happy/friendogly/data/model/ClubDto.kt @@ -10,8 +10,6 @@ data class ClubDto( val address: ClubAddressDto, val status: ClubStateDto, val createdAt: LocalDateTime, - val allowedGender: List, - val allowedSize: List, val memberCapacity: Int, val currentMemberCount: Int, val imageUrl: String? = null, diff --git a/android/app/src/main/java/com/happy/friendogly/domain/model/Club.kt b/android/app/src/main/java/com/happy/friendogly/domain/model/Club.kt index 9083b80c2..bf5297fab 100644 --- a/android/app/src/main/java/com/happy/friendogly/domain/model/Club.kt +++ b/android/app/src/main/java/com/happy/friendogly/domain/model/Club.kt @@ -10,8 +10,6 @@ data class Club( val address: ClubAddress, val status: ClubState, val createdAt: LocalDateTime, - val allowedGender: List, - val allowedSize: List, val memberCapacity: Int, val currentMemberCount: Int, val imageUrl: String? = null, diff --git a/android/app/src/main/java/com/happy/friendogly/presentation/ui/club/common/adapter/club/ClubViewHolder.kt b/android/app/src/main/java/com/happy/friendogly/presentation/ui/club/common/adapter/club/ClubViewHolder.kt index 673c6e79b..0572b6d92 100644 --- a/android/app/src/main/java/com/happy/friendogly/presentation/ui/club/common/adapter/club/ClubViewHolder.kt +++ b/android/app/src/main/java/com/happy/friendogly/presentation/ui/club/common/adapter/club/ClubViewHolder.kt @@ -4,17 +4,14 @@ import androidx.recyclerview.widget.RecyclerView import com.happy.friendogly.databinding.ItemClubBinding import com.happy.friendogly.presentation.ui.club.common.ClubItemActionHandler import com.happy.friendogly.presentation.ui.club.common.model.ClubItemUiModel -import com.happy.friendogly.presentation.ui.club.list.adapter.filter.FilterAdapter import com.happy.friendogly.presentation.ui.club.list.adapter.pet.ClubPetAdapter class ClubViewHolder( private val binding: ItemClubBinding, ) : RecyclerView.ViewHolder(binding.root) { - private val filterAdapter = FilterAdapter() private val woofAdapter = ClubPetAdapter() init { - binding.rcvClubListFilterList.adapter = filterAdapter binding.rcvClubListDogList.adapter = woofAdapter } @@ -24,7 +21,6 @@ class ClubViewHolder( ) { binding.club = clubItemUiModel binding.actionHandler = actionHandler - filterAdapter.submitList(clubItemUiModel.filters) woofAdapter.submitList(clubItemUiModel.clubPets) } } diff --git a/android/app/src/main/java/com/happy/friendogly/presentation/ui/club/common/mapper/ClubMapper.kt b/android/app/src/main/java/com/happy/friendogly/presentation/ui/club/common/mapper/ClubMapper.kt index 2f1d2a5f6..83720ae77 100644 --- a/android/app/src/main/java/com/happy/friendogly/presentation/ui/club/common/mapper/ClubMapper.kt +++ b/android/app/src/main/java/com/happy/friendogly/presentation/ui/club/common/mapper/ClubMapper.kt @@ -16,7 +16,6 @@ fun Club.toPresentation(): ClubItemUiModel { clubLocation = address.toPresentation(), clubLeaderName = ownerMemberName, title = title, - filters = allowedGender.toGenderGroupFilters() + allowedSize.toSizeGroupFilters(), clubDate = createdAt, currentNumberOfPeople = currentMemberCount, content = content, diff --git a/android/app/src/main/java/com/happy/friendogly/presentation/ui/club/common/model/ClubItemUiModel.kt b/android/app/src/main/java/com/happy/friendogly/presentation/ui/club/common/model/ClubItemUiModel.kt index c0fc999f4..6361ea7ed 100644 --- a/android/app/src/main/java/com/happy/friendogly/presentation/ui/club/common/model/ClubItemUiModel.kt +++ b/android/app/src/main/java/com/happy/friendogly/presentation/ui/club/common/model/ClubItemUiModel.kt @@ -1,12 +1,10 @@ package com.happy.friendogly.presentation.ui.club.common.model import com.happy.friendogly.domain.model.ClubState -import com.happy.friendogly.presentation.ui.club.common.model.clubfilter.ClubFilter import kotlinx.datetime.LocalDateTime data class ClubItemUiModel( val clubId: Long, - val filters: List, val clubPoster: String?, val clubState: ClubState, val title: String, diff --git a/android/app/src/main/java/com/happy/friendogly/remote/mapper/ClubMapper.kt b/android/app/src/main/java/com/happy/friendogly/remote/mapper/ClubMapper.kt index 17824183c..0ad8f183b 100644 --- a/android/app/src/main/java/com/happy/friendogly/remote/mapper/ClubMapper.kt +++ b/android/app/src/main/java/com/happy/friendogly/remote/mapper/ClubMapper.kt @@ -16,8 +16,6 @@ fun ClubResponse.toData(): ClubDto { address = address.toData(), status = status.toData(), createdAt = createdAt, - allowedGender = allowedGender.map { it.toData() }, - allowedSize = allowedSize.map { it.toData() }, memberCapacity = memberCapacity, currentMemberCount = currentMemberCount, imageUrl = imageUrl, diff --git a/android/app/src/main/java/com/happy/friendogly/remote/model/response/ClubResponse.kt b/android/app/src/main/java/com/happy/friendogly/remote/model/response/ClubResponse.kt index dbe7af9b4..e2cfb05d7 100644 --- a/android/app/src/main/java/com/happy/friendogly/remote/model/response/ClubResponse.kt +++ b/android/app/src/main/java/com/happy/friendogly/remote/model/response/ClubResponse.kt @@ -14,8 +14,6 @@ data class ClubResponse( val status: ClubStateResponse, @Serializable(with = LocalDateTimeSerializer::class) val createdAt: LocalDateTime, - val allowedGender: List, - val allowedSize: List, val memberCapacity: Int, val currentMemberCount: Int, val imageUrl: String? = null, diff --git a/android/app/src/main/res/layout/item_club.xml b/android/app/src/main/res/layout/item_club.xml index edd5804cd..9498cdd2e 100644 --- a/android/app/src/main/res/layout/item_club.xml +++ b/android/app/src/main/res/layout/item_club.xml @@ -53,19 +53,6 @@ app:layout_constraintStart_toEndOf="@id/iv_club_list_poster" app:layout_constraintTop_toTopOf="@id/iv_club_list_poster"> - -