[Min/Max Quantities Editing Support] Networking & Model #11611

toupper · 2024-05-29T12:44:47Z

⚠️ This PR depends on wordpress-mobile/WordPress-FluxC-Android#3022

Description

With this PR we add support for the new REST API additions on the Min/Max Quantities extension. The changes are mostly in the model: the only user-facing change is that now quantity rules in variations need to override the parent product rules to display the rules entry, otherwise they're hidden. With this we reach parity with iOS.

Testing instructions

[Videos are recorded on iOS, but they're applicable to Android]

Products

Store without the Min/Max Quantities plugin installed. We don't show the Min/Max Quantities row in product details:

Go to a store without the Min/Max Quantities installed.
Open the app, and go to the products tab.
Tap on any product.
You don't see any row about the Min/Max Quantities:

Store with the Min/Max Quantities plugin installed but a product with no rules. We don't show the Min/Max Quantities row in product details:

Go to a store without the Min/Max Quantities installed.
Open the app, and go to the products tab.
Tap on any product.
You don't see any row about the Min/Max Quantities:

Store with the Min/Max Quantities plugin installed and a product with rules. We show the Min/Max Quantities row in product details and allow navigation:

Go to a store without the Min/Max Quantities installed.
Open the app, and go to the products tab.
Tap on any product.
You don't see the row about the Min/Max Quantities. Tap on that.
You navigate to the Min/Max Quantities detail.

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-05-13.at.12.49.05.mp4

Product Variations

Store without the Min/Max Quantities plugin installed. We don't show the Min/Max Quantities row in product variation details:

Go to a store without the Min/Max Quantities installed.
Open the app, and go to the products tab.
Tap on any product with variations.
Tap on any variation,
You don't see any row about the Min/Max Quantities:

Store with the Min/Max Quantities plugin installed but a variation with no rules. We don't show the Min/Max Quantities row in product details:

Go to a store with the Min/Max Quantities installed.
Open the app, and go to the products tab.
Tap on any product with variations.
Tap on any variation,
You don't see any row about the Min/Max Quantities (same as GIF above)

Store with the Min/Max Quantities plugin installed, a variation with rules, but the parent product disables quantity rules for variations. We don't show the Min/Max Quantities row in product details:

Go to a store with the Min/Max Quantities installed.
Open the app, and go to the products tab.
Tap on any product with variations. The product should check combine variation in the Quantity Rules section in wp-admin.
Tap on the variation with rules.
You don't see any row about the Min/Max Quantities (same as GIF above)

Store with the Min/Max Quantities plugin installed, a variation with rules, and the parent product enables quantity rules for variations. We show the Min/Max Quantities row in product details:

Images/gif

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.

… them any longer.

atorresveiga

Great work @toupper!
Thanks for the detailed test cases description, it help me to ensure that everything was working as expected.

LGTM!

atorresveiga · 2024-06-05T14:11:37Z

Before merging it, please note that detekt is failing

…odel # Conflicts: # build.gradle

wpmobilebot · 2024-06-17T09:34:38Z

Found 1 violations:

The PR caused the following dependency changes:

expand

-+--- org.wordpress:fluxc:2.85.0
-|    +--- org.wordpress:wellsql:2.0.0
-|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.7.0 (*)
-|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
-|    +--- org.wordpress.fluxc:fluxc-annotations:2.85.0
-|    +--- org.greenrobot:eventbus: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.7.0 (*)
-|    |    |    \--- 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.6.2 (*)
-|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.6.2 (*)
-|    |    \--- 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-jdk8:1.6.20 -> 1.9.10 (*)
-|    +--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.20 -> 1.9.22
-|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 (*)
-|    +--- androidx.appcompat:appcompat:1.0.2 -> 1.6.1 (*)
-|    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.2 (*)
-|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6
-|    |    \--- androidx.annotation:annotation:1.2.0 -> 1.7.0 (*)
-|    +--- androidx.security:security-crypto:1.0.0 -> 1.1.0-alpha03
-|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.0 (*)
-|    |    +--- 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.4.2 -> 2.5.2 (*)
-|    +--- androidx.room:room-ktx:2.4.2 -> 2.5.2
-|    |    +--- androidx.room:room-common:2.5.2 (*)
-|    |    +--- androidx.room:room-runtime:2.5.2 (*)
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.22 (*)
-|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.7.3 (*)
-|    +--- com.google.dagger:dagger:2.42 -> 2.50
-|    |    \--- javax.inject:javax.inject:1
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.7.3 (*)
-|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.7.3 (*)
++--- org.wordpress:fluxc:trunk-133baec149a2d4f4f947667b7f489f01a811da94
+|    +--- org.wordpress:wellsql:2.0.0
+|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.7.0 (*)
+|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
+|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-133baec149a2d4f4f947667b7f489f01a811da94
+|    +--- org.greenrobot:eventbus: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.7.0 (*)
+|    |    |    \--- 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.6.2 (*)
+|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.6.2 (*)
+|    |    \--- 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-jdk8:1.6.20 -> 1.9.10 (*)
+|    +--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.20 -> 1.9.22
+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 (*)
+|    +--- androidx.appcompat:appcompat:1.0.2 -> 1.6.1 (*)
+|    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.2 (*)
+|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6
+|    |    \--- androidx.annotation:annotation:1.2.0 -> 1.7.0 (*)
+|    +--- androidx.security:security-crypto:1.0.0 -> 1.1.0-alpha03
+|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.0 (*)
+|    |    +--- 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.4.2 -> 2.5.2 (*)
+|    +--- androidx.room:room-ktx:2.4.2 -> 2.5.2
+|    |    +--- androidx.room:room-common:2.5.2 (*)
+|    |    +--- androidx.room:room-runtime:2.5.2 (*)
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.22 (*)
+|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.7.3 (*)
+|    +--- com.google.dagger:dagger:2.42 -> 2.50
+|    |    \--- javax.inject:javax.inject:1
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.7.3 (*)
+|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.7.3 (*)
-\--- org.wordpress.fluxc.plugins:woocommerce:2.85.0
-     +--- org.wordpress:wellsql:2.0.0 (*)
-     +--- org.wordpress.fluxc:fluxc-annotations:2.85.0
-     +--- androidx.room:room-ktx:2.4.2 -> 2.5.2 (*)
-     +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 -> 1.9.10 (*)
-     +--- org.wordpress:fluxc:2.85.0 (*)
-     +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-     +--- com.google.dagger:dagger:2.42 -> 2.50 (*)
-     +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.7.3 (*)
-     +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.7.3 (*)
-     \--- androidx.room:room-runtime:2.4.2 -> 2.5.2 (*)
+\--- org.wordpress.fluxc.plugins:woocommerce:trunk-133baec149a2d4f4f947667b7f489f01a811da94
+     +--- org.wordpress:wellsql:2.0.0 (*)
+     +--- org.wordpress.fluxc:fluxc-annotations:trunk-133baec149a2d4f4f947667b7f489f01a811da94
+     +--- androidx.room:room-ktx:2.4.2 -> 2.5.2 (*)
+     +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 -> 1.9.10 (*)
+     +--- org.wordpress:fluxc:trunk-133baec149a2d4f4f947667b7f489f01a811da94 (*)
+     +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
+     +--- com.google.dagger:dagger:2.42 -> 2.50 (*)
+     +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.7.3 (*)
+     +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.7.3 (*)
+     \--- androidx.room:room-runtime:2.4.2 -> 2.5.2 (*)

Please review and act accordingly

wpmobilebot · 2024-06-17T10:21:43Z

📲 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
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`0899bc5`
	Direct Download	`woocommerce-prototype-build-pr11611-0899bc5.apk`

codecov-commenter · 2024-06-17T10:36:11Z

Codecov Report

Attention: Patch coverage is 33.33333% with 80 lines in your changes missing coverage. Please review.

Project coverage is 40.25%. Comparing base (56719db) to head (0899bc5).

Files	Patch %	Lines
...erce/android/model/SubscriptionProductVariation.kt	0.00%	39 Missing ⚠️
.../com/woocommerce/android/model/ProductVariation.kt	55.17%	4 Missing and 9 partials ⚠️
...in/kotlin/com/woocommerce/android/model/Product.kt	55.55%	4 Missing and 8 partials ⚠️
...i/products/variations/VariationDetailRepository.kt	0.00%	7 Missing ⚠️
...oid/ui/products/details/ProductDetailRepository.kt	0.00%	6 Missing ⚠️
...cts/variations/GetProductVariationQuantityRules.kt	62.50%	0 Missing and 3 partials ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##              trunk   #11611      +/-   ##
============================================
- Coverage     40.28%   40.25%   -0.04%     
+ Complexity     5333     5329       -4     
============================================
  Files          1133     1132       -1     
  Lines         65148    65214      +66     
  Branches       9006     9042      +36     
============================================
+ Hits          26243    26250       +7     
- Misses        36504    36549      +45     
- Partials       2401     2415      +14

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

toupper added 6 commits May 27, 2024 15:42

Adapt repository to new REST API

f19b355

Adapt also variation repository

d68f050

Add model properties

91dd271

Update logic for showing quantity rules for variations

9a524a6

Remove metadata references for quantity rules, as we won't be needing…

9b4577a

… them any longer.

Adapt Unit tests to new implementation

d100a70

toupper added feature: product details Related to adding or editing products, includes product settings. category: woo extensions Related to WC extensions or plugins. labels May 29, 2024

toupper added this to the 19.0 milestone May 29, 2024

toupper requested a review from atorresveiga May 29, 2024 12:44

toupper mentioned this pull request May 29, 2024

[Woo Min/Max Quantities] Add Support to New REST API wordpress-mobile/WordPress-FluxC-Android#3022

Merged

toupper changed the title ~~Issue/11590 min max quantities networking model~~ [Min/Max Quantities Editing Support] Networking & Model May 29, 2024

Fix typos

722d472

atorresveiga approved these changes Jun 5, 2024

View reviewed changes

Fix typo

a593981

JorgeMucientes modified the milestones: 19.0, 19.1 Jun 7, 2024

toupper modified the milestones: 19.1, 19.2 Jun 14, 2024

toupper closed this in wordpress-mobile/WordPress-FluxC-Android#3022 Jun 17, 2024

toupper reopened this Jun 17, 2024

toupper added 4 commits June 17, 2024 10:37

Fix detekt issues

8e6baaf

Update Flux-C version

999f8d7

Merge branch 'trunk' into issue/11590-min-max-quantities-networking-m…

170ab24

…odel # Conflicts: # build.gradle

Remove unused import

6f329ff

toupper added 2 commits June 17, 2024 11:42

Remove unnecessary import

261949d

Fix detekt issues (CyclomaticComplexMethod)

0899bc5

toupper merged commit 7028982 into trunk Jun 17, 2024
14 checks passed

toupper deleted the issue/11590-min-max-quantities-networking-model branch June 17, 2024 10:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[Min/Max Quantities Editing Support] Networking & Model #11611

[Min/Max Quantities Editing Support] Networking & Model #11611

Uh oh!

toupper commented May 29, 2024 •

edited

Loading

Uh oh!

atorresveiga left a comment

Uh oh!

atorresveiga commented Jun 5, 2024

Uh oh!

wpmobilebot commented Jun 17, 2024

Uh oh!

wpmobilebot commented Jun 17, 2024

Uh oh!

codecov-commenter commented Jun 17, 2024

Uh oh!

Uh oh!

Uh oh!

[Min/Max Quantities Editing Support] Networking & Model #11611

[Min/Max Quantities Editing Support] Networking & Model #11611

Uh oh!

Conversation

toupper commented May 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Testing instructions

Products

Store without the Min/Max Quantities plugin installed. We don't show the Min/Max Quantities row in product details:

Store with the Min/Max Quantities plugin installed but a product with no rules. We don't show the Min/Max Quantities row in product details:

Store with the Min/Max Quantities plugin installed and a product with rules. We show the Min/Max Quantities row in product details and allow navigation:

Product Variations

Store without the Min/Max Quantities plugin installed. We don't show the Min/Max Quantities row in product variation details:

Store with the Min/Max Quantities plugin installed but a variation with no rules. We don't show the Min/Max Quantities row in product details:

Store with the Min/Max Quantities plugin installed, a variation with rules, but the parent product disables quantity rules for variations. We don't show the Min/Max Quantities row in product details:

Store with the Min/Max Quantities plugin installed, a variation with rules, and the parent product enables quantity rules for variations. We show the Min/Max Quantities row in product details:

Images/gif

Uh oh!

atorresveiga left a comment

Choose a reason for hiding this comment

Uh oh!

atorresveiga commented Jun 5, 2024

Uh oh!

wpmobilebot commented Jun 17, 2024

The PR caused the following dependency changes:

Uh oh!

wpmobilebot commented Jun 17, 2024

Uh oh!

codecov-commenter commented Jun 17, 2024

Codecov Report

Uh oh!

Uh oh!

Uh oh!

toupper commented May 29, 2024 •

edited

Loading