fix: moved packages

SShlykov · Mar 21, 2024 · b29a075 · b29a075
1 parent acc3ecb
commit b29a075
Show file tree

Hide file tree

Showing 23 changed files with 16 additions and 91 deletions.
diff --git a/api_gateway/Dockerfile b/api_gateway/Dockerfile
@@ -4,10 +4,7 @@ WORKDIR /app
 COPY ../api_gateway ./api_gateway
 COPY ../auth ./auth
 COPY ../bookback ./bookback
-COPY ../logger ./logger
-COPY ../metrics ./metrics
-COPY ../postgres ./postgres
-COPY ../scripts ./scripts
+COPY ../go_pkg ./go_pkg
 COPY ../go.work ./go.work
 
 RUN go build -o /app/main ./api_gateway/cmd/api_gateway

diff --git a/api_gateway/cmd/api_gateway/main.go b/api_gateway/cmd/api_gateway/main.go
@@ -4,6 +4,7 @@ import (
  "context"
  "fmt"
  userService "github.com/SShlykov/zeitment/auth/pkg/grpc/user_v1"
+ loggerPkg "github.com/SShlykov/zeitment/logger"
  "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
  "google.golang.org/grpc"
  "log"
@@ -16,11 +17,12 @@ var (
 )
 
 func main() {
+ logger := loggerPkg.SetupLogger("info")
  proxyAddr := fmt.Sprintf(":%s", os.Getenv("PORT"))
- HTTPProxy(proxyAddr)
+ HTTPProxy(proxyAddr, logger)
 }
 
-func HTTPProxy(proxyAddr string) {
+func HTTPProxy(proxyAddr string, logger loggerPkg.Logger) {
  grpcGwMux := runtime.NewServeMux()
 
  //----------------------------------------------------------------
@@ -30,13 +32,13 @@ func HTTPProxy(proxyAddr string) {
  //grpc.WithPerRPCCredentials(&reqData{}),
  grpcUserConn, err := grpc.Dial(authServiceURL, grpc.WithInsecure())
  if err != nil {
- log.Fatalln("Filed to connect to User service", err)
+ logger.Error("Filed to connect to User service", loggerPkg.Err(err))
  }
  defer grpcUserConn.Close()
 
  err = userService.RegisterUserServiceHandler(context.Background(), grpcGwMux, grpcUserConn)
  if err != nil {
- log.Fatalln("Filed to start HTTP server", err)
+ logger.Error("Filed to register User service", loggerPkg.Err(err))
  }
 
  //----------------------------------------------------------------
@@ -45,12 +47,7 @@ func HTTPProxy(proxyAddr string) {
  mux := http.NewServeMux()
 
  mux.Handle("/api/v1/", grpcGwMux)
- mux.HandleFunc("/", helloWorld)
 
- fmt.Println("starting HTTP server at " + proxyAddr)
+ logger.Info("starting HTTP server at " + proxyAddr)
  log.Fatal(http.ListenAndServe(proxyAddr, mux))
 }
-
-func helloWorld(w http.ResponseWriter, r *http.Request) {
- _, _ = w.Write([]byte("Hello, world!"))
-}
diff --git a/auth/Dockerfile b/auth/Dockerfile
@@ -4,10 +4,7 @@ WORKDIR /app
 COPY ../api_gateway ./api_gateway
 COPY ../auth ./auth
 COPY ../bookback ./bookback
-COPY ../logger ./logger
-COPY ../metrics ./metrics
-COPY ../postgres ./postgres
-COPY ../scripts ./scripts
+COPY ../go_pkg ./go_pkg
 COPY ../go.work ./go.work
 
 RUN go build -o /app/main ./auth/cmd/auth

diff --git a/auth/internal/domain/services/user_v1.go b/auth/internal/domain/services/user_v1.go
@@ -52,7 +52,8 @@ func (uss *userServiceServer) SignUp(ctx context.Context, in *user_v1.SignUpRequ
  user.PasswordHash = hashed
  user.UpdateAfter = sql.Null[int64]{Valid: true, V: int64(30 * 24 * time.Hour)}
 
- userID, err := uss.repo.Create(ctx, user)
+ var userID string
+ userID, err = uss.repo.Create(ctx, user)
  if err != nil {
  return nil, err
  }

diff --git a/bookback/Dockerfile b/bookback/Dockerfile
@@ -4,10 +4,7 @@ WORKDIR /app
 COPY ../api_gateway ./api_gateway
 COPY ../auth ./auth
 COPY ../bookback ./bookback
-COPY ../logger ./logger
-COPY ../metrics ./metrics
-COPY ../postgres ./postgres
-COPY ../scripts ./scripts
+COPY ../go_pkg ./go_pkg
 COPY ../go.work ./go.work
 
 RUN go build -o /app/main ./bookback/cmd/bookback

diff --git a/bookback/internal/bootstrap/app/app.go b/bookback/internal/bootstrap/app/app.go
@@ -56,7 +56,7 @@ func (app *App) Run() error {
  logg := app.logger
  logg.Info("starting book app", slog.String("at", app.web.Address))
  logg.Debug("debug messages enabled")
- 
+
  go func() {
  app.RunWebServer()
  }()

diff --git a/go.work b/go.work
@@ -4,7 +4,7 @@ use (
  ./api_gateway
  ./auth
  ./bookback
- ./logger
- ./postgres
- ./metrics
+ ./go_pkg/logger
+ ./go_pkg/postgres
+ ./go_pkg/metrics
 )
diff --git a/logger/error.go → go_pkg/logger/error.go b/logger/error.go → go_pkg/logger/error.go
diff --git a/logger/go.mod → go_pkg/logger/go.mod b/logger/go.mod → go_pkg/logger/go.mod
diff --git a/logger/go.sum → go_pkg/logger/go.sum b/logger/go.sum → go_pkg/logger/go.sum
diff --git a/logger/handler.go → go_pkg/logger/handler.go b/logger/handler.go → go_pkg/logger/handler.go
diff --git a/logger/logger.go → go_pkg/logger/logger.go b/logger/logger.go → go_pkg/logger/logger.go
diff --git a/metrics/Readme.md → go_pkg/metrics/Readme.md b/metrics/Readme.md → go_pkg/metrics/Readme.md
diff --git a/metrics/go.mod → go_pkg/metrics/go.mod b/metrics/go.mod → go_pkg/metrics/go.mod
diff --git a/metrics/interface.go → go_pkg/metrics/interface.go b/metrics/interface.go → go_pkg/metrics/interface.go
diff --git a/metrics/localmetrics/metrics.go → go_pkg/metrics/localmetrics/metrics.go b/metrics/localmetrics/metrics.go → go_pkg/metrics/localmetrics/metrics.go
diff --git a/postgres/client.go → go_pkg/postgres/client.go b/postgres/client.go → go_pkg/postgres/client.go
diff --git a/postgres/dbutils/db_utils.go → go_pkg/postgres/dbutils/db_utils.go b/postgres/dbutils/db_utils.go → go_pkg/postgres/dbutils/db_utils.go
diff --git a/postgres/go.mod → go_pkg/postgres/go.mod b/postgres/go.mod → go_pkg/postgres/go.mod
diff --git a/postgres/go.sum → go_pkg/postgres/go.sum b/postgres/go.sum → go_pkg/postgres/go.sum
diff --git a/postgres/interface.go → go_pkg/postgres/interface.go b/postgres/interface.go → go_pkg/postgres/interface.go
diff --git a/postgres/pg.go → go_pkg/postgres/pg.go b/postgres/pg.go → go_pkg/postgres/pg.go
diff --git a/postgres/transaction/transaction.go b/postgres/transaction/transaction.go