[Woo POS][non-simple products] Integrate "include_types" parameter for product endpoint #13072

AnirudhBhat · 2024-12-05T05:40:24Z

NOTE: This PR depends on this fluxc PR. Please review and merge that before merging this one. Also, please ensure to update the fluxc version after merging the fluxc PR.

⚠️ Don't merge until the base branch is not merged into trunk.

Description

This PR integrates include_types parameter for the product endpoint. This parameter helps especially in POS to include only product types that are compatible. Right now, we have enabled just Simple product types for POS.

With this integration, include_types takes precedence over the type param when both are present.

Here's the backend PR for more context: woocommerce/woocommerce#52994

This PR also removes non-simple products feature flag as it is no longer required since we can control via the API the type of product we display in POS.

Testing information

Ensure you have installed the latest Woocommerce nightly build in your store
Navigate to the products tab and ensure you see all the products
Open network inspection tab in Android studio and ensure the network call has include_types=
Navigate to the POS (More menu -> POS)
Ensure you see only simple products
Open network inspection tab in Android studio and ensure the network call has include_types=simple

The tests that have been performed

Ensured only simple products are displayed on POS mode and all products in store management mode.

Images/gif

api_changes.mp4

I have considered if this change warrants release notes and have added them to RELEASE-NOTES.txt if necessary. Use the "[Internal]" label for non-user-facing changes.

Reviewer (or Author, in the case of optional code reviews):

Please make sure these conditions are met before approving the PR, or request changes if the PR needs improvement:

The PR is small and has a clear, single focus, or a valid explanation is provided in the description. If needed, please request to split it into smaller PRs.
Ensure Adequate Unit Test Coverage: The changes are reasonably covered by unit tests or an explanation is provided in the PR description.
Manual Testing: The author listed all the tests they ran, including smoke tests when needed (e.g., for refactorings). The reviewer confirmed that the PR works as expected on big (tablet) and small (phone) in case of UI changes, and no regressions are added.

…ue/13061-integrate-api-change

wpmobilebot · 2024-12-05T05:44:20Z

Project dependencies changes

The following changes in project dependencies were detected (configuration vanillaReleaseRuntimeClasspath):

list

Upgraded Dependencies
org.wordpress.fluxc.plugins:woocommerce:trunk-7cb493915ef7e0ee6eff1a4ca3b9872e178ee73e, (changed from trunk-d9a3dcb6ea775cb2822aaecfa52e49d6d4b00e9b)
org.wordpress.fluxc:fluxc-annotations:trunk-7cb493915ef7e0ee6eff1a4ca3b9872e178ee73e, (changed from trunk-d9a3dcb6ea775cb2822aaecfa52e49d6d4b00e9b)
org.wordpress:fluxc:trunk-7cb493915ef7e0ee6eff1a4ca3b9872e178ee73e, (changed from trunk-d9a3dcb6ea775cb2822aaecfa52e49d6d4b00e9b)

tree

-+--- org.wordpress:fluxc:trunk-d9a3dcb6ea775cb2822aaecfa52e49d6d4b00e9b
-|    +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.25 -> 2.0.21
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:2.0.21 (*)
-|    |    \--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.21
-|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:2.0.21 (*)
-|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6
-|    |    \--- androidx.annotation:annotation:1.2.0 -> 1.8.1 (*)
-|    +--- androidx.security:security-crypto:1.0.0 -> 1.1.0-alpha03
-|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.1 (*)
-|    |    +--- com.google.crypto.tink:tink-android:1.5.0
-|    |    \--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
-|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0
-|    |    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
-|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 -> 1.9.10 (*)
-|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-|    +--- org.apache.commons:commons-text:1.10.0 (*)
-|    +--- androidx.room:room-runtime:2.6.1 (*)
-|    +--- androidx.room:room-ktx:2.6.1
-|    |    +--- androidx.room:room-common:2.6.1 (*)
-|    |    +--- androidx.room:room-runtime:2.6.1 (*)
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.21 (*)
-|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 -> 1.8.1 (*)
-|    |    +--- androidx.room:room-common:2.6.1 (c)
-|    |    \--- androidx.room:room-runtime:2.6.1 (c)
-|    +--- com.google.dagger:dagger:2.51.1
-|    |    \--- javax.inject:javax.inject:1
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
-|    +--- org.wordpress:wellsql:2.0.0
-|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.1 (*)
-|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
-|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-d9a3dcb6ea775cb2822aaecfa52e49d6d4b00e9b
-|    +--- org.greenrobot:eventbus:3.3.1 (*)
-|    +--- org.greenrobot:eventbus-java:3.3.1
-|    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
-|    +--- com.android.volley:volley:1.1.1 -> 1.2.0
-|    +--- androidx.paging:paging-runtime:2.1.2
-|    |    +--- androidx.paging:paging-common:2.1.2
-|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.8.1 (*)
-|    |    |    \--- androidx.arch.core:core-common:2.0.0 -> 2.2.0 (*)
-|    |    +--- androidx.arch.core:core-runtime:2.0.0 -> 2.2.0 (*)
-|    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.8.7 (*)
-|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.8.7 (*)
-|    |    \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.2 (*)
-|    +--- com.goterl:lazysodium-android:5.0.2
-|    +--- net.java.dev.jna:jna:5.5.0
-|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 -> 2.0.21 (*)
++--- org.wordpress:fluxc:trunk-7cb493915ef7e0ee6eff1a4ca3b9872e178ee73e
+|    +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.25 -> 2.0.21
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:2.0.21 (*)
+|    |    \--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.21
+|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:2.0.21 (*)
+|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6
+|    |    \--- androidx.annotation:annotation:1.2.0 -> 1.8.1 (*)
+|    +--- androidx.security:security-crypto:1.0.0 -> 1.1.0-alpha03
+|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.1 (*)
+|    |    +--- com.google.crypto.tink:tink-android:1.5.0
+|    |    \--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
+|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0
+|    |    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 -> 1.9.10 (*)
+|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
+|    +--- org.apache.commons:commons-text:1.10.0 (*)
+|    +--- androidx.room:room-runtime:2.6.1 (*)
+|    +--- androidx.room:room-ktx:2.6.1
+|    |    +--- androidx.room:room-common:2.6.1 (*)
+|    |    +--- androidx.room:room-runtime:2.6.1 (*)
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 2.0.21 (*)
+|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 -> 1.8.1 (*)
+|    |    +--- androidx.room:room-common:2.6.1 (c)
+|    |    \--- androidx.room:room-runtime:2.6.1 (c)
+|    +--- com.google.dagger:dagger:2.51.1
+|    |    \--- javax.inject:javax.inject:1
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
+|    +--- org.wordpress:wellsql:2.0.0
+|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.1 (*)
+|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
+|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-7cb493915ef7e0ee6eff1a4ca3b9872e178ee73e
+|    +--- org.greenrobot:eventbus:3.3.1 (*)
+|    +--- org.greenrobot:eventbus-java:3.3.1
+|    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
+|    +--- com.android.volley:volley:1.1.1 -> 1.2.0
+|    +--- androidx.paging:paging-runtime:2.1.2
+|    |    +--- androidx.paging:paging-common:2.1.2
+|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.8.1 (*)
+|    |    |    \--- androidx.arch.core:core-common:2.0.0 -> 2.2.0 (*)
+|    |    +--- androidx.arch.core:core-runtime:2.0.0 -> 2.2.0 (*)
+|    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.8.7 (*)
+|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.8.7 (*)
+|    |    \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.2 (*)
+|    +--- com.goterl:lazysodium-android:5.0.2
+|    +--- net.java.dev.jna:jna:5.5.0
+|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 -> 2.0.21 (*)
-\--- org.wordpress.fluxc.plugins:woocommerce:trunk-d9a3dcb6ea775cb2822aaecfa52e49d6d4b00e9b
-     +--- org.wordpress:fluxc:trunk-d9a3dcb6ea775cb2822aaecfa52e49d6d4b00e9b (*)
-     +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-     +--- com.google.dagger:dagger:2.51.1 (*)
-     +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
-     +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
-     +--- androidx.room:room-runtime:2.6.1 (*)
-     +--- org.wordpress:wellsql:2.0.0 (*)
-     +--- org.wordpress.fluxc:fluxc-annotations:trunk-d9a3dcb6ea775cb2822aaecfa52e49d6d4b00e9b
-     +--- androidx.room:room-ktx:2.6.1 (*)
-     \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 -> 2.0.21 (*)
+\--- org.wordpress.fluxc.plugins:woocommerce:trunk-7cb493915ef7e0ee6eff1a4ca3b9872e178ee73e
+     +--- org.wordpress:fluxc:trunk-7cb493915ef7e0ee6eff1a4ca3b9872e178ee73e (*)
+     +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
+     +--- com.google.dagger:dagger:2.51.1 (*)
+     +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
+     +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
+     +--- androidx.room:room-runtime:2.6.1 (*)
+     +--- org.wordpress:wellsql:2.0.0 (*)
+     +--- org.wordpress.fluxc:fluxc-annotations:trunk-7cb493915ef7e0ee6eff1a4ca3b9872e178ee73e
+     +--- androidx.room:room-ktx:2.6.1 (*)
+     \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 -> 2.0.21 (*)

wpmobilebot · 2024-12-05T05:47:26Z

📲 You can test the changes from this Pull Request in WooCommerce-Wear Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce-Wear Android
	Platform	⌚️ Wear OS
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`7f911b1`
	Direct Download	`woocommerce-wear-prototype-build-pr13072-7f911b1.apk`

wpmobilebot · 2024-12-05T05:57:52Z

📲 You can test the changes from this Pull Request in WooCommerce Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce Android
	Platform	📱 Mobile
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`7f911b1`
	Direct Download	`woocommerce-prototype-build-pr13072-7f911b1.apk`

codecov-commenter · 2024-12-05T07:28:08Z

Codecov Report

Attention: Patch coverage is 58.82353% with 7 lines in your changes missing coverage. Please review.

Project coverage is 40.36%. Comparing base (83b55b4) to head (7f911b1).
Report is 10 commits behind head on trunk.

Files with missing lines	Patch %	Lines
...android/ui/products/selector/ProductListHandler.kt	66.66%	0 Missing and 4 partials ⚠️
.../android/ui/products/list/ProductListRepository.kt	0.00%	2 Missing ⚠️
.../ui/products/selector/ProductSelectorRepository.kt	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##              trunk   #13072   +/-   ##
=========================================
  Coverage     40.36%   40.36%           
  Complexity     6197     6197           
=========================================
  Files          1296     1295    -1     
  Lines         74756    74760    +4     
  Branches      10239    10240    +1     
=========================================
+ Hits          30178    30180    +2     
  Misses        41954    41954           
- Partials       2624     2626    +2

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

samiuelson

LGTM

…ue/13061-integrate-api-change # Conflicts: # gradle/libs.versions.toml

AnirudhBhat added 5 commits December 5, 2024 10:08

Integrate include_types parameter for the products endpoint

783eaf6

Just include simple type for now

9e277ea

Remove feature flag

a2525fa

Merge branch 'refs/heads/issue/12967-retry-pagination-error' into iss…

c763e5a

…ue/13061-integrate-api-change

Update fluxc hash

7c1cbbd

AnirudhBhat added type: task An internally driven task. feature: point of sale POS project labels Dec 5, 2024

AnirudhBhat added this to the 21.3 milestone Dec 5, 2024

AnirudhBhat changed the base branch from trunk to issue/12967-retry-pagination-error December 5, 2024 05:40

AnirudhBhat mentioned this pull request Dec 5, 2024

[Woo POS][non-simple products] Integrate include_types parameter for products endpoint wordpress-mobile/WordPress-FluxC-Android#3117

Merged

AnirudhBhat requested a review from samiuelson December 5, 2024 05:44

AnirudhBhat marked this pull request as ready for review December 5, 2024 05:44

Make test pass

727c9e7

samiuelson self-assigned this Dec 6, 2024

samiuelson approved these changes Dec 10, 2024

View reviewed changes

AnirudhBhat added 2 commits December 12, 2024 14:32

Update fluxc hash

70a3a1a

Merge branch 'refs/heads/issue/12967-retry-pagination-error' into iss…

7f911b1

…ue/13061-integrate-api-change # Conflicts: # gradle/libs.versions.toml

Base automatically changed from issue/12967-retry-pagination-error to trunk December 12, 2024 09:14

AnirudhBhat enabled auto-merge December 12, 2024 09:16

AnirudhBhat merged commit df6be4c into trunk Dec 12, 2024
16 checks passed

AnirudhBhat deleted the issue/13061-integrate-api-change branch December 12, 2024 09:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Woo POS][non-simple products] Integrate "include_types" parameter for product endpoint #13072

[Woo POS][non-simple products] Integrate "include_types" parameter for product endpoint #13072

AnirudhBhat commented Dec 5, 2024 •

edited

Loading

wpmobilebot commented Dec 5, 2024 •

edited

Loading

wpmobilebot commented Dec 5, 2024 •

edited

Loading

wpmobilebot commented Dec 5, 2024 •

edited

Loading

codecov-commenter commented Dec 5, 2024 •

edited

Loading

samiuelson left a comment

[Woo POS][non-simple products] Integrate "include_types" parameter for product endpoint #13072

[Woo POS][non-simple products] Integrate "include_types" parameter for product endpoint #13072

Conversation

AnirudhBhat commented Dec 5, 2024 • edited Loading

NOTE: This PR depends on this fluxc PR. Please review and merge that before merging this one. Also, please ensure to update the fluxc version after merging the fluxc PR.

Description

Testing information

The tests that have been performed

Images/gif

Reviewer (or Author, in the case of optional code reviews):

wpmobilebot commented Dec 5, 2024 • edited Loading

Project dependencies changes

wpmobilebot commented Dec 5, 2024 • edited Loading

wpmobilebot commented Dec 5, 2024 • edited Loading

codecov-commenter commented Dec 5, 2024 • edited Loading

Codecov Report

samiuelson left a comment

Choose a reason for hiding this comment

AnirudhBhat commented Dec 5, 2024 •

edited

Loading

wpmobilebot commented Dec 5, 2024 •

edited

Loading

wpmobilebot commented Dec 5, 2024 •

edited

Loading

wpmobilebot commented Dec 5, 2024 •

edited

Loading

codecov-commenter commented Dec 5, 2024 •

edited

Loading