Skip to content
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d84deca
feat :: 지원 μ·¨μ†Œ API μΆ”κ°€
ashxom Nov 19, 2026
1beeaec
feat :: 지원 μ·¨μ†Œ 원격 λ°μ΄ν„°μ†ŒμŠ€ μΆ”κ°€
ashxom Nov 19, 2026
97bbe66
feat :: 지원 μ·¨μ†Œ 원격 λ°μ΄ν„°μ†ŒμŠ€ κ΅¬ν˜„ μΆ”κ°€
ashxom Nov 19, 2026
ca23be2
feat :: 지원 μ·¨μ†Œ Repository μΈν„°νŽ˜μ΄μŠ€ μΆ”κ°€
ashxom Nov 19, 2026
4a8ecd3
feat :: 지원 μ·¨μ†Œ Repository κ΅¬ν˜„ μΆ”κ°€
ashxom Nov 19, 2026
2ddc888
feat :: 지원 μ·¨μ†Œ UseCase μΆ”κ°€
ashxom Nov 19, 2026
0b2f44a
feat :: 지원 μ·¨μ†Œ μ§„μž… UI μΆ”κ°€
ashxom Nov 19, 2026
b56d978
feat :: 지원 μ·¨μ†Œ λ‹€μ΄μ–Όλ‘œκ·Έ μΆ”κ°€
ashxom Nov 19, 2026
029fddd
feat :: 지원 μ·¨μ†Œ μƒνƒœ 처리 μΆ”κ°€
ashxom Nov 19, 2026
4c5b9a1
feat :: 지원 μ·¨μ†Œ μ•ˆλ‚΄ 문ꡬ μΆ”κ°€
ashxom Nov 19, 2026
9566deb
fix :: 지원 μƒνƒœ μ΅œμ‹  κ°’ μ‚¬μš© μˆ˜μ •
ashxom Nov 19, 2026
3828c40
fix :: 지원 λͺ©λ‘ 쑰회 μˆœμ„œ 보μž₯ μˆ˜μ •
ashxom Nov 19, 2026
7e2c87e
fix :: 지원 μ·¨μ†Œ 밑쀄 ν‘œμ‹œ μˆ˜μ •
ashxom Nov 19, 2026
0800c3a
fix :: 지원 μ·¨μ†Œ 클릭 이벀트 μˆ˜μ •
ashxom Nov 19, 2026
f33d59f
feat :: λ‹€μ΄μ–Όλ‘œκ·Έ 크기 Modifier μΆ”κ°€
ashxom Nov 19, 2026
d327d56
fix :: 지원 μ·¨μ†Œ λ‹€μ΄μ–Όλ‘œκ·Έ 폭 μˆ˜μ •
ashxom Nov 19, 2026
071d777
feat :: λ‹€μ΄μ–Όλ‘œκ·Έ μ°½ 속성 μΆ”κ°€
ashxom Nov 19, 2026
2f63abd
fix :: 지원 μ·¨μ†Œ λͺ¨λ‹¬ ν™”λ©΄ 폭 적용
ashxom Nov 19, 2026
13265d4
feat :: λ‹€μ΄μ–Όλ‘œκ·Έ λ²„νŠΌ ν™”μ‚΄ν‘œ μ˜΅μ…˜ μΆ”κ°€
ashxom Nov 19, 2026
ce47251
feat :: λ‹€μ΄μ–Όλ‘œκ·Έ λ²„νŠΌ ν™”μ‚΄ν‘œ μ„€μ • μΆ”κ°€
ashxom Nov 19, 2026
843e0c3
fix :: 지원 μ·¨μ†Œ λͺ¨λ‹¬ λ²„νŠΌ λ””μžμΈ μˆ˜μ •
ashxom Nov 19, 2026
f99ec31
fix :: μ·¨μ†Œ ν›„ 지원 λͺ©λ‘ κ°±μ‹  μˆ˜μ •
ashxom Nov 19, 2026
7395fa6
fix :: CI μ˜μ‘΄μ„± λ‹€μš΄λ‘œλ“œ μž¬μ‹œλ„ μΆ”κ°€
ashxom Nov 19, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,7 @@ interface ApplicationRepository {
applyCompanyRequest: ApplyCompanyRequest,
)

suspend fun cancelApplication(applicationId: Long)

suspend fun fetchEmploymentStatus(year: Int): FetchEmploymentStatusResponse
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ class ApplicationRepositoryImpl @Inject constructor(
)
}

override suspend fun cancelApplication(applicationId: Long) {
remoteApplicationDataSource.cancelApplication(applicationId = applicationId)
}

override suspend fun fetchEmploymentStatus(year: Int): FetchEmploymentStatusResponse {
return remoteApplicationDataSource.fetchEmploymentStatus(year = year)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ private fun LargeButton(
enabled: Boolean,
buttonType: ButtonType,
keyboardInteractionEnabled: Boolean,
showArrow: Boolean = true,
onClick: () -> Unit,
) {
var pressed by remember { mutableStateOf(false) }
Expand Down Expand Up @@ -225,12 +226,14 @@ private fun LargeButton(
style = JobisTypography.SubHeadLine,
color = contentColor,
)
Spacer(modifier = Modifier.width(4.dp))
Icon(
painter = painterResource(id = JobisIcon.LongArrow),
tint = contentColor,
contentDescription = stringResource(id = R.string.content_description_long_arrow),
)
if (showArrow) {
Spacer(modifier = Modifier.width(4.dp))
Icon(
painter = painterResource(id = JobisIcon.LongArrow),
tint = contentColor,
contentDescription = stringResource(id = R.string.content_description_long_arrow),
)
}
}
}
}
Expand Down Expand Up @@ -391,6 +394,7 @@ fun JobisDialogButton(
color: ButtonColor = ButtonColor.Default,
enabled: Boolean = true,
keyboardInteractionEnabled: Boolean = true,
showArrow: Boolean = true,
onClick: () -> Unit,
) {
LargeButton(
Expand All @@ -400,6 +404,7 @@ fun JobisDialogButton(
enabled = enabled,
buttonType = ButtonType.DIALOG,
keyboardInteractionEnabled = keyboardInteractionEnabled,
showArrow = showArrow,
onClick = onClick,
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,33 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog
import androidx.compose.ui.window.DialogProperties
import team.retum.jobisdesignsystemv2.button.ButtonColor
import team.retum.jobisdesignsystemv2.button.JobisDialogButton
import team.retum.jobisdesignsystemv2.foundation.JobisTheme
import team.retum.jobisdesignsystemv2.foundation.JobisTypography

@Composable
fun JobisDialog(
modifier: Modifier = Modifier,
properties: DialogProperties = DialogProperties(),
onDismissRequest: () -> Unit,
title: String,
description: String,
subButtonText: String = "",
mainButtonText: String,
subButtonColor: ButtonColor = ButtonColor.Default,
mainButtonColor: ButtonColor = ButtonColor.Error,
showButtonArrow: Boolean = true,
onSubButtonClick: () -> Unit = { },
onMainButtonClick: () -> Unit,
) {
Dialog(onDismissRequest = onDismissRequest) {
Dialog(
onDismissRequest = onDismissRequest,
properties = properties,
) {
Column(
modifier = Modifier
modifier = modifier
.clip(RoundedCornerShape(12.dp))
.background(JobisTheme.colors.background)
.padding(vertical = 8.dp),
Expand Down Expand Up @@ -66,13 +73,15 @@ fun JobisDialog(
modifier = Modifier.weight(1f),
text = subButtonText,
color = subButtonColor,
showArrow = showButtonArrow,
onClick = onSubButtonClick,
)
}
JobisDialogButton(
modifier = Modifier.weight(1f),
text = mainButtonText,
color = mainButtonColor,
showArrow = showButtonArrow,
onClick = onMainButtonClick,
)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package team.retum.usecase.usecase.application

import team.retum.data.repository.application.ApplicationRepository
import javax.inject.Inject

class CancelApplicationUseCase @Inject constructor(
private val applicationRepository: ApplicationRepository,
) {
suspend operator fun invoke(applicationId: Long) = runCatching {
applicationRepository.cancelApplication(applicationId = applicationId)
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package team.retum.network.api

import retrofit2.http.Body
import retrofit2.http.DELETE
import retrofit2.http.GET
import retrofit2.http.POST
import retrofit2.http.PUT
Expand Down Expand Up @@ -38,6 +39,11 @@ interface ApplicationApi {
@Body applyCompanyRequest: ApplyCompanyRequest,
)

@DELETE(RequestUrls.Applications.cancel)
suspend fun cancelApplication(
@Path(RequestUrls.PATH.applicationId) applicationId: Long,
)

@GET(RequestUrls.Applications.employment)
suspend fun fetchEmploymentStatus(
@Path(RequestUrls.PATH.year) year: Int,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,7 @@ interface RemoteApplicationDataSource {
applyCompanyRequest: ApplyCompanyRequest,
)

suspend fun cancelApplication(applicationId: Long)

suspend fun fetchEmploymentStatus(year: Int): FetchEmploymentStatusResponse
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ class RemoteApplicationDataSourceImpl @Inject constructor(
}
}

override suspend fun cancelApplication(applicationId: Long) {
RequestHandler<Unit>().request {
applicationApi.cancelApplication(applicationId = applicationId)
}
}

override suspend fun fetchEmploymentStatus(year: Int): FetchEmploymentStatusResponse {
return RequestHandler<FetchEmploymentStatusResponse>().request {
applicationApi.fetchEmploymentStatus(year = year)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,19 @@ import team.retum.jobisdesignsystemv2.card.JobisCard
import team.retum.jobisdesignsystemv2.foundation.JobisTheme
import team.retum.jobisdesignsystemv2.foundation.JobisTypography
import team.retum.jobisdesignsystemv2.text.JobisText
import team.retum.jobisdesignsystemv2.utils.clickable
import team.retum.usecase.entity.application.AppliedCompaniesEntity

@Composable
internal fun ApplyCompanyItem(
onShowRejectionReasonClick: () -> Unit,
onCancelApplicationClick: () -> Unit,
appliedCompany: AppliedCompaniesEntity.ApplicationEntity,
isFocus: Boolean,
navigateToRecruitmentDetails: (Long) -> Unit,
navigateToApplication: () -> Unit,
) {
val applicationStatus = remember { appliedCompany.applicationStatus }
val applicationStatus = appliedCompany.applicationStatus
val color = when (applicationStatus) {
ApplyStatus.FAILED, ApplyStatus.REJECTED, ApplyStatus.DOC_FAILED -> JobisTheme.colors.error
ApplyStatus.REQUESTED, ApplyStatus.APPROVED -> JobisTheme.colors.tertiary
Expand Down Expand Up @@ -79,11 +81,14 @@ internal fun ApplyCompanyItem(
}

JobisCard(
onClick = {
when (applicationStatus) {
ApplyStatus.REJECTED -> onShowRejectionReasonClick()
ApplyStatus.REQUESTED -> navigateToApplication()
else -> navigateToRecruitmentDetails(appliedCompany.recruitmentId)
onClick = if (applicationStatus == ApplyStatus.REQUESTED) {
null
} else {
{
when (applicationStatus) {
ApplyStatus.REJECTED -> onShowRejectionReasonClick()
else -> navigateToRecruitmentDetails(appliedCompany.recruitmentId)
}
}
},
) {
Expand Down Expand Up @@ -119,18 +124,36 @@ internal fun ApplyCompanyItem(
)
if (applicationStatus == ApplyStatus.REJECTED || applicationStatus == ApplyStatus.REQUESTED) {
JobisText(
modifier = Modifier.padding(start = 8.dp),
modifier = Modifier
.padding(start = 8.dp)
.then(
if (applicationStatus == ApplyStatus.REQUESTED) {
Modifier.clickable(onClick = navigateToApplication)
} else {
Modifier
},
),
text = stringResource(
id = when (applicationStatus) {
ApplyStatus.REJECTED -> R.string.reason_rejection
else -> R.string.re_apply
},
).plus(" ->"),
).plus(" β†’"),
style = JobisTypography.SubBody,
color = color,
textDecoration = TextDecoration.Underline,
)
}
if (applicationStatus == ApplyStatus.REQUESTED) {
JobisText(
modifier = Modifier
.padding(start = 8.dp)
.clickable(onClick = onCancelApplicationClick),
text = stringResource(R.string.cancel_application),
style = JobisTypography.SubBody,
textDecoration = TextDecoration.Underline,
)
}
}
}
}
42 changes: 42 additions & 0 deletions feature/home/src/main/java/team/retum/home/ui/HomeScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.DialogProperties
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import coil.compose.AsyncImage
Expand All @@ -61,8 +62,10 @@ import team.retum.home.viewmodel.HomeSideEffect
import team.retum.home.viewmodel.HomeState
import team.retum.home.viewmodel.HomeViewModel
import team.retum.jobisdesignsystemv2.appbar.JobisSmallTopAppBar
import team.retum.jobisdesignsystemv2.button.ButtonColor
import team.retum.jobisdesignsystemv2.button.JobisIconButton
import team.retum.jobisdesignsystemv2.card.JobisCard
import team.retum.jobisdesignsystemv2.dialog.JobisDialog
import team.retum.jobisdesignsystemv2.foundation.JobisIcon
import team.retum.jobisdesignsystemv2.foundation.JobisTheme
import team.retum.jobisdesignsystemv2.foundation.JobisTypography
Expand Down Expand Up @@ -94,6 +97,40 @@ internal fun Home(
val state by homeViewModel.state.collectAsStateWithLifecycle()
val scrollState = rememberScrollState()

if (state.cancelApplicationId != null) {
JobisDialog(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 24.dp),
properties = DialogProperties(usePlatformDefaultWidth = false),
onDismissRequest = homeViewModel::dismissCancelApplication,
title = stringResource(R.string.cancel_application_title),
description = stringResource(R.string.cancel_application_description),
subButtonText = stringResource(R.string.cancel),
mainButtonText = stringResource(R.string.confirm),
subButtonColor = ButtonColor.Default,
showButtonArrow = false,
onSubButtonClick = homeViewModel::dismissCancelApplication,
onMainButtonClick = homeViewModel::cancelApplication,
)
}

if (state.isCancelApplicationFailureDialogVisible) {
JobisDialog(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 24.dp),
properties = DialogProperties(usePlatformDefaultWidth = false),
onDismissRequest = homeViewModel::dismissCancelApplicationFailureDialog,
title = stringResource(R.string.cancel_application_failure_title),
description = stringResource(R.string.cancel_application_failure_description),
mainButtonText = stringResource(R.string.confirm),
mainButtonColor = ButtonColor.Primary,
showButtonArrow = false,
onMainButtonClick = homeViewModel::dismissCancelApplicationFailureDialog,
)
}

LaunchedEffect(Unit) {
with(homeViewModel) {
calculateTerm()
Expand Down Expand Up @@ -142,6 +179,7 @@ internal fun Home(
onWinterInternClick = onWinterInternClick,
onEmploymentClick = onEmploymentClick,
onRejectionReasonClick = homeViewModel::onRejectionReasonClick,
onCancelApplicationClick = homeViewModel::onCancelApplicationClick,
state = state,
banners = state.banners.toPersistentList(),
studentInformation = state.studentInformation,
Expand Down Expand Up @@ -170,6 +208,7 @@ private fun HomeScreen(
onEmploymentClick: () -> Unit,
onWinterInternClick: (Boolean) -> Unit,
onRejectionReasonClick: (ApplicationData) -> Unit,
onCancelApplicationClick: (Long) -> Unit,
state: HomeState,
banners: ImmutableList<BannersEntity.BannerEntity>,
studentInformation: StudentInformationEntity,
Expand Down Expand Up @@ -228,6 +267,7 @@ private fun HomeScreen(
applicationId = applicationId,
appliedCompanies = appliedCompanies,
onShowRejectionReasonClick = onRejectionReasonClick,
onCancelApplicationClick = onCancelApplicationClick,
setScroll = setScroll,
navigateToRecruitmentDetails = navigateToRecruitmentDetails,
navigateToApplication = navigateToApplication,
Expand Down Expand Up @@ -569,6 +609,7 @@ private fun ApplyStatus(
applicationId: Long?,
appliedCompanies: ImmutableList<AppliedCompaniesEntity.ApplicationEntity>,
onShowRejectionReasonClick: (ApplicationData) -> Unit,
onCancelApplicationClick: (Long) -> Unit,
setScroll: (position: Float) -> Unit,
navigateToRecruitmentDetails: (Long) -> Unit,
navigateToApplication: (ApplicationData) -> Unit,
Expand Down Expand Up @@ -614,6 +655,7 @@ private fun ApplyStatus(
)
ApplyCompanyItem(
onShowRejectionReasonClick = { onShowRejectionReasonClick(applicationData) },
onCancelApplicationClick = { onCancelApplicationClick(it.applicationId) },
appliedCompany = it,
isFocus = applicationId == it.applicationId,
navigateToRecruitmentDetails = navigateToRecruitmentDetails,
Expand Down
Loading
Loading