🔀 :: (#184) 1.2.0 출시

buildSrc/src/main/java/Dependency.kt

@@ -65,8 +65,10 @@ object Dependency {
 
     object Google {
         const val MATERIAL = "com.google.android.material:material:${Versions.Material}"
-        const val FIREBASE_BOM = "com.google.firebase:firebase-bom:${Versions.FIREBASE_BOM}"
-        const val FIREBASE_ANALYTICS = "com.google.firebase:firebase-analytics-ktx"
+        const val FIREBASE_BOM = "com.google.firebase:firebase-bom:${Versions.FirebaseBom}"
+        const val FIREBASE_ANALYTICS = "com.google.firebase:firebase-analytics-ktx:${Versions.FirebaseAnalytics}"
+        const val FIREBASE_MESSAGING = "com.google.firebase:firebase-messaging-ktx:${Versions.FirebaseMessaging}"
+        const val IN_APP_UPDATE = "com.google.android.play:core-ktx:${Versions.InAppUpdate}"
     }
 
     object Test {

buildSrc/src/main/java/Versions.kt

@@ -44,5 +44,9 @@ object Versions {
     const val Lifecycle = "2.3.1"
     const val LifecycleRuntime = "2.5.1"
 
-    const val FIREBASE_BOM = "32.0.0"
+    const val FirebaseBom = "32.2.3"
+    const val FirebaseAnalytics = "21.3.0"
+    const val FirebaseMessaging = "23.2.1"
+
+    const val InAppUpdate = "1.8.1"
 }

data/src/main/java/com/goms/data/api/NotificationApi.kt

@@ -0,0 +1,12 @@
+package com.goms.data.api
+
+import retrofit2.Response
+import retrofit2.http.POST
+import retrofit2.http.Path
+
+interface NotificationApi {
+    @POST("notification/token/{deviceToken}")
+    suspend fun setNotification(
+        @Path("deviceToken") deviceToken: String
+    ): Response<Unit>
+}

data/src/main/java/com/goms/data/api/interceptor/LoginInterceptor.kt

@@ -21,38 +21,21 @@ class LoginInterceptor @Inject constructor(
     override fun intercept(chain: Interceptor.Chain): Response {
         val request = chain.request()
 
-        // 토큰 갱신 요청인지, 로그인 요청인지 확인해 따로 리턴한다.
         if ("/api/v1/auth" == request.url.encodedPath && "PATCH" == request.method)
             return chain.proceed(request)
         if ("/api/v1/auth/signin" == request.url.encodedPath && "POST" == request.method)
             return chain.proceed(request)
 
         val currentTime = LocalDateTime.now()
-        val parsePattern = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH-mm-ss")
+        val parsePattern = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss")
         val accessTokenExp = authTokenDataSource.getAccessTokenExp()
         val refreshTokenExp = authTokenDataSource.getRefreshTokenExp()
         val accessTokenExpireDate = LocalDateTime.parse(accessTokenExp, parsePattern)
         val refreshTokenExpireDate = LocalDateTime.parse(refreshTokenExp, parsePattern)
 
         if (currentTime.isAfter(refreshTokenExpireDate)) throw NeedLoginException()
         if (currentTime.isAfter(accessTokenExpireDate)) {
-            val currentRefreshToken = authTokenDataSource.getRefreshToken()
-            val refreshRequest = chain.request().newBuilder()
-                .url(BuildConfig.BASE_URL+"auth")
-                .addHeader("refreshToken", "Bearer $currentRefreshToken")
-                .patch("".toRequestBody(null))
-                .build()
-            val refreshResponse = chain.proceed(refreshRequest)
-            if (refreshResponse.isSuccessful) {
-                val jsonParser = JsonParser()
-                val token = jsonParser.parse(refreshResponse.body?.string()) as JsonObject
-                authTokenDataSource.setToken(
-                    accessToken = token["accessToken"].toString().deleteDot(),
-                    refreshToken = token["refreshToken"].toString().deleteDot(),
-                    accessTokenExp = token["accessTokenExp"].toString().deleteDot(),
-                    refreshTokenExp = token["refreshTokenExp"].toString().deleteDot()
-                )
-            } else throw NeedLoginException()
+            tokenRefresh(chain)
         }
 
         // 이 부분이 기존 요청에 token header를 붙여 return 하는 곳
@@ -64,6 +47,26 @@ class LoginInterceptor @Inject constructor(
         )
     }
 
+    private fun tokenRefresh(chain: Interceptor.Chain) {
+        val currentRefreshToken = authTokenDataSource.getRefreshToken()
+        val refreshRequest = chain.request().newBuilder()
+            .url(BuildConfig.BASE_URL+"auth")
+            .addHeader("refreshToken", "Bearer $currentRefreshToken")
+            .patch("".toRequestBody(null))
+            .build()
+        val refreshResponse = chain.proceed(refreshRequest)
+        if (refreshResponse.isSuccessful) {
+            val jsonParser = JsonParser()
+            val token = jsonParser.parse(refreshResponse.body?.string()) as JsonObject
+            authTokenDataSource.setToken(
+                accessToken = token["accessToken"].toString().deleteDot(),
+                refreshToken = token["refreshToken"].toString().deleteDot(),
+                accessTokenExp = token["accessTokenExp"].toString().deleteDot(),
+                refreshTokenExp = token["refreshTokenExp"].toString().deleteDot()
+            )
+        } else throw NeedLoginException()
+    }
+
     private fun String.deleteDot(): String {
         return this.substring(1, this.length-1)
     }

data/src/main/java/com/goms/data/datasource/notification/NotificationDataSource.kt

@@ -0,0 +1,8 @@
+package com.goms.data.datasource.notification
+
+import kotlinx.coroutines.flow.Flow
+import retrofit2.Response
+
+interface NotificationDataSource {
+    suspend fun setNotification(deviceToken: String): Flow<Response<Unit>>
+}

data/src/main/java/com/goms/data/datasource/notification/NotificationDataSourceImpl.kt

@@ -0,0 +1,17 @@
+package com.goms.data.datasource.notification
+
+import com.goms.data.api.NotificationApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import retrofit2.Response
+import javax.inject.Inject
+
+class NotificationDataSourceImpl @Inject constructor(
+    private val notificationApi: NotificationApi
+): NotificationDataSource {
+    override suspend fun setNotification(deviceToken: String): Flow<Response<Unit>> {
+        return flow {
+            emit(notificationApi.setNotification(deviceToken))
+        }
+    }
+}

data/src/main/java/com/goms/data/mapper/ProfileMapper.kt

@@ -7,7 +7,6 @@ import com.goms.domain.data.profile.ProfileResponseData
 object ProfileMapper {
     fun profileResponseToData(profileResponse: ProfileResponse): ProfileResponseData {
         return ProfileResponseData(
-            accountIdx = profileResponse.accountIdx,
             name = profileResponse.name,
             studentNum = StudentInfoMapper.studentInfoToData(profileResponse.studentNum),
             authority = profileResponse.authority,

data/src/main/java/com/goms/data/model/profile/ProfileResponse.kt

@@ -2,10 +2,8 @@ package com.goms.data.model.profile
 
 import com.goms.data.model.util.StudentInfo
 import com.google.gson.annotations.SerializedName
-import java.util.UUID
 
 data class ProfileResponse(
-    @SerializedName("accountIdx") val accountIdx: UUID,
     @SerializedName("name") val name: String,
     @SerializedName("studentNum") val studentNum: StudentInfo,
     @SerializedName("authority") val authority: String,

data/src/main/java/com/goms/data/repository/AuthRepositoryImpl.kt

@@ -35,7 +35,7 @@ class AuthRepositoryImpl @Inject constructor(
         val currentTime = LocalDateTime.now()
         val accessTokenExp = authTokenDataSource.getAccessTokenExp()
         val refreshTokenExp = authTokenDataSource.getRefreshTokenExp()
-        val parsePattern = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH-mm-ss")
+        val parsePattern = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss")
         val refreshExpireDate = LocalDateTime.parse(refreshTokenExp, parsePattern)
         val accessExpireDate = LocalDateTime.parse(accessTokenExp, parsePattern)
 

data/src/main/java/com/goms/data/repository/NotificationRepositoryImpl.kt

@@ -0,0 +1,20 @@
+package com.goms.data.repository
+
+import com.goms.data.datasource.notification.NotificationDataSource
+import com.goms.domain.repository.NotificationRepository
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import retrofit2.Response
+import javax.inject.Inject
+
+class NotificationRepositoryImpl @Inject constructor(
+    private val notificationDataSource: NotificationDataSource
+): NotificationRepository {
+    override suspend fun setNotification(deviceToken: String): Flow<Response<Unit>> {
+        return flow {
+            notificationDataSource.setNotification(deviceToken).collect {
+                emit(it)
+            }
+        }
+    }
+}

domain/src/main/java/com/goms/domain/data/profile/ProfileResponseData.kt

@@ -2,10 +2,8 @@ package com.goms.domain.data.profile
 
 import com.goms.domain.data.util.StudentInfoData
 import java.io.Serializable
-import java.util.UUID
 
 data class ProfileResponseData(
-    val accountIdx: UUID,
     val name: String,
     val studentNum: StudentInfoData,
     val authority: String,

domain/src/main/java/com/goms/domain/repository/NotificationRepository.kt

@@ -0,0 +1,8 @@
+package com.goms.domain.repository
+
+import kotlinx.coroutines.flow.Flow
+import retrofit2.Response
+
+interface NotificationRepository {
+    suspend fun setNotification(deviceToken: String): Flow<Response<Unit>>
+}

domain/src/main/java/com/goms/domain/usecase/notification/SetNotificationUseCase.kt

@@ -0,0 +1,14 @@
+package com.goms.domain.usecase.notification
+
+import com.goms.domain.repository.NotificationRepository
+import kotlinx.coroutines.flow.Flow
+import retrofit2.Response
+import javax.inject.Inject
+
+class SetNotificationUseCase @Inject constructor(
+    private val notificationRepository: NotificationRepository
+) {
+    suspend operator fun invoke(deviceToken: String): Flow<Response<Unit>> {
+        return notificationRepository.setNotification(deviceToken)
+    }
+}

presentation/build.gradle.kts

@@ -17,8 +17,8 @@ android {
         applicationId = "com.goms.presentation"
         minSdk = 26
         targetSdk = 33
-        versionCode = 7
-        versionName = "1.1.1"
+        versionCode = 8
+        versionName = "1.2.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
@@ -88,6 +88,9 @@ dependencies {
     implementation(Dependency.Retrofit.OKHTTP)
     implementation(Dependency.Retrofit.OKHTTP_LOGGING_INTERCEPTOR)
 
+    // in app update
+    implementation(Dependency.Google.IN_APP_UPDATE)
+
     // compose
     implementation(Dependency.Compose.ACTIVITY_COMPOSE)
     implementation(Dependency.Compose.COMPOSE)
@@ -118,6 +121,8 @@ dependencies {
     implementation(Dependency.AndroidX.SWIPE_REFRESH_LAYOUT)
     implementation(Dependency.Libraries.SWIPE_REFRESH)
 
+    // firebase
     implementation(platform(Dependency.Google.FIREBASE_BOM))
     implementation(Dependency.Google.FIREBASE_ANALYTICS)
+    implementation(Dependency.Google.FIREBASE_MESSAGING)
 }

presentation/src/main/AndroidManifest.xml

@@ -5,6 +5,7 @@
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <uses-feature
         android:name="android.hardware.camera"
@@ -53,6 +54,13 @@
             android:name=".view.main.MainActivity"
             android:screenOrientation="portrait"
             android:exported="true" />
-    </application>
 
+        <service
+            android:name=".utils.notification.GomsNotification"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+    </application>
 </manifest>

presentation/src/main/java/com/goms/presentation/di/module/DataSourceModule.kt

@@ -6,6 +6,8 @@ import com.goms.data.datasource.auth.AuthDataSource
 import com.goms.data.datasource.auth.AuthDataSourceImpl
 import com.goms.data.datasource.late.LateDataSource
 import com.goms.data.datasource.late.LateDataSourceImpl
+import com.goms.data.datasource.notification.NotificationDataSource
+import com.goms.data.datasource.notification.NotificationDataSourceImpl
 import com.goms.data.datasource.outing.OutingDataSource
 import com.goms.data.datasource.outing.OutingDataSourceImpl
 import com.goms.data.datasource.profile.ProfileDataSource
@@ -50,4 +52,9 @@ abstract class DataSourceModule {
     abstract fun bindCouncilDataSource(
         councilDataSourceImpl: CouncilDataSourceImpl
     ): CouncilDataSource
+
+    @Binds
+    abstract fun bindNotificationDataSource(
+        notificationDataSourceImpl: NotificationDataSourceImpl
+    ): NotificationDataSource
 }

presentation/src/main/java/com/goms/presentation/di/module/NetWorkModule.kt

@@ -1,8 +1,10 @@
 package com.goms.presentation.di.module
 
+import android.util.Log
 import com.goms.data.api.AuthApi
 import com.goms.data.api.CouncilApi
 import com.goms.data.api.LateApi
+import com.goms.data.api.NotificationApi
 import com.goms.data.api.OutingApi
 import com.goms.data.api.ProfileApi
 import com.goms.data.api.interceptor.LoginInterceptor
@@ -13,6 +15,7 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import java.util.concurrent.TimeUnit
@@ -24,16 +27,25 @@ object NetWorkModule {
     @Provides
     @Singleton
     fun provideOkhttpClient(
+        httpLoggingInterceptor: HttpLoggingInterceptor,
         loginInterceptor: LoginInterceptor
     ): OkHttpClient {
         return OkHttpClient.Builder()
             .addInterceptor(loginInterceptor)
+            .addInterceptor(httpLoggingInterceptor)
             .connectTimeout(30, TimeUnit.SECONDS)
             .readTimeout(30, TimeUnit.SECONDS)
             .writeTimeout(30, TimeUnit.SECONDS)
             .build()
     }
 
+    @Provides
+    @Singleton
+    fun provideHttpLoggingInterceptor(): HttpLoggingInterceptor {
+        return HttpLoggingInterceptor { message -> Log.v("HTTP", message) }
+            .setLevel(HttpLoggingInterceptor.Level.BODY)
+    }
+
     @Provides
     @Singleton
     fun provideGsonConverterFactory(): GsonConverterFactory {
@@ -86,4 +98,10 @@ object NetWorkModule {
     fun provideCouncilService(retrofit: Retrofit): CouncilApi {
         return retrofit.create(CouncilApi::class.java)
     }
+
+    @Provides
+    @Singleton
+    fun provideNotificationApi(retrofit: Retrofit): NotificationApi {
+        return retrofit.create(NotificationApi::class.java)
+    }
 }

presentation/src/main/java/com/goms/presentation/di/module/RepositoryModule.kt

@@ -3,11 +3,13 @@ package com.goms.presentation.di.module
 import com.goms.data.repository.AuthRepositoryImpl
 import com.goms.data.repository.CouncilRepositoryImpl
 import com.goms.data.repository.LateRepositoryImpl
+import com.goms.data.repository.NotificationRepositoryImpl
 import com.goms.data.repository.OutingRepositoryImpl
 import com.goms.data.repository.ProfileRepositoryImpl
 import com.goms.domain.repository.AuthRepository
 import com.goms.domain.repository.CouncilRepository
 import com.goms.domain.repository.LateRepository
+import com.goms.domain.repository.NotificationRepository
 import com.goms.domain.repository.OutingRepository
 import com.goms.domain.repository.ProfileRepository
 import dagger.Binds
@@ -42,4 +44,9 @@ abstract class RepositoryModule {
     abstract fun bindCouncilRepository(
         councilRepositoryImpl: CouncilRepositoryImpl
     ): CouncilRepository
+
+    @Binds
+    abstract fun bindNotificationRepository(
+        notificationRepositoryImpl: NotificationRepositoryImpl
+    ): NotificationRepository
 }