Antone/3ybactuk-marketplace-go-service-project
1
0
Fork 0
mirror of https://github.com/3ybactuk/marketplace-go-service-project.git synced 2025-10-30 14:03:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

[hw-4] add postgres db

Browse Source
This commit is contained in:
Никита Шубин
2025-06-26 12:08:46 +00:00
parent 3ebaad5558
commit 77ed9fcf85
46 changed files with 1582 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
loms/internal/domain/service/mock/order_repository_mock.go
View File

@@ -1,8 +1,8 @@
// Code generated by http://github.com/gojuno/minimock (v3.4.5). DO NOT EDIT.
// Code generated by http://github.com/gojuno/minimock (v3.4.0). DO NOT EDIT.
package mock
//go:generate minimock -i route256/loms/internal/domain/loms/service.OrderRepository -o order_repository_mock.go -n OrderRepositoryMock -p mock
//go:generate minimock -i route256/loms/internal/domain/service.OrderRepository -o order_repository_mock.go -n OrderRepositoryMock -p mock
import (
"context"

4
loms/internal/domain/service/mock/stock_repository_mock.go
View File

@@ -1,8 +1,8 @@
// Code generated by http://github.com/gojuno/minimock (v3.4.5). DO NOT EDIT.
// Code generated by http://github.com/gojuno/minimock (v3.4.0). DO NOT EDIT.
package mock
//go:generate minimock -i route256/loms/internal/domain/loms/service.StockRepository -o stock_repository_mock.go -n StockRepositoryMock -p mock
//go:generate minimock -i route256/loms/internal/domain/service.StockRepository -o stock_repository_mock.go -n StockRepositoryMock -p mock
import (
"context"

161
loms/internal/domain/service/service.go
View File

@@ -28,15 +28,24 @@ type StockRepository interface {
StockGetByID(ctx context.Context, sku entity.Sku) (*entity.Stock, error)
}
type LomsService struct {
orders OrderRepository
stocks StockRepository
type txManager interface {
WriteWithTransaction(ctx context.Context, fn func(ctx context.Context) error) (err error)
ReadWithTransaction(ctx context.Context, fn func(ctx context.Context) error) (err error)
WriteWithRepeatableRead(ctx context.Context, fn func(ctx context.Context) error) (err error)
ReadWithRepeatableRead(ctx context.Context, fn func(ctx context.Context) error) (err error)
}
func NewLomsService(orderRepo OrderRepository, stockRepo StockRepository) *LomsService {
type LomsService struct {
orders OrderRepository
stocks StockRepository
txManager txManager
}
func NewLomsService(orderRepo OrderRepository, stockRepo StockRepository, txManager txManager) *LomsService {
return &LomsService{
orders: orderRepo,
stocks: stockRepo,
orders: orderRepo,
stocks: stockRepo,
txManager: txManager,
}
}
@@ -77,40 +86,44 @@ func (s *LomsService) OrderCreate(ctx context.Context, orderReq *pb.OrderCreateR
return int(a.ID - b.ID)
})
id, err := s.orders.OrderCreate(ctx, order)
if err != nil {
return 0, fmt.Errorf("orders.OrderCreate: %w", err)
}
var (
orderID entity.ID
resErr error
)
order.OrderID = id
commitedStocks := make([]*entity.Stock, 0, len(order.Items))
for _, item := range order.Items {
stock := &entity.Stock{
Item: item,
Reserved: item.Count,
err := s.txManager.WriteWithTransaction(ctx, func(txCtx context.Context) error {
id, err := s.orders.OrderCreate(txCtx, order)
if err != nil {
return err
}
order.OrderID = id
orderID = id
if err := s.stocks.StockReserve(ctx, stock); err != nil {
s.rollbackStocks(ctx, commitedStocks)
committed := make([]*entity.Stock, 0, len(order.Items))
for _, it := range order.Items {
st := &entity.Stock{Item: it, Reserved: it.Count}
if err := s.stocks.StockReserve(txCtx, st); err != nil {
s.rollbackStocks(txCtx, committed)
if statusErr := s.orders.OrderSetStatus(ctx, order.OrderID, pb.OrderStatus_ORDER_STATUS_FAILED.String()); statusErr != nil {
log.Error().Err(statusErr).Msg("failed to update status on stock reserve fail")
_ = s.orders.OrderSetStatus(txCtx, id,
pb.OrderStatus_ORDER_STATUS_FAILED.String())
resErr = fmt.Errorf("stocks.StockReserve: %w", err)
return nil
}
return 0, fmt.Errorf("stocks.StockReserve: %w", err)
committed = append(committed, st)
}
commitedStocks = append(commitedStocks, stock)
}
if err := s.orders.OrderSetStatus(ctx, order.OrderID, pb.OrderStatus_ORDER_STATUS_AWAITING_PAYMENT.String()); err != nil {
s.rollbackStocks(ctx, commitedStocks)
return s.orders.OrderSetStatus(txCtx, id,
pb.OrderStatus_ORDER_STATUS_AWAITING_PAYMENT.String())
})
if err != nil {
return 0, err
}
return order.OrderID, nil
if resErr != nil {
return 0, resErr
}
return orderID, nil
}
func (s *LomsService) OrderInfo(ctx context.Context, orderID entity.ID) (*entity.Order, error) {
@@ -122,54 +135,66 @@ func (s *LomsService) OrderInfo(ctx context.Context, orderID entity.ID) (*entity
}
func (s *LomsService) OrderPay(ctx context.Context, orderID entity.ID) error {
order, err := s.OrderInfo(ctx, orderID)
if err != nil {
return err
if orderID <= 0 {
return model.ErrInvalidInput
}
switch order.Status {
case pb.OrderStatus_ORDER_STATUS_PAYED.String():
return nil
case pb.OrderStatus_ORDER_STATUS_AWAITING_PAYMENT.String():
for _, item := range order.Items {
if err := s.stocks.StockReserveRemove(ctx, &entity.Stock{
Item: item,
Reserved: item.Count,
}); err != nil {
log.Error().Err(err).Msg("failed to free stock reservation")
}
return s.txManager.WriteWithTransaction(ctx, func(txCtx context.Context) error {
order, err := s.orders.OrderGetByID(txCtx, orderID)
if err != nil {
return err
}
return s.orders.OrderSetStatus(ctx, orderID, pb.OrderStatus_ORDER_STATUS_PAYED.String())
default:
return model.ErrOrderInvalidStatus
}
switch order.Status {
case pb.OrderStatus_ORDER_STATUS_PAYED.String():
return nil
case pb.OrderStatus_ORDER_STATUS_AWAITING_PAYMENT.String():
for _, it := range order.Items {
if err := s.stocks.StockReserveRemove(txCtx, &entity.Stock{
Item: it,
Reserved: it.Count,
}); err != nil {
log.Error().Err(err).Msg("failed to free stock reservation")
}
}
return s.orders.OrderSetStatus(txCtx, orderID,
pb.OrderStatus_ORDER_STATUS_PAYED.String())
default:
return model.ErrOrderInvalidStatus
}
})
}
func (s *LomsService) OrderCancel(ctx context.Context, orderID entity.ID) error {
order, err := s.OrderInfo(ctx, orderID)
if err != nil {
return err
if orderID <= 0 {
return model.ErrInvalidInput
}
switch order.Status {
case pb.OrderStatus_ORDER_STATUS_CANCELLED.String():
return nil
case pb.OrderStatus_ORDER_STATUS_FAILED.String(), pb.OrderStatus_ORDER_STATUS_PAYED.String():
return model.ErrOrderInvalidStatus
}
stocks := make([]*entity.Stock, len(order.Items))
for i, item := range order.Items {
stocks[i] = &entity.Stock{
Item: item,
Reserved: item.Count,
return s.txManager.WriteWithTransaction(ctx, func(txCtx context.Context) error {
order, err := s.orders.OrderGetByID(txCtx, orderID)
if err != nil {
return err
}
}
s.rollbackStocks(ctx, stocks)
switch order.Status {
case pb.OrderStatus_ORDER_STATUS_CANCELLED.String():
return nil
case pb.OrderStatus_ORDER_STATUS_FAILED.String(),
pb.OrderStatus_ORDER_STATUS_PAYED.String():
return model.ErrOrderInvalidStatus
}
return s.orders.OrderSetStatus(ctx, orderID, pb.OrderStatus_ORDER_STATUS_CANCELLED.String())
for _, it := range order.Items {
if err := s.stocks.StockCancel(txCtx, &entity.Stock{
Item: it,
Reserved: it.Count,
}); err != nil {
return err
}
}
return s.orders.OrderSetStatus(txCtx, orderID,
pb.OrderStatus_ORDER_STATUS_CANCELLED.String())
})
}
func (s *LomsService) StocksInfo(ctx context.Context, sku entity.Sku) (uint32, error) {
@@ -182,5 +207,5 @@ func (s *LomsService) StocksInfo(ctx context.Context, sku entity.Sku) (uint32, e
return 0, err
}
return stock.Item.Count, nil
return stock.Item.Count - stock.Reserved, nil
}

61
loms/internal/domain/service/service_test.go
View File

@@ -21,6 +21,24 @@ const (
testSku = entity.Sku(199)
)
type mockTxManager struct{}
func (t *mockTxManager) WriteWithTransaction(ctx context.Context, fn func(ctx context.Context) error) (err error) {
return fn(ctx)
}
func (t *mockTxManager) ReadWithTransaction(ctx context.Context, fn func(ctx context.Context) error) (err error) {
return fn(ctx)
}
func (t *mockTxManager) WriteWithRepeatableRead(ctx context.Context, fn func(ctx context.Context) error) (err error) {
return fn(ctx)
}
func (t *mockTxManager) ReadWithRepeatableRead(ctx context.Context, fn func(ctx context.Context) error) (err error) {
return fn(ctx)
}
func TestLomsService_OrderCreate(t *testing.T) {
t.Parallel()
@@ -130,8 +148,7 @@ func TestLomsService_OrderCreate(t *testing.T) {
OrderCreateMock.Return(1, nil).
OrderSetStatusMock.Return(errors.New("unexpected error")),
stocks: mock.NewStockRepositoryMock(mc).
StockReserveMock.Return(nil).
StockCancelMock.Return(nil),
StockReserveMock.Return(nil),
},
args: args{
req: goodReq,
@@ -145,7 +162,7 @@ func TestLomsService_OrderCreate(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
svc := NewLomsService(tt.fields.orders, tt.fields.stocks)
svc := NewLomsService(tt.fields.orders, tt.fields.stocks, &mockTxManager{})
_, err := svc.OrderCreate(ctx, tt.args.req)
tt.wantErr(t, err)
})
@@ -256,24 +273,46 @@ func TestLomsService_OrderPay(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
svc := NewLomsService(tt.fields.orders, tt.fields.stocks)
svc := NewLomsService(tt.fields.orders, tt.fields.stocks, &mockTxManager{})
err := svc.OrderPay(ctx, tt.args.id)
tt.wantErr(t, err)
})
}
}
func TestLomsService_OrderInfo(t *testing.T) {
func TestLomsService_OrderInfoBadInput(t *testing.T) {
t.Parallel()
svc := NewLomsService(
nil,
nil,
&mockTxManager{},
)
_, err := svc.OrderInfo(context.Background(), 0)
require.ErrorIs(t, err, model.ErrInvalidInput)
}
func TestLomsService_OrderInfoSuccess(t *testing.T) {
t.Parallel()
order := &entity.Order{
OrderID: 123,
Status: "payed",
UserID: 1337,
Items: []entity.OrderItem{},
}
mc := minimock.NewController(t)
svc := NewLomsService(
mock.NewOrderRepositoryMock(mc),
mock.NewStockRepositoryMock(mc),
mock.NewOrderRepositoryMock(mc).OrderGetByIDMock.Return(order, nil),
nil,
&mockTxManager{},
)
err := svc.OrderPay(context.Background(), 0)
require.ErrorIs(t, err, model.ErrInvalidInput)
gotOrder, err := svc.OrderInfo(context.Background(), 123)
require.NoError(t, err)
require.Equal(t, order, gotOrder)
}
func TestLomsService_OrderCancel(t *testing.T) {
@@ -370,7 +409,7 @@ func TestLomsService_OrderCancel(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
svc := NewLomsService(tt.fields.orders, tt.fields.stocks)
svc := NewLomsService(tt.fields.orders, tt.fields.stocks, &mockTxManager{})
err := svc.OrderCancel(ctx, tt.args.id)
tt.wantErr(t, err)
})
@@ -437,7 +476,7 @@ func TestLomsService_StocksInfo(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
svc := NewLomsService(nil, tt.fields.stocks)
svc := NewLomsService(nil, tt.fields.stocks, &mockTxManager{})
got, err := svc.StocksInfo(ctx, tt.args.sku)
tt.wantErr(t, err)
if err == nil {