Dev

app/build.gradle.kts

@@ -88,6 +88,9 @@ dependencies {
     debugImplementation(libs.androidx.compose.ui.test.manifest)
     // Testing dependencies
     testImplementation(libs.junit)
+    testImplementation(libs.mockk)
+    testImplementation(libs.turbine)
+    testImplementation(libs.kotlinx.coroutines.test)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
     androidTestImplementation(platform(libs.androidx.compose.bom))

app/src/main/java/com/autoever/everp/MainActivity.kt

@@ -4,13 +4,21 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import com.autoever.everp.ui.MainScreen
 import com.autoever.everp.ui.navigation.AppNavGraph
+import com.autoever.everp.ui.splash.SplashScreen
 import com.autoever.everp.ui.theme.EverpTheme
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.delay
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
@@ -20,12 +28,28 @@ class MainActivity : ComponentActivity() {
         enableEdgeToEdge()
         setContent {
             EverpTheme {
-                MainScreen()
-                Surface(modifier = Modifier.fillMaxSize()) {
-                    AppNavGraph()
-                }
+                AppContent()
             }
         }
     }
+}
+
+@Composable
+private fun AppContent() {
+    var showSplash by remember { mutableStateOf(true) }
+
+    LaunchedEffect(Unit) {
+        delay(2000) // 2초간 SplashScreen 표시
+        showSplash = false
+    }
 
+    Box(modifier = Modifier.fillMaxSize()) {
+        if (showSplash) {
+            SplashScreen()
+        } else {
+            Surface(modifier = Modifier.fillMaxSize()) {
+                AppNavGraph()
+            }
+        }
+    }
 }

app/src/main/java/com/autoever/everp/data/datasource/remote/FcmRemoteDataSource.kt

@@ -28,7 +28,7 @@ interface FcmRemoteDataSource {
         request: InvoiceUpdateRequestDto,
     ): Result<Unit>
 
-    suspend fun requestReceivable(
+    suspend fun updateCustomerInvoiceStatus(
         invoiceId: String,
     ): Result<Unit>
 
@@ -50,7 +50,7 @@ interface FcmRemoteDataSource {
         request: InvoiceUpdateRequestDto,
     ): Result<Unit>
 
-    suspend fun completeReceivable(
+    suspend fun updateSupplierInvoiceStatus(
         invoiceId: String,
     ): Result<Unit>
 }

app/src/main/java/com/autoever/everp/data/datasource/remote/http/impl/FcmHttpRemoteDataSourceImpl.kt

@@ -63,16 +63,14 @@ class FcmHttpRemoteDataSourceImpl @Inject constructor(
     }
 
     /**
-     * 공급사(Supplier)
-     * 매입 전표 상태 수정
-     * 확인 요청 -> 완납
+     * 매입 전표 수정
      */
     override suspend fun updateApInvoice(
         invoiceId: String,
         request: InvoiceUpdateRequestDto,
     ): Result<Unit> = withContext(Dispatchers.IO) {
         try {
-            val response = fcmApi.updateApInvoice(invoiceId)
+            val response = fcmApi.updateApInvoice(invoiceId, request)
             if (response.success) {
                 Result.success(Unit)
             } else {
@@ -84,22 +82,6 @@ class FcmHttpRemoteDataSourceImpl @Inject constructor(
         }
     }
 
-    override suspend fun requestReceivable(
-        invoiceId: String,
-    ): Result<Unit> = withContext(Dispatchers.IO) {
-        try {
-            val response = fcmApi.requestReceivable(invoiceId)
-            if (response.success) {
-                Result.success(Unit)
-            } else {
-                Result.failure(Exception(response.message ?: "수취 요청 실패"))
-            }
-        } catch (e: Exception) {
-            Timber.e(e, "수취 요청 실패")
-            Result.failure(e)
-        }
-    }
-
     // ========== AR 인보이스 (매출) ==========
     override suspend fun getArInvoiceList(
 //        companyName: String?,
@@ -143,10 +125,9 @@ class FcmHttpRemoteDataSourceImpl @Inject constructor(
         }
     }
 
+
     /**
-     * 고객사(Customer)
-     * 매출 전표 상태 수정
-     * 미납 -> 확인 요청
+     * 매출 전표 수정
      */
     override suspend fun updateArInvoice(
         invoiceId: String,
@@ -165,9 +146,37 @@ class FcmHttpRemoteDataSourceImpl @Inject constructor(
         }
     }
 
-    override suspend fun completeReceivable(invoiceId: String): Result<Unit> {
+    // ========== 인보이스 상태 수정 ==========
+
+    /**
+     * 고객사(Customer)
+     * 매출 전표 상태 수정
+     * 미납 -> 확인 요청
+     */
+    override suspend fun updateCustomerInvoiceStatus(
+        invoiceId: String,
+    ): Result<Unit> = withContext(Dispatchers.IO) {
+        try {
+            val response = fcmApi.updateCustomerInvoiceStatus(invoiceId)
+            if (response.success) {
+                Result.success(Unit)
+            } else {
+                Result.failure(Exception(response.message))
+            }
+        } catch (e: Exception) {
+            Timber.e(e, "수취 요청 실패")
+            Result.failure(e)
+        }
+    }
+
+    /**
+     * 공급사(Supplier)
+     * 매입 전표 상태 수정
+     * 확인 요청 -> 완납
+     */
+    override suspend fun updateSupplierInvoiceStatus(invoiceId: String): Result<Unit> {
         return try {
-            val response = fcmApi.completeReceivable(invoiceId)
+            val response = fcmApi.updateSupplierInvoiceStatus(invoiceId)
             if (response.success) {
                 Result.success(Unit)
             } else {

app/src/main/java/com/autoever/everp/data/datasource/remote/http/service/FcmApi.kt

@@ -37,14 +37,12 @@ interface FcmApi {
     ): ApiResponse<InvoiceDetailResponseDto>
 
     /**
-     * 공급사(Supplier)
-     * 매입 전표 상태 수정
-     * 확인 요청 -> 완납
+     *
      */
     @PATCH("$BASE_URL/invoice/ap/{invoiceId}")
     suspend fun updateApInvoice(
         @Path("invoiceId") invoiceId: String,
-//        @Body request: InvoiceUpdateRequestDto,
+        @Body request: InvoiceUpdateRequestDto,
     ): ApiResponse<Any>
 
     /**
@@ -86,6 +84,24 @@ interface FcmApi {
         @Path("invoiceId") invoiceId: String,
     ): ApiResponse<Any>
 
+    /**
+     * 공급사(Supplier)
+     * 매출 전표 상태 수정(확인 요청 -> 완료)
+     */
+    @POST("$BASE_URL/invoice/ap/{invoiceId}/payable/complete")
+    suspend fun updateSupplierInvoiceStatus(
+        @Path("invoiceId") invoiceId: String,
+    ): ApiResponse<Unit>
+
+    /**
+     * 고객사(Customer)
+     * 매입 전표 상태 수정(미납 -> 확인 요청)
+     */
+    @POST("$BASE_URL/invoice/ap/receivable/request")
+    suspend fun updateCustomerInvoiceStatus(
+        @Query("invoiceId") invoiceId: String,
+    ): ApiResponse<Unit>
+
     companion object {
         private const val BASE_URL = "business/fcm"
     }

app/src/main/java/com/autoever/everp/data/datasource/remote/http/service/SdApi.kt

@@ -139,7 +139,7 @@ data class QuotationDetailResponseDto(
     val quotationDate: LocalDate,
     @Serializable(with = LocalDateSerializer::class)
     @SerialName("dueDate")
-    val dueDate: LocalDate,
+    val dueDate: LocalDate? = null,
     @SerialName("statusCode")
     val statusCode: QuotationStatusEnum,
     @SerialName("customerName")

app/src/main/java/com/autoever/everp/data/repository/FcmRepositoryImpl.kt

@@ -77,8 +77,8 @@ class FcmRepositoryImpl @Inject constructor(
             }
     }
 
-    override suspend fun requestReceivable(invoiceId: String): Result<Unit> {
-        return fcmFinanceRemoteDataSource.requestReceivable(invoiceId)
+    override suspend fun updateCustomerInvoiceStatus(invoiceId: String): Result<Unit> {
+        return fcmFinanceRemoteDataSource.updateCustomerInvoiceStatus(invoiceId)
     }
 
     // ========== AR 인보이스 (매출) ==========
@@ -135,8 +135,8 @@ class FcmRepositoryImpl @Inject constructor(
             }
     }
 
-    override suspend fun completeReceivable(invoiceId: String): Result<Unit> {
-        return fcmFinanceRemoteDataSource.completeReceivable(invoiceId)
+    override suspend fun updateSupplierInvoiceStatus(invoiceId: String): Result<Unit> {
+        return fcmFinanceRemoteDataSource.updateSupplierInvoiceStatus(invoiceId)
             .onSuccess {
                 // 완료 성공 시 로컬 캐시 갱신
                 refreshArInvoiceDetail(invoiceId)

app/src/main/java/com/autoever/everp/domain/model/quotation/QuotationDetail.kt

@@ -6,7 +6,7 @@ data class QuotationDetail(
     val id: String, // 견적서 ID
     val number: String, // 견적서 코드
     val issueDate: LocalDate, // 발행일, 견적일자
-    val dueDate: LocalDate, // 납기일
+    val dueDate: LocalDate? = null, // 납기일
     val status: QuotationStatusEnum, // 상태 값은 Enum으로 따로 관리
     val totalAmount: Long, // 총 금액
     val customer: QuotationDetailCustomer,

app/src/main/java/com/autoever/everp/domain/repository/FcmRepository.kt

@@ -21,7 +21,7 @@ interface FcmRepository {
     suspend fun getApInvoiceDetail(invoiceId: String): Result<InvoiceDetail>
 
     suspend fun updateApInvoice(invoiceId: String, request: InvoiceUpdateRequestDto): Result<Unit>
-    suspend fun requestReceivable(invoiceId: String): Result<Unit>
+    suspend fun updateCustomerInvoiceStatus(invoiceId: String): Result<Unit>
 
     // ========== AR 인보이스 (매출) ==========
     fun observeArInvoiceList(): Flow<PageResponse<InvoiceListItem>>
@@ -33,6 +33,6 @@ interface FcmRepository {
     suspend fun getArInvoiceDetail(invoiceId: String): Result<InvoiceDetail>
 
     suspend fun updateArInvoice(invoiceId: String, request: InvoiceUpdateRequestDto): Result<Unit>
-    suspend fun completeReceivable(invoiceId: String): Result<Unit>
+    suspend fun updateSupplierInvoiceStatus(invoiceId: String): Result<Unit>
 }
 

app/src/main/java/com/autoever/everp/ui/customer/CustomerProfileScreen.kt

@@ -13,7 +13,9 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Person
+import androidx.compose.material.icons.outlined.Logout
 import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.Icon
@@ -180,7 +182,19 @@ fun CustomerProfileScreen(
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(vertical = 24.dp),
-        ) { }
+            colors = ButtonDefaults.buttonColors(
+                containerColor = MaterialTheme.colorScheme.error,
+                contentColor = MaterialTheme.colorScheme.onError,
+            ),
+            shape = MaterialTheme.shapes.large,
+        ) {
+            Icon(
+                imageVector = Icons.Outlined.Logout,
+                contentDescription = "로그아웃",
+            )
+            androidx.compose.foundation.layout.Spacer(modifier = androidx.compose.ui.Modifier.size(8.dp))
+            Text(text = "로그아웃")
+        }
     }
 }
 

app/src/main/java/com/autoever/everp/ui/customer/InvoiceDetailScreen.kt

@@ -37,9 +37,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavController
 import com.autoever.everp.ui.common.components.StatusBadge
 import com.autoever.everp.utils.state.UiResult
-import java.text.NumberFormat
 import java.time.format.DateTimeFormatter
-import java.util.Locale
 
 @Composable
 fun InvoiceDetailScreen(
@@ -261,10 +259,11 @@ fun InvoiceDetailScreen(
                         }
 
                         // 납부 확인 요청 버튼 (UNPAID 상태일 때만 표시)
+//                        if (detail.status == InvoiceStatusEnum.UNPAID) {
                         if (!isAp && detail.status == InvoiceStatusEnum.UNPAID) {
                             Spacer(modifier = Modifier.height(16.dp))
                             Button(
-                                onClick = { viewModel.requestReceivable(invoiceId) },
+                                onClick = { viewModel.updateCustomerInvoiceStatus(invoiceId) },
                                 modifier = Modifier.fillMaxWidth(),
                             ) {
                                 Text("납부 확인 요청")

app/src/main/java/com/autoever/everp/ui/customer/InvoiceDetailViewModel.kt

@@ -67,9 +67,9 @@ class InvoiceDetailViewModel @Inject constructor(
         loadInvoiceDetail(invoiceId, isAp)
     }
 
-    fun requestReceivable(invoiceId: String) {
+    fun updateCustomerInvoiceStatus(invoiceId: String) {
         viewModelScope.launch {
-            _requestResult.value = fcmRepository.requestReceivable(invoiceId)
+            _requestResult.value = fcmRepository.updateCustomerInvoiceStatus(invoiceId)
                 .onSuccess {
                     // 성공 시 상세 정보 다시 로드
                     loadInvoiceDetail(invoiceId, false) // AR 인보이스

app/src/main/java/com/autoever/everp/ui/customer/NotificationScreen.kt

@@ -34,6 +34,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import com.autoever.everp.domain.model.notification.Notification
 import com.autoever.everp.domain.model.notification.NotificationLinkEnum
+import com.autoever.everp.domain.model.notification.NotificationSourceEnum
 import com.autoever.everp.ui.common.components.StatusBadge
 import com.autoever.everp.ui.supplier.SupplierSubNavigationItem
 import java.time.Duration
@@ -172,10 +173,12 @@ private fun NotificationItem(
                     fontWeight = if (notification.isRead) FontWeight.Normal else FontWeight.Bold,
                 )
 
-                StatusBadge(
-                    text = notification.source.toKorean(),
-                    color = notification.source.toColor(),
-                )
+                if (notification.source != NotificationSourceEnum.UNKNOWN) {
+                    StatusBadge(
+                        text = notification.source.toKorean(),
+                        color = notification.source.toColor(),
+                    )
+                }
             }
 
             Text(

app/src/main/java/com/autoever/everp/ui/customer/QuotationDetailScreen.kt

@@ -149,7 +149,7 @@ fun QuotationDetailScreen(
                                 )
                                 DetailRow(
                                     label = "납기일자",
-                                    value = detail.dueDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")),
+                                    value = detail.dueDate?.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) ?: "-",
                                 )
                                 DetailRow(
                                     label = "총 금액",

app/src/main/java/com/autoever/everp/ui/main/MainScreen.kt

@@ -69,6 +69,8 @@ fun MainScreen(
                         popUpTo(Routes.HOME) { inclusive = true }
                         launchSingleTop = true
                     }
+                } else {
+                    homeVm.refreshUserIfAuthenticated()
                 }
             }
             .collect()