Skip to content
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.

Sign up for GitHub

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

Update SiteModel: Add column isSingleUserSite #2873

Merged
merged 8 commits into from
Oct 18, 2023
Merged

Update SiteModel: Add column isSingleUserSite #2873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1e7ea12
Add field single_user_site to response object
zwarm Oct 17, 2023
cc93827
Set single_user_site to site and add to filter site_fields
zwarm Oct 17, 2023
1b74560
Add mIsSingleUserSite column
zwarm Oct 17, 2023
53ecb45
Update dbVersion and migration for is_single_user_site in SiteModel
zwarm Oct 17, 2023
49d87a6
Revert "Set single_user_site to site and add to filter site_fields"
zwarm Oct 17, 2023
f2cd1e0
Set isSingleUserSite on site and add to site_fields
zwarm Oct 17, 2023
be41f25
Switch primitive type
zwarm Oct 17, 2023
d5837e7
Update tests to support the addition of single_user_site field request
zwarm Oct 17, 2023
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
6 changes: 3 additions & 3 deletions ...e/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteRestClientTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class SiteRestClientTest {
mapOf(
"fields" to "ID,URL,name,description,jetpack,jetpack_connection," +
"visible,is_private,options,plan,capabilities,quota,icon,meta,zendesk_site_meta," +
"organization_id,was_ecommerce_trial"
"organization_id,was_ecommerce_trial,single_user_site"
)
)
}
Expand Down Expand Up @@ -145,7 +145,7 @@ class SiteRestClientTest {
"filters" to "wpcom",
"fields" to "ID,URL,name,description,jetpack,jetpack_connection," +
"visible,is_private,options,plan,capabilities,quota,icon,meta,zendesk_site_meta," +
"organization_id,was_ecommerce_trial"
"organization_id,was_ecommerce_trial,single_user_site"
)
)
}
Expand Down Expand Up @@ -174,7 +174,7 @@ class SiteRestClientTest {
mapOf(
"fields" to "ID,URL,name,description,jetpack,jetpack_connection," +
"visible,is_private,options,plan,capabilities,quota,icon,meta,zendesk_site_meta," +
"organization_id,was_ecommerce_trial"
"organization_id,was_ecommerce_trial,single_user_site"
)
)
}
Expand Down
10 changes: 10 additions & 0 deletions fluxc/src/main/java/org/wordpress/android/fluxc/model/SiteModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,8 @@ public class SiteModel extends Payload<BaseNetworkError> implements Identifiable
private String mPlanActiveFeatures;
@Column
private Boolean mWasEcommerceTrial;
@Column
private Boolean mIsSingleUserSite;

@Override
public int getId() {
Expand Down Expand Up @@ -1111,4 +1113,12 @@ public String getPlanActiveFeatures() {
public void setPlanActiveFeatures(final String planActiveFeatures) {
this.mPlanActiveFeatures = planActiveFeatures;
}

public Boolean isSingleUserSite() {
return mIsSingleUserSite;
}

public void setIsSingleUserSite(Boolean isSingleUserSite) {
mIsSingleUserSite = isSingleUserSite;
}
}
3 changes: 2 additions & 1 deletion fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteRestClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1203,6 +1203,7 @@ class SiteRestClient @Inject constructor(
site.origin = SiteModel.ORIGIN_WPCOM_REST
site.planActiveFeatures = (from.plan?.features?.active?.joinToString(",")).orEmpty()
site.wasEcommerceTrial = from.was_ecommerce_trial
site.setIsSingleUserSite(from.single_user_site)
return site
}

Expand Down Expand Up @@ -1265,7 +1266,7 @@ class SiteRestClient @Inject constructor(
private const val NEW_SITE_TIMEOUT_MS = 90000
private const val SITE_FIELDS = "ID,URL,name,description,jetpack,jetpack_connection,visible,is_private," +
"options,plan,capabilities,quota,icon,meta,zendesk_site_meta,organization_id," +
"was_ecommerce_trial"
"was_ecommerce_trial,single_user_site"
private const val FIELDS = "fields"
private const val FILTERS = "filters"
}
Expand Down
1 change: 1 addition & 0 deletions .../main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteWPComRestResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,5 @@ public class BloggingPromptsSettings {
public Quota quota;
public ZendeskSiteMeta zendesk_site_meta;
public boolean was_ecommerce_trial;
public boolean single_user_site;
}
5 changes: 4 additions & 1 deletion fluxc/src/main/java/org/wordpress/android/fluxc/persistence/WellSqlConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ open class WellSqlConfig : DefaultWellConfig {
annotation class AddOn

override fun getDbVersion(): Int {
return 196
return 197
}

override fun getDbName(): String {
Expand Down Expand Up @@ -1990,6 +1990,9 @@ open class WellSqlConfig : DefaultWellConfig {
"_id INTEGER PRIMARY KEY AUTOINCREMENT)"
)
}
196 -> migrate(version) {
db.execSQL("ALTER TABLE SiteModel ADD IS_SINGLE_USER_SITE BOOLEAN")
}
}
}
db.setTransactionSuccessful()
Expand Down
Loading