Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cmd/app/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ func main() {

router.Post("/payment/intent", paymentIntentHandler.Create)
router.Post("/payment/intent/capture", paymentIntentHandler.Capture)
router.Post("/payment/intent/refund", paymentIntentHandler.Refund)
router.Post("/payment/intent/cancel", paymentIntentHandler.Cancel)

s := &http.Server{
Addr: ":" + config.Env.App.Port,
Expand Down
2 changes: 0 additions & 2 deletions internal/bank/ficmart_bank_repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ func (r *FicMartBankRepo) Authorize(ctx context.Context, idempotencyKey string,
return Payment{}, err
}

log.Println("capture object in drom bank: ", resData)
return resData.ToPayment(), nil
}

Expand All @@ -65,7 +64,6 @@ func (r *FicMartBankRepo) Capture(ctx context.Context, idempotencyKey, authoriza
return Payment{}, err
}

log.Println("capture object in drom bank: ", resData)
return resData.ToPayment(), nil
}

Expand Down
16 changes: 8 additions & 8 deletions internal/paymentevent/pgsql_repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func NewPostgresRepo(db DBTX) *PostgresRepo {
}

func (r *PostgresRepo) Create(ctx context.Context, intentId, status, providerStateId string) (PaymentEvent, error) {
var process PaymentEvent
var event PaymentEvent
err := r.db.QueryRow(ctx, `
INSERT INTO payment_events (
payment_intent_id, state, external_state_id
Expand All @@ -33,18 +33,18 @@ func (r *PostgresRepo) Create(ctx context.Context, intentId, status, providerSta
status,
providerStateId,
).Scan(
&process.Id,
&process.PaymentIntentId,
&process.State,
&process.ExternalStateId,
&process.Metadata,
&process.CreatedAt,
&event.Id,
&event.PaymentIntentId,
&event.State,
&event.ExternalStateId,
&event.Metadata,
&event.CreatedAt,
)
if err != nil {
return PaymentEvent{}, err
}

return process, nil
return event, nil
}

func (r *PostgresRepo) GetByIntentAndStatus(ctx context.Context, intentId, status string) (PaymentEvent, error) {
Expand Down
52 changes: 45 additions & 7 deletions internal/paymentintent/cancel.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,61 @@ import (
"github.com/jackc/pgx/v5"
)

func (s *Service) Cancel(ctx context.Context, idempotencyKey, paymentRef string) (string, error) {
paymentIntent, err := s.repo.GetWithEvent(ctx, paymentRef, PaymentStatusAuthorized)
func (s *Service) Cancel(ctx context.Context,
idempotencyKey, requestHash, paymentRef string,
) (PaymentIntent, bool, error) {
reservedPI, err := s.getReservedIntent(ctx, idempotencyKey, requestHash)
if err != nil {
return PaymentIntent{}, false, err
}

if reservedPI != nil {
return *reservedPI, true, nil
}

pi, err := s.repo.GetWithEvent(ctx, paymentRef, PaymentStatusAuthorized)
if err != nil {
if errors.Is(err, pgx.ErrNoRows) {
log.Printf("operation not allowed: intent=%s, required_status=%s", paymentRef, PaymentStatusAuthorized)
return "", ErrOperationNotAllowed
return PaymentIntent{}, false, ErrOperationNotAllowed
}

log.Printf("Error retrieving payment intent for payment reference %s: %s", paymentRef, err)
return "", ErrInternal
return PaymentIntent{}, false, ErrInternal
}

payment, err := s.bankRepo.Void(ctx, idempotencyKey, paymentIntent.CurrentEvent.ExternalStateId)
payment, err := s.bankRepo.Void(ctx, idempotencyKey, pi.CurrentEvent.ExternalStateId)
if err != nil {
log.Printf("Bank failed to void payment: %s", err)
return "", ErrBankDeclined
return PaymentIntent{}, false, ErrBankDeclined
}

err = s.uow.RunInTx(ctx, func(r Repos) error {
event, err := r.PaymentEvent.Create(ctx, pi.Id, PaymentStatusCanceled, payment.VoidId)
if err != nil {
return err
}

err = r.PaymentIntent.UpdateState(ctx, pi.PaymentRef, event.State)
if err != nil {
return err
}

pi.Status = event.State
pi.CurrentEvent = nil

return nil
})
if err != nil {
log.Printf("Error creating payment event for state to %v: %s", PaymentStatusCanceled, err)
return PaymentIntent{}, false, ErrInternal
}

err = s.idempotencyService.ReserveKey(ctx, idempotencyKey, requestHash, pi.PaymentRef)
if err != nil {
log.Printf("Error reserving refunded payment intent: %s", err)
return PaymentIntent{}, false, ErrInternal
}

return payment.VoidId, nil
return pi, false, nil
}
32 changes: 16 additions & 16 deletions internal/paymentintent/capture.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ import (
func (s *Service) Capture(ctx context.Context,
idempotencyKey, requestHash, paymentRef string, amount int,
) (PaymentIntent, bool, error) {
reservedPaymentIntent, err := s.getReserved(ctx, idempotencyKey, requestHash)
reservedPI, err := s.getReservedIntent(ctx, idempotencyKey, requestHash)
if err != nil {
return PaymentIntent{}, false, err
}

if reservedPaymentIntent != nil {
return *reservedPaymentIntent, true, nil
if reservedPI != nil {
return *reservedPI, true, nil
}

paymentIntent, err := s.repo.GetWithEvent(ctx, paymentRef, PaymentStatusAuthorized)
pi, err := s.repo.GetWithEvent(ctx, paymentRef, PaymentStatusAuthorized)
if err != nil {
if errors.Is(err, pgx.ErrNoRows) {
log.Printf("operation not allowed: intent=%s, required_status=%s", paymentRef, PaymentStatusAuthorized)
Expand All @@ -31,38 +31,38 @@ func (s *Service) Capture(ctx context.Context,
return PaymentIntent{}, false, ErrInternal
}

payment, err := s.bankRepo.Capture(ctx, idempotencyKey, paymentIntent.CurrentEvent.ExternalStateId, amount)
log.Println("paymetttttt: ", payment)
payment, err := s.bankRepo.Capture(ctx, idempotencyKey, pi.CurrentEvent.ExternalStateId, amount)
if err != nil {
log.Printf("Bank capture failed for payment reference %s: %s", paymentRef, err)
return PaymentIntent{}, false, ErrBankDeclined
}

err = s.uow.RunInTx(ctx, func(r Repos) error {
err = r.PaymentIntent.UpdateState(ctx, paymentRef, PaymentStatusCaptured)
event, err := r.PaymentEvent.Create(ctx, pi.Id, PaymentStatusCaptured, payment.CaptureId)
if err != nil {
log.Printf("Error updating bank capture for payment reference %s: %s", paymentRef, err)
return ErrInternal
return err
}

process, err := r.PaymentEvent.Create(ctx, paymentIntent.Id, PaymentStatusCaptured, payment.CaptureId)
err = r.PaymentIntent.UpdateState(ctx, paymentRef, event.State)
if err != nil {
log.Printf("Error creating payment process: %s", err)
return ErrInternal
return err
}

paymentIntent.Status = process.State
// remove state object from getting returned to client
paymentIntent.CurrentEvent = nil
pi.Status = event.State
pi.CurrentEvent = nil

return nil
})
if err != nil {
log.Printf("Error creating payment event for state to %v: %s", PaymentStatusCaptured, err)
return PaymentIntent{}, false, ErrInternal
}

err = s.idempotencyService.ReserveKey(ctx, idempotencyKey, requestHash, paymentRef)
if err != nil {
log.Printf("Error reserving idempotency key: %s", err)
return PaymentIntent{}, false, ErrInternal
}

return paymentIntent, false, nil
return pi, false, nil
}
35 changes: 19 additions & 16 deletions internal/paymentintent/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,35 +11,35 @@ import (
func (s *Service) Create(
ctx context.Context, idempotencyKey, requestHash string, input CreateInput,
) (PaymentIntent, bool, error) {
reservedPaymentIntent, err := s.getReserved(ctx, idempotencyKey, requestHash)
reservedPI, err := s.getReservedIntent(ctx, idempotencyKey, requestHash)
if err != nil {
return PaymentIntent{}, false, err
}

if reservedPaymentIntent != nil {
return *reservedPaymentIntent, true, nil
if reservedPI != nil {
return *reservedPI, true, nil
}

var paymentIntent PaymentIntent
var pi PaymentIntent
err = s.uow.RunInTx(ctx, func(r Repos) error {
paymentIntent, err = r.PaymentIntent.Create(
pi, err = r.PaymentIntent.Create(
ctx, input.Amount.Figure, input.Amount.Currency, input.OrderId, input.CustomerId,
)
if err != nil {
log.Printf("Error creating payment intent: %s", err)
return err
}

id, err := strconv.ParseInt(paymentIntent.Id, 10, 64)
id, err := strconv.ParseInt(pi.Id, 10, 64)
if err != nil {
log.Printf("Error parsing payment intent ID: %s", err)
return err
}

paymentIntent.PaymentRef = utils.GeneratePaymentRef(id)
pi.PaymentRef = utils.GeneratePaymentRef(id)

err = r.PaymentIntent.CreateReference(
ctx, paymentIntent.Id, paymentIntent.PaymentRef,
ctx, pi.Id, pi.PaymentRef,
)
if err != nil {
log.Printf("Error creating payment intent: %s", err)
Expand All @@ -52,7 +52,7 @@ func (s *Service) Create(
return PaymentIntent{}, false, err
}

err = s.idempotencyService.ReserveKey(ctx, idempotencyKey, requestHash, paymentIntent.PaymentRef)
err = s.idempotencyService.ReserveKey(ctx, idempotencyKey, requestHash, pi.PaymentRef)
if err != nil {
return PaymentIntent{}, false, ErrInternal
}
Expand All @@ -76,27 +76,30 @@ func (s *Service) Create(
},
)
if err != nil {
log.Printf("Bank authorization failed for payment reference %s: %s", paymentIntent.PaymentRef, err)
log.Printf("Bank authorization failed for payment reference %s: %s", pi.PaymentRef, err)
return PaymentIntent{}, false, ErrBankDeclined
}

err = s.uow.RunInTx(ctx, func(r Repos) error {
err := r.PaymentIntent.UpdateState(ctx, paymentIntent.PaymentRef, PaymentStatusAuthorized)
event, err := r.PaymentEvent.Create(ctx, pi.Id, PaymentStatusAuthorized, payment.AuthorizationId)
if err != nil {
log.Printf("Error updating payment intent state: %s", err)
return err
}

process, err := r.PaymentEvent.Create(ctx, paymentIntent.Id, PaymentStatusAuthorized, payment.AuthorizationId)
err = r.PaymentIntent.UpdateState(ctx, pi.PaymentRef, event.State)
if err != nil {
log.Printf("Error creating payment process state: %s", err)
return err
}

paymentIntent.Status = process.State
pi.Status = event.State
pi.CurrentEvent = nil

return nil
})
if err != nil {
log.Printf("Error creating payment event for state to %v: %s", PaymentStatusAuthorized, err)
return PaymentIntent{}, false, ErrInternal
}

return paymentIntent, false, nil
return pi, false, nil
}
32 changes: 28 additions & 4 deletions internal/paymentintent/dto.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ func (c CardR) Validate() error {
)
}

type CreatePaymentIntentRequest struct {
type CreateRequest struct {
Card *Card `json:"card"`
Amount int `json:"amount"`
Currency string `json:"currency"`
OrderId string `json:"order_id"`
CustomerId string `json:"customer_id"`
}

func (r *CreatePaymentIntentRequest) Validate() error {
func (r *CreateRequest) Validate() error {
return validation.ValidateStruct(
r,
validation.Field(&r.Card, validation.Required),
Expand All @@ -49,19 +49,43 @@ func (r *CreatePaymentIntentRequest) Validate() error {
)
}

type CapturePaymentIntentRequest struct {
type CaptureRequest struct {
PaymentRef string `json:"payment_ref"`
Amount int `json:"amount"`
}

func (r *CapturePaymentIntentRequest) Validate() error {
func (r *CaptureRequest) Validate() error {
return validation.ValidateStruct(
r,
validation.Field(&r.PaymentRef, validation.Required),
validation.Field(&r.Amount, validation.Required),
)
}

type RefundRequest struct {
PaymentRef string `json:"payment_ref"`
Amount int `json:"amount"`
}

func (r *RefundRequest) Validate() error {
return validation.ValidateStruct(
r,
validation.Field(&r.PaymentRef, validation.Required),
validation.Field(&r.Amount, validation.Required),
)
}

type CencelRequest struct {
PaymentRef string `json:"payment_ref"`
}

func (r *CencelRequest) Validate() error {
return validation.ValidateStruct(
r,
validation.Field(&r.PaymentRef, validation.Required),
)
}

// Bussiness DTO

type CardExpiry struct {
Expand Down
Loading
Loading