SWI-8645 Fix Multi-Channel Messaging Schemas

.openapi-generator/FILES

@@ -111,14 +111,22 @@ bandwidth/models/mms_message_content.py
 bandwidth/models/mms_message_content_file.py
 bandwidth/models/multi_channel_action.py
 bandwidth/models/multi_channel_action_calendar_event.py
-bandwidth/models/multi_channel_channel_list_object.py
-bandwidth/models/multi_channel_channel_list_object_content.py
+bandwidth/models/multi_channel_channel_list_mms_object.py
+bandwidth/models/multi_channel_channel_list_mms_response_object.py
+bandwidth/models/multi_channel_channel_list_object_base.py
+bandwidth/models/multi_channel_channel_list_owner_object.py
+bandwidth/models/multi_channel_channel_list_rbm_object.py
+bandwidth/models/multi_channel_channel_list_rbm_object_all_of_content.py
+bandwidth/models/multi_channel_channel_list_rbm_response_object.py
+bandwidth/models/multi_channel_channel_list_request_object.py
+bandwidth/models/multi_channel_channel_list_response_object.py
+bandwidth/models/multi_channel_channel_list_sms_object.py
+bandwidth/models/multi_channel_channel_list_sms_response_object.py
 bandwidth/models/multi_channel_error.py
 bandwidth/models/multi_channel_message_channel_enum.py
 bandwidth/models/multi_channel_message_content.py
 bandwidth/models/multi_channel_message_request.py
 bandwidth/models/multi_channel_message_response_data.py
-bandwidth/models/multi_channel_message_response_data_channel_list_inner.py
 bandwidth/models/opt_in_workflow.py
 bandwidth/models/page_info.py
 bandwidth/models/priority_enum.py
@@ -285,14 +293,22 @@ docs/MmsMessageContentFile.md
 docs/MultiChannelAction.md
 docs/MultiChannelActionCalendarEvent.md
 docs/MultiChannelApi.md
-docs/MultiChannelChannelListObject.md
-docs/MultiChannelChannelListObjectContent.md
+docs/MultiChannelChannelListMMSObject.md
+docs/MultiChannelChannelListMMSResponseObject.md
+docs/MultiChannelChannelListObjectBase.md
+docs/MultiChannelChannelListOwnerObject.md
+docs/MultiChannelChannelListRBMObject.md
+docs/MultiChannelChannelListRBMObjectAllOfContent.md
+docs/MultiChannelChannelListRBMResponseObject.md
+docs/MultiChannelChannelListRequestObject.md
+docs/MultiChannelChannelListResponseObject.md
+docs/MultiChannelChannelListSMSObject.md
+docs/MultiChannelChannelListSMSResponseObject.md
 docs/MultiChannelError.md
 docs/MultiChannelMessageChannelEnum.md
 docs/MultiChannelMessageContent.md
 docs/MultiChannelMessageRequest.md
 docs/MultiChannelMessageResponseData.md
-docs/MultiChannelMessageResponseDataChannelListInner.md
 docs/OptInWorkflow.md
 docs/PageInfo.md
 docs/PhoneNumberLookupApi.md

README.md

@@ -243,14 +243,22 @@ Class | Method | HTTP request | Description
  - [MmsMessageContentFile](docs/MmsMessageContentFile.md)
  - [MultiChannelAction](docs/MultiChannelAction.md)
  - [MultiChannelActionCalendarEvent](docs/MultiChannelActionCalendarEvent.md)
- - [MultiChannelChannelListObject](docs/MultiChannelChannelListObject.md)
- - [MultiChannelChannelListObjectContent](docs/MultiChannelChannelListObjectContent.md)
+ - [MultiChannelChannelListMMSObject](docs/MultiChannelChannelListMMSObject.md)
+ - [MultiChannelChannelListMMSResponseObject](docs/MultiChannelChannelListMMSResponseObject.md)
+ - [MultiChannelChannelListObjectBase](docs/MultiChannelChannelListObjectBase.md)
+ - [MultiChannelChannelListOwnerObject](docs/MultiChannelChannelListOwnerObject.md)
+ - [MultiChannelChannelListRBMObject](docs/MultiChannelChannelListRBMObject.md)
+ - [MultiChannelChannelListRBMObjectAllOfContent](docs/MultiChannelChannelListRBMObjectAllOfContent.md)
+ - [MultiChannelChannelListRBMResponseObject](docs/MultiChannelChannelListRBMResponseObject.md)
+ - [MultiChannelChannelListRequestObject](docs/MultiChannelChannelListRequestObject.md)
+ - [MultiChannelChannelListResponseObject](docs/MultiChannelChannelListResponseObject.md)
+ - [MultiChannelChannelListSMSObject](docs/MultiChannelChannelListSMSObject.md)
+ - [MultiChannelChannelListSMSResponseObject](docs/MultiChannelChannelListSMSResponseObject.md)
  - [MultiChannelError](docs/MultiChannelError.md)
  - [MultiChannelMessageChannelEnum](docs/MultiChannelMessageChannelEnum.md)
  - [MultiChannelMessageContent](docs/MultiChannelMessageContent.md)
  - [MultiChannelMessageRequest](docs/MultiChannelMessageRequest.md)
  - [MultiChannelMessageResponseData](docs/MultiChannelMessageResponseData.md)
- - [MultiChannelMessageResponseDataChannelListInner](docs/MultiChannelMessageResponseDataChannelListInner.md)
  - [OptInWorkflow](docs/OptInWorkflow.md)
  - [PageInfo](docs/PageInfo.md)
  - [PriorityEnum](docs/PriorityEnum.md)

bandwidth.yml

@@ -2490,7 +2490,7 @@ components:
         $ref: '#/components/schemas/multiChannelAction'
       maxItems: 11
     multiChannelAction:
-      oneOf:
+      anyOf:
         - $ref: '#/components/schemas/rbmActionBase'
         - $ref: '#/components/schemas/rbmActionDial'
         - $ref: '#/components/schemas/rbmActionViewLocation'
@@ -2505,7 +2505,7 @@ components:
           CREATE_CALENDAR_EVENT: '#/components/schemas/multiChannelActionCalendarEvent'
           OPEN_URL: '#/components/schemas/rbmActionOpenUrl'
           REQUEST_LOCATION: '#/components/schemas/rbmActionBase'
-    multiChannelChannelListObject:
+    multiChannelChannelListObjectBase:
       type: object
       properties:
         from:
@@ -2514,19 +2514,85 @@ components:
           $ref: '#/components/schemas/applicationId'
         channel:
           $ref: '#/components/schemas/multiChannelMessageChannelEnum'
-        content:
-          description: The content of the message.
-          oneOf:
-            - $ref: '#/components/schemas/rbmMessageContentText'
-            - $ref: '#/components/schemas/rbmMessageMedia'
-            - $ref: '#/components/schemas/rbmMessageContentRichCard'
-            - $ref: '#/components/schemas/smsMessageContent'
-            - $ref: '#/components/schemas/mmsMessageContent'
       required:
         - from
         - applicationId
         - channel
+    multiChannelChannelListRBMObject:
+      allOf:
+        - $ref: '#/components/schemas/multiChannelChannelListObjectBase'
+        - type: object
+          properties:
+            content:
+              description: The content of the message.
+              oneOf:
+                - $ref: '#/components/schemas/rbmMessageContentText'
+                - $ref: '#/components/schemas/rbmMessageMedia'
+                - $ref: '#/components/schemas/rbmMessageContentRichCard'
+      required:
         - content
+    multiChannelChannelListSMSObject:
+      allOf:
+        - $ref: '#/components/schemas/multiChannelChannelListObjectBase'
+        - type: object
+          properties:
+            content:
+              $ref: '#/components/schemas/smsMessageContent'
+      required:
+        - content
+    multiChannelChannelListMMSObject:
+      allOf:
+        - $ref: '#/components/schemas/multiChannelChannelListObjectBase'
+        - type: object
+          properties:
+            content:
+              $ref: '#/components/schemas/mmsMessageContent'
+      required:
+        - content
+    multiChannelChannelListRBMResponseObject:
+      allOf:
+        - $ref: '#/components/schemas/multiChannelChannelListRBMObject'
+        - $ref: '#/components/schemas/multiChannelChannelListOwnerObject'
+    multiChannelChannelListSMSResponseObject:
+      allOf:
+        - $ref: '#/components/schemas/multiChannelChannelListSMSObject'
+        - $ref: '#/components/schemas/multiChannelChannelListOwnerObject'
+    multiChannelChannelListMMSResponseObject:
+      allOf:
+        - $ref: '#/components/schemas/multiChannelChannelListMMSObject'
+        - $ref: '#/components/schemas/multiChannelChannelListOwnerObject'
+    multiChannelChannelListRequestObject:
+      anyOf:
+        - $ref: '#/components/schemas/multiChannelChannelListRBMObject'
+        - $ref: '#/components/schemas/multiChannelChannelListSMSObject'
+        - $ref: '#/components/schemas/multiChannelChannelListMMSObject'
+      discriminator:
+        propertyName: channel
+        mapping:
+          RBM: '#/components/schemas/multiChannelChannelListRBMObject'
+          SMS: '#/components/schemas/multiChannelChannelListSMSObject'
+          MMS: '#/components/schemas/multiChannelChannelListMMSObject'
+    multiChannelChannelListOwnerObject:
+      type: object
+      properties:
+        owner:
+          type: string
+          description: >-
+            The Bandwidth senderId associated with the message. Identical to
+            'from'.
+      required:
+        - owner
+    multiChannelChannelListResponseObject:
+      anyOf:
+        - $ref: '#/components/schemas/multiChannelChannelListRBMResponseObject'
+        - $ref: '#/components/schemas/multiChannelChannelListSMSResponseObject'
+        - $ref: '#/components/schemas/multiChannelChannelListMMSResponseObject'
+      discriminator:
+        propertyName: channel
+        mapping:
+          RBM: '#/components/schemas/multiChannelChannelListRBMResponseObject'
+          SMS: '#/components/schemas/multiChannelChannelListSMSResponseObject'
+          MMS: '#/components/schemas/multiChannelChannelListMMSResponseObject'
     multiChannelMessageRequest:
       description: Multi-Channel Message Request
       type: object
@@ -2540,7 +2606,7 @@ components:
             order they are listed. Once a message sends successfully, the others
             will be ignored.
           items:
-            $ref: '#/components/schemas/multiChannelChannelListObject'
+            $ref: '#/components/schemas/multiChannelChannelListRequestObject'
           maxItems: 4
         tag:
           $ref: '#/components/schemas/tag'
@@ -2573,17 +2639,7 @@ components:
             order they are listed. Once a message sends successfully, the others
             will be ignored.
           items:
-            allOf:
-              - $ref: '#/components/schemas/multiChannelChannelListObject'
-              - type: object
-                properties:
-                  owner:
-                    type: string
-                    description: >-
-                      The Bandwidth senderId associated with the message.
-                      Identical to 'from'.
-                required:
-                  - owner
+            $ref: '#/components/schemas/multiChannelChannelListResponseObject'
           maxItems: 4
         tag:
           $ref: '#/components/schemas/tag'

bandwidth/__init__.py

@@ -131,14 +131,22 @@
     "MmsMessageContentFile",
     "MultiChannelAction",
     "MultiChannelActionCalendarEvent",
-    "MultiChannelChannelListObject",
-    "MultiChannelChannelListObjectContent",
+    "MultiChannelChannelListMMSObject",
+    "MultiChannelChannelListMMSResponseObject",
+    "MultiChannelChannelListObjectBase",
+    "MultiChannelChannelListOwnerObject",
+    "MultiChannelChannelListRBMObject",
+    "MultiChannelChannelListRBMObjectAllOfContent",
+    "MultiChannelChannelListRBMResponseObject",
+    "MultiChannelChannelListRequestObject",
+    "MultiChannelChannelListResponseObject",
+    "MultiChannelChannelListSMSObject",
+    "MultiChannelChannelListSMSResponseObject",
     "MultiChannelError",
     "MultiChannelMessageChannelEnum",
     "MultiChannelMessageContent",
     "MultiChannelMessageRequest",
     "MultiChannelMessageResponseData",
-    "MultiChannelMessageResponseDataChannelListInner",
     "OptInWorkflow",
     "PageInfo",
     "PriorityEnum",
@@ -324,14 +332,22 @@
 from bandwidth.models.mms_message_content_file import MmsMessageContentFile as MmsMessageContentFile
 from bandwidth.models.multi_channel_action import MultiChannelAction as MultiChannelAction
 from bandwidth.models.multi_channel_action_calendar_event import MultiChannelActionCalendarEvent as MultiChannelActionCalendarEvent
-from bandwidth.models.multi_channel_channel_list_object import MultiChannelChannelListObject as MultiChannelChannelListObject
-from bandwidth.models.multi_channel_channel_list_object_content import MultiChannelChannelListObjectContent as MultiChannelChannelListObjectContent
+from bandwidth.models.multi_channel_channel_list_mms_object import MultiChannelChannelListMMSObject as MultiChannelChannelListMMSObject
+from bandwidth.models.multi_channel_channel_list_mms_response_object import MultiChannelChannelListMMSResponseObject as MultiChannelChannelListMMSResponseObject
+from bandwidth.models.multi_channel_channel_list_object_base import MultiChannelChannelListObjectBase as MultiChannelChannelListObjectBase
+from bandwidth.models.multi_channel_channel_list_owner_object import MultiChannelChannelListOwnerObject as MultiChannelChannelListOwnerObject
+from bandwidth.models.multi_channel_channel_list_rbm_object import MultiChannelChannelListRBMObject as MultiChannelChannelListRBMObject
+from bandwidth.models.multi_channel_channel_list_rbm_object_all_of_content import MultiChannelChannelListRBMObjectAllOfContent as MultiChannelChannelListRBMObjectAllOfContent
+from bandwidth.models.multi_channel_channel_list_rbm_response_object import MultiChannelChannelListRBMResponseObject as MultiChannelChannelListRBMResponseObject
+from bandwidth.models.multi_channel_channel_list_request_object import MultiChannelChannelListRequestObject as MultiChannelChannelListRequestObject
+from bandwidth.models.multi_channel_channel_list_response_object import MultiChannelChannelListResponseObject as MultiChannelChannelListResponseObject
+from bandwidth.models.multi_channel_channel_list_sms_object import MultiChannelChannelListSMSObject as MultiChannelChannelListSMSObject
+from bandwidth.models.multi_channel_channel_list_sms_response_object import MultiChannelChannelListSMSResponseObject as MultiChannelChannelListSMSResponseObject
 from bandwidth.models.multi_channel_error import MultiChannelError as MultiChannelError
 from bandwidth.models.multi_channel_message_channel_enum import MultiChannelMessageChannelEnum as MultiChannelMessageChannelEnum
 from bandwidth.models.multi_channel_message_content import MultiChannelMessageContent as MultiChannelMessageContent
 from bandwidth.models.multi_channel_message_request import MultiChannelMessageRequest as MultiChannelMessageRequest
 from bandwidth.models.multi_channel_message_response_data import MultiChannelMessageResponseData as MultiChannelMessageResponseData
-from bandwidth.models.multi_channel_message_response_data_channel_list_inner import MultiChannelMessageResponseDataChannelListInner as MultiChannelMessageResponseDataChannelListInner
 from bandwidth.models.opt_in_workflow import OptInWorkflow as OptInWorkflow
 from bandwidth.models.page_info import PageInfo as PageInfo
 from bandwidth.models.priority_enum import PriorityEnum as PriorityEnum

bandwidth/models/__init__.py

@@ -106,14 +106,22 @@
 from bandwidth.models.mms_message_content_file import MmsMessageContentFile
 from bandwidth.models.multi_channel_action import MultiChannelAction
 from bandwidth.models.multi_channel_action_calendar_event import MultiChannelActionCalendarEvent
-from bandwidth.models.multi_channel_channel_list_object import MultiChannelChannelListObject
-from bandwidth.models.multi_channel_channel_list_object_content import MultiChannelChannelListObjectContent
+from bandwidth.models.multi_channel_channel_list_mms_object import MultiChannelChannelListMMSObject
+from bandwidth.models.multi_channel_channel_list_mms_response_object import MultiChannelChannelListMMSResponseObject
+from bandwidth.models.multi_channel_channel_list_object_base import MultiChannelChannelListObjectBase
+from bandwidth.models.multi_channel_channel_list_owner_object import MultiChannelChannelListOwnerObject
+from bandwidth.models.multi_channel_channel_list_rbm_object import MultiChannelChannelListRBMObject
+from bandwidth.models.multi_channel_channel_list_rbm_object_all_of_content import MultiChannelChannelListRBMObjectAllOfContent
+from bandwidth.models.multi_channel_channel_list_rbm_response_object import MultiChannelChannelListRBMResponseObject
+from bandwidth.models.multi_channel_channel_list_request_object import MultiChannelChannelListRequestObject
+from bandwidth.models.multi_channel_channel_list_response_object import MultiChannelChannelListResponseObject
+from bandwidth.models.multi_channel_channel_list_sms_object import MultiChannelChannelListSMSObject
+from bandwidth.models.multi_channel_channel_list_sms_response_object import MultiChannelChannelListSMSResponseObject
 from bandwidth.models.multi_channel_error import MultiChannelError
 from bandwidth.models.multi_channel_message_channel_enum import MultiChannelMessageChannelEnum
 from bandwidth.models.multi_channel_message_content import MultiChannelMessageContent
 from bandwidth.models.multi_channel_message_request import MultiChannelMessageRequest
 from bandwidth.models.multi_channel_message_response_data import MultiChannelMessageResponseData
-from bandwidth.models.multi_channel_message_response_data_channel_list_inner import MultiChannelMessageResponseDataChannelListInner
 from bandwidth.models.opt_in_workflow import OptInWorkflow
 from bandwidth.models.page_info import PageInfo
 from bandwidth.models.priority_enum import PriorityEnum