Skip to content

Commit e6650b1

Browse files
authored
πŸ”— :: (#419) nullable 처리
2 parents cb71b5c + 01ad9c8 commit e6650b1

File tree

5 files changed

+15
-4
lines changed

5 files changed

+15
-4
lines changed

β€Žcore/domain/src/main/java/team/retum/usecase/entity/RecruitmentDetailsEntity.ktβ€Ž

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ data class RecruitmentDetailsEntity(
2929
val isApplicable: Boolean,
3030
val bookmarked: Boolean,
3131
val winterIntern: Boolean,
32-
val integrationPlan: Boolean,
32+
val integrationPlan: Boolean?,
33+
val hireConvertible: Boolean?,
3334
)
3435

3536
@Immutable
@@ -73,6 +74,7 @@ internal fun FetchRecruitmentDetailsResponse.toEntity() = RecruitmentDetailsEnti
7374
bookmarked = this.bookmarked,
7475
winterIntern = this.winterIntern,
7576
integrationPlan = this.integrationPlan,
77+
hireConvertible = this.hireConvertible,
7678
)
7779

7880
private fun Areas.toEntity() = AreasEntity(

β€Žcore/network/src/main/java/team/retum/network/model/response/FetchRecruitmentDetailsResponse.ktβ€Ž

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ data class FetchRecruitmentDetailsResponse(
2525
@Json(name = "is_applicable") val isApplicable: Boolean,
2626
@Json(name = "bookmarked") val bookmarked: Boolean,
2727
@Json(name = "winter_intern") val winterIntern: Boolean,
28-
@Json(name = "integration_plan") val integrationPlan: Boolean,
28+
@Json(name = "integration_plan") val integrationPlan: Boolean?,
29+
@Json(name = "hire_convertible") val hireConvertible: Boolean?,
2930
)
3031

3132
@JsonClass(generateAdapter = true)

β€Žfeature/recruitment/src/main/java/team/retum/jobis/recruitment/ui/RecruitmentDetailsScreen.ktβ€Ž

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,10 +253,16 @@ private fun RecruitmentDetailInfo(
253253
title = stringResource(id = R.string.etc),
254254
content = etc,
255255
)
256-
if (winterIntern) {
256+
if (winterIntern && integrationPlan != null) {
257257
Detail(
258258
title = stringResource(id = R.string.integration_plan),
259-
content = "${if (integrationPlan) "있" else "μ—†"}음",
259+
content = "${if (integrationPlan!!) "있" else "μ—†"}음",
260+
)
261+
}
262+
if (!winterIntern && hireConvertible != null) {
263+
Detail(
264+
title = stringResource(id = R.string.hireConvertible),
265+
content = "${if (hireConvertible!!) "있" else "μ—†"}음",
260266
)
261267
}
262268
}

β€Žfeature/recruitment/src/main/java/team/retum/jobis/recruitment/viewmodel/RecruitmentDetailsViewModel.ktβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ internal data class RecruitmentDetailsState(
7676
bookmarked = false,
7777
winterIntern = false,
7878
integrationPlan = false,
79+
hireConvertible = false,
7980
),
8081
buttonEnabled = false,
8182
)

β€Žfeature/recruitment/src/main/res/values/strings.xmlβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<string name="submission_document">제좜 μ„œλ₯˜</string>
2727
<string name="etc">기타 사항</string>
2828
<string name="integration_plan">ν˜„μž₯μ‹€μŠ΅ 연계 κ³„νš</string>
29+
<string name="hireConvertible">μ±„μš©μ „ν™˜ κ°€λŠ₯ μ—¬λΆ€</string>
2930
<string name="apply">μ§€μ›ν•˜κΈ°</string>
3031
<string name="can_do_not_apply">지원할 수 μ—†μ–΄μš”</string>
3132
<string name="major_task">μ£Όμš” 업무</string>

0 commit comments

Comments
Β (0)