fixed po <-> tgsettle contract

api/gateway/tgsettle/storage/model/execution.go

@@ -20,22 +20,25 @@ const (
 )
 
 type PaymentRecord struct {
-	storable.Base   `bson:",inline" json:",inline"`
-	OperationRef    string              `bson:"operationRef,omitempty" json:"operation_ref,omitempty"`
-	IdempotencyKey  string              `bson:"idempotencyKey,omitempty" json:"idempotency_key,omitempty"`
-	PaymentIntentID string              `bson:"paymentIntentId,omitempty" json:"payment_intent_id,omitempty"`
-	QuoteRef        string              `bson:"quoteRef,omitempty" json:"quote_ref,omitempty"`
-	IntentRef       string              `bson:"intentRef,omitempty" json:"intent_ref,omitempty"`
-	PaymentRef      string              `bson:"paymentRef,omitempty" json:"payment_ref,omitempty"`
-	OutgoingLeg     string              `bson:"outgoingLeg,omitempty" json:"outgoing_leg,omitempty"`
-	TargetChatID    string              `bson:"targetChatId,omitempty" json:"target_chat_id,omitempty"`
-	RequestedMoney  *paymenttypes.Money `bson:"requestedMoney,omitempty" json:"requested_money,omitempty"`
-	ExecutedMoney   *paymenttypes.Money `bson:"executedMoney,omitempty" json:"executed_money,omitempty"`
-	Status          PaymentStatus       `bson:"status,omitempty" json:"status,omitempty"`
-	FailureReason   string              `bson:"failureReason,omitempty" json:"Failure_reason,omitempty"`
-	ExecutedAt      time.Time           `bson:"executedAt,omitempty" json:"executed_at,omitempty"`
-	ExpiresAt       time.Time           `bson:"expiresAt,omitempty" json:"expires_at,omitempty"`
-	ExpiredAt       time.Time           `bson:"expiredAt,omitempty" json:"expired_at,omitempty"`
+	storable.Base              `bson:",inline" json:",inline"`
+	OperationRef               string              `bson:"operationRef,omitempty" json:"operation_ref,omitempty"`
+	IdempotencyKey             string              `bson:"idempotencyKey,omitempty" json:"idempotency_key,omitempty"`
+	ConfirmationRef            string              `bson:"confirmationRef,omitempty" json:"confirmation_ref,omitempty"`
+	ConfirmationMessageID      string              `bson:"confirmationMessageId,omitempty" json:"confirmation_message_id,omitempty"`
+	ConfirmationReplyMessageID string              `bson:"confirmationReplyMessageId,omitempty" json:"confirmation_reply_message_id,omitempty"`
+	PaymentIntentID            string              `bson:"paymentIntentId,omitempty" json:"payment_intent_id,omitempty"`
+	QuoteRef                   string              `bson:"quoteRef,omitempty" json:"quote_ref,omitempty"`
+	IntentRef                  string              `bson:"intentRef,omitempty" json:"intent_ref,omitempty"`
+	PaymentRef                 string              `bson:"paymentRef,omitempty" json:"payment_ref,omitempty"`
+	OutgoingLeg                string              `bson:"outgoingLeg,omitempty" json:"outgoing_leg,omitempty"`
+	TargetChatID               string              `bson:"targetChatId,omitempty" json:"target_chat_id,omitempty"`
+	RequestedMoney             *paymenttypes.Money `bson:"requestedMoney,omitempty" json:"requested_money,omitempty"`
+	ExecutedMoney              *paymenttypes.Money `bson:"executedMoney,omitempty" json:"executed_money,omitempty"`
+	Status                     PaymentStatus       `bson:"status,omitempty" json:"status,omitempty"`
+	FailureReason              string              `bson:"failureReason,omitempty" json:"Failure_reason,omitempty"`
+	ExecutedAt                 time.Time           `bson:"executedAt,omitempty" json:"executed_at,omitempty"`
+	ExpiresAt                  time.Time           `bson:"expiresAt,omitempty" json:"expires_at,omitempty"`
+	ExpiredAt                  time.Time           `bson:"expiredAt,omitempty" json:"expired_at,omitempty"`
 }
 
 type TelegramConfirmation struct {

api/gateway/tgsettle/storage/mongo/store/payments.go

@@ -103,14 +103,13 @@ func (p *Payments) Upsert(ctx context.Context, record *model.PaymentRecord) erro
 		return merrors.InvalidArgument("payment record is nil", "record")
 	}
 	record.IdempotencyKey = strings.TrimSpace(record.IdempotencyKey)
-	record.PaymentIntentID = strings.TrimSpace(record.PaymentIntentID)
 	record.QuoteRef = strings.TrimSpace(record.QuoteRef)
 	record.OutgoingLeg = strings.TrimSpace(record.OutgoingLeg)
 	record.TargetChatID = strings.TrimSpace(record.TargetChatID)
 	record.IntentRef = strings.TrimSpace(record.IntentRef)
 	record.OperationRef = strings.TrimSpace(record.OperationRef)
-	if record.PaymentIntentID == "" {
-		return merrors.InvalidArgument("intention reference is required", "payment_intent_ref")
+	if record.IntentRef == "" {
+		return merrors.InvalidArgument("intention reference is required", "intent_ref")
 	}
 	if record.IdempotencyKey == "" {
 		return merrors.InvalidArgument("idempotency key is required", "idempotency_key")
@@ -148,7 +147,7 @@ func (p *Payments) Upsert(ctx context.Context, record *model.PaymentRecord) erro
 		if !errors.Is(err, context.Canceled) && !errors.Is(err, context.DeadlineExceeded) {
 			p.logger.Warn("Failed to upsert payment record",
 				zap.String("idempotency_key", record.IdempotencyKey),
-				zap.String("payment_intent_id", record.PaymentIntentID),
+				zap.String("intent_ref", record.IntentRef),
 				zap.String("quote_ref", record.QuoteRef),
 				zap.Error(err))
 		}

api/gateway/tgsettle/storage/mongo/store/payments_test.go

@@ -112,9 +112,8 @@ func TestPaymentsUpsert_ReusesExistingIDFromIdempotencyLookup(t *testing.T) {
 					CreatedAt: existingCreatedAt,
 					UpdatedAt: existingCreatedAt,
 				},
-				IdempotencyKey:  key,
-				PaymentIntentID: "pi-old",
-				IntentRef:       "intent-old",
+				IdempotencyKey: key,
+				IntentRef:      "pi-old",
 			},
 		},
 		duplicateWhenZeroID: true,
@@ -122,10 +121,9 @@ func TestPaymentsUpsert_ReusesExistingIDFromIdempotencyLookup(t *testing.T) {
 	store := &Payments{logger: zap.NewNop(), repo: repo}
 
 	record := &model.PaymentRecord{
-		IdempotencyKey:  key,
-		PaymentIntentID: "pi-new",
-		QuoteRef:        "quote-new",
-		IntentRef:       "intent-new",
+		IdempotencyKey: key,
+		IntentRef:      "pi-new",
+		QuoteRef:       "quote-new",
 	}
 
 	if err := store.Upsert(context.Background(), record); err != nil {
@@ -155,9 +153,8 @@ func TestPaymentsUpsert_RetriesAfterDuplicateKeyRace(t *testing.T) {
 					CreatedAt: time.Date(2026, 3, 6, 10, 1, 0, 0, time.UTC),
 					UpdatedAt: time.Date(2026, 3, 6, 10, 1, 0, 0, time.UTC),
 				},
-				IdempotencyKey:  key,
-				PaymentIntentID: "pi-existing",
-				IntentRef:       "intent-existing",
+				IdempotencyKey: key,
+				IntentRef:      "pi-existing",
 			},
 		},
 		findErrByCall: map[int]error{
@@ -168,10 +165,9 @@ func TestPaymentsUpsert_RetriesAfterDuplicateKeyRace(t *testing.T) {
 	store := &Payments{logger: zap.NewNop(), repo: repo}
 
 	record := &model.PaymentRecord{
-		IdempotencyKey:  key,
-		PaymentIntentID: "pi-new",
-		QuoteRef:        "quote-new",
-		IntentRef:       "intent-new",
+		IdempotencyKey: key,
+		IntentRef:      "pi-new",
+		QuoteRef:       "quote-new",
 	}
 
 	if err := store.Upsert(context.Background(), record); err != nil {
@@ -203,9 +199,8 @@ func TestPaymentsUpsert_PropagatesNoSuchTransactionAfterDuplicate(t *testing.T)
 					CreatedAt: time.Date(2026, 3, 6, 10, 2, 0, 0, time.UTC),
 					UpdatedAt: time.Date(2026, 3, 6, 10, 2, 0, 0, time.UTC),
 				},
-				IdempotencyKey:  key,
-				PaymentIntentID: "pi-existing",
-				IntentRef:       "intent-existing",
+				IdempotencyKey: key,
+				IntentRef:      "pi-existing",
 			},
 		},
 		findErrByCall: map[int]error{
@@ -221,10 +216,9 @@ func TestPaymentsUpsert_PropagatesNoSuchTransactionAfterDuplicate(t *testing.T)
 	store := &Payments{logger: zap.NewNop(), repo: repo}
 
 	record := &model.PaymentRecord{
-		IdempotencyKey:  key,
-		PaymentIntentID: "pi-new",
-		QuoteRef:        "quote-new",
-		IntentRef:       "intent-new",
+		IdempotencyKey: key,
+		IntentRef:      "pi-new",
+		QuoteRef:       "quote-new",
 	}
 
 	err := store.Upsert(context.Background(), record)