From 6ff6a9ca39aab23497504a2c72ca6f37b1476d70 Mon Sep 17 00:00:00 2001 From: spenes Date: Mon, 6 May 2024 15:36:23 +0300 Subject: [PATCH] Update schema for com.mandrill/message_opened/jsonschema/1-0-3 (close #893) --- modules/common/src/main/resources/reference.conf | 2 +- .../SpecHelpers.scala | 2 +- .../adapters/registry/MandrillAdapterSpec.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/common/src/main/resources/reference.conf b/modules/common/src/main/resources/reference.conf index 648cbc411..226da5df1 100644 --- a/modules/common/src/main/resources/reference.conf +++ b/modules/common/src/main/resources/reference.conf @@ -80,7 +80,7 @@ "message_delayed": "iglu:com.mandrill/message_delayed/jsonschema/1-0-2", "message_delivered": "iglu:com.mandrill/message_delivered/jsonschema/1-0-0", "message_marked_as_spam": "iglu:com.mandrill/message_marked_as_spam/jsonschema/1-0-2", - "message_opened": "iglu:com.mandrill/message_opened/jsonschema/1-0-2", + "message_opened": "iglu:com.mandrill/message_opened/jsonschema/1-0-3", "message_rejected": "iglu:com.mandrill/message_rejected/jsonschema/1-0-1", "message_sent": "iglu:com.mandrill/message_sent/jsonschema/1-0-1", "message_soft_bounced": "iglu:com.mandrill/message_soft_bounced/jsonschema/1-0-2", diff --git a/modules/common/src/test/scala/com.snowplowanalytics.snowplow.enrich.common/SpecHelpers.scala b/modules/common/src/test/scala/com.snowplowanalytics.snowplow.enrich.common/SpecHelpers.scala index ae018a13c..16f08597c 100644 --- a/modules/common/src/test/scala/com.snowplowanalytics.snowplow.enrich.common/SpecHelpers.scala +++ b/modules/common/src/test/scala/com.snowplowanalytics.snowplow.enrich.common/SpecHelpers.scala @@ -249,7 +249,7 @@ object SpecHelpers extends CatsEffect { message_delayed = "iglu:com.mandrill/message_delayed/jsonschema/1-0-2", message_delivered = "iglu:com.mandrill/message_delivered/jsonschema/1-0-0", message_marked_as_spam = "iglu:com.mandrill/message_marked_as_spam/jsonschema/1-0-2", - message_opened = "iglu:com.mandrill/message_opened/jsonschema/1-0-2", + message_opened = "iglu:com.mandrill/message_opened/jsonschema/1-0-3", message_rejected = "iglu:com.mandrill/message_rejected/jsonschema/1-0-1", message_sent = "iglu:com.mandrill/message_sent/jsonschema/1-0-1", message_soft_bounced = "iglu:com.mandrill/message_soft_bounced/jsonschema/1-0-2", diff --git a/modules/common/src/test/scala/com.snowplowanalytics.snowplow.enrich.common/adapters/registry/MandrillAdapterSpec.scala b/modules/common/src/test/scala/com.snowplowanalytics.snowplow.enrich.common/adapters/registry/MandrillAdapterSpec.scala index b2cc2bed3..736e5caaf 100644 --- a/modules/common/src/test/scala/com.snowplowanalytics.snowplow.enrich.common/adapters/registry/MandrillAdapterSpec.scala +++ b/modules/common/src/test/scala/com.snowplowanalytics.snowplow.enrich.common/adapters/registry/MandrillAdapterSpec.scala @@ -171,7 +171,7 @@ class MandrillAdapterSpec extends Specification with DataTables with ValidatedMa "tv" -> "com.mandrill-v1", "e" -> "ue", "p" -> "srv", - "ue_pr" -> """{"schema":"iglu:com.snowplowanalytics.snowplow/unstruct_event/jsonschema/1-0-0","data":{"schema":"iglu:com.mandrill/message_opened/jsonschema/1-0-2","data":{"ip":"127.0.0.1","location":{"city":"Oklahoma City","latitude":35.4675598145,"timezone":"-05:00","country":"United States","longitude":-97.5164337158,"country_short":"US","postal_code":"73101","region":"Oklahoma"},"_id":"exampleaaaaaaaaaaaaaaaaaaaaaaaaa5","ts":"2023-09-19T16:58:28.000Z","user_agent":"Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.1.8) Gecko/20100317 Postbox/1.1.3","msg":{"_version":"exampleaaaaaaaaaaaaaaa","subject":"This an example webhook message","email":"example.webhook@mandrillapp.com","state":"sent","_id":"exampleaaaaaaaaaaaaaaaaaaaaaaaaa5","tags":["webhook-example"],"ts":"2013-04-04T21:13:19.000Z","clicks":[{"ts":"2013-04-04T21:31:51.000Z","url":"http://mandrill.com"}],"metadata":{"user_id":111},"sender":"example.sender@mandrillapp.com","opens":[{"ts":"2013-04-04T21:31:51.000Z"}]},"user_agent_parsed":{"os_company_url":"http://www.apple.com/","os_family":"OS X","os_company":"Apple Computer, Inc.","os_url":"http://www.apple.com/osx/","ua_url":"http://www.postbox-inc.com/","ua_icon":"http://cdn.mandrill.com/img/email-client-icons/postbox.png","ua_version":"1.1.3","os_name":"OS X 10.6 Snow Leopard","ua_company":"Postbox, Inc.","ua_family":"Postbox","os_icon":"http://cdn.mandrill.com/img/email-client-icons/macosx.png","ua_company_url":"http://www.postbox-inc.com/","ua_name":"Postbox 1.1.3","type":"Email Client","mobile":false}}}}""" + "ue_pr" -> """{"schema":"iglu:com.snowplowanalytics.snowplow/unstruct_event/jsonschema/1-0-0","data":{"schema":"iglu:com.mandrill/message_opened/jsonschema/1-0-3","data":{"ip":"127.0.0.1","location":{"city":"Oklahoma City","latitude":35.4675598145,"timezone":"-05:00","country":"United States","longitude":-97.5164337158,"country_short":"US","postal_code":"73101","region":"Oklahoma"},"_id":"exampleaaaaaaaaaaaaaaaaaaaaaaaaa5","ts":"2023-09-19T16:58:28.000Z","user_agent":"Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.1.8) Gecko/20100317 Postbox/1.1.3","msg":{"_version":"exampleaaaaaaaaaaaaaaa","subject":"This an example webhook message","email":"example.webhook@mandrillapp.com","state":"sent","_id":"exampleaaaaaaaaaaaaaaaaaaaaaaaaa5","tags":["webhook-example"],"ts":"2013-04-04T21:13:19.000Z","clicks":[{"ts":"2013-04-04T21:31:51.000Z","url":"http://mandrill.com"}],"metadata":{"user_id":111},"sender":"example.sender@mandrillapp.com","opens":[{"ts":"2013-04-04T21:31:51.000Z"}]},"user_agent_parsed":{"os_company_url":"http://www.apple.com/","os_family":"OS X","os_company":"Apple Computer, Inc.","os_url":"http://www.apple.com/osx/","ua_url":"http://www.postbox-inc.com/","ua_icon":"http://cdn.mandrill.com/img/email-client-icons/postbox.png","ua_version":"1.1.3","os_name":"OS X 10.6 Snow Leopard","ua_company":"Postbox, Inc.","ua_family":"Postbox","os_icon":"http://cdn.mandrill.com/img/email-client-icons/macosx.png","ua_company_url":"http://www.postbox-inc.com/","ua_name":"Postbox 1.1.3","type":"Email Client","mobile":false}}}}""" ).toOpt, ContentType.some, Shared.cljSource,