Merge pull request #578 from wordpress-mobile/fix/plan-flag

Paul Von Schrottky · web-flow · commit 85336d9792ed · 2023-02-17T20:49:50.000-03:00
Fix a regression in plan flag logic
diff --git a/WordPressKit.podspec b/WordPressKit.podspec
@@ -2,7 +2,7 @@
 
 Pod::Spec.new do |s|
   s.name          = 'WordPressKit'
-  s.version       = '6.1.0-beta.2'
+  s.version       = '6.1.0-beta.3'
 
   s.summary       = 'WordPressKit offers a clean and simple WordPress.com and WordPress.org API.'
   s.description   = <<-DESC
diff --git a/WordPressKit/RemoteBlog.swift b/WordPressKit/RemoteBlog.swift
@@ -72,7 +72,7 @@ import NSObject_SafeExpectations
         self.options = RemoteBlogOptionsHelper.mapOptions(fromResponse: json)
         self.planID = json.number(forKeyPath: "plan.product_id")
         self.planTitle = json.string(forKeyPath: "plan.product_name_short")
-        self.hasPaidPlan = json.number(forKeyPath: "plan.is_free")?.boolValue ?? false
+        self.hasPaidPlan = !(json.number(forKeyPath: "plan.is_free")?.boolValue ?? true)
         self.quotaSpaceAllowed = json.number(forKeyPath: "quota.space_allowed")
         self.quotaSpaceUsed = json.number(forKeyPath: "quota.space_used")
     }

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ import NSObject_SafeExpectations`
`72`	`72`	`self.options = RemoteBlogOptionsHelper.mapOptions(fromResponse: json)`
`73`	`73`	`self.planID = json.number(forKeyPath: "plan.product_id")`
`74`	`74`	`self.planTitle = json.string(forKeyPath: "plan.product_name_short")`
`75`		`- self.hasPaidPlan = json.number(forKeyPath: "plan.is_free")?.boolValue ?? false`
	`75`	`+ self.hasPaidPlan = !(json.number(forKeyPath: "plan.is_free")?.boolValue ?? true)`
`76`	`76`	`self.quotaSpaceAllowed = json.number(forKeyPath: "quota.space_allowed")`
`77`	`77`	`self.quotaSpaceUsed = json.number(forKeyPath: "quota.space_used")`
`78`	`78`	`}`