[Refactor] search, my

app/build.gradle.kts

@@ -7,6 +7,7 @@ plugins {
     alias(libs.plugins.dagger.hilt)
     id("org.jetbrains.kotlin.kapt")
     alias(libs.plugins.navigationSafeArgs)
+    id("com.google.gms.google-services")
 }
 
 val properties = Properties().apply {
@@ -148,4 +149,9 @@ dependencies {
 
     // Accompanist
     implementation(libs.accompanist.permissions)
+
+    // Firebase
+    implementation(platform("com.google.firebase:firebase-bom:33.4.0"))
+    implementation("com.google.firebase:firebase-analytics-ktx")
+    implementation("com.google.firebase:firebase-config-ktx")
 }

app/src/main/java/com/example/findu/data/dataremote/datasource/HomeRemoteDataSource.kt

@@ -1,7 +1,7 @@
 package com.example.findu.data.dataremote.datasource
 
 import com.example.findu.data.dataremote.model.base.BaseResponse
-import com.example.findu.data.dataremote.model.response.HomeResponseDto
+import com.example.findu.data.dataremote.model.response.home.HomeResponseDto
 
 interface HomeRemoteDataSource {
     suspend fun getHome(

app/src/main/java/com/example/findu/data/dataremote/datasource/InformationRemoteDataSource.kt

@@ -0,0 +1,31 @@
+package com.example.findu.data.dataremote.datasource
+
+import com.example.findu.data.dataremote.model.base.BaseResponse
+import com.example.findu.data.dataremote.model.response.information.VolunteersResponseDto
+import com.example.findu.data.dataremote.model.response.information.CentersResponseDto
+import com.example.findu.data.dataremote.model.response.information.DepartmentsResponseDto
+import com.example.findu.data.dataremote.model.response.information.SidoListDto
+import com.example.findu.data.dataremote.model.response.information.SigunguListDto
+
+interface InformationRemoteDataSource {
+    suspend fun getVolunteers(
+        lastId: Long? = Long.MAX_VALUE,
+    ): BaseResponse<VolunteersResponseDto>
+
+    suspend fun getCenters(
+        lastId: Long? = Long.MAX_VALUE,
+        sido: String? = null,
+        sigungu: String? = null,
+        lat: Double? = null,
+        long: Double? = null
+    ): BaseResponse<CentersResponseDto>
+
+    suspend fun getDepartments(
+        district: String? = null,
+        lastId: Long? = Long.MAX_VALUE,
+    ): BaseResponse<DepartmentsResponseDto>
+
+    suspend fun getSido(): BaseResponse<SidoListDto>
+
+    suspend fun getSigungu(sidoId:Long): BaseResponse<SigunguListDto>
+}

app/src/main/java/com/example/findu/data/dataremote/datasource/MyRemoteDataSource.kt

@@ -9,6 +9,7 @@ import com.example.findu.data.dataremote.model.response.my.MyReportHistoryRespon
 import com.example.findu.data.dataremote.model.response.my.MyViewedAnimalsResponseDto
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
+import java.io.File
 
 interface MyRemoteDataSource {
     suspend fun getInterestAnimals(
@@ -29,7 +30,7 @@ interface MyRemoteDataSource {
 
     suspend fun getNickname(): BaseResponse<MyNickNameResponseDto>
 
-    suspend fun patchProfileImageFile(file: MultipartBody.Part): NullableBaseResponse<Unit>
-
-    suspend fun patchProfileImageDefault(defaultProfileImageName: RequestBody): NullableBaseResponse<Unit>
-}
+    suspend fun patchProfileImage(
+        profileImageFile: File?,
+        defaultImageName: String?
+    ): NullableBaseResponse<Unit>}

app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/HomeRemoteDataSourceImpl.kt

@@ -2,7 +2,7 @@ package com.example.findu.data.dataremote.datasourceimpl
 
 import com.example.findu.data.dataremote.datasource.HomeRemoteDataSource
 import com.example.findu.data.dataremote.model.base.BaseResponse
-import com.example.findu.data.dataremote.model.response.HomeResponseDto
+import com.example.findu.data.dataremote.model.response.home.HomeResponseDto
 import com.example.findu.data.dataremote.service.HomeService
 import javax.inject.Inject
 

app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/InformationRemoteDataSourceImpl.kt

@@ -0,0 +1,39 @@
+package com.example.findu.data.dataremote.datasourceimpl
+
+import com.example.findu.data.dataremote.datasource.InformationRemoteDataSource
+import com.example.findu.data.dataremote.model.base.BaseResponse
+import com.example.findu.data.dataremote.model.response.information.CentersResponseDto
+import com.example.findu.data.dataremote.model.response.information.DepartmentsResponseDto
+import com.example.findu.data.dataremote.model.response.information.SidoListDto
+import com.example.findu.data.dataremote.model.response.information.SigunguListDto
+import com.example.findu.data.dataremote.model.response.information.VolunteersResponseDto
+import com.example.findu.data.dataremote.service.InformationService
+import javax.inject.Inject
+
+class InformationRemoteDataSourceImpl @Inject constructor(
+    private val informationService: InformationService
+) : InformationRemoteDataSource {
+
+    override suspend fun getVolunteers(
+        lastId: Long?
+    ): BaseResponse<VolunteersResponseDto> = informationService.getVolunteers(lastId)
+
+    override suspend fun getCenters(
+        lastId: Long?,
+        sido: String?,
+        sigungu: String?,
+        lat: Double?,
+        long: Double?
+    ): BaseResponse<CentersResponseDto> = informationService.getCenters(lastId, sido, sigungu, lat, long)
+
+
+    override suspend fun getDepartments(
+        district: String?,
+        lastId: Long?
+    ): BaseResponse<DepartmentsResponseDto> = informationService.getDepartments(district, lastId)
+
+    override suspend fun getSido(): BaseResponse<SidoListDto> = informationService.getSido()
+
+    override suspend fun getSigungu(sidoId:Long): BaseResponse<SigunguListDto> = informationService.getSigungu(sidoId = sidoId)
+
+}

app/src/main/java/com/example/findu/data/dataremote/datasourceimpl/MyRemoteDataSourceImpl.kt

@@ -10,8 +10,11 @@ import com.example.findu.data.dataremote.model.response.my.MyReportHistoryRespon
 import com.example.findu.data.dataremote.model.response.my.MyViewedAnimalsResponseDto
 import com.example.findu.data.dataremote.service.MyService
 import com.example.findu.data.dataremote.util.handleBaseResponse
+import com.example.findu.data.mapper.torequest.toImageMultipart
+import com.example.findu.data.mapper.torequest.toPlainTextRequestBody
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
+import java.io.File
 import javax.inject.Inject
 
 class MyRemoteDataSourceImpl @Inject constructor(
@@ -39,11 +42,13 @@ class MyRemoteDataSourceImpl @Inject constructor(
     override suspend fun getNickname(): BaseResponse<MyNickNameResponseDto> =
         myService.getNickname()
 
-    override suspend fun patchProfileImageFile(file: MultipartBody.Part): NullableBaseResponse<Unit> =
-        myService.patchProfileImageFile(file)
-
-
-    override suspend fun patchProfileImageDefault(defaultProfileImageName: RequestBody): NullableBaseResponse<Unit> =
-        myService.patchProfileImageDefault(defaultProfileImageName)
+    override suspend fun patchProfileImage(
+        profileImageFile: File?,
+        defaultImageName: String?
+    ): NullableBaseResponse<Unit> =
+        myService.patchProfileImage(
+            profileImageFile = profileImageFile?.toImageMultipart("profileImageFile"),
+            defaultProfileImageName = defaultImageName?.toPlainTextRequestBody()
+        )
 
 }

app/src/main/java/com/example/findu/data/dataremote/model/response/HomeResponseDto.kt → app/src/main/java/com/example/findu/data/dataremote/model/response/home/HomeResponseDto.kt

@@ -1,4 +1,4 @@
-package com.example.findu.data.dataremote.model.response
+package com.example.findu.data.dataremote.model.response.home
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/com/example/findu/data/dataremote/model/response/information/CentersResponseDto.kt

@@ -0,0 +1,31 @@
+package com.example.findu.data.dataremote.model.response.information
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CentersResponseDto(
+    @SerialName("centers")
+    val centers: List<CenterDto>,
+
+    @SerialName("lastId")
+    val lastId: Long?,
+
+    @SerialName("isLast")
+    val isLast: Boolean
+)
+
+@Serializable
+data class CenterDto(
+    @SerialName("jurisdiction")
+    val jurisdiction: List<String>,
+
+    @SerialName("centerName")
+    val centerName: String,
+
+    @SerialName("phoneNumber")
+    val phoneNumber: String,
+
+    @SerialName("address")
+    val address: String
+)

app/src/main/java/com/example/findu/data/dataremote/model/response/information/DepartmentsResponseDto.kt

@@ -0,0 +1,29 @@
+package com.example.findu.data.dataremote.model.response.information
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+
+@Serializable
+data class DepartmentsResponseDto(
+    @SerialName("departments")
+    val departments: List<DepartmentDto>,
+
+    @SerialName("lastId")
+    val lastId: Long?,
+
+    @SerialName("isLast")
+    val isLast: Boolean
+)
+
+@Serializable
+data class DepartmentDto(
+    @SerialName("departmentName")
+    val departmentName: String,
+
+    @SerialName("district")
+    val district: String,
+
+    @SerialName("phoneNumber")
+    val phoneNumber: String
+)

app/src/main/java/com/example/findu/data/dataremote/model/response/information/SidoListDto.kt

@@ -0,0 +1,18 @@
+package com.example.findu.data.dataremote.model.response.information
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SidoListDto(
+    @SerialName("sidoList")
+    val sidoList: List<SidoItemDto>
+)
+
+@Serializable
+data class SidoItemDto(
+    @SerialName("id")
+    val id: Long,
+    @SerialName("name")
+    val name: String
+)

app/src/main/java/com/example/findu/data/dataremote/model/response/information/SigunguListDto.kt

@@ -0,0 +1,10 @@
+package com.example.findu.data.dataremote.model.response.information
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SigunguListDto(
+    @SerialName("sigunguList")
+    val sigunguList: List<String>
+)

app/src/main/java/com/example/findu/data/dataremote/model/response/information/VolunteersResponseDto.kt

@@ -0,0 +1,30 @@
+package com.example.findu.data.dataremote.model.response.information
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class VolunteersResponseDto(
+    @SerialName("volunteerWorks")
+    val volunteerWorks: List<VolunteerWorkDto>,
+    @SerialName("lastId")
+    val lastId: Long,
+    @SerialName("isLast")
+    val isLast: Boolean
+)
+
+@Serializable
+data class VolunteerWorkDto(
+    @SerialName("institution")
+    val institution: String,
+    @SerialName("recruitmentPeriod")
+    val recruitmentPeriod: String,
+    @SerialName("address")
+    val address: String,
+    @SerialName("workPeriod")
+    val workPeriod: String,
+    @SerialName("workTime")
+    val workTime: String,
+    @SerialName("webLink")
+    val webLink: String
+)

app/src/main/java/com/example/findu/data/dataremote/model/response/my/MyInterestResponseDto.kt

@@ -6,7 +6,7 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class MyInterestResponseDto(
-    @SerialName("interestAnimals")
+    @SerialName("cards")
     val interestAnimals: List<InterestAnimalDto>,
     @SerialName("isLast")
     val isLast: Boolean,
@@ -20,12 +20,12 @@ data class MyInterestResponseDto(
         @SerialName("thumbnailImageUrl")
         val thumbnailImageUrl: String,
         @SerialName("title")
-        val title: String,
+        val title: String? = null,
         @SerialName("tag")
         val tag: String,
         @SerialName("date")
         val date: String,
-        @SerialName("address")
+        @SerialName("location")
         val address: String,
 
 

app/src/main/java/com/example/findu/data/dataremote/service/HomeService.kt

@@ -1,7 +1,7 @@
 package com.example.findu.data.dataremote.service
 
 import com.example.findu.data.dataremote.model.base.BaseResponse
-import com.example.findu.data.dataremote.model.response.HomeResponseDto
+import com.example.findu.data.dataremote.model.response.home.HomeResponseDto
 import com.example.findu.data.dataremote.util.ApiConstraints.API
 import com.example.findu.data.dataremote.util.ApiConstraints.HOME
 import com.example.findu.data.dataremote.util.ApiConstraints.VERSION

app/src/main/java/com/example/findu/data/dataremote/service/InformationService.kt

@@ -0,0 +1,43 @@
+package com.example.findu.data.dataremote.service
+
+import com.example.findu.data.dataremote.model.base.BaseResponse
+import com.example.findu.data.dataremote.model.response.home.HomeResponseDto
+import com.example.findu.data.dataremote.model.response.information.CentersResponseDto
+import com.example.findu.data.dataremote.model.response.information.DepartmentsResponseDto
+import com.example.findu.data.dataremote.model.response.information.SidoListDto
+import com.example.findu.data.dataremote.model.response.information.SigunguListDto
+import com.example.findu.data.dataremote.model.response.information.VolunteersResponseDto
+import com.example.findu.data.dataremote.util.ApiConstraints.API
+import com.example.findu.data.dataremote.util.ApiConstraints.INFORMATION
+import com.example.findu.data.dataremote.util.ApiConstraints.VERSION
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+interface InformationService {
+    @GET("/$API/$VERSION/$INFORMATION/volunteer-works")
+    suspend fun getVolunteers(
+        @Query("lastId") lastId: Long? = Long.MAX_VALUE,
+    ): BaseResponse<VolunteersResponseDto>
+
+    @GET("/$API/$VERSION/$INFORMATION/protection-centers")
+    suspend fun getCenters(
+        @Query("lastId") lastId: Long? = Long.MAX_VALUE,
+        @Query("sido") sido: String? = null,
+        @Query("sigungu") sigungu: String? = null,
+        @Query("lat") lat: Double? = null,
+        @Query("long") long: Double? = null
+    ): BaseResponse<CentersResponseDto>
+
+    @GET("/$API/$VERSION/$INFORMATION/departments")
+    suspend fun getDepartments(
+        @Query("district") district: String? = null,
+        @Query("lastId") lastId: Long? = Long.MAX_VALUE,
+    ): BaseResponse<DepartmentsResponseDto>
+
+    @GET("/$API/$VERSION/sidos")
+    suspend fun getSido(): BaseResponse<SidoListDto>
+
+    @GET("/$API/$VERSION/sigungus")
+    suspend fun getSigungu(
+        @Query("sidoId") sidoId: Long): BaseResponse<SigunguListDto>
+}

app/src/main/java/com/example/findu/data/dataremote/service/InterestService.kt

@@ -22,9 +22,9 @@ interface InterestService {
         @Body request: MyInterestRequestDto
     ) : NullableBaseResponse<Unit>
 
-    @DELETE("/api/v2/users/me/interest-animals")
+    @DELETE("/api/v2/users/me/interest-animals/{reportId}")
     suspend fun deleteInterestAnimal(
-        @Query("reportId") reportId : Long
+        @Path("reportId") reportId: Long
     ) : NullableBaseResponse<Unit>
 
 }