refactor #1505: migrated client usecase to kotlin

PratyushSingh07 · PratyushSingh07 · commit ba238313557f · 2024-02-10T12:13:09.000+05:30
diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/CreateClient.kt b/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/CreateClient.kt
@@ -16,8 +16,8 @@ import javax.inject.Inject
 class CreateClient @Inject constructor(private val apiRepository: FineractRepository) :
     UseCase<CreateClient.RequestValues, CreateClient.ResponseValue>() {
 
-    class RequestValues(val client: NewClient) : UseCase.RequestValues
-    class ResponseValue(val clientId: Int) : UseCase.ResponseValue
+    data class RequestValues(val client: NewClient) : UseCase.RequestValues
+    data class ResponseValue(val clientId: Int) : UseCase.ResponseValue
 
     override fun executeUseCase(requestValues: RequestValues) {
         apiRepository.createClient(requestValues.client)
@@ -26,7 +26,7 @@ class CreateClient @Inject constructor(private val apiRepository: FineractReposi
             .subscribe(object : Subscriber<ResponseValue>() {
                 override fun onCompleted() {}
                 override fun onError(e: Throwable) {
-                    var message: String? = "Error"
+                    var message: String
                     try {
                         message = (e as HttpException).response().errorBody().string()
                         message = getUserMessage(message)
diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/FetchClientData.kt b/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/FetchClientData.kt
@@ -15,12 +15,12 @@ import javax.inject.Inject
  */
 class FetchClientData @Inject constructor(private val fineractRepository: FineractRepository) :
     UseCase<FetchClientData.RequestValues, FetchClientData.ResponseValue>() {
-    @JvmField
+
     @Inject
-    var clientDetailsMapper: ClientDetailsMapper? = null
+    lateinit var clientDetailsMapper: ClientDetailsMapper
 
-    class RequestValues(val clientid: Long) : UseCase.RequestValues
-    class ResponseValue(val userDetails: org.mifos.mobilewallet.core.domain.model.client.Client) :
+    data class RequestValues(val clientid: Long) : UseCase.RequestValues
+    data class ResponseValue(val userDetails: org.mifos.mobilewallet.core.domain.model.client.Client) :
         UseCase.ResponseValue
 
     override fun executeUseCase(requestValues: RequestValues) {
@@ -36,7 +36,7 @@ class FetchClientData @Inject constructor(private val fineractRepository: Finera
                 override fun onNext(client: Client) {
                     useCaseCallback.onSuccess(
                         ResponseValue(
-                            clientDetailsMapper!!.transform(client)
+                            clientDetailsMapper.transform(client)
                         )
                     )
                 }
diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/FetchClientDetails.kt b/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/FetchClientDetails.kt
@@ -15,8 +15,8 @@ import javax.inject.Inject
 class FetchClientDetails @Inject constructor(private val mFineractRepository: FineractRepository) :
     UseCase<FetchClientDetails.RequestValues, FetchClientDetails.ResponseValue>() {
 
-    class RequestValues(val clientId: Long) : UseCase.RequestValues
-    class ResponseValue(val client: Client) : UseCase.ResponseValue
+    data class RequestValues(val clientId: Long) : UseCase.RequestValues
+    data class ResponseValue(val client: Client) : UseCase.ResponseValue
 
     override fun executeUseCase(requestValues: RequestValues) {
         mFineractRepository.getClientDetails(requestValues.clientId)
diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/FetchClientImage.kt b/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/FetchClientImage.kt
@@ -15,8 +15,8 @@ import javax.inject.Inject
 class FetchClientImage @Inject constructor(private val mFineractRepository: FineractRepository) :
     UseCase<FetchClientImage.RequestValues, FetchClientImage.ResponseValue>() {
 
-    class RequestValues(val clientid: Long) : UseCase.RequestValues
-    class ResponseValue(val responseBody: ResponseBody) : UseCase.ResponseValue
+    data class RequestValues(val clientid: Long) : UseCase.RequestValues
+    data class ResponseValue(val responseBody: ResponseBody) : UseCase.ResponseValue
 
     override fun executeUseCase(requestValues: RequestValues) {
         mFineractRepository.getClientImage(requestValues.clientid)
diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/SearchClient.kt b/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/SearchClient.kt
@@ -16,12 +16,12 @@ import javax.inject.Inject
  */
 class SearchClient @Inject constructor(private val apiRepository: FineractRepository) :
     UseCase<SearchClient.RequestValues, SearchClient.ResponseValue>() {
-    @JvmField
+
     @Inject
-    var searchedEntitiesMapper: SearchedEntitiesMapper? = null
+    lateinit var searchedEntitiesMapper: SearchedEntitiesMapper
 
-    class RequestValues(val externalId: String) : UseCase.RequestValues
-    class ResponseValue(val results: List<SearchResult>) : UseCase.ResponseValue
+    data class RequestValues(val externalId: String) : UseCase.RequestValues
+    data class ResponseValue(val results: List<SearchResult>) : UseCase.ResponseValue
 
     override fun executeUseCase(requestValues: RequestValues) {
         apiRepository.searchResources(requestValues.externalId, Constants.CLIENTS, false)
@@ -37,7 +37,7 @@ class SearchClient @Inject constructor(private val apiRepository: FineractReposi
                     if (results.isNotEmpty()) {
                         useCaseCallback.onSuccess(
                             ResponseValue(
-                                searchedEntitiesMapper!!.transformList(results)
+                                searchedEntitiesMapper.transformList(results)
                             )
                         )
                     } else {
diff --git a/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/UpdateClient.kt b/core/data/src/main/java/org/mifos/mobilewallet/core/domain/usecase/client/UpdateClient.kt
@@ -16,10 +16,10 @@ import javax.inject.Inject
 class UpdateClient @Inject constructor(private val fineractRepository: FineractRepository) :
     UseCase<UpdateClient.RequestValues, UpdateClient.ResponseValue>() {
 
-    class RequestValues(val updateClientEntity: Any, val clientId: Long) :
+    data class RequestValues(val updateClientEntity: Any, val clientId: Long) :
         UseCase.RequestValues
 
-    class ResponseValue : UseCase.ResponseValue
+    data class ResponseValue(val responseBody: ResponseBody) : UseCase.ResponseValue
 
     override fun executeUseCase(requestValues: RequestValues) {
         fineractRepository.updateClient(requestValues.clientId, requestValues.updateClientEntity)
@@ -28,7 +28,7 @@ class UpdateClient @Inject constructor(private val fineractRepository: FineractR
             .subscribe(object : Subscriber<ResponseBody>() {
                 override fun onCompleted() {}
                 override fun onError(e: Throwable) {
-                    var message: String? = "Error"
+                    var message: String
                     try {
                         message = (e as HttpException).response().errorBody().string()
                         message = getUserMessage(message)
@@ -39,7 +39,7 @@ class UpdateClient @Inject constructor(private val fineractRepository: FineractR
                 }
 
                 override fun onNext(responseBody: ResponseBody) {
-                    useCaseCallback.onSuccess(ResponseValue())
+                    useCaseCallback.onSuccess(ResponseValue(responseBody))
                 }
             })
     }
diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/SearchContract.kt b/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/SearchContract.kt
@@ -15,6 +15,6 @@ interface SearchContract {
     }
 
     interface SearchPresenter : BasePresenter {
-        fun performSearch(query: String?)
+        fun performSearch(query: String)
     }
 }
diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/TransferContract.kt b/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/TransferContract.kt
@@ -16,7 +16,7 @@ interface TransferContract {
     }
 
     interface TransferPresenter : BasePresenter {
-        fun fetchClient(externalId: String?)
+        fun fetchClient(externalId: String)
         fun makeTransfer(fromClientId: Long, toClientId: Long, amount: Double)
     }
 }
diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/presenter/MakeTransferPresenter.kt b/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/presenter/MakeTransferPresenter.kt
@@ -13,21 +13,21 @@ import javax.inject.Inject
  */
 class MakeTransferPresenter @Inject constructor(private val mUsecaseHandler: UseCaseHandler) :
     TransferContract.TransferPresenter {
-    @JvmField
+
     @Inject
-    var transferFunds: TransferFunds? = null
+    lateinit var transferFunds: TransferFunds
 
-    @JvmField
     @Inject
-    var searchClient: SearchClient? = null
+    lateinit var searchClient: SearchClient
+
     private var mTransferView: TransferContract.TransferView? = null
     override fun attachView(baseView: BaseView<*>?) {
         mTransferView = baseView as TransferContract.TransferView?
         mTransferView?.setPresenter(this)
     }
 
-    override fun fetchClient(externalId: String?) {
-        mUsecaseHandler.execute(searchClient, externalId?.let { SearchClient.RequestValues(it) },
+    override fun fetchClient(externalId: String) {
+        mUsecaseHandler.execute(searchClient, SearchClient.RequestValues(externalId),
             object : UseCaseCallback<SearchClient.ResponseValue?> {
                 override fun onSuccess(response: SearchClient.ResponseValue?) {
                     val searchResult = response?.results?.get(0)
@@ -57,7 +57,7 @@ class MakeTransferPresenter @Inject constructor(private val mUsecaseHandler: Use
 
                 override fun onError(message: String) {
                     mTransferView?.enableDragging(true)
-                    mTransferView!!.transferFailure()
+                    mTransferView?.transferFailure()
                 }
             })
     }
diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/presenter/SearchPresenter.kt b/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/presenter/SearchPresenter.kt
@@ -12,20 +12,20 @@ import javax.inject.Inject
  */
 class SearchPresenter @Inject constructor(private val mUsecaseHandler: UseCaseHandler) :
     SearchContract.SearchPresenter {
-    @JvmField
+
     @Inject
-    var searchClient: SearchClient? = null
-    private var mSearchView: SearchContract.SearchView? = null
+    lateinit var searchClient: SearchClient
+    private lateinit var mSearchView: SearchContract.SearchView
     override fun attachView(baseView: BaseView<*>?) {
-        mSearchView = baseView as SearchContract.SearchView?
-        mSearchView?.setPresenter(this)
+        mSearchView = baseView as SearchContract.SearchView
+        mSearchView.setPresenter(this)
     }
 
-    override fun performSearch(query: String?) {
-        mUsecaseHandler.execute(searchClient, query?.let { SearchClient.RequestValues(it) },
+    override fun performSearch(query: String) {
+        mUsecaseHandler.execute(searchClient, SearchClient.RequestValues(query),
             object : UseCaseCallback<SearchClient.ResponseValue?> {
                 override fun onSuccess(response: SearchClient.ResponseValue?) {
-                    mSearchView?.showSearchResult(response?.results?.toMutableList())
+                    mSearchView.showSearchResult(response?.results?.toMutableList())
                 }
 
                 override fun onError(message: String) {}
diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/ui/MakeTransferFragment.kt b/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/common/ui/MakeTransferFragment.kt
@@ -100,7 +100,7 @@ class MakeTransferFragment : BottomSheetDialogFragment(), TransferContract.Trans
         ButterKnife.bind(this, view)
         mPresenter?.attachView(this)
         amount = arguments?.getDouble(Constants.AMOUNT) ?: 0.0
-        mTransferPresenter?.fetchClient(arguments?.getString(Constants.TO_EXTERNAL_ID))
+        mTransferPresenter?.fetchClient(arguments?.getString(Constants.TO_EXTERNAL_ID).toString())
         btnCancel?.setOnClickListener { dismiss() }
         btnConfirm?.setOnClickListener {
             mTransferPresenter?.makeTransfer(
diff --git a/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/registration/presenter/MobileVerificationPresenter.kt b/mifospay/src/main/java/org/mifos/mobilewallet/mifospay/registration/presenter/MobileVerificationPresenter.kt
@@ -13,34 +13,35 @@ import javax.inject.Inject
  */
 class MobileVerificationPresenter @Inject constructor(private val mUseCaseHandler: UseCaseHandler) :
     RegistrationContract.MobileVerificationPresenter {
-    var mMobileVerificationView: MobileVerificationView? = null
+
+    lateinit var mMobileVerificationView: MobileVerificationView
 
     @JvmField
     @Inject
     var searchClientUseCase: SearchClient? = null
     override fun attachView(baseView: BaseView<*>?) {
-        mMobileVerificationView = baseView as MobileVerificationView?
-        mMobileVerificationView?.setPresenter(this)
+        mMobileVerificationView = baseView as MobileVerificationView
+        mMobileVerificationView.setPresenter(this)
     }
 
     override fun requestOTPfromServer(fullNumber: String?, mobileNo: String?) {
         mUseCaseHandler.execute(searchClientUseCase,
             mobileNo?.let { SearchClient.RequestValues(it) },
             object : UseCaseCallback<SearchClient.ResponseValue?> {
                 override fun onSuccess(response: SearchClient.ResponseValue?) {
-                    mMobileVerificationView?.onRequestOtpFailed("Mobile number already exists.")
+                    mMobileVerificationView.onRequestOtpFailed("Mobile number already exists.")
                 }
 
                 override fun onError(message: String) {
                     // TODO:: request OTP
-                    mMobileVerificationView?.onRequestOtpSuccess()
+                    mMobileVerificationView.onRequestOtpSuccess()
                 }
             })
     }
 
     override fun verifyOTP(otp: String?) {
         // TODO:: verify OTP
-        mMobileVerificationView?.onOtpVerificationSuccess()
+        mMobileVerificationView.onOtpVerificationSuccess()
 
         // TODO::
 

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,6 @@ interface SearchContract {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`interface SearchPresenter : BasePresenter {`
`18`		`- fun performSearch(query: String?)`
	`18`	`+ fun performSearch(query: String)`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ interface TransferContract {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`interface TransferPresenter : BasePresenter {`
`19`		`- fun fetchClient(externalId: String?)`
	`19`	`+ fun fetchClient(externalId: String)`
`20`	`20`	`fun makeTransfer(fromClientId: Long, toClientId: Long, amount: Double)`
`21`	`21`	`}`
`22`	`22`	`}`