diff --git a/.air.toml b/.air.app.toml similarity index 89% rename from .air.toml rename to .air.app.toml index b3ea101..be2a33d 100644 --- a/.air.toml +++ b/.air.app.toml @@ -7,10 +7,10 @@ tmp_dir = "tmp" [build] args_bin = [] - bin = "./tmp/main" - cmd = "go build -buildvcs=false -o ./tmp/main ./cmd/app" + bin = "./tmp/app" + cmd = "go build -buildvcs=false -o ./tmp/app ./cmd/app" delay = 1000 - entrypoint = ["./tmp/main"] + entrypoint = ["./tmp/app"] exclude_dir = ["assets", "tmp", "vendor", "testdata"] exclude_file = [] exclude_regex = ["_test.go"] diff --git a/.air.worker.toml b/.air.worker.toml new file mode 100644 index 0000000..006734d --- /dev/null +++ b/.air.worker.toml @@ -0,0 +1,58 @@ +#:schema https://json.schemastore.org/any.json + +env_files = [] +root = "." +testdata_dir = "testdata" +tmp_dir = "tmp" + +[build] + args_bin = [] + bin = "./tmp/worker" + cmd = "go build -buildvcs=false -o ./tmp/worker ./cmd/worker" + delay = 1000 + entrypoint = ["./tmp/worker"] + exclude_dir = ["assets", "tmp", "vendor", "testdata"] + exclude_file = [] + exclude_regex = ["_test.go"] + exclude_unchanged = false + follow_symlink = false + full_bin = "" + ignore_dangerous_root_dir = false + include_dir = [] + include_ext = ["go", "tpl", "tmpl", "html"] + include_file = [] + kill_delay = "0s" + log = "build-errors.log" + poll = false + poll_interval = 0 + post_cmd = [] + pre_cmd = [] + rerun = false + rerun_delay = 500 + send_interrupt = false + stop_on_error = false + +[color] + app = "" + build = "yellow" + main = "magenta" + runner = "green" + watcher = "cyan" + +[log] + main_only = false + silent = false + time = false + +[misc] + clean_on_exit = false + +[proxy] + app_port = 0 + app_start_timeout = 0 + enabled = false + proxy_port = 0 + +[screen] + clear_on_rebuild = false + keep_scroll = true \ No newline at end of file diff --git a/.dockerignore b/.dockerignore index cf18901..96e9b39 100644 --- a/.dockerignore +++ b/.dockerignore @@ -7,4 +7,5 @@ .git /docker/storage /storage/*.sqlite -/storage/*.db \ No newline at end of file +/storage/*.db +tmp \ No newline at end of file diff --git a/.gitignore b/.gitignore index 21282e6..3d51b70 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,6 @@ !.env.example tmp -compose.override.yaml \ No newline at end of file +compose.override.yaml +project_structure.md +coverage.txt \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 457b1c7..ee3f81f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,4 +20,4 @@ RUN if [ "$APP_ENV" != "local" ]; then \ go build -o cmd/app/main ./cmd/app; \ fi -ENTRYPOINT ["/bin/sh", "start.sh"] \ No newline at end of file +ENTRYPOINT ["/bin/sh", "scripts/start.app.sh"] \ No newline at end of file diff --git a/makefile b/Makefile similarity index 100% rename from makefile rename to Makefile diff --git a/README.md b/README.md new file mode 100644 index 0000000..c12af25 --- /dev/null +++ b/README.md @@ -0,0 +1,33 @@ +# Ledger + +A Payment Gateway service between a fictional e-commerce platform (FicMart) and a fictional Bank. + +## Overview + +Ledger is a work-in-progress Go service that sits between FicMart and a bank integration layer. It is designed to accept payment intents, communicate with the bank, manage payment state, and handle retries and terminal failures. + +## Repository Scope + +This repository currently includes: + +- core payment intent domain logic +- bank integration abstractions +- payment event tracking +- idempotency support +- worker and queue components +- configuration, database, and notifier plumbing + +## Status + +This project is not complete yet. The repository is a minimal starting point for development and documentation will expand as the implementation matures. + +## Getting Started + +The repository contains Docker and Compose files, plus Go entry points under `cmd/`. + +If you want to explore the code, the main areas are: + +- `cmd/` – application, CLI, and worker entry points +- `internal/domain/` – payment gateway domain logic +- `internal/jobs/` – background processing and queue workers +- `internal/platform/` – configuration, database, middleware, notifier, and rendering support diff --git a/cmd/app/main.go b/cmd/app/main.go index 4cc8dfc..5d2d7db 100644 --- a/cmd/app/main.go +++ b/cmd/app/main.go @@ -1,21 +1,22 @@ package main import ( - "context" - "ledger/app/config" - "ledger/app/middleware" - "ledger/app/storage" - "ledger/internal/bank" - "ledger/internal/idempotency" - "ledger/internal/paymentevent" - "ledger/internal/paymentintent" - "ledger/pkg/uow" + "ledger/internal/domain/bank" + "ledger/internal/domain/idempotency" + "ledger/internal/domain/paymentevent" + "ledger/internal/domain/paymentintent" + "ledger/internal/jobs/queue" + "ledger/internal/platform/config" + "ledger/internal/platform/database" + "ledger/internal/platform/middleware" + "ledger/internal/platform/notifier" "log" "net/http" "time" "github.com/go-chi/chi/v5" chiMiddleware "github.com/go-chi/chi/v5/middleware" + "github.com/hibiken/asynq" ) func main() { @@ -23,12 +24,12 @@ func main() { log.Fatal(err) } - pgsql, err := storage.InitPostgres() + pgsql, err := database.InitPostgres() if err != nil { log.Fatal(err) } - redis, err := storage.InitRedis() + redis, err := database.InitRedis() if err != nil { log.Fatal(err) } @@ -37,6 +38,8 @@ func main() { Timeout: 10 * time.Second, } + appMiddleware := middleware.NewMiddleware() + ficmartBankRepo := bank.NewFicMartBankRepo(client) idempotencyRepo := idempotency.NewRedisRepo(redis) @@ -44,16 +47,27 @@ func main() { paymentEventRepo := paymentevent.NewPostgresRepo(pgsql) - uow := uow.NewPgsqlUoW(pgsql) + uow := paymentintent.NewPgsqlUoW(pgsql) + + notifier := notifier.NewRedisNotifier(redis) + + asynqClient := asynq.NewClient(asynq.RedisClientOpt{ + Addr: config.Env.Redis.Addr, + Password: config.Env.Redis.Password, + DB: 1, + }) + + queueClient := queue.NewClient(asynqClient) paymentIntentRepo := paymentintent.NewPostgresRepo(pgsql) paymentIntentService := paymentintent.NewService( paymentIntentRepo, paymentEventRepo, ficmartBankRepo, - - &paymentIntentTxAdapter{u: uow}, + uow, idempotencyService, + queueClient, + notifier, ) paymentIntentHandler := paymentintent.NewHandler(paymentIntentService) @@ -61,34 +75,32 @@ func main() { router.Use(chiMiddleware.Logger, chiMiddleware.Recoverer) - appMiddleware := middleware.NewMiddleware() - router.Use(appMiddleware.EnsureIndempotencyKey) + router.Get("/health", func(w http.ResponseWriter, r *http.Request) { + w.WriteHeader(http.StatusOK) + _, err := w.Write([]byte("OK")) + if err != nil { + log.Printf("Error writing health check response: %s", err) + } + }) - 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) + router.Get("/payment/intent", paymentIntentHandler.Get) + + router.Group(func(r chi.Router) { + r.Use(appMiddleware.EnsureIndempotencyKey) + + r.Post("/payment/intent", paymentIntentHandler.Create) + r.Post("/payment/intent/capture", paymentIntentHandler.Capture) + r.Post("/payment/intent/refund", paymentIntentHandler.Refund) + r.Post("/payment/intent/cancel", paymentIntentHandler.Cancel) + }) s := &http.Server{ Addr: ":" + config.Env.App.Port, Handler: router, ReadTimeout: 10 * time.Second, - WriteTimeout: 10 * time.Second, + WriteTimeout: 40 * time.Second, MaxHeaderBytes: 1 << 20, } log.Fatal(s.ListenAndServe()) } - -type paymentIntentTxAdapter struct { - u *uow.PgsqlUoW -} - -func (a *paymentIntentTxAdapter) RunInTx(ctx context.Context, fn func(paymentintent.Repos) error) error { - return a.u.RunInTx(ctx, func(r uow.Repos) error { - return fn(paymentintent.Repos{ - PaymentIntent: r.PaymentIntent, - PaymentEvent: r.PaymentEvent, - }) - }) -} diff --git a/cmd/cli/main.go b/cmd/cli/main.go index 9856e54..be05b6f 100644 --- a/cmd/cli/main.go +++ b/cmd/cli/main.go @@ -2,8 +2,8 @@ package main import ( "context" - "ledger/app/config" - "ledger/app/storage" + "ledger/internal/platform/config" + "ledger/internal/platform/database" "log" "time" @@ -23,6 +23,7 @@ var migrations = []cmdforge.Migration{ amount BIGINT NOT NULL, currency CHAR(3) NOT NULL, status TEXT NOT NULL, + current_operation TEXT, created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(), updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW() ); @@ -69,7 +70,7 @@ func main() { log.Fatal(err) } - pgsql, err := storage.InitPostgres() + pgsql, err := database.InitPostgres() if err != nil { log.Fatal(err) } diff --git a/cmd/worker/main.go b/cmd/worker/main.go new file mode 100644 index 0000000..84dafe6 --- /dev/null +++ b/cmd/worker/main.go @@ -0,0 +1,73 @@ +package main + +import ( + "ledger/internal/domain/bank" + "ledger/internal/domain/paymentintent" + "ledger/internal/jobs/tasks" + "ledger/internal/jobs/worker" + "ledger/internal/platform/config" + "ledger/internal/platform/database" + "ledger/internal/platform/notifier" + "log" + "net/http" + "time" + + "github.com/hibiken/asynq" +) + +func main() { + if err := config.LoadEnv(); err != nil { + log.Fatal(err) + } + + pgsql, err := database.InitPostgres() + if err != nil { + log.Fatal(err) + } + + redis, err := database.InitRedis() + if err != nil { + log.Fatal(err) + } + + srv := asynq.NewServer( + asynq.RedisClientOpt{ + Addr: config.Env.Redis.Addr, + Password: config.Env.Redis.Password, + DB: 1, + }, + + asynq.Config{ + // Specify how many concurrent workers to use + Concurrency: 10, + // Optionally specify multiple queues with different priority. + Queues: map[string]int{ + "critical": 6, + "default": 3, + "low": 1, + }, + // See the godoc for other configuration options + }, + ) + + client := &http.Client{ + Timeout: 10 * time.Second, + } + + bankRepo := bank.NewFicMartBankRepo(client) + uow := paymentintent.NewPgsqlUoW(pgsql) + notifier := notifier.NewRedisNotifier(redis) + + taskHandler := worker.NewPaymentWorker(bankRepo, uow, notifier) + + // mux maps a type to a handler + mux := asynq.NewServeMux() + mux.HandleFunc(tasks.TypeCreatePayment, taskHandler.HandleCreate) + mux.HandleFunc(tasks.TypeCapturePayment, taskHandler.HandleCapture) + // mux.HandleFunc(tasks.TypeRefundPayment, taskHandler.HandleRefund) + // mux.HandleFunc(tasks.TypeCancelPayment, taskHandler.HandleCancel) + + if err := srv.Run(mux); err != nil { + log.Fatalf("could not run server: %v", err) + } +} diff --git a/compose.yaml b/compose.yaml index 892da07..45a2347 100644 --- a/compose.yaml +++ b/compose.yaml @@ -13,6 +13,15 @@ services: working_dir: /var/www ports: - "${APP_PORT}:${APP_PORT}" + worker: + image: ledger-app + container_name: ledger-worker + restart: unless-stopped + env_file: + - .env + entrypoint: ["/bin/sh", "-c", "exec sh scripts/start.worker.sh"] + depends_on: + - redis extra_hosts: - "host.docker.internal:host-gateway" db: diff --git a/coverage.txt b/coverage.txt deleted file mode 100644 index 0eb106e..0000000 --- a/coverage.txt +++ /dev/null @@ -1,151 +0,0 @@ -mode: atomic -ledger/app/config/env.go:38.33,39.18 1 0 -ledger/app/config/env.go:39.18,41.3 1 0 -ledger/app/config/env.go:43.2,50.19 2 0 -ledger/app/config/env.go:65.22,67.16 2 0 -ledger/app/config/env.go:67.16,69.3 1 0 -ledger/app/config/env.go:71.2,101.19 2 0 -ledger/app/config/validate.go:5.23,6.31 1 0 -ledger/app/config/validate.go:6.31,8.3 1 0 -ledger/app/config/validate.go:10.2,10.23 1 0 -ledger/app/config/validate.go:10.23,12.3 1 0 -ledger/app/config/validate.go:14.2,14.24 1 0 -ledger/app/config/validate.go:14.24,16.3 1 0 -ledger/app/config/validate.go:18.2,26.46 2 0 -ledger/app/config/validate.go:26.46,30.3 1 0 -ledger/app/config/validate.go:32.2,32.26 1 0 -ledger/app/config/validate.go:32.26,34.3 1 0 -ledger/app/config/validate.go:36.2,36.26 1 0 -ledger/app/config/validate.go:36.26,38.3 1 0 -ledger/app/config/validate.go:40.2,40.30 1 0 -ledger/app/config/validate.go:40.30,42.3 1 0 -ledger/app/config/validate.go:44.2,44.12 1 0 -ledger/app/middleware/middleware.go:7.34,9.2 1 0 -ledger/app/middleware/middleware.go:11.76,12.71 1 0 -ledger/app/middleware/middleware.go:12.71,15.27 2 0 -ledger/app/middleware/middleware.go:15.27,18.4 2 0 -ledger/app/middleware/middleware.go:20.3,20.23 1 0 -ledger/app/render/json.go:24.72,30.2 1 0 -ledger/app/render/json.go:33.67,40.2 1 0 -ledger/app/render/json.go:42.69,44.16 2 0 -ledger/app/render/json.go:44.16,54.3 3 0 -ledger/app/render/json.go:56.2,59.41 3 0 -ledger/app/render/json.go:59.41,61.3 1 0 -ledger/app/storage/pgsql.go:11.44,16.16 4 0 -ledger/app/storage/pgsql.go:16.16,18.3 1 0 -ledger/app/storage/pgsql.go:20.2,21.16 2 0 -ledger/app/storage/pgsql.go:21.16,23.3 1 0 -ledger/app/storage/pgsql.go:25.2,25.16 1 0 -ledger/app/storage/redis.go:11.41,24.16 6 0 -ledger/app/storage/redis.go:24.16,27.3 2 0 -ledger/app/storage/redis.go:29.2,29.19 1 0 -ledger/cmd/cli/main.go:32.13,36.41 3 0 -ledger/cmd/cli/main.go:36.41,38.3 1 0 -ledger/cmd/cli/main.go:40.2,41.16 2 0 -ledger/cmd/cli/main.go:41.16,43.3 1 0 -ledger/cmd/cli/main.go:45.2,47.16 2 0 -ledger/cmd/app/main.go:18.13,19.41 1 0 -ledger/cmd/app/main.go:19.41,21.3 1 0 -ledger/cmd/app/main.go:23.2,24.16 2 0 -ledger/cmd/app/main.go:24.16,26.3 1 0 -ledger/cmd/app/main.go:28.2,29.16 2 0 -ledger/cmd/app/main.go:29.16,31.3 1 0 -ledger/cmd/app/main.go:33.2,63.31 14 0 -ledger/internal/bank/dto.go:15.55,17.21 2 0 -ledger/internal/bank/dto.go:17.21,19.3 1 0 -ledger/internal/bank/dto.go:21.2,28.3 1 0 -ledger/internal/bank/ficmart_bank_repo.go:18.63,20.2 1 0 -ledger/internal/bank/ficmart_bank_repo.go:22.120,33.16 4 0 -ledger/internal/bank/ficmart_bank_repo.go:33.16,36.3 2 0 -ledger/internal/bank/ficmart_bank_repo.go:38.2,39.16 2 0 -ledger/internal/bank/ficmart_bank_repo.go:39.16,41.3 1 0 -ledger/internal/bank/ficmart_bank_repo.go:43.2,47.16 4 0 -ledger/internal/bank/ficmart_bank_repo.go:47.16,50.3 2 0 -ledger/internal/bank/ficmart_bank_repo.go:51.2,54.16 3 0 -ledger/internal/bank/ficmart_bank_repo.go:54.16,57.3 2 0 -ledger/internal/bank/ficmart_bank_repo.go:59.2,59.51 1 0 -ledger/internal/bank/ficmart_bank_repo.go:59.51,62.3 2 0 -ledger/internal/bank/ficmart_bank_repo.go:64.2,65.55 2 0 -ledger/internal/bank/ficmart_bank_repo.go:65.55,67.3 1 0 -ledger/internal/bank/ficmart_bank_repo.go:69.2,69.33 1 0 -ledger/internal/idempotency/redis_repo.go:14.51,16.2 1 0 -ledger/internal/idempotency/redis_repo.go:18.93,20.2 1 0 -ledger/internal/idempotency/redis_repo.go:22.90,24.2 1 0 -ledger/internal/idempotency/service.go:17.43,19.2 1 2 -ledger/internal/idempotency/service.go:21.105,28.16 3 1 -ledger/internal/idempotency/service.go:28.16,31.3 2 0 -ledger/internal/idempotency/service.go:33.2,34.16 2 1 -ledger/internal/idempotency/service.go:34.16,37.3 2 0 -ledger/internal/idempotency/service.go:39.2,39.12 1 1 -ledger/internal/idempotency/service.go:42.93,44.16 2 1 -ledger/internal/idempotency/service.go:44.16,45.33 1 0 -ledger/internal/idempotency/service.go:45.33,47.4 1 0 -ledger/internal/idempotency/service.go:49.3,49.18 1 0 -ledger/internal/idempotency/service.go:52.2,55.16 3 1 -ledger/internal/idempotency/service.go:55.16,58.3 2 0 -ledger/internal/idempotency/service.go:60.2,60.20 1 1 -ledger/utils/utils.go:11.43,16.2 3 0 -ledger/internal/paymentintent/dto.go:16.33,31.2 1 0 -ledger/internal/paymentintent/dto.go:41.55,50.2 1 0 -ledger/internal/paymentintent/handler.go:16.44,18.2 1 0 -ledger/internal/paymentintent/handler.go:20.66,27.61 4 0 -ledger/internal/paymentintent/handler.go:27.61,30.3 2 0 -ledger/internal/paymentintent/handler.go:32.2,32.39 1 0 -ledger/internal/paymentintent/handler.go:32.39,35.3 2 0 -ledger/internal/paymentintent/handler.go:37.2,38.16 2 0 -ledger/internal/paymentintent/handler.go:38.16,41.3 2 0 -ledger/internal/paymentintent/handler.go:43.2,60.16 2 0 -ledger/internal/paymentintent/handler.go:60.16,61.10 1 0 -ledger/internal/paymentintent/handler.go:62.47,63.57 1 0 -ledger/internal/paymentintent/handler.go:65.40,66.68 1 0 -ledger/internal/paymentintent/handler.go:68.45,69.68 1 0 -ledger/internal/paymentintent/handler.go:71.36,72.68 1 0 -ledger/internal/paymentintent/handler.go:74.11,75.75 1 0 -ledger/internal/paymentintent/handler.go:78.3,78.9 1 0 -ledger/internal/paymentintent/handler.go:81.2,81.14 1 0 -ledger/internal/paymentintent/handler.go:81.14,83.3 1 0 -ledger/internal/paymentintent/handler.go:85.2,85.90 1 0 -ledger/internal/paymentintent/handler.go:88.48,90.16 2 0 -ledger/internal/paymentintent/handler.go:90.16,92.3 1 0 -ledger/internal/paymentintent/handler.go:93.2,96.18 3 0 -ledger/internal/paymentintent/pgsql_repo.go:16.57,18.2 1 0 -ledger/internal/paymentintent/pgsql_repo.go:24.19,26.16 2 0 -ledger/internal/paymentintent/pgsql_repo.go:26.16,28.3 1 0 -ledger/internal/paymentintent/pgsql_repo.go:29.2,49.16 4 0 -ledger/internal/paymentintent/pgsql_repo.go:49.16,51.3 1 0 -ledger/internal/paymentintent/pgsql_repo.go:53.2,65.16 3 0 -ledger/internal/paymentintent/pgsql_repo.go:65.16,67.3 1 0 -ledger/internal/paymentintent/pgsql_repo.go:69.2,70.16 2 0 -ledger/internal/paymentintent/pgsql_repo.go:70.16,72.3 1 0 -ledger/internal/paymentintent/pgsql_repo.go:74.2,74.30 1 0 -ledger/internal/paymentintent/pgsql_repo.go:77.114,103.16 3 0 -ledger/internal/paymentintent/pgsql_repo.go:103.16,105.3 1 0 -ledger/internal/paymentintent/pgsql_repo.go:107.2,107.20 1 0 -ledger/internal/paymentintent/pgsql_repo.go:110.109,133.16 3 0 -ledger/internal/paymentintent/pgsql_repo.go:133.16,135.3 1 0 -ledger/internal/paymentintent/pgsql_repo.go:137.2,137.20 1 0 -ledger/internal/paymentintent/service.go:25.12,27.2 1 6 -ledger/internal/paymentintent/service.go:31.32,33.68 2 4 -ledger/internal/paymentintent/service.go:33.68,35.3 1 0 -ledger/internal/paymentintent/service.go:37.2,37.26 1 4 -ledger/internal/paymentintent/service.go:37.26,39.3 1 1 -ledger/internal/paymentintent/service.go:41.2,44.16 2 3 -ledger/internal/paymentintent/service.go:44.16,47.3 2 0 -ledger/internal/paymentintent/service.go:49.2,50.16 2 3 -ledger/internal/paymentintent/service.go:50.16,52.3 1 0 -ledger/internal/paymentintent/service.go:54.2,72.16 2 3 -ledger/internal/paymentintent/service.go:72.16,75.3 2 0 -ledger/internal/paymentintent/service.go:77.2,78.16 2 3 -ledger/internal/paymentintent/service.go:78.16,81.3 2 0 -ledger/internal/paymentintent/service.go:83.2,83.41 1 3 -ledger/internal/paymentintent/service.go:86.112,88.46 2 6 -ledger/internal/paymentintent/service.go:88.46,91.3 2 0 -ledger/internal/paymentintent/service.go:93.2,93.18 1 6 -ledger/internal/paymentintent/service.go:93.18,94.39 1 3 -ledger/internal/paymentintent/service.go:94.39,97.4 2 1 -ledger/internal/paymentintent/service.go:99.3,100.17 2 2 -ledger/internal/paymentintent/service.go:100.17,101.37 1 0 -ledger/internal/paymentintent/service.go:101.37,104.5 2 0 -ledger/internal/paymentintent/service.go:106.4,107.27 2 0 -ledger/internal/paymentintent/service.go:110.3,110.29 1 2 -ledger/internal/paymentintent/service.go:113.2,113.45 1 3 diff --git a/go.mod b/go.mod index f379cad..91f1817 100644 --- a/go.mod +++ b/go.mod @@ -6,12 +6,19 @@ require ( github.com/go-ozzo/ozzo-validation/v4 v4.3.0 github.com/jackc/pgx/v5 v5.9.2 github.com/joho/godotenv v1.5.1 - github.com/redis/go-redis/v9 v9.20.0 + github.com/redis/go-redis/v9 v9.21.0 ) require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/hibiken/asynq v0.26.0 // indirect + github.com/robfig/cron/v3 v3.0.1 // indirect + github.com/spf13/cast v1.10.0 // indirect go.uber.org/atomic v1.11.0 // indirect + golang.org/x/sys v0.47.0 // indirect + golang.org/x/time v0.15.0 // indirect + google.golang.org/protobuf v1.36.11 // indirect ) require ( diff --git a/go.sum b/go.sum index 36a7dca..16b9ab7 100644 --- a/go.sum +++ b/go.sum @@ -13,6 +13,10 @@ github.com/go-chi/chi/v5 v5.3.0 h1:halUjDxhshgXHMrao5bB8eNBXo/rnzwr8m5m36glehM= github.com/go-chi/chi/v5 v5.3.0/go.mod h1:R+tYY2hNuVUUjxoPtqUdgBqevM9s9njzkTLutVsOCto= github.com/go-ozzo/ozzo-validation/v4 v4.3.0 h1:byhDUpfEwjsVQb1vBunvIjh2BHQ9ead57VkAEY4V+Es= github.com/go-ozzo/ozzo-validation/v4 v4.3.0/go.mod h1:2NKgrcHl3z6cJs+3Oo940FPRiTzuqKbvfrL2RxCj6Ew= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/hibiken/asynq v0.26.0 h1:1Zxr92MlDnb1Zt/QR5g2vSCqUS03i95lUfqx5X7/wrw= +github.com/hibiken/asynq v0.26.0/go.mod h1:Qk4e57bTnWDoyJ67VkchuV6VzSM9IQW2nPvAGuDyw58= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= @@ -31,6 +35,12 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/redis/go-redis/v9 v9.20.0 h1:WnQYxLkgO2xiXTCJY0ldIiI8dNqCDlQAG+AtaH7a2a0= github.com/redis/go-redis/v9 v9.20.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA= +github.com/redis/go-redis/v9 v9.21.0 h1:FPBE4hhbAke+TLmcY3WkpbDffJEomdqPn3HYiqAtL9E= +github.com/redis/go-redis/v9 v9.21.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA= +github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= +github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= +github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY= +github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -45,8 +55,14 @@ golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= +golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U= +golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno= +google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= +google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/index.html b/index.html new file mode 100644 index 0000000..71d1db2 --- /dev/null +++ b/index.html @@ -0,0 +1,25 @@ + + + + + + Bank API - Swagger UI + + + + +
+ + + + + \ No newline at end of file diff --git a/internal/bank/dto.go b/internal/domain/bank/dto.go similarity index 95% rename from internal/bank/dto.go rename to internal/domain/bank/dto.go index 8b4228d..995aecc 100644 --- a/internal/bank/dto.go +++ b/internal/domain/bank/dto.go @@ -77,3 +77,8 @@ func (r ficMartRefundResponse) ToPayment() Payment { RefundedAt: &r.RefundedAt, } } + +type ficMartErrorResponse struct { + Code string `json:"error"` + Message string `json:"message"` +} diff --git a/internal/domain/bank/error.go b/internal/domain/bank/error.go new file mode 100644 index 0000000..d3b4407 --- /dev/null +++ b/internal/domain/bank/error.go @@ -0,0 +1,34 @@ +package bank + +import ( + "errors" + "fmt" +) + +// Sentinels used for asynq retry classification. +var ( + ErrInternal = errors.New("internal error") + ErrBankTransient = errors.New("bank transient error") + ErrBankTerminal = errors.New("bank terminal error") +) + +// APIError carries FicMart's structured 4xx error body. +type APIError struct { + StatusCode int + Code string // e.g. "invalid_card" + Message string // e.g. "Available balance is less than requested amount" +} + +func (e *APIError) Error() string { + return fmt.Sprintf("bank declined: code=%s message=%s", e.Code, e.Message) +} + +// Unwrap lets errors.Is(err, ErrBankTerminal) succeed for any *APIError, +// so callers can classify without knowing the concrete type. +func (e *APIError) Unwrap() error { + return ErrBankTerminal +} + +func IsTerminal(err error) bool { + return errors.Is(err, ErrInternal) || errors.Is(err, ErrBankTerminal) +} diff --git a/internal/bank/ficmart_bank_repo.go b/internal/domain/bank/ficmart_bank_repo.go similarity index 66% rename from internal/bank/ficmart_bank_repo.go rename to internal/domain/bank/ficmart_bank_repo.go index 1cb60f7..3a56ad1 100644 --- a/internal/bank/ficmart_bank_repo.go +++ b/internal/domain/bank/ficmart_bank_repo.go @@ -6,7 +6,7 @@ import ( "encoding/json" "fmt" "io" - "ledger/app/config" + "ledger/internal/platform/config" "log" "net/http" ) @@ -42,7 +42,7 @@ func (r *FicMartBankRepo) Authorize(ctx context.Context, idempotencyKey string, var resData ficMartAuthorizeResponse if err := json.Unmarshal(body, &resData); err != nil { - return Payment{}, err + return Payment{}, fmt.Errorf("%w: %v", ErrInternal, err) } return resData.ToPayment(), nil @@ -61,7 +61,7 @@ func (r *FicMartBankRepo) Capture(ctx context.Context, idempotencyKey, authoriza var resData ficMartCaptureResponse if err := json.Unmarshal(body, &resData); err != nil { - return Payment{}, err + return Payment{}, fmt.Errorf("%w: %v", ErrInternal, err) } return resData.ToPayment(), nil @@ -79,7 +79,7 @@ func (r *FicMartBankRepo) Void(ctx context.Context, idempotencyKey, authorizatio var resData ficMartVoidResponse if err := json.Unmarshal(body, &resData); err != nil { - return Payment{}, err + return Payment{}, fmt.Errorf("%w: %v", ErrInternal, err) } return resData.ToPayment(), nil @@ -98,7 +98,7 @@ func (r *FicMartBankRepo) Refund(ctx context.Context, idempotencyKey, captureId var resData ficMartRefundResponse if err := json.Unmarshal(body, &resData); err != nil { - return Payment{}, err + return Payment{}, fmt.Errorf("%w: %v", ErrInternal, err) } return resData.ToPayment(), nil @@ -107,13 +107,14 @@ func (r *FicMartBankRepo) Refund(ctx context.Context, idempotencyKey, captureId func (r *FicMartBankRepo) makePostRequest(ctx context.Context, endpoint string, data any, idempotencyKey string) ([]byte, error) { jsonData, err := json.Marshal(data) if err != nil { - log.Printf("Error encoding data: %s", err) - return []byte(""), err + log.Printf("Error encoding request payload: %s", err) + return nil, ErrInternal } - req, err := http.NewRequestWithContext(ctx, "POST", config.Env.BankAPIBaseURL+endpoint, bytes.NewBuffer(jsonData)) + req, err := http.NewRequestWithContext(ctx, http.MethodPost, config.Env.BankAPIBaseURL+endpoint, bytes.NewBuffer(jsonData)) if err != nil { - return []byte(""), err + log.Printf("Error building request: %s", err) + return nil, ErrInternal } req.Header.Set("Content-Type", "application/json") @@ -122,7 +123,7 @@ func (r *FicMartBankRepo) makePostRequest(ctx context.Context, endpoint string, res, err := r.client.Do(req) if err != nil { log.Printf("Client request error: %s", err) - return []byte(""), err + return nil, fmt.Errorf("%w: %v", ErrBankTransient, err) } defer func() { _ = res.Body.Close() @@ -130,14 +131,25 @@ func (r *FicMartBankRepo) makePostRequest(ctx context.Context, endpoint string, body, err := io.ReadAll(res.Body) if err != nil { - log.Printf("Error reading response body, %s", err) - return []byte(""), err + log.Printf("Error reading response body: %s", err) + return nil, ErrInternal } - if res.StatusCode < 200 || res.StatusCode >= 300 { - log.Printf("API error: status=%d body=%s", res.StatusCode, string(body)) - return []byte(""), fmt.Errorf("bank API error: %s", string(body)) - } + switch { + case res.StatusCode >= 200 && res.StatusCode < 300: + return body, nil + + case res.StatusCode >= 500: + log.Printf("Bank transient error: status=%d body=%s", res.StatusCode, string(body)) + return nil, fmt.Errorf("%w: status=%d", ErrBankTransient, res.StatusCode) - return body, nil + default: + var apiErr ficMartErrorResponse + if jsonErr := json.Unmarshal(body, &apiErr); jsonErr != nil { + log.Printf("Bank terminal error (unparseable body): status=%d body=%s", res.StatusCode, string(body)) + return nil, &APIError{StatusCode: res.StatusCode, Code: "unknown", Message: string(body)} + } + log.Printf("Bank terminal error: status=%d code=%s message=%s", res.StatusCode, apiErr.Code, apiErr.Message) + return nil, &APIError{StatusCode: res.StatusCode, Code: apiErr.Code, Message: apiErr.Message} + } } diff --git a/internal/bank/model.go b/internal/domain/bank/model.go similarity index 100% rename from internal/bank/model.go rename to internal/domain/bank/model.go diff --git a/internal/bank/repository.go b/internal/domain/bank/repository.go similarity index 100% rename from internal/bank/repository.go rename to internal/domain/bank/repository.go diff --git a/internal/idempotency/model.go b/internal/domain/idempotency/model.go similarity index 100% rename from internal/idempotency/model.go rename to internal/domain/idempotency/model.go diff --git a/internal/idempotency/redis_repo.go b/internal/domain/idempotency/redis_repo.go similarity index 79% rename from internal/idempotency/redis_repo.go rename to internal/domain/idempotency/redis_repo.go index 3ee429d..77528f5 100644 --- a/internal/idempotency/redis_repo.go +++ b/internal/domain/idempotency/redis_repo.go @@ -22,3 +22,7 @@ func (r *RedisRepo) SaveKey(ctx context.Context, idempotencyKey string, entry st func (r *RedisRepo) GetByKey(ctx context.Context, idempotencyKey string) (string, error) { return r.redis.Get(ctx, idempotencyKey).Result() } + +func (r *RedisRepo) RemoveKey(ctx context.Context, idempotencyKey string) error { + return r.redis.Del(ctx, idempotencyKey).Err() +} diff --git a/internal/idempotency/repository.go b/internal/domain/idempotency/repository.go similarity index 77% rename from internal/idempotency/repository.go rename to internal/domain/idempotency/repository.go index 9ae9612..8e8b0a9 100644 --- a/internal/idempotency/repository.go +++ b/internal/domain/idempotency/repository.go @@ -5,4 +5,5 @@ import "context" type Repository interface { SaveKey(ctx context.Context, idempotencyKey string, entry string) error GetByKey(ctx context.Context, idempotencyKey string) (string, error) + RemoveKey(ctx context.Context, idempotencyKey string) error } diff --git a/internal/idempotency/service.go b/internal/domain/idempotency/service.go similarity index 88% rename from internal/idempotency/service.go rename to internal/domain/idempotency/service.go index e1fc04b..935fb8f 100644 --- a/internal/idempotency/service.go +++ b/internal/domain/idempotency/service.go @@ -59,3 +59,7 @@ func (s *Service) GetKeyReserve(ctx context.Context, idempotencyKey string) (*En return &entry, nil } + +func (s *Service) RemoveKey(ctx context.Context, idempotencyKey string) error { + return s.repo.RemoveKey(ctx, fmt.Sprintf("idempotency-key:%s", idempotencyKey)) +} diff --git a/internal/idempotency/service_test.go b/internal/domain/idempotency/service_test.go similarity index 84% rename from internal/idempotency/service_test.go rename to internal/domain/idempotency/service_test.go index 2552c75..a9483e5 100644 --- a/internal/idempotency/service_test.go +++ b/internal/domain/idempotency/service_test.go @@ -13,8 +13,9 @@ const ( ) type repoMock struct { - SaveKeyFn func(ctx context.Context, idempotencyKey string, entry string) error - GetByKeyFn func(ctx context.Context, idempotencyKey string) (string, error) + SaveKeyFn func(ctx context.Context, idempotencyKey string, entry string) error + GetByKeyFn func(ctx context.Context, idempotencyKey string) (string, error) + RemoveKeyFn func(ctx context.Context, idempotencyKey string) error calls []string } @@ -29,6 +30,11 @@ func (r *repoMock) GetByKey(ctx context.Context, idempotencyKey string) (string, return r.GetByKeyFn(ctx, idempotencyKey) } +func (r *repoMock) RemoveKey(ctx context.Context, idempotencyKey string) error { + r.calls = append(r.calls, "RemoveKey") + return r.RemoveKeyFn(ctx, idempotencyKey) +} + func TestReserveKeyHappyPath(t *testing.T) { key := "idmkey" formattedKey := fmt.Sprintf("idempotency-key:%v", key) diff --git a/internal/paymentevent/model.go b/internal/domain/paymentevent/model.go similarity index 100% rename from internal/paymentevent/model.go rename to internal/domain/paymentevent/model.go diff --git a/internal/paymentevent/pgsql_repo.go b/internal/domain/paymentevent/pgsql_repo.go similarity index 89% rename from internal/paymentevent/pgsql_repo.go rename to internal/domain/paymentevent/pgsql_repo.go index cf4caf6..e02c40f 100644 --- a/internal/paymentevent/pgsql_repo.go +++ b/internal/domain/paymentevent/pgsql_repo.go @@ -20,18 +20,19 @@ func NewPostgresRepo(db DBTX) *PostgresRepo { return &PostgresRepo{db} } -func (r *PostgresRepo) Create(ctx context.Context, intentId, status, providerStateId string) (PaymentEvent, error) { +func (r *PostgresRepo) Create(ctx context.Context, intentId, status, providerStateId, metadata string) (PaymentEvent, error) { var event PaymentEvent err := r.db.QueryRow(ctx, ` INSERT INTO payment_events ( - payment_intent_id, state, external_state_id + payment_intent_id, state, external_state_id, metadata ) - VALUES ($1, $2, $3) + VALUES ($1, $2, $3, $4) RETURNING id::text, payment_intent_id, state, external_state_id, metadata, created_at `, intentId, status, providerStateId, + metadata, ).Scan( &event.Id, &event.PaymentIntentId, diff --git a/internal/paymentevent/repository.go b/internal/domain/paymentevent/repository.go similarity index 60% rename from internal/paymentevent/repository.go rename to internal/domain/paymentevent/repository.go index 9e5e4f3..9d57faf 100644 --- a/internal/paymentevent/repository.go +++ b/internal/domain/paymentevent/repository.go @@ -3,6 +3,6 @@ package paymentevent import "context" type Repository interface { - Create(ctx context.Context, intentId, status, providerStateId string) (PaymentEvent, error) + Create(ctx context.Context, intentId, status, providerStateId, metadata string) (PaymentEvent, error) GetByIntentAndStatus(ctx context.Context, intentId, status string) (PaymentEvent, error) } diff --git a/internal/paymentintent/cancel.go b/internal/domain/paymentintent/cancel.go similarity index 95% rename from internal/paymentintent/cancel.go rename to internal/domain/paymentintent/cancel.go index e9f71ab..ab0dc71 100644 --- a/internal/paymentintent/cancel.go +++ b/internal/domain/paymentintent/cancel.go @@ -37,8 +37,8 @@ func (s *Service) Cancel(ctx context.Context, return PaymentIntent{}, false, ErrBankDeclined } - err = s.uow.RunInTx(ctx, func(r Repos) error { - event, err := r.PaymentEvent.Create(ctx, pi.Id, PaymentStatusCanceled, payment.VoidId) + err = s.uow.RunInTx(ctx, func(r TxRepos) error { + event, err := r.PaymentEvent.Create(ctx, pi.Id, PaymentStatusCanceled, payment.VoidId, "") if err != nil { return err } diff --git a/internal/paymentintent/capture.go b/internal/domain/paymentintent/capture.go similarity index 52% rename from internal/paymentintent/capture.go rename to internal/domain/paymentintent/capture.go index 38e3daa..b6b197d 100644 --- a/internal/paymentintent/capture.go +++ b/internal/domain/paymentintent/capture.go @@ -3,7 +3,9 @@ package paymentintent import ( "context" "errors" + "ledger/internal/jobs/tasks" "log" + "time" "github.com/jackc/pgx/v5" ) @@ -31,38 +33,50 @@ func (s *Service) Capture(ctx context.Context, return PaymentIntent{}, false, ErrInternal } - payment, err := s.bankRepo.Capture(ctx, idempotencyKey, pi.CurrentEvent.ExternalStateId, amount) + err = s.startOperation(ctx, pi.PaymentRef, PaymentCaptureOp) if err != nil { - log.Printf("Bank capture failed for payment reference %s: %s", paymentRef, err) - return PaymentIntent{}, false, ErrBankDeclined + log.Printf("Error starting capture process for payment reference %s: %s", paymentRef, err) + return PaymentIntent{}, false, ErrInternal } + pi.CurrentOp = PaymentCaptureOp - err = s.uow.RunInTx(ctx, func(r Repos) error { - event, err := r.PaymentEvent.Create(ctx, pi.Id, PaymentStatusCaptured, payment.CaptureId) - if err != nil { - return err - } + err = s.idempotencyService.ReserveKey(ctx, idempotencyKey, requestHash, paymentRef) + if err != nil { + log.Printf("Error reserving idempotency key: %s", err) + return PaymentIntent{}, false, ErrInternal + } - err = r.PaymentIntent.UpdateState(ctx, paymentRef, event.State) - if err != nil { - return err - } + // subscribing before enqueuing to avoid missing the signal + resultCtx, cancel := context.WithTimeout(ctx, 30*time.Second) + defer cancel() - pi.Status = event.State - pi.CurrentEvent = nil + sub := s.notifier.Subscribe(pi.PaymentRef) + defer sub.Close() - return nil + err = s.queue.EnqueueCapture(ctx, tasks.CapturePayload{ + IdempotencyKey: idempotencyKey, + IntentId: pi.Id, + PaymentRef: pi.PaymentRef, + StateId: pi.CurrentEvent.ExternalStateId, + Amount: pi.Amount, }) if err != nil { - log.Printf("Error creating payment event for state to %v: %s", PaymentStatusCaptured, err) + log.Printf("Error enqueuing capture payment task: %s", 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 + result, err := sub.Wait(resultCtx) + if err != nil || result == "" { + return pi, false, nil } + if result != PaymentStatusCaptured { + log.Printf("Payment failed for %v: %s", pi.PaymentRef, result) + return PaymentIntent{}, false, NewBankDeclinedError(result) + } + + pi.Status = result + pi.CurrentOp = "" + return pi, false, nil } diff --git a/internal/paymentintent/capture_test.go b/internal/domain/paymentintent/capture_test.go similarity index 100% rename from internal/paymentintent/capture_test.go rename to internal/domain/paymentintent/capture_test.go diff --git a/internal/paymentintent/create.go b/internal/domain/paymentintent/create.go similarity index 51% rename from internal/paymentintent/create.go rename to internal/domain/paymentintent/create.go index 8048879..1ca6748 100644 --- a/internal/paymentintent/create.go +++ b/internal/domain/paymentintent/create.go @@ -2,10 +2,12 @@ package paymentintent import ( "context" - "ledger/internal/bank" - "ledger/pkg/utils" + "ledger/internal/domain/bank" + "ledger/internal/jobs/tasks" + "ledger/pkg/uuid" "log" "strconv" + "time" ) func (s *Service) Create( @@ -20,34 +22,7 @@ func (s *Service) Create( return *reservedPI, true, nil } - var pi PaymentIntent - err = s.uow.RunInTx(ctx, func(r Repos) error { - 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(pi.Id, 10, 64) - if err != nil { - log.Printf("Error parsing payment intent ID: %s", err) - return err - } - - pi.PaymentRef = utils.GeneratePaymentRef(id) - - err = r.PaymentIntent.CreateReference( - ctx, pi.Id, pi.PaymentRef, - ) - if err != nil { - log.Printf("Error creating payment intent: %s", err) - return err - } - - return nil - }) + pi, err := s.createPendingIntent(ctx, input) if err != nil { return PaymentIntent{}, false, err } @@ -57,10 +32,18 @@ func (s *Service) Create( return PaymentIntent{}, false, ErrInternal } - payment, err := s.bankRepo.Authorize( - ctx, - idempotencyKey, - bank.AuthorizeInput{ + // subscribing before enqueuing to avoid missing the signal + resultCtx, cancel := context.WithTimeout(ctx, 30*time.Second) + defer cancel() + + sub := s.notifier.Subscribe(pi.PaymentRef) + defer sub.Close() + + err = s.queue.EnqueueCreate(ctx, tasks.CreatePayload{ + IdempotencyKey: idempotencyKey, + IntentId: pi.Id, + PaymentRef: pi.PaymentRef, + BankInput: &bank.AuthorizeInput{ Card: bank.Card{ Number: input.Card.Number, CVV: input.Card.CVV, @@ -74,32 +57,67 @@ func (s *Service) Create( Currency: input.Amount.Currency, }, }, - ) + }) if err != nil { - log.Printf("Bank authorization failed for payment reference %s: %s", pi.PaymentRef, err) - return PaymentIntent{}, false, ErrBankDeclined + log.Printf("Error enqueuing create payment task: %s", err) + return PaymentIntent{}, false, ErrInternal } - err = s.uow.RunInTx(ctx, func(r Repos) error { - event, err := r.PaymentEvent.Create(ctx, pi.Id, PaymentStatusAuthorized, payment.AuthorizationId) + result, err := sub.Wait(resultCtx) + if err != nil || result == "" { + return pi, false, nil + } + + if result != PaymentStatusAuthorized { + log.Printf("Payment failed for %v: %s", pi.PaymentRef, result) + return PaymentIntent{}, false, NewBankDeclinedError(result) + } + + pi.Status = result + pi.CurrentOp = "" + + return pi, false, nil +} + +func (s *Service) createPendingIntent(ctx context.Context, input CreateInput) (PaymentIntent, error) { + var pi PaymentIntent + err := s.uow.RunInTx(ctx, func(r TxRepos) error { + var err error + pi, err = r.PaymentIntent.Create( + ctx, input.Amount.Figure, input.Amount.Currency, input.OrderId, input.CustomerId, + ) + if err != nil { + return err + } + + id, err := strconv.ParseInt(pi.Id, 10, 64) if err != nil { return err } - err = r.PaymentIntent.UpdateState(ctx, pi.PaymentRef, event.State) + ref := uuid.GeneratePaymentRef(id) + + err = r.PaymentIntent.CreateReference( + ctx, pi.Id, ref, + ) if err != nil { return err } - pi.Status = event.State - pi.CurrentEvent = nil + err = r.PaymentIntent.UpdateOperation(ctx, ref, PaymentAuthorizationOp) + if err != nil { + return err + } + + pi.PaymentRef = ref + pi.CurrentOp = PaymentAuthorizationOp return nil }) if err != nil { - log.Printf("Error creating payment event for state to %v: %s", PaymentStatusAuthorized, err) - return PaymentIntent{}, false, ErrInternal + log.Printf("Error creating payment intent: %s", err) + return PaymentIntent{}, err } - return pi, false, nil + return pi, err } diff --git a/internal/paymentintent/create_test.go b/internal/domain/paymentintent/create_test.go similarity index 77% rename from internal/paymentintent/create_test.go rename to internal/domain/paymentintent/create_test.go index 7cf5e3a..433cc3c 100644 --- a/internal/paymentintent/create_test.go +++ b/internal/domain/paymentintent/create_test.go @@ -4,10 +4,13 @@ import ( "context" "encoding/json" "fmt" - "ledger/app/config" - "ledger/internal/bank" - "ledger/internal/idempotency" - "ledger/internal/paymentevent" + "ledger/internal/domain/bank" + "ledger/internal/domain/idempotency" + "ledger/internal/domain/paymentevent" + "ledger/internal/jobs/queue" + "ledger/internal/jobs/tasks" + "ledger/internal/platform/config" + "ledger/internal/platform/notifier" "testing" "github.com/redis/go-redis/v9" @@ -40,7 +43,7 @@ func TestCreateReplaysExistingPaymentIntent(t *testing.T) { } uow := &uowMock{ - RunInTxFn: func(ctx context.Context, fn func(Repos) error) error { + RunInTxFn: func(ctx context.Context, fn func(TxRepos) error) error { t.Fatal("RunInTx should not be called for reserved payment intent") return nil }, @@ -48,7 +51,15 @@ func TestCreateReplaysExistingPaymentIntent(t *testing.T) { idempotencyService := idempotency.NewService(idempotencyRepo) - service := NewService(repo, &paymentEventRepoMock{}, &bankRepoMock{}, uow, idempotencyService) + service := NewService( + repo, + &paymentEventRepoMock{}, + &bankRepoMock{}, + uow, + idempotencyService, + &queue.Client{}, + ¬ifier.RedisNotifier{}, + ) _, relayed, err := service.Create( context.Background(), @@ -112,7 +123,7 @@ func TestNewPaymentIntentIsCreatedForDifferentIdempotencyKeys(t *testing.T) { } ppRepo := &paymentEventRepoMock{ - CreateFn: func(ctx context.Context, intentId, status, bankAuthId string) (paymentevent.PaymentEvent, error) { + CreateFn: func(ctx context.Context, intentId, status, bankAuthId, metadata string) (paymentevent.PaymentEvent, error) { return paymentevent.PaymentEvent{}, nil }, } @@ -120,15 +131,39 @@ func TestNewPaymentIntentIsCreatedForDifferentIdempotencyKeys(t *testing.T) { idempotencyService := idempotency.NewService(idempotencyRepo) uow := &uowMock{ - RunInTxFn: func(ctx context.Context, fn func(Repos) error) error { - return fn(Repos{ + RunInTxFn: func(ctx context.Context, fn func(TxRepos) error) error { + return fn(TxRepos{ PaymentIntent: repo, PaymentEvent: ppRepo, }) }, } - service := NewService(repo, &paymentEventRepoMock{}, bankRepo, uow, idempotencyService) + notifier := ¬ifierMock{ + publishFn: func(ctx context.Context, channel, result string) error { + return nil + }, + + waitFn: func(ctx context.Context) (string, error) { + return PaymentStatusAuthorized, nil + }, + } + + queue := &queueMock{ + EnqueueCreateFn: func(ctx context.Context, payload tasks.CreatePayload) error { + return nil + }, + } + + service := NewService( + repo, + &paymentEventRepoMock{}, + bankRepo, + uow, + idempotencyService, + queue, + notifier, + ) paymentIntent, relayed, err := service.Create( context.Background(), diff --git a/internal/paymentintent/dto.go b/internal/domain/paymentintent/dto.go similarity index 100% rename from internal/paymentintent/dto.go rename to internal/domain/paymentintent/dto.go diff --git a/internal/paymentintent/error.go b/internal/domain/paymentintent/error.go similarity index 62% rename from internal/paymentintent/error.go rename to internal/domain/paymentintent/error.go index d01ea95..437649b 100644 --- a/internal/paymentintent/error.go +++ b/internal/domain/paymentintent/error.go @@ -15,3 +15,19 @@ var ( ErrInconsistentState = errors.New("payment intent inconsistent with idempotency state") ) + +type BankDeclinedError struct { + Reason string +} + +func (e *BankDeclinedError) Error() string { + return e.Reason +} + +func (e *BankDeclinedError) Unwrap() error { + return ErrBankDeclined +} + +func NewBankDeclinedError(reason string) error { + return &BankDeclinedError{Reason: reason} +} diff --git a/internal/domain/paymentintent/error_test.go b/internal/domain/paymentintent/error_test.go new file mode 100644 index 0000000..e752aa6 --- /dev/null +++ b/internal/domain/paymentintent/error_test.go @@ -0,0 +1,19 @@ +package paymentintent + +import ( + "errors" + "testing" +) + +func TestBankDeclinedErrorPreservesReason(t *testing.T) { + reason := "bank declined: code=invalid_card message=insufficient funds" + + err := NewBankDeclinedError(reason) + if !errors.Is(err, ErrBankDeclined) { + t.Fatalf("expected error to match ErrBankDeclined") + } + + if err.Error() != reason { + t.Fatalf("expected error message %q, got %q", reason, err.Error()) + } +} diff --git a/internal/paymentintent/handler.go b/internal/domain/paymentintent/handler.go similarity index 84% rename from internal/paymentintent/handler.go rename to internal/domain/paymentintent/handler.go index 21d37fc..1ad277c 100644 --- a/internal/paymentintent/handler.go +++ b/internal/domain/paymentintent/handler.go @@ -5,7 +5,7 @@ import ( "encoding/hex" "encoding/json" "errors" - "ledger/app/render" + "ledger/internal/platform/render" "log" "net/http" ) @@ -60,23 +60,7 @@ func (h *Handler) Create(w http.ResponseWriter, r *http.Request) { }, ) if err != nil { - switch { - case errors.Is(err, ErrIdempotencyKeyReuse): - render.ErrorJSON(w, err.Error(), http.StatusConflict) - - case errors.Is(err, ErrBankDeclined): - render.ErrorJSON(w, err.Error(), http.StatusUnprocessableEntity) - - case errors.Is(err, ErrInconsistentState): - render.ErrorJSON(w, err.Error(), http.StatusInternalServerError) - - case errors.Is(err, ErrInternal): - render.ErrorJSON(w, err.Error(), http.StatusInternalServerError) - - default: - render.ErrorJSON(w, "Unexpected error", http.StatusInternalServerError) - } - + renderErr(err, w) return } @@ -84,6 +68,7 @@ func (h *Handler) Create(w http.ResponseWriter, r *http.Request) { w.Header().Set("X-Idempotent-Replayed", "true") } + paymentIntent = *stripPrivateFields(&paymentIntent) render.JSON(w, http.StatusCreated, "Payment Intent created successfully", paymentIntent) } @@ -124,6 +109,7 @@ func (h *Handler) Capture(w http.ResponseWriter, r *http.Request) { w.Header().Set("X-Idempotent-Replayed", "true") } + paymentIntent = *stripPrivateFields(&paymentIntent) render.JSON(w, http.StatusCreated, "Payment captured successfully", paymentIntent) } @@ -164,6 +150,7 @@ func (h *Handler) Refund(w http.ResponseWriter, r *http.Request) { w.Header().Set("X-Idempotent-Replayed", "true") } + paymentIntent = *stripPrivateFields(&paymentIntent) render.JSON(w, http.StatusCreated, "Payment refunded successfully", paymentIntent) } @@ -205,9 +192,27 @@ func (h *Handler) Cancel(w http.ResponseWriter, r *http.Request) { w.Header().Set("X-Idempotent-Replayed", "true") } + paymentIntent = *stripPrivateFields(&paymentIntent) render.JSON(w, http.StatusCreated, "Payment successfully canceled", paymentIntent) } +func (h *Handler) Get(w http.ResponseWriter, r *http.Request) { + paymentRef := r.URL.Query().Get("payment_ref") + if paymentRef == "" { + render.ErrorJSON(w, "payment_ref is required", http.StatusBadRequest) + return + } + + paymentIntent, err := h.service.GetByRef(r.Context(), paymentRef) + if err != nil { + renderErr(err, w) + return + } + + paymentIntent = stripPrivateFields(paymentIntent) + render.JSON(w, http.StatusOK, "Payment intent retrieved successfully", paymentIntent) +} + func hashRequestBody(body any) (string, error) { canonical, err := json.Marshal(body) if err != nil { @@ -225,7 +230,7 @@ func renderErr(err error, w http.ResponseWriter) { render.ErrorJSON(w, err.Error(), http.StatusConflict) case errors.Is(err, ErrBankDeclined): - render.ErrorJSON(w, err.Error(), http.StatusUnprocessableEntity) + render.ErrorJSON(w, err.Error(), http.StatusBadRequest) case errors.Is(err, ErrInconsistentState): render.ErrorJSON(w, err.Error(), http.StatusInternalServerError) @@ -236,7 +241,16 @@ func renderErr(err error, w http.ResponseWriter) { case errors.Is(err, ErrOperationNotAllowed): render.ErrorJSON(w, err.Error(), http.StatusForbidden) + case errors.Is(err, ErrNotFound): + render.ErrorJSON(w, err.Error(), http.StatusNotFound) + default: render.ErrorJSON(w, "Unexpected error", http.StatusInternalServerError) } } + +func stripPrivateFields(pi *PaymentIntent) *PaymentIntent { + pi.Id = "" + pi.CurrentEvent = nil + return pi +} diff --git a/internal/paymentintent/model.go b/internal/domain/paymentintent/model.go similarity index 74% rename from internal/paymentintent/model.go rename to internal/domain/paymentintent/model.go index d7d05fa..feba1f2 100644 --- a/internal/paymentintent/model.go +++ b/internal/domain/paymentintent/model.go @@ -1,7 +1,7 @@ package paymentintent import ( - "ledger/internal/paymentevent" + "ledger/internal/domain/paymentevent" "time" ) @@ -14,6 +14,13 @@ const ( PaymentStatusFailed string = "failed" ) +const ( + PaymentAuthorizationOp string = "authorizing" + PaymentCaptureOp string = "capturing" + PaymentRefundOp string = "refunding" + PaymentCancelOp string = "canceling" +) + type PaymentIntent struct { Id string `json:"id,omitempty"` PaymentRef string `json:"payment_reference"` @@ -22,6 +29,7 @@ type PaymentIntent struct { OrderId string `json:"order_id"` CustomerId string `json:"customer_id"` Status string `json:"status"` + CurrentOp string `json:"current_operation"` CreatedAt time.Time `json:"created_at"` UpdatedAt *time.Time `json:"updated_at,omitempty"` diff --git a/internal/paymentintent/pgsql_repo.go b/internal/domain/paymentintent/pgsql_repo.go similarity index 90% rename from internal/paymentintent/pgsql_repo.go rename to internal/domain/paymentintent/pgsql_repo.go index 2d6a74d..2e9714e 100644 --- a/internal/paymentintent/pgsql_repo.go +++ b/internal/domain/paymentintent/pgsql_repo.go @@ -3,7 +3,7 @@ package paymentintent import ( "context" "errors" - "ledger/internal/paymentevent" + "ledger/internal/domain/paymentevent" "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgconn" @@ -108,6 +108,19 @@ func (r *PostgresRepo) UpdateState(ctx context.Context, paymentRef, state string return nil } +func (r *PostgresRepo) UpdateOperation(ctx context.Context, paymentRef, operation string) error { + _, err := r.db.Exec(ctx, ` + UPDATE payment_intents + SET current_operation = $1 + WHERE payment_reference = $2 + `, operation, paymentRef) + if err != nil { + return err + } + + return nil +} + func (r *PostgresRepo) GetByRef(ctx context.Context, paymentRef string) (PaymentIntent, error) { var intent PaymentIntent @@ -120,6 +133,7 @@ func (r *PostgresRepo) GetByRef(ctx context.Context, paymentRef string) (Payment order_id, customer_id, status, + current_operation, created_at FROM payment_intents WHERE payment_reference = $1 @@ -131,6 +145,7 @@ func (r *PostgresRepo) GetByRef(ctx context.Context, paymentRef string) (Payment &intent.OrderId, &intent.CustomerId, &intent.Status, + &intent.CurrentOp, &intent.CreatedAt, ) if err != nil { diff --git a/internal/paymentintent/refund.go b/internal/domain/paymentintent/refund.go similarity index 95% rename from internal/paymentintent/refund.go rename to internal/domain/paymentintent/refund.go index 0a10883..67bf093 100644 --- a/internal/paymentintent/refund.go +++ b/internal/domain/paymentintent/refund.go @@ -38,8 +38,8 @@ func (s *Service) Refund(ctx context.Context, return PaymentIntent{}, false, ErrBankDeclined } - err = s.uow.RunInTx(ctx, func(r Repos) error { - event, err := r.PaymentEvent.Create(ctx, pi.Id, PaymentStatusRefunded, payment.RefundId) + err = s.uow.RunInTx(ctx, func(r TxRepos) error { + event, err := r.PaymentEvent.Create(ctx, pi.Id, PaymentStatusRefunded, payment.RefundId, "") if err != nil { return err } diff --git a/internal/paymentintent/repository.go b/internal/domain/paymentintent/repository.go similarity index 86% rename from internal/paymentintent/repository.go rename to internal/domain/paymentintent/repository.go index 2d07fd9..e54f0b4 100644 --- a/internal/paymentintent/repository.go +++ b/internal/domain/paymentintent/repository.go @@ -8,4 +8,5 @@ type Repository interface { UpdateState(ctx context.Context, paymentRef, state string) error GetByRef(ctx context.Context, paymentRef string) (PaymentIntent, error) GetWithEvent(ctx context.Context, paymentRef, state string) (PaymentIntent, error) + UpdateOperation(ctx context.Context, paymentRef, operation string) error } diff --git a/internal/paymentintent/service.go b/internal/domain/paymentintent/service.go similarity index 58% rename from internal/paymentintent/service.go rename to internal/domain/paymentintent/service.go index b9eba6a..393784a 100644 --- a/internal/paymentintent/service.go +++ b/internal/domain/paymentintent/service.go @@ -3,42 +3,61 @@ package paymentintent import ( "context" "errors" - "ledger/internal/bank" - "ledger/internal/idempotency" - "ledger/internal/paymentevent" + "ledger/internal/domain/bank" + "ledger/internal/domain/idempotency" + "ledger/internal/domain/paymentevent" + "ledger/internal/jobs/queue" + "ledger/internal/platform/notifier" "log" "github.com/jackc/pgx/v5" "github.com/redis/go-redis/v9" ) -type Repos struct { - PaymentIntent Repository - PaymentEvent paymentevent.Repository -} - -type UoW interface { - RunInTx(ctx context.Context, fn func(Repos) error) error -} - type Service struct { repo Repository eventRepo paymentevent.Repository bankRepo bank.Repository - uow UoW + uow UnitOfWork idempotencyService *idempotency.Service + + queue queue.QueueInterface + notifier notifier.Notifier } func NewService( repo Repository, paymentEventRepo paymentevent.Repository, bankRepo bank.Repository, - uow UoW, + uow UnitOfWork, idempotencyService *idempotency.Service, + queueClient queue.QueueInterface, + notifier notifier.Notifier, ) *Service { - return &Service{repo, paymentEventRepo, bankRepo, uow, idempotencyService} + return &Service{ + repo, + paymentEventRepo, + bankRepo, + uow, + idempotencyService, + queueClient, + notifier, + } +} + +func (s *Service) GetByRef(ctx context.Context, ref string) (*PaymentIntent, error) { + pi, err := s.repo.GetByRef(ctx, ref) + if err != nil { + if errors.Is(err, pgx.ErrNoRows) { + return nil, ErrNotFound + } + log.Println("failed to get payment intent for payment ref: ", ref, " error: ", err) + return nil, ErrInternal + } + + return &pi, nil } func (s *Service) getReservedIntent(ctx context.Context, idempotencyKey, requestHash string) (*PaymentIntent, error) { @@ -70,3 +89,7 @@ func (s *Service) getReservedIntent(ctx context.Context, idempotencyKey, request return &pi, nil } + +func (s *Service) startOperation(ctx context.Context, paymentRef, operation string) error { + return s.repo.UpdateOperation(ctx, paymentRef, operation) +} diff --git a/internal/paymentintent/service_test.go b/internal/domain/paymentintent/service_test.go similarity index 68% rename from internal/paymentintent/service_test.go rename to internal/domain/paymentintent/service_test.go index 56f7ccc..5f03ff6 100644 --- a/internal/paymentintent/service_test.go +++ b/internal/domain/paymentintent/service_test.go @@ -3,9 +3,12 @@ package paymentintent import ( "context" "encoding/json" - "ledger/internal/bank" - "ledger/internal/idempotency" - "ledger/internal/paymentevent" + "ledger/internal/domain/bank" + "ledger/internal/domain/idempotency" + "ledger/internal/domain/paymentevent" + "ledger/internal/jobs/queue" + "ledger/internal/jobs/tasks" + "ledger/internal/platform/notifier" "testing" ) @@ -30,6 +33,7 @@ type repoMock struct { UpdateStateFn func(ctx context.Context, paymentRef, state string) error GetByRefFn func(ctx context.Context, paymentRef string) (PaymentIntent, error) GetWithEventFn func(ctx context.Context, paymentRef, state string) (PaymentIntent, error) + UpdateOperationFn func(ctx context.Context, paymentRef, operation string) error calls []string } @@ -59,17 +63,24 @@ func (r *repoMock) GetWithEvent(ctx context.Context, paymentRef, state string) ( return r.GetWithEventFn(ctx, paymentRef, state) } +func (r *repoMock) UpdateOperation(ctx context.Context, paymentRef, operation string) error { + if r.UpdateOperationFn != nil { + return r.UpdateOperationFn(ctx, paymentRef, operation) + } + return nil +} + // Payment event mocks type paymentEventRepoMock struct { - CreateFn func(ctx context.Context, intentId, status, providerStateId string) (paymentevent.PaymentEvent, error) + CreateFn func(ctx context.Context, intentId, status, providerStateId, metadata string) (paymentevent.PaymentEvent, error) GetByIntentAndStatusFn func(ctx context.Context, paymentIntentId, paymentIntentStatus string) (paymentevent.PaymentEvent, error) calls []string } -func (r *paymentEventRepoMock) Create(ctx context.Context, intentId, status, providerStateId string) (paymentevent.PaymentEvent, error) { +func (r *paymentEventRepoMock) Create(ctx context.Context, intentId, status, providerStateId, metadata string) (paymentevent.PaymentEvent, error) { r.calls = append(r.calls, createCall) - return r.CreateFn(ctx, intentId, status, providerStateId) + return r.CreateFn(ctx, intentId, status, providerStateId, metadata) } func (r *paymentEventRepoMock) GetByIntentAndStatus(ctx context.Context, paymentIntentId, paymentIntentStatus string) (paymentevent.PaymentEvent, error) { @@ -109,8 +120,9 @@ func (r *bankRepoMock) Refund(ctx context.Context, idempotencyKey, captureId str // Idempotency Repo Mocks type idempotencyRepoMock struct { - SaveKeyFn func(ctx context.Context, idempotencyKey string, entry string) error - GetByKeyFn func(ctx context.Context, idempotencyKey string) (string, error) + SaveKeyFn func(ctx context.Context, idempotencyKey string, entry string) error + GetByKeyFn func(ctx context.Context, idempotencyKey string) (string, error) + RemoveKeyFn func(ctx context.Context, idempotencyKey string) error calls []string } @@ -125,15 +137,65 @@ func (r *idempotencyRepoMock) GetByKey(ctx context.Context, idempotencyKey strin return r.GetByKeyFn(ctx, idempotencyKey) } +func (r *idempotencyRepoMock) RemoveKey(ctx context.Context, idempotencyKey string) error { + r.calls = append(r.calls, "RemoveKey") + return r.RemoveKeyFn(ctx, idempotencyKey) +} + // UoW Mock type uowMock struct { - RunInTxFn func(ctx context.Context, fn func(Repos) error) error + RunInTxFn func(ctx context.Context, fn func(TxRepos) error) error } -func (u *uowMock) RunInTx(ctx context.Context, fn func(Repos) error) error { +func (u *uowMock) RunInTx(ctx context.Context, fn func(TxRepos) error) error { return u.RunInTxFn(ctx, fn) } +// Notifier Mock +type notifierMock struct { + publishFn func(ctx context.Context, channel, result string) error + waitFn func(ctx context.Context) (string, error) +} + +func (n *notifierMock) Subscribe(channel string) notifier.Subscription { + return &testSubscription{waitFn: n.waitFn} +} + +func (n *notifierMock) Publish(ctx context.Context, channel, result string) error { + if n.publishFn != nil { + return n.publishFn(ctx, channel, result) + } + return nil +} + +type testSubscription struct { + waitFn func(ctx context.Context) (string, error) +} + +func (s *testSubscription) Wait(ctx context.Context) (string, error) { + if s.waitFn != nil { + return s.waitFn(ctx) + } + return "", nil +} + +func (s *testSubscription) Close() {} + +// Queue mock +type queueMock struct { + EnqueueCreateFn func(ctx context.Context, payload tasks.CreatePayload) error + EnqueueCaptureFn func(ctx context.Context, payload tasks.CapturePayload) error +} + +func (q *queueMock) EnqueueCreate(ctx context.Context, payload tasks.CreatePayload) error { + return q.EnqueueCreateFn(ctx, payload) +} + +func (q *queueMock) EnqueueCapture(ctx context.Context, payload tasks.CapturePayload) error { + return q.EnqueueCaptureFn(ctx, payload) +} + +// Base test func TestGetReservedHappyPath(t *testing.T) { requestHash := "req-hash" paymentRef := "payment-ref" @@ -158,16 +220,23 @@ func TestGetReservedHappyPath(t *testing.T) { } uow := &uowMock{ - RunInTxFn: func(ctx context.Context, fn func(Repos) error) error { - return fn(Repos{ + RunInTxFn: func(ctx context.Context, fn func(TxRepos) error) error { + return fn(TxRepos{ PaymentIntent: repo, }) }, } idempotencyService := idempotency.NewService(idempotencyRepo) - - service := NewService(repo, &paymentEventRepoMock{}, &bankRepoMock{}, uow, idempotencyService) + service := NewService( + repo, + &paymentEventRepoMock{}, + &bankRepoMock{}, + uow, + idempotencyService, + &queue.Client{}, + ¬ifier.RedisNotifier{}, + ) paymentIntent, err := service.getReservedIntent(context.Background(), "idm-key", requestHash) if err != nil { @@ -206,8 +275,8 @@ func TestGetReservedThrowsErrorOnIdempotencyKeyReuse(t *testing.T) { } uow := &uowMock{ - RunInTxFn: func(ctx context.Context, fn func(Repos) error) error { - return fn(Repos{ + RunInTxFn: func(ctx context.Context, fn func(TxRepos) error) error { + return fn(TxRepos{ PaymentIntent: repo, }) }, @@ -215,7 +284,15 @@ func TestGetReservedThrowsErrorOnIdempotencyKeyReuse(t *testing.T) { idempotencyService := idempotency.NewService(idempotencyRepo) - service := NewService(repo, &paymentEventRepoMock{}, &bankRepoMock{}, uow, idempotencyService) + service := NewService( + repo, + &paymentEventRepoMock{}, + &bankRepoMock{}, + uow, + idempotencyService, + &queue.Client{}, + ¬ifier.RedisNotifier{}, + ) _, err := service.getReservedIntent(context.Background(), "idm-key", requestHash) if err == nil { diff --git a/pkg/uow/pgsql_uow.go b/internal/domain/paymentintent/uow.go similarity index 50% rename from pkg/uow/pgsql_uow.go rename to internal/domain/paymentintent/uow.go index 970e50a..7ca8f77 100644 --- a/pkg/uow/pgsql_uow.go +++ b/internal/domain/paymentintent/uow.go @@ -1,32 +1,37 @@ -package uow +package paymentintent import ( "context" - "ledger/internal/paymentevent" - "ledger/internal/paymentintent" + "ledger/internal/domain/paymentevent" "github.com/jackc/pgx/v5/pgxpool" ) +type TxRepos struct { + PaymentIntent Repository + PaymentEvent paymentevent.Repository +} + +type UnitOfWork interface { + RunInTx(ctx context.Context, fn func(TxRepos) error) error +} + type PgsqlUoW struct{ db *pgxpool.Pool } func NewPgsqlUoW(db *pgxpool.Pool) *PgsqlUoW { return &PgsqlUoW{db} } -func (u *PgsqlUoW) RunInTx(ctx context.Context, fn func(Repos) error) error { +func (u *PgsqlUoW) RunInTx(ctx context.Context, fn func(TxRepos) error) error { tx, err := u.db.Begin(ctx) if err != nil { return err } - - repos := Repos{ - PaymentIntent: paymentintent.NewPostgresRepo(tx), + repos := TxRepos{ + PaymentIntent: NewPostgresRepo(tx), PaymentEvent: paymentevent.NewPostgresRepo(tx), } - if err := fn(repos); err != nil { _ = tx.Rollback(ctx) return err } - return tx.Commit(ctx) } diff --git a/internal/jobs/queue/client.go b/internal/jobs/queue/client.go new file mode 100644 index 0000000..289d017 --- /dev/null +++ b/internal/jobs/queue/client.go @@ -0,0 +1,33 @@ +package queue + +import ( + "context" + "ledger/internal/jobs/tasks" + + "github.com/hibiken/asynq" +) + +type QueueInterface interface { + EnqueueCreate(ctx context.Context, p tasks.CreatePayload) error + EnqueueCapture(ctx context.Context, p tasks.CapturePayload) error +} + +type Client struct { + client *asynq.Client +} + +func NewClient(client *asynq.Client) *Client { + return &Client{client} +} + +func (c *Client) Close() { + err := c.client.Close() + if err != nil { + panic(err) + } +} + +func (c *Client) enqueue(ctx context.Context, task *asynq.Task, opts ...asynq.Option) error { + _, err := c.client.EnqueueContext(ctx, task, opts...) + return err +} diff --git a/internal/jobs/queue/payment.go b/internal/jobs/queue/payment.go new file mode 100644 index 0000000..6f95470 --- /dev/null +++ b/internal/jobs/queue/payment.go @@ -0,0 +1,41 @@ +package queue + +import ( + "context" + "ledger/internal/jobs/tasks" + "log" + + "github.com/hibiken/asynq" +) + +func (c *Client) EnqueueCreate(ctx context.Context, p tasks.CreatePayload) error { + task, err := tasks.NewCreatePaymentTask(p) + if err != nil { + return err + } + + err = c.enqueue(ctx, task, asynq.Queue("critical"), asynq.MaxRetry(5)) + if err != nil { + + return err + } + + log.Printf("Enqueued create payment task for intent %s", p.IntentId) + return nil +} + +func (c *Client) EnqueueCapture(ctx context.Context, p tasks.CapturePayload) error { + task, err := tasks.NewCapturePaymentTask(p) + if err != nil { + return err + } + + err = c.enqueue(ctx, task, asynq.Queue("critical"), asynq.MaxRetry(5)) + if err != nil { + + return err + } + + log.Printf("Enqueued capture payment task for intent %s", p.IntentId) + return nil +} diff --git a/internal/jobs/tasks/payment.go b/internal/jobs/tasks/payment.go new file mode 100644 index 0000000..4567377 --- /dev/null +++ b/internal/jobs/tasks/payment.go @@ -0,0 +1,46 @@ +package tasks + +import ( + "encoding/json" + "ledger/internal/domain/bank" + + "github.com/hibiken/asynq" +) + +const ( + TypeCreatePayment = "payment:create" + TypeCapturePayment = "payment:capture" + TypeRefundPayment = "payment:refund" + TypeCancelPayment = "payment:cancel" +) + +type CreatePayload struct { + IdempotencyKey string + IntentId string + PaymentRef string + BankInput *bank.AuthorizeInput +} + +type CapturePayload struct { + IdempotencyKey string + IntentId string + PaymentRef string + StateId string + Amount int +} + +func NewCreatePaymentTask(p CreatePayload) (*asynq.Task, error) { + payload, err := json.Marshal(p) + if err != nil { + return nil, err + } + return asynq.NewTask(TypeCreatePayment, payload), nil +} + +func NewCapturePaymentTask(p CapturePayload) (*asynq.Task, error) { + payload, err := json.Marshal(p) + if err != nil { + return nil, err + } + return asynq.NewTask(TypeCapturePayment, payload), nil +} diff --git a/internal/jobs/worker/abstract.go b/internal/jobs/worker/abstract.go new file mode 100644 index 0000000..8b6aff9 --- /dev/null +++ b/internal/jobs/worker/abstract.go @@ -0,0 +1,106 @@ +package worker + +import ( + "context" + "errors" + "fmt" + "ledger/internal/domain/bank" + "ledger/internal/domain/paymentintent" + "log" + + "github.com/hibiken/asynq" +) + +func (w *PaymentWorker) terminateRetry(ctx context.Context, paymentRef, intentId string) error { + err := w.uow.RunInTx(ctx, func(r paymentintent.TxRepos) error { + ev, err := r.PaymentEvent.Create( + ctx, intentId, + paymentintent.PaymentStatusFailed, + "", // no authorization ID + "bank unreachable after max retries", + ) + if err != nil { + return err + } + return r.PaymentIntent.UpdateState(ctx, paymentRef, ev.State) + }) + if err != nil { + log.Printf("Error recording exhausted-retry failure for %v: %s", paymentRef, err) + return err + } + + log.Printf("Retries exhausted for %v: %s", paymentRef, err) + return fmt.Errorf("%v: %w", err, asynq.SkipRetry) +} + +func (w *PaymentWorker) handleTerminalError( + ctx context.Context, + payment bank.Payment, + paymentRef, intentId string, + err error, +) error { + if err == nil { + return nil + } + + if !bank.IsTerminal(err) { + return nil + } + + reason := err.Error() + var apiErr *bank.APIError + if errors.As(err, &apiErr) { + reason = apiErr.Message + } + + txErr := w.uow.RunInTx(ctx, func(r paymentintent.TxRepos) error { + ev, err := r.PaymentEvent.Create( + ctx, intentId, + paymentintent.PaymentStatusFailed, + payment.AuthorizationId, + reason, + ) + if err != nil { + return err + } + return r.PaymentIntent.UpdateState(ctx, paymentRef, ev.State) + }) + if txErr != nil { + log.Printf("Error recording terminal failure for %v: %s", paymentRef, txErr) + return txErr + } + + if pubErr := w.notifier.Publish(ctx, paymentRef, reason); pubErr != nil { + log.Printf("Error publishing failed status for %v: %s", paymentRef, pubErr) + } + + log.Printf("Payment declined for %v: %s", paymentRef, err) + return fmt.Errorf("%v: %w", err, asynq.SkipRetry) +} + +func (w *PaymentWorker) handleTransientError( + ctx context.Context, + paymentRef, intentId string, + err error, +) error { + if err == nil { + return nil + } + + if bank.IsTerminal(err) { + return nil + } + + retried, _ := asynq.GetRetryCount(ctx) + maxRetry, _ := asynq.GetMaxRetry(ctx) + + if retried >= maxRetry { + if pubErr := w.notifier.Publish(ctx, paymentRef, paymentintent.PaymentStatusFailed); pubErr != nil { + log.Printf("Error publishing exhausted-retry status for %v: %s", paymentRef, pubErr) + } + return w.terminateRetry(ctx, paymentRef, intentId) + } + + log.Printf("Transient bank error for %v, will retry: %s", paymentRef, err) + return err +} diff --git a/internal/jobs/worker/payment.go b/internal/jobs/worker/payment.go new file mode 100644 index 0000000..db4429d --- /dev/null +++ b/internal/jobs/worker/payment.go @@ -0,0 +1,121 @@ +package worker + +import ( + "context" + "encoding/json" + "fmt" + "ledger/internal/domain/bank" + "ledger/internal/domain/paymentintent" + "ledger/internal/jobs/tasks" + "ledger/internal/platform/notifier" + "log" + + "github.com/hibiken/asynq" +) + +type PaymentWorker struct { + bankRepo bank.Repository + uow paymentintent.UnitOfWork + notifier notifier.Notifier +} + +func NewPaymentWorker( + bankRepo bank.Repository, + uow paymentintent.UnitOfWork, + notifier notifier.Notifier, +) *PaymentWorker { + return &PaymentWorker{bankRepo, uow, notifier} +} + +func (w *PaymentWorker) HandleCreate(ctx context.Context, t *asynq.Task) error { + var p tasks.CreatePayload + if err := json.Unmarshal(t.Payload(), &p); err != nil { + return fmt.Errorf("%v: %w", err, asynq.SkipRetry) + } + + payment, err := w.bankRepo.Authorize(ctx, p.IdempotencyKey, *p.BankInput) + + if err := w.handleTransientError(ctx, p.PaymentRef, p.IntentId, err); err != nil { + return err + } + + if err := w.handleTerminalError(ctx, payment, p.PaymentRef, p.IntentId, err); err != nil { + return err + } + + err = w.uow.RunInTx(ctx, func(r paymentintent.TxRepos) error { + event, err := r.PaymentEvent.Create( + ctx, p.IntentId, + paymentintent.PaymentStatusAuthorized, + payment.AuthorizationId, + "", // metadata + ) + if err != nil { + return err + } + + err = r.PaymentIntent.UpdateOperation(ctx, p.PaymentRef, "") + if err != nil { + return err + } + + return r.PaymentIntent.UpdateState(ctx, p.PaymentRef, event.State) + }) + if err != nil { + log.Printf("Error creating payment event for state to %v: %s", paymentintent.PaymentStatusAuthorized, err) + return err + } + + if pubErr := w.notifier.Publish(ctx, p.PaymentRef, paymentintent.PaymentStatusAuthorized); pubErr != nil { + log.Printf("Error publishing authorized status for %v: %s", p.PaymentRef, pubErr) + } + + log.Printf("Payment authorized for %v: %s", p.PaymentRef, payment.AuthorizationId) + return nil +} + +func (w *PaymentWorker) HandleCapture(ctx context.Context, t *asynq.Task) error { + var p tasks.CapturePayload + if err := json.Unmarshal(t.Payload(), &p); err != nil { + return fmt.Errorf("%v: %w", err, asynq.SkipRetry) + } + + payment, err := w.bankRepo.Capture(ctx, p.IdempotencyKey, p.StateId, p.Amount) + + if err := w.handleTransientError(ctx, p.PaymentRef, p.IntentId, err); err != nil { + return err + } + + if err := w.handleTerminalError(ctx, payment, p.PaymentRef, p.IntentId, err); err != nil { + return err + } + + err = w.uow.RunInTx(ctx, func(r paymentintent.TxRepos) error { + event, err := r.PaymentEvent.Create( + ctx, p.IntentId, + paymentintent.PaymentStatusCaptured, + payment.CaptureId, "", + ) + if err != nil { + return err + } + + err = r.PaymentIntent.UpdateOperation(ctx, p.PaymentRef, "") + if err != nil { + return err + } + + return r.PaymentIntent.UpdateState(ctx, p.PaymentRef, event.State) + }) + if err != nil { + log.Printf("Error creating payment event for state to %v: %s", paymentintent.PaymentStatusCaptured, err) + return err + } + + if pubErr := w.notifier.Publish(ctx, p.PaymentRef, paymentintent.PaymentStatusCaptured); pubErr != nil { + log.Printf("Error publishing captured status for %v: %s", p.PaymentRef, pubErr) + } + + log.Printf("Payment captured for %v: %s", p.PaymentRef, payment.CaptureId) + return nil +} diff --git a/app/config/env.go b/internal/platform/config/env.go similarity index 94% rename from app/config/env.go rename to internal/platform/config/env.go index a7c4e21..c205db5 100644 --- a/app/config/env.go +++ b/internal/platform/config/env.go @@ -21,6 +21,7 @@ type AppConfig struct { type RedisConfig struct { Host string Port string + Addr string Password string } @@ -92,6 +93,7 @@ func LoadEnv() error { Redis: RedisConfig{ Host: os.Getenv("REDIS_HOST"), Port: os.Getenv("REDIS_PORT"), + Addr: fmt.Sprintf("%s:%s", os.Getenv("REDIS_HOST"), os.Getenv("REDIS_PORT")), Password: os.Getenv("REDIS_PASSWORD"), }, diff --git a/app/config/validate.go b/internal/platform/config/validate.go similarity index 100% rename from app/config/validate.go rename to internal/platform/config/validate.go diff --git a/app/storage/pgsql.go b/internal/platform/database/pgsql.go similarity index 87% rename from app/storage/pgsql.go rename to internal/platform/database/pgsql.go index 65533b5..59f40e4 100644 --- a/app/storage/pgsql.go +++ b/internal/platform/database/pgsql.go @@ -1,8 +1,8 @@ -package storage +package database import ( "context" - "ledger/app/config" + "ledger/internal/platform/config" "time" "github.com/jackc/pgx/v5/pgxpool" diff --git a/app/storage/redis.go b/internal/platform/database/redis.go similarity index 91% rename from app/storage/redis.go rename to internal/platform/database/redis.go index eb25f82..e6852e9 100644 --- a/app/storage/redis.go +++ b/internal/platform/database/redis.go @@ -1,8 +1,8 @@ -package storage +package database import ( "context" - "ledger/app/config" + "ledger/internal/platform/config" "time" "github.com/redis/go-redis/v9" diff --git a/app/middleware/middleware.go b/internal/platform/middleware/middleware.go similarity index 100% rename from app/middleware/middleware.go rename to internal/platform/middleware/middleware.go diff --git a/internal/platform/notifier/contract.go b/internal/platform/notifier/contract.go new file mode 100644 index 0000000..da3dde8 --- /dev/null +++ b/internal/platform/notifier/contract.go @@ -0,0 +1,13 @@ +package notifier + +import "context" + +type Notifier interface { + Subscribe(channel string) Subscription + Publish(ctx context.Context, channel, result string) error +} + +type Subscription interface { + Wait(ctx context.Context) (string, error) + Close() +} diff --git a/internal/platform/notifier/redis.go b/internal/platform/notifier/redis.go new file mode 100644 index 0000000..e40ab6e --- /dev/null +++ b/internal/platform/notifier/redis.go @@ -0,0 +1,43 @@ +package notifier + +import ( + "context" + + "github.com/redis/go-redis/v9" +) + +type RedisNotifier struct { + rdb *redis.Client +} + +func NewRedisNotifier(rdb *redis.Client) *RedisNotifier { + return &RedisNotifier{rdb} +} + +func (n *RedisNotifier) Subscribe(channel string) Subscription { + sub := n.rdb.Subscribe(context.Background(), channel) + return &RedisSubscription{sub: sub} +} + +func (n *RedisNotifier) Publish(ctx context.Context, channel, result string) error { + return n.rdb.Publish(ctx, channel, result).Err() +} + +type RedisSubscription struct { + sub *redis.PubSub +} + +func (s *RedisSubscription) Wait(ctx context.Context) (string, error) { + ch := s.sub.Channel() + + select { + case msg := <-ch: + return msg.Payload, nil + case <-ctx.Done(): + return "", ctx.Err() + } +} + +func (s *RedisSubscription) Close() { + _ = s.sub.Close() +} diff --git a/app/render/json.go b/internal/platform/render/json.go similarity index 100% rename from app/render/json.go rename to internal/platform/render/json.go diff --git a/pkg/uow/uow.go b/pkg/uow/uow.go deleted file mode 100644 index 2e49b67..0000000 --- a/pkg/uow/uow.go +++ /dev/null @@ -1,16 +0,0 @@ -package uow - -import ( - "context" - "ledger/internal/paymentevent" - "ledger/internal/paymentintent" -) - -type Repos struct { - PaymentIntent paymentintent.Repository - PaymentEvent paymentevent.Repository -} - -type UnitOfWork interface { - RunInTx(ctx context.Context, fn func(repos Repos) error) error -} diff --git a/pkg/utils/utils.go b/pkg/uuid/uuid.go similarity index 86% rename from pkg/utils/utils.go rename to pkg/uuid/uuid.go index 92ca8ef..2855bbf 100644 --- a/pkg/utils/utils.go +++ b/pkg/uuid/uuid.go @@ -1,10 +1,10 @@ -package utils +package uuid import ( "crypto/hmac" "crypto/sha256" "encoding/hex" - "ledger/app/config" + "ledger/internal/platform/config" "strconv" ) diff --git a/project_structure.md b/project_structure.md deleted file mode 100644 index 9ff70d1..0000000 --- a/project_structure.md +++ /dev/null @@ -1,143 +0,0 @@ -# 📁 Ledger - Project Structure - -_Generated on: 09/06/2026, 20:44:28_ - -## 📋 Quick Overview - -| Metric | Value | -| ---------------- | -------- | -| 📄 Total Files | 48 | -| 📁 Total Folders | 18 | -| 🌳 Max Depth | 2 levels | -| 🛠️ Tech Stack | Docker | - -## ⭐ Important Files - -- 🟡 🚫 **.gitignore** - Git ignore rules -- 🟡 🐳 **Dockerfile** - Docker container - -## 📊 File Statistics - -### By File Type - -- 📄 **.go** (Other files): 31 files (64.6%) -- ⚙️ **.yml** (YAML files): 3 files (6.3%) -- ⚙️ **.yaml** (YAML files): 3 files (6.3%) -- ⚙️ **.toml** (TOML files): 1 files (2.1%) -- 🐳 **.dockerignore** (Docker ignore): 1 files (2.1%) -- 📄 **.example** (Other files): 1 files (2.1%) -- 🚫 **.gitignore** (Git ignore): 1 files (2.1%) -- 🐳 **.dockerfile** (Docker files): 1 files (2.1%) -- 📄 **.txt** (Text files): 1 files (2.1%) -- 📄 **.mod** (Other files): 1 files (2.1%) -- 📄 **.sum** (Other files): 1 files (2.1%) -- 📄 **.** (Other files): 1 files (2.1%) -- 📖 **.md** (Markdown files): 1 files (2.1%) -- 📄 **.sh** (Other files): 1 files (2.1%) - -### By Category - -- **Other**: 36 files (75.0%) -- **Config**: 7 files (14.6%) -- **DevOps**: 3 files (6.3%) -- **Docs**: 2 files (4.2%) - -### 📁 Largest Directories - -- **root**: 48 files -- **internal**: 21 files -- **internal/paymentintent**: 10 files -- **app**: 6 files -- **internal/idempotency**: 5 files - -## 🌳 Directory Structure - -``` -Ledger/ -├── ⚙️ .air.toml -├── 🐳 .dockerignore -├── 📄 .env.example -├── 📂 .github/ -│ └── 📂 workflows/ -│ │ ├── ⚙️ build.yml -│ │ ├── ⚙️ deploy.yaml -│ │ ├── ⚙️ lint.yml -│ │ └── ⚙️ test.yml -├── 🟡 🚫 **.gitignore** -├── 🚀 app/ -│ ├── ⚙️ config/ -│ │ ├── 📄 env.go -│ │ └── 📄 validate.go -│ ├── 📂 middleware/ -│ │ └── 📄 middleware.go -│ ├── 📂 render/ -│ │ └── 📄 json.go -│ └── 📂 storage/ -│ │ ├── 📄 pgsql.go -│ │ └── 📄 redis.go -├── 📂 cmd/ -│ ├── 🚀 app/ -│ │ └── 📄 main.go -│ └── 📂 cli/ -│ │ └── 📄 main.go -├── ⚙️ compose.override.yaml -├── ⚙️ compose.yaml -├── 📄 coverage.txt -├── 🟡 🐳 **Dockerfile** -├── 📄 go.mod -├── 📄 go.sum -├── 📂 internal/ -│ ├── 📂 bank/ -│ │ ├── 📄 dto.go -│ │ ├── 📄 ficmart_bank_repo.go -│ │ ├── 📄 model.go -│ │ └── 📄 repository.go -│ ├── 📂 idempotency/ -│ │ ├── 📄 model.go -│ │ ├── 📄 redis_repo.go -│ │ ├── 📄 repository.go -│ │ ├── 📄 service_test.go -│ │ └── 📄 service.go -│ ├── 📂 paymentintent/ -│ │ ├── 📄 capture.go -│ │ ├── 📄 create.go -│ │ ├── 📄 dto.go -│ │ ├── 📄 error.go -│ │ ├── 📄 handler.go -│ │ ├── 📄 model.go -│ │ ├── 📄 pgsql_repo.go -│ │ ├── 📄 repository.go -│ │ ├── 📄 service_test.go -│ │ └── 📄 service.go -│ └── 📂 paymentevent/ -│ │ ├── 📄 pgsql_repo.go -│ │ └── 📄 repository.go -├── 📄 makefile -├── 📂 pkg/ -│ ├── 📂 uow/ -│ │ └── 📄 uow.go -│ └── 🔧 utils/ -│ │ └── 📄 utils.go -├── 📖 project_structure.md -└── 📄 start.sh -``` - -## 📖 Legend - -### File Types - -- ⚙️ Config: TOML files -- 🐳 DevOps: Docker ignore -- 📄 Other: Other files -- ⚙️ Config: YAML files -- ⚙️ Config: YAML files -- 🚫 DevOps: Git ignore -- 🐳 DevOps: Docker files -- 📄 Docs: Text files -- 📖 Docs: Markdown files - -### Importance Levels - -- 🔴 Critical: Essential project files -- 🟡 High: Important configuration files -- 🔵 Medium: Helpful but not essential files diff --git a/start.sh b/scripts/start.app.sh similarity index 58% rename from start.sh rename to scripts/start.app.sh index 4a09e5a..7cbd34c 100644 --- a/start.sh +++ b/scripts/start.app.sh @@ -1,7 +1,7 @@ #!/bin/sh if [ "$APP_ENV" = "local" ]; then go mod download - exec air + exec air -c .air.app.toml else - exec ./cmd/app + exec ../cmd/app fi \ No newline at end of file diff --git a/scripts/start.worker.sh b/scripts/start.worker.sh new file mode 100644 index 0000000..3d1ccf6 --- /dev/null +++ b/scripts/start.worker.sh @@ -0,0 +1,6 @@ +#!/bin/sh +if [ "$APP_ENV" = "local" ]; then + exec air -c .air.worker.toml +else + exec ../cmd/worker +fi \ No newline at end of file