🚀 :: 2.2.4

Team-return · Oct 26, 2024 · 668938c · 668938c
2 parents 948eed5 + b9506b1
commit 668938c
Show file tree

Hide file tree

Showing 41 changed files with 197 additions and 190 deletions.
diff --git a/.github/workflows/android-production-deploy-play-store.yml b/.github/workflows/android-production-deploy-play-store.yml
@@ -79,72 +79,17 @@ jobs:
           prerelease: false
 
       - name: Notify Discord on Success
-        if: ${{ success() }}
+        if: success()
         id: discord-success
-        uses: Ilshidur/[email protected]
-        env: 
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_URL }}
-          DISCORD_USERNAME: 깡통 로켓
-          DISCORD_EMBEDS: |
-           [
-             {
-               "title": "🚀 앱이 배포되었습니다.",
-               "color": "#36a64f",
-               "description": "https://github.com/${{github.repository}}",
-               "fields": [
-                  {
-                    "name": "Repository",
-                    "value": "${{ github.repository }}",
-                    "inline": true
-                  },
-                  {
-                    "name": "Tag",
-                    "value": "${{ github.ref_name }}",
-                    "inline": true
-                  },
-                  {
-                    "name": "Version",
-                    "value": "${{ steps.get_tag.outputs.name }}",
-                    "inline": true
-                  },
-                  {
-                    "name": "Release Note",
-                    "value": "${{ env.RELEASE_NOTE }}",
-                    "inline": false
-                  },
-                ]
-             }
-           ]
+        run: |
+          curl -H "Content-Type: application/json" \
+               -d '{"content": "🚀 앱이 배포되었습니다.\nTag: ${{ github.ref_name }}\n Version: ${{ steps.get_tag.outputs.name }}\nRelease Note: ${{ env.RELEASE_NOTE }}"}' \
+               ${{ secrets.DISCORD_WEBHOOK_URL }}
 
       - name: Notify Discord on Failure
-        if: ${{ failure() }}
         id: discord-failure
-        uses: Ilshidur/[email protected]
-        env: 
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_URL }}
-          DISCORD_USERNAME: 깡통 로켓
-          DISCORD_EMBEDS: |
-           [
-             {
-               "title": "💣 앱 배포에 실패했어요 ㅠㅠ",
-               "color": "#ff0000",
-               "description": "https://github.com/${{github.repository}}",
-               "fields": [
-                  {
-                    "name": "Repository",
-                    "value": "${{ github.repository }}",
-                    "inline": true
-                  },
-                  {
-                    "name": "Tag",
-                    "value": "${{ github.ref_name }}",
-                    "inline": true
-                  },
-                  {
-                    "name": "Version",
-                    "value": "${{ steps.get_tag.outputs.name }}",
-                    "inline": true
-                  },
-                ]
-             }
-           ]
+        if: failure()
+        run: |
+          curl -H "Content-Type: application/json" \
+               -d '{"content": "💣 앱 배포에 실패했어요 ㅠㅠ\nTag: ${{ github.ref_name }}\nVersion: ${{ steps.get_tag.outputs.name }}"}' \
+               ${{ secrets.DISCORD_WEBHOOK_URL }}
diff --git a/app/src/main/java/team/retum/jobisandroidv2/JobisNavigator.kt b/app/src/main/java/team/retum/jobisandroidv2/JobisNavigator.kt
@@ -110,8 +110,8 @@ internal class JobisNavigator(
         navController.navigateToReportBug()
     }
 
-    fun navigateToSearchRecruitment() {
-        navController.navigateToSearchRecruitment()
+    fun navigateToSearchRecruitment(isWinterIntern: Boolean) {
+        navController.navigateToSearchRecruitment(isWinterIntern = isWinterIntern)
     }
 
     fun navigateToNotificationSetting() {

diff --git a/app/src/main/java/team/retum/jobisandroidv2/root/RootNavigation.kt b/app/src/main/java/team/retum/jobisandroidv2/root/RootNavigation.kt
@@ -16,7 +16,7 @@ fun NavGraphBuilder.root(
     onRecruitmentDetailsClick: (Long) -> Unit,
     onCompaniesClick: () -> Unit,
     onRecruitmentFilterClick: () -> Unit,
-    onSearchRecruitmentClick: () -> Unit,
+    onSearchRecruitmentClick: (Boolean) -> Unit,
     onNotificationSettingClick: () -> Unit,
     onNoticeClick: () -> Unit,
     onSelectInterestClick: () -> Unit,

diff --git a/app/src/main/java/team/retum/jobisandroidv2/root/RootScreen.kt b/app/src/main/java/team/retum/jobisandroidv2/root/RootScreen.kt
@@ -50,7 +50,7 @@ internal fun Root(
     onRecruitmentDetailsClick: (Long) -> Unit,
     onCompaniesClick: () -> Unit,
     onRecruitmentFilterClick: () -> Unit,
-    onSearchRecruitmentClick: () -> Unit,
+    onSearchRecruitmentClick: (Boolean) -> Unit,
     onNotificationSettingClick: () -> Unit,
     onNoticeClick: () -> Unit,
     onSelectInterestClick: () -> Unit,
@@ -115,7 +115,7 @@ private fun RootScreen(
     onWinterInternClick: () -> Unit,
     onRecruitmentDetailsClick: (Long) -> Unit,
     onRecruitmentFilterClick: () -> Unit,
-    onSearchRecruitmentClick: () -> Unit,
+    onSearchRecruitmentClick: (Boolean) -> Unit,
     showRejectionModal: (ApplicationData) -> Unit,
     onCompaniesClick: () -> Unit,
     onNotificationSettingClick: () -> Unit,

diff --git a/app/src/main/play/release-notes/ko-KR/default.txt b/app/src/main/play/release-notes/ko-KR/default.txt
@@ -1,14 +1,12 @@
-[v2.2.3]
-• 버그 수정 및 기능을 추가했어요.
+[v2.2.4]
+• 버그 수정 및 데이터를 수정했어요.
 
 [ 새로운 기능 ]
-• 체험형 현장실습이 추가되었어요.
-• 겨울인턴 알림을 추가했어요.
+-
 
 [ 개선된 점 ]
 • 디자인 요소를 변경했어요.
+• 기업 및 모집의뢰서의 데이터가 수정되었어요.
 
 [ 버그 수정 ]
-• 지원내역이 복사되는 버그를 수정했어요.
-• 인증코드 전송 버그를 수정했어요.
-• 지원현황에서 사진이 안뜨는 버그를 수정했어요.
+• 이메일이 전송되지 않는 버그를 수정했어요.
diff --git a/buildSrc/src/main/kotlin/ProjectProperties.kt b/buildSrc/src/main/kotlin/ProjectProperties.kt
@@ -2,8 +2,8 @@ object ProjectProperties {
     const val COMPILE_SDK = 34
     const val MIN_SDK = 28
     const val TARGET_SDK = 34
-    const val VERSION_CODE = 17
-    const val VERSION_NAME = "2.2.3"
+    const val VERSION_CODE = 18
+    const val VERSION_NAME = "2.2.4"
     const val COMPOSE_COMPILER_EXTENSION = "1.5.6"
     const val JVM_TARGET = "18"
 }
diff --git a/core/common/src/main/java/team/retum/common/utils/ResourceKeys.kt b/core/common/src/main/java/team/retum/common/utils/ResourceKeys.kt
@@ -18,6 +18,7 @@ object ResourceKeys {
     const val COMPANY_NAME = "companyName"
     const val IS_MOVED_RECRUITMENT_DETAILS = "isMovedRecruitmentDetails"
     const val IS_MOVED_COMPANY_DETAILS = "isMovedCompanyDetails"
+    const val IS_WINTER_INTERN = "isWinterIntern"
     const val EMAIL = "@dsm.hs.kr"
     const val DATABASE_NAME = "jobis-database"
 }
diff --git a/core/data/src/main/java/team/retum/data/repository/user/UserRepository.kt b/core/data/src/main/java/team/retum/data/repository/user/UserRepository.kt
@@ -22,7 +22,7 @@ interface UserRepository {
 
     fun getRefreshExpiresAt(): String
 
-    fun signOut()
+    suspend fun signOut()
 
     suspend fun saveDeviceToken(deviceToken: String)
 

diff --git a/core/data/src/main/java/team/retum/data/repository/user/UserRepositoryImpl.kt b/core/data/src/main/java/team/retum/data/repository/user/UserRepositoryImpl.kt
@@ -55,7 +55,8 @@ class UserRepositoryImpl @Inject constructor(
         return localUserDataSource.getRefreshExpiresAt()
     }
 
-    override fun signOut() {
+    override suspend fun signOut() {
+        remoteUserDataSource.deleteDeviceToken()
         localUserDataSource.clearUserInformation()
     }
 

diff --git a/core/design-system/src/main/java/team/retum/jobisdesignsystemv2/textfield/JobisTextField.kt b/core/design-system/src/main/java/team/retum/jobisdesignsystemv2/textfield/JobisTextField.kt
@@ -49,6 +49,7 @@ import team.retum.jobisdesignsystemv2.foundation.JobisIcon
 import team.retum.jobisdesignsystemv2.foundation.JobisTheme
 import team.retum.jobisdesignsystemv2.foundation.JobisTypography
 import team.retum.jobisdesignsystemv2.text.JobisText
+import team.retum.jobisdesignsystemv2.utils.clickable
 
 /**
  * [JobisTextField]에서 표시되는 description의 종류를 결정
@@ -100,6 +101,40 @@ private fun TextFieldTitle(
     )
 }
 
+@Composable
+private fun JobisVerificationButton(
+    modifier: Modifier = Modifier,
+    onVerificationClick: () -> Unit,
+    isSendAuthenticationCode: Boolean,
+) {
+    Box(
+        modifier = modifier
+            .background(
+                color = JobisTheme.colors.primary,
+                shape = RoundedCornerShape(8.dp),
+            )
+            .padding(
+                horizontal = 8.dp,
+                vertical = 4.dp,
+            )
+            .clickable(
+                onClick = onVerificationClick,
+            ),
+    ) {
+        JobisText(
+            text = stringResource(
+                id = if (isSendAuthenticationCode) {
+                    R.string.re_send_authentication_code
+                } else {
+                    R.string.authentication
+                },
+            ),
+            style = JobisTypography.Body,
+            color = JobisTheme.colors.onSurfaceVariant,
+        )
+    }
+}
+
 @Composable
 private fun TextField(
     modifier: Modifier = Modifier,
@@ -112,6 +147,9 @@ private fun TextField(
     keyboardType: KeyboardType,
     maxLength: Int,
     showEmailHint: Boolean,
+    showVerificationButton: Boolean,
+    onVerificationClick: () -> Unit,
+    isSendAuthenticationCode: Boolean,
     showVisibleIcon: Boolean,
     @DrawableRes drawableResId: Int?,
     content: @Composable () -> Unit,
@@ -193,6 +231,12 @@ private fun TextField(
                             color = JobisTheme.colors.onSurfaceVariant,
                         )
                     }
+                    if (showVerificationButton) {
+                        JobisVerificationButton(
+                            onVerificationClick = onVerificationClick,
+                            isSendAuthenticationCode = isSendAuthenticationCode,
+                        )
+                    }
                     content()
                     if (showVisibleIcon) {
                         JobisIconButton(
@@ -270,6 +314,9 @@ private fun Description(
  * @param singleLine 텍스트 필드에 다중 줄을 허용할 것인지 결정
  * @param maxLength 텍스트 필드 값의 최대 길이
  * @param showEmailHint 이메일 도메인에 대한 힌트를 표시할 것인지 결정(e.g., @dsm.hs.kr).
+ * @param showVerificationButton 인증 버튼을 표시할 것인지 결정
+ * @param onVerificationClick 인증 버튼을 클릭할 때 호출되는 함수
+ * @param isSendAuthenticationCode 인증 여부
  * @param showVisibleIcon 비밀번호 표시
  * @param drawableResId 텍스트 필드에 표시될 아이콘
  * @param fieldColor 배경 색상
@@ -316,6 +363,9 @@ fun JobisTextField(
     singleLine: Boolean = true,
     maxLength: Int = Int.MAX_VALUE,
     showEmailHint: Boolean = false,
+    showVerificationButton: Boolean = false,
+    onVerificationClick: () -> Unit = { },
+    isSendAuthenticationCode: Boolean = false,
     showVisibleIcon: Boolean = false,
     @DrawableRes drawableResId: Int? = null,
     fieldColor: Color = JobisTheme.colors.inverseSurface,
@@ -352,6 +402,9 @@ fun JobisTextField(
             keyboardType = keyboardType,
             maxLength = maxLength,
             showEmailHint = showEmailHint,
+            showVerificationButton = showVerificationButton,
+            onVerificationClick = onVerificationClick,
+            isSendAuthenticationCode = isSendAuthenticationCode,
             showVisibleIcon = showVisibleIcon,
             drawableResId = drawableResId,
             content = content,

diff --git a/core/design-system/src/main/res/values/strings.xml b/core/design-system/src/main/res/values/strings.xml
@@ -23,4 +23,6 @@
     <string name="content_description_search">검색하기</string>
     <string name="content_description_jobis">앱 바 로고</string>
     <string name="content_description_information">정보</string>
+    <string name="authentication">인증 하기</string>
+    <string name="re_send_authentication_code">재발송</string>
 </resources>
diff --git a/core/domain/src/main/java/team/retum/usecase/entity/RecruitmentDetailsEntity.kt b/core/domain/src/main/java/team/retum/usecase/entity/RecruitmentDetailsEntity.kt
@@ -14,20 +14,21 @@ data class RecruitmentDetailsEntity(
     val companyProfileUrl: String,
     val companyName: String,
     val areas: List<AreasEntity>,
-    val requiredGrade: Long?,
+    val additionalQualifications: String?,
     val workingHours: String,
     val requiredLicenses: List<String>?,
     val hiringProgress: List<HiringProgress>,
     val trainPay: Long,
     val pay: String?,
     val benefits: String?,
-    val military: Boolean,
+    val militarySupport: Boolean,
     val submitDocument: String,
     val startDate: String?,
     val endDate: String?,
     val etc: String?,
     val isApplicable: Boolean,
     val bookmarked: Boolean,
+    val winterIntern: Boolean,
 )
 
 @Immutable
@@ -55,20 +56,21 @@ internal fun FetchRecruitmentDetailsResponse.toEntity() = RecruitmentDetailsEnti
     companyProfileUrl = ResourceKeys.IMAGE_URL + this.companyProfileUrl,
     companyName = this.companyName,
     areas = this.areas.map { it.toEntity() },
-    requiredGrade = this.requiredGrade,
+    additionalQualifications = this.additionalQualifications,
     workingHours = this.workingHours,
     requiredLicenses = this.requiredLicenses,
     hiringProgress = this.hiringProgress,
     trainPay = this.trainPay,
     pay = this.pay,
     benefits = this.benefits,
-    military = this.military,
+    militarySupport = this.militarySupport,
     submitDocument = this.submitDocument,
     startDate = this.startDate,
     endDate = this.endDate,
     etc = this.etc,
     isApplicable = this.isApplicable,
     bookmarked = this.bookmarked,
+    winterIntern = this.winterIntern,
 )
 
 private fun Areas.toEntity() = AreasEntity(

diff --git a/core/domain/src/main/java/team/retum/usecase/entity/company/CompanyDetailsEntity.kt b/core/domain/src/main/java/team/retum/usecase/entity/company/CompanyDetailsEntity.kt
@@ -32,12 +32,8 @@ data class CompanyDetailsEntity(
     val companyProfileUrl: String,
     val companyIntroduce: String,
     val mainAddress: String?,
-    val subAddress: String?,
     val managerName: String?,
-    val managerPhoneNo: String?,
-    val subManagerName: String?,
-    val subManagerPhoneNo: String?,
-    val fax: String?,
+    val representativePhoneNo: String?,
     val email: String?,
     val representativeName: String?,
     val foundedAt: String,
@@ -47,6 +43,7 @@ data class CompanyDetailsEntity(
     val attachments: List<String>?,
     val serviceName: String?,
     val businessArea: String?,
+    val headquarter: Boolean,
 )
 
 fun FetchCompanyDetailsResponse.toEntity() = CompanyDetailsEntity(
@@ -55,12 +52,8 @@ fun FetchCompanyDetailsResponse.toEntity() = CompanyDetailsEntity(
     companyProfileUrl = ResourceKeys.IMAGE_URL + this.companyProfileUrl,
     companyIntroduce = this.companyIntroduce,
     mainAddress = "${this.mainAddress} ${this.mainAddressDetail}",
-    subAddress = this.subAddress?.apply { plus(this@toEntity.subAddressDetail) },
     managerName = this.managerName,
-    managerPhoneNo = this.managerPhoneNo?.toPhoneNumber(),
-    subManagerName = this.subManagerName,
-    subManagerPhoneNo = this.subManagerPhoneNo?.toPhoneNumber(),
-    fax = this.fax,
+    representativePhoneNo = this.representativePhoneNo?.toPhoneNumber(),
     email = this.email,
     representativeName = this.representativeName,
     foundedAt = this.foundedAt,
@@ -70,6 +63,7 @@ fun FetchCompanyDetailsResponse.toEntity() = CompanyDetailsEntity(
     attachments = this.attachments,
     serviceName = this.serviceName,
     businessArea = this.businessArea,
+    headquarter = this.headquarter,
 )
 
 private fun Double.toTake(): String {

diff --git a/...omain/src/main/java/team/retum/usecase/usecase/auth/AuthorizeAuthenticationCodeUseCase.kt b/...omain/src/main/java/team/retum/usecase/usecase/auth/AuthorizeAuthenticationCodeUseCase.kt
@@ -1,6 +1,5 @@
 package team.retum.usecase.usecase.auth
 
-import team.retum.common.utils.ResourceKeys
 import team.retum.data.repository.auth.AuthRepository
 import javax.inject.Inject
 
@@ -12,7 +11,7 @@ class AuthorizeAuthenticationCodeUseCase @Inject constructor(
         authCode: String,
     ) = runCatching {
         authRepository.authorizeAuthenticationCode(
-            email = email + ResourceKeys.EMAIL,
+            email = email,
             authCode = authCode,
         )
     }