finish refactor code

Author: thangchung

Makefile

@@ -64,7 +64,7 @@ docker-compose-build:
 wire:
 	cd internal/barista/app && wire && cd - && \
 	cd internal/counter/app && wire && cd - && \
-	cd internal/barista/app && wire && cd - && \
+	cd internal/kitchen/app && wire && cd - && \
 	cd internal/product/app && wire && cd -
 .PHONY: wire
 

README.md

@@ -1,8 +1,8 @@
 # go-coffeeshop
 
-A event-driven microservices coffee shop application has been written in Golang, and deployment using Nomad, Consul Connect, Vault, and Terraform.
+An event-driven microservices coffee shop application has been written in Golang and deployed using Nomad, Consul Connect, Vault, and Terraform.
 
-Other versions can be found at:
+Other versions in .NET/C# can be found at:
 
 - [.NET CoffeeShop with Microservices approach](https://github.com/thangchung/coffeeshop-on-nomad)
 - [.NET CoffeeShop with Modular Monolith approach](https://github.com/thangchung/coffeeshop-modular)
@@ -23,6 +23,7 @@ Other versions can be found at:
       - [sirupsen/logrus](https://github.com/sirupsen/logrus)
     - [samber/lo](https://github.com/samber/lo)
     - [automaxprocs/maxprocs](go.uber.org/automaxprocs/maxprocs)
+    - [stretchr/testify](github.com/stretchr/testify)
     - golang/glog
     - google/uuid
     - google.golang.org/genproto
@@ -45,16 +46,16 @@ No. | Service | URI
 1 | grpc-gateway | [http://localhost:5000](http://localhost:5000)
 2 | product service | [http://localhost:5001](http://localhost:5001)
 3 | counter service | [http://localhost:5002](http://localhost:5002)
-4 | barista service |  
-5 | kitchen service |  
+4 | barista service | worker only
+5 | kitchen service | worker only
 6 | web | [http://localhost:8888](http://localhost:8888)
 
 ## Starting project
 
-Jump into `.devcontainer`, then
+Jump into [`.devcontainer`](https://code.visualstudio.com/docs/devcontainers/containers), then
 
 ```bash
-> make compose
+> make docker-compose
 ```
 
 From `vscode` => Press F1 => Type `Simple Browser View` => Choose it and enter [http://localhost:8888](http://localhost:8888).
@@ -82,6 +83,10 @@ The details of how to run it can be find at [deployment with Nomad, Consult Conn
 
 ## Development
 
+### Clean Domain-driven Design
+
+![clean_ddd](docs/clean_ddd.svg)
+
 ### Generate dependency injection instances with wire
 
 ```bash

cmd/barista/main.go

@@ -46,21 +46,17 @@ func main() {
 	// integrate Logrus with the slog logger
 	slog.New(logger.NewLogrusHandler(logrus.StandardLogger()))
 
-	a, err := app.InitApp(cfg, postgres.DBConnString(cfg.PG.DsnURL), rabbitmq.RabbitMQConnStr(cfg.RabbitMQ.URL))
+	a, cleanup, err := app.InitApp(cfg, postgres.DBConnString(cfg.PG.DsnURL), rabbitmq.RabbitMQConnStr(cfg.RabbitMQ.URL))
 	if err != nil {
 		slog.Error("failed init app", err)
 		cancel()
 	}
 
-	defer a.AMQPConn.Close()
-	defer a.PG.Close()
-
 	a.CounterOrderPub.Configure(
 		pkgPublisher.ExchangeName("counter-order-exchange"),
 		pkgPublisher.BindingKey("counter-order-routing-key"),
 		pkgPublisher.MessageTypeName("barista-order-updated"),
 	)
-	defer a.CounterOrderPub.CloseChan()
 
 	a.Consumer.Configure(
 		pkgConsumer.ExchangeName("barista-order-exchange"),
@@ -84,8 +80,10 @@ func main() {
 
 	select {
 	case v := <-quit:
+		cleanup()
 		slog.Info("signal.Notify", v)
 	case done := <-ctx.Done():
+		cleanup()
 		slog.Info("ctx.Done", done)
 	}
 }

cmd/counter/main.go

@@ -55,7 +55,7 @@ func main() {
 		<-ctx.Done()
 	}()
 
-	prepareApp(ctx, cancel, cfg, server)
+	cleanup := prepareApp(ctx, cancel, cfg, server)
 
 	// gRPC Server.
 	address := fmt.Sprintf("%s:%d", cfg.HTTP.Host, cfg.HTTP.Port)
@@ -89,36 +89,33 @@ func main() {
 
 	select {
 	case v := <-quit:
+		cleanup()
 		slog.Info("signal.Notify", v)
 	case done := <-ctx.Done():
-		slog.Info("ctx.Done", done)
+		cleanup()
+		slog.Info("ctx.Done", "app done", done)
 	}
 }
 
-func prepareApp(ctx context.Context, cancel context.CancelFunc, cfg *config.Config, server *grpc.Server) {
-	a, err := app.InitApp(cfg, postgres.DBConnString(cfg.PG.DsnURL), rabbitmq.RabbitMQConnStr(cfg.RabbitMQ.URL), server)
+func prepareApp(ctx context.Context, cancel context.CancelFunc, cfg *config.Config, server *grpc.Server) func() {
+	a, cleanup, err := app.InitApp(cfg, postgres.DBConnString(cfg.PG.DsnURL), rabbitmq.RabbitMQConnStr(cfg.RabbitMQ.URL), server)
 	if err != nil {
 		slog.Error("failed init app", err)
 		cancel()
 		<-ctx.Done()
 	}
 
-	// defer a.AMQPConn.Close()
-	// defer a.PG.Close()
-
 	a.BaristaOrderPub.Configure(
 		pkgPublisher.ExchangeName("barista-order-exchange"),
 		pkgPublisher.BindingKey("barista-order-routing-key"),
 		pkgPublisher.MessageTypeName("barista-order-created"),
 	)
-	// defer a.BaristaOrderPub.CloseChan()
 
 	a.KitchenOrderPub.Configure(
 		pkgPublisher.ExchangeName("kitchen-order-exchange"),
 		pkgPublisher.BindingKey("kitchen-order-routing-key"),
 		pkgPublisher.MessageTypeName("kitchen-order-created"),
 	)
-	// defer a.KitchenOrderPub.CloseChan()
 
 	a.Consumer.Configure(
 		pkgConsumer.ExchangeName("counter-order-exchange"),
@@ -135,4 +132,6 @@ func prepareApp(ctx context.Context, cancel context.CancelFunc, cfg *config.Conf
 			<-ctx.Done()
 		}
 	}()
+
+	return cleanup
 }

cmd/kitchen/main.go

@@ -46,21 +46,17 @@ func main() {
 	// integrate Logrus with the slog logger
 	slog.New(logger.NewLogrusHandler(logrus.StandardLogger()))
 
-	a, err := app.InitApp(cfg, postgres.DBConnString(cfg.PG.DsnURL), rabbitmq.RabbitMQConnStr(cfg.RabbitMQ.URL))
+	a, cleanup, err := app.InitApp(cfg, postgres.DBConnString(cfg.PG.DsnURL), rabbitmq.RabbitMQConnStr(cfg.RabbitMQ.URL))
 	if err != nil {
 		slog.Error("failed init app", err)
 		cancel()
 	}
 
-	defer a.AMQPConn.Close()
-	defer a.PG.Close()
-
 	a.CounterOrderPub.Configure(
 		pkgPublisher.ExchangeName("counter-order-exchange"),
 		pkgPublisher.BindingKey("counter-order-routing-key"),
 		pkgPublisher.MessageTypeName("kitchen-order-updated"),
 	)
-	defer a.CounterOrderPub.CloseChan()
 
 	a.Consumer.Configure(
 		pkgConsumer.ExchangeName("kitchen-order-exchange"),
@@ -84,8 +80,10 @@ func main() {
 
 	select {
 	case v := <-quit:
+		cleanup()
 		slog.Info("signal.Notify", v)
 	case done := <-ctx.Done():
+		cleanup()
 		slog.Info("ctx.Done", done)
 	}
 }