woowacourse-teams
diff --git a/‎.github/workflows/backend-dev-ci-cd.yml
+7-7 b/‎.github/workflows/backend-dev-ci-cd.yml
+7-7
diff --git a/‎.github/workflows/backend-prod-ci-cd.yml
+14-19 b/‎.github/workflows/backend-prod-ci-cd.yml
+14-19
diff --git a/‎Dockerfile
+1-1 b/‎Dockerfile
+1-1
diff --git a/‎android/app/src/androidTest/java/com/zzang/chongdae/presentation/view/commentdetail/CommentDetailActivityTest.kt
+32 b/‎android/app/src/androidTest/java/com/zzang/chongdae/presentation/view/commentdetail/CommentDetailActivityTest.kt
+32
diff --git a/‎android/app/src/main/java/com/zzang/chongdae/auth/repository/AuthRepository.kt
+1-1 b/‎android/app/src/main/java/com/zzang/chongdae/auth/repository/AuthRepository.kt
+1-1
diff --git a/‎android/app/src/main/java/com/zzang/chongdae/auth/repository/AuthRepositoryImpl.kt
+1-1 b/‎android/app/src/main/java/com/zzang/chongdae/auth/repository/AuthRepositoryImpl.kt
+1-1
diff --git a/‎android/app/src/main/java/com/zzang/chongdae/auth/source/AuthRemoteDataSourceImpl.kt
+1-2 b/‎android/app/src/main/java/com/zzang/chongdae/auth/source/AuthRemoteDataSourceImpl.kt
+1-2
diff --git a/‎android/app/src/main/java/com/zzang/chongdae/data/remote/api/NetworkManager.kt
-50 b/‎android/app/src/main/java/com/zzang/chongdae/data/remote/api/NetworkManager.kt
-50
diff --git a/‎android/app/src/main/java/com/zzang/chongdae/data/remote/interceptor/TokenAuthenticator.kt
+43 b/‎android/app/src/main/java/com/zzang/chongdae/data/remote/interceptor/TokenAuthenticator.kt
+43
diff --git a/‎android/app/src/main/java/com/zzang/chongdae/data/remote/source/CommentRemoteDataSourceImpl.kt
+1-2 b/‎android/app/src/main/java/com/zzang/chongdae/data/remote/source/CommentRemoteDataSourceImpl.kt
+1-2
diff --git a/‎android/app/src/main/java/com/zzang/chongdae/data/remote/source/CommentRoomsDataSourceImpl.kt
+1-2 b/‎android/app/src/main/java/com/zzang/chongdae/data/remote/source/CommentRoomsDataSourceImpl.kt
+1-2
diff --git a/‎android/app/src/main/java/com/zzang/chongdae/data/remote/source/OfferingDetailDataSourceImpl.kt
+2-4 b/‎android/app/src/main/java/com/zzang/chongdae/data/remote/source/OfferingDetailDataSourceImpl.kt
+2-4
diff --git a/‎android/app/src/main/java/com/zzang/chongdae/data/remote/source/OfferingRemoteDataSourceImpl.kt
+1-2 b/‎android/app/src/main/java/com/zzang/chongdae/data/remote/source/OfferingRemoteDataSourceImpl.kt
+1-2
diff --git a/‎android/app/src/main/java/com/zzang/chongdae/data/remote/source/ParticipantRemoteDataSourceImpl.kt
+1-2 b/‎android/app/src/main/java/com/zzang/chongdae/data/remote/source/ParticipantRemoteDataSourceImpl.kt
+1-2
diff --git a/‎android/app/src/main/java/com/zzang/chongdae/di/annotations/AuthQualifier.kt
-4 b/‎android/app/src/main/java/com/zzang/chongdae/di/annotations/AuthQualifier.kt
-4
diff --git a/‎android/app/src/main/java/com/zzang/chongdae/di/annotations/CommentDetailQualifier.kt
-4 b/‎android/app/src/main/java/com/zzang/chongdae/di/annotations/CommentDetailQualifier.kt
-4
diff --git a/‎android/app/src/main/java/com/zzang/chongdae/di/annotations/OfferingDetailQualifier.kt
-4 b/‎android/app/src/main/java/com/zzang/chongdae/di/annotations/OfferingDetailQualifier.kt
-4
diff --git a/‎android/app/src/main/java/com/zzang/chongdae/di/annotations/OfferingQualifier.kt
-4 b/‎android/app/src/main/java/com/zzang/chongdae/di/annotations/OfferingQualifier.kt
-4
diff --git a/‎android/app/src/main/java/com/zzang/chongdae/di/annotations/ParticipantQualifier.kt
-4 b/‎android/app/src/main/java/com/zzang/chongdae/di/annotations/ParticipantQualifier.kt
-4
@@ -7,12 +7,12 @@ on:
       - "backend/**"
       - ".github/workflows/backend-dev-ci-cd.yml"
       - "Dockerfile"
-  # pull_request:
-  #   branches: [ "chongdae" ]
-  #   paths:
-  #     - "backend/**"
-  #     - ".github/workflows/backend-dev-ci-cd.yml"
-  #     - "Dockerfile"
+#  pull_request:
+#    branches: [ "develop" ]
+#    paths:
+#      - "backend/**"
+#      - ".github/workflows/backend-dev-ci-cd.yml"
+#      - "Dockerfile"
 
 jobs:
 
@@ -80,5 +80,5 @@ jobs:
     steps:
       - name: Switch from old to new container
         run: |
-          bash switch_blue_green_container.sh
+          bash switch_blue_green_container.sh dev.default.conf
         working-directory: backend/deploy
@@ -7,12 +7,12 @@ on:
       - "backend/**"
       - ".github/workflows/backend-prod-ci-cd.yml"
       - "Dockerfile"
-  # pull_request:
-  #   branches: [ "develop" ]
-  #   paths:
-  #     - "backend/**"
-  #     - ".github/workflows/backend-prod-ci-cd.yml"
-  #     - "Dockerfile"
+#  pull_request:
+#    branches: [ "develop" ]
+#    paths:
+#      - "backend/**"
+#      - ".github/workflows/backend-prod-ci-cd.yml"
+#      - "Dockerfile"
 
 jobs:
 
@@ -62,28 +62,23 @@ jobs:
           docker push ${{ secrets.BE_DOCKERHUB_USERNAME }}/${{ secrets.BE_DOCKER_IMAGE_NAME_PROD }}:${GITHUB_SHA::7}
 
   deploy-new-container:
-  needs: build-and-test
-  strategy:
-    matrix:
-      runner: [prod-a, prod-b]
-    runs-on: [ self-hosted, ${{ matrix.runner }} ]
+    needs: build-and-test
+    runs-on: [ self-hosted, prod ]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Deploy new container on ${{ matrix.runner }}
+      - name: Deploy new container
         run: |
           bash launch_next_container.sh ${GITHUB_SHA::7} prod ${{ secrets.BE_DOCKERHUB_USERNAME }} ${{ secrets.BE_DOCKER_IMAGE_NAME_PROD }}
         working-directory: backend/deploy
 
   switch-new-container:
     needs: deploy-new-container
-    strategy:
-      matrix:
-        runner: [prod-a, prod-b]
-    runs-on: [ self-hosted, ${{ matrix.runner }} ]
+    runs-on: [ self-hosted, prod ]
+
     steps:
-      - name: Switch from old to new container on ${{ matrix.runner }}
+      - name: Switch from old to new container
         run: |
-          bash switch_blue_green_container.sh
-        working-directory: backend/deploy
+          bash switch_blue_green_container.sh default.conf
+        working-directory: backend/deploy
@@ -1,4 +1,4 @@
-FROM --platform=linux/arm64 amazoncorretto:17
+FROM --platform=linux/amd64 amazoncorretto:17
 
 ENV TZ=Asia/Seoul
 
 
@@ -27,4 +27,36 @@ class CommentDetailActivityTest {
         Espresso.onView(ViewMatchers.withId(R.id.view))
             .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
     }
+
+    @Test
+    @DisplayName("공동구매 상태 이미지를 로드한다")
+    fun loadOfferingStatusImage() {
+        // then
+        Espresso.onView(ViewMatchers.withId(R.id.iv_offering_status))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+    }
+
+    @Test
+    @DisplayName("공동구매 약속 장소와 시간을 로드한다")
+    fun loadOfferingLocation() {
+        // then
+        Espresso.onView(ViewMatchers.withId(R.id.tv_default_location))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+    }
+
+    @Test
+    @DisplayName("댓글 목록을 로드한다")
+    fun loadComments() {
+        // then
+        Espresso.onView(ViewMatchers.withId(R.id.rv_comments))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+    }
+
+    @Test
+    @DisplayName("댓글을 입력할 수 있는 EditText가 보여야 한다")
+    fun displayCommentEditText() {
+        // then
+        Espresso.onView(ViewMatchers.withId(R.id.et_comment))
+            .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+    }
 }
@@ -5,7 +5,7 @@ import com.zzang.chongdae.common.handler.DataError
 import com.zzang.chongdae.common.handler.Result
 
 interface AuthRepository {
-    suspend fun saveLogin(
+    suspend fun postLogin(
         accessToken: String,
         fcmToken: String,
     ): Result<Member, DataError.Network>
 
@@ -14,7 +14,7 @@ class AuthRepositoryImpl
     constructor(
         @AuthDataSourceQualifier private val authRemoteDataSource: AuthRemoteDataSource,
     ) : AuthRepository {
-        override suspend fun saveLogin(
+        override suspend fun postLogin(
             accessToken: String,
             fcmToken: String,
         ): Result<Member, DataError.Network> {
 
@@ -6,13 +6,12 @@ import com.zzang.chongdae.auth.dto.response.MemberResponse
 import com.zzang.chongdae.common.handler.DataError
 import com.zzang.chongdae.common.handler.Result
 import com.zzang.chongdae.data.remote.util.safeApiCall
-import com.zzang.chongdae.di.annotations.AuthApiServiceQualifier
 import javax.inject.Inject
 
 class AuthRemoteDataSourceImpl
     @Inject
     constructor(
-        @AuthApiServiceQualifier private val service: AuthApiService,
+        private val service: AuthApiService,
     ) : AuthRemoteDataSource {
         override suspend fun saveLogin(tokensRequest: TokensRequest): Result<MemberResponse, DataError.Network> {
             return safeApiCall { service.postLogin(tokensRequest) }
 
@@ -0,0 +1,43 @@
+package com.zzang.chongdae.data.remote.interceptor
+
+import com.zzang.chongdae.common.handler.Result
+import com.zzang.chongdae.domain.usecase.auth.RefreshTokenUseCase
+import dagger.Lazy
+import kotlinx.coroutines.runBlocking
+import okhttp3.Authenticator
+import okhttp3.Request
+import okhttp3.Response
+import okhttp3.Route
+import javax.inject.Inject
+
+class TokenAuthenticator
+    @Inject
+    constructor(
+        private val refreshTokenUseCase: Lazy<RefreshTokenUseCase>,
+    ) : Authenticator {
+        override fun authenticate(
+            route: Route?,
+            response: Response,
+        ): Request? {
+            if (response.request.header(AUTHORIZATION_HEADER) != null) {
+                return null
+            }
+
+            val newToken =
+                runBlocking {
+                    when (val result = refreshTokenUseCase.get()()) {
+                        is Result.Success -> result.data
+                        else -> null
+                    }
+                } ?: return null
+
+            return response.request.newBuilder()
+                .header(AUTHORIZATION_HEADER, "$TOKEN_PREFIX$newToken")
+                .build()
+        }
+
+        companion object {
+            private const val AUTHORIZATION_HEADER = "Authorization"
+            private const val TOKEN_PREFIX = "Bearer "
+        }
+    }
@@ -9,13 +9,12 @@ import com.zzang.chongdae.data.remote.dto.response.comment.CommentsResponse
 import com.zzang.chongdae.data.remote.dto.response.comment.UpdatedStatusResponse
 import com.zzang.chongdae.data.remote.util.safeApiCall
 import com.zzang.chongdae.data.source.comment.CommentRemoteDataSource
-import com.zzang.chongdae.di.annotations.CommentDetailApiServiceQualifier
 import javax.inject.Inject
 
 class CommentRemoteDataSourceImpl
     @Inject
     constructor(
-        @CommentDetailApiServiceQualifier private val service: CommentApiService,
+        private val service: CommentApiService,
     ) : CommentRemoteDataSource {
         override suspend fun saveComment(commentRequest: CommentRequest): Result<Unit, DataError.Network> =
             safeApiCall {
 
@@ -6,13 +6,12 @@ import com.zzang.chongdae.data.remote.api.CommentApiService
 import com.zzang.chongdae.data.remote.dto.response.commentroom.CommentRoomsResponse
 import com.zzang.chongdae.data.remote.util.safeApiCall
 import com.zzang.chongdae.data.source.CommentRoomsDataSource
-import com.zzang.chongdae.di.annotations.CommentRoomsApiServiceQualifier
 import javax.inject.Inject
 
 class CommentRoomsDataSourceImpl
     @Inject
     constructor(
-        @CommentRoomsApiServiceQualifier private val commentApiService: CommentApiService,
+        private val commentApiService: CommentApiService,
     ) : CommentRoomsDataSource {
         override suspend fun fetchCommentRooms(): Result<CommentRoomsResponse, DataError.Network> {
             return safeApiCall { commentApiService.getCommentRooms() }
 
@@ -8,15 +8,13 @@ import com.zzang.chongdae.data.remote.dto.request.ParticipationRequest
 import com.zzang.chongdae.data.remote.dto.response.offering.OfferingDetailResponse
 import com.zzang.chongdae.data.remote.util.safeApiCall
 import com.zzang.chongdae.data.source.OfferingDetailDataSource
-import com.zzang.chongdae.di.annotations.OfferingApiServiceQualifier
-import com.zzang.chongdae.di.annotations.ParticipantApiServiceQualifier
 import javax.inject.Inject
 
 class OfferingDetailDataSourceImpl
     @Inject
     constructor(
-        @OfferingApiServiceQualifier private val offeringApiService: OfferingApiService,
-        @ParticipantApiServiceQualifier private val participationApiService: ParticipationApiService,
+        private val offeringApiService: OfferingApiService,
+        private val participationApiService: ParticipationApiService,
     ) : OfferingDetailDataSource {
         override suspend fun fetchOfferingDetail(offeringId: Long): Result<OfferingDetailResponse, DataError.Network> =
             safeApiCall { offeringApiService.getOfferingDetail(offeringId) }
 
@@ -13,14 +13,13 @@ import com.zzang.chongdae.data.remote.dto.response.offering.RemoteOffering
 import com.zzang.chongdae.data.remote.mapper.toProductUrlRequest
 import com.zzang.chongdae.data.remote.util.safeApiCall
 import com.zzang.chongdae.data.source.offering.OfferingRemoteDataSource
-import com.zzang.chongdae.di.annotations.OfferingApiServiceQualifier
 import okhttp3.MultipartBody
 import javax.inject.Inject
 
 class OfferingRemoteDataSourceImpl
     @Inject
     constructor(
-        @OfferingApiServiceQualifier private val service: OfferingApiService,
+        private val service: OfferingApiService,
     ) : OfferingRemoteDataSource {
         override suspend fun fetchOffering(offeringId: Long): Result<RemoteOffering, DataError.Network> =
             safeApiCall { service.getOffering(offeringId) }
 
@@ -6,13 +6,12 @@ import com.zzang.chongdae.data.remote.api.ParticipationApiService
 import com.zzang.chongdae.data.remote.dto.response.participants.ParticipantsResponse
 import com.zzang.chongdae.data.remote.util.safeApiCall
 import com.zzang.chongdae.data.source.ParticipantRemoteDataSource
-import com.zzang.chongdae.di.annotations.ParticipantApiServiceQualifier
 import javax.inject.Inject
 
 class ParticipantRemoteDataSourceImpl
     @Inject
     constructor(
-        @ParticipantApiServiceQualifier private val service: ParticipationApiService,
+        private val service: ParticipationApiService,
     ) : ParticipantRemoteDataSource {
         override suspend fun fetchParticipants(offeringId: Long): Result<ParticipantsResponse, DataError.Network> =
             safeApiCall {
 
@@ -9,7 +9,3 @@ annotation class AuthRepositoryQualifier
 @Qualifier
 @Retention(AnnotationRetention.BINARY)
 annotation class AuthDataSourceQualifier
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class AuthApiServiceQualifier
@@ -9,7 +9,3 @@ annotation class CommentDetailRepositoryQualifier
 @Qualifier
 @Retention(AnnotationRetention.BINARY)
 annotation class CommentDetailDataSourceQualifier
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class CommentDetailApiServiceQualifier
@@ -9,7 +9,3 @@ annotation class OfferingDetailRepositoryQualifier
 @Qualifier
 @Retention(AnnotationRetention.BINARY)
 annotation class OfferingDetailDataSourceQualifier
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class OfferingDetailApiServiceQualifier
@@ -14,10 +14,6 @@ annotation class OfferingRemoteDataSourceQualifier
 @Retention(AnnotationRetention.BINARY)
 annotation class OfferingLocalDataSourceQualifier
 
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class OfferingApiServiceQualifier
-
 @Qualifier
 @Retention(AnnotationRetention.BINARY)
 annotation class OfferingDaoQualifier
@@ -9,7 +9,3 @@ annotation class ParticipantRepositoryQualifier
 @Qualifier
 @Retention(AnnotationRetention.BINARY)
 annotation class ParticipantDataSourceQualifier
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class ParticipantApiServiceQualifier
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM --platform=linux/arm64 amazoncorretto:17`
	`1`	`+FROM --platform=linux/amd64 amazoncorretto:17`
`2`	`2`
`3`	`3`	`ENV TZ=Asia/Seoul`
`4`	`4`