-
Notifications
You must be signed in to change notification settings - Fork 131
[Shipping labels] Add endpoint to fetch shipments #13995
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
irfano
wants to merge
14
commits into
trunk
Choose a base branch
from
issue/WOOMOB-416-split-shipment-config-endpoint
base: trunk
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+213
−15
Open
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
29c3069
Add the ability to fetch shipping label config data
irfano 2ed0b18
Add fetchConfig function to WooShippingLabelRepository
irfano 5127f43
Add DTO models for config endpoint
irfano 60bb867
Add WooShipping config datastore
irfano 9b6354c
Fetch shipping config when order details are loaded
irfano 95d0267
Fetch shipments in GetShippableItems class
irfano d5e02aa
Fix OrderDetailViewModelTest
irfano 53fee3e
Fix GetShippableItemsTests
irfano e2e8ea1
Fix OrderDetailsTransactionLauncherTest
irfano f063bc4
Test fetching shipping config in order detail view model
irfano 911bfbb
Rename WooShippingConfigurationDataStore to WooShippingStoreOptionsDa…
irfano 3101cd0
Rename SHIPPING_CONFIG to SHIPPING_LABEL_CONFIG
irfano 753c079
Fix detekt errors
irfano 1053e9e
Add a mock response for the config endpoint
irfano File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
49 changes: 49 additions & 0 deletions
49
...merce/src/androidTest/assets/mocks/mappings/jetpack-blogs/wc/orders/2201/2201_config.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| { | ||
| "request": { | ||
| "method": "GET", | ||
| "urlPathPattern": "/rest/v1.1/jetpack-blogs/161477129/rest-api/", | ||
| "queryParameters": { | ||
| "json": { | ||
| "equalTo": "true" | ||
| }, | ||
| "path": { | ||
| "matches": "/wcshipping/v1/config/label-purchase/2201(.*)" | ||
| }, | ||
| "locale": { | ||
| "matches": "(.*)" | ||
| } | ||
| } | ||
| }, | ||
| "response": { | ||
| "status": 200, | ||
| "jsonBody": { | ||
| "success": true, | ||
| "config": { | ||
| "order": {}, | ||
| "accountSettings": {}, | ||
| "packagesSettings": { | ||
| "schema": { | ||
| "custom": {}, | ||
| "predefined": {} | ||
| }, | ||
| "packages": { | ||
| "custom": {}, | ||
| "predefined": {} | ||
| } | ||
| }, | ||
| "shippingLabelData": {}, | ||
| "continents": {}, | ||
| "eu_countries": {}, | ||
| "items": {}, | ||
| "is_destination_verified": {}, | ||
| "is_origin_verified": {}, | ||
| "shipments": {}, | ||
| "origin_addresses": {} | ||
| } | ||
| }, | ||
| "headers": { | ||
| "Content-Type": "application/json", | ||
| "Connection": "keep-alive" | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...rc/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/ObserveStoreOptions.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
.../woocommerce/android/ui/orders/wooshippinglabels/datasource/WooShippingConfigDataStore.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| package com.woocommerce.android.ui.orders.wooshippinglabels.datasource | ||
|
|
||
| import androidx.datastore.core.DataStore | ||
| import androidx.datastore.preferences.core.Preferences | ||
| import androidx.datastore.preferences.core.edit | ||
| import androidx.datastore.preferences.core.stringPreferencesKey | ||
| import com.google.gson.Gson | ||
| import com.woocommerce.android.datastore.DataStoreQualifier | ||
| import com.woocommerce.android.datastore.DataStoreType | ||
| import com.woocommerce.android.tools.SelectedSite | ||
| import com.woocommerce.android.ui.orders.wooshippinglabels.networking.ConfigDTO | ||
| import kotlinx.coroutines.flow.Flow | ||
| import kotlinx.coroutines.flow.map | ||
| import javax.inject.Inject | ||
|
|
||
| class WooShippingConfigDataStore @Inject constructor( | ||
| @DataStoreQualifier(DataStoreType.SHIPPING_LABEL_CONFIG) private val dataStore: DataStore<Preferences>, | ||
| private val gson: Gson, | ||
| private val selectedSite: SelectedSite | ||
| ) { | ||
| private fun getConfigKey(orderId: Long) = "${selectedSite.getOrNull()?.siteId ?: ""}:${orderId}Config" | ||
|
|
||
| fun observeConfig(orderId: Long): Flow<ConfigDTO?> = dataStore.data.map { prefs -> | ||
| val config = prefs[stringPreferencesKey(getConfigKey(orderId))] | ||
| runCatching { gson.fromJson(config, ConfigDTO::class.java) }.getOrNull() | ||
| } | ||
|
|
||
| suspend fun saveConfig(orderId: Long, config: ConfigDTO) { | ||
| dataStore.edit { preferences -> | ||
| preferences[stringPreferencesKey(getConfigKey(orderId))] = gson.toJson(config) | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can test the output of this PR by debugging this
shipment.