8015 Pass platform and build identifiers in JITM

Author: joshheald

Networking/Networking.xcodeproj/project.pbxproj

@@ -865,7 +865,7 @@
 		09885C7F27C3FFD200910A62 /* product-variations-bulk-update.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "product-variations-bulk-update.json"; sourceTree = "<group>"; };
 		09EA564A27C75FCE00407D40 /* ProductVariationsBulkUpdateMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductVariationsBulkUpdateMapper.swift; sourceTree = "<group>"; };
 		24F98C512502E79800F49B68 /* FeatureFlagsRemote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureFlagsRemote.swift; sourceTree = "<group>"; };
-		24F98C532502E8DD00F49B68 /* Bundle+Woo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Bundle+Woo.swift"; sourceTree = "<group>"; };
+		24F98C532502E8DD00F49B68 /* Bundle+Woo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "Bundle+Woo.swift"; path = "../../../WooFoundation/WooFoundation/Extensions/Bundle+Woo.swift"; sourceTree = "<group>"; };
 		24F98C552502EA4800F49B68 /* FeatureFlag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureFlag.swift; sourceTree = "<group>"; };
 		24F98C572502EA8800F49B68 /* FeatureFlagMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureFlagMapper.swift; sourceTree = "<group>"; };
 		24F98C5D2502EDCF00F49B68 /* BundleWooTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BundleWooTests.swift; sourceTree = "<group>"; };

WooFoundation/WooFoundation.xcodeproj/project.pbxproj

@@ -13,6 +13,7 @@
 		03597A9D28F93409005E4A98 /* WooCommerceComUTMProviderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03597A9C28F93409005E4A98 /* WooCommerceComUTMProviderTests.swift */; };
 		035BA3A6290FF98D0056F0AD /* UTMProviderProtocolExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 035BA3A5290FF98D0056F0AD /* UTMProviderProtocolExtensionTests.swift */; };
 		036563D728F93F8D00D84BFD /* TestKit in Frameworks */ = {isa = PBXBuildFile; productRef = 036563D628F93F8D00D84BFD /* TestKit */; };
+		03B8C3892914083F002235B1 /* Bundle+Woo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03B8C3882914083F002235B1 /* Bundle+Woo.swift */; };
 		265C99D828B93F04005E6117 /* ColorPalette.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 265C99D728B93F04005E6117 /* ColorPalette.xcassets */; };
 		265C99DD28B941D5005E6117 /* UIColor+Muriel-Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 265C99DC28B941D5005E6117 /* UIColor+Muriel-Tests.swift */; };
 		265C99DF28B94271005E6117 /* MurielColorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 265C99DE28B94271005E6117 /* MurielColorTests.swift */; };
@@ -56,6 +57,7 @@
 		03597A9A28F87BFC005E4A98 /* WooCommerceComUTMProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WooCommerceComUTMProvider.swift; sourceTree = "<group>"; };
 		03597A9C28F93409005E4A98 /* WooCommerceComUTMProviderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WooCommerceComUTMProviderTests.swift; sourceTree = "<group>"; };
 		035BA3A5290FF98D0056F0AD /* UTMProviderProtocolExtensionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UTMProviderProtocolExtensionTests.swift; sourceTree = "<group>"; };
+		03B8C3882914083F002235B1 /* Bundle+Woo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Bundle+Woo.swift"; sourceTree = "<group>"; };
 		265C99D728B93F04005E6117 /* ColorPalette.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = ColorPalette.xcassets; sourceTree = "<group>"; };
 		265C99DC28B941D5005E6117 /* UIColor+Muriel-Tests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIColor+Muriel-Tests.swift"; sourceTree = "<group>"; };
 		265C99DE28B94271005E6117 /* MurielColorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MurielColorTests.swift; sourceTree = "<group>"; };
@@ -243,6 +245,7 @@
 				B9C9C65F283E71F4001B879F /* Double+Woo.swift */,
 				B9C9C658283E7195001B879F /* NSDecimalNumber+Helpers.swift */,
 				68FBC5B228926B2C00A05461 /* Collection+Extensions.swift */,
+				03B8C3882914083F002235B1 /* Bundle+Woo.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -471,6 +474,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				03B8C3892914083F002235B1 /* Bundle+Woo.swift in Sources */,
 				B9C9C659283E7195001B879F /* NSDecimalNumber+Helpers.swift in Sources */,
 				26AF1F5328B8362800937BA9 /* UIColor+SemanticColors.swift in Sources */,
 				03597A9B28F87BFC005E4A98 /* WooCommerceComUTMProvider.swift in Sources */,

Networking/Networking/Extensions/Bundle+Woo.swift renamed to WooFoundation/WooFoundation/Extensions/Bundle+Woo.swift

@@ -1,15 +1,15 @@
 import Foundation
 
 extension Bundle {
-    var buildNumber: String {
+    public var buildNumber: String {
         guard let buildNumber = Bundle.main.infoDictionary?["CFBundleVersion"] as? String else {
             return "unknown"
         }
 
         return buildNumber
     }
 
-    var marketingVersion: String {
+    public var marketingVersion: String {
         guard let marketingVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String else {
             return "unknown"
         }

Yosemite/Yosemite/Stores/JustInTimeMessageStore.swift

@@ -51,15 +51,61 @@ private extension JustInTimeMessageStore {
                     messagePath: .init(app: .wooMobile,
                                        screen: screen,
                                        hook: hook),
-                    query: nil,
-                    locale: "")
+                    query: justInTimeMessageQuery(),
+                    locale: localeLanguageRegionIdentifier())
             let displayResult = result.map(displayMessages(_:))
             await MainActor.run {
                 completion(displayResult)
             }
         }
     }
 
+    func justInTimeMessageQuery() -> [String: String] {
+        var queryItems = [
+            "platform": "ios",
+            "version": Bundle.main.marketingVersion
+        ]
+
+        if let device = deviceIdiomName() {
+            queryItems["device"] = device
+        }
+
+        if let buildType = buildType() {
+            queryItems["build_type"] = buildType
+        }
+
+        return queryItems
+    }
+
+    func deviceIdiomName() -> String? {
+        switch UIDevice.current.userInterfaceIdiom {
+        case .phone:
+            return "phone"
+        case .pad:
+            return "pad"
+        default:
+            return nil
+        }
+    }
+
+    func buildType() -> String? {
+        #if DEBUG
+        return "developer"
+        #else
+        return nil
+        #endif
+    }
+
+    func localeLanguageRegionIdentifier() -> String? {
+        guard let languageCode = Locale.current.languageCode else {
+            return nil
+        }
+        guard let regionCode = Locale.current.regionCode else {
+            return languageCode
+        }
+        return "\(languageCode)_\(regionCode)"
+    }
+
     func displayMessages(_ messages: [Networking.JustInTimeMessage]) -> [JustInTimeMessage] {
         return messages.map { JustInTimeMessage(message: $0) }
     }