feat: Add network_code to InboundMessage

Author: SMadani

CHANGELOG.md

@@ -4,10 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-# [8.7.0] - 2024-05-??
+# [8.7.0] - 2024-05-16
 - Added missing supported languages to `TextToSpeechLanguage` enum
 - Added `ttl` field to outbound MMS messages
 - Added message reply context to Whatsapp outbound requests
+- Added network code to `InboundMessage`
 
 # [8.6.0] - 2024-04-18
 - Added Experience Composer to Video API

src/main/java/com/vonage/client/messages/InboundMessage.java

@@ -38,6 +38,7 @@ public class InboundMessage extends JsonableBaseObject {
 
 	protected static class UrlWrapper extends JsonableBaseObject {
 		@JsonProperty("url") protected URI url;
+		@JsonProperty("name") protected String name;
 	}
 
 	protected static class UrlWrapperWithCaption extends UrlWrapper {
@@ -48,6 +49,10 @@ protected static class Whatsapp extends JsonableBaseObject {
 		@JsonProperty("referral") protected Referral referral;
 	}
 
+	protected static class Origin extends JsonableBaseObject {
+		@JsonProperty("network_code") protected String networkCode;
+	}
+
 	protected InboundMessage() {}
 
 	@JsonAnySetter protected Map<String, Object> unknownProperties;
@@ -79,6 +84,7 @@ protected InboundMessage() {}
 	@JsonProperty("order") protected Order whatsappOrder;
 	@JsonProperty("usage") protected MessageStatus.Usage usage;
 	@JsonProperty("sms") protected SmsInboundMetadata smsMetadata;
+	@JsonProperty("origin") protected Origin origin;
 
 	/**
 	 * This is a catch-all method which encapsulates all fields in the response JSON
@@ -330,6 +336,19 @@ public SmsInboundMetadata getSmsMetadata() {
 		return smsMetadata;
 	}
 
+	/**
+	 * If the {@linkplain #getChannel()} is {@linkplain Channel#SMS} or {@linkplain Channel#MMS},
+	 * return the network code from which the message originated (if available).
+	 *
+	 * @return The origin network code if applicable, or {@code null} if unknown.
+	 *
+	 * @since 8.7.0
+	 */
+	@JsonIgnore
+	public String getNetworkCode() {
+		return origin != null ? origin.networkCode : null;
+	}
+
 	/**
 	 * If the {@linkplain #getChannel()} is {@linkplain Channel#WHATSAPP} and a content referral is present in
 	 * the message, returns the metadata related to the post or advertisement that the user clicked on.

src/test/java/com/vonage/client/messages/InboundMessageTest.java

@@ -358,4 +358,15 @@ public void testWhatsappReferralOnly() {
 		assertEquals(sourceType, referral.getSourceType());
 		assertEquals(URI.create(sourceUrl), referral.getSourceUrl());
 	}
+
+	@Test
+	public void testOriginOnly() {
+		String networkCode = "12534", json = "{\n" +
+				"  \"origin\": {\n" +
+				"    \"network_code\": \""+networkCode+"\"\n" +
+				"   }\n" +
+				"}";
+		var im = InboundMessage.fromJson(json);
+		assertEquals(networkCode, im.getNetworkCode());
+	}
 }