fastlane 2.150.0.rc1 → 2.150.0.rc6

data/spaceship/lib/spaceship/connect_api/models/app_screenshot_set.rb

@@ -39,8 +39,24 @@ module Spaceship
         APP_WATCH_SERIES_3 = "APP_WATCH_SERIES_3"
         APP_WATCH_SERIES_4 = "APP_WATCH_SERIES_4"
 
+        APP_APPLE_TV = "APP_APPLE_TV"
+
         APP_DESKTOP = "APP_DESKTOP"
 
+        ALL_IMESSAGE = [
+          IMESSAGE_APP_IPHONE_40,
+          IMESSAGE_APP_IPHONE_47,
+          IMESSAGE_APP_IPHONE_55,
+          IMESSAGE_APP_IPHONE_58,
+          IMESSAGE_APP_IPHONE_65,
+
+          IMESSAGE_APP_IPAD_97,
+          IMESSAGE_APP_IPAD_105,
+          IMESSAGE_APP_IPAD_PRO_129,
+          IMESSAGE_APP_IPAD_PRO_3GEN_11,
+          IMESSAGE_APP_IPAD_PRO_3GEN_129
+        ]
+
         ALL = [
           APP_IPHONE_35,
           APP_IPHONE_40,
@@ -84,6 +100,14 @@ module Spaceship
         return "appScreenshotSets"
       end
 
+      def apple_tv?
+        DisplayType::APP_APPLE_TV == screenshot_display_type
+      end
+
+      def imessage?
+        DisplayType::ALL_IMESSAGE.include?(screenshot_display_type)
+      end
+
       #
       # API
       #
@@ -93,8 +117,8 @@ module Spaceship
         return resp.to_models
       end
 
-      def upload_screenshot(path: nil)
-        return Spaceship::ConnectAPI::AppScreenshot.create(app_screenshot_set_id: id, path: path)
+      def upload_screenshot(path: nil, wait_for_processing: true)
+        return Spaceship::ConnectAPI::AppScreenshot.create(app_screenshot_set_id: id, path: path, wait_for_processing: wait_for_processing)
       end
     end
   end

data/spaceship/lib/spaceship/connect_api/models/app_store_version.rb

@@ -26,6 +26,7 @@ module Spaceship
         REJECTED = "REJECTED"
         PREPARE_FOR_SUBMISSION = "PREPARE_FOR_SUBMISSION"
         METADATA_REJECTED = "METADATA_REJECTED"
+        INVALID_BINARY = "INVALID_BINARY"
       end
 
       module ReleaseType

data/spaceship/lib/spaceship/connect_api/models/app_store_version_localization.rb

@@ -1,4 +1,5 @@
 require_relative '../model'
+require_relative './app_preview_set'
 require_relative './app_screenshot_set'
 
 module Spaceship
@@ -51,6 +52,21 @@ module Spaceship
         Spaceship::ConnectAPI.delete_app_store_version_localization(app_store_version_localization_id: id)
       end
 
+      #
+      # App Preview Sets
+      #
+
+      def get_app_preview_sets(filter: {}, includes: "appPreviews", limit: nil, sort: nil)
+        filter ||= {}
+        filter["appStoreVersionLocalization"] = id
+        return Spaceship::ConnectAPI::AppPreviewSet.all(filter: filter, includes: includes, limit: limit, sort: sort)
+      end
+
+      def create_app_preview_set(attributes: nil)
+        resp = Spaceship::ConnectAPI.post_app_preview_set(app_store_version_localization_id: id, attributes: attributes)
+        return resp.to_models.first
+      end
+
       #
       # App Screenshot Sets
       #

data/spaceship/lib/spaceship/connect_api/models/territory.rb

@@ -0,0 +1,27 @@
+require_relative '../model'
+module Spaceship
+  class ConnectAPI
+    class Territory
+      include Spaceship::ConnectAPI::Model
+
+      attr_accessor :currency
+
+      attr_mapping({
+        "currency" => "currency"
+      })
+
+      def self.type
+        return "territories"
+      end
+
+      #
+      # API
+      #
+
+      def self.all(filter: {}, includes: nil, limit: 180, sort: nil)
+        resps = Spaceship::ConnectAPI.get_territories(filter: {}, includes: nil, limit: nil, sort: nil).all_pages
+        return resps.flat_map(&:to_models)
+      end
+    end
+  end
+end

data/spaceship/lib/spaceship/connect_api/models/user.rb

@@ -39,7 +39,8 @@ module Spaceship
       #
 
       def self.all(filter: {}, includes: nil, limit: nil, sort: nil)
-        return Spaceship::ConnectAPI.get_users(filter: filter, includes: includes)
+        resps = Spaceship::ConnectAPI.get_users(filter: filter, includes: includes).all_pages
+        return resps.flat_map(&:to_models)
       end
 
       def self.find(email: nil, includes: nil)

data/spaceship/lib/spaceship/connect_api/tunes/tunes.rb

@@ -28,7 +28,7 @@ module Spaceship
       # app
       #
 
-      def post_app(name: nil, version_string: nil, sku: nil, primary_locale: nil, bundle_id: nil, platforms: nil)
+      def post_app(name: nil, version_string: nil, sku: nil, primary_locale: nil, bundle_id: nil, platforms: nil, company_name: nil)
         included = []
         included << {
           type: "appInfos",
@@ -89,91 +89,175 @@ module Spaceship
           }
         end
 
+        relationships = {
+          appStoreVersions: {
+            data: app_store_verions_data
+          },
+          appInfos: {
+            data: [
+              {
+                type: "appInfos",
+                id: "${new-appInfo-id}"
+              }
+            ]
+          }
+        }
+
+        app_attributes = {
+          sku: sku,
+          primaryLocale: primary_locale,
+          bundleId: bundle_id
+        }
+        app_attributes[:companyName] = company_name if company_name
+
         body = {
           data: {
             type: "apps",
+            attributes: app_attributes,
+            relationships: relationships
+          },
+          included: included
+        }
+
+        Client.instance.post("apps", body)
+      end
+
+      def patch_app(app_id: nil, attributes: {}, app_price_tier_id: nil, territory_ids: nil)
+        relationships = {}
+        included = []
+
+        # Price tier
+        unless app_price_tier_id.nil?
+          relationships[:prices] = {
+            data: [
+              {
+                type: "appPrices",
+                id: "${price1}"
+              }
+            ]
+          }
+
+          included << {
+            type: "appPrices",
+            id: "${price1}",
             attributes: {
-              sku: sku,
-              primaryLocale: primary_locale,
-              bundleId: bundle_id
+              startDate: nil
             },
             relationships: {
-              appStoreVersions: {
-                data: app_store_verions_data
+              app: {
+                data: {
+                  type: "apps",
+                  id: app_id
+                }
               },
-              appInfos: {
-                data: [
-                  {
-                    type: "appInfos",
-                    id: "${new-appInfo-id}"
-                  }
-                ]
+              priceTier: {
+                data: {
+                  type: "appPriceTiers",
+                  id: app_price_tier_id.to_s
+                }
               }
             }
-          },
-          included: included
+          }
+        end
+
+        # Territories
+        territories_data = (territory_ids || []).map do |id|
+          { type: "territories", id: id }
+        end
+        unless territories_data.empty?
+          relationships[:availableTerritories] = {
+            data: territories_data
+          }
+        end
+
+        # Data
+        data = {
+          type: "apps",
+          id: app_id
         }
+        data[:attributes] = attributes unless attributes.empty?
+        data[:relationships] = relationships unless relationships.empty?
 
-        Client.instance.post("apps", body)
+        # Body
+        body = {
+          data: data
+        }
+        body[:included] = included unless included.empty?
+
+        Client.instance.patch("apps/#{app_id}", body)
+      end
+
+      #
+      # appPreview
+      #
+
+      def get_app_preview(app_preview_id: nil)
+        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+        Client.instance.get("appPreviews/#{app_preview_id}", params)
       end
 
-      def patch_app(app_id: nil, attributes: {})
+      def post_app_preview(app_preview_set_id: nil, attributes: {})
         body = {
           data: {
-            type: "apps",
-            id: app_id,
+            type: "appPreviews",
+            attributes: attributes,
+            relationships: {
+              appPreviewSet: {
+                data: {
+                  type: "appPreviewSets",
+                  id: app_preview_set_id
+                }
+              }
+            }
+          }
+        }
+
+        Client.instance.post("appPreviews", body)
+      end
+
+      def patch_app_preview(app_preview_id: nil, attributes: {})
+        body = {
+          data: {
+            type: "appPreviews",
+            id: app_preview_id,
             attributes: attributes
           }
         }
 
-        Client.instance.patch("apps/#{app_id}", body)
+        Client.instance.patch("appPreviews/#{app_preview_id}", body)
       end
 
-      def patch_app_app_prices(app_id: nil, app_price_tier_id: nil)
+      def delete_app_preview(app_preview_id: nil)
+        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+        Client.instance.delete("appPreviews/#{app_preview_id}", params)
+      end
+
+      #
+      # appPreviewSets
+      #
+
+      def get_app_preview_sets(filter: {}, includes: nil, limit: nil, sort: nil)
+        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        Client.instance.get("appPreviewSets", params)
+      end
+
+      def post_app_preview_set(app_store_version_localization_id: nil, attributes: {})
         body = {
           data: {
-            type: "apps",
-            id: app_id,
-            attributes: {
-              availableInNewTerritories: true
-            },
+            type: "appPreviewSets",
+            attributes: attributes,
             relationships: {
-              prices: {
-                data: [
-                  {
-                    type: "appPrices",
-                    id: "${price1}"
-                  }
-                ]
-              }
-            }
-          },
-          included: [
-            {
-              type: "appPrices",
-              id: "${price1}",
-              attributes: {
-                startDate: nil
-              },
-              relationships: {
-                app: {
-                  data: {
-                    type: "apps",
-                    id: app_id
-                  }
-                },
-                priceTier: {
-                  data: {
-                    type: "appPriceTiers",
-                    id: app_price_tier_id.to_s
-                  }
+              appStoreVersionLocalization: {
+                data: {
+                  type: "appStoreVersionLocalizations",
+                  id: app_store_version_localization_id
                 }
               }
             }
-          ]
+          }
         }
 
-        Client.instance.patch("apps/#{app_id}", body)
+        Client.instance.post("appPreviewSets", body)
       end
 
       #
@@ -262,6 +346,11 @@ module Spaceship
       # appScreenshots
       #
 
+      def get_app_screenshot(app_screenshot_id: nil)
+        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+        Client.instance.get("appScreenshots/#{app_screenshot_id}", params)
+      end
+
       def post_app_screenshot(app_screenshot_set_id: nil, attributes: {})
         body = {
           data: {
@@ -302,9 +391,9 @@ module Spaceship
       # appInfos
       #
 
-      def get_app_infos(app_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+      def get_app_infos(filter: {}, includes: nil, limit: nil, sort: nil)
         params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("apps/#{app_id}/appInfos", params)
+        Client.instance.get("appInfos", params)
       end
 
       def patch_app_info(app_info_id: nil, attributes: {})
@@ -323,27 +412,70 @@ module Spaceship
         Client.instance.patch("appInfos/#{app_info_id}", body)
       end
 
-      def patch_app_info_categories(app_info_id: nil, primary_category_id: nil, secondary_category_id: nil, primary_subcategory_one_id: nil, primary_subcategory_two_id: nil, secondary_subcategory_one_id: nil, secondary_subcategory_two_id: nil)
-        relationships = {
-          primaryCategory: {
+      #
+      # Adding the key will create/update (if value) or delete if nil
+      # Not including a key will leave as is
+      # category_id_map: {
+      #   primary_category_id: "GAMES",
+      #   primary_subcategory_one_id: "PUZZLE",
+      #   primary_subcategory_two_id: "STRATEGY",
+      #   secondary_category_id: nil,
+      #   secondary_subcategory_one_id: nil,
+      #   secondary_subcategory_two_id: nil
+      # }
+      #
+      def patch_app_info_categories(app_info_id: nil, category_id_map: nil)
+        category_id_map ||= {}
+        primary_category_id = category_id_map[:primary_category_id]
+        primary_subcategory_one_id = category_id_map[:primary_subcategory_one_id]
+        primary_subcategory_two_id = category_id_map[:primary_subcategory_two_id]
+        secondary_category_id = category_id_map[:secondary_category_id]
+        secondary_subcategory_one_id = category_id_map[:secondary_subcategory_one_id]
+        secondary_subcategory_two_id = category_id_map[:secondary_subcategory_two_id]
+
+        relationships = {}
+
+        # Only update if key is included (otherwise category will be removed)
+        if category_id_map.include?(:primary_category_id)
+          relationships[:primaryCategory] = {
             data: primary_category_id ? { type: "appCategories", id: primary_category_id } : nil
-          },
-          secondaryCategory: {
-            data: secondary_category_id ? { type: "appCategories", id: secondary_category_id } : nil
-          },
-          primarySubcategoryOne: {
+          }
+        end
+
+        # Only update if key is included (otherwise category will be removed)
+        if category_id_map.include?(:primary_subcategory_one_id)
+          relationships[:primarySubcategoryOne] = {
             data: primary_subcategory_one_id ? { type: "appCategories", id: primary_subcategory_one_id } : nil
-          },
-          primarySubcategoryTwo: {
+          }
+        end
+
+        # Only update if key is included (otherwise category will be removed)
+        if category_id_map.include?(:primary_subcategory_two_id)
+          relationships[:primarySubcategoryTwo] = {
             data: primary_subcategory_two_id ? { type: "appCategories", id: primary_subcategory_two_id } : nil
-          },
-          secondarySubcategoryOne: {
+          }
+        end
+
+        # Only update if key is included (otherwise category will be removed)
+        if category_id_map.include?(:secondary_category_id)
+          relationships[:secondaryCategory] = {
+            data: secondary_category_id ? { type: "appCategories", id: secondary_category_id } : nil
+          }
+        end
+
+        # Only update if key is included (otherwise category will be removed)
+        if category_id_map.include?(:secondary_subcategory_one_id)
+          relationships[:secondarySubcategoryOne] = {
             data: secondary_subcategory_one_id ? { type: "appCategories", id: secondary_subcategory_one_id } : nil
-          },
-          secondarySubcategoryTwo: {
+          }
+        end
+
+        # Only update if key is included (otherwise category will be removed)
+        if category_id_map.include?(:secondary_subcategory_two_id)
+          relationships[:secondarySubcategoryTwo] = {
             data: secondary_subcategory_two_id ? { type: "appCategories", id: secondary_subcategory_two_id } : nil
           }
-        }
+        end
 
         data = {
           type: "appInfos",
@@ -698,6 +830,15 @@ module Spaceship
         params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
         Client.instance.delete("idfaDeclarations/#{idfa_declaration_id}", params)
       end
+
+      #
+      # territories
+      #
+
+      def get_territories(filter: {}, includes: nil, limit: nil, sort: nil)
+        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+        Client.instance.get("territories", params)
+      end
     end
   end
 end