refactor: add sub back button url to radom checkout session top level

Author: clD11

services/skus/controllers_test.go

@@ -1769,6 +1769,10 @@ func (suite *ControllersTestSuite) TestCreateOrder_RadomPayable() {
 
 	suite.service.radomClient = &mockRadomClient{
 		fnCreateCheckoutSession: func(ctx context.Context, creq *radom.CreateCheckoutSessionRequest) (radom.CreateCheckoutSessionResponse, error) {
+			if creq.SubBackBtnURL != "https://example-back-button.com" {
+				return radom.CreateCheckoutSessionResponse{}, model.Error("unexpected_response")
+			}
+
 			return radom.CreateCheckoutSessionResponse{
 				SessionID: sessID,
 			}, nil

services/skus/radom/radom.go

@@ -37,8 +37,7 @@ type Method struct {
 }
 
 type LineItem struct {
-	ProductID     string `json:"productId"`
-	SubBackBtnURL string `json:"subscriptionBackButtonUrl"`
+	ProductID string `json:"productId"`
 }
 
 type Metadata struct {
@@ -47,12 +46,13 @@ type Metadata struct {
 }
 
 type CreateCheckoutSessionRequest struct {
-	LineItems  []LineItem `json:"lineItems"`
-	Gateway    *Gateway   `json:"gateway"`
-	SuccessURL string     `json:"successUrl"`
-	CancelURL  string     `json:"cancelUrl"`
-	Metadata   []Metadata `json:"metadata"`
-	ExpiresAt  int64      `json:"expiresAt"` // in unix seconds
+	LineItems     []LineItem `json:"lineItems"`
+	Gateway       *Gateway   `json:"gateway"`
+	SuccessURL    string     `json:"successUrl"`
+	CancelURL     string     `json:"cancelUrl"`
+	SubBackBtnURL string     `json:"subscriptionBackButtonUrl"`
+	Metadata      []Metadata `json:"metadata"`
+	ExpiresAt     int64      `json:"expiresAt"` // in unix seconds
 }
 
 type CreateCheckoutSessionResponse struct {

services/skus/service.go

@@ -2154,16 +2154,17 @@ func (s *Service) createRadomSession(ctx context.Context, req *model.CreateOrder
 		return "", err
 	}
 
-	items, err := orderItemsToRadomLineItems(order.Items, req)
+	items, err := orderItemsToRadomLineItems(order.Items)
 	if err != nil {
 		return "", err
 	}
 
 	reqx := &radom.CreateCheckoutSessionRequest{
-		LineItems:  items,
-		Gateway:    s.radomGateway,
-		SuccessURL: surl,
-		CancelURL:  curl,
+		LineItems:     items,
+		Gateway:       s.radomGateway,
+		SuccessURL:    surl,
+		CancelURL:     curl,
+		SubBackBtnURL: req.RadomMetadata.SubBackBtnURL,
 		Metadata: []radom.Metadata{
 			{
 				Key:   "brave_order_id",
@@ -2183,7 +2184,7 @@ func (s *Service) createRadomSession(ctx context.Context, req *model.CreateOrder
 
 const errRadomProductIDNotFound = model.Error("product id not found in metadata")
 
-func orderItemsToRadomLineItems(orderItems []model.OrderItem, req *model.CreateOrderRequestNew) ([]radom.LineItem, error) {
+func orderItemsToRadomLineItems(orderItems []model.OrderItem) ([]radom.LineItem, error) {
 	lineItems := make([]radom.LineItem, 0, len(orderItems))
 	for i := range orderItems {
 		pid, ok := orderItems[i].RadomProductID()
@@ -2192,8 +2193,7 @@ func orderItemsToRadomLineItems(orderItems []model.OrderItem, req *model.CreateO
 		}
 
 		item := radom.LineItem{
-			ProductID:     pid,
-			SubBackBtnURL: req.RadomMetadata.SubBackBtnURL,
+			ProductID: pid,
 		}
 
 		lineItems = append(lineItems, item)

services/skus/service_nonint_test.go

@@ -5209,12 +5209,17 @@ func TestService_createRadomSessID(t *testing.T) {
 				},
 				req: &model.CreateOrderRequestNew{
 					RadomMetadata: &model.OrderRadomMetadata{
-						SuccessURI: "https://example.com",
-						CancelURI:  "https://example.com",
+						SuccessURI:    "https://example.com",
+						CancelURI:     "https://example.com",
+						SubBackBtnURL: "https://example-back-button.com",
 					},
 				},
 				radCl: &mockRadomClient{
 					fnCreateCheckoutSession: func(ctx context.Context, creq *radom.CreateCheckoutSessionRequest) (radom.CreateCheckoutSessionResponse, error) {
+						if creq.SubBackBtnURL != "https://example-back-button.com" {
+							return radom.CreateCheckoutSessionResponse{}, model.Error("unexpected_response")
+						}
+
 						return radom.CreateCheckoutSessionResponse{SessionID: "session_id"}, nil
 					},
 				},
@@ -5248,7 +5253,6 @@ func TestService_createRadomSessID(t *testing.T) {
 func Test_orderItemsToLineItems(t *testing.T) {
 	type tcGiven struct {
 		orderItems []model.OrderItem
-		req        *model.CreateOrderRequestNew
 	}
 
 	type tcExpected struct {
@@ -5288,21 +5292,14 @@ func Test_orderItemsToLineItems(t *testing.T) {
 						},
 					},
 				},
-				req: &model.CreateOrderRequestNew{
-					RadomMetadata: &model.OrderRadomMetadata{
-						SubBackBtnURL: "https://example.com",
-					},
-				},
 			},
 			exp: tcExpected{
 				lineItems: []radom.LineItem{
 					{
-						ProductID:     "product_1",
-						SubBackBtnURL: "https://example.com",
+						ProductID: "product_1",
 					},
 					{
-						ProductID:     "product_2",
-						SubBackBtnURL: "https://example.com",
+						ProductID: "product_2",
 					},
 				},
 			},
@@ -5313,7 +5310,7 @@ func Test_orderItemsToLineItems(t *testing.T) {
 		tc := tests[i]
 
 		t.Run(tc.name, func(t *testing.T) {
-			actual, err := orderItemsToRadomLineItems(tc.given.orderItems, tc.given.req)
+			actual, err := orderItemsToRadomLineItems(tc.given.orderItems)
 			must.Equal(t, tc.exp.err, err)
 
 			should.Equal(t, tc.exp.lineItems, actual)