feat: 쪽지 관련 공통 코드 작성

android/app/src/main/java/com/now/naaga/data/mapper/AdventureResultMapper.kt

@@ -1,7 +1,7 @@
 package com.now.naaga.data.mapper
 
 import com.now.domain.model.AdventureResult
-import com.now.domain.model.AdventureResultType
+import com.now.domain.model.type.AdventureResultType
 import com.now.naaga.data.remote.dto.AdventureResultDto
 import java.time.LocalDateTime
 

android/app/src/main/java/com/now/naaga/data/mapper/AuthMapper.kt

@@ -1,7 +1,7 @@
 package com.now.naaga.data.mapper
 
-import com.now.domain.model.AuthPlatformType
 import com.now.domain.model.PlatformAuth
+import com.now.domain.model.type.AuthPlatformType
 import com.now.naaga.data.remote.dto.PlatformAuthDto
 
 fun PlatformAuthDto.toDomain(): PlatformAuth {

android/app/src/main/java/com/now/naaga/data/mapper/PlaceMapper.kt

@@ -2,7 +2,7 @@ package com.now.naaga.data.mapper
 
 import com.now.domain.model.Place
 import com.now.naaga.data.remote.dto.PlaceDto
-import com.now.naaga.data.remote.dto.PostPlaceDto
+import com.now.naaga.data.remote.dto.post.PostPlaceDto
 
 fun Place.toDto(): PlaceDto {
     return PlaceDto(

android/app/src/main/java/com/now/naaga/data/remote/dto/ClosedLetterDto.kt

@@ -0,0 +1,12 @@
+package com.now.naaga.data.remote.dto
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ClosedLetterDto(
+    @SerialName("id")
+    val id: Long,
+    @SerialName("coordinate")
+    val coordinateDto: CoordinateDto,
+)

android/app/src/main/java/com/now/naaga/data/remote/dto/OpenLetterDto.kt

@@ -0,0 +1,18 @@
+package com.now.naaga.data.remote.dto
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class OpenLetterDto(
+    @SerialName("id")
+    val id: Long,
+    @SerialName("player")
+    val player: PlayerDto,
+    @SerialName("coordinate")
+    val coordinateDto: CoordinateDto,
+    @SerialName("message")
+    val message: String,
+    @SerialName("registerDate")
+    val registerDate: String,
+)

android/app/src/main/java/com/now/naaga/data/remote/dto/post/PostLetterDto.kt

@@ -0,0 +1,14 @@
+package com.now.naaga.data.remote.dto.post
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PostLetterDto(
+    @SerialName("message")
+    val message: String,
+    @SerialName("latitude")
+    val latitude: Double,
+    @SerialName("longitude")
+    val longitude: Double,
+)

android/app/src/main/java/com/now/naaga/data/remote/dto/PostPlaceDto.kt → android/app/src/main/java/com/now/naaga/data/remote/dto/post/PostPlaceDto.kt

@@ -1,5 +1,6 @@
-package com.now.naaga.data.remote.dto
+package com.now.naaga.data.remote.dto.post
 
+import com.now.naaga.data.remote.dto.CoordinateDto
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

android/app/src/main/java/com/now/naaga/data/remote/retrofit/service/LetterService.kt

@@ -0,0 +1,35 @@
+package com.now.naaga.data.remote.retrofit.service
+
+import com.now.naaga.data.remote.dto.ClosedLetterDto
+import com.now.naaga.data.remote.dto.OpenLetterDto
+import com.now.naaga.data.remote.dto.post.PostLetterDto
+import retrofit2.Response
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.POST
+import retrofit2.http.Path
+import retrofit2.http.Query
+
+interface LetterService {
+    @POST("/letters")
+    suspend fun registerLetter(
+        @Body postLetterDto: PostLetterDto,
+    ): Response<OpenLetterDto>
+
+    @GET("/letters/nearby")
+    suspend fun getNearbyLetters(
+        @Query("latitude") latitude: Double,
+        @Query("longitude") longitude: Double,
+    ): Response<List<ClosedLetterDto>>
+
+    @GET("/letters/{letterId}")
+    suspend fun getLetter(
+        @Path("letterId") letterId: Long,
+    ): Response<OpenLetterDto>
+
+    @GET("/letterlogs")
+    suspend fun getInGameLetters(
+        @Query("gameId") gameId: Long,
+        @Query("logType") logType: String,
+    ): Response<List<OpenLetterDto>>
+}

android/app/src/main/java/com/now/naaga/data/remote/retrofit/service/PlaceService.kt

@@ -1,7 +1,7 @@
 package com.now.naaga.data.remote.retrofit.service
 
 import com.now.naaga.data.remote.dto.PlaceDto
-import com.now.naaga.data.remote.dto.PostPlaceDto
+import com.now.naaga.data.remote.dto.post.PostPlaceDto
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import retrofit2.Response

android/app/src/main/java/com/now/naaga/data/repository/DefaultAdventureRepository.kt

@@ -1,13 +1,13 @@
 package com.now.naaga.data.repository
 
 import com.now.domain.model.Adventure
-import com.now.domain.model.AdventureEndType
 import com.now.domain.model.AdventureResult
 import com.now.domain.model.AdventureStatus
 import com.now.domain.model.Coordinate
 import com.now.domain.model.Hint
-import com.now.domain.model.OrderType
-import com.now.domain.model.SortType
+import com.now.domain.model.type.AdventureEndType
+import com.now.domain.model.type.OrderType
+import com.now.domain.model.type.SortType
 import com.now.domain.repository.AdventureRepository
 import com.now.naaga.data.mapper.toDomain
 import com.now.naaga.data.mapper.toDto

android/app/src/main/java/com/now/naaga/data/repository/DefaultLetterRepository.kt

@@ -0,0 +1,27 @@
+package com.now.naaga.data.repository
+
+import com.now.domain.model.letter.ClosedLetter
+import com.now.domain.model.letter.OpenLetter
+import com.now.domain.model.type.LogType
+import com.now.domain.repository.LetterRepository
+import com.now.naaga.data.remote.retrofit.service.LetterService
+
+class DefaultLetterRepository(
+    private val letterService: LetterService,
+) : LetterRepository {
+    override suspend fun postLetter(message: String, latitude: Double, longitude: Double): OpenLetter {
+        TODO("Not yet implemented")
+    }
+
+    override suspend fun fetchNearbyLetters(latitude: Double, longitude: Double): List<ClosedLetter> {
+        TODO("Not yet implemented")
+    }
+
+    override suspend fun fetchLetter(letterId: Long): OpenLetter {
+        TODO("Not yet implemented")
+    }
+
+    override suspend fun fetchLetterLogs(gameId: Long, logType: LogType): List<OpenLetter> {
+        TODO("Not yet implemented")
+    }
+}

android/app/src/main/java/com/now/naaga/di/RepositoryModule.kt

@@ -8,11 +8,13 @@ import com.now.domain.repository.StatisticsRepository
 import com.now.naaga.data.local.AuthDataSource
 import com.now.naaga.data.remote.retrofit.service.AdventureService
 import com.now.naaga.data.remote.retrofit.service.AuthService
+import com.now.naaga.data.remote.retrofit.service.LetterService
 import com.now.naaga.data.remote.retrofit.service.PlaceService
 import com.now.naaga.data.remote.retrofit.service.RankService
 import com.now.naaga.data.remote.retrofit.service.StatisticsService
 import com.now.naaga.data.repository.DefaultAdventureRepository
 import com.now.naaga.data.repository.DefaultAuthRepository
+import com.now.naaga.data.repository.DefaultLetterRepository
 import com.now.naaga.data.repository.DefaultPlaceRepository
 import com.now.naaga.data.repository.DefaultRankRepository
 import com.now.naaga.data.repository.DefaultStatisticsRepository
@@ -47,4 +49,9 @@ class RepositoryModule {
     @Provides
     fun provideStatisticsRepository(statisticsService: StatisticsService): StatisticsRepository =
         DefaultStatisticsRepository(statisticsService)
+
+    @Singleton
+    @Provides
+    fun provideLetterRepository(letterService: LetterService): DefaultLetterRepository =
+        DefaultLetterRepository(letterService)
 }

android/app/src/main/java/com/now/naaga/di/ServiceModule.kt

@@ -5,6 +5,7 @@ import com.now.naaga.BuildConfig
 import com.now.naaga.data.remote.retrofit.AuthInterceptor
 import com.now.naaga.data.remote.retrofit.service.AdventureService
 import com.now.naaga.data.remote.retrofit.service.AuthService
+import com.now.naaga.data.remote.retrofit.service.LetterService
 import com.now.naaga.data.remote.retrofit.service.PlaceService
 import com.now.naaga.data.remote.retrofit.service.RankService
 import com.now.naaga.data.remote.retrofit.service.StatisticsService
@@ -56,4 +57,8 @@ class ServiceModule {
     @Singleton
     @Provides
     fun provideAuthService(retrofit: Retrofit): AuthService = retrofit.create(AuthService::class.java)
+
+    @Singleton
+    @Provides
+    fun provideLetterService(retrofit: Retrofit): LetterService = retrofit.create(LetterService::class.java)
 }

android/app/src/main/java/com/now/naaga/presentation/adventurehistory/AdventureHistoryViewModel.kt

@@ -5,8 +5,8 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.now.domain.model.AdventureResult
-import com.now.domain.model.OrderType
-import com.now.domain.model.SortType
+import com.now.domain.model.type.OrderType
+import com.now.domain.model.type.SortType
 import com.now.domain.repository.AdventureRepository
 import com.now.naaga.data.throwable.DataThrowable
 import com.now.naaga.data.throwable.DataThrowable.PlayerThrowable

android/app/src/main/java/com/now/naaga/presentation/adventurehistory/recyclerview/AdventureHistoryViewHolder.kt

@@ -5,7 +5,7 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.now.domain.model.AdventureResult
-import com.now.domain.model.AdventureResultType
+import com.now.domain.model.type.AdventureResultType
 import com.now.naaga.R
 import com.now.naaga.databinding.ItemHistoryBinding
 

android/app/src/main/java/com/now/naaga/presentation/adventureresult/AdventureResultActivity.kt

@@ -8,7 +8,7 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import com.bumptech.glide.Glide
 import com.now.domain.model.AdventureResult
-import com.now.domain.model.AdventureResultType
+import com.now.domain.model.type.AdventureResultType
 import com.now.naaga.R
 import com.now.naaga.data.firebase.analytics.ADVENTURE_RESULT
 import com.now.naaga.data.firebase.analytics.AnalyticsDelegate

android/app/src/main/java/com/now/naaga/presentation/login/LoginActivity.kt

@@ -8,7 +8,7 @@ import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import com.now.domain.model.AuthPlatformType
+import com.now.domain.model.type.AuthPlatformType
 import com.now.naaga.data.firebase.analytics.AnalyticsDelegate
 import com.now.naaga.data.firebase.analytics.DefaultAnalyticsDelegate
 import com.now.naaga.data.firebase.analytics.LOGIN_AUTH

android/app/src/main/java/com/now/naaga/presentation/login/LoginViewModel.kt

@@ -4,8 +4,8 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.now.domain.model.AuthPlatformType
 import com.now.domain.model.PlatformAuth
+import com.now.domain.model.type.AuthPlatformType
 import com.now.domain.repository.AuthRepository
 import com.now.naaga.data.throwable.DataThrowable
 import dagger.hilt.android.lifecycle.HiltViewModel

android/app/src/main/java/com/now/naaga/presentation/mypage/MyPageViewModel.kt

@@ -4,11 +4,11 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.now.domain.model.OrderType
 import com.now.domain.model.Place
 import com.now.domain.model.Rank
-import com.now.domain.model.SortType
 import com.now.domain.model.Statistics
+import com.now.domain.model.type.OrderType
+import com.now.domain.model.type.SortType
 import com.now.domain.repository.PlaceRepository
 import com.now.domain.repository.RankRepository
 import com.now.domain.repository.StatisticsRepository

android/app/src/main/java/com/now/naaga/presentation/onadventure/OnAdventureViewModel.kt

@@ -6,11 +6,11 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.map
 import androidx.lifecycle.viewModelScope
 import com.now.domain.model.Adventure
-import com.now.domain.model.AdventureEndType
 import com.now.domain.model.AdventureStatus
 import com.now.domain.model.Coordinate
 import com.now.domain.model.Hint
 import com.now.domain.model.RemainingTryCount
+import com.now.domain.model.type.AdventureEndType
 import com.now.domain.repository.AdventureRepository
 import com.now.naaga.data.throwable.DataThrowable
 import com.now.naaga.data.throwable.DataThrowable.Companion.hintThrowable

android/app/src/main/java/com/now/naaga/presentation/rank/RankViewModel.kt

@@ -4,9 +4,9 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.now.domain.model.OrderType
 import com.now.domain.model.Rank
-import com.now.domain.model.SortType
+import com.now.domain.model.type.OrderType
+import com.now.domain.model.type.SortType
 import com.now.domain.repository.RankRepository
 import com.now.naaga.data.throwable.DataThrowable
 import com.now.naaga.data.throwable.DataThrowable.PlayerThrowable

android/app/src/test/java/com/now/naaga/AdventureHistoryViewModelTest.kt

@@ -2,11 +2,11 @@ package com.now.naaga
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.now.domain.model.AdventureResult
-import com.now.domain.model.AdventureResultType
 import com.now.domain.model.Coordinate
-import com.now.domain.model.OrderType
 import com.now.domain.model.Place
-import com.now.domain.model.SortType
+import com.now.domain.model.type.AdventureResultType
+import com.now.domain.model.type.OrderType
+import com.now.domain.model.type.SortType
 import com.now.domain.repository.AdventureRepository
 import com.now.naaga.presentation.adventurehistory.AdventureHistoryViewModel
 import io.mockk.coEvery

android/app/src/test/java/com/now/naaga/AdventureResultViewModelTest.kt

@@ -2,11 +2,11 @@ package com.now.naaga
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.now.domain.model.AdventureResult
-import com.now.domain.model.AdventureResultType
 import com.now.domain.model.Coordinate
 import com.now.domain.model.Place
 import com.now.domain.model.Player
 import com.now.domain.model.Rank
+import com.now.domain.model.type.AdventureResultType
 import com.now.domain.repository.AdventureRepository
 import com.now.domain.repository.RankRepository
 import com.now.naaga.presentation.adventureresult.AdventureResultViewModel

android/app/src/test/java/com/now/naaga/RankViewModelTest.kt

@@ -1,10 +1,10 @@
 package com.now.naaga
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import com.now.domain.model.OrderType
 import com.now.domain.model.Player
 import com.now.domain.model.Rank
-import com.now.domain.model.SortType
+import com.now.domain.model.type.OrderType
+import com.now.domain.model.type.SortType
 import com.now.domain.repository.RankRepository
 import com.now.naaga.presentation.rank.RankViewModel
 import io.mockk.coEvery

android/domain/src/main/java/com/now/domain/model/AdventureResult.kt

@@ -1,5 +1,6 @@
 package com.now.domain.model
 
+import com.now.domain.model.type.AdventureResultType
 import java.time.LocalDateTime
 
 data class AdventureResult(

android/domain/src/main/java/com/now/domain/model/Place.kt

@@ -29,10 +29,6 @@ data class Place(
         return getDistance(coordinate) <= NEARBY_STANDARD
     }
 
-    fun isNearBy(distance: Int): Boolean {
-        return distance <= NEARBY_STANDARD
-    }
-
     companion object {
         const val NEARBY_STANDARD = 70L
     }

android/domain/src/main/java/com/now/domain/model/PlatformAuth.kt

@@ -1,5 +1,7 @@
 package com.now.domain.model
 
+import com.now.domain.model.type.AuthPlatformType
+
 data class PlatformAuth(
     val token: String,
     val type: AuthPlatformType,

android/domain/src/main/java/com/now/domain/model/letter/ClosedLetter.kt

@@ -0,0 +1,8 @@
+package com.now.domain.model.letter
+
+import com.now.domain.model.Coordinate
+
+data class ClosedLetter(
+    val id: Long,
+    val coordinate: Coordinate,
+)