Feature/organization management: 중개자>봉사관리 & 봉사자>봉사관리 & 홈 UI 수정

core/data/src/main/java/com/kusitms/connectdog/core/data/api/ApiService.kt

@@ -3,6 +3,7 @@ package com.kusitms.connectdog.core.data.api
 import com.kusitms.connectdog.core.data.api.model.LoginResponseItem
 import com.kusitms.connectdog.core.data.api.model.MyInfoResponseItem
 import com.kusitms.connectdog.core.data.api.model.NormalLoginBody
+import com.kusitms.connectdog.core.data.api.model.Response
 import com.kusitms.connectdog.core.data.api.model.ReviewResponseItem
 import com.kusitms.connectdog.core.data.api.model.SocialLoginBody
 import com.kusitms.connectdog.core.data.api.model.VolunteerResponse
@@ -15,6 +16,7 @@ import com.kusitms.connectdog.core.data.api.model.volunteer.BadgeResponse
 import com.kusitms.connectdog.core.data.api.model.volunteer.BookmarkResponseItem
 import com.kusitms.connectdog.core.data.api.model.volunteer.UserInfoResponse
 import retrofit2.http.Body
+import retrofit2.http.DELETE
 import retrofit2.http.GET
 import retrofit2.http.Headers
 import retrofit2.http.POST
@@ -24,7 +26,7 @@ import retrofit2.http.Query
 internal interface ApiService {
 
     /**
-     * 이동봉사자 > 홈
+     * 홈
      */
     @GET("/volunteers/posts/home")
     suspend fun getAnnouncementPostsHome(): List<AnnouncementHomeResponseItem>
@@ -51,7 +53,7 @@ internal interface ApiService {
     ): List<ReviewResponseItem>
 
     /**
-     * 이동봉사자 > 봉사관리
+     * 봉사관리
      */
     @GET("/volunteers/applications/waiting")
     suspend fun getApplicationWaiting(
@@ -76,6 +78,11 @@ internal interface ApiService {
         @Path("applicationId") applicationId: Long
     ): VolunteerResponse
 
+    @DELETE("/volunteers/applications/{applicationId}")
+    suspend fun deleteMyApplication(
+        @Path("applicationId") applicationId: Long
+    ): Response
+
     /**
      * 로그인
      */

core/data/src/main/java/com/kusitms/connectdog/core/data/api/InterApiService.kt

@@ -1,11 +1,14 @@
 package com.kusitms.connectdog.core.data.api
 
+import com.kusitms.connectdog.core.data.api.model.Response
 import com.kusitms.connectdog.core.data.api.model.VolunteerResponse
 import com.kusitms.connectdog.core.data.api.model.intermediator.InterApplicationCompletedResponseItem
 import com.kusitms.connectdog.core.data.api.model.intermediator.InterApplicationInProgressResponseItem
 import com.kusitms.connectdog.core.data.api.model.intermediator.InterApplicationRecruitingResponseItem
 import com.kusitms.connectdog.core.data.api.model.intermediator.InterApplicationWaitingResponseItem
+import retrofit2.http.DELETE
 import retrofit2.http.GET
+import retrofit2.http.PATCH
 import retrofit2.http.Path
 import retrofit2.http.Query
 
@@ -41,4 +44,19 @@ internal interface InterApiService {
     suspend fun getApplicationVolunteer(
         @Path("applicationId") applicationId: Long
     ): VolunteerResponse
+
+    @PATCH("/intermediaries/applications/{applicationId}")
+    suspend fun patchApplicationVolunteer(
+        @Path("applicationId") applicationId: Long
+    ): Response
+
+    @DELETE("/intermediaries/applications/{applicationId}")
+    suspend fun deleteApplicationVolunteer(
+        @Path("applicationId") applicationId: Long
+    ): Response
+
+    @PATCH("/intermediaries/applications/{applicationId}/completed")
+    suspend fun patchApplicationCompleted(
+        @Path("applicationId") applicationId: Long
+    ): Response
 }

core/data/src/main/java/com/kusitms/connectdog/core/data/api/model/Response.kt

@@ -0,0 +1,8 @@
+package com.kusitms.connectdog.core.data.api.model
+
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class Response(
+    val isSuccess: Boolean
+)

core/data/src/main/java/com/kusitms/connectdog/core/data/api/model/ReviewResponseItem.kt

@@ -9,9 +9,10 @@ data class ReviewResponseItem(
     val departureLoc: String,
     val dogName: String,
     val endDate: String,
-    val images: List<String>,
+    val images: List<String>?,
     val intermediaryName: String,
     val mainImage: String,
     val startDate: String,
-    val volunteerNickname: String
+    val volunteerNickname: String,
+    val profileImageNum: Int
 )

core/data/src/main/java/com/kusitms/connectdog/core/data/di/ApiModule.kt

@@ -57,19 +57,6 @@ internal object ApiModule {
         }
     }
 
-    @Provides
-    @Singleton
-    fun provideIntermediatorApiService(
-        okHttpClient: OkHttpClient,
-        moshi: Moshi
-    ): InterApiService {
-        return Retrofit.Builder()
-            .baseUrl(BASE_URL)
-            .addConverterFactory(MoshiConverterFactory.create(moshi))
-            .client(okHttpClient).build()
-            .create(InterApiService::class.java)
-    }
-
     @Provides
     @Singleton
     fun provideDataStoreRepository(@ApplicationContext context: Context): DataStoreRepository {
@@ -112,6 +99,19 @@ internal object ApiModule {
             .create(ApiService::class.java)
     }
 
+    @Provides
+    @Singleton
+    fun provideIntermediatorApiService(
+        okHttpClient: OkHttpClient,
+        moshi: Moshi
+    ): InterApiService {
+        return Retrofit.Builder()
+            .baseUrl(BASE_URL)
+            .addConverterFactory(MoshiConverterFactory.create(moshi))
+            .client(okHttpClient).build()
+            .create(InterApiService::class.java)
+    }
+
     @Provides
     @Singleton
     fun provideJson(): Json =

core/data/src/main/java/com/kusitms/connectdog/core/data/mapper/ResultMapper.kt

@@ -0,0 +1,6 @@
+package com.kusitms.connectdog.core.data.mapper
+
+import com.kusitms.connectdog.core.data.api.model.Response
+import com.kusitms.connectdog.core.model.ConnectDogResult
+
+internal fun Response.toData(): ConnectDogResult = ConnectDogResult(isSuccess)

core/data/src/main/java/com/kusitms/connectdog/core/data/mapper/ReviewMapper.kt

@@ -2,19 +2,16 @@ package com.kusitms.connectdog.core.data.mapper
 
 import com.kusitms.connectdog.core.data.api.model.ReviewResponseItem
 import com.kusitms.connectdog.core.model.Review
-import com.kusitms.connectdog.core.util.toLocalDate
+import com.kusitms.connectdog.core.util.dateRangeFormat
 
 internal fun ReviewResponseItem.toData(): Review {
-    val datePattern = "yyyy-MM-dd"
-    val start = startDate.toLocalDate(datePattern)
-    val end = endDate.toLocalDate(datePattern)
     return Review(
-        profileUrl = mainImage, // todo profileUrl로 바뀔 예정
+        profileNum = profileImageNum,
         dogName = dogName,
         userName = volunteerNickname,
         contentUrl = mainImage,
-        date = "$start-$end",
-        location = "$departureLoc->$arrivalLoc",
+        date = dateRangeFormat(startDate, endDate),
+        location = "$departureLoc → $arrivalLoc",
         organization = intermediaryName,
         content = content
     )

core/data/src/main/java/com/kusitms/connectdog/core/data/mapper/volunteer/AnnouncementMapper.kt

@@ -3,32 +3,23 @@ package com.kusitms.connectdog.core.data.mapper.volunteer
 import com.kusitms.connectdog.core.data.api.model.volunteer.AnnouncementHomeResponseItem
 import com.kusitms.connectdog.core.data.api.model.volunteer.AnnouncementSearchResponseItem
 import com.kusitms.connectdog.core.model.Announcement
-import com.kusitms.connectdog.core.util.dateFormat
-import com.kusitms.connectdog.core.util.toLocalDate
+import com.kusitms.connectdog.core.util.dateRangeFormat
 
 internal fun AnnouncementHomeResponseItem.toData(): Announcement {
-    val datePattern = "yyyy-MM-dd"
-    val uiPattern = "YY.MM.dd(E)"
-    val start = this.startDate.toLocalDate(datePattern).dateFormat(uiPattern)
-    val end = this.endDate.toLocalDate(datePattern).dateFormat(uiPattern)
     return Announcement(
         imageUrl = this.mainImage,
         location = "${this.departureLoc} → ${this.arrivalLoc}",
-        date = "$start-$end",
+        date = dateRangeFormat(startDate, endDate),
         organization = this.intermediaryName,
         hasKennel = this.isKennel
     )
 }
 
 internal fun AnnouncementSearchResponseItem.toData(): Announcement {
-    val datePattern = "yyyy-MM-dd"
-    val uiPattern = "YY.MM.dd(E)"
-    val start = this.startDate.toLocalDate(datePattern).dateFormat(uiPattern)
-    val end = this.endDate.toLocalDate(datePattern).dateFormat(uiPattern)
     return Announcement(
         imageUrl = this.mainImage,
         location = "${this.departureLoc} → ${this.arrivalLoc}",
-        date = "$start-$end",
+        date = dateRangeFormat(startDate, endDate),
         organization = this.intermediaryName,
         hasKennel = this.isKennel
     )

core/data/src/main/java/com/kusitms/connectdog/core/data/repository/HomeRepositoryImpl.kt

@@ -27,9 +27,17 @@ internal class HomeRepositoryImpl @Inject constructor(
         page: Int?,
         size: Int?
     ): List<Announcement> {
+        var depart = departureLoc
+        if (depart != null) {
+            if ("전체" in depart) depart = depart.take(2)
+        }
+        var dest = arrivalLoc
+        if (dest != null) {
+            if ("전체" in dest) dest = dest.take(2)
+        }
         return api.getAnnouncementFilterPosts(
             postStatus,
-            departureLoc, arrivalLoc,
+            depart, dest,
             startDate, endDate,
             dogSize, isKennel, intermediaryName,
             orderCondition,

core/data/src/main/java/com/kusitms/connectdog/core/data/repository/InterManagementRepository.kt

@@ -1,5 +1,6 @@
 package com.kusitms.connectdog.core.data.repository
 
+import com.kusitms.connectdog.core.model.ConnectDogResult
 import com.kusitms.connectdog.core.model.InterApplication
 import com.kusitms.connectdog.core.model.Volunteer
 
@@ -9,4 +10,9 @@ interface InterManagementRepository {
     suspend fun getApplicationInProgress(page: Int? = 0, size: Int? = 5): List<InterApplication>
     suspend fun getApplicationCompleted(page: Int? = 0, size: Int? = 5): List<InterApplication>
     suspend fun getApplicationVolunteer(applicationId: Long): Volunteer
+
+    suspend fun confirmApplicationVolunteer(applicationId: Long): ConnectDogResult
+    suspend fun rejectApplicationVolunteer(applicationId: Long): ConnectDogResult
+
+    suspend fun completeApllication(applicationId: Long): ConnectDogResult
 }

core/data/src/main/java/com/kusitms/connectdog/core/data/repository/InterManagementRepositoryImpl.kt

@@ -3,7 +3,7 @@ package com.kusitms.connectdog.core.data.repository
 import com.kusitms.connectdog.core.data.api.InterApiService
 import com.kusitms.connectdog.core.data.mapper.intermediator.toData
 import com.kusitms.connectdog.core.data.mapper.toData
-import com.kusitms.connectdog.core.data.mapper.volunteer.toData
+import com.kusitms.connectdog.core.model.ConnectDogResult
 import com.kusitms.connectdog.core.model.InterApplication
 import com.kusitms.connectdog.core.model.Volunteer
 import javax.inject.Inject
@@ -30,4 +30,16 @@ internal class InterManagementRepositoryImpl @Inject constructor(
     override suspend fun getApplicationVolunteer(applicationId: Long): Volunteer {
         return api.getApplicationVolunteer(applicationId).toData()
     }
+
+    override suspend fun confirmApplicationVolunteer(applicationId: Long): ConnectDogResult {
+        return api.patchApplicationVolunteer(applicationId).toData()
+    }
+
+    override suspend fun rejectApplicationVolunteer(applicationId: Long): ConnectDogResult {
+        return api.deleteApplicationVolunteer(applicationId).toData()
+    }
+
+    override suspend fun completeApllication(applicationId: Long): ConnectDogResult {
+        return api.patchApplicationCompleted(applicationId).toData()
+    }
 }

core/data/src/main/java/com/kusitms/connectdog/core/data/repository/ManagementRepository.kt

@@ -1,11 +1,14 @@
 package com.kusitms.connectdog.core.data.repository
 
 import com.kusitms.connectdog.core.model.Application
+import com.kusitms.connectdog.core.model.ConnectDogResult
 import com.kusitms.connectdog.core.model.Volunteer
 
 interface ManagementRepository {
     suspend fun getApplicationWaiting(page: Int? = 0, size: Int? = 5): List<Application>
     suspend fun getApplicationInProgress(page: Int? = 0, size: Int? = 5): List<Application>
     suspend fun getApplicationCompleted(page: Int? = 0, size: Int? = 5): List<Application>
     suspend fun getMyApplication(applicationId: Long): Volunteer
+
+    suspend fun deleteMyApplication(applicationId: Long): ConnectDogResult
 }

core/data/src/main/java/com/kusitms/connectdog/core/data/repository/ManagementRepositoryImpl.kt

@@ -4,6 +4,7 @@ import com.kusitms.connectdog.core.data.api.ApiService
 import com.kusitms.connectdog.core.data.mapper.toData
 import com.kusitms.connectdog.core.data.mapper.volunteer.toData
 import com.kusitms.connectdog.core.model.Application
+import com.kusitms.connectdog.core.model.ConnectDogResult
 import com.kusitms.connectdog.core.model.Volunteer
 import javax.inject.Inject
 
@@ -25,4 +26,8 @@ internal class ManagementRepositoryImpl @Inject constructor(
     override suspend fun getMyApplication(applicationId: Long): Volunteer {
         return api.getMyApplication(applicationId).toData()
     }
+
+    override suspend fun deleteMyApplication(applicationId: Long): ConnectDogResult {
+        return api.deleteMyApplication(applicationId).toData()
+    }
 }

core/designsystem/build.gradle.kts

@@ -35,6 +35,7 @@ android {
 
 dependencies {
     implementation(project(":core:model"))
+    implementation(project(":core:util"))
 
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)

core/designsystem/src/main/java/com/kusitms/connectdog/core/designsystem/component/ApplicationBottomSheet.kt

@@ -185,14 +185,14 @@ private fun CommentContent(comment: String) {
             .fillMaxWidth()
             .background(color = Orange20, shape = RoundedCornerShape(4.dp))
             .padding(10.dp),
-        horizontalAlignment = Alignment.Start
+        horizontalAlignment = Alignment.Start,
+        verticalArrangement = Arrangement.spacedBy(4.dp)
     ) {
         Text(
             text = stringResource(id = R.string.volunteer_comment),
             style = MaterialTheme.typography.titleSmall,
             fontSize = 14.sp
         )
-        Spacer(modifier = Modifier.size(6.dp))
         Text(text = comment, style = MaterialTheme.typography.bodyMedium)
     }
 }

core/designsystem/src/main/java/com/kusitms/connectdog/core/designsystem/component/Content.kt

@@ -3,9 +3,6 @@ package com.kusitms.connectdog.core.designsystem.component
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.defaultMinSize
-import androidx.compose.foundation.layout.width
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -60,14 +57,12 @@ fun TitleValue(
     style: TextStyle,
     isValid: Boolean = true
 ) {
-    Row {
+    Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) {
         Text(
             text = title,
             style = style,
-            color = if (isValid) Gray3 else Gray6,
-            modifier = Modifier.defaultMinSize(minWidth = 35.dp)
+            color = if (isValid) Gray3 else Gray6
         )
-        Spacer(modifier = Modifier.width(12.dp))
         Text(
             text = value,
             style = style,