Skip to content

Commit 18c9837

Browse files
shuaiwa-metafacebook-github-bot
authored andcommitted
add order_id and event_id into original_event_data
Summary: Add the order_id and event_id into original_event_data Reviewed By: satwikareddy3 Differential Revision: D74200927 Privacy Context Container: L1246766 fbshipit-source-id: 6e4a86334bec7e0af5b9d0b0e50fba0ecd048ebf
1 parent d0001ca commit 18c9837

2 files changed

Lines changed: 87 additions & 9 deletions

File tree

src/main/java/com/facebook/ads/sdk/serverside/OriginalEventData.java

Lines changed: 78 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ public class OriginalEventData {
3333
@SerializedName("event_time")
3434
private Long eventTime = null;
3535

36+
@SerializedName("order_id")
37+
private String orderID = null;
38+
39+
@SerializedName("event_id")
40+
private String eventID = null;
41+
3642
/**
3743
* Default Constructor.
3844
*/
@@ -42,19 +48,23 @@ public OriginalEventData() {
4248
/**
4349
* Constructor.
4450
*
45-
* @param eventName Meta pixel Standard Event or Custom Event name
51+
* @param eventName Meta pixel Standard Event or Custom Event name.
4652
* @param eventTime Unix timestamp in seconds indicating when the original event occurred.
53+
* @param orderID The order ID for this transaction as a string.
54+
* @param eventID A unique string chosen by the advertiser.
4755
*/
48-
public OriginalEventData(String eventName, Long eventTime) {
56+
public OriginalEventData(String eventName, Long eventTime, String orderID, String eventID) {
4957
this.eventName = eventName;
5058
this.eventTime = eventTime;
59+
this.orderID = orderID;
60+
this.eventID = eventID;
5161
}
5262

5363
/**
5464
* Set Meta pixel Standard Event or Custom Event name.
5565
*
5666
* @param eventName Meta pixel Standard Event or Custom Event name.
57-
* @return Event
67+
* @return OriginalEventData
5868
*/
5969
public OriginalEventData eventName(String eventName) {
6070
this.eventName = eventName;
@@ -83,7 +93,7 @@ public void setEventName(String eventName) {
8393
* Set Unix timestamp in seconds indicating when the original event occurred.
8494
*
8595
* @param eventTime Unix timestamp in seconds indicating when the original event occurred
86-
* @return Event
96+
* @return OriginalEventData
8797
*/
8898
public OriginalEventData eventTime(Long eventTime) {
8999
this.eventTime = eventTime;
@@ -108,6 +118,64 @@ public void setEventTime(Long eventTime) {
108118
this.eventTime = eventTime;
109119
}
110120

121+
/**
122+
* Set the order_id of original Event.
123+
*
124+
* @param orderID The order ID for this transaction as a string.
125+
* @return OriginalEventData
126+
*/
127+
public OriginalEventData orderID(String orderID) {
128+
this.orderID = orderID;
129+
return this;
130+
}
131+
132+
/**
133+
* Get the order_id of original Event.
134+
*
135+
* @return orderID
136+
*/
137+
public String getOrderID() {
138+
return orderID;
139+
}
140+
141+
/**
142+
* Set the order_id of original Event.
143+
*
144+
* @param orderID The order ID for this transaction as a string.
145+
*/
146+
public void setOrderID(String orderID) {
147+
this.orderID = orderID;
148+
}
149+
150+
/**
151+
* Set the event_id of original Event.
152+
*
153+
* @param eventID A unique string chosen by the advertiser.
154+
* @return OriginalEventData
155+
*/
156+
public OriginalEventData eventID(String eventID) {
157+
this.eventID = eventID;
158+
return this;
159+
}
160+
161+
/**
162+
* Get the event_id of original Event.
163+
*
164+
* @return event_id
165+
*/
166+
public String getEventID() {
167+
return eventID;
168+
}
169+
170+
/**
171+
* Set the event_id of original Event.
172+
*
173+
* @param eventID A unique string chosen by the advertiser.
174+
*/
175+
public void setEventID(String eventID) {
176+
this.eventID = eventID;
177+
}
178+
111179
@Override
112180
public boolean equals(Object o) {
113181
if (this == o) {
@@ -118,12 +186,14 @@ public boolean equals(Object o) {
118186
}
119187
OriginalEventData originalEvent = (OriginalEventData) o;
120188
return Objects.equals(this.eventName, originalEvent.eventName)
121-
&& Objects.equals(this.eventTime, originalEvent.eventTime);
189+
&& Objects.equals(this.eventTime, originalEvent.eventTime)
190+
&& Objects.equals(this.orderID, originalEvent.orderID)
191+
&& Objects.equals(this.eventID, originalEvent.eventID);
122192
}
123193

124194
@Override
125195
public int hashCode() {
126-
return Objects.hash(eventName, eventTime);
196+
return Objects.hash(eventName, eventTime, orderID, eventID);
127197
}
128198

129199
@Override
@@ -132,6 +202,8 @@ public String toString() {
132202
sb.append("class OriginalEventData {\n");
133203
sb.append(" eventName: ").append(toIndentedString(eventName)).append("\n");
134204
sb.append(" eventTime: ").append(toIndentedString(eventTime)).append("\n");
205+
sb.append(" orderID: ").append(toIndentedString(orderID)).append("\n");
206+
sb.append(" eventID: ").append(toIndentedString(eventID)).append("\n");
135207
sb.append("}");
136208
return sb.toString();
137209
}

src/test/java/com/facebook/ads/sdk/serverside/OriginalEventDataTest.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,26 @@ public void TestOriginalEventDataBuilderAndGetters() {
2828
OriginalEventData originalEventData = new OriginalEventData();
2929
String eventName = "eventName-0";
3030
long eventTime = 123L;
31-
originalEventData.eventName(eventName).eventTime(eventTime);
31+
String orderID = "orderID-0";
32+
String eventID = "eventID-0";
33+
originalEventData.eventName(eventName).eventTime(eventTime).orderID(orderID).eventID(eventID);
3234

3335
assertEquals(originalEventData.getEventName(), eventName);
3436
assertEquals((long) originalEventData.getEventTime(), eventTime);
37+
assertEquals(originalEventData.getOrderID(), orderID);
38+
assertEquals(originalEventData.getEventID(), eventID);
3539
}
3640

3741
@Test
3842
public void TestWhenInstancesAreEqual() {
3943
OriginalEventData originalEventData1 = new OriginalEventData();
4044
String eventName = "eventName-0";
4145
long eventTime = 123L;
42-
originalEventData1.eventName(eventName).eventTime(eventTime);
46+
String orderID = "orderID-0";
47+
String eventID = "eventID-0";
48+
originalEventData1.eventName(eventName).eventTime(eventTime).orderID(orderID).eventID(eventID);
4349
OriginalEventData originalEventData2 = new OriginalEventData();
44-
originalEventData2.eventName(eventName).eventTime(eventTime);
50+
originalEventData2.eventName(eventName).eventTime(eventTime).orderID(orderID).eventID(eventID);
4551

4652
assertEquals(originalEventData1, originalEventData2);
4753
assertEquals(originalEventData1.hashCode(), originalEventData2.hashCode());

0 commit comments

Comments
 (0)