From 61b2db26484839ef668f80de56a65073cc663905 Mon Sep 17 00:00:00 2001 From: Vikram Praveen Kumar Date: Wed, 10 Feb 2021 07:37:58 -0800 Subject: [PATCH 1/6] Add new communicationIdentifier properties and participant events --- .../AzureCommunicationServices.json | 87 +++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json b/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json index 384521adebae..f5ff3e7cb079 100644 --- a/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json +++ b/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json @@ -67,6 +67,10 @@ "description": "The MRI of the creator of the thread", "type": "string" }, + "createdByCommunicationIdentifier": { + "description": "The communication identifier of the user who created the thread", + "$ref": "../../../../../communication/data-plane/Microsoft.CommunicationServicesCommon/stable/2021-03-07/common.json#/definitions/CommunicationIdentifierModel" + }, "properties": { "description": "The thread properties", "type": "object", @@ -80,6 +84,13 @@ "items": { "$ref": "#/definitions/ACSChatThreadMemberProperties" } + }, + "participants": { + "description": "The list of properties of participants who are part of the thread", + "type": "array", + "items": { + "$ref": "#/definitions/ACSChatThreadParticipantProperties" + } } } }, @@ -95,6 +106,10 @@ "description": "The MRI of the user who deleted the thread", "type": "string" }, + "deletedByCommunicationIdentifier": { + "description": "The communication identifier of the user who deleted the thread", + "$ref": "../../../../../communication/data-plane/Microsoft.CommunicationServicesCommon/stable/2021-03-07/common.json#/definitions/CommunicationIdentifierModel" + }, "deleteTime": { "description": "The deletion time of the thread", "format": "date-time", @@ -114,6 +129,10 @@ "description": "The MRI of the user who updated the thread properties", "type": "string" }, + "editedByCommunicationIdentifier": { + "description": "The communication identifier of the user who updated the thread properties", + "$ref": "../../../../../communication/data-plane/Microsoft.CommunicationServicesCommon/stable/2021-03-07/common.json#/definitions/CommunicationIdentifierModel" + }, "editTime": { "description": "The time at which the properties of the thread were updated", "format": "date-time", @@ -174,6 +193,52 @@ } } }, + "ACSChatParticipantAddedToThreadWithUserEventData": { + "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatParticipantAddedToThreadWithUser event.", + "allOf": [ + { + "$ref": "#/definitions/ACSChatThreadEventBaseProperties" + } + ], + "properties": { + "time": { + "description": "The time at which the user was added to the thread", + "format": "date-time", + "type": "string" + }, + "addedByCommunicationIdentifier": { + "description": "The communication identifier of the user who added the user", + "$ref": "../../../../../communication/data-plane/Microsoft.CommunicationServicesCommon/stable/2021-03-07/common.json#/definitions/CommunicationIdentifierModel" + }, + "participantAdded": { + "description": "The details of the user who was added", + "$ref": "#/definitions/ACSChatThreadParticipantProperties" + } + } + }, + "ACSChatParticipantRemovedFromThreadWithUserEventData": { + "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatParticipantRemovedFromThreadWithUser event.", + "allOf": [ + { + "$ref": "#/definitions/ACSChatThreadEventBaseProperties" + } + ], + "properties": { + "time": { + "description": "The time at which the user was removed to the thread", + "format": "date-time", + "type": "string" + }, + "removedByCommunicationIdentifier": { + "description": "The communication identifier of the user who removed the user", + "$ref": "../../../../../communication/data-plane/Microsoft.CommunicationServicesCommon/stable/2021-03-07/common.json#/definitions/CommunicationIdentifierModel" + }, + "participantRemoved": { + "description": "The details of the user who was removed", + "$ref": "#/definitions/ACSChatThreadParticipantProperties" + } + } + }, "AcsSmsDeliveryReportReceivedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.SMSDeliveryReportReceived event.", "allOf": [ @@ -259,6 +324,10 @@ "description": "The MRI of the sender", "type": "string" }, + "senderCommunicationIdentifier": { + "description": "The communication identifier of the sender", + "$ref": "../../../../../communication/data-plane/Microsoft.CommunicationServicesCommon/stable/2021-03-07/common.json#/definitions/CommunicationIdentifierModel" + }, "senderDisplayName": { "description": "The display name of the sender", "type": "string" @@ -287,6 +356,10 @@ "description": "The MRI of the target user", "type": "string" }, + "recipientCommunicationIdentifier": { + "description": "The communication identifier of the target user", + "$ref": "../../../../../communication/data-plane/Microsoft.CommunicationServicesCommon/stable/2021-03-07/common.json#/definitions/CommunicationIdentifierModel" + }, "transactionId": { "description": "The transaction id will be used as co-relation vector", "type": "string" @@ -311,6 +384,20 @@ } } }, + "ACSChatThreadParticipantProperties": { + "description": "Schema of the chat thread member", + "type": "object", + "properties": { + "displayName": { + "description": "The name of the user", + "type": "string" + }, + "participantCommunicationIdentifier": { + "description": "The communication identifier of the user", + "$ref": "../../../../../communication/data-plane/Microsoft.CommunicationServicesCommon/stable/2021-03-07/common.json#/definitions/CommunicationIdentifierModel" + } + } + }, "AcsSmsEventBaseProperties": { "description": "Schema of common properties of all SMS events", "type": "object", From f1045d0c198924fb71cd8024dea144b85c38551a Mon Sep 17 00:00:00 2001 From: Vikram Praveen Kumar Date: Wed, 10 Feb 2021 07:48:36 -0800 Subject: [PATCH 2/6] Remove deprecated properties and events --- .../AzureCommunicationServices.json | 87 ------------------- 1 file changed, 87 deletions(-) diff --git a/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json b/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json index f5ff3e7cb079..4860b2b390ea 100644 --- a/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json +++ b/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json @@ -63,10 +63,6 @@ } ], "properties": { - "createdBy": { - "description": "The MRI of the creator of the thread", - "type": "string" - }, "createdByCommunicationIdentifier": { "description": "The communication identifier of the user who created the thread", "$ref": "../../../../../communication/data-plane/Microsoft.CommunicationServicesCommon/stable/2021-03-07/common.json#/definitions/CommunicationIdentifierModel" @@ -78,13 +74,6 @@ "type": "object" } }, - "members": { - "description": "The list of properties of users who are part of the thread", - "type": "array", - "items": { - "$ref": "#/definitions/ACSChatThreadMemberProperties" - } - }, "participants": { "description": "The list of properties of participants who are part of the thread", "type": "array", @@ -102,10 +91,6 @@ } ], "properties": { - "deletedBy": { - "description": "The MRI of the user who deleted the thread", - "type": "string" - }, "deletedByCommunicationIdentifier": { "description": "The communication identifier of the user who deleted the thread", "$ref": "../../../../../communication/data-plane/Microsoft.CommunicationServicesCommon/stable/2021-03-07/common.json#/definitions/CommunicationIdentifierModel" @@ -125,10 +110,6 @@ } ], "properties": { - "editedBy": { - "description": "The MRI of the user who updated the thread properties", - "type": "string" - }, "editedByCommunicationIdentifier": { "description": "The communication identifier of the user who updated the thread properties", "$ref": "../../../../../communication/data-plane/Microsoft.CommunicationServicesCommon/stable/2021-03-07/common.json#/definitions/CommunicationIdentifierModel" @@ -147,52 +128,6 @@ } } }, - "ACSChatMemberAddedToThreadWithUserEventData": { - "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMemberAddedToThreadWithUser event.", - "allOf": [ - { - "$ref": "#/definitions/ACSChatThreadEventBaseProperties" - } - ], - "properties": { - "time": { - "description": "The time at which the user was added to the thread", - "format": "date-time", - "type": "string" - }, - "addedBy": { - "description": "The MRI of the user who added the user", - "type": "string" - }, - "memberAdded": { - "description": "The details of the user who was added", - "$ref": "#/definitions/ACSChatThreadMemberProperties" - } - } - }, - "ACSChatMemberRemovedFromThreadWithUserEventData": { - "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMemberRemovedFromThreadWithUser event.", - "allOf": [ - { - "$ref": "#/definitions/ACSChatThreadEventBaseProperties" - } - ], - "properties": { - "time": { - "description": "The time at which the user was removed to the thread", - "format": "date-time", - "type": "string" - }, - "removedBy": { - "description": "The MRI of the user who removed the user", - "type": "string" - }, - "memberRemoved": { - "description": "The details of the user who was removed", - "$ref": "#/definitions/ACSChatThreadMemberProperties" - } - } - }, "ACSChatParticipantAddedToThreadWithUserEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatParticipantAddedToThreadWithUser event.", "allOf": [ @@ -320,10 +255,6 @@ "description": "The chat message id", "type": "string" }, - "senderId": { - "description": "The MRI of the sender", - "type": "string" - }, "senderCommunicationIdentifier": { "description": "The communication identifier of the sender", "$ref": "../../../../../communication/data-plane/Microsoft.CommunicationServicesCommon/stable/2021-03-07/common.json#/definitions/CommunicationIdentifierModel" @@ -352,10 +283,6 @@ "description": "Schema of common properties of all chat events", "type": "object", "properties": { - "recipientId": { - "description": "The MRI of the target user", - "type": "string" - }, "recipientCommunicationIdentifier": { "description": "The communication identifier of the target user", "$ref": "../../../../../communication/data-plane/Microsoft.CommunicationServicesCommon/stable/2021-03-07/common.json#/definitions/CommunicationIdentifierModel" @@ -370,20 +297,6 @@ } } }, - "ACSChatThreadMemberProperties": { - "description": "Schema of the chat thread member", - "type": "object", - "properties": { - "displayName": { - "description": "The name of the user", - "type": "string" - }, - "memberId": { - "description": "The MRI of the user", - "type": "string" - } - } - }, "ACSChatThreadParticipantProperties": { "description": "Schema of the chat thread member", "type": "object", From 30570e61d7a371b4ded4743ec8206d434d112945 Mon Sep 17 00:00:00 2001 From: Vikram Praveen Kumar Date: Thu, 8 Oct 2020 15:54:56 -0700 Subject: [PATCH 3/6] Add thread-level chat events to the swagger --- .../AzureCommunicationServices.json | 243 ++++++++++++++++++ 1 file changed, 243 insertions(+) diff --git a/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json b/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json index 4860b2b390ea..c8920e75e8f1 100644 --- a/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json +++ b/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json @@ -21,6 +21,20 @@ } } }, + "ACSChatNewMessageInThreadEventData": { + "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatNewMessageInThread event.", + "allOf": [ + { + "$ref": "#/definitions/ACSChatMessageEventInThreadBaseProperties" + } + ], + "properties": { + "messageBody": { + "description": "The body of the chat message", + "type": "string" + } + } + }, "ACSChatMessageEditedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMessageEdited event.", "allOf": [ @@ -40,6 +54,25 @@ } } }, + "ACSChatMessageEditedInThreadEventData": { + "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMessageEditedInThread event.", + "allOf": [ + { + "$ref": "#/definitions/ACSChatMessageEventInThreadBaseProperties" + } + ], + "properties": { + "messageBody": { + "description": "The body of the chat message", + "type": "string" + }, + "editTime": { + "description": "The time at which the message was edited", + "format": "date-time", + "type": "string" + } + } + }, "ACSChatMessageDeletedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMessageDeleted event.", "allOf": [ @@ -55,6 +88,21 @@ } } }, + "ACSChatMessageDeletedInThreadEventData": { + "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMessageDeletedInThread event.", + "allOf": [ + { + "$ref": "#/definitions/ACSChatMessageEventInThreadBaseProperties" + } + ], + "properties": { + "deleteTime": { + "description": "The time at which the message was deleted", + "format": "date-time", + "type": "string" + } + } + }, "ACSChatThreadCreatedWithUserEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadCreatedWithUser event.", "allOf": [ @@ -83,6 +131,34 @@ } } }, + "ACSChatThreadCreatedEventData": { + "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadCreatedWithUser event.", + "allOf": [ + { + "$ref": "#/definitions/ACSChatThreadEventInThreadBaseProperties" + } + ], + "properties": { + "createdBy": { + "description": "The MRI of the creator of the thread", + "type": "string" + }, + "properties": { + "description": "The thread properties", + "type": "object", + "additionalProperties": { + "type": "object" + } + }, + "members": { + "description": "The list of properties of users who are part of the thread", + "type": "array", + "items": { + "$ref": "#/definitions/ACSChatThreadMemberProperties" + } + } + } + }, "ACSChatThreadWithUserDeletedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadWithUserDeleted event.", "allOf": [ @@ -102,6 +178,25 @@ } } }, + "ACSChatThreadDeletedEventData": { + "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadDeleted event.", + "allOf": [ + { + "$ref": "#/definitions/ACSChatThreadEventInThreadBaseProperties" + } + ], + "properties": { + "deletedBy": { + "description": "The MRI of the user who deleted the thread", + "type": "string" + }, + "deleteTime": { + "description": "The deletion time of the thread", + "format": "date-time", + "type": "string" + } + } + }, "ACSChatThreadPropertiesUpdatedPerUserEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadPropertiesUpdatedPerUser event.", "allOf": [ @@ -128,6 +223,32 @@ } } }, + "ACSChatThreadPropertiesUpdatedEventData": { + "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadPropertiesUpdated event.", + "allOf": [ + { + "$ref": "#/definitions/ACSChatThreadEventInThreadBaseProperties" + } + ], + "properties": { + "editedBy": { + "description": "The MRI of the user who updated the thread properties", + "type": "string" + }, + "editTime": { + "description": "The time at which the properties of the thread were updated", + "format": "date-time", + "type": "string" + }, + "properties": { + "description": "The updated thread properties", + "type": "object", + "additionalProperties": { + "type": "object" + } + } + } + }, "ACSChatParticipantAddedToThreadWithUserEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatParticipantAddedToThreadWithUser event.", "allOf": [ @@ -174,6 +295,62 @@ } } }, + "ACSChatMemberAddedToThreadEventData": { + "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMemberAddedToThread event.", + "allOf": [ + { + "$ref": "#/definitions/ACSChatEventInThreadBaseProperties" + } + ], + "properties": { + "time": { + "description": "The time at which the user was added to the thread", + "format": "date-time", + "type": "string" + }, + "addedBy": { + "description": "The MRI of the user who added the user", + "type": "string" + }, + "memberAdded": { + "description": "The details of the user who was added", + "$ref": "#/definitions/ACSChatThreadMemberProperties" + }, + "version": { + "description": "The version of the thread", + "type": "integer", + "format": "int64" + } + } + }, + "ACSChatMemberRemovedFromThreadEventData": { + "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMemberRemovedFromThread event.", + "allOf": [ + { + "$ref": "#/definitions/ACSChatEventInThreadBaseProperties" + } + ], + "properties": { + "time": { + "description": "The time at which the user was removed to the thread", + "format": "date-time", + "type": "string" + }, + "removedBy": { + "description": "The MRI of the user who removed the user", + "type": "string" + }, + "memberRemoved": { + "description": "The details of the user who was removed", + "$ref": "#/definitions/ACSChatThreadMemberProperties" + }, + "version": { + "description": "The version of the thread", + "type": "integer", + "format": "int64" + } + } + }, "AcsSmsDeliveryReportReceivedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.SMSDeliveryReportReceived event.", "allOf": [ @@ -243,6 +420,26 @@ } } }, + "ACSChatThreadEventInThreadBaseProperties": { + "description": "Schema of common properties of all chat thread events", + "allOf": [ + { + "$ref": "#/definitions/ACSChatEventInThreadBaseProperties" + } + ], + "properties": { + "createTime": { + "description": "The original creation time of the thread", + "format": "date-time", + "type": "string" + }, + "version": { + "description": "The version of the thread", + "type": "integer", + "format": "int64" + } + } + }, "ACSChatMessageEventBaseProperties": { "description": "Schema of common properties of all chat message events", "allOf": [ @@ -279,6 +476,52 @@ } } }, + "ACSChatMessageEventInThreadBaseProperties": { + "description": "Schema of common properties of all thread-level chat message events", + "allOf": [ + { + "$ref": "#/definitions/ACSChatEventInThreadBaseProperties" + } + ], + "properties": { + "messageId": { + "description": "The chat message id", + "type": "string" + }, + "senderId": { + "description": "The MRI of the sender", + "type": "string" + }, + "senderDisplayName": { + "description": "The display name of the sender", + "type": "string" + }, + "composeTime": { + "description": "The original compose time of the message", + "format": "date-time", + "type": "string" + }, + "type": { + "description": "The type of the message", + "type": "string" + }, + "version": { + "description": "The version of the message", + "type": "integer", + "format": "int64" + } + } + }, + "ACSChatEventInThreadBaseProperties": { + "description": "Schema of common properties of all thread-level chat events", + "type": "object", + "properties": { + "threadId": { + "description": "The chat thread id", + "type": "string" + } + } + }, "ACSChatEventBaseProperties": { "description": "Schema of common properties of all chat events", "type": "object", From 736316b1eec8ba0fbee841644c8a1a80e52dcb3e Mon Sep 17 00:00:00 2001 From: Vikram Praveen Kumar Date: Wed, 10 Feb 2021 10:43:20 -0800 Subject: [PATCH 4/6] Replace MRI with CommunicationIdentifier and member with participant --- .../AzureCommunicationServices.json | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json b/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json index c8920e75e8f1..75926a0ad34c 100644 --- a/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json +++ b/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json @@ -139,9 +139,9 @@ } ], "properties": { - "createdBy": { - "description": "The MRI of the creator of the thread", - "type": "string" + "createdByCommunicationIdentifier": { + "description": "The communication identifier of the user who created the thread", + "$ref": "../../../../../communication/data-plane/Microsoft.CommunicationServicesCommon/stable/2021-03-07/common.json#/definitions/CommunicationIdentifierModel" }, "properties": { "description": "The thread properties", @@ -150,11 +150,11 @@ "type": "object" } }, - "members": { - "description": "The list of properties of users who are part of the thread", + "participants": { + "description": "The list of properties of participants who are part of the thread", "type": "array", "items": { - "$ref": "#/definitions/ACSChatThreadMemberProperties" + "$ref": "#/definitions/ACSChatThreadParticipantProperties" } } } @@ -186,9 +186,9 @@ } ], "properties": { - "deletedBy": { - "description": "The MRI of the user who deleted the thread", - "type": "string" + "deletedByCommunicationIdentifier": { + "description": "The communication identifier of the user who deleted the thread", + "$ref": "../../../../../communication/data-plane/Microsoft.CommunicationServicesCommon/stable/2021-03-07/common.json#/definitions/CommunicationIdentifierModel" }, "deleteTime": { "description": "The deletion time of the thread", @@ -231,9 +231,9 @@ } ], "properties": { - "editedBy": { - "description": "The MRI of the user who updated the thread properties", - "type": "string" + "editedByCommunicationIdentifier": { + "description": "The communication identifier of the user who updated the thread properties", + "$ref": "../../../../../communication/data-plane/Microsoft.CommunicationServicesCommon/stable/2021-03-07/common.json#/definitions/CommunicationIdentifierModel" }, "editTime": { "description": "The time at which the properties of the thread were updated", @@ -295,8 +295,8 @@ } } }, - "ACSChatMemberAddedToThreadEventData": { - "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMemberAddedToThread event.", + "ACSChatParticipantAddedToThreadEventData": { + "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatParticipantAddedToThread event.", "allOf": [ { "$ref": "#/definitions/ACSChatEventInThreadBaseProperties" @@ -308,13 +308,13 @@ "format": "date-time", "type": "string" }, - "addedBy": { - "description": "The MRI of the user who added the user", - "type": "string" + "addedByCommunicationIdentifier": { + "description": "The communication identifier of the user who added the user", + "$ref": "../../../../../communication/data-plane/Microsoft.CommunicationServicesCommon/stable/2021-03-07/common.json#/definitions/CommunicationIdentifierModel" }, - "memberAdded": { + "participantAdded": { "description": "The details of the user who was added", - "$ref": "#/definitions/ACSChatThreadMemberProperties" + "$ref": "#/definitions/ACSChatThreadParticipantProperties" }, "version": { "description": "The version of the thread", @@ -323,8 +323,8 @@ } } }, - "ACSChatMemberRemovedFromThreadEventData": { - "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMemberRemovedFromThread event.", + "ACSChatParticipantRemovedFromThreadEventData": { + "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatParticipantRemovedFromThread event.", "allOf": [ { "$ref": "#/definitions/ACSChatEventInThreadBaseProperties" @@ -336,13 +336,13 @@ "format": "date-time", "type": "string" }, - "removedBy": { - "description": "The MRI of the user who removed the user", - "type": "string" + "removedByCommunicationIdentifier": { + "description": "The communication identifier of the user who removed the user", + "$ref": "../../../../../communication/data-plane/Microsoft.CommunicationServicesCommon/stable/2021-03-07/common.json#/definitions/CommunicationIdentifierModel" }, - "memberRemoved": { + "participantRemoved": { "description": "The details of the user who was removed", - "$ref": "#/definitions/ACSChatThreadMemberProperties" + "$ref": "#/definitions/ACSChatThreadParticipantProperties" }, "version": { "description": "The version of the thread", @@ -488,9 +488,9 @@ "description": "The chat message id", "type": "string" }, - "senderId": { - "description": "The MRI of the sender", - "type": "string" + "senderCommunicationIdentifier": { + "description": "The communication identifier of the sender", + "$ref": "../../../../../communication/data-plane/Microsoft.CommunicationServicesCommon/stable/2021-03-07/common.json#/definitions/CommunicationIdentifierModel" }, "senderDisplayName": { "description": "The display name of the sender", @@ -541,7 +541,7 @@ } }, "ACSChatThreadParticipantProperties": { - "description": "Schema of the chat thread member", + "description": "Schema of the chat thread participant", "type": "object", "properties": { "displayName": { From fa531025d22bc13f5bc0ea8a314f9dedbaa6304f Mon Sep 17 00:00:00 2001 From: Vikram Praveen Kumar Date: Fri, 19 Feb 2021 23:47:52 -0800 Subject: [PATCH 5/6] Rename event type names --- .../AzureCommunicationServices.json | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json b/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json index 8a4e08c1e358..b1c073c4896e 100644 --- a/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json +++ b/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json @@ -21,11 +21,11 @@ } } }, - "ACSChatNewMessageInThreadEventData": { - "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatNewMessageInThread event.", + "AcsChatMessageReceivedInThreadEventData": { + "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMessageReceivedInThread event.", "allOf": [ { - "$ref": "#/definitions/ACSChatMessageEventInThreadBaseProperties" + "$ref": "#/definitions/AcsChatMessageEventInThreadBaseProperties" } ], "properties": { @@ -54,11 +54,11 @@ } } }, - "ACSChatMessageEditedInThreadEventData": { + "AcsChatMessageEditedInThreadEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMessageEditedInThread event.", "allOf": [ { - "$ref": "#/definitions/ACSChatMessageEventInThreadBaseProperties" + "$ref": "#/definitions/AcsChatMessageEventInThreadBaseProperties" } ], "properties": { @@ -88,11 +88,11 @@ } } }, - "ACSChatMessageDeletedInThreadEventData": { + "AcsChatMessageDeletedInThreadEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatMessageDeletedInThread event.", "allOf": [ { - "$ref": "#/definitions/ACSChatMessageEventInThreadBaseProperties" + "$ref": "#/definitions/AcsChatMessageEventInThreadBaseProperties" } ], "properties": { @@ -131,11 +131,11 @@ } } }, - "ACSChatThreadCreatedEventData": { + "AcsChatThreadCreatedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadCreatedWithUser event.", "allOf": [ { - "$ref": "#/definitions/ACSChatThreadEventInThreadBaseProperties" + "$ref": "#/definitions/AcsChatThreadEventInThreadBaseProperties" } ], "properties": { @@ -178,11 +178,11 @@ } } }, - "ACSChatThreadDeletedEventData": { + "AcsChatThreadDeletedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadDeleted event.", "allOf": [ { - "$ref": "#/definitions/ACSChatThreadEventInThreadBaseProperties" + "$ref": "#/definitions/AcsChatThreadEventInThreadBaseProperties" } ], "properties": { @@ -223,11 +223,11 @@ } } }, - "ACSChatThreadPropertiesUpdatedEventData": { + "AcsChatThreadPropertiesUpdatedEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatThreadPropertiesUpdated event.", "allOf": [ { - "$ref": "#/definitions/ACSChatThreadEventInThreadBaseProperties" + "$ref": "#/definitions/AcsChatThreadEventInThreadBaseProperties" } ], "properties": { @@ -295,11 +295,11 @@ } } }, - "ACSChatParticipantAddedToThreadEventData": { + "AcsChatParticipantAddedToThreadEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatParticipantAddedToThread event.", "allOf": [ { - "$ref": "#/definitions/ACSChatEventInThreadBaseProperties" + "$ref": "#/definitions/AcsChatEventInThreadBaseProperties" } ], "properties": { @@ -323,11 +323,11 @@ } } }, - "ACSChatParticipantRemovedFromThreadEventData": { + "AcsChatParticipantRemovedFromThreadEventData": { "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Communication.ChatParticipantRemovedFromThread event.", "allOf": [ { - "$ref": "#/definitions/ACSChatEventInThreadBaseProperties" + "$ref": "#/definitions/AcsChatEventInThreadBaseProperties" } ], "properties": { @@ -420,11 +420,11 @@ } } }, - "ACSChatThreadEventInThreadBaseProperties": { + "AcsChatThreadEventInThreadBaseProperties": { "description": "Schema of common properties of all chat thread events", "allOf": [ { - "$ref": "#/definitions/ACSChatEventInThreadBaseProperties" + "$ref": "#/definitions/AcsChatEventInThreadBaseProperties" } ], "properties": { @@ -476,11 +476,11 @@ } } }, - "ACSChatMessageEventInThreadBaseProperties": { + "AcsChatMessageEventInThreadBaseProperties": { "description": "Schema of common properties of all thread-level chat message events", "allOf": [ { - "$ref": "#/definitions/ACSChatEventInThreadBaseProperties" + "$ref": "#/definitions/AcsChatEventInThreadBaseProperties" } ], "properties": { @@ -512,7 +512,7 @@ } } }, - "ACSChatEventInThreadBaseProperties": { + "AcsChatEventInThreadBaseProperties": { "description": "Schema of common properties of all thread-level chat events", "type": "object", "properties": { From fa936faec15ce9f6114647c5691081acd3aa6ba1 Mon Sep 17 00:00:00 2001 From: Vikram Praveen Kumar Date: Fri, 19 Feb 2021 23:57:38 -0800 Subject: [PATCH 6/6] fix typo --- .../stable/2018-01-01/AzureCommunicationServices.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json b/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json index b1c073c4896e..ccbff6064853 100644 --- a/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json +++ b/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json @@ -126,7 +126,7 @@ "description": "The list of properties of participants who are part of the thread", "type": "array", "items": { - "$ref": "#/definitions/AcSChatThreadParticipantProperties" + "$ref": "#/definitions/AcsChatThreadParticipantProperties" } } }