Use id instead of cid when sending events to customer io

Author: toddkazakov

oura/jotform/webhook.go

@@ -183,7 +183,7 @@ func (w *WebhookProcessor) handleSurveyCompleted(ctx context.Context, identifier
 		Data: surveyCompletedData,
 	}
 
-	err := w.customerIOClient.SendEvent(ctx, identifiers.CID, surveyCompleted)
+	err := w.customerIOClient.SendEvent(ctx, identifiers.ID, surveyCompleted)
 	if err != nil {
 		return errors.Wrap(err, "unable to send sizing kit delivered event")
 	}

oura/jotform/webhook_test.go

@@ -100,7 +100,6 @@ var _ = Describe("WebhookProcessor", func() {
 		It("should successfully process an eligible submission and create consent record", func() {
 			submissionID := "6410095903544943563"
 			userID := "1aacb960-430c-4081-8b3b-a32688807dc5"
-			cid := "cio_0987654321"
 
 			submission, err := jotformTest.LoadFixture("./test/fixtures/submission.json")
 			Expect(err).ToNot(HaveOccurred())
@@ -118,7 +117,7 @@ var _ = Describe("WebhookProcessor", func() {
 				ouraTest.Response{StatusCode: http.StatusOK, Body: customer},
 			)
 			trackAPIResponses.AddResponse(
-				[]ouraTest.RequestMatcher{ouraTest.NewRequestMethodAndPathMatcher(http.MethodPost, "/api/v1/customers/"+cid+"/events")},
+				[]ouraTest.RequestMatcher{ouraTest.NewRequestMethodAndPathMatcher(http.MethodPost, "/api/v1/customers/"+userID+"/events")},
 				ouraTest.Response{StatusCode: http.StatusOK, Body: "{}"},
 			)
 
@@ -171,7 +170,6 @@ var _ = Describe("WebhookProcessor", func() {
 		It("should successfully process an eligible submission and not attempt to create consent record if one already exists", func() {
 			submissionID := "6410095903544943563"
 			userID := "1aacb960-430c-4081-8b3b-a32688807dc5"
-			cid := "cio_0987654321"
 
 			submission, err := jotformTest.LoadFixture("./test/fixtures/submission.json")
 			Expect(err).ToNot(HaveOccurred())
@@ -189,7 +187,7 @@ var _ = Describe("WebhookProcessor", func() {
 				ouraTest.Response{StatusCode: http.StatusOK, Body: customer},
 			)
 			trackAPIResponses.AddResponse(
-				[]ouraTest.RequestMatcher{ouraTest.NewRequestMethodAndPathMatcher(http.MethodPost, "/api/v1/customers/"+cid+"/events")},
+				[]ouraTest.RequestMatcher{ouraTest.NewRequestMethodAndPathMatcher(http.MethodPost, "/api/v1/customers/"+userID+"/events")},
 				ouraTest.Response{StatusCode: http.StatusOK, Body: "{}"},
 			)
 

oura/shopify/fulfillment.go

@@ -150,7 +150,7 @@ func (f *FulfillmentEventProcessor) onSizingKitDelivered(ctx context.Context, id
 		},
 	}
 
-	return f.customerIOClient.SendEvent(ctx, identifiers.CID, sizingKitDelivered)
+	return f.customerIOClient.SendEvent(ctx, identifiers.ID, sizingKitDelivered)
 }
 
 func (f *FulfillmentEventProcessor) onRingDelivered(ctx context.Context, identifiers customerio.Identifiers, event FulfillmentEvent) error {
@@ -160,5 +160,5 @@ func (f *FulfillmentEventProcessor) onRingDelivered(ctx context.Context, identif
 		Data: customerio.OuraRingDeliveredData{},
 	}
 
-	return f.customerIOClient.SendEvent(ctx, identifiers.CID, ringDelivered)
+	return f.customerIOClient.SendEvent(ctx, identifiers.ID, ringDelivered)
 }

oura/shopify/fulfillment_test.go

@@ -74,7 +74,7 @@ var _ = Describe("FulfillmentEventProcessor", func() {
 
 	Context("ProcessSubmission", func() {
 		It("should successfully process a sizing kit delivery", func() {
-			cid := "cio_0987654321"
+			id := "1aacb960-430c-4081-8b3b-a32688807dc5"
 			sizingKitDiscountCode := shopify.RandomDiscountCode()
 
 			event := shopify.FulfillmentEvent{
@@ -120,7 +120,7 @@ var _ = Describe("FulfillmentEventProcessor", func() {
 
 					trackAPIResponses.AddResponse(
 						[]ouraTest.RequestMatcher{
-							ouraTest.NewRequestMethodAndPathMatcher(http.MethodPost, "/api/v1/customers/"+cid+"/events"),
+							ouraTest.NewRequestMethodAndPathMatcher(http.MethodPost, "/api/v1/customers/"+id+"/events"),
 							ouraTest.NewRequestJSONBodyMatcher(`{
 					  	        "name": "oura_sizing_kit_delivered",
 						        "id": "` + fmt.Sprintf("%d", event.ID) + `",
@@ -141,7 +141,7 @@ var _ = Describe("FulfillmentEventProcessor", func() {
 		})
 
 		It("should successfully process a ring delivery", func() {
-			cid := "cio_0987654321"
+			id := "1aacb960-430c-4081-8b3b-a32688807dc5"
 			discountCode := shopify.RandomDiscountCode()
 
 			event := shopify.FulfillmentEvent{
@@ -180,7 +180,7 @@ var _ = Describe("FulfillmentEventProcessor", func() {
 
 			trackAPIResponses.AddResponse(
 				[]ouraTest.RequestMatcher{
-					ouraTest.NewRequestMethodAndPathMatcher(http.MethodPost, "/api/v1/customers/"+cid+"/events"),
+					ouraTest.NewRequestMethodAndPathMatcher(http.MethodPost, "/api/v1/customers/"+id+"/events"),
 					ouraTest.NewRequestJSONBodyMatcher(`{
 					  	"name": "oura_ring_delivered",
 						"id": "` + fmt.Sprintf("%d", event.ID) + `",