onesignal 1.0.0.beta1 → 2.2.0

data/lib/onesignal/models/notification.rb

@@ -3,10 +3,10 @@
 
 #A powerful way to send personalized messages at scale and build effective customer engagement strategies. Learn more at onesignal.com
 
-The version of the OpenAPI document: 1.0.0
+The version of the OpenAPI document: 1.4.0
 Contact: devrel@onesignal.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.2.0-SNAPSHOT
+OpenAPI Generator version: 6.0.0-SNAPSHOT
 
 =end
 
@@ -21,46 +21,10 @@ module OneSignal
     # Segment that will be excluded when sending. Users in these segments will not receive a notification, even if they were included in included_segments. This targeting parameter is only compatible with included_segments. Example: [\"Active Users\", \"Inactive Users\"] 
     attr_accessor :excluded_segments
 
-    # relation = \">\" or \"<\" hours_ago = number of hours before or after the users last session. Example: \"1.1\" 
-    attr_accessor :last_session
-
-    # relation = \">\" or \"<\" hours_ago = number of hours before or after the users first session. Example: \"1.1\" 
-    attr_accessor :first_session
-
-    # relation = \">\", \"<\", \"=\" or \"!=\" value = number sessions. Example: \"1\" 
-    attr_accessor :session_count
-
-    # relation = \">\", \"<\", \"=\" or \"!=\" value = Time in seconds the user has been in your app. Example: \"3600\" 
-    attr_accessor :session_time
-
-    # relation = \">\", \"<\", or \"=\" value = Amount in USD a user has spent on IAP (In App Purchases). Example: \"0.99\" 
-    attr_accessor :amount_spent
-
-    # relation = \">\", \"<\" or \"=\" key = SKU purchased in your app as an IAP (In App Purchases). Example: \"com.domain.100coinpack\" value = value of SKU to compare to. Example: \"0.99\" 
-    attr_accessor :bought_sku
-
-    # relation = \">\", \"<\", \"=\", \"!=\", \"exists\", \"not_exists\", \"time_elapsed_gt\" (paid plan only) or \"time_elapsed_lt\" (paid plan only) See Time Operators key = Tag key to compare. value = Tag value to compare. Not required for \"exists\" or \"not_exists\". Example: See Formatting Filters 
-    attr_accessor :tag
-
-    # relation = \"=\" or \"!=\" value = 2 character language code. Example: \"en\". For a list of all language codes see Language & Localization. 
-    attr_accessor :language
-
-    # relation = \">\", \"<\", \"=\" or \"!=\" value = app version. Example: \"1.0.0\" 
-    attr_accessor :app_version
-
-    # radius = in meters lat = latitude long = longitude 
-    attr_accessor :location
-
-    # value = email address Only for sending Push Notifications Use this for targeting push subscribers associated with an email set with all SDK setEmail methods To send emails to specific email addresses use include_email_tokens parameter 
-    attr_accessor :email
-
-    # relation = \"=\" value = 2-digit Country code Example: \"field\": \"country\", \"relation\": \"=\", \"value\", \"US\" 
-    attr_accessor :country
-
     # Specific playerids to send your notification to. _Does not require API Auth Key. Do not combine with other targeting parameters. Not compatible with any other targeting parameters. Example: [\"1dd608f2-c6a1-11e3-851d-000c2940e62c\"] Limit of 2,000 entries per REST API call 
     attr_accessor :include_player_ids
 
-    # Target specific devices by custom user IDs assigned via API. Not compatible with any other targeting parameters Example: [“custom-id-assigned-by-api”] REQUIRED: REST API Key Authentication Limit of 2,000 entries per REST API call. Note: If targeting push, email, or sms subscribers with same ids, use with channel_for_external_user_ids to indicate you are sending a push or email or sms. 
+    # Target specific devices by custom user IDs assigned via API. Not compatible with any other targeting parameters Example: [\"custom-id-assigned-by-api\"] REQUIRED: REST API Key Authentication Limit of 2,000 entries per REST API call. Note: If targeting push, email, or sms subscribers with same ids, use with channel_for_external_user_ids to indicate you are sending a push or email or sms. 
     attr_accessor :include_external_user_ids
 
     # Recommended for Sending Emails - Target specific email addresses. If an email does not correspond to an existing user, a new user will be created. Example: nick@catfac.ts Limit of 2,000 entries per REST API call 
@@ -87,10 +51,17 @@ module OneSignal
     # Not Recommended: Please consider using include_player_ids or include_external_user_ids instead. Target using Android device registration IDs. If a token does not correspond to an existing user, a new user will be created. Example: APA91bEeiUeSukAAUdnw3O2RB45FWlSpgJ7Ji_... Limit of 2,000 entries per REST API call 
     attr_accessor :include_android_reg_ids
 
+    attr_accessor :include_aliases
+
+    attr_accessor :target_channel
+
     attr_accessor :id
 
     attr_accessor :value
 
+    # Required for SMS Messages. An identifier for tracking message within the OneSignal dashboard or export analytics. Not shown to end user.
+    attr_accessor :name
+
     attr_accessor :aggregation
 
     # Indicates whether to send to all devices registered under your app's Apple iOS platform.
@@ -129,9 +100,12 @@ module OneSignal
     # Required: Your OneSignal Application ID, which can be found in Keys & IDs. It is a UUID and looks similar to 8250eaf6-1a58-489e-b136-7c74a864b434. 
     attr_accessor :app_id
 
-    # Correlation and idempotency key. A request received with this parameter will first look for another notification with the same external_id. If one exists, a notification will not be sent, and result of the previous operation will instead be returned. Therefore, if you plan on using this feature, it's important to use a good source of randomness to generate the UUID passed here. This key is only idempotent for 30 days. After 30 days, the notification could be removed from our system and a notification with the same external_id will be sent again.   See Idempotent Notification Requests for more details writeOnly: true 
+    # [DEPRECATED] Correlation and idempotency key. A request received with this parameter will first look for another notification with the same external_id. If one exists, a notification will not be sent, and result of the previous operation will instead be returned. Therefore, if you plan on using this feature, it's important to use a good source of randomness to generate the UUID passed here. This key is only idempotent for 30 days. After 30 days, the notification could be removed from our system and a notification with the same external_id will be sent again.   See Idempotent Notification Requests for more details writeOnly: true 
     attr_accessor :external_id
 
+    # Correlation and idempotency key. A request received with this parameter will first look for another notification with the same idempotency key. If one exists, a notification will not be sent, and result of the previous operation will instead be returned. Therefore, if you plan on using this feature, it's important to use a good source of randomness to generate the UUID passed here. This key is only idempotent for 30 days. After 30 days, the notification could be removed from our system and a notification with the same idempotency key will be sent again.   See Idempotent Notification Requests for more details writeOnly: true 
+    attr_accessor :idempotency_key
+
     attr_accessor :contents
 
     attr_accessor :headings
@@ -239,34 +213,34 @@ module OneSignal
     # Channel: Push Notifications Platform: iOS Sound file that is included in your app to play instead of the default device notification sound. Pass nil to disable vibration and sound for the notification. Example: \"notification.wav\" 
     attr_accessor :ios_sound
 
-    # Channel: Push Notifications Platform: Android ⚠Deprecated, this field doesn't work on Android 8 (Oreo) and newer devices! Please use Notification Categories / Channels noted above instead to support ALL versions of Android. Sound file that is included in your app to play instead of the default device notification sound. Pass nil to disable sound for the notification. NOTE: Leave off file extension for Android. Example: \"notification\" 
+    # Channel: Push Notifications Platform: Android &#9888;&#65039;Deprecated, this field doesn't work on Android 8 (Oreo) and newer devices! Please use Notification Categories / Channels noted above instead to support ALL versions of Android. Sound file that is included in your app to play instead of the default device notification sound. Pass nil to disable sound for the notification. NOTE: Leave off file extension for Android. Example: \"notification\" 
     attr_accessor :android_sound
 
-    # Channel: Push Notifications Platform: Huawei ⚠Deprecated, this field ONLY works on EMUI 5 (Android 7 based) and older devices. Please also set Notification Categories / Channels noted above to support EMUI 8 (Android 8 based) devices. Sound file that is included in your app to play instead of the default device notification sound. NOTE: Leave off file extension for and include the full path.  Example: \"/res/raw/notification\" 
+    # Channel: Push Notifications Platform: Huawei &#9888;&#65039;Deprecated, this field ONLY works on EMUI 5 (Android 7 based) and older devices. Please also set Notification Categories / Channels noted above to support EMUI 8 (Android 8 based) devices. Sound file that is included in your app to play instead of the default device notification sound. NOTE: Leave off file extension for and include the full path.  Example: \"/res/raw/notification\" 
     attr_accessor :huawei_sound
 
-    # Channel: Push Notifications Platform: Amazon ⚠Deprecated, this field doesn't work on Android 8 (Oreo) and newer devices! Please use Notification Categories / Channels noted above instead to support ALL versions of Android. Sound file that is included in your app to play instead of the default device notification sound. Pass nil to disable sound for the notification. NOTE: Leave off file extension for Android. Example: \"notification\" 
+    # Channel: Push Notifications Platform: Amazon &#9888;&#65039;Deprecated, this field doesn't work on Android 8 (Oreo) and newer devices! Please use Notification Categories / Channels noted above instead to support ALL versions of Android. Sound file that is included in your app to play instead of the default device notification sound. Pass nil to disable sound for the notification. NOTE: Leave off file extension for Android. Example: \"notification\" 
     attr_accessor :adm_sound
 
     # Channel: Push Notifications Platform: Windows Sound file that is included in your app to play instead of the default device notification sound. Example: \"notification.wav\" 
     attr_accessor :wp_wns_sound
 
-    # Channel: Push Notifications Platform: Android ⚠Deprecated, this field doesn't work on Android 8 (Oreo) and newer devices! Please use Notification Categories / Channels noted above instead to support ALL versions of Android. Sets the devices LED notification light if the device has one. ARGB Hex format. Example(Blue): \"FF0000FF\" 
+    # Channel: Push Notifications Platform: Android &#9888;&#65039;Deprecated, this field doesn't work on Android 8 (Oreo) and newer devices! Please use Notification Categories / Channels noted above instead to support ALL versions of Android. Sets the devices LED notification light if the device has one. ARGB Hex format. Example(Blue): \"FF0000FF\" 
     attr_accessor :android_led_color
 
-    # Channel: Push Notifications Platform: Huawei ⚠Deprecated, this field ONLY works on EMUI 5 (Android 7 based) and older devices. Please also set Notification Categories / Channels noted above to support EMUI 8 (Android 8 based) devices. Sets the devices LED notification light if the device has one. RGB Hex format. Example(Blue): \"0000FF\" 
+    # Channel: Push Notifications Platform: Huawei &#9888;&#65039;Deprecated, this field ONLY works on EMUI 5 (Android 7 based) and older devices. Please also set Notification Categories / Channels noted above to support EMUI 8 (Android 8 based) devices. Sets the devices LED notification light if the device has one. RGB Hex format. Example(Blue): \"0000FF\" 
     attr_accessor :huawei_led_color
 
     # Channel: Push Notifications Platform: Android Sets the background color of the notification circle to the left of the notification text. Only applies to apps targeting Android API level 21+ on Android 5.0+ devices. Example(Red): \"FFFF0000\" 
     attr_accessor :android_accent_color
 
-    # Channel: Push Notifications Platform: Huawei Accent Color used on Action Buttons and Group overflow count. Uses RGB Hex value (E.g. #9900FF). Defaults to device’s theme color if not set. 
+    # Channel: Push Notifications Platform: Huawei Accent Color used on Action Buttons and Group overflow count. Uses RGB Hex value (E.g. #9900FF). Defaults to device's theme color if not set. 
     attr_accessor :huawei_accent_color
 
-    # Channel: Push Notifications Platform: Android 5.0_ ⚠Deprecated, this field doesn't work on Android 8 (Oreo) and newer devices! Please use Notification Categories / Channels noted above instead to support ALL versions of Android. 1 = Public (default) (Shows the full message on the lock screen unless the user has disabled all notifications from showing on the lock screen. Please consider the user and mark private if the contents are.) 0 = Private (Hides message contents on lock screen if the user set \"Hide sensitive notification content\" in the system settings) -1 = Secret (Notification does not show on the lock screen at all) 
+    # Channel: Push Notifications Platform: Android 5.0_ &#9888;&#65039;Deprecated, this field doesn't work on Android 8 (Oreo) and newer devices! Please use Notification Categories / Channels noted above instead to support ALL versions of Android. 1 = Public (default) (Shows the full message on the lock screen unless the user has disabled all notifications from showing on the lock screen. Please consider the user and mark private if the contents are.) 0 = Private (Hides message contents on lock screen if the user set \"Hide sensitive notification content\" in the system settings) -1 = Secret (Notification does not show on the lock screen at all) 
     attr_accessor :android_visibility
 
-    # Channel: Push Notifications Platform: Huawei ⚠Deprecated, this field ONLY works on EMUI 5 (Android 7 based) and older devices. Please also set Notification Categories / Channels noted above to support EMUI 8 (Android 8 based) devices. 1 = Public (default) (Shows the full message on the lock screen unless the user has disabled all notifications from showing on the lock screen. Please consider the user and mark private if the contents are.) 0 = Private (Hides message contents on lock screen if the user set \"Hide sensitive notification content\" in the system settings) -1 = Secret (Notification does not show on the lock screen at all) 
+    # Channel: Push Notifications Platform: Huawei &#9888;&#65039;Deprecated, this field ONLY works on EMUI 5 (Android 7 based) and older devices. Please also set Notification Categories / Channels noted above to support EMUI 8 (Android 8 based) devices. 1 = Public (default) (Shows the full message on the lock screen unless the user has disabled all notifications from showing on the lock screen. Please consider the user and mark private if the contents are.) 0 = Private (Hides message contents on lock screen if the user set \"Hide sensitive notification content\" in the system settings) -1 = Secret (Notification does not show on the lock screen at all) 
     attr_accessor :huawei_visibility
 
     # Channel: Push Notifications Platform: iOS Describes whether to set or increase/decrease your app's iOS badge count by the ios_badgeCount specified count. Can specify None, SetTo, or Increase. `None` leaves the count unaffected. `SetTo` directly sets the badge count to the number specified in ios_badgeCount. `Increase` adds the number specified in ios_badgeCount to the total. Use a negative number to decrease the badge count. 
@@ -284,9 +258,6 @@ module OneSignal
     # Channel: Push Notifications Platform: iOS 10+ iOS can localize push notification messages on the client using special parameters such as loc-key. When using the Create Notification endpoint, you must include these parameters inside of a field called apns_alert. Please see Apple's guide on localizing push notifications to learn more. 
     attr_accessor :apns_alert
 
-    # Channel: All Schedule notification for future delivery. API defaults to UTC -1100 Examples: All examples are the exact same date & time. \"Thu Sep 24 2015 14:00:00 GMT-0700 (PDT)\" \"September 24th 2015, 2:00:00 pm UTC-07:00\" \"2015-09-24 14:00:00 GMT-0700\" \"Sept 24 2015 14:00:00 GMT-0700\" \"Thu Sep 24 2015 14:00:00 GMT-0700 (Pacific Daylight Time)\" Note: SMS currently only supports send_after parameter. 
-    attr_accessor :send_after
-
     # Channel: All Possible values are: timezone (Deliver at a specific time-of-day in each users own timezone) last-active Same as Intelligent Delivery . (Deliver at the same time of day as each user last used your app). If send_after is used, this takes effect after the send_after time has elapsed. 
     attr_accessor :delayed_option
 
@@ -327,7 +298,7 @@ module OneSignal
     attr_accessor :summary_arg_count
 
     # Channel: Email Required.  The subject of the email. 
-    attr_accessor :email_subect
+    attr_accessor :email_subject
 
     # Channel: Email Required unless template_id is set. HTML suported The body of the email you wish to send. Typically, customers include their own HTML templates here. Must include [unsubscribe_url] in an <a> tag somewhere in the email. Note: any malformed HTML content will be sent to users. Please double-check your HTML is valid. 
     attr_accessor :email_body
@@ -338,12 +309,26 @@ module OneSignal
     # Channel: Email The email address the email is from. If not specified, will default to \"from email\" set in the OneSignal Dashboard Email Settings. 
     attr_accessor :email_from_address
 
+    # Channel: Email The preheader text of the email. Preheader is the preview text displayed immediately after an email subject that provides additional context about the email content. If not specified, will default to null. 
+    attr_accessor :email_preheader
+
+    # Channel: Email Default is `false`. This field is used to send transactional notifications. If set to `true`, this notification will also be sent to unsubscribed emails. If a `template_id` is provided, the `include_unsubscribed` value from the template will be inherited. If you are using a third-party ESP, this field requires the ESP's list of unsubscribed emails to be cleared.
+    attr_accessor :include_unsubscribed
+
     # Channel: SMS Phone Number used to send SMS. Should be a registered Twilio phone number in E.164 format. 
     attr_accessor :sms_from
 
     # Channel: SMS URLs for the media files to be attached to the SMS content. Limit: 10 media urls with a total max. size of 5MBs. 
     attr_accessor :sms_media_urls
 
+    attr_accessor :filters
+
+    # Channel: All JSON object that can be used as a source of message personalization data for fields that support tag variable substitution. Push, SMS: Can accept up to 2048 bytes of valid JSON. Email: Can accept up to 10000 bytes of valid JSON. Example: {\"order_id\": 123, \"currency\": \"USD\", \"amount\": 25} 
+    attr_accessor :custom_data
+
+    # Channel: All Schedule notification for future delivery. API defaults to UTC -1100 Examples: All examples are the exact same date & time. \"Thu Sep 24 2015 14:00:00 GMT-0700 (PDT)\" \"September 24th 2015, 2:00:00 pm UTC-07:00\" \"2015-09-24 14:00:00 GMT-0700\" \"Sept 24 2015 14:00:00 GMT-0700\" \"Thu Sep 24 2015 14:00:00 GMT-0700 (Pacific Daylight Time)\" Note: SMS currently only supports send_after parameter. 
+    attr_accessor :send_after
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -371,18 +356,6 @@ module OneSignal
       {
         :'included_segments' => :'included_segments',
         :'excluded_segments' => :'excluded_segments',
-        :'last_session' => :'last_session',
-        :'first_session' => :'first_session',
-        :'session_count' => :'session_count',
-        :'session_time' => :'session_time',
-        :'amount_spent' => :'amount_spent',
-        :'bought_sku' => :'bought_sku',
-        :'tag' => :'tag',
-        :'language' => :'language',
-        :'app_version' => :'app_version',
-        :'location' => :'location',
-        :'email' => :'email',
-        :'country' => :'country',
         :'include_player_ids' => :'include_player_ids',
         :'include_external_user_ids' => :'include_external_user_ids',
         :'include_email_tokens' => :'include_email_tokens',
@@ -393,8 +366,11 @@ module OneSignal
         :'include_chrome_reg_ids' => :'include_chrome_reg_ids',
         :'include_chrome_web_reg_ids' => :'include_chrome_web_reg_ids',
         :'include_android_reg_ids' => :'include_android_reg_ids',
+        :'include_aliases' => :'include_aliases',
+        :'target_channel' => :'target_channel',
         :'id' => :'id',
         :'value' => :'value',
+        :'name' => :'name',
         :'aggregation' => :'aggregation',
         :'is_ios' => :'isIos',
         :'is_android' => :'isAndroid',
@@ -409,6 +385,7 @@ module OneSignal
         :'channel_for_external_user_ids' => :'channel_for_external_user_ids',
         :'app_id' => :'app_id',
         :'external_id' => :'external_id',
+        :'idempotency_key' => :'idempotency_key',
         :'contents' => :'contents',
         :'headings' => :'headings',
         :'subtitle' => :'subtitle',
@@ -461,7 +438,6 @@ module OneSignal
         :'collapse_id' => :'collapse_id',
         :'web_push_topic' => :'web_push_topic',
         :'apns_alert' => :'apns_alert',
-        :'send_after' => :'send_after',
         :'delayed_option' => :'delayed_option',
         :'delivery_time_of_day' => :'delivery_time_of_day',
         :'ttl' => :'ttl',
@@ -475,12 +451,17 @@ module OneSignal
         :'thread_id' => :'thread_id',
         :'summary_arg' => :'summary_arg',
         :'summary_arg_count' => :'summary_arg_count',
-        :'email_subect' => :'email_subect',
+        :'email_subject' => :'email_subject',
         :'email_body' => :'email_body',
         :'email_from_name' => :'email_from_name',
         :'email_from_address' => :'email_from_address',
+        :'email_preheader' => :'email_preheader',
+        :'include_unsubscribed' => :'include_unsubscribed',
         :'sms_from' => :'sms_from',
-        :'sms_media_urls' => :'sms_media_urls'
+        :'sms_media_urls' => :'sms_media_urls',
+        :'filters' => :'filters',
+        :'custom_data' => :'custom_data',
+        :'send_after' => :'send_after'
       }
     end
 
@@ -494,18 +475,6 @@ module OneSignal
       {
         :'included_segments' => :'Array<String>',
         :'excluded_segments' => :'Array<String>',
-        :'last_session' => :'String',
-        :'first_session' => :'String',
-        :'session_count' => :'String',
-        :'session_time' => :'String',
-        :'amount_spent' => :'String',
-        :'bought_sku' => :'String',
-        :'tag' => :'String',
-        :'language' => :'String',
-        :'app_version' => :'String',
-        :'location' => :'String',
-        :'email' => :'String',
-        :'country' => :'String',
         :'include_player_ids' => :'Array<String>',
         :'include_external_user_ids' => :'Array<String>',
         :'include_email_tokens' => :'Array<String>',
@@ -516,8 +485,11 @@ module OneSignal
         :'include_chrome_reg_ids' => :'Array<String>',
         :'include_chrome_web_reg_ids' => :'Array<String>',
         :'include_android_reg_ids' => :'Array<String>',
+        :'include_aliases' => :'PlayerNotificationTargetIncludeAliases',
+        :'target_channel' => :'String',
         :'id' => :'String',
         :'value' => :'Integer',
+        :'name' => :'String',
         :'aggregation' => :'String',
         :'is_ios' => :'Boolean',
         :'is_android' => :'Boolean',
@@ -532,6 +504,7 @@ module OneSignal
         :'channel_for_external_user_ids' => :'String',
         :'app_id' => :'String',
         :'external_id' => :'String',
+        :'idempotency_key' => :'String',
         :'contents' => :'StringMap',
         :'headings' => :'StringMap',
         :'subtitle' => :'StringMap',
@@ -557,7 +530,7 @@ module OneSignal
         :'huawei_channel_id' => :'String',
         :'existing_android_channel_id' => :'String',
         :'huawei_existing_channel_id' => :'String',
-        :'android_background_layout' => :'NotificationAllOfAndroidBackgroundLayout',
+        :'android_background_layout' => :'BasicNotificationAllOfAndroidBackgroundLayout',
         :'small_icon' => :'String',
         :'huawei_small_icon' => :'String',
         :'large_icon' => :'String',
@@ -584,7 +557,6 @@ module OneSignal
         :'collapse_id' => :'String',
         :'web_push_topic' => :'String',
         :'apns_alert' => :'Object',
-        :'send_after' => :'String',
         :'delayed_option' => :'String',
         :'delivery_time_of_day' => :'String',
         :'ttl' => :'Integer',
@@ -598,26 +570,113 @@ module OneSignal
         :'thread_id' => :'String',
         :'summary_arg' => :'String',
         :'summary_arg_count' => :'Integer',
-        :'email_subect' => :'String',
+        :'email_subject' => :'String',
         :'email_body' => :'String',
         :'email_from_name' => :'String',
         :'email_from_address' => :'String',
+        :'email_preheader' => :'String',
+        :'include_unsubscribed' => :'Boolean',
         :'sms_from' => :'String',
-        :'sms_media_urls' => :'Array<String>'
+        :'sms_media_urls' => :'Array<String>',
+        :'filters' => :'Array<Filter>',
+        :'custom_data' => :'Object',
+        :'send_after' => :'Time'
       }
     end
 
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
+        :'include_player_ids',
+        :'include_external_user_ids',
+        :'include_aliases',
+        :'name',
+        :'is_ios',
+        :'is_android',
+        :'is_huawei',
+        :'is_any_web',
+        :'is_chrome_web',
+        :'is_firefox',
+        :'is_safari',
+        :'is_wp_wns',
+        :'is_adm',
+        :'is_chrome',
+        :'external_id',
+        :'idempotency_key',
+        :'contents',
+        :'headings',
+        :'subtitle',
+        :'data',
+        :'huawei_msg_type',
+        :'url',
+        :'web_url',
+        :'app_url',
+        :'ios_attachments',
+        :'template_id',
+        :'content_available',
+        :'target_content_identifier',
+        :'big_picture',
+        :'huawei_big_picture',
+        :'adm_big_picture',
+        :'chrome_big_picture',
+        :'chrome_web_image',
+        :'buttons',
+        :'web_buttons',
+        :'ios_category',
+        :'huawei_channel_id',
+        :'huawei_existing_channel_id',
+        :'small_icon',
+        :'huawei_small_icon',
+        :'large_icon',
+        :'huawei_large_icon',
+        :'adm_small_icon',
+        :'adm_large_icon',
+        :'chrome_web_icon',
+        :'chrome_web_badge',
+        :'firefox_icon',
+        :'chrome_icon',
+        :'ios_sound',
+        :'android_sound',
+        :'huawei_sound',
+        :'adm_sound',
+        :'wp_wns_sound',
+        :'android_led_color',
+        :'huawei_led_color',
+        :'android_accent_color',
+        :'huawei_accent_color',
+        :'android_visibility',
+        :'huawei_visibility',
+        :'ios_badge_type',
+        :'ios_badge_count',
+        :'web_push_topic',
+        :'apns_alert',
+        :'delayed_option',
+        :'delivery_time_of_day',
+        :'ttl',
+        :'priority',
+        :'throttle_rate_per_minute',
+        :'android_group',
+        :'android_group_message',
+        :'adm_group',
+        :'adm_group_message',
+        :'thread_id',
+        :'email_subject',
+        :'email_from_name',
+        :'email_from_address',
+        :'email_preheader',
+        :'sms_from',
+        :'sms_media_urls',
+        :'filters',
+        :'custom_data',
+        :'send_after'
       ])
     end
 
     # List of class defined in allOf (OpenAPI v3)
     def self.openapi_all_of
       [
-      :'NotificationAllOf',
-      :'NotificationTarget'
+      :'BasicNotification',
+      :'NotificationAllOf'
       ]
     end
 
@@ -648,54 +707,6 @@ module OneSignal
         end
       end
 
-      if attributes.key?(:'last_session')
-        self.last_session = attributes[:'last_session']
-      end
-
-      if attributes.key?(:'first_session')
-        self.first_session = attributes[:'first_session']
-      end
-
-      if attributes.key?(:'session_count')
-        self.session_count = attributes[:'session_count']
-      end
-
-      if attributes.key?(:'session_time')
-        self.session_time = attributes[:'session_time']
-      end
-
-      if attributes.key?(:'amount_spent')
-        self.amount_spent = attributes[:'amount_spent']
-      end
-
-      if attributes.key?(:'bought_sku')
-        self.bought_sku = attributes[:'bought_sku']
-      end
-
-      if attributes.key?(:'tag')
-        self.tag = attributes[:'tag']
-      end
-
-      if attributes.key?(:'language')
-        self.language = attributes[:'language']
-      end
-
-      if attributes.key?(:'app_version')
-        self.app_version = attributes[:'app_version']
-      end
-
-      if attributes.key?(:'location')
-        self.location = attributes[:'location']
-      end
-
-      if attributes.key?(:'email')
-        self.email = attributes[:'email']
-      end
-
-      if attributes.key?(:'country')
-        self.country = attributes[:'country']
-      end
-
       if attributes.key?(:'include_player_ids')
         if (value = attributes[:'include_player_ids']).is_a?(Array)
           self.include_player_ids = value
@@ -756,6 +767,14 @@ module OneSignal
         end
       end
 
+      if attributes.key?(:'include_aliases')
+        self.include_aliases = attributes[:'include_aliases']
+      end
+
+      if attributes.key?(:'target_channel')
+        self.target_channel = attributes[:'target_channel']
+      end
+
       if attributes.key?(:'id')
         self.id = attributes[:'id']
       end
@@ -764,14 +783,16 @@ module OneSignal
         self.value = attributes[:'value']
       end
 
+      if attributes.key?(:'name')
+        self.name = attributes[:'name']
+      end
+
       if attributes.key?(:'aggregation')
         self.aggregation = attributes[:'aggregation']
       end
 
       if attributes.key?(:'is_ios')
         self.is_ios = attributes[:'is_ios']
-      else
-        self.is_ios = true
       end
 
       if attributes.key?(:'is_android')
@@ -822,6 +843,10 @@ module OneSignal
         self.external_id = attributes[:'external_id']
       end
 
+      if attributes.key?(:'idempotency_key')
+        self.idempotency_key = attributes[:'idempotency_key']
+      end
+
       if attributes.key?(:'contents')
         self.contents = attributes[:'contents']
       end
@@ -1034,10 +1059,6 @@ module OneSignal
         self.apns_alert = attributes[:'apns_alert']
       end
 
-      if attributes.key?(:'send_after')
-        self.send_after = attributes[:'send_after']
-      end
-
       if attributes.key?(:'delayed_option')
         self.delayed_option = attributes[:'delayed_option']
       end
@@ -1090,8 +1111,8 @@ module OneSignal
         self.summary_arg_count = attributes[:'summary_arg_count']
       end
 
-      if attributes.key?(:'email_subect')
-        self.email_subect = attributes[:'email_subect']
+      if attributes.key?(:'email_subject')
+        self.email_subject = attributes[:'email_subject']
       end
 
       if attributes.key?(:'email_body')
@@ -1106,6 +1127,14 @@ module OneSignal
         self.email_from_address = attributes[:'email_from_address']
       end
 
+      if attributes.key?(:'email_preheader')
+        self.email_preheader = attributes[:'email_preheader']
+      end
+
+      if attributes.key?(:'include_unsubscribed')
+        self.include_unsubscribed = attributes[:'include_unsubscribed']
+      end
+
       if attributes.key?(:'sms_from')
         self.sms_from = attributes[:'sms_from']
       end
@@ -1115,6 +1144,20 @@ module OneSignal
           self.sms_media_urls = value
         end
       end
+
+      if attributes.key?(:'filters')
+        if (value = attributes[:'filters']).is_a?(Array)
+          self.filters = value
+        end
+      end
+
+      if attributes.key?(:'custom_data')
+        self.custom_data = attributes[:'custom_data']
+      end
+
+      if attributes.key?(:'send_after')
+        self.send_after = attributes[:'send_after']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -1131,12 +1174,24 @@ module OneSignal
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      target_channel_validator = EnumAttributeValidator.new('String', ["push", "email", "sms"])
+      return false unless target_channel_validator.valid?(@target_channel)
       aggregation_validator = EnumAttributeValidator.new('String', ["sum", "count"])
       return false unless aggregation_validator.valid?(@aggregation)
       return false if @app_id.nil?
       true
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] target_channel Object to be assigned
+    def target_channel=(target_channel)
+      validator = EnumAttributeValidator.new('String', ["push", "email", "sms"])
+      unless validator.valid?(target_channel)
+        fail ArgumentError, "invalid value for \"target_channel\", must be one of #{validator.allowable_values}."
+      end
+      @target_channel = target_channel
+    end
+
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] aggregation Object to be assigned
     def aggregation=(aggregation)
@@ -1154,18 +1209,6 @@ module OneSignal
       self.class == o.class &&
           included_segments == o.included_segments &&
           excluded_segments == o.excluded_segments &&
-          last_session == o.last_session &&
-          first_session == o.first_session &&
-          session_count == o.session_count &&
-          session_time == o.session_time &&
-          amount_spent == o.amount_spent &&
-          bought_sku == o.bought_sku &&
-          tag == o.tag &&
-          language == o.language &&
-          app_version == o.app_version &&
-          location == o.location &&
-          email == o.email &&
-          country == o.country &&
           include_player_ids == o.include_player_ids &&
           include_external_user_ids == o.include_external_user_ids &&
           include_email_tokens == o.include_email_tokens &&
@@ -1176,8 +1219,11 @@ module OneSignal
           include_chrome_reg_ids == o.include_chrome_reg_ids &&
           include_chrome_web_reg_ids == o.include_chrome_web_reg_ids &&
           include_android_reg_ids == o.include_android_reg_ids &&
+          include_aliases == o.include_aliases &&
+          target_channel == o.target_channel &&
           id == o.id &&
           value == o.value &&
+          name == o.name &&
           aggregation == o.aggregation &&
           is_ios == o.is_ios &&
           is_android == o.is_android &&
@@ -1192,6 +1238,7 @@ module OneSignal
           channel_for_external_user_ids == o.channel_for_external_user_ids &&
           app_id == o.app_id &&
           external_id == o.external_id &&
+          idempotency_key == o.idempotency_key &&
           contents == o.contents &&
           headings == o.headings &&
           subtitle == o.subtitle &&
@@ -1244,7 +1291,6 @@ module OneSignal
           collapse_id == o.collapse_id &&
           web_push_topic == o.web_push_topic &&
           apns_alert == o.apns_alert &&
-          send_after == o.send_after &&
           delayed_option == o.delayed_option &&
           delivery_time_of_day == o.delivery_time_of_day &&
           ttl == o.ttl &&
@@ -1258,12 +1304,17 @@ module OneSignal
           thread_id == o.thread_id &&
           summary_arg == o.summary_arg &&
           summary_arg_count == o.summary_arg_count &&
-          email_subect == o.email_subect &&
+          email_subject == o.email_subject &&
           email_body == o.email_body &&
           email_from_name == o.email_from_name &&
           email_from_address == o.email_from_address &&
+          email_preheader == o.email_preheader &&
+          include_unsubscribed == o.include_unsubscribed &&
           sms_from == o.sms_from &&
-          sms_media_urls == o.sms_media_urls
+          sms_media_urls == o.sms_media_urls &&
+          filters == o.filters &&
+          custom_data == o.custom_data &&
+          send_after == o.send_after
     end
 
     # @see the `==` method
@@ -1275,7 +1326,7 @@ module OneSignal
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [included_segments, excluded_segments, last_session, first_session, session_count, session_time, amount_spent, bought_sku, tag, language, app_version, location, email, country, include_player_ids, include_external_user_ids, include_email_tokens, include_phone_numbers, include_ios_tokens, include_wp_wns_uris, include_amazon_reg_ids, include_chrome_reg_ids, include_chrome_web_reg_ids, include_android_reg_ids, id, value, aggregation, is_ios, is_android, is_huawei, is_any_web, is_chrome_web, is_firefox, is_safari, is_wp_wns, is_adm, is_chrome, channel_for_external_user_ids, app_id, external_id, contents, headings, subtitle, data, huawei_msg_type, url, web_url, app_url, ios_attachments, template_id, content_available, mutable_content, target_content_identifier, big_picture, huawei_big_picture, adm_big_picture, chrome_big_picture, chrome_web_image, buttons, web_buttons, ios_category, android_channel_id, huawei_channel_id, existing_android_channel_id, huawei_existing_channel_id, android_background_layout, small_icon, huawei_small_icon, large_icon, huawei_large_icon, adm_small_icon, adm_large_icon, chrome_web_icon, chrome_web_badge, firefox_icon, chrome_icon, ios_sound, android_sound, huawei_sound, adm_sound, wp_wns_sound, android_led_color, huawei_led_color, android_accent_color, huawei_accent_color, android_visibility, huawei_visibility, ios_badge_type, ios_badge_count, collapse_id, web_push_topic, apns_alert, send_after, delayed_option, delivery_time_of_day, ttl, priority, apns_push_type_override, throttle_rate_per_minute, android_group, android_group_message, adm_group, adm_group_message, thread_id, summary_arg, summary_arg_count, email_subect, email_body, email_from_name, email_from_address, sms_from, sms_media_urls].hash
+      [included_segments, excluded_segments, include_player_ids, include_external_user_ids, include_email_tokens, include_phone_numbers, include_ios_tokens, include_wp_wns_uris, include_amazon_reg_ids, include_chrome_reg_ids, include_chrome_web_reg_ids, include_android_reg_ids, include_aliases, target_channel, id, value, name, aggregation, is_ios, is_android, is_huawei, is_any_web, is_chrome_web, is_firefox, is_safari, is_wp_wns, is_adm, is_chrome, channel_for_external_user_ids, app_id, external_id, idempotency_key, contents, headings, subtitle, data, huawei_msg_type, url, web_url, app_url, ios_attachments, template_id, content_available, mutable_content, target_content_identifier, big_picture, huawei_big_picture, adm_big_picture, chrome_big_picture, chrome_web_image, buttons, web_buttons, ios_category, android_channel_id, huawei_channel_id, existing_android_channel_id, huawei_existing_channel_id, android_background_layout, small_icon, huawei_small_icon, large_icon, huawei_large_icon, adm_small_icon, adm_large_icon, chrome_web_icon, chrome_web_badge, firefox_icon, chrome_icon, ios_sound, android_sound, huawei_sound, adm_sound, wp_wns_sound, android_led_color, huawei_led_color, android_accent_color, huawei_accent_color, android_visibility, huawei_visibility, ios_badge_type, ios_badge_count, collapse_id, web_push_topic, apns_alert, delayed_option, delivery_time_of_day, ttl, priority, apns_push_type_override, throttle_rate_per_minute, android_group, android_group_message, adm_group, adm_group_message, thread_id, summary_arg, summary_arg_count, email_subject, email_body, email_from_name, email_from_address, email_preheader, include_unsubscribed, sms_from, sms_media_urls, filters, custom_data, send_after].hash
     end
 
     # Builds the object from hash
@@ -1290,6 +1341,7 @@ module OneSignal
     # @return [Object] Returns the model itself
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
+      attributes = attributes.transform_keys(&:to_sym)
       self.class.openapi_types.each_pair do |key, type|
         if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
           self.send("#{key}=", nil)