alxeg/payouts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement yookassa client

Browse Source
This commit is contained in:
alxeg
2026-03-19 00:09:25 +03:00
parent 075a53f6ef
commit dd2c360cf6
15 changed files with 411 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
internal/api/common/error.go Normal file
View File

@@ -0,0 +1,36 @@
package common
import (
"encoding/json"
"fmt"
"log/slog"
"net/http"
"strings"
"unicode"
"unicode/utf8"
"payouts/internal/models"
)
func Reason(reason string, params ...any) slog.Attr {
return slog.String("reason", fmt.Sprintf(reason, params...))
}
func ErrorResponse(w http.ResponseWriter, message string, err error, status int, logOpts ...any) {
r, size := utf8.DecodeRuneInString(message)
errorMsg := string(unicode.ToUpper(r)) + strings.ToLower(message[size:])
logFields := logOpts
if err != nil {
logFields = append([]any{slog.String("error", err.Error())}, logOpts...)
}
slog.Error(errorMsg, logFields...)
w.Header().Set("Content-type", "application/json")
w.WriteHeader(status)
json.NewEncoder(w).Encode(&models.ErrorResp{
Message: errorMsg,
Status: status,
})
}

101
internal/api/payout/payout_handler.go
View File

@@ -1,6 +1,7 @@
package payout
import (
"context"
"encoding/json"
"errors"
"fmt"
@@ -12,6 +13,7 @@ import (
"github.com/google/uuid"
"go.uber.org/fx"
"payouts/internal/api/common"
"payouts/internal/config"
"payouts/internal/models"
"payouts/internal/service/cache"
@@ -99,18 +101,36 @@ func (p *payoutHandler) checkAllowedIpCallback(ipStr string) bool {
// GetSbpBanks implements [Handler].
func (p *payoutHandler) GetSbpBanks(w http.ResponseWriter, r *http.Request) {
panic("unimplemented")
w.Header().Set("Content-type", "application/json")
banksResp, err := p.yooKassa.GetSbpBanks(yookassa.WithContext(r.Context()))
if err != nil {
status := http.StatusBadRequest
var yError *yookassa.Error
if errors.As(err, &yError) {
status = yError.Status
}
common.ErrorResponse(w, "failed to retrieve sbp banks", err, status)
return
}
encoder := json.NewEncoder(w)
err = encoder.Encode(banksResp)
if err != nil {
common.ErrorResponse(w, "failed to encode response", err, http.StatusInternalServerError)
}
}
// PaymentCreate implements [Handler].
func (p *payoutHandler) PayoutCreate(w http.ResponseWriter, r *http.Request) {
errResponse := func(message string, err error, status int) {
http.Error(w, errors.Join(errors.New(message), err).Error(), status)
}
defer r.Body.Close()
w.Header().Set("Content-type", "application/json")
userSession, err := p.getSession(r)
if err != nil {
errResponse("unauthorized", err, http.StatusUnauthorized)
common.ErrorResponse(w, "unauthorized", err, http.StatusUnauthorized)
return
}
@@ -120,8 +140,7 @@ func (p *payoutHandler) PayoutCreate(w http.ResponseWriter, r *http.Request) {
decoder := json.NewDecoder(r.Body)
err = decoder.Decode(&payoutReq)
if err != nil {
slog.Error("Failed to decode request body", slog.String("error", err.Error()))
errResponse("failed to decode request body", err, http.StatusBadRequest)
common.ErrorResponse(w, "failed to decode request body", err, http.StatusBadRequest)
return
}
@@ -131,34 +150,78 @@ func (p *payoutHandler) PayoutCreate(w http.ResponseWriter, r *http.Request) {
IdempotenceKey: idempotenceKey,
Type: payoutReq.PayoutType.String(),
Amount: payoutReq.Amount,
Status: orm.StatusCreated,
Status: models.StatusCreated.String(),
}
err = p.dbService.CreatePayout(payoutModel, database.WithContext(r.Context()))
if err != nil {
common.ErrorResponse(w, "failed to create payout data", err, http.StatusInternalServerError)
return
}
slog.Debug(fmt.Sprintf("Received create payload request: %v from user %v", payoutReq, userSession))
payoutResp, err := p.yooKassa.CreatePayout(payoutReq, userSession, idempotenceKey, yookassa.WithContext(r.Context()))
if err != nil {
slog.Error("Failed to create payout request", slog.String("error", err.Error()))
errResponse("failed to create payout request", err, http.StatusBadRequest)
status := http.StatusBadRequest
var yError *yookassa.Error
if errors.As(err, &yError) {
status = yError.Status
}
common.ErrorResponse(w, "failed to create payout request", err, status)
return
}
updatedRows, err := p.dbService.UpdatePayoutById(payoutModel.ID, orm.Payout{
PayoutID: payoutResp.ID,
Status: payoutResp.Status.String(),
}, database.WithContext(r.Context()))
if err != nil || updatedRows == 0 {
common.ErrorResponse(w, "failed to update payout data", err, http.StatusInternalServerError, slog.String("id", fmt.Sprintf("%d", payoutModel.ID)))
return
}
encoder := json.NewEncoder(w)
encoder.Encode(payoutResp)
err = encoder.Encode(payoutResp)
if err != nil {
common.ErrorResponse(w, "failed to encode response", err, http.StatusInternalServerError)
}
}
func (p *payoutHandler) delayedPayoutUpdate(ctx context.Context, payoutData *yookassa.PayoutResponse) {
<-ctx.Done()
slog.Info("Updating payout data received from callback")
updatedRows, err := p.dbService.UpdatePayoutByPayoutID(payoutData.ID, orm.Payout{
Status: payoutData.Status.String(),
}, database.WithContext(context.Background()))
if err != nil || updatedRows == 0 {
slog.Error("Failed to update paylout data", slog.String("error", fmt.Sprintf("%v", err)), slog.Int("rows_updated", updatedRows))
} else {
slog.Info("Successfully updated payout data", slog.String("payout_id", payoutData.ID), slog.String("new_status", payoutData.Status.String()))
}
}
// PaymentCallback implements [Handler].
func (p *payoutHandler) PayoutCallback(w http.ResponseWriter, r *http.Request) {
inData := map[string]any{}
decoder := json.NewDecoder(r.Body)
decoder.Decode(&inData)
// todo: check also the X-real-ip and/or X-Forwarded-For
if !p.checkAllowedIpCallback(r.RemoteAddr) {
slog.Error(fmt.Sprintf("Callback came from unallowed ip: %s", r.RemoteAddr))
http.Error(w, "unallowed", http.StatusForbidden)
if p.yookassaConf.CheckAllowedCallbackAddress && !p.checkAllowedIpCallback(r.RemoteAddr) {
common.ErrorResponse(w, "unallowed", nil, http.StatusForbidden, common.Reason("Callback came from unallowed ip: %s", r.RemoteAddr))
return
}
slog.Info(fmt.Sprintf("Received callback from %s with object %v with headers %v", r.RemoteAddr, inData, r.Header))
payoutData := &yookassa.PayoutResponse{}
decoder := json.NewDecoder(r.Body)
err := decoder.Decode(payoutData)
if err != nil {
common.ErrorResponse(w, "bad request", nil, http.StatusBadRequest, common.Reason("Failed to decode payload data: %v", err))
return
}
ctx, _ := context.WithTimeout(context.Background(), p.yookassaConf.CallbackProcessTimeout)
go p.delayedPayoutUpdate(ctx, payoutData)
slog.Debug(fmt.Sprintf("Received callback from %s with object %v with headers %v", r.RemoteAddr, payoutData, r.Header))
}

35
internal/api/user/user_handler.go
View File

@@ -2,8 +2,6 @@ package user
import (
"encoding/json"
"errors"
"log/slog"
"net/http"
"time"
@@ -12,6 +10,7 @@ import (
"go.uber.org/fx"
"golang.org/x/crypto/bcrypt"
"payouts/internal/api/common"
"payouts/internal/config"
"payouts/internal/models"
"payouts/internal/service/cache"
@@ -52,28 +51,21 @@ func NewUserHandler(p Params) (Handler, error) {
func (u *userHandler) UserRegister(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
errResponse := func(message string, err error, status int) {
http.Error(w, errors.Join(errors.New(message), err).Error(), status)
}
user := models.UserRegister{}
err := json.NewDecoder(r.Body).Decode(&user)
if err != nil {
slog.Error("Failed to get password hash", slog.String("error", err.Error()))
errResponse("failed to decode request body", err, http.StatusBadRequest)
common.ErrorResponse(w, "failed to decode request body", err, http.StatusBadRequest)
return
}
if user.Passwd != user.PasswdCfm || len(user.Passwd) == 0 || len(user.Phone) == 0 || len(user.TIN) == 0 {
slog.Error("No required parameters passed")
errResponse("invalid parameters", nil, http.StatusBadRequest)
common.ErrorResponse(w, "invalid parameters", nil, http.StatusBadRequest)
return
}
hashedPassword, err := bcrypt.GenerateFromPassword([]byte(user.Passwd), bcrypt.DefaultCost)
if err != nil {
slog.Error("Failed to get password hash", slog.String("error", err.Error()))
errResponse("internal error", nil, http.StatusInternalServerError)
common.ErrorResponse(w, "internal error", nil, http.StatusInternalServerError, common.Reason("failed to get password hash: %v", err))
return
}
user.PasswdHash = string(hashedPassword)
@@ -84,8 +76,7 @@ func (u *userHandler) UserRegister(w http.ResponseWriter, r *http.Request) {
// todo: add data validation
err = u.dbService.CreateUser(&ormUser, database.WithContext(r.Context()))
if err != nil {
slog.Error("Failed to create user", slog.String("error", err.Error()))
errResponse("failed to create user", err, http.StatusBadRequest)
common.ErrorResponse(w, "failed to create user", err, http.StatusBadRequest)
return
}
@@ -96,33 +87,27 @@ func (u *userHandler) UserRegister(w http.ResponseWriter, r *http.Request) {
func (u *userHandler) UserLogin(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
errResponse := func(message string, err error, status int) {
w.Header().Set("Content-Type", "text/plain")
http.Error(w, errors.Join(errors.New(message), err).Error(), status)
}
user := models.UserLoginReq{}
err := json.NewDecoder(r.Body).Decode(&user)
if err != nil {
errResponse("failed to decode request body", err, http.StatusBadRequest)
common.ErrorResponse(w, "failed to decode request body", err, http.StatusBadRequest)
return
}
if len(user.Phone) == 0 || len(user.Passwd) == 0 {
slog.Error("No required parameters passed")
errResponse("invalid parameters", nil, http.StatusBadRequest)
common.ErrorResponse(w, "invalid parameters", nil, http.StatusBadRequest, common.Reason("no user or password passed"))
return
}
ormUser, err := u.dbService.GetUser(&orm.User{Phone: user.Phone}, database.WithContext(r.Context()))
if err != nil {
errResponse("invalid credentials", nil, http.StatusUnauthorized)
common.ErrorResponse(w, "invalid credentials", nil, http.StatusUnauthorized, common.Reason("no user found by number %s", user.Phone))
return
}
err = bcrypt.CompareHashAndPassword([]byte(ormUser.PasswdHash), []byte(user.Passwd))
if err != nil {
errResponse("invalid credentials", nil, http.StatusUnauthorized)
common.ErrorResponse(w, "invalid credentials", nil, http.StatusUnauthorized, common.Reason("password does not match"))
return
}
@@ -138,7 +123,7 @@ func (u *userHandler) UserLogin(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json")
err = json.NewEncoder(w).Encode(resp)
if err != nil {
errResponse("failed to encode response", err, http.StatusInternalServerError)
common.ErrorResponse(w, "failed to encode response", err, http.StatusInternalServerError)
return
}
}