Gave separate events within an ecommerce transaction different transaction IDs (snowplow#89)

Author: fblundun

CHANGES.txt

@@ -1,5 +1,6 @@
 Version 0.4.0 (2014-05-xx)
 --------------------------
+Gave separate events within an ecommerce transaction different transaction IDs (#89) 
 Added https support for tracker (#81)
 Added callbacks for flushing (#78)
 Added Python-logging (#76)

snowplow_tracker/test/integration/test_integration.py

@@ -100,8 +100,7 @@ def test_integration_ecommerce_transaction(self):
         for key in expected_fields:
             self.assertEquals(from_querystring(key, querystrings[-1]), expected_fields[key])
 
-        for key in ["dtm", "tid"]:
-            self.assertEquals(from_querystring(key, querystrings[-3]), from_querystring(key, querystrings[-2]))
+        self.assertEquals(from_querystring("dtm", querystrings[-3]), from_querystring("dtm", querystrings[-2]))
 
     def test_integration_screen_view(self):
         t = tracker.Tracker(default_consumer, default_subject)

snowplow_tracker/tracker.py

@@ -137,6 +137,7 @@ def complete_payload(self, pb):
             :type   pb:              payload
             :rtype:                  tracker | int
         """
+        pb.add("tid", Tracker.get_transaction_id())
         pb.add_dict(self.standard_nv_pairs)
         if "co" in pb.nv_pairs or "cx" in pb.nv_pairs:
             pb.add("cv", self.context_vendor)
@@ -165,8 +166,6 @@ def track_page_view(self, page_url, page_title=None, referrer=None, context=None
         pb.add("refr", referrer)
         pb.add("evn", DEFAULT_VENDOR)
 
-        tid = Tracker.get_transaction_id()
-        pb.add("tid", tid)
         dtm = Tracker.get_timestamp(tstamp)
         pb.add("dtm", tstamp)        
         pb.add_json(context, self.encode_base64, "cx", "co")
@@ -177,7 +176,7 @@ def track_page_view(self, page_url, page_title=None, referrer=None, context=None
     def track_ecommerce_transaction_item(self, order_id, sku, price, quantity,
                                          name=None, category=None, currency=None,
                                          context=None,
-                                         tstamp=None, tid=None):
+                                         tstamp=None):
         """
             This is an internal method called by track_ecommerce_transaction.
             It is not for public use.
@@ -210,7 +209,6 @@ def track_ecommerce_transaction_item(self, order_id, sku, price, quantity,
         pb.add("ti_qu", quantity)
         pb.add("ti_cu", currency)
         pb.add("evn", DEFAULT_VENDOR)
-        pb.add("tid", tid)
         pb.add("dtm", tstamp)
         pb.add_json(context, self.encode_base64, "cx", "co")
 
@@ -260,8 +258,6 @@ def track_ecommerce_transaction(self, order_id, total_value,
         pb.add("tr_cu", currency)
         pb.add("evn", DEFAULT_VENDOR)
 
-        tid = Tracker.get_transaction_id()
-        pb.add("tid", tid)
         dtm = Tracker.get_timestamp(tstamp)
         pb.add("dtm", dtm)
         pb.add_json(context, self.encode_base64, "cx", "co")
@@ -272,7 +268,6 @@ def track_ecommerce_transaction(self, order_id, total_value,
 
         for item in items:
             item["tstamp"] = dtm
-            item["tid"] = tid
             item["order_id"] = order_id
             item["currency"] = currency
             item_results.append(self.track_ecommerce_transaction_item(**item))
@@ -329,8 +324,6 @@ def track_struct_event(self, category, action, label=None, property_=None, value
         pb.add("se_va", value)
         pb.add("evn", DEFAULT_VENDOR)
 
-        tid = Tracker.get_transaction_id()
-        pb.add("tid", tid)
         dtm = Tracker.get_timestamp(tstamp)
         pb.add("dtm", tstamp)
         pb.add_json(context, self.encode_base64, "cx", "co")
@@ -359,8 +352,6 @@ def track_unstruct_event(self, event_vendor, event_name, dict_, context=None, ts
 
         dtm = Tracker.get_timestamp(tstamp)
         pb.add("dtm", tstamp)
-        tid = Tracker.get_transaction_id()
-        pb.add("tid", tid)
         pb.add_json(context, self.encode_base64, "cx", "co")
 
         return self.complete_payload(pb)