add collapseId to OSNotification

Author: emawby

iOS_SDK/OneSignalSDK/Source/OSNotification.m

@@ -130,6 +130,7 @@ - (void)parseCommonOneSignalFields:(NSDictionary*)payload {
     _templateId = payload[@"ti"];
     _templateName = payload[@"tn"];
     _badgeIncrement = [payload[@"badge_inc"] integerValue];
+    _collapseId = payload[@"collapse_id"];
 }
 
 - (void)parseApnsFields {
@@ -216,7 +217,7 @@ - (void)parseOtherApnsFields {
 }
 
 - (NSString *)description {
-    return [NSString stringWithFormat: @"notificationId=%@ templateId=%@ templateName=%@ contentAvailable=%@ mutableContent=%@ category=%@ relevanceScore=%@ interruptionLevel=%@ rawPayload=%@", _notificationId, _templateId, _templateName, _contentAvailable ? @"YES" : @"NO", _mutableContent ? @"YES" : @"NO", _category, _relevanceScore, _interruptionLevel, _rawPayload];
+    return [NSString stringWithFormat: @"notificationId=%@ templateId=%@ templateName=%@ contentAvailable=%@ mutableContent=%@ category=%@ relevanceScore=%@ interruptionLevel=%@ collapseId=%@ rawPayload=%@", _notificationId, _templateId, _templateName, _contentAvailable ? @"YES" : @"NO", _mutableContent ? @"YES" : @"NO", _category, _relevanceScore, _interruptionLevel, _collapseId, _rawPayload];
 }
 
 - (NSDictionary *)jsonRepresentation {
@@ -281,6 +282,9 @@ - (NSDictionary *)jsonRepresentation {
 
     if (self.interruptionLevel)
         [obj setObject:self.interruptionLevel forKeyedSubscript: @"interruptionLevel"];
+    
+    if (self.collapseId)
+        [obj setObject:self.collapseId forKeyedSubscript: @"collapseId"];
 
     return obj;
 }

iOS_SDK/OneSignalSDK/Source/OneSignal.h

@@ -136,6 +136,8 @@ typedef NS_ENUM(NSUInteger, OSNotificationActionType)  {
 /* iOS 15+ : Interruption Level */
 @property(readonly)NSString *interruptionLevel;
 
+@property(readonly, nullable)NSString *collapseId;
+
 /* Parses an APNS push payload into a OSNotification object.
    Useful to call from your NotificationServiceExtension when the
       didReceiveNotificationRequest:withContentHandler: method fires. */