Merge pull request #2650 from brave-intl/master

Production 2024-08-28_01

services/skus/credentials.go

@@ -362,7 +362,7 @@ func (s *Service) doCredsExist(ctx context.Context, item *model.OrderItem) error
 	// Check if we already have a signing request for this order, delete order creds will
 	// delete the prior signing request.
 	// This allows subscriptions to manage how many order creds are handed out.
-	signingOrderRequests, err := s.Datastore.GetSigningOrderRequestOutboxByOrderItem(ctx, item.ID)
+	signingOrderRequests, err := s.Datastore.GetSigningOrderRequestOutboxByOrderItem(ctx, item.OrderID, item.ID)
 	if err != nil {
 		return fmt.Errorf("error validating no credentials exist for order item: %w", err)
 	}

services/skus/datastore.go

@@ -87,7 +87,7 @@ type Datastore interface {
 	InsertSigningOrderRequestOutbox(ctx context.Context, requestID uuid.UUID, orderID uuid.UUID, itemID uuid.UUID, signingOrderRequest SigningOrderRequest) error
 	GetSigningOrderRequestOutboxByRequestID(ctx context.Context, dbi sqlx.QueryerContext, reqID uuid.UUID) (*SigningOrderRequestOutbox, error)
 	GetSigningOrderRequestOutboxByOrder(ctx context.Context, orderID uuid.UUID) ([]SigningOrderRequestOutbox, error)
-	GetSigningOrderRequestOutboxByOrderItem(ctx context.Context, itemID uuid.UUID) ([]SigningOrderRequestOutbox, error)
+	GetSigningOrderRequestOutboxByOrderItem(ctx context.Context, orderID, itemID uuid.UUID) ([]SigningOrderRequestOutbox, error)
 	DeleteSigningOrderRequestOutboxByOrderTx(ctx context.Context, tx *sqlx.Tx, orderID uuid.UUID) error
 	UpdateSigningOrderRequestOutboxTx(ctx context.Context, tx *sqlx.Tx, requestID uuid.UUID, completedAt time.Time) error
 	AppendOrderMetadata(context.Context, *uuid.UUID, string, string) error
@@ -1078,15 +1078,15 @@ func (pg *Postgres) GetSigningOrderRequestOutboxByOrder(ctx context.Context, ord
 
 // GetSigningOrderRequestOutboxByOrderItem retrieves the latest signing order from the outbox.
 // An empty result set is returned if no rows are found.
-func (pg *Postgres) GetSigningOrderRequestOutboxByOrderItem(ctx context.Context, itemID uuid.UUID) ([]SigningOrderRequestOutbox, error) {
-	var signingRequestOutbox []SigningOrderRequestOutbox
-	err := pg.RawDB().SelectContext(ctx, &signingRequestOutbox,
-		`select request_id, order_id, item_id, completed_at, message_data
-				from signing_order_request_outbox where item_id = $1`, itemID)
-	if err != nil {
+func (pg *Postgres) GetSigningOrderRequestOutboxByOrderItem(ctx context.Context, orderID, itemID uuid.UUID) ([]SigningOrderRequestOutbox, error) {
+	var result []SigningOrderRequestOutbox
+
+	const q = `SELECT request_id, order_id, item_id, completed_at, message_data FROM signing_order_request_outbox WHERE order_id=$1 AND item_id=$2;`
+	if err := pg.RawDB().SelectContext(ctx, &result, q, orderID, itemID); err != nil {
 		return nil, fmt.Errorf("error retrieving signing requests from outbox: %w", err)
 	}
-	return signingRequestOutbox, nil
+
+	return result, nil
 }
 
 // GetSigningOrderRequestOutboxByRequestID retrieves the SigningOrderRequestOutbox by requestID.

services/skus/datastore_test.go

@@ -446,7 +446,7 @@ func (suite *PostgresTestSuite) TestInsertSigningOrderRequestOutbox() {
 	err := suite.storage.InsertSigningOrderRequestOutbox(ctx, requestID, orderID, itemID, signingOrderRequest)
 	suite.Require().NoError(err)
 
-	signingOrderRequests, err := suite.storage.GetSigningOrderRequestOutboxByOrderItem(ctx, itemID)
+	signingOrderRequests, err := suite.storage.GetSigningOrderRequestOutboxByOrderItem(ctx, orderID, itemID)
 	suite.Require().NoError(err)
 
 	suite.Require().Len(signingOrderRequests, 1)