Skip to content

Commit

Permalink
Merge pull request #652 from nyaruka/event_optin_id
Browse files Browse the repository at this point in the history 
Channel Event OptIn ID
  • Loading branch information
@rowanseymour
rowanseymour authored Oct 4, 2023
2 parents 0786149 + ceab9b0 commit 68a5508
Show file tree
Hide file tree
Showing 13 changed files with 91 additions and 76 deletions.
37 changes: 23 additions & 14 deletions backends/rapidpro/backend_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1265,7 +1265,7 @@ func (ts *BackendTestSuite) TestChannelEvent() {
clog := courier.NewChannelLog(courier.ChannelLogTypeUnknown, channel, nil)
urn, _ := urns.NewTelURNForCountry("12065551616", channel.Country())

event := ts.b.NewChannelEvent(channel, courier.EventTypeReferral, urn, clog).WithExtra(map[string]any{"ref_id": "12345"}).WithContactName("kermit frog")
event := ts.b.NewChannelEvent(channel, courier.EventTypeReferral, urn, clog).WithExtra(map[string]string{"ref_id": "12345"}).WithContactName("kermit frog")
err := ts.b.WriteChannelEvent(ctx, event, clog)
ts.NoError(err)

Expand All @@ -1274,12 +1274,21 @@ func (ts *BackendTestSuite) TestChannelEvent() {
ts.Equal(null.String("kermit frog"), contact.Name_)

dbE := event.(*ChannelEvent)
dbE, err = readChannelEventFromDB(ts.b, dbE.ID_)
ts.NoError(err)
dbE = readChannelEventFromDB(ts.b, dbE.ID_)
ts.Equal(dbE.EventType_, courier.EventTypeReferral)
ts.Equal(map[string]any{"ref_id": "12345"}, dbE.Extra())
ts.Equal(map[string]string{"ref_id": "12345"}, dbE.Extra())
ts.Equal(contact.ID_, dbE.ContactID_)
ts.Equal(contact.URNID_, dbE.ContactURNID_)

event = ts.b.NewChannelEvent(channel, courier.EventTypeOptIn, urn, clog).WithExtra(map[string]string{"title": "Polls", "payload": "1"})
err = ts.b.WriteChannelEvent(ctx, event, clog)
ts.NoError(err)

dbE = event.(*ChannelEvent)
dbE = readChannelEventFromDB(ts.b, dbE.ID_)
ts.Equal(dbE.EventType_, courier.EventTypeOptIn)
ts.Equal(map[string]string{"title": "Polls", "payload": "1"}, dbE.Extra())
ts.Equal(null.Int(1), dbE.OptInID_)
}

func (ts *BackendTestSuite) TestSessionTimeout() {
Expand All @@ -1305,7 +1314,7 @@ func (ts *BackendTestSuite) TestMailroomEvents() {
clog := courier.NewChannelLog(courier.ChannelLogTypeUnknown, channel, nil)
urn, _ := urns.NewTelURNForCountry("12065551616", channel.Country())

event := ts.b.NewChannelEvent(channel, courier.EventTypeReferral, urn, clog).WithExtra(map[string]any{"ref_id": "12345"}).
event := ts.b.NewChannelEvent(channel, courier.EventTypeReferral, urn, clog).WithExtra(map[string]string{"ref_id": "12345"}).
WithContactName("kermit frog").
WithOccurredOn(time.Date(2020, 8, 5, 13, 30, 0, 123456789, time.UTC))
err := ts.b.WriteChannelEvent(ctx, event, clog)
Expand All @@ -1316,10 +1325,9 @@ func (ts *BackendTestSuite) TestMailroomEvents() {
ts.Equal(null.String("kermit frog"), contact.Name_)

dbE := event.(*ChannelEvent)
dbE, err = readChannelEventFromDB(ts.b, dbE.ID_)
ts.NoError(err)
dbE = readChannelEventFromDB(ts.b, dbE.ID_)
ts.Equal(dbE.EventType_, courier.EventTypeReferral)
ts.Equal(map[string]any{"ref_id": "12345"}, dbE.Extra())
ts.Equal(map[string]string{"ref_id": "12345"}, dbE.Extra())
ts.Equal(contact.ID_, dbE.ContactID_)
ts.Equal(contact.URNID_, dbE.ContactURNID_)

Expand Down Expand Up @@ -1552,14 +1560,15 @@ WHERE
`

const sqlSelectEvent = `
SELECT org_id, channel_id, contact_id, contact_urn_id, event_type, extra, occurred_on, created_on, log_uuids
SELECT id, org_id, channel_id, contact_id, contact_urn_id, event_type, optin_id, extra, occurred_on, created_on, log_uuids
FROM channels_channelevent
WHERE id = $1`

func readChannelEventFromDB(b *backend, id ChannelEventID) (*ChannelEvent, error) {
e := &ChannelEvent{
ID_: id,
}
func readChannelEventFromDB(b *backend, id ChannelEventID) *ChannelEvent {
e := &ChannelEvent{}
err := b.db.Get(e, sqlSelectEvent, id)
return e, err
if err != nil {
panic(err)
}
return e
}
21 changes: 15 additions & 6 deletions backends/rapidpro/channel_event.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ type ChannelEvent struct {
ChannelID_ courier.ChannelID `json:"channel_id" db:"channel_id"`
URN_ urns.URN `json:"urn" db:"urn"`
EventType_ courier.ChannelEventType `json:"event_type" db:"event_type"`
Extra_ null.Map[any] `json:"extra" db:"extra"`
OptInID_ null.Int `json:"optin_id" db:"optin_id"`
Extra_ null.Map[string] `json:"extra" db:"extra"`
OccurredOn_ time.Time `json:"occurred_on" db:"occurred_on"`
CreatedOn_ time.Time `json:"created_on" db:"created_on"`
LogUUIDs pq.StringArray `json:"log_uuids" db:"log_uuids"`
Expand Down Expand Up @@ -82,7 +83,7 @@ func (e *ChannelEvent) ChannelID() courier.ChannelID { return e.ChannelID
func (e *ChannelEvent) ChannelUUID() courier.ChannelUUID { return e.ChannelUUID_ }
func (e *ChannelEvent) EventType() courier.ChannelEventType { return e.EventType_ }
func (e *ChannelEvent) URN() urns.URN { return e.URN_ }
func (e *ChannelEvent) Extra() map[string]any { return e.Extra_ }
func (e *ChannelEvent) Extra() map[string]string { return e.Extra_ }
func (e *ChannelEvent) OccurredOn() time.Time { return e.OccurredOn_ }
func (e *ChannelEvent) CreatedOn() time.Time { return e.CreatedOn_ }
func (e *ChannelEvent) Channel() *Channel { return e.channel }
Expand All @@ -97,8 +98,16 @@ func (e *ChannelEvent) WithURNAuthTokens(tokens map[string]string) courier.Chann
return e
}

func (e *ChannelEvent) WithExtra(extra map[string]any) courier.ChannelEvent {
e.Extra_ = null.Map[any](extra)
func (e *ChannelEvent) WithExtra(extra map[string]string) courier.ChannelEvent {
if e.EventType_ == courier.EventTypeOptIn || e.EventType_ == courier.EventTypeOptOut {
optInID := extra["payload"]
if optInID != "" {
asInt, _ := strconv.Atoi(optInID)
e.OptInID_ = null.Int(asInt)
}
}

e.Extra_ = null.Map[string](extra)
return e
}

Expand Down Expand Up @@ -127,8 +136,8 @@ func writeChannelEvent(ctx context.Context, b *backend, event courier.ChannelEve

const sqlInsertChannelEvent = `
INSERT INTO
channels_channelevent( org_id, channel_id, contact_id, contact_urn_id, event_type, extra, occurred_on, created_on, log_uuids)
VALUES(:org_id, :channel_id, :contact_id, :contact_urn_id, :event_type, :extra, :occurred_on, :created_on, :log_uuids)
channels_channelevent( org_id, channel_id, contact_id, contact_urn_id, event_type, optin_id, extra, occurred_on, created_on, log_uuids)
VALUES(:org_id, :channel_id, :contact_id, :contact_urn_id, :event_type, :optin_id, :extra, :occurred_on, :created_on, :log_uuids)
RETURNING id`

// writeChannelEventToDB writes the passed in msg status to our db
Expand Down
11 changes: 10 additions & 1 deletion backends/rapidpro/schema.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,14 @@ CREATE TABLE contacts_contacturn (
UNIQUE (org_id, identity)
);

DROP TABLE IF EXISTS msgs_optin CASCADE;
CREATE TABLE msgs_optin (
id serial primary key,
uuid uuid NOT NULL,
org_id integer NOT NULL references orgs_org(id) on delete cascade,
name character varying(64)
);

DROP TABLE IF EXISTS msgs_msg CASCADE;
CREATE TABLE msgs_msg (
id bigserial primary key,
Expand Down Expand Up @@ -83,7 +91,7 @@ CREATE TABLE msgs_msg (
contact_urn_id integer NOT NULL references contacts_contacturn(id) on delete cascade,
org_id integer NOT NULL references orgs_org(id) on delete cascade,
metadata text,
topup_id integer,
optin_id integer references msgs_optin(id) on delete cascade,
delete_from_counts boolean,
log_uuids uuid[]
);
Expand Down Expand Up @@ -111,6 +119,7 @@ CREATE TABLE channels_channelevent (
channel_id integer NOT NULL references channels_channel(id) on delete cascade,
contact_id integer NOT NULL references contacts_contact(id) on delete cascade,
contact_urn_id integer NOT NULL references contacts_contacturn(id) on delete cascade,
optin_id integer references msgs_optin(id) on delete cascade,
org_id integer NOT NULL references orgs_org(id) on delete cascade,
log_uuids uuid[]
);
Expand Down
10 changes: 8 additions & 2 deletions backends/rapidpro/testdata.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,14 @@ DELETE FROM contacts_contacturn;
INSERT INTO contacts_contacturn("id", "identity", "path", "scheme", "priority", "channel_id", "contact_id", "org_id")
VALUES(1000, 'tel:+12067799192', '+12067799192', 'tel', 50, 10, 100, 1);

/** Msg with id 10,000 */
DELETE from msgs_msg;
/* Msg optins with ids 1, 2 */
DELETE FROM msgs_optin;
INSERT INTO msgs_optin(id, uuid, org_id, name) VALUES
(1, 'fc1cef6e-b5b1-452d-9528-a4b24db28eb0', 1, 'Polls'),
(2, '2b1eba23-4a97-46ac-9022-11304412b32f', 1, 'Jokes');

/** Msg with id 10000 */
DELETE FROM msgs_msg;
INSERT INTO msgs_msg("id", "text", "high_priority", "created_on", "modified_on", "sent_on", "queued_on", "direction", "status", "visibility", "msg_type",
"msg_count", "error_count", "next_attempt", "external_id", "channel_id", "contact_id", "contact_urn_id", "org_id")
VALUES(10000, 'test message', True, now(), now(), now(), now(), 'O', 'W', 'V', 'T',
Expand Down
4 changes: 2 additions & 2 deletions channel_event.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ type ChannelEvent interface {
ChannelUUID() ChannelUUID
URN() urns.URN
EventType() ChannelEventType
Extra() map[string]any
Extra() map[string]string
CreatedOn() time.Time
OccurredOn() time.Time

WithContactName(name string) ChannelEvent
WithURNAuthTokens(tokens map[string]string) ChannelEvent
WithExtra(extra map[string]any) ChannelEvent
WithExtra(extra map[string]string) ChannelEvent
WithOccurredOn(time.Time) ChannelEvent
}
11 changes: 3 additions & 8 deletions handlers/facebook_legacy/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,7 @@ func (h *handler) receiveEvents(ctx context.Context, channel courier.Channel, w
event := h.Backend().NewChannelEvent(channel, courier.EventTypeReferral, urn, clog).WithOccurredOn(date)

// build our extra
extra := map[string]any{
referrerIDKey: msg.OptIn.Ref,
}
extra := map[string]string{referrerIDKey: msg.OptIn.Ref}
event = event.WithExtra(extra)

err := h.Backend().WriteChannelEvent(ctx, event, clog)
Expand All @@ -295,7 +293,7 @@ func (h *handler) receiveEvents(ctx context.Context, channel courier.Channel, w
event := h.Backend().NewChannelEvent(channel, eventType, urn, clog).WithOccurredOn(date)

// build our extra
extra := map[string]any{
extra := map[string]string{
titleKey: msg.Postback.Title,
payloadKey: msg.Postback.Payload,
}
Expand Down Expand Up @@ -326,10 +324,7 @@ func (h *handler) receiveEvents(ctx context.Context, channel courier.Channel, w
event := h.Backend().NewChannelEvent(channel, courier.EventTypeReferral, urn, clog).WithOccurredOn(date)

// build our extra
extra := map[string]any{
sourceKey: msg.Referral.Source,
typeKey: msg.Referral.Type,
}
extra := map[string]string{sourceKey: msg.Referral.Source, typeKey: msg.Referral.Type}

// add referrer id if present
if msg.Referral.Ref != "" {
Expand Down
12 changes: 6 additions & 6 deletions handlers/facebook_legacy/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ var testCases = []IncomingTestCase{
ExpectedRespStatus: 200,
ExpectedBodyContains: "Handled",
ExpectedEvents: []ExpectedEvent{
{Type: courier.EventTypeReferral, URN: "facebook:ref:optin_user_ref", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]any{"referrer_id": "optin_ref"}},
{Type: courier.EventTypeReferral, URN: "facebook:ref:optin_user_ref", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]string{"referrer_id": "optin_ref"}},
},
},
{
Expand All @@ -492,7 +492,7 @@ var testCases = []IncomingTestCase{
ExpectedRespStatus: 200,
ExpectedBodyContains: "Handled",
ExpectedEvents: []ExpectedEvent{
{Type: courier.EventTypeReferral, URN: "facebook:5678", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]any{"referrer_id": "optin_ref"}},
{Type: courier.EventTypeReferral, URN: "facebook:5678", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]string{"referrer_id": "optin_ref"}},
},
},
{
Expand All @@ -502,7 +502,7 @@ var testCases = []IncomingTestCase{
ExpectedRespStatus: 200,
ExpectedBodyContains: "Handled",
ExpectedEvents: []ExpectedEvent{
{Type: courier.EventTypeNewConversation, URN: "facebook:5678", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]any{"title": "postback title", "payload": "get_started"}},
{Type: courier.EventTypeNewConversation, URN: "facebook:5678", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]string{"title": "postback title", "payload": "get_started"}},
},
},
{
Expand All @@ -512,7 +512,7 @@ var testCases = []IncomingTestCase{
ExpectedRespStatus: 200,
ExpectedBodyContains: "Handled",
ExpectedEvents: []ExpectedEvent{
{Type: courier.EventTypeReferral, URN: "facebook:5678", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]any{"title": "postback title", "payload": "postback payload", "referrer_id": "postback ref", "source": "postback source", "type": "postback type"}},
{Type: courier.EventTypeReferral, URN: "facebook:5678", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]string{"title": "postback title", "payload": "postback payload", "referrer_id": "postback ref", "source": "postback source", "type": "postback type"}},
},
},
{
Expand All @@ -522,7 +522,7 @@ var testCases = []IncomingTestCase{
ExpectedRespStatus: 200,
ExpectedBodyContains: "Handled",
ExpectedEvents: []ExpectedEvent{
{Type: courier.EventTypeReferral, URN: "facebook:5678", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]any{"title": "postback title", "payload": "get_started", "referrer_id": "postback ref", "source": "postback source", "type": "postback type", "ad_id": "ad id"}},
{Type: courier.EventTypeReferral, URN: "facebook:5678", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]string{"title": "postback title", "payload": "get_started", "referrer_id": "postback ref", "source": "postback source", "type": "postback type", "ad_id": "ad id"}},
},
},
{
Expand All @@ -532,7 +532,7 @@ var testCases = []IncomingTestCase{
ExpectedRespStatus: 200,
ExpectedBodyContains: `"referrer_id":"referral id"`,
ExpectedEvents: []ExpectedEvent{
{Type: courier.EventTypeReferral, URN: "facebook:5678", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]any{"referrer_id": "referral id", "source": "referral source", "type": "referral type", "ad_id": "ad id"}},
{Type: courier.EventTypeReferral, URN: "facebook:5678", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]string{"referrer_id": "referral id", "source": "referral source", "type": "referral type", "ad_id": "ad id"}},
},
},
{
Expand Down
16 changes: 8 additions & 8 deletions handlers/meta/facebook_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ var facebookIncomingTests = []IncomingTestCase{
ExpectedRespStatus: 200,
ExpectedBodyContains: "Handled",
ExpectedEvents: []ExpectedEvent{
{Type: courier.EventTypeReferral, URN: "facebook:ref:optin_user_ref", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]any{"referrer_id": "optin_ref"}},
{Type: courier.EventTypeReferral, URN: "facebook:ref:optin_user_ref", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]string{"referrer_id": "optin_ref"}},
},
PrepRequest: addValidSignature,
},
Expand All @@ -111,7 +111,7 @@ var facebookIncomingTests = []IncomingTestCase{
ExpectedRespStatus: 200,
ExpectedBodyContains: "Handled",
ExpectedEvents: []ExpectedEvent{
{Type: courier.EventTypeReferral, URN: "facebook:5678", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]any{"referrer_id": "optin_ref"}},
{Type: courier.EventTypeReferral, URN: "facebook:5678", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]string{"referrer_id": "optin_ref"}},
},
PrepRequest: addValidSignature,
},
Expand All @@ -122,7 +122,7 @@ var facebookIncomingTests = []IncomingTestCase{
ExpectedRespStatus: 200,
ExpectedBodyContains: "Handled",
ExpectedEvents: []ExpectedEvent{
{Type: courier.EventTypeOptIn, URN: "facebook:5678", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]any{"optin_id": 3456, "optin_name": "Bird Facts"}},
{Type: courier.EventTypeOptIn, URN: "facebook:5678", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]string{"title": "Bird Facts", "payload": "3456"}},
},
ExpectedURNAuthTokens: map[urns.URN]map[string]string{"facebook:5678": {"optin:3456": "12345678901234567890"}},
PrepRequest: addValidSignature,
Expand All @@ -134,7 +134,7 @@ var facebookIncomingTests = []IncomingTestCase{
ExpectedRespStatus: 200,
ExpectedBodyContains: "Handled",
ExpectedEvents: []ExpectedEvent{
{Type: courier.EventTypeOptOut, URN: "facebook:5678", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]any{"optin_id": 3456, "optin_name": "Bird Facts"}},
{Type: courier.EventTypeOptOut, URN: "facebook:5678", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]string{"title": "Bird Facts", "payload": "3456"}},
},
ExpectedURNAuthTokens: map[urns.URN]map[string]string{"facebook:5678": {}},
PrepRequest: addValidSignature,
Expand All @@ -146,7 +146,7 @@ var facebookIncomingTests = []IncomingTestCase{
ExpectedRespStatus: 200,
ExpectedBodyContains: "Handled",
ExpectedEvents: []ExpectedEvent{
{Type: courier.EventTypeNewConversation, URN: "facebook:5678", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]any{"title": "postback title", "payload": "get_started"}},
{Type: courier.EventTypeNewConversation, URN: "facebook:5678", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]string{"title": "postback title", "payload": "get_started"}},
},
PrepRequest: addValidSignature,
},
Expand All @@ -157,7 +157,7 @@ var facebookIncomingTests = []IncomingTestCase{
ExpectedRespStatus: 200,
ExpectedBodyContains: "Handled",
ExpectedEvents: []ExpectedEvent{
{Type: courier.EventTypeReferral, URN: "facebook:5678", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]any{"title": "postback title", "payload": "postback payload", "referrer_id": "postback ref", "source": "postback source", "type": "postback type"}},
{Type: courier.EventTypeReferral, URN: "facebook:5678", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]string{"title": "postback title", "payload": "postback payload", "referrer_id": "postback ref", "source": "postback source", "type": "postback type"}},
},
PrepRequest: addValidSignature,
},
Expand All @@ -168,7 +168,7 @@ var facebookIncomingTests = []IncomingTestCase{
ExpectedRespStatus: 200,
ExpectedBodyContains: "Handled",
ExpectedEvents: []ExpectedEvent{
{Type: courier.EventTypeReferral, URN: "facebook:5678", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]any{"title": "postback title", "payload": "get_started", "referrer_id": "postback ref", "source": "postback source", "type": "postback type", "ad_id": "ad id"}},
{Type: courier.EventTypeReferral, URN: "facebook:5678", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]string{"title": "postback title", "payload": "get_started", "referrer_id": "postback ref", "source": "postback source", "type": "postback type", "ad_id": "ad id"}},
},
PrepRequest: addValidSignature,
},
Expand All @@ -179,7 +179,7 @@ var facebookIncomingTests = []IncomingTestCase{
ExpectedRespStatus: 200,
ExpectedBodyContains: `"referrer_id":"referral id"`,
ExpectedEvents: []ExpectedEvent{
{Type: courier.EventTypeReferral, URN: "facebook:5678", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]any{"referrer_id": "referral id", "source": "referral source", "type": "referral type", "ad_id": "ad id"}},
{Type: courier.EventTypeReferral, URN: "facebook:5678", Time: time.Date(2016, 4, 7, 1, 11, 27, 970000000, time.UTC), Extra: map[string]string{"referrer_id": "referral id", "source": "referral source", "type": "referral type", "ad_id": "ad id"}},
},
PrepRequest: addValidSignature,
},
Expand Down
Loading

0 comments on commit 68a5508

Please sign in to comment.