Change call function lambda return type

MarkNjunge · MarkNjunge · commit 470a4d113786 · 2020-04-13T23:48:07.000+03:00
diff --git a/core/src/main/java/com/marknjunge/core/data/repository/AuthRepository.kt b/core/src/main/java/com/marknjunge/core/data/repository/AuthRepository.kt
@@ -9,12 +9,7 @@ import com.marknjunge.core.utils.call
 interface AuthRepository {
     suspend fun signInWithGoogle(idToken: String): Resource<User>
 
-    suspend fun signUp(
-        firstName: String,
-        lastName: String,
-        email: String,
-        password: String
-    ): Resource<User>
+    suspend fun signUp(firstName: String, lastName: String, email: String, password: String): Resource<User>
 
     suspend fun signIn(email: String, password: String): Resource<User>
 
@@ -39,7 +34,7 @@ internal class ApiAuthRepository(
             preferencesRepository.user = response.user
             preferencesRepository.sessionId = response.session.sessionId
 
-            Resource.Success(response.user)
+            response.user
         }
     }
 
@@ -56,7 +51,7 @@ internal class ApiAuthRepository(
             preferencesRepository.user = response.user
             preferencesRepository.sessionId = response.session.sessionId
 
-            Resource.Success(response.user)
+            response.user
         }
     }
 
@@ -67,7 +62,7 @@ internal class ApiAuthRepository(
             preferencesRepository.user = response.user
             preferencesRepository.sessionId = response.session.sessionId
 
-            Resource.Success(response.user)
+            response.user
         }
     }
 
@@ -79,8 +74,6 @@ internal class ApiAuthRepository(
             }
             preferencesRepository.user = null
             preferencesRepository.sessionId = ""
-
-            Resource.Success(Unit)
         }
     }
 
@@ -91,22 +84,18 @@ internal class ApiAuthRepository(
             }
             preferencesRepository.user = null
             preferencesRepository.sessionId = ""
-
-            Resource.Success(Unit)
         }
     }
 
     override suspend fun requestPasswordReset(email: String): Resource<ApiResponse> {
         return call {
-            val response = authService.requestPasswordReset(RequestPasswordResetDto(email))
-            Resource.Success(response)
+            authService.requestPasswordReset(RequestPasswordResetDto(email))
         }
     }
 
     override suspend fun resetPassword(token: String, newPassword: String): Resource<ApiResponse> {
         return call {
-            val response = authService.resetPassword(ResetPasswordDto(token, newPassword))
-            Resource.Success(response)
+            authService.resetPassword(ResetPasswordDto(token, newPassword))
         }
     }
 }
diff --git a/core/src/main/java/com/marknjunge/core/data/repository/CartRepository.kt b/core/src/main/java/com/marknjunge/core/data/repository/CartRepository.kt
@@ -17,7 +17,7 @@ internal class ApiCartRepository(
 ) : CartRepository {
     override suspend fun verifyOrder(dto: VerifyOrderDto): Resource<List<VerifyOrderResponse>> {
         return call {
-            Resource.Success(cartService.verifyCart(preferencesRepository.sessionId, dto))
+            cartService.verifyCart(preferencesRepository.sessionId, dto)
         }
     }
 }
diff --git a/core/src/main/java/com/marknjunge/core/data/repository/OrdersRepository.kt b/core/src/main/java/com/marknjunge/core/data/repository/OrdersRepository.kt
@@ -21,27 +21,26 @@ internal class ApiOrdersRepository(
 ) : OrdersRepository {
     override suspend fun placeOrder(dto: PlaceOrderDto): Resource<Order> {
         return call {
-            Resource.Success(ordersService.placeOrder(preferencesRepository.sessionId, dto))
+            ordersService.placeOrder(preferencesRepository.sessionId, dto)
         }
     }
 
     override suspend fun getOrders(): Resource<List<Order>> {
         return call {
-            Resource.Success(ordersService.getOrders(preferencesRepository.sessionId))
+            ordersService.getOrders(preferencesRepository.sessionId)
         }
     }
 
     override suspend fun changePaymentMethod(id: String, method: PaymentMethod): Resource<ApiResponse> {
         return call {
             val dto = ChangePaymentMethodDto(method)
-            val response = ordersService.changePaymentMethod(preferencesRepository.sessionId, id, dto)
-            Resource.Success(response)
+            ordersService.changePaymentMethod(preferencesRepository.sessionId, id, dto)
         }
     }
 
     override suspend fun getOrderById(id: String): Resource<Order> {
         return call {
-            Resource.Success(ordersService.getOrderById(preferencesRepository.sessionId, id))
+            ordersService.getOrderById(preferencesRepository.sessionId, id)
         }
     }
 }
diff --git a/core/src/main/java/com/marknjunge/core/data/repository/PaymentRepository.kt b/core/src/main/java/com/marknjunge/core/data/repository/PaymentRepository.kt
@@ -31,12 +31,7 @@ internal class ApiPaymentsRepository(
 ) : PaymentsRepository {
     override suspend fun requestMpesa(mobileNumber: String, orderId: String): Resource<ApiResponse> {
         return call {
-            Resource.Success(
-                paymentsService.requestMpesa(
-                    preferencesRepository.sessionId,
-                    RequestMpesaDto(mobileNumber, orderId)
-                )
-            )
+            paymentsService.requestMpesa(preferencesRepository.sessionId, RequestMpesaDto(mobileNumber, orderId))
         }
     }
 
@@ -53,21 +48,19 @@ internal class ApiPaymentsRepository(
         billingCountry: String
     ): Resource<ApiResponse> {
         return call {
-            Resource.Success(
-                paymentsService.initiateCardPayment(
-                    preferencesRepository.sessionId,
-                    InitiateCardPaymentDto(
-                        orderId,
-                        cardNo,
-                        cvv,
-                        expiryMonth,
-                        expiryYear,
-                        billingZip,
-                        billingCity,
-                        billingAddress,
-                        billingState,
-                        billingCountry
-                    )
+            paymentsService.initiateCardPayment(
+                preferencesRepository.sessionId,
+                InitiateCardPaymentDto(
+                    orderId,
+                    cardNo,
+                    cvv,
+                    expiryMonth,
+                    expiryYear,
+                    billingZip,
+                    billingCity,
+                    billingAddress,
+                    billingState,
+                    billingCountry
                 )
             )
         }
diff --git a/core/src/main/java/com/marknjunge/core/data/repository/ProductsRepository.kt b/core/src/main/java/com/marknjunge/core/data/repository/ProductsRepository.kt
@@ -12,7 +12,7 @@ interface ProductsRepository {
 internal class ApiProductsRepository(private val apiService: ApiService) : ProductsRepository {
     override suspend fun getProducts(): Resource<List<Product>> {
         return call {
-            Resource.Success(apiService.getProducts())
+            apiService.getProducts()
         }
     }
 }
diff --git a/core/src/main/java/com/marknjunge/core/data/repository/UsersRepository.kt b/core/src/main/java/com/marknjunge/core/data/repository/UsersRepository.kt
@@ -61,8 +61,6 @@ internal class ApiUsersRepository(
                     email = email
                 )
                 preferencesRepository.user = updatedUser
-
-                Resource.Success(Unit)
             }
         }
 
@@ -79,7 +77,7 @@ internal class ApiUsersRepository(
             val addresses = preferencesRepository.user!!.address.toMutableList()
             addresses.add(saveAddress)
             preferencesRepository.user = preferencesRepository.user!!.copy(address = addresses)
-            Resource.Success(saveAddress)
+            saveAddress
         }
     }
 
@@ -89,7 +87,6 @@ internal class ApiUsersRepository(
             val addresses = preferencesRepository.user!!.address.toMutableList()
             addresses.remove(address)
             preferencesRepository.user = preferencesRepository.user!!.copy(address = addresses)
-            Resource.Success(Unit)
         }
     }
 
@@ -99,19 +96,17 @@ internal class ApiUsersRepository(
             usersService.updateFcmToken(preferencesRepository.sessionId, UpdateFcmTokenDto(token))
             val updatedUser = preferencesRepository.user!!.copy(fcmToken = token)
             preferencesRepository.user = updatedUser
-            Resource.Success(Unit)
         }
     }
 
     override suspend fun deleteUser(): Resource<Unit> {
         return call {
-            val res = usersService.deleteUser(preferencesRepository.sessionId)
+            usersService.deleteUser(preferencesRepository.sessionId)
             if (preferencesRepository.user!!.signInMethod == "GOOGLE"){
                 googleSignInClient.signOut()
             }
             preferencesRepository.user = null
             preferencesRepository.sessionId = ""
-            Resource.Success(res)
         }
     }
 
diff --git a/core/src/main/java/com/marknjunge/core/utils/NetworkCall.kt b/core/src/main/java/com/marknjunge/core/utils/NetworkCall.kt
@@ -2,9 +2,9 @@ package com.marknjunge.core.utils
 
 import com.marknjunge.core.data.model.Resource
 
-internal suspend fun <T> call(block: suspend () -> Resource<T>): Resource<T> {
+internal suspend fun <T> call(block: suspend () -> T): Resource<T> {
     return try {
-        block()
+        Resource.Success(block())
     } catch (e: Exception) {
         return parseException(e)
     }

Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,7 @@ import com.marknjunge.core.utils.call`
`9`	`9`	`interface AuthRepository {`
`10`	`10`	`suspend fun signInWithGoogle(idToken: String): Resource<User>`
`11`	`11`
`12`		`- suspend fun signUp(`
`13`		`- firstName: String,`
`14`		`- lastName: String,`
`15`		`- email: String,`
`16`		`- password: String`
`17`		`- ): Resource<User>`
	`12`	`+ suspend fun signUp(firstName: String, lastName: String, email: String, password: String): Resource<User>`
`18`	`13`
`19`	`14`	`suspend fun signIn(email: String, password: String): Resource<User>`
`20`	`15`
`@@ -39,7 +34,7 @@ internal class ApiAuthRepository(`
`39`	`34`	`preferencesRepository.user = response.user`
`40`	`35`	`preferencesRepository.sessionId = response.session.sessionId`
`41`	`36`
`42`		`- Resource.Success(response.user)`
	`37`	`+ response.user`
`43`	`38`	`}`
`44`	`39`	`}`
`45`	`40`
`@@ -56,7 +51,7 @@ internal class ApiAuthRepository(`
`56`	`51`	`preferencesRepository.user = response.user`
`57`	`52`	`preferencesRepository.sessionId = response.session.sessionId`
`58`	`53`
`59`		`- Resource.Success(response.user)`
	`54`	`+ response.user`
`60`	`55`	`}`
`61`	`56`	`}`
`62`	`57`
`@@ -67,7 +62,7 @@ internal class ApiAuthRepository(`
`67`	`62`	`preferencesRepository.user = response.user`
`68`	`63`	`preferencesRepository.sessionId = response.session.sessionId`
`69`	`64`
`70`		`- Resource.Success(response.user)`
	`65`	`+ response.user`
`71`	`66`	`}`
`72`	`67`	`}`
`73`	`68`
`@@ -79,8 +74,6 @@ internal class ApiAuthRepository(`
`79`	`74`	`}`
`80`	`75`	`preferencesRepository.user = null`
`81`	`76`	`preferencesRepository.sessionId = ""`
`82`		`-`
`83`		`- Resource.Success(Unit)`
`84`	`77`	`}`
`85`	`78`	`}`
`86`	`79`
`@@ -91,22 +84,18 @@ internal class ApiAuthRepository(`
`91`	`84`	`}`
`92`	`85`	`preferencesRepository.user = null`
`93`	`86`	`preferencesRepository.sessionId = ""`
`94`		`-`
`95`		`- Resource.Success(Unit)`
`96`	`87`	`}`
`97`	`88`	`}`
`98`	`89`
`99`	`90`	`override suspend fun requestPasswordReset(email: String): Resource<ApiResponse> {`
`100`	`91`	`return call {`
`101`		`- val response = authService.requestPasswordReset(RequestPasswordResetDto(email))`
`102`		`- Resource.Success(response)`
	`92`	`+ authService.requestPasswordReset(RequestPasswordResetDto(email))`
`103`	`93`	`}`
`104`	`94`	`}`
`105`	`95`
`106`	`96`	`override suspend fun resetPassword(token: String, newPassword: String): Resource<ApiResponse> {`
`107`	`97`	`return call {`
`108`		`- val response = authService.resetPassword(ResetPasswordDto(token, newPassword))`
`109`		`- Resource.Success(response)`
	`98`	`+ authService.resetPassword(ResetPasswordDto(token, newPassword))`
`110`	`99`	`}`
`111`	`100`	`}`
`112`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ internal class ApiCartRepository(`
`17`	`17`	`) : CartRepository {`
`18`	`18`	`override suspend fun verifyOrder(dto: VerifyOrderDto): Resource<List<VerifyOrderResponse>> {`
`19`	`19`	`return call {`
`20`		`- Resource.Success(cartService.verifyCart(preferencesRepository.sessionId, dto))`
	`20`	`+ cartService.verifyCart(preferencesRepository.sessionId, dto)`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,27 +21,26 @@ internal class ApiOrdersRepository(`
`21`	`21`	`) : OrdersRepository {`
`22`	`22`	`override suspend fun placeOrder(dto: PlaceOrderDto): Resource<Order> {`
`23`	`23`	`return call {`
`24`		`- Resource.Success(ordersService.placeOrder(preferencesRepository.sessionId, dto))`
	`24`	`+ ordersService.placeOrder(preferencesRepository.sessionId, dto)`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`override suspend fun getOrders(): Resource<List<Order>> {`
`29`	`29`	`return call {`
`30`		`- Resource.Success(ordersService.getOrders(preferencesRepository.sessionId))`
	`30`	`+ ordersService.getOrders(preferencesRepository.sessionId)`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`override suspend fun changePaymentMethod(id: String, method: PaymentMethod): Resource<ApiResponse> {`
`35`	`35`	`return call {`
`36`	`36`	`val dto = ChangePaymentMethodDto(method)`
`37`		`- val response = ordersService.changePaymentMethod(preferencesRepository.sessionId, id, dto)`
`38`		`- Resource.Success(response)`
	`37`	`+ ordersService.changePaymentMethod(preferencesRepository.sessionId, id, dto)`
`39`	`38`	`}`
`40`	`39`	`}`
`41`	`40`
`42`	`41`	`override suspend fun getOrderById(id: String): Resource<Order> {`
`43`	`42`	`return call {`
`44`		`- Resource.Success(ordersService.getOrderById(preferencesRepository.sessionId, id))`
	`43`	`+ ordersService.getOrderById(preferencesRepository.sessionId, id)`
`45`	`44`	`}`
`46`	`45`	`}`
`47`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ interface ProductsRepository {`
`12`	`12`	`internal class ApiProductsRepository(private val apiService: ApiService) : ProductsRepository {`
`13`	`13`	`override suspend fun getProducts(): Resource<List<Product>> {`
`14`	`14`	`return call {`
`15`		`- Resource.Success(apiService.getProducts())`
	`15`	`+ apiService.getProducts()`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,6 @@ internal class ApiUsersRepository(`
`61`	`61`	`email = email`
`62`	`62`	`)`
`63`	`63`	`preferencesRepository.user = updatedUser`
`64`		`-`
`65`		`- Resource.Success(Unit)`
`66`	`64`	`}`
`67`	`65`	`}`
`68`	`66`
`@@ -79,7 +77,7 @@ internal class ApiUsersRepository(`
`79`	`77`	`val addresses = preferencesRepository.user!!.address.toMutableList()`
`80`	`78`	`addresses.add(saveAddress)`
`81`	`79`	`preferencesRepository.user = preferencesRepository.user!!.copy(address = addresses)`
`82`		`- Resource.Success(saveAddress)`
	`80`	`+ saveAddress`
`83`	`81`	`}`
`84`	`82`	`}`
`85`	`83`
`@@ -89,7 +87,6 @@ internal class ApiUsersRepository(`
`89`	`87`	`val addresses = preferencesRepository.user!!.address.toMutableList()`
`90`	`88`	`addresses.remove(address)`
`91`	`89`	`preferencesRepository.user = preferencesRepository.user!!.copy(address = addresses)`
`92`		`- Resource.Success(Unit)`
`93`	`90`	`}`
`94`	`91`	`}`
`95`	`92`
`@@ -99,19 +96,17 @@ internal class ApiUsersRepository(`
`99`	`96`	`usersService.updateFcmToken(preferencesRepository.sessionId, UpdateFcmTokenDto(token))`
`100`	`97`	`val updatedUser = preferencesRepository.user!!.copy(fcmToken = token)`
`101`	`98`	`preferencesRepository.user = updatedUser`
`102`		`- Resource.Success(Unit)`
`103`	`99`	`}`
`104`	`100`	`}`
`105`	`101`
`106`	`102`	`override suspend fun deleteUser(): Resource<Unit> {`
`107`	`103`	`return call {`
`108`		`- val res = usersService.deleteUser(preferencesRepository.sessionId)`
	`104`	`+ usersService.deleteUser(preferencesRepository.sessionId)`
`109`	`105`	`if (preferencesRepository.user!!.signInMethod == "GOOGLE"){`
`110`	`106`	`googleSignInClient.signOut()`
`111`	`107`	`}`
`112`	`108`	`preferencesRepository.user = null`
`113`	`109`	`preferencesRepository.sessionId = ""`
`114`		`- Resource.Success(res)`
`115`	`110`	`}`
`116`	`111`	`}`
`117`	`112`