[feat] 핀 클릭 시 번개 목록 API 연동

app/src/main/AndroidManifest.xml

@@ -81,7 +81,7 @@
             tools:ignore="LockedOrientationActivity" />
         <activity
             android:name=".presentation.ui.main.MainActivity"
-            android:exported="true"
+            android:exported="false"
             android:screenOrientation="portrait"
             tools:ignore="LockedOrientationActivity" />
         <activity

app/src/main/java/org/sopt/pingle/data/datasource/remote/MapRemoteDataSource.kt

@@ -1,8 +1,14 @@
 package org.sopt.pingle.data.datasource.remote
 
 import org.sopt.pingle.data.model.remote.response.ResponsePinListDto
+import org.sopt.pingle.data.model.remote.response.ResponsePingleListDto
 import org.sopt.pingle.util.base.BaseResponse
 
 interface MapRemoteDataSource {
-    suspend fun getPinListWithoutFiltering(teamId: Long, category: String?): BaseResponse<List<ResponsePinListDto>>
+    suspend fun getPinListWithoutFiltering(
+        teamId: Long,
+        category: String?
+    ): BaseResponse<List<ResponsePinListDto>>
+
+    suspend fun getPingleList(teamId: Long, pinId: Long): BaseResponse<List<ResponsePingleListDto>>
 }

app/src/main/java/org/sopt/pingle/data/datasourceimpl/remote/MapRemoteDataSourceImpl.kt

@@ -3,6 +3,7 @@ package org.sopt.pingle.data.datasourceimpl.remote
 import javax.inject.Inject
 import org.sopt.pingle.data.datasource.remote.MapRemoteDataSource
 import org.sopt.pingle.data.model.remote.response.ResponsePinListDto
+import org.sopt.pingle.data.model.remote.response.ResponsePingleListDto
 import org.sopt.pingle.data.service.MapService
 import org.sopt.pingle.util.base.BaseResponse
 
@@ -14,4 +15,10 @@ class MapRemoteDataSourceImpl @Inject constructor(
         category: String?
     ): BaseResponse<List<ResponsePinListDto>> =
         mapService.getPinListWithoutFiltering(teamId = teamId, category = category)
+
+    override suspend fun getPingleList(
+        teamId: Long,
+        pinId: Long
+    ): BaseResponse<List<ResponsePingleListDto>> =
+        mapService.getPingleList(teamId = teamId, pinId = pinId)
 }

app/src/main/java/org/sopt/pingle/data/model/remote/response/ResponsePingleListDto.kt

@@ -0,0 +1,48 @@
+package org.sopt.pingle.data.model.remote.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import org.sopt.pingle.domain.model.PingleEntity
+
+@Serializable
+data class ResponsePingleListDto(
+    @SerialName("id")
+    val id: Long,
+    @SerialName("category")
+    val category: String,
+    @SerialName("name")
+    val name: String,
+    @SerialName("ownerName")
+    val ownerName: String,
+    @SerialName("location")
+    val location: String,
+    @SerialName("date")
+    val date: String,
+    @SerialName("startAt")
+    val startAt: String,
+    @SerialName("endAt")
+    val endAt: String,
+    @SerialName("maxParticipants")
+    val maxParticipants: Int,
+    @SerialName("curParticipants")
+    val curParticipants: Int,
+    @SerialName("isParticipating")
+    val isParticipating: Boolean,
+    @SerialName("chatLink")
+    val chatLink: String
+) {
+    fun toPingleEntity() = PingleEntity(
+        id = this.id,
+        category = this.category,
+        name = this.name,
+        ownerName = this.ownerName,
+        location = this.location,
+        date = this.date,
+        startAt = this.startAt,
+        endAt = this.endAt,
+        maxParticipants = this.maxParticipants,
+        curParticipants = this.curParticipants,
+        isParticipating = this.isParticipating,
+        chatLink = this.chatLink
+    )
+}

app/src/main/java/org/sopt/pingle/data/repository/MapRepositoryImpl.kt

@@ -5,6 +5,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import org.sopt.pingle.data.datasource.remote.MapRemoteDataSource
 import org.sopt.pingle.domain.model.PinEntity
+import org.sopt.pingle.domain.model.PingleEntity
 import org.sopt.pingle.domain.repository.MapRepository
 
 class MapRepositoryImpl @Inject constructor(
@@ -24,4 +25,16 @@ class MapRepositoryImpl @Inject constructor(
         }
         emit(result.getOrThrow())
     }
+
+    override suspend fun getPingleList(teamId: Long, pinId: Long): Flow<List<PingleEntity>> = flow {
+        val result = runCatching {
+            mapDataSource.getPingleList(
+                teamId = teamId,
+                pinId = pinId
+            ).data.map { pingle ->
+                pingle.toPingleEntity()
+            }
+        }
+        emit(result.getOrThrow())
+    }
 }

app/src/main/java/org/sopt/pingle/data/service/MapService.kt

@@ -1,6 +1,7 @@
 package org.sopt.pingle.data.service
 
 import org.sopt.pingle.data.model.remote.response.ResponsePinListDto
+import org.sopt.pingle.data.model.remote.response.ResponsePingleListDto
 import org.sopt.pingle.util.base.BaseResponse
 import retrofit2.http.GET
 import retrofit2.http.Path
@@ -13,11 +14,19 @@ interface MapService {
         @Query(CATEGORY) category: String?
     ): BaseResponse<List<ResponsePinListDto>>
 
+    @GET("$VERSION/$TEAMS/{$TEAM_ID}/$PINS/{$PIN_ID}/$MEETINGS")
+    suspend fun getPingleList(
+        @Path("$TEAM_ID") teamId: Long,
+        @Path("$PIN_ID") pinId: Long
+    ): BaseResponse<List<ResponsePingleListDto>>
+
     companion object {
         const val VERSION = "v1"
         const val TEAMS = "teams"
-        const val PINS = "pins"
         const val TEAM_ID = "teamId"
+        const val PINS = "pins"
+        const val PIN_ID = "pinId"
         const val CATEGORY = "category"
+        const val MEETINGS = "meetings"
     }
 }

app/src/main/java/org/sopt/pingle/di/UseCaseModule.kt

@@ -9,6 +9,7 @@ import org.sopt.pingle.domain.repository.DummyRepository
 import org.sopt.pingle.domain.repository.MapRepository
 import org.sopt.pingle.domain.usecase.GetDummyUserListUseCase
 import org.sopt.pingle.domain.usecase.GetPinListWithoutFilteringUseCase
+import org.sopt.pingle.domain.usecase.GetPingleListUseCase
 import org.sopt.pingle.domain.usecase.SetDummyDataUseCase
 
 @Module
@@ -28,4 +29,9 @@ class UseCaseModule {
     @Singleton
     fun providesGetPinListWithoutFilteringUseCase(mapRepository: MapRepository): GetPinListWithoutFilteringUseCase =
         GetPinListWithoutFilteringUseCase(mapRepository = mapRepository)
+
+    @Provides
+    @Singleton
+    fun providesGetPingleListUseCase(mapRepository: MapRepository): GetPingleListUseCase =
+        GetPingleListUseCase(mapRepository = mapRepository)
 }

app/src/main/java/org/sopt/pingle/domain/repository/MapRepository.kt

@@ -2,7 +2,9 @@ package org.sopt.pingle.domain.repository
 
 import kotlinx.coroutines.flow.Flow
 import org.sopt.pingle.domain.model.PinEntity
+import org.sopt.pingle.domain.model.PingleEntity
 
 interface MapRepository {
     suspend fun getPinListWithoutFiltering(teamId: Long, category: String?): Flow<List<PinEntity>>
+    suspend fun getPingleList(teamId: Long, pinId: Long): Flow<List<PingleEntity>>
 }

app/src/main/java/org/sopt/pingle/domain/usecase/GetPingleListUseCase.kt

@@ -0,0 +1,12 @@
+package org.sopt.pingle.domain.usecase
+
+import kotlinx.coroutines.flow.Flow
+import org.sopt.pingle.domain.model.PingleEntity
+import org.sopt.pingle.domain.repository.MapRepository
+
+class GetPingleListUseCase(
+    private val mapRepository: MapRepository
+) {
+    suspend operator fun invoke(teamId: Long, pinId: Long): Flow<List<PingleEntity>> =
+        mapRepository.getPingleList(teamId = teamId, pinId = pinId)
+}

app/src/main/java/org/sopt/pingle/presentation/mapper/PinMapper.kt

@@ -3,7 +3,11 @@ package org.sopt.pingle.presentation.mapper
 import androidx.databinding.Observable
 import com.naver.maps.geometry.LatLng
 import com.naver.maps.map.overlay.Marker
+import java.time.LocalDate
+import java.time.LocalTime
+import java.time.format.DateTimeFormatter
 import org.sopt.pingle.domain.model.PinEntity
+import org.sopt.pingle.domain.model.PingleEntity
 import org.sopt.pingle.presentation.model.MarkerModel
 import org.sopt.pingle.presentation.type.CategoryType
 
@@ -29,3 +33,17 @@ fun PinEntity.toMarkerModel(): MarkerModel {
 
     return markerModel
 }
+
+fun PingleEntity.isCompleted() = maxParticipants == curParticipants
+
+fun PingleEntity.convertToCalenderDetail(): String {
+    val localDate = LocalDate.parse(date, DateTimeFormatter.ISO_LOCAL_DATE)
+    val startTime = LocalTime.parse(startAt, DateTimeFormatter.ISO_LOCAL_TIME)
+    val endTime = LocalTime.parse(endAt, DateTimeFormatter.ISO_LOCAL_TIME)
+
+    return buildString {
+        append("${localDate.year}년 ${localDate.monthValue}월 ${localDate.dayOfMonth}일\n")
+        append("${startTime.format(DateTimeFormatter.ofPattern("HH:mm"))} ~ ")
+        append("${endTime.format(DateTimeFormatter.ofPattern("HH:mm"))}")
+    }
+}

app/src/main/java/org/sopt/pingle/presentation/ui/main/home/map/MapFragment.kt

@@ -26,14 +26,15 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.sopt.pingle.R
 import org.sopt.pingle.databinding.FragmentMapBinding
-import org.sopt.pingle.presentation.model.MarkerModel
+import org.sopt.pingle.domain.model.PinEntity
+import org.sopt.pingle.presentation.mapper.toMarkerModel
 import org.sopt.pingle.presentation.type.CategoryType
 import org.sopt.pingle.presentation.ui.main.home.mainlist.MainListFragment
 import org.sopt.pingle.util.base.BindingFragment
 import org.sopt.pingle.util.component.AllModalDialogFragment
-import org.sopt.pingle.util.component.OnPingleCardClickListener
 import org.sopt.pingle.util.component.PingleChip
 import org.sopt.pingle.util.fragment.navigateToFragment
+import org.sopt.pingle.util.fragment.navigateToWebView
 import org.sopt.pingle.util.fragment.stringOf
 import org.sopt.pingle.util.view.UiState
 
@@ -70,6 +71,7 @@ class MapFragment : BindingFragment<FragmentMapBinding>(R.layout.fragment_map),
             with(uiSettings) {
                 isZoomControlEnabled = false
                 isScaleBarEnabled = false
+                isCompassEnabled = false
             }
 
             setOnMapClickListener { _, _ ->
@@ -100,15 +102,6 @@ class MapFragment : BindingFragment<FragmentMapBinding>(R.layout.fragment_map),
             chipMapCategoryStudy.setChipCategoryType(CategoryType.STUDY)
             chipMapCategoryMulti.setChipCategoryType(CategoryType.MULTI)
             chipMapCategoryOthers.setChipCategoryType(CategoryType.OTHERS)
-            cardMap.listener = object : OnPingleCardClickListener {
-                override fun onPingleCardChatBtnClickListener() {
-                    // TODO 선택된 마커로 웹뷰 연결
-                }
-
-                override fun onPingleCardParticipateBtnClickListener() {
-                    // TODO 선택된 마커 참여 현황 여부에 따른 모달 로직 구현
-                }
-            }
         }
     }
 
@@ -143,11 +136,18 @@ class MapFragment : BindingFragment<FragmentMapBinding>(R.layout.fragment_map),
             mapViewModel.getPinListWithoutFilter()
         }.launchIn(lifecycleScope)
 
-        mapViewModel.markerListState.flowWithLifecycle(lifecycle).onEach { uiState ->
+        mapViewModel.pinEntityListState.flowWithLifecycle(lifecycle).onEach { uiState ->
             when (uiState) {
                 is UiState.Success -> {
                     if (::naverMap.isInitialized) {
                         makeMarkers(uiState.data)
+                        with(binding) {
+                            fabMapHere.visibility = View.VISIBLE
+                            fabMapList.visibility = View.VISIBLE
+                            cardMap.visibility = View.INVISIBLE
+                        }
+
+                        mapViewModel.clearSelectedMarkerPosition()
                     }
                 }
 
@@ -165,6 +165,21 @@ class MapFragment : BindingFragment<FragmentMapBinding>(R.layout.fragment_map),
                     }
                 }
             }.launchIn(lifecycleScope)
+
+        mapViewModel.pingleListState.flowWithLifecycle(lifecycle).onEach { uiState ->
+            when (uiState) {
+                is UiState.Success -> {
+                    with(binding.cardMap) {
+                        initLayout(uiState.data[SINGLE_SELECTION])
+                        setOnChatButtonClick {
+                            startActivity(navigateToWebView(uiState.data[SINGLE_SELECTION].chatLink))
+                        }
+                    }
+                }
+
+                else -> Unit
+            }
+        }.launchIn(lifecycleScope)
     }
 
     private fun setLocationTrackingMode() {
@@ -203,17 +218,21 @@ class MapFragment : BindingFragment<FragmentMapBinding>(R.layout.fragment_map),
         }
     }
 
-    private fun makeMarkers(markerList: List<MarkerModel>) {
+    private fun makeMarkers(pinEntityList: List<PinEntity>) {
         mapViewModel.clearMarkerList()
 
-        markerList.mapIndexed { _, markerModel ->
-            markerModel.marker.apply {
-                mapViewModel.addMarkerList(this)
-                map = naverMap
-                setOnClickListener {
-                    // TODO 마커 클릭 이벤트 수정
-                    return@setOnClickListener true
+        pinEntityList.mapIndexed { index, pinEntity ->
+            pinEntity.toMarkerModel().apply {
+                this.marker.apply {
+                    map = naverMap
+                    setOnClickListener {
+                        mapViewModel.updateMarkerModelListSelectedValue(index)
+                        mapViewModel.getPingleList(pinEntity.id)
+                        moveMapCamera(position)
+                        return@setOnClickListener true
+                    }
                 }
+                mapViewModel.addMarkerList(this)
             }
         }
     }