Merge pull request #44 from PawWithU/feature/organization_management

Feature/organization management: 봉사관리 완료

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFAC60</color>
+</resources>

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

@@ -1,12 +1,12 @@
 package com.kusitms.connectdog.core.data.api
 
-import com.kusitms.connectdog.core.data.api.model.AnnouncementHomeResponseItem
-import com.kusitms.connectdog.core.data.api.model.AnnouncementSearchResponseItem
-import com.kusitms.connectdog.core.data.api.model.ApplicationCompletedResponseItem
-import com.kusitms.connectdog.core.data.api.model.ApplicationInProgressResponseItem
-import com.kusitms.connectdog.core.data.api.model.ApplicationWaitingResponseItem
 import com.kusitms.connectdog.core.data.api.model.ReviewResponseItem
 import com.kusitms.connectdog.core.data.api.model.VolunteerResponse
+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.data.api.model.volunteer.ApplicationCompletedResponseItem
+import com.kusitms.connectdog.core.data.api.model.volunteer.ApplicationInProgressResponseItem
+import com.kusitms.connectdog.core.data.api.model.volunteer.ApplicationWaitingResponseItem
 import retrofit2.http.GET
 import retrofit2.http.Path
 import retrofit2.http.Query

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

@@ -0,0 +1,44 @@
+package com.kusitms.connectdog.core.data.api
+
+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.GET
+import retrofit2.http.Path
+import retrofit2.http.Query
+
+internal interface InterApiService {
+    /**
+     * 봉사관리
+     */
+    @GET("/intermediaries/posts/recruiting")
+    suspend fun getApplicationRecruiting(
+        @Query("page") page: Int?,
+        @Query("size") size: Int?
+    ): List<InterApplicationRecruitingResponseItem>
+
+    @GET("/intermediaries/applications/waiting")
+    suspend fun getApplicationWaiting(
+        @Query("page") page: Int?,
+        @Query("size") size: Int?
+    ): List<InterApplicationWaitingResponseItem>
+
+    @GET("/intermediaries/applications/progressing")
+    suspend fun getApplicationProgressing(
+        @Query("page") page: Int?,
+        @Query("size") size: Int?
+    ): List<InterApplicationInProgressResponseItem>
+
+    @GET("/intermediaries/applications/completed")
+    suspend fun getApplicationCompleted(
+        @Query("page") page: Int?,
+        @Query("size") size: Int?
+    ): List<InterApplicationCompletedResponseItem>
+
+    @GET("/intermediaries/applications/{applicationId}")
+    suspend fun getApplicationVolunteer(
+        @Path("applicationId") applicationId: Long
+    ): VolunteerResponse
+}

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

@@ -0,0 +1,18 @@
+package com.kusitms.connectdog.core.data.api.model.intermediator
+
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class InterApplicationCompletedResponseItem(
+    val applicationId: Long,
+    val arrivalLoc: String,
+    val departureLoc: String,
+    val dogName: String,
+    val endDate: String,
+    val mainImage: String,
+    val postId: Long,
+    val reviewId: Long?,
+    val dogStatusId: Long?,
+    val startDate: String,
+    val volunteerName: String
+)

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

@@ -0,0 +1,16 @@
+package com.kusitms.connectdog.core.data.api.model.intermediator
+
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class InterApplicationInProgressResponseItem(
+    val postId: Long,
+    val applicationId: Long,
+    val arrivalLoc: String,
+    val departureLoc: String,
+    val dogName: String,
+    val endDate: String,
+    val mainImage: String,
+    val startDate: String,
+    val volunteerName: String
+)

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

@@ -0,0 +1,16 @@
+package com.kusitms.connectdog.core.data.api.model.intermediator
+
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class InterApplicationRecruitingResponseItem(
+    val postId: Long,
+    val arrivalLoc: String,
+    val departureLoc: String,
+    val dogName: String,
+    val endDate: String,
+    val mainImage: String,
+    val postStatus: String,
+    val startDate: String,
+    val volunteerName: String?
+)

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

@@ -0,0 +1,17 @@
+package com.kusitms.connectdog.core.data.api.model.intermediator
+
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class InterApplicationWaitingResponseItem(
+    val applicationId: Long,
+    val postId: Long,
+    val applicationTime: String,
+    val arrivalLoc: String,
+    val departureLoc: String,
+    val dogName: String,
+    val endDate: String,
+    val mainImage: String,
+    val startDate: String,
+    val volunteerName: String
+)

core/data/src/main/java/com/kusitms/connectdog/core/data/api/model/AnnouncementHomeResponseItem.kt → core/data/src/main/java/com/kusitms/connectdog/core/data/api/model/volunteer/AnnouncementHomeResponseItem.kt

@@ -1,4 +1,4 @@
-package com.kusitms.connectdog.core.data.api.model
+package com.kusitms.connectdog.core.data.api.model.volunteer
 
 import com.squareup.moshi.JsonClass
 

core/data/src/main/java/com/kusitms/connectdog/core/data/api/model/AnnouncementSearchResponseItem.kt → core/data/src/main/java/com/kusitms/connectdog/core/data/api/model/volunteer/AnnouncementSearchResponseItem.kt

@@ -1,4 +1,4 @@
-package com.kusitms.connectdog.core.data.api.model
+package com.kusitms.connectdog.core.data.api.model.volunteer
 
 import com.squareup.moshi.JsonClass
 

core/data/src/main/java/com/kusitms/connectdog/core/data/api/model/ApplicationCompletedResponseItem.kt → core/data/src/main/java/com/kusitms/connectdog/core/data/api/model/volunteer/ApplicationCompletedResponseItem.kt

@@ -1,4 +1,4 @@
-package com.kusitms.connectdog.core.data.api.model
+package com.kusitms.connectdog.core.data.api.model.volunteer
 
 import com.squareup.moshi.JsonClass
 

core/data/src/main/java/com/kusitms/connectdog/core/data/api/model/ApplicationInProgressResponseItem.kt → core/data/src/main/java/com/kusitms/connectdog/core/data/api/model/volunteer/ApplicationInProgressResponseItem.kt

@@ -1,4 +1,4 @@
-package com.kusitms.connectdog.core.data.api.model
+package com.kusitms.connectdog.core.data.api.model.volunteer
 
 import com.squareup.moshi.JsonClass
 

core/data/src/main/java/com/kusitms/connectdog/core/data/api/model/ApplicationWaitingResponseItem.kt → core/data/src/main/java/com/kusitms/connectdog/core/data/api/model/volunteer/ApplicationWaitingResponseItem.kt

@@ -1,4 +1,4 @@
-package com.kusitms.connectdog.core.data.api.model
+package com.kusitms.connectdog.core.data.api.model.volunteer
 
 import com.squareup.moshi.JsonClass
 

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

@@ -1,6 +1,7 @@
 package com.kusitms.connectdog.core.data.di
 
 import com.kusitms.connectdog.core.data.api.ApiService
+import com.kusitms.connectdog.core.data.api.InterApiService
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import dagger.Module
@@ -26,13 +27,14 @@ internal object ApiModule {
 
     private val networkInterceptor: Interceptor = Interceptor { chain ->
         val request = chain.request()
-        val jwt = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJBY2Nlc3NUb2tlbiIsInJvbGVOYW1lIjoiVk9MVU5URUVSIiwiaWQiOjEsImV4cCI6MTcwMTY4OTU0NX0.Icz7auxDCkiUSaCaEQYzMibizObIrOniP5WmjX8cn54T56kA_i2bfG9IxUne3exWdFGq7DPWp7i-prpq5LgfXw"
+        val jwt = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJBY2Nlc3NUb2tlbiIsInJvbGVOYW1lIjoiVk9MVU5URUVSIiwiaWQiOjEsImV4cCI6MTcwMTc4MDEwNX0.wRNKOcfnFxvXmsGFXPZ3aSsGcOXxbUXczsjC_BRtHmhGmKJalOE4P7rcY_eAdOIKldtX3xE6Gdb3DYkLGEPP5A"
+        val interJwt = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJBY2Nlc3NUb2tlbiIsInJvbGVOYW1lIjoiSU5URVJNRURJQVJZIiwiaWQiOjEsImV4cCI6MTcwMTc4MDA4OX0.IxtBsu26aVswZpyfXBEYcpyLIb_IxAgFkCQTkJfG2QCeU29VfwO7ixBNACcDlvdPp2nR1PD8T6STPZKfpDW_Gw"
         try {
             chain.proceed(
                 request.newBuilder()
                     .addHeader(
                         "Authorization",
-                        "Bearer $jwt"
+                        "Bearer $interJwt"
                     ) // todo
                     .build()
             )
@@ -84,6 +86,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/di/InterDataModule.kt

@@ -0,0 +1,21 @@
+package com.kusitms.connectdog.core.data.di
+
+import com.kusitms.connectdog.core.data.api.InterApiService
+import com.kusitms.connectdog.core.data.repository.InterManagementRepository
+import com.kusitms.connectdog.core.data.repository.InterManagementRepositoryImpl
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@InstallIn(SingletonComponent::class)
+@Module
+internal class InterDataModule {
+
+    @Provides
+    @Singleton
+    fun provideInterManagementRepository(apiService: InterApiService): InterManagementRepository {
+        return InterManagementRepositoryImpl(apiService)
+    }
+}

core/data/src/main/java/com/kusitms/connectdog/core/data/di/DataModule.kt → core/data/src/main/java/com/kusitms/connectdog/core/data/di/VolunteerDataModule.kt

@@ -16,7 +16,7 @@ import javax.inject.Singleton
 
 @InstallIn(SingletonComponent::class)
 @Module
-internal class DataModule {
+internal class VolunteerDataModule {
 
     @Provides
     @Singleton

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

@@ -0,0 +1,55 @@
+package com.kusitms.connectdog.core.data.mapper.intermediator
+
+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 com.kusitms.connectdog.core.model.InterApplication
+import com.kusitms.connectdog.core.util.dateRangeFormat
+
+internal fun InterApplicationRecruitingResponseItem.toData(): InterApplication =
+    InterApplication(
+        imageUrl = mainImage,
+        dogName = dogName,
+        location = "${this.departureLoc} → ${this.arrivalLoc}",
+        date = dateRangeFormat(startDate, endDate),
+        volunteerName = volunteerName ?: "-",
+        postId = postId,
+        postStatus = postStatus
+    )
+
+internal fun InterApplicationWaitingResponseItem.toData(): InterApplication =
+    InterApplication(
+        imageUrl = mainImage,
+        dogName = dogName,
+        location = "${this.departureLoc} → ${this.arrivalLoc}",
+        date = dateRangeFormat(startDate, endDate),
+        volunteerName = volunteerName,
+        postId = postId,
+        applicationTime = applicationTime,
+        applicationId = applicationId
+    )
+
+internal fun InterApplicationInProgressResponseItem.toData(): InterApplication =
+    InterApplication(
+        imageUrl = mainImage,
+        dogName = dogName,
+        location = "${this.departureLoc} → ${this.arrivalLoc}",
+        date = dateRangeFormat(startDate, endDate),
+        volunteerName = volunteerName,
+        postId = postId,
+        applicationId = applicationId
+    )
+
+internal fun InterApplicationCompletedResponseItem.toData(): InterApplication =
+    InterApplication(
+        imageUrl = mainImage,
+        dogName = dogName,
+        location = "${this.departureLoc} → ${this.arrivalLoc}",
+        date = dateRangeFormat(startDate, endDate),
+        volunteerName = volunteerName,
+        postId = postId,
+        applicationId = applicationId,
+        reviewId = reviewId,
+        dogStatusId = dogStatusId
+    )