[hw-5] concurrency, graceful shutdown, concurrent tests

loms/internal/app/app.go

@@ -30,6 +30,10 @@ import (
 type App struct {
 	config     *config.Config
 	controller *server.Server
+
+	grpcServer *grpc.Server
+	httpServer *http.Server
+	gwConn     *grpc.ClientConn
 }
 
 func NewApp(configPath string) (*App, error) {
@@ -72,26 +76,65 @@ func NewApp(configPath string) (*App, error) {
 	return app, nil
 }
 
-func (app *App) ListenAndServe() error {
+func (app *App) Shutdown(ctx context.Context) (err error) {
+	if app.httpServer != nil {
+		err = app.httpServer.Shutdown(ctx)
+
+		if err != nil {
+			log.Error().Err(err).Msgf("failed http gateway server shutdown")
+		}
+	}
+
+	done := make(chan struct{})
+	if app.grpcServer != nil {
+		go func() {
+			app.grpcServer.GracefulStop()
+
+			close(done)
+		}()
+	}
+
+	select {
+	case <-done:
+	case <-ctx.Done():
+		if app.grpcServer != nil {
+			app.grpcServer.Stop()
+		}
+	}
+
+	if app.gwConn != nil {
+		err2 := app.gwConn.Close()
+
+		if err2 != nil {
+			err = err2
+
+			log.Error().Err(err).Msgf("failed gateway connection close")
+		}
+	}
+
+	return err
+}
+
+func (app *App) ListenAndServe(ctx context.Context) error {
 	grpcAddr := fmt.Sprintf("%s:%s", app.config.Service.Host, app.config.Service.GRPCPort)
 	l, err := net.Listen("tcp", grpcAddr)
 	if err != nil {
 		return err
 	}
 
-	grpcServer := grpc.NewServer(
+	app.grpcServer = grpc.NewServer(
 		grpc.ChainUnaryInterceptor(
 			mw.Logging,
 			mw.Validate,
 		),
 	)
-	reflection.Register(grpcServer)
+	reflection.Register(app.grpcServer)
 
-	pb.RegisterLOMSServer(grpcServer, app.controller)
+	pb.RegisterLOMSServer(app.grpcServer, app.controller)
 
 	go func() {
-		if err = grpcServer.Serve(l); err != nil {
-			log.Fatal().Msgf("failed to serve: %v", err)
+		if err = app.grpcServer.Serve(l); err != nil {
+			log.Fatal().Err(err).Msg("failed to serve")
 		}
 	}()
 
@@ -106,21 +149,22 @@ func (app *App) ListenAndServe() error {
 	if err != nil {
 		return fmt.Errorf("grpc.NewClient: %w", err)
 	}
+	app.gwConn = conn
 
 	gwmux := runtime.NewServeMux()
-	if err = pb.RegisterLOMSHandler(context.Background(), gwmux, conn); err != nil {
+	if err = pb.RegisterLOMSHandler(ctx, gwmux, conn); err != nil {
 		return fmt.Errorf("pb.RegisterLOMSHandler: %w", err)
 	}
 
-	gwServer := &http.Server{
+	app.httpServer = &http.Server{
 		Addr:        fmt.Sprintf("%s:%s", app.config.Service.Host, app.config.Service.HTTPPort),
 		Handler:     gwmux,
 		ReadTimeout: 10 * time.Second,
 	}
 
-	log.Info().Msgf("Serving http loms at http://%s", gwServer.Addr)
+	log.Info().Msgf("Serving http loms at http://%s", app.httpServer.Addr)
 
-	return gwServer.ListenAndServe()
+	return app.httpServer.ListenAndServe()
 }
 
 func getPostgresPools(c *config.Config) (masterPool, replicaPool *pgxpool.Pool, err error) {

loms/internal/domain/repository/stocks/inmemory/stock-data.json

@@ -1,37 +1,16 @@
 [
-  {
-    "sku": 139275865,
-    "total_count": 65534,
-    "reserved": 0
-  },
-  {
-    "sku": 2956315,
-    "total_count": 100,
-    "reserved": 30
-  },
-  {
-    "sku": 1076963,
-    "total_count": 100,
-    "reserved": 35
-  },
-  {
-    "sku": 135717466,
-    "total_count": 100,
-    "reserved": 20
-  },
-  {
-    "sku": 135937324,
-    "total_count": 100,
-    "reserved": 30
-  },
-  {
-    "sku": 1625903,
-    "total_count": 10000,
-    "reserved": 0
-  },
-  {
-    "sku": 1148162,
-    "total_count": 100,
-    "reserved": 0
-  }
+  {"sku": 139275865,"total_count": 65534,"reserved": 0},
+  {"sku": 2956315,"total_count": 100,"reserved": 30},
+  {"sku": 1076963,"total_count": 100,"reserved": 35},
+  {"sku": 135717466,"total_count": 100,"reserved": 20},
+  {"sku": 135937324,"total_count": 100,"reserved": 30},
+  {"sku": 1625903,"total_count": 10000,"reserved": 0},
+  {"sku": 1148162,"total_count": 100,"reserved": 0},
+  {"sku": 2958025,"total_count": 100,"reserved": 0},
+  {"sku": 3596599,"total_count": 100,"reserved": 0},
+  {"sku": 3618852,"total_count": 100,"reserved": 0},
+  {"sku": 4288068,"total_count": 100,"reserved": 0},
+  {"sku": 4465995,"total_count": 100,"reserved": 0},
+  {"sku": 30816475,"total_count": 100,"reserved": 0},
+  {"sku": 2618151,"total_count": 100,"reserved": 0}
 ]

loms/internal/domain/repository/stocks/sqlc/repository.go

@@ -27,7 +27,7 @@ func NewStockRepository(write, read *pgxpool.Pool) service.StockRepository {
 	}
 }
 
-func (s *stockRepo) GetQuerier(ctx context.Context) *Queries {
+func (s *stockRepo) GetWriter(ctx context.Context) *Queries {
 	tx, ok := postgres.TxFromCtx(ctx)
 	if ok {
 		return New(tx)
@@ -36,8 +36,17 @@ func (s *stockRepo) GetQuerier(ctx context.Context) *Queries {
 	return New(s.write)
 }
 
+func (s *stockRepo) GetReader(ctx context.Context) *Queries {
+	tx, ok := postgres.TxFromCtx(ctx)
+	if ok {
+		return New(tx)
+	}
+
+	return New(s.read)
+}
+
 func (s *stockRepo) StockReserve(ctx context.Context, stock *entity.Stock) error {
-	querier := s.GetQuerier(ctx)
+	querier := s.GetWriter(ctx)
 
 	rows, err := querier.StockReserve(ctx, &StockReserveParams{
 		Sku:      int64(stock.Item.ID),
@@ -55,7 +64,7 @@ func (s *stockRepo) StockReserve(ctx context.Context, stock *entity.Stock) error
 }
 
 func (s *stockRepo) StockReserveRemove(ctx context.Context, stock *entity.Stock) error {
-	querier := s.GetQuerier(ctx)
+	querier := s.GetWriter(ctx)
 
 	rows, err := querier.StockReserveRemove(ctx, &StockReserveRemoveParams{
 		Sku:      int64(stock.Item.ID),
@@ -81,7 +90,7 @@ func (s *stockRepo) StockReserveRemove(ctx context.Context, stock *entity.Stock)
 }
 
 func (s *stockRepo) StockCancel(ctx context.Context, stock *entity.Stock) error {
-	querier := s.GetQuerier(ctx)
+	querier := s.GetWriter(ctx)
 
 	rows, err := querier.StockCancel(ctx, &StockCancelParams{
 		Sku:      int64(stock.Item.ID),
@@ -107,7 +116,7 @@ func (s *stockRepo) StockCancel(ctx context.Context, stock *entity.Stock) error
 }
 
 func (s *stockRepo) StockGetByID(ctx context.Context, sku entity.Sku) (*entity.Stock, error) {
-	querier := s.GetQuerier(ctx)
+	querier := s.GetReader(ctx)
 
 	stock, err := querier.StockGetByID(ctx, int64(sku))
 	switch {

loms/internal/domain/service/service_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/gojuno/minimock/v3"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"go.uber.org/goleak"
 
 	"route256/loms/internal/domain/entity"
 	"route256/loms/internal/domain/model"
@@ -39,6 +40,10 @@ func (t *mockTxManager) ReadWithRepeatableRead(ctx context.Context, fn func(ctx
 	return fn(ctx)
 }
 
+func TestMain(m *testing.M) {
+	goleak.VerifyTestMain(m)
+}
+
 func TestLomsService_OrderCreate(t *testing.T) {
 	t.Parallel()