[Release] v0.7.0

app/src/main/java/com/project200/undabang/main/MainActivity.kt

@@ -144,7 +144,6 @@ class MainActivity : AppCompatActivity(), BottomNavigationController {
                 com.project200.undabang.feature.matching.R.id.exercisePlaceSearchFragment,
                 com.project200.undabang.feature.matching.R.id.exercisePlaceRegisterFragment,
                 com.project200.undabang.feature.matching.R.id.matchingGuideFragment,
-                com.project200.undabang.feature.matching.R.id.matchingUrlFormFragment,
                 com.project200.undabang.feature.chatting.R.id.chattingRoomFragment,
                 // ... 필요한 다른 프래그먼트 ID들 추가 ... //
             )

app/src/main/java/com/project200/undabang/main/MainViewModel.kt

@@ -56,6 +56,7 @@ class MainViewModel
         fun login() {
             viewModelScope.launch {
                 val result = loginUseCase()
+                checkIsRegisteredUseCase()
                 _loginResult.value = result
             }
         }

common/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest>
-
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>

common/src/main/java/com/project200/common/utils/NetworkMonitor.kt

@@ -0,0 +1,55 @@
+package com.project200.common.utils
+
+import android.Manifest
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import android.net.NetworkRequest
+import androidx.annotation.RequiresPermission
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.callbackFlow
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class NetworkMonitor
+    @Inject
+    constructor(
+        @ApplicationContext context: Context,
+    ) {
+        private val connectivityManager =
+            context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+
+        // 현재 인터넷 연결 여부 확인
+        @RequiresPermission(Manifest.permission.ACCESS_NETWORK_STATE)
+        fun isCurrentlyConnected(): Boolean {
+            val activeNetwork = connectivityManager.activeNetwork ?: return false
+            val capabilities = connectivityManager.getNetworkCapabilities(activeNetwork) ?: return false
+            return capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+        }
+
+        // 네트워크 상태 변경 감지 Flow
+        val networkState =
+            callbackFlow {
+                val callback =
+                    object : ConnectivityManager.NetworkCallback() {
+                        override fun onAvailable(network: Network) {
+                            trySend(true)
+                        }
+
+                        override fun onLost(network: Network) {
+                            trySend(false)
+                        }
+                    }
+
+                val request =
+                    NetworkRequest.Builder()
+                        .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+                        .build()
+
+                connectivityManager.registerNetworkCallback(request, callback)
+                awaitClose { connectivityManager.unregisterNetworkCallback(callback) }
+            }
+    }

data/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest>
-
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>

data/src/main/java/com/project200/data/api/ApiService.kt

@@ -356,7 +356,12 @@ interface ApiService {
     // 매칭지도 회원들 조회
     @GET("api/v1/members")
     @AccessTokenApi
-    suspend fun getMatchingMembers(): BaseResponse<List<GetMatchingMembersDto>>
+    suspend fun getMatchingMembers(
+        @Query("leftTopLatitude") leftTopLatitude: Double,
+        @Query("leftTopLongitude") leftTopLongitude: Double,
+        @Query("rightBottomLatitude") rightBottomLatitude: Double,
+        @Query("rightBottomLongitude") rightBottomLongitude: Double,
+    ): BaseResponse<List<GetMatchingMembersDto>>
 
     // 매칭 타 회원 프로필 조회
     @GET("api/v1/members/{memberId}/profile")

data/src/main/java/com/project200/data/api/ChatApiService.kt

@@ -0,0 +1,13 @@
+package com.project200.data.api
+
+import com.project200.data.dto.BaseResponse
+import com.project200.data.dto.TicketResponse
+import retrofit2.http.POST
+import retrofit2.http.Path
+
+interface ChatApiService {
+    @POST("api/v1/chat-rooms/{chatroomId}/ticket")
+    suspend fun getChatTicket(
+        @Path("chatroomId") chatroomId: Long,
+    ): BaseResponse<TicketResponse>
+}

data/src/main/java/com/project200/data/di/NetworkModule.kt

@@ -1,6 +1,7 @@
 package com.project200.data.di
 
 import com.project200.data.api.ApiService
+import com.project200.data.api.ChatApiService
 import com.project200.data.utils.FcmTokenProvider
 import com.project200.data.utils.LocalDateAdapter
 import com.project200.data.utils.LocalDateTimeAdapter
@@ -71,6 +72,7 @@ object NetworkModule {
             .addInterceptor(tokenInterceptor)
             .connectTimeout(30, TimeUnit.SECONDS)
             .readTimeout(30, TimeUnit.SECONDS)
+            .pingInterval(30, TimeUnit.SECONDS)
             .writeTimeout(30, TimeUnit.SECONDS)
             .build()
     }
@@ -100,4 +102,10 @@ object NetworkModule {
     fun provideApiService(retrofit: Retrofit): ApiService {
         return retrofit.create(ApiService::class.java)
     }
+
+    @Provides
+    @Singleton
+    fun provideChatApiService(retrofit: Retrofit): ChatApiService {
+        return retrofit.create(ChatApiService::class.java)
+    }
 }

data/src/main/java/com/project200/data/di/RepositoryModule.kt

@@ -3,6 +3,7 @@ package com.project200.data.di
 import com.project200.data.impl.AddressRepositoryImpl
 import com.project200.data.impl.AppUpdateRepositoryImpl
 import com.project200.data.impl.AuthRepositoryImpl
+import com.project200.data.impl.ChatSocketRepositoryImpl
 import com.project200.data.impl.ChattingRepositoryImpl
 import com.project200.data.impl.ExerciseRecordRepositoryImpl
 import com.project200.data.impl.FcmRepositoryImpl
@@ -15,6 +16,7 @@ import com.project200.data.impl.TimerRepositoryImpl
 import com.project200.domain.repository.AddressRepository
 import com.project200.domain.repository.AppUpdateRepository
 import com.project200.domain.repository.AuthRepository
+import com.project200.domain.repository.ChatSocketRepository
 import com.project200.domain.repository.ChattingRepository
 import com.project200.domain.repository.ExerciseRecordRepository
 import com.project200.domain.repository.FcmRepository
@@ -77,6 +79,10 @@ abstract class RepositoryModule {
     @Singleton
     abstract fun bindChattingRepository(chattingRepositoryImpl: ChattingRepositoryImpl): ChattingRepository
 
+    @Binds
+    @Singleton
+    abstract fun bindChatSocketRepository(chatSocketRepositoryImpl: ChatSocketRepositoryImpl): ChatSocketRepository
+
     @Binds
     @Singleton
     abstract fun bindNotificationRepository(notificationRepositoryImpl: NotificationRepositoryImpl): NotificationRepository

data/src/main/java/com/project200/data/dto/ChattingDTO.kt

@@ -1,6 +1,9 @@
 package com.project200.data.dto
 
+import com.project200.domain.model.SocketType
+import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import com.squareup.moshi.Moshi
 import java.time.LocalDateTime
 
 @JsonClass(generateAdapter = true)
@@ -11,6 +14,9 @@ data class PostChatRoomResponse(
 @JsonClass(generateAdapter = true)
 data class PostChatRoomRequest(
     val receiverId: String,
+    val exerciseLocationId: Long,
+    val requesterLatitude: Double,
+    val requesterLongitude: Double,
 )
 
 @JsonClass(generateAdapter = true)
@@ -62,3 +68,56 @@ data class PostMessageResponse(
 data class PostChatMessageRequest(
     val content: String,
 )
+
+// 티켓 발급 응답
+@JsonClass(generateAdapter = true)
+data class TicketResponse(
+    @Json(name = "chatTicket")
+    val chatTicket: String,
+)
+
+@JsonClass(generateAdapter = true)
+data class SocketChatMessage(
+    val succeed: Boolean,
+    val type: SocketType,
+    val message: String? = null,
+    val data: Any? = null,
+) {
+    /**
+     * TALK 타입일 때 안전하게 DTO로 변환하여 가져오는 도우미 함수
+     */
+    fun getChatData(moshi: Moshi): SocketChatMessageDTO? {
+        if (type != SocketType.TALK || data == null) return null
+        return try {
+            val adapter = moshi.adapter(SocketChatMessageDTO::class.java)
+            adapter.fromJsonValue(data)
+        } catch (e: Exception) {
+            null
+        }
+    }
+
+    /**
+     * ERROR 타입일 때 data 필드에 담긴 에러 상세 내용을 가져오는 도우미 함수
+     */
+    fun getErrorDetail(): String? {
+        return data as? String
+    }
+}
+
+@JsonClass(generateAdapter = true)
+data class SocketChatMessageDTO(
+    val chatId: Long,
+    val senderId: String?,
+    val senderNickname: String?,
+    val senderProfileUrl: String?,
+    val senderThumbnailUrl: String?,
+    val chatContent: String,
+    val chatType: String,
+    val sentAt: LocalDateTime,
+)
+
+@JsonClass(generateAdapter = true)
+data class SocketChatRequest(
+    val type: SocketType,
+    val content: String?,
+)

data/src/main/java/com/project200/data/dto/MatchingDTO.kt

@@ -10,11 +10,14 @@ data class GetMatchingMembersDto(
     val nickname: String,
     val gender: String,
     val birthDate: String,
+    val memberScore: Int,
     val locations: List<LocationDto>,
+    val preferredExercises: List<GetProfilePreferredExerciseDTO>,
 )
 
 @JsonClass(generateAdapter = true)
 data class LocationDto(
+    val exerciseLocationId: Long,
     val exerciseLocationName: String,
     val latitude: Double,
     val longitude: Double,

data/src/main/java/com/project200/data/impl/AuthRepositoryImpl.kt

@@ -27,6 +27,7 @@ class AuthRepositoryImpl
             withContext(ioDispatcher) {
                 try {
                     val response = apiService.getIsRegistered()
+                    response.data?.let { spManager.saveMemberId(it.memberId) }
                     response.data?.isRegistered ?: false
                 } catch (e: CancellationException) {
                     throw e
@@ -81,6 +82,10 @@ class AuthRepositoryImpl
             )
         }
 
+        override suspend fun getMemberId(): String {
+            return spManager.getMemberId().toString()
+        }
+
         companion object {
             const val TAG = "AuthRepositoryImpl"
         }