Merge #92 -> develop

[Feat/#92] 산책 게시물 리스트 조회 API

Author: sonms

app/src/main/java/com/paw/key/core/designsystem/component/CourseCard.kt

@@ -1,6 +1,5 @@
 package com.paw.key.core.designsystem.component
 
-import android.util.Log
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -16,7 +15,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
-import com.paw.key.R
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
@@ -39,25 +37,39 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
 import coil.request.ImageRequest
+import com.paw.key.R
 import com.paw.key.core.designsystem.theme.PawKeyTheme
 import com.paw.key.core.util.noRippleClickable
-import kotlin.String
 
 @Composable
 fun CourseCard(
     title: String,
-    petName:String,
+    petName: String,
     date: String,
-    onCLickItem : () -> Unit,
+    representativeImageUrl: String? = null, // 추가
+    petProfileImageUrl: String? = null,     // 추가
+    descriptionTags: List<String> = emptyList(), // 추가
+    onCLickItem: () -> Unit,
     modifier: Modifier = Modifier,
-    isShared : Boolean = false, // true면 떠진거 false면 닫은거
-    isRecord : Boolean = false // 기록한 아이템 - true면 하트, false면 공유 아이콘
+    isShared: Boolean = false,
+    isRecord: Boolean = false
 ) {
+    // 날짜 포맷 변환 함수
+    fun formatDate(dateString: String): String {
+        return try {
+            // "2025-07-15T21:27:03.54498" -> "2025/07/15"
+            val datePart = dateString.split("T")[0] // "2025-07-15"
+            datePart.replace("-", "/") // "2025/07/15"
+        } catch (e: Exception) {
+            dateString // 실패하면 원본 반환
+        }
+    }
+
     Column(
         modifier = modifier
             .padding(8.dp)
             .fillMaxWidth()
-            .size(width = 328.dp , height = 240.dp)
+            .size(width = 328.dp, height = 240.dp)
             .background(Color.White, shape = RoundedCornerShape(20.dp))
             .noRippleClickable {
                 onCLickItem()
@@ -70,32 +82,38 @@ fun CourseCard(
                 .aspectRatio(343f / 172f)
                 .clip(RoundedCornerShape(10.dp))
         ) {
-            // 지도 이미지 Todo : 테스트용
-            Image(
-                painter = painterResource(id = R.drawable.dummy_map),
-                contentDescription = null,
-                modifier = Modifier
-                    .fillMaxSize()
-                    .padding(start = 8.dp, end = 8.dp, top = 8.dp)
-                    .clip(RoundedCornerShape(8.dp)),
-                contentScale = ContentScale.Crop
-            )
-
-            /*AsyncImage(
-                model = ImageRequest.Builder(LocalContext.current)
-                    .data("https://pawkey-server.com/image.jpg") // ← 서버에서 받은 이미지 URL 넣깅
-                    .crossfade(true)
-                    .build(),
-                contentDescription = null,
-                modifier = Modifier.fillMaxSize(),
-                contentScale = ContentScale.Crop
-            )*/
+            // 서버 이미지 또는 기본 이미지
+            if (representativeImageUrl != null) {
+                AsyncImage(
+                    model = ImageRequest.Builder(LocalContext.current)
+                        .data(representativeImageUrl)
+                        .crossfade(true)
+                        .build(),
+                    contentDescription = null,
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .padding(start = 8.dp, end = 8.dp, top = 8.dp)
+                        .clip(RoundedCornerShape(8.dp)),
+                    contentScale = ContentScale.Crop
+                )
+            } else {
+                // 기본 이미지
+                Image(
+                    painter = painterResource(id = R.drawable.dummy_map),
+                    contentDescription = null,
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .padding(start = 8.dp, end = 8.dp, top = 8.dp)
+                        .clip(RoundedCornerShape(8.dp)),
+                    contentScale = ContentScale.Crop
+                )
+            }
 
             // 하단 그라데이션 오버레이
             Box(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .height(LocalConfiguration.current.screenHeightDp.dp * 0.6f) // 높이 조절 가능
+                    .height(LocalConfiguration.current.screenHeightDp.dp * 0.6f)
                     .padding(start = 8.dp, end = 8.dp, top = 8.dp)
                     .align(Alignment.BottomCenter)
                     .background(
@@ -115,19 +133,39 @@ fun CourseCard(
                 verticalAlignment = Alignment.CenterVertically,
                 modifier = Modifier
                     .align(Alignment.BottomStart)
-                    .padding(start = 16.dp, end = 16.dp,bottom = 16.dp)
+                    .padding(start = 16.dp, end = 16.dp, bottom = 16.dp)
             ) {
-                AsyncImage(
-                    model = ImageRequest.Builder(LocalContext.current)
-                        .data("https://pawkey-server.com/image.jpg") // ← 서버에서 받은 이미지 URL 넣깅
-                        .crossfade(true)
-                        .build(),
-                    contentDescription = null,
-                    modifier = Modifier
-                        .size(40.dp)
-                        .clip(CircleShape), // 원형 크롭
-                    contentScale = ContentScale.Crop
-                )
+                // 반려견 프로필 이미지
+                if (petProfileImageUrl != null) {
+                    AsyncImage(
+                        model = ImageRequest.Builder(LocalContext.current)
+                            .data(petProfileImageUrl)
+                            .crossfade(true)
+                            .build(),
+                        contentDescription = null,
+                        modifier = Modifier
+                            .size(40.dp)
+                            .clip(CircleShape),
+                        contentScale = ContentScale.Crop
+                    )
+                } else {
+                    // 기본 프로필 이미지
+                    Box(
+                        modifier = Modifier
+                            .size(40.dp)
+                            .clip(CircleShape)
+                            .background(PawKeyTheme.colors.gray200),
+                        contentAlignment = Alignment.Center
+                    ) {
+                        Icon(
+                            imageVector = ImageVector.vectorResource(id = R.drawable.ic_heart_default),
+                            contentDescription = null,
+                            tint = PawKeyTheme.colors.gray400,
+                            modifier = Modifier.size(20.dp)
+                        )
+                    }
+                }
+
                 Spacer(modifier = Modifier.width(10.dp))
                 Column {
                     Text(
@@ -144,7 +182,7 @@ fun CourseCard(
                         )
                         Spacer(modifier = Modifier.width(8.dp))
                         Text(
-                            text = date,
+                            text = formatDate(date), // 포맷된 날짜 사용
                             style = PawKeyTheme.typography.caption12R,
                             color = PawKeyTheme.colors.gray100
                         )
@@ -189,16 +227,9 @@ fun CourseCard(
 
         Spacer(modifier = Modifier.height(12.dp))
 
-        
+        // 서버에서 받은 태그들 사용
         ChipRow(
-            tags = listOf(
-            "이륜차 거의 없음",
-            "배변 쓰레기통",
-            "쉼터",
-            "CCTV 있음",
-            "물그릇 비치","이륜차 거의 없음",
-            "배변 쓰레기통",
-            "쉼터",),
+            tags = descriptionTags,
             modifier = Modifier
                 .padding(start = 16.dp, end = 16.dp)
         )

app/src/main/java/com/paw/key/data/di/RepositoryModule.kt

@@ -11,6 +11,7 @@ import com.paw.key.data.repositoryimpl.WalkSharedResultRepositoryImpl
 import com.paw.key.data.repositoryimpl.filter.FilterOptionRepositoryImpl
 import com.paw.key.data.repositoryimpl.sharedwalk.SharedWalkRepositoryImpl
 import com.paw.key.data.repositoryimpl.home.HomeRegionRepositoryImpl
+import com.paw.key.data.repositoryimpl.list.PostsListRepositoryImpl
 import com.paw.key.data.repositoryimpl.walklist.WalkListDetailRepositoryImpl
 import com.paw.key.data.repositoryimpl.walkreview.WalkReviewRepositoryImpl
 import com.paw.key.domain.repository.DummyRepository
@@ -22,6 +23,7 @@ import com.paw.key.domain.repository.WalkSharedResultRepository
 import com.paw.key.domain.repository.filter.FilterOptionRepository
 import com.paw.key.domain.repository.sharedwalk.SharedWalkRepository
 import com.paw.key.domain.repository.home.HomeRegionRepository
+import com.paw.key.domain.repository.list.PostsListRepository
 import com.paw.key.domain.repository.petprofile.PetProfileRepository
 import com.paw.key.domain.repository.walkcourse.WalkCourseRepository
 import com.paw.key.domain.repository.walklist.WalkListRepository
@@ -97,7 +99,7 @@ interface RepositoryModule {
     fun bindPetProfileRepository(
         impl: PetProfileRepositoryImpl
     ): PetProfileRepository
-  
+
     @Binds
     @Singleton
     fun bindWalkReviewRepository(
@@ -117,4 +119,10 @@ interface RepositoryModule {
         impl: FilterOptionRepositoryImpl
     ) : FilterOptionRepository
 
+    //게시물 리스트
+    @Binds
+    @Singleton
+    fun bindPostsListRepository(
+        impl: PostsListRepositoryImpl
+    ) : PostsListRepository
 }

app/src/main/java/com/paw/key/data/di/ServiceModule.kt

@@ -9,6 +9,7 @@ import com.paw.key.data.service.RegionService
 import com.paw.key.data.service.filter.FilterOptionService
 import com.paw.key.data.service.sharedwalk.SharedWalkService
 import com.paw.key.data.service.home.HomeRegionService
+import com.paw.key.data.service.list.PostsListService
 import com.paw.key.data.service.walkcourse.WalkCourseService
 import com.paw.key.data.service.walklist.WalkListDetailService
 import com.paw.key.data.service.walkreview.WalkReviewService
@@ -85,4 +86,9 @@ object ServiceModule {
     @Singleton
     fun provideFilterOptionService(retrofit: Retrofit): FilterOptionService =
         retrofit.create()
+
+    @Provides
+    @Singleton
+    fun providePostsListService(retrofit: Retrofit): PostsListService =
+        retrofit.create()
 }

app/src/main/java/com/paw/key/data/dto/request/list/PostsListRequestDto.kt

@@ -0,0 +1,22 @@
+package com.paw.key.data.dto.request.list
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PostsListRequestDto(
+    @SerialName("durationStart")
+    val durationStart: Int? = null,
+    @SerialName("durationEnd")
+    val durationEnd: Int? = null,
+    @SerialName("selectedOptions")
+    val selectedOptions: List<TraitList>? = null
+)
+
+@Serializable
+data class TraitList(
+    @SerialName("categoryId")
+    val categoryId: Int? = null,
+    @SerialName("optionsIds")
+    val optionIds: List<Int>? = null
+)

app/src/main/java/com/paw/key/data/dto/response/list/PostsListResponseDto.kt

@@ -0,0 +1,70 @@
+package com.paw.key.data.dto.response.list
+
+import com.paw.key.domain.model.entity.list.ListEntity
+import com.paw.key.domain.model.entity.list.PostEntity
+import com.paw.key.domain.model.entity.list.WriterEntity
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PostsListResponseDto (
+    @SerialName("posts")
+    val posts : List<PostDto>
+)
+
+@Serializable
+data class PostDto (
+    @SerialName("postId")
+    val postId : Int,
+    @SerialName("createdAt")
+    val createdAt : String,
+    @SerialName("isLike")
+    val isLike : Boolean,
+    @SerialName("title")
+    val title : String,
+    @SerialName("representativeImageUrl")
+    val representativeImageUrl : String,
+    @SerialName("routeId")
+    val routeId : Int,
+    @SerialName("writer")
+    val writer : WriterDto,
+    @SerialName("descriptionTags")
+    val descriptionTags : List<String>
+)
+
+@Serializable
+data class WriterDto (
+    @SerialName("userId")
+    val userId : Int,
+    @SerialName("petName")
+    val petName : String,
+    @SerialName("petProfileImageUrl")
+    val petProfileImageUrl : String,
+)
+
+fun PostsListResponseDto.toEntity(): ListEntity {
+    return ListEntity(
+        posts = posts.map { it.toEntity() }
+    )
+}
+
+fun PostDto.toEntity(): PostEntity {
+    return PostEntity(
+        postId = postId,
+        createdAt = createdAt,
+        isLike = isLike,
+        title = title,
+        representativeImageUrl = representativeImageUrl,
+        routeId = routeId,
+        writer = writer.toEntity(),
+        descriptionTags = descriptionTags
+    )
+}
+
+fun WriterDto.toEntity(): WriterEntity {
+    return WriterEntity(
+        userId = userId,
+        petName = petName,
+        petProfileImageUrl = petProfileImageUrl
+    )
+}

app/src/main/java/com/paw/key/data/remote/datasource/list/PostsListDataSource.kt

@@ -0,0 +1,19 @@
+package com.paw.key.data.remote.datasource.list
+
+import com.paw.key.data.dto.request.list.PostsListRequestDto
+import com.paw.key.data.service.list.PostsListService
+import javax.inject.Inject
+
+class PostsListDataSource @Inject constructor(
+    private val service: PostsListService
+) {
+    suspend fun postList(userId: Int, request: PostsListRequestDto) =
+        service.postList(userId, request)
+
+    suspend fun getAllPosts(userId: Int) =
+        service.postList(userId, PostsListRequestDto(
+            durationStart = 0,
+            durationEnd = 0,
+            selectedOptions = emptyList()
+        ))
+}