-
-
Notifications
You must be signed in to change notification settings - Fork 392
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Issue #1217: whatsapp business platform incoming video message
- Loading branch information
Showing
5 changed files
with
265 additions
and
70 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
71 changes: 71 additions & 0 deletions
71
src/main/lombok/com/restfb/types/whatsapp/platform/message/Video.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| /* | ||
| * Copyright (c) 2010-2022 Mark Allen, Norbert Bartels. | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
| package com.restfb.types.whatsapp.platform.message; | ||
|
|
||
| import com.restfb.Facebook; | ||
| import com.restfb.types.AbstractFacebookType; | ||
|
|
||
| import lombok.Getter; | ||
| import lombok.Setter; | ||
|
|
||
| public class Video extends AbstractFacebookType { | ||
|
|
||
| /** | ||
| * The ID for the video | ||
| */ | ||
| @Getter | ||
| @Setter | ||
| private String id; | ||
|
|
||
| /** | ||
| * The mime type for the video file | ||
| */ | ||
| @Getter | ||
| @Setter | ||
| @Facebook("mime_type") | ||
| private String mimeType; | ||
|
|
||
| /** | ||
| * Image hash | ||
| */ | ||
| @Getter | ||
| @Setter | ||
| private String sha256; | ||
|
|
||
| /** | ||
| * The caption for the video, if provided | ||
| */ | ||
| @Getter | ||
| @Setter | ||
| private String caption; | ||
|
|
||
| /** | ||
| * The name for the file on the sender's device | ||
| */ | ||
| @Getter | ||
| @Setter | ||
| private String filename; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| /* | ||
| * Copyright (c) 2010-2022 Mark Allen, Norbert Bartels. | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
| package com.restfb.types; | ||
|
|
||
| import com.restfb.AbstractJsonMapperTests; | ||
| import com.restfb.types.webhook.ChangeValue; | ||
| import com.restfb.types.webhook.WebhookEntry; | ||
| import com.restfb.types.webhook.WebhookObject; | ||
| import com.restfb.types.webhook.whatsapp.WhatsappMessagesValue; | ||
| import com.restfb.types.whatsapp.platform.Contact; | ||
| import com.restfb.types.whatsapp.platform.Message; | ||
| import com.restfb.types.whatsapp.platform.message.Image; | ||
| import com.restfb.types.whatsapp.platform.message.Video; | ||
| import com.restfb.types.whatsapp.platform.message.MessageType; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.util.Date; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| class WABPwebhookTest extends AbstractJsonMapperTests { | ||
|
|
||
| @Test | ||
| void incomingMessageText() { | ||
| WhatsappMessagesValue change = getWHObjectFromJson("webhook-incoming-message-text", WhatsappMessagesValue.class); | ||
| assertThat(change).isInstanceOf(WhatsappMessagesValue.class); | ||
|
|
||
| // check contact | ||
| checkContact(change); | ||
|
|
||
| // check Metadata | ||
| checkMetaData(change); | ||
|
|
||
| // check Message | ||
| assertThat(change.getMessages()).hasSize(1); | ||
| com.restfb.types.whatsapp.platform.Message message = change.getMessages().get(0); | ||
| assertThat(message.getText()).isNotNull(); | ||
| assertThat(message.getText().getBody()).isEqualTo("Test"); | ||
| assertThat(message.getTimestamp()).isEqualTo(new Date(1653253313000L)); | ||
| assertThat(message.getType()).isEqualTo(MessageType.text); | ||
| assertThat(message.getFrom()).isEqualTo("491234567890"); | ||
| assertThat(message.isText()).isTrue(); | ||
| } | ||
|
|
||
| @Test | ||
| void incomingMessageImage() { | ||
| WhatsappMessagesValue change = getWHObjectFromJson("webhook-incoming-message-image", WhatsappMessagesValue.class); | ||
| assertThat(change).isInstanceOf(WhatsappMessagesValue.class); | ||
|
|
||
| // check contact | ||
| checkContact(change); | ||
|
|
||
| // check Metadata | ||
| checkMetaData(change); | ||
|
|
||
| // check Message | ||
| assertThat(change.getMessages()).hasSize(1); | ||
| Message message = change.getMessages().get(0); | ||
| assertThat(message.getImage()).isNotNull(); | ||
| assertThat(message.isImage()).isTrue(); | ||
| assertThat(message.isText()).isFalse(); | ||
|
|
||
| Image image = message.getImage(); | ||
| assertThat(image.getCaption()).isEqualTo("Some awesome image"); | ||
| assertThat(image.getId()).isEqualTo("400962571939895"); | ||
| assertThat(image.getMimeType()).isEqualTo("image\\/jpeg"); | ||
| assertThat(image.getSha256()).isEqualTo("law0CgE277wMMnIJU0XIxhDne6Ptmwaek\\/thVM7mVtg="); | ||
|
|
||
| assertThat(message.getTimestamp()).isEqualTo(new Date(1653253313000L)); | ||
| assertThat(message.getType()).isEqualTo(MessageType.image); | ||
| assertThat(message.getFrom()).isEqualTo("491234567890"); | ||
| } | ||
|
|
||
| @Test | ||
| void incomingMessageVideo() { | ||
| WhatsappMessagesValue change = getWHObjectFromJson("webhook-incoming-message-video", WhatsappMessagesValue.class); | ||
| assertThat(change).isInstanceOf(WhatsappMessagesValue.class); | ||
|
|
||
| checkContact(change); | ||
|
|
||
| checkMetaData(change); | ||
|
|
||
| // check Message | ||
| assertThat(change.getMessages()).hasSize(1); | ||
| Message message = change.getMessages().get(0); | ||
| assertThat(message.getVideo()).isNotNull(); | ||
| assertThat(message.isImage()).isFalse(); | ||
| assertThat(message.isText()).isFalse(); | ||
| assertThat(message.isVideo()).isTrue(); | ||
|
|
||
| Video image = message.getVideo(); | ||
| assertThat(image.getCaption()).isEqualTo("Video"); | ||
| assertThat(image.getId()).isEqualTo("378911494190301"); | ||
| assertThat(image.getMimeType()).isEqualTo("video\\/mp4"); | ||
| assertThat(image.getSha256()).isEqualTo("r9TvFx8eGPq\\/nn7l\\/yVMfSmQjBPWlEGOpkBKMVNqDGk="); | ||
|
|
||
| assertThat(message.getTimestamp()).isEqualTo(new Date(1653253313000L)); | ||
| assertThat(message.getType()).isEqualTo(MessageType.video); | ||
| assertThat(message.getFrom()).isEqualTo("491234567890"); | ||
| } | ||
|
|
||
| private void checkMetaData(WhatsappMessagesValue change) { | ||
| // check Metadata | ||
| assertThat(change.getMetadata()).isNotNull(); | ||
| assertThat(change.getMetadata().getDisplayPhoneNumber()).isEqualTo("1234567891"); | ||
| assertThat(change.getMetadata().getPhoneNumberId()).isEqualTo("10634295353625"); | ||
| } | ||
|
|
||
| private void checkContact(WhatsappMessagesValue change) { | ||
| // check contact | ||
| assertThat(change.getContacts()).hasSize(1); | ||
| Contact contact = change.getContacts().get(0); | ||
| assertThat(contact.getWaId()).isEqualTo("491234567890"); | ||
| assertThat(contact.getProfile()).isNotNull(); | ||
| assertThat(contact.getProfile().getName()).isEqualTo("TestUser"); | ||
| } | ||
|
|
||
| private <T extends ChangeValue> T getWHObjectFromJson(String jsonName, Class<T> clazz) { | ||
| WebhookObject webhookObject = | ||
| createJsonMapper().toJavaObject(jsonFromClasspath("whatsapp/" + jsonName), WebhookObject.class); | ||
| assertThat(webhookObject.isWhatsAppBusinessAccount()).isTrue(); | ||
| assertThat(webhookObject.getEntryList()).hasSize(1); | ||
| WebhookEntry entry = webhookObject.getEntryList().get(0); | ||
| return entry.getChanges().get(0).getValue().convertChangeValue(clazz); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
src/test/resources/json/whatsapp/webhook-incoming-message-video.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| { | ||
| "object": "whatsapp_business_account", | ||
| "entry": [ | ||
| { | ||
| "id": "101809759215303", | ||
| "changes": [ | ||
| { | ||
| "value": { | ||
| "messaging_product": "whatsapp", | ||
| "metadata": { | ||
| "display_phone_number": "1234567891", | ||
| "phone_number_id": "10634295353625" | ||
| }, | ||
| "contacts": [ | ||
| { | ||
| "profile": { | ||
| "name": "TestUser" | ||
| }, | ||
| "wa_id": "491234567890" | ||
| } | ||
| ], | ||
| "messages": [ | ||
| { | ||
| "from": "491234567890", | ||
| "id": "wamid.HBgNNDkxNTIwOTgzMzM5OBUCABIYHGDEHJVFHJEVCFHJEVBCMTkyODk1OEIyAA==", | ||
| "timestamp": "1653253313", | ||
| "type": "video", | ||
| "video": { | ||
| "caption": "Video", | ||
| "mime_type": "video\\/mp4", | ||
| "sha256": "r9TvFx8eGPq\\/nn7l\\/yVMfSmQjBPWlEGOpkBKMVNqDGk=", | ||
| "id": "378911494190301" | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "field": "messages" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |