woocommerce · pmusolino · Jun 3, 2024 · May 20, 2024 · May 20, 2024 · May 20, 2024
diff --git a/Fakes/Fakes/Networking.generated.swift b/Fakes/Fakes/Networking.generated.swift
@@ -2099,7 +2099,7 @@ extension Networking.Site {
             jetpackConnectionActivePlugins: .fake(),
             timezone: .fake(),
             gmtOffset: .fake(),
-            isPublic: .fake(),
+            visibility: .fake(),
             canBlaze: .fake(),
             isAdmin: .fake(),
             wasEcommerceTrial: .fake()
@@ -2189,6 +2189,13 @@ extension Networking.SiteSummaryStats {
         )
     }
 }
+extension Networking.SiteVisibility {
+    /// Returns a "ready to use" type filled with fake values.
+    ///
+    public static func fake() -> Networking.SiteVisibility {
+        .privateSite
+    }
+}
 extension Networking.SiteVisitStats {
     /// Returns a "ready to use" type filled with fake values.
     ///

diff --git a/Networking/Networking/Model/Copiable/Models+Copiable.generated.swift b/Networking/Networking/Model/Copiable/Models+Copiable.generated.swift
@@ -3043,7 +3043,7 @@ extension Networking.Site {
         jetpackConnectionActivePlugins: CopiableProp<[String]> = .copy,
         timezone: CopiableProp<String> = .copy,
         gmtOffset: CopiableProp<Double> = .copy,
-        isPublic: CopiableProp<Bool> = .copy,
+        visibility: CopiableProp<SiteVisibility> = .copy,
         canBlaze: CopiableProp<Bool> = .copy,
         isAdmin: CopiableProp<Bool> = .copy,
         wasEcommerceTrial: CopiableProp<Bool> = .copy
@@ -3065,7 +3065,7 @@ extension Networking.Site {
         let jetpackConnectionActivePlugins = jetpackConnectionActivePlugins ?? self.jetpackConnectionActivePlugins
         let timezone = timezone ?? self.timezone
         let gmtOffset = gmtOffset ?? self.gmtOffset
-        let isPublic = isPublic ?? self.isPublic
+        let visibility = visibility ?? self.visibility
         let canBlaze = canBlaze ?? self.canBlaze
         let isAdmin = isAdmin ?? self.isAdmin
         let wasEcommerceTrial = wasEcommerceTrial ?? self.wasEcommerceTrial
@@ -3088,7 +3088,7 @@ extension Networking.Site {
             jetpackConnectionActivePlugins: jetpackConnectionActivePlugins,
             timezone: timezone,
             gmtOffset: gmtOffset,
-            isPublic: isPublic,
+            visibility: visibility,
             canBlaze: canBlaze,
             isAdmin: isAdmin,
             wasEcommerceTrial: wasEcommerceTrial

diff --git a/Networking/Networking/Model/Site.swift b/Networking/Networking/Model/Site.swift
@@ -74,7 +74,7 @@ public struct Site: Decodable, Equatable, GeneratedFakeable, GeneratedCopiable {
 
     /// Whether the site is launched and public.
     ///
-    public let isPublic: Bool
+    public let visibility: SiteVisibility
 
     /// Whether the site is partially eligible for Blaze. For the site to be fully eligible for Blaze, `isAdmin` needs to be `true` as well.
     ///
@@ -113,7 +113,7 @@ public struct Site: Decodable, Equatable, GeneratedFakeable, GeneratedCopiable {
         let loginURL = try optionsContainer.decode(String.self, forKey: .loginURL)
         let frameNonce = try optionsContainer.decode(String.self, forKey: .frameNonce)
         let canBlaze = optionsContainer.failsafeDecodeIfPresent(booleanForKey: .canBlaze) ?? false
-        let isPublic = optionsContainer.failsafeDecodeIfPresent(booleanForKey: .isPublic) ?? false
+        let visibility = optionsContainer.failsafeDecodeIfPresent(SiteVisibility.self, forKey: .visibility) ?? .privateSite
 
         let planContainer = try siteContainer.nestedContainer(keyedBy: PlanInfo.self, forKey: .plan)
         let plan = try planContainer.decode(String.self, forKey: .slug)
@@ -143,7 +143,7 @@ public struct Site: Decodable, Equatable, GeneratedFakeable, GeneratedCopiable {
                   jetpackConnectionActivePlugins: jetpackConnectionActivePlugins,
                   timezone: timezone,
                   gmtOffset: gmtOffset,
-                  isPublic: isPublic,
+                  visibility: visibility,
                   canBlaze: canBlaze,
                   isAdmin: isAdmin,
                   wasEcommerceTrial: wasEcommerceTrial)
@@ -168,7 +168,7 @@ public struct Site: Decodable, Equatable, GeneratedFakeable, GeneratedCopiable {
                 jetpackConnectionActivePlugins: [String],
                 timezone: String,
                 gmtOffset: Double,
-                isPublic: Bool,
+                visibility: SiteVisibility,
                 canBlaze: Bool,
                 isAdmin: Bool,
                 wasEcommerceTrial: Bool) {
@@ -189,7 +189,7 @@ public struct Site: Decodable, Equatable, GeneratedFakeable, GeneratedCopiable {
         self.jetpackConnectionActivePlugins = jetpackConnectionActivePlugins
         self.timezone = timezone
         self.gmtOffset = gmtOffset
-        self.isPublic = isPublic
+        self.visibility = visibility
         self.canBlaze = canBlaze
         self.isAdmin = isAdmin
         self.wasEcommerceTrial = wasEcommerceTrial
@@ -264,7 +264,7 @@ private extension Site {
         case adminURL = "admin_url"
         case loginURL = "login_url"
         case frameNonce = "frame_nonce"
-        case isPublic = "blog_public"
+        case visibility = "blog_public"
         case canBlaze = "can_blaze"
     }
 
@@ -273,6 +273,14 @@ private extension Site {
     }
 }
 
+/// Enum representing the visibility status of a site.
+///
+public enum SiteVisibility: Int, Codable, GeneratedFakeable {
+    case privateSite = -1
+    case comingSoon = 0
+    case publicSite = 1
+}
+
 /// Computed properties
 ///
 public extension Site {
@@ -284,6 +292,11 @@ public extension Site {
         return TimeZone(secondsFromGMT: secondsFromGMT) ?? .current
     }
 
+    /// Returns true only if the site is hosted on WP.com and is private.
+    ///
+    var isPrivateWPCOMSite: Bool {
+        return isWordPressComStore && (visibility == .privateSite)
+    }
 }
 
 private extension Site {

diff --git a/Networking/Networking/Model/WordPressSite.swift b/Networking/Networking/Model/WordPressSite.swift
@@ -105,7 +105,7 @@ public extension WordPressSite {
               jetpackConnectionActivePlugins: [],
               timezone: timezone,
               gmtOffset: Double(gmtOffset) ?? 0,
-              isPublic: false,
+              visibility: .publicSite,
               canBlaze: false,
               isAdmin: false,
               wasEcommerceTrial: false)

diff --git a/Networking/NetworkingTests/Mapper/AccountMapperTests.swift b/Networking/NetworkingTests/Mapper/AccountMapperTests.swift
@@ -45,7 +45,7 @@ final class AccountMapperTests: XCTestCase {
         XCTAssertEqual(first.gmtOffset, 3.5)
         XCTAssertEqual(first.siteTimezone, TimeZone(secondsFromGMT: 12600))
         XCTAssertEqual(first.jetpackConnectionActivePlugins, [])
-        XCTAssertEqual(first.isPublic, true)
+        XCTAssertEqual(first.visibility, .publicSite)
         XCTAssertEqual(first.canBlaze, true)
         XCTAssertEqual(first.isAdmin, true)
         XCTAssertTrue(first.wasEcommerceTrial)
@@ -69,7 +69,7 @@ final class AccountMapperTests: XCTestCase {
         XCTAssertEqual(second.gmtOffset, -4)
         XCTAssertEqual(second.siteTimezone, TimeZone(secondsFromGMT: -14400))
         XCTAssertEqual(second.jetpackConnectionActivePlugins, ["jetpack", "woocommerce-payments"])
-        XCTAssertEqual(second.isPublic, false)
+        XCTAssertEqual(second.visibility, .comingSoon)
         XCTAssertEqual(second.canBlaze, false)
         XCTAssertEqual(second.isAdmin, false)
         XCTAssertFalse(second.wasEcommerceTrial)

diff --git a/Networking/NetworkingTests/Remote/AccountRemoteTests.swift b/Networking/NetworkingTests/Remote/AccountRemoteTests.swift
@@ -79,7 +79,7 @@ final class AccountRemoteTests: XCTestCase {
         // Sites in `sites.json` include one Jetpack CP site and one site with Jetpack-the-plugin.
         let jcpSites = sites.filter { $0.isJetpackCPConnected }
         let nonJCPSites = sites.filter { $0.isJetpackCPConnected == false }
-        let publicSites = sites.filter { $0.isPublic }
+        let publicSites = sites.filter { $0.visibility == .publicSite }
         XCTAssertEqual(jcpSites.count, 1)
         XCTAssertEqual(nonJCPSites.count, 1)
         XCTAssertEqual(publicSites.count, 1)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -2,7 +2,7 @@
 
 19.0
 -----
-
+- [internal] Resolved an issue where users were unable to upload product images when the store is set to private on WP.com. [https://github.com/woocommerce/woocommerce-ios/issues/12646]
 
 18.9
 -----

diff --git a/Storage/Storage.xcodeproj/project.pbxproj b/Storage/Storage.xcodeproj/project.pbxproj
@@ -78,6 +78,7 @@
 		454005AA24AE4D350087FDD1 /* WooCommerceModelV28toV29.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = 454005A924AE4D350087FDD1 /* WooCommerceModelV28toV29.xcmappingmodel */; };
 		455C0C9025DD6D93007B6F38 /* AccountSettings+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 455C0C8E25DD6D93007B6F38 /* AccountSettings+CoreDataClass.swift */; };
 		455C0C9125DD6D93007B6F38 /* AccountSettings+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 455C0C8F25DD6D93007B6F38 /* AccountSettings+CoreDataProperties.swift */; };
+		456C14082C08D838006710C0 /* WooCommerceModelV111toV112.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = 456C14072C08D838006710C0 /* WooCommerceModelV111toV112.xcmappingmodel */; };
 		457E6E8227D8B60F00173F69 /* Order+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 457E6E8027D8B60F00173F69 /* Order+CoreDataClass.swift */; };
 		457E6E8327D8B60F00173F69 /* Order+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 457E6E8127D8B60F00173F69 /* Order+CoreDataProperties.swift */; };
 		45E1862E2370450C009241F3 /* ShippingLine+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45E1862D2370450C009241F3 /* ShippingLine+CoreDataClass.swift */; };
@@ -356,6 +357,8 @@
 		454005A924AE4D350087FDD1 /* WooCommerceModelV28toV29.xcmappingmodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcmappingmodel; path = WooCommerceModelV28toV29.xcmappingmodel; sourceTree = "<group>"; };
 		455C0C8E25DD6D93007B6F38 /* AccountSettings+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AccountSettings+CoreDataClass.swift"; sourceTree = "<group>"; };
 		455C0C8F25DD6D93007B6F38 /* AccountSettings+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AccountSettings+CoreDataProperties.swift"; sourceTree = "<group>"; };
+		456C14062C08D7C4006710C0 /* Model 112.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Model 112.xcdatamodel"; sourceTree = "<group>"; };
+		456C14072C08D838006710C0 /* WooCommerceModelV111toV112.xcmappingmodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcmappingmodel; path = WooCommerceModelV111toV112.xcmappingmodel; sourceTree = "<group>"; };
 		457E6E7F27D8B51E00173F69 /* Model 66.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Model 66.xcdatamodel"; sourceTree = "<group>"; };
 		457E6E8027D8B60F00173F69 /* Order+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Order+CoreDataClass.swift"; sourceTree = "<group>"; };
 		457E6E8127D8B60F00173F69 /* Order+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Order+CoreDataProperties.swift"; sourceTree = "<group>"; };
@@ -801,6 +804,7 @@
 				0284BD8825BAC83700D00C06 /* WooCommerceModelV42toV43.xcmappingmodel */,
 				CCD2E70625DE9AAA00BD975D /* WooCommerceModelV45toV46.xcmappingmodel */,
 				688908A928FD00320081A07E /* WooCommerceModelV74toV75.xcmappingmodel */,
+				456C14072C08D838006710C0 /* WooCommerceModelV111toV112.xcmappingmodel */,
 			);
 			name = "Mapping Models";
 			sourceTree = "<group>";
@@ -1360,6 +1364,7 @@
 				688908AA28FD00320081A07E /* WooCommerceModelV74toV75.xcmappingmodel in Sources */,
 				D821645D2239F5FC00F46F89 /* ShipmentTrackingProviderGroup+CoreDataClass.swift in Sources */,
 				B9B8B5052AA0D7F500B36811 /* TaxRate+CoreDataProperties.swift in Sources */,
+				456C14082C08D838006710C0 /* WooCommerceModelV111toV112.xcmappingmodel in Sources */,
 				D88E233B25AE08C90023F3B1 /* OrderFeeLine+CoreDataClass.swift in Sources */,
 				03101EFF29DD7D1300769CF3 /* CardReaderType.swift in Sources */,
 				0371C38128781E2900277E2C /* FeatureAnnouncementCampaignSettings.swift in Sources */,
@@ -2003,6 +2008,7 @@
 		DEC51AA4275B41BE009F3DF4 /* WooCommerce.xcdatamodeld */ = {
 			isa = XCVersionGroup;
 			children = (
+				456C14062C08D7C4006710C0 /* Model 112.xcdatamodel */,
 				CE606D962BE3AA4B001CB424 /* Model 111.xcdatamodel */,
 				CECE6BB42BA9CA1700A57C1F /* Model 110.xcdatamodel */,
 				DEA0D0692BA953D3007786F2 /* Model 109.xcdatamodel */,
@@ -2115,7 +2121,7 @@
 				DEC51ADE275B41BE009F3DF4 /* Model 47.xcdatamodel */,
 				DEC51ADF275B41BE009F3DF4 /* Model 19.xcdatamodel */,
 			);
-			currentVersion = CE606D962BE3AA4B001CB424 /* Model 111.xcdatamodel */;
+			currentVersion = 456C14062C08D7C4006710C0 /* Model 112.xcdatamodel */;
 			path = WooCommerce.xcdatamodeld;
 			sourceTree = "<group>";
 			versionGroupType = wrapper.xcdatamodel;

diff --git a/Storage/Storage/Model/MIGRATIONS.md b/Storage/Storage/Model/MIGRATIONS.md
@@ -2,6 +2,12 @@
 
 This file documents changes in the WCiOS Storage data model. Please explain any changes to the data model as well as any custom migrations.
 
+## Model 112 (Release 19.0.0.0)
+- @pmusolino 2024-05-31
+    - Added `visibility` attribute to `Site` entity.
+    - Removed `isPublic` attribute from `Site` entity.
+    - Added `WooCommerceModelV111toV112` mapping model.
+
 ## Model 111 (Release 18.5.0.0)
 - @rachelmcr 2024-05-02
     - Add `ShippingMethod` entity.

diff --git a/Storage/Storage/Model/Site+CoreDataProperties.swift b/Storage/Storage/Model/Site+CoreDataProperties.swift
@@ -23,7 +23,7 @@ extension Site {
     @NSManaged public var isJetpackConnected: Bool
     @NSManaged public var isJetpackThePluginInstalled: Bool
     @NSManaged public var jetpackConnectionActivePlugins: [String]?
-    @NSManaged public var isPublic: Bool
+    @NSManaged public var visibility: Int64
     @NSManaged public var isSiteOwner: Bool
     @NSManaged public var isAdmin: Bool
     @NSManaged public var canBlaze: Bool

diff --git a/Storage/Storage/Model/WooCommerce.xcdatamodeld/.xccurrentversion b/Storage/Storage/Model/WooCommerce.xcdatamodeld/.xccurrentversion
@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>Model 111.xcdatamodel</string>
+	<string>Model 112.xcdatamodel</string>
 </dict>
 </plist>
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
 .0
     -----
+    - [internal] Resolved an issue where users were unable to upload product images when the store is set to private on WP.com. [https://github.com/woocommerce/woocommerce-ios/issues/12646]
 .9
     -----
@@ Expand Down @@