refactor: rename radom event to radom notification

services/skus/controllers.go

@@ -1213,25 +1213,25 @@ func handleRadomWebhookH(w http.ResponseWriter, r *http.Request, svc *Service) *
 		return handlers.RenderContent(ctx, struct{}{}, w, http.StatusOK)
 	}
 
-	event, err := radom.ParseEvent(b)
+	ntf, err := radom.ParseNotification(b)
 	if err != nil {
 		l.Err(err).Msg("failed to parse radom event")
 
 		return handlers.WrapError(err, "failed to parse radom event", http.StatusBadRequest)
 	}
 
-	if err := svc.processRadomEvent(ctx, event); err != nil {
-		l.Err(err).Msg("failed to process radom event")
+	if err := svc.processRadomNotification(ctx, ntf); err != nil {
+		l.Err(err).Msg("failed to process radom notification")
 
 		return handlers.WrapError(model.ErrSomethingWentWrong, "something went wrong", http.StatusInternalServerError)
 	}
 
 	msg := "skipped radom notification"
-	if event.ShouldProcess() {
+	if ntf.ShouldProcess() {
 		msg = "processed radom notification"
 	}
 
-	l.Info().Str("ntf_type", event.EventType).Str("ntf_effect", event.Effect()).Msg(msg)
+	l.Info().Str("ntf_type", ntf.NtfType()).Str("ntf_effect", ntf.Effect()).Msg(msg)
 
 	return handlers.RenderContent(ctx, struct{}{}, w, http.StatusOK)
 }

services/skus/controllers_test.go

@@ -1859,7 +1859,7 @@ func (suite *ControllersTestSuite) TestWebhook_Radom() {
 
 	suite.service.payHistRepo = repository.NewOrderPayHistory()
 
-	event := &radom.Event{
+	event := &radom.Notification{
 		EventData: &radom.EventData{
 			New: &radom.NewSubscription{
 				SubscriptionID: subID,
@@ -1897,6 +1897,20 @@ func (suite *ControllersTestSuite) TestWebhook_Radom() {
 	suite.Require().NoError(err)
 
 	suite.Equal(model.OrderStatusPaid, order.Status)
+
+	{
+		req := httptest.NewRequest(http.MethodPost, "/", bytes.NewBuffer(b))
+
+		req.Header.Add("radom-verification-key", "test-token")
+
+		rw := httptest.NewRecorder()
+
+		//svr := &http.Server{Addr: ":8080", Handler: oh}
+
+		svr.Handler.ServeHTTP(rw, req)
+
+		suite.Require().Equal(http.StatusOK, rw.Code)
+	}
 }
 
 // ReadSigningOrderRequestMessage reads messages from the unsigned order request topic

services/skus/radom/event.go → services/skus/radom/notification.go

@@ -19,7 +19,7 @@ const (
 	ErrVerificationKeyInvalid = Error("radom: verification key is invalid")
 )
 
-type Event struct {
+type Notification struct {
 	EventType string     `json:"eventType"`
 	EventData *EventData `json:"eventData"`
 	RadomData *Data      `json:"radomData"`
@@ -62,16 +62,16 @@ type Subscription struct {
 	SubscriptionID uuid.UUID `json:"subscriptionId"`
 }
 
-func (e *Event) OrderID() (uuid.UUID, error) {
+func (n *Notification) OrderID() (uuid.UUID, error) {
 	switch {
-	case e.EventData == nil || e.EventData.New == nil:
+	case n.EventData == nil || n.EventData.New == nil:
 		return uuid.Nil, ErrUnsupportedEvent
 
-	case e.RadomData == nil || e.RadomData.CheckoutSession == nil:
+	case n.RadomData == nil || n.RadomData.CheckoutSession == nil:
 		return uuid.Nil, ErrNoCheckoutSessionData
 
 	default:
-		mdata := e.RadomData.CheckoutSession.Metadata
+		mdata := n.RadomData.CheckoutSession.Metadata
 
 		for i := range mdata {
 			if mdata[i].Key == "brave_order_id" {
@@ -83,83 +83,87 @@ func (e *Event) OrderID() (uuid.UUID, error) {
 	}
 }
 
-func (e *Event) SubID() (uuid.UUID, error) {
+func (n *Notification) SubID() (uuid.UUID, error) {
 	switch {
-	case e.EventData == nil:
+	case n.EventData == nil:
 		return uuid.Nil, ErrUnsupportedEvent
 
-	case e.EventData.New != nil:
-		return e.EventData.New.SubscriptionID, nil
+	case n.EventData.New != nil:
+		return n.EventData.New.SubscriptionID, nil
 
-	case e.EventData.Payment != nil:
-		if e.EventData.Payment.RadomData == nil || e.EventData.Payment.RadomData.Subscription == nil {
+	case n.EventData.Payment != nil:
+		if n.EventData.Payment.RadomData == nil || n.EventData.Payment.RadomData.Subscription == nil {
 			return uuid.Nil, ErrNoRadomPaymentData
 		}
 
-		return e.EventData.Payment.RadomData.Subscription.SubscriptionID, nil
+		return n.EventData.Payment.RadomData.Subscription.SubscriptionID, nil
 
-	case e.EventData.Cancelled != nil:
-		return e.EventData.Cancelled.SubscriptionID, nil
+	case n.EventData.Cancelled != nil:
+		return n.EventData.Cancelled.SubscriptionID, nil
 
-	case e.EventData.Expired != nil:
-		return e.EventData.Expired.SubscriptionID, nil
+	case n.EventData.Expired != nil:
+		return n.EventData.Expired.SubscriptionID, nil
 
 	default:
 		return uuid.Nil, ErrUnsupportedEvent
 	}
 }
 
-func (e *Event) IsNewSub() bool {
-	return e.EventData != nil && e.EventData.New != nil
+func (n *Notification) IsNewSub() bool {
+	return n.EventData != nil && n.EventData.New != nil
 }
 
-func (e *Event) ShouldRenew() bool {
-	return e.EventData != nil && e.EventData.Payment != nil
+func (n *Notification) ShouldRenew() bool {
+	return n.EventData != nil && n.EventData.Payment != nil
 }
 
-func (e *Event) ShouldCancel() bool {
+func (n *Notification) ShouldCancel() bool {
 	switch {
-	case e.EventData == nil:
+	case n.EventData == nil:
 		return false
 
-	case e.EventData.Cancelled != nil:
+	case n.EventData.Cancelled != nil:
 		return true
 
-	case e.EventData.Expired != nil:
+	case n.EventData.Expired != nil:
 		return true
 
 	default:
 		return false
 	}
 }
 
-func (e *Event) ShouldProcess() bool {
-	return e.IsNewSub() || e.ShouldRenew() || e.ShouldCancel()
+func (n *Notification) ShouldProcess() bool {
+	return n.IsNewSub() || n.ShouldRenew() || n.ShouldCancel()
 }
 
-func (e *Event) Effect() string {
+func (n *Notification) Effect() string {
 	switch {
-	case e.IsNewSub():
+	case n.IsNewSub():
 		return "new"
 
-	case e.ShouldRenew():
+	case n.ShouldRenew():
 		return "renew"
 
-	case e.ShouldCancel():
+	case n.ShouldCancel():
 		return "cancel"
 
 	default:
 		return "skip"
 	}
 }
 
-func ParseEvent(b []byte) (*Event, error) {
-	event := &Event{}
-	if err := json.Unmarshal(b, event); err != nil {
+func (n *Notification) NtfType() string {
+	return n.EventType
+}
+
+func ParseNotification(b []byte) (*Notification, error) {
+	ntf := &Notification{}
+	if err := json.Unmarshal(b, ntf); err != nil {
 		return nil, err
 	}
 
-	return event, nil
+	return ntf, nil
 }
 
 type MessageAuthConfig struct {