Skip to content
This repository has been archived by the owner on Feb 4, 2025. It is now read-only.

Allow passing a "source type" when creating Woo Orders. #2964

Merged
merged 3 commits into from
Mar 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -556,7 +556,8 @@ class WooOrdersFragment : StoreSelectingFragment(), WCAddOrderShipmentTrackingDi
shippingAddress = shippingAddress,
billingAddress = billingAddress,
customerNote = customerNote
)
),
attributionSourceType = "fluxc-example-app"
)
if (result.isError) {
prependToLog("Order creation failed, error ${result.error.type} ${result.error.message}")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import org.wordpress.android.fluxc.generated.endpoint.WOOCOMMERCE
import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
import org.wordpress.android.fluxc.model.OrderEntity
import org.wordpress.android.fluxc.model.SiteModel
import org.wordpress.android.fluxc.model.WCMetaData.OrderAttributionInfoKeys
import org.wordpress.android.fluxc.model.WCOrderListDescriptor
import org.wordpress.android.fluxc.model.WCOrderShipmentProviderModel
import org.wordpress.android.fluxc.model.WCOrderShipmentTrackingModel
Expand Down Expand Up @@ -786,10 +787,22 @@ class OrderRestClient @Inject constructor(

suspend fun createOrder(
site: SiteModel,
request: UpdateOrderRequest
request: UpdateOrderRequest,
attributionSourceType: String?
): WooPayload<OrderEntity> {
val url = WOOCOMMERCE.orders.pathV3
val body = request.toNetworkRequest()
val metaData = mapOf(
"meta_data" to listOfNotNull(
attributionSourceType?.let {
mapOf(
"key" to OrderAttributionInfoKeys.SOURCE_TYPE,
"value" to attributionSourceType
)
}
)
)

val body = request.toNetworkRequest() + metaData

val response = wooNetwork.executePostGsonRequest(
site = site,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,13 @@ class OrderUpdateStore @Inject internal constructor(
}
}

suspend fun createOrder(site: SiteModel, createOrderRequest: UpdateOrderRequest): WooResult<OrderEntity> {
suspend fun createOrder(
site: SiteModel,
createOrderRequest: UpdateOrderRequest,
attributionSourceType: String? = null
): WooResult<OrderEntity> {
return coroutineEngine.withDefaultContext(T.API, this, "createOrder") {
val result = wcOrderRestClient.createOrder(site, createOrderRequest)
val result = wcOrderRestClient.createOrder(site, createOrderRequest, attributionSourceType)

return@withDefaultContext if (result.isError) {
WooResult(result.error)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import kotlinx.coroutines.test.TestCoroutineScope
import org.assertj.core.api.Assertions.assertThat
import org.junit.Test
import org.mockito.kotlin.any
import org.mockito.kotlin.anyOrNull
import org.mockito.kotlin.argThat
import org.mockito.kotlin.doReturn
import org.mockito.kotlin.mock
Expand Down Expand Up @@ -424,7 +425,7 @@ class OrderUpdateStoreTest {
setUp {
orderRestClient = mock {
onBlocking {
createOrder(any(), any())
createOrder(any(), any(), anyOrNull())
}.doReturn(
WooPayload(newOrder)
)
Expand Down
Loading