diff --git a/app/src/main/java/com/navi/medici/androidCustomerApp/api/BaseURL.kt b/app/src/main/java/com/navi/medici/androidCustomerApp/api/BaseURL.kt index 01dd8a683e..256478b80e 100644 --- a/app/src/main/java/com/navi/medici/androidCustomerApp/api/BaseURL.kt +++ b/app/src/main/java/com/navi/medici/androidCustomerApp/api/BaseURL.kt @@ -1,15 +1,16 @@ package com.navi.medici.androidCustomerApp.api object BaseURL { -// const val AUTH_SERVICE = "https://auth-service.np.navi-tech.in" -// const val LOAN_ORIGINATION_MANAGER = "https://loan-origination-service.np.navi-tech.in" -// const val LOAN_APPLICATION_SERVICE = "https://loan-accounts-service.np.navi-tech.in/v1/" + const val AUTH_SERVICE = "https://auth-service.np.navi-tech.in" + const val LOAN_ORIGINATION_MANAGER = "https://loan-origination-manager.np.navi-tech.in" + const val LOAN_APPLICATION_SERVICE = "https://loan-application-service.np.navi-tech.in" // const val AUTH_SERVICE = "https://0b454d2f-d0fd-45c0-9362-876deb481835.mock.pstmn.io" // const val LOAN_ORIGINATION_MANAGER = "https://0b454d2f-d0fd-45c0-9362-876deb481835.mock.pstmn.io" // const val LOAN_APPLICATION_SERVICE = "https://0b454d2f-d0fd-45c0-9362-876deb481835.mock.pstmn.io" - const val AUTH_SERVICE = "http://192.168.1.188:8080" - const val LOAN_ORIGINATION_MANAGER = "http://192.168.1.188:8081" - const val LOAN_APPLICATION_SERVICE = "http://192.168.1.188:8082" +// const val AUTH_SERVICE = "http://192.168.1.188:8080" +// const val LOAN_ORIGINATION_MANAGER = "http://192.168.1.188:8081" +// const val LOAN_APPLICATION_SERVICE = "http://192.168.1.188:8082" + } \ No newline at end of file diff --git a/app/src/main/java/com/navi/medici/androidCustomerApp/api/KycDocumentUploadApi.kt b/app/src/main/java/com/navi/medici/androidCustomerApp/api/KycDocumentUploadApi.kt index 32652cb257..0c0f5cc929 100644 --- a/app/src/main/java/com/navi/medici/androidCustomerApp/api/KycDocumentUploadApi.kt +++ b/app/src/main/java/com/navi/medici/androidCustomerApp/api/KycDocumentUploadApi.kt @@ -5,15 +5,12 @@ import com.navi.medici.androidCustomerApp.models.response.KycDocumentUploadRespo import okhttp3.MultipartBody import okhttp3.RequestBody import retrofit2.Response -import retrofit2.http.Multipart -import retrofit2.http.POST -import retrofit2.http.Part -import retrofit2.http.Path +import retrofit2.http.* interface KycDocumentUploadApi { @Multipart - @POST("/loan-origination-manager/loan-applications/3A2B0A2D-FA9E-40ED-B4BA-A0037C378AB5/POI") - suspend fun submitPoaDocument(@Path("type") type: RequestBody, @Part file: MultipartBody.Part): Response + @POST("/loan-origination-manager/loan-applications/{loanApplicationId}/POA") + suspend fun submitPoaDocument(@Path("loanApplicationId") loanApplicationId: String, @Part("type") type: RequestBody, @Part file: MultipartBody.Part): Response companion object { operator fun invoke(): KycDocumentUploadApi { diff --git a/app/src/main/java/com/navi/medici/androidCustomerApp/repositories/KycDocumentUploadRepository.kt b/app/src/main/java/com/navi/medici/androidCustomerApp/repositories/KycDocumentUploadRepository.kt index 63ce8e59fe..72fd8bad53 100644 --- a/app/src/main/java/com/navi/medici/androidCustomerApp/repositories/KycDocumentUploadRepository.kt +++ b/app/src/main/java/com/navi/medici/androidCustomerApp/repositories/KycDocumentUploadRepository.kt @@ -6,9 +6,10 @@ import okhttp3.RequestBody import retrofit2.http.Part class KycDocumentUploadRepository(private val kycDocumentUploadApi: KycDocumentUploadApi) { - suspend fun submitPoaDocument(@Part type: RequestBody, @Part file: MultipartBody.Part) = + suspend fun submitPoaDocument(loanApplicationId: String, @Part type: RequestBody, @Part file: MultipartBody.Part) = suspend { kycDocumentUploadApi.submitPoaDocument( + loanApplicationId, type, file ) diff --git a/app/src/main/java/com/navi/medici/androidCustomerApp/ui/fragments/KycDocumentUploadFragment.kt b/app/src/main/java/com/navi/medici/androidCustomerApp/ui/fragments/KycDocumentUploadFragment.kt index 626b99a6f7..726d54b3e2 100644 --- a/app/src/main/java/com/navi/medici/androidCustomerApp/ui/fragments/KycDocumentUploadFragment.kt +++ b/app/src/main/java/com/navi/medici/androidCustomerApp/ui/fragments/KycDocumentUploadFragment.kt @@ -76,7 +76,7 @@ class KycDocumentUploadFragment : Fragment() { super.onActivityResult(requestCode, resultCode, data) if (requestCode == fileSelectCode) { data?.data?.let { - viewModel.submitPoaDocument(it, getLoanApplicationId()) + viewModel.submitPoaDocument(it, getLoanApplicationId().toString()) } } } @@ -92,10 +92,7 @@ class KycDocumentUploadFragment : Fragment() { } private fun getLoanApplicationId(): String? { - return PreferenceWrapper.getStringPreference( - activity as Activity, - PreferenceNames.LOAN_APPLICATION_ID - ) + return PreferenceManager.getLoanApplicationId(requireContext()) } companion object { diff --git a/app/src/main/java/com/navi/medici/androidCustomerApp/viewModels/KycDocumentUploadViewModel.kt b/app/src/main/java/com/navi/medici/androidCustomerApp/viewModels/KycDocumentUploadViewModel.kt index 21f768da15..5f146d587d 100644 --- a/app/src/main/java/com/navi/medici/androidCustomerApp/viewModels/KycDocumentUploadViewModel.kt +++ b/app/src/main/java/com/navi/medici/androidCustomerApp/viewModels/KycDocumentUploadViewModel.kt @@ -1,6 +1,7 @@ package com.navi.medici.androidCustomerApp.viewModels import android.net.Uri +import android.util.Log import android.view.View import android.widget.AdapterView import androidx.lifecycle.MutableLiveData @@ -41,7 +42,8 @@ class KycDocumentUploadViewModel : ViewModel() { fun submitPoaDocument(uri: Uri, loanApplicationId: String?) { uri.path?.let { - val poaDocumentFile = File(it) + Log.i("uri path", it) + val poaDocumentFile = File(it.removePrefix("/document/raw:")) val reqFile = RequestBody.create( MediaType.parse("application/x-www-form-urlencoded"), poaDocumentFile @@ -55,6 +57,7 @@ class KycDocumentUploadViewModel : ViewModel() { coroutineScope.launch { loanApplicationId?.let { loanApplicationId -> kycDocumentUploadRepository.submitPoaDocument( + loanApplicationId, requestType, body ) diff --git a/app/src/main/java/com/navi/medici/androidCustomerApp/viewModels/OfferAcceptViewModel.kt b/app/src/main/java/com/navi/medici/androidCustomerApp/viewModels/OfferAcceptViewModel.kt index 620f3601dc..d3d3fbe331 100644 --- a/app/src/main/java/com/navi/medici/androidCustomerApp/viewModels/OfferAcceptViewModel.kt +++ b/app/src/main/java/com/navi/medici/androidCustomerApp/viewModels/OfferAcceptViewModel.kt @@ -15,7 +15,8 @@ import timber.log.Timber class OfferAcceptViewModel : ViewModel() { private val _customerId = MutableLiveData() private val _applicationSummary = MutableLiveData() - private val offerAcceptRepository = LoanApplicationRepository(LoanApplicationApi(), PlaceholderApi()) + private val offerAcceptRepository = + LoanApplicationRepository(LoanApplicationApi(), PlaceholderApi()) private val coroutineScope = CoroutineScope(Dispatchers.Main) val customerId: LiveData