Merge pull request #5 from jeferagudeloc/develop

jeferagudeloc · web-flow · commit 18bfc4664271 · 2023-05-25T10:36:53.000-04:00
[develop]: add debugger and server grpc users + debug dockerfile
diff --git a/config/nginx/Dockerfile b/config/nginx/Dockerfile
@@ -0,0 +1,2 @@
+FROM nginx:latest
+COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/config/nginx/nginx.conf b/config/nginx/nginx.conf
@@ -0,0 +1,33 @@
+worker_processes 1;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    upstream gateway {
+        server gateway:8080;
+    }
+
+    server {
+        listen 80;
+
+        location / {
+            if ($request_method = 'OPTIONS') {
+                add_header 'Access-Control-Allow-Origin' '*';
+                add_header 'Access-Control-Allow-Methods' 'POST, GET, OPTIONS';
+                add_header 'Access-Control-Allow-Headers' 'Content-Type,x-endpoint-api-userinfo,x-commerce,x-country,authorization,x-environment';
+                add_header 'Access-Control-Max-Age' 1728000;
+                add_header 'Content-Type' 'text/plain; charset=utf-8';
+                add_header 'Content-Length' 0;
+                return 204;
+            }
+
+            add_header 'Access-Control-Allow-Origin' '*';
+            proxy_pass http://gateway;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        }
+    }
+}
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -9,8 +9,6 @@ services:
       - ./src/ui:/app/
     ports: 
       - 3000:3000 
-    networks:
-      - bridge
   server:
     build:
       context: './src/server'
@@ -32,17 +30,29 @@ services:
   gateway:
     build:
       context: './src/gateway'
-      dockerfile: 'Dockerfile'
+      dockerfile: 'Dockerfile.debug'
     container_name: gateway
     ports: 
-      - 8080:3000
+      - 8080:8080
+      - 4000:4000
     depends_on:
       - server
     restart: on-failure
     volumes:
       - ./src/gateway:/usr/src/app/
     networks:
       - bridge
+  nginx:
+    image: nginx
+    container_name: nginx
+    ports:
+      - 9080:80
+    volumes:
+      - ./config/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
+    networks:
+      - bridge
+    depends_on:
+      - gateway
   mysql:
     image: mysql
     command: --default-authentication-plugin=mysql_native_password
diff --git a/src/gateway/.vscode/launch.json b/src/gateway/.vscode/launch.json
@@ -11,6 +11,14 @@
             "mode": "auto",
             "program": "${workspaceFolder}/main.go",
             "args": [],
+        },
+        {
+            "name": "Docker Debug",
+            "type": "go",
+            "request": "attach",
+            "mode": "remote",
+            "port": 4000,
+            "host": "127.0.0.1"
         }
     ]
 }
diff --git a/src/gateway/Dockerfile.debug b/src/gateway/Dockerfile.debug
@@ -0,0 +1,16 @@
+FROM golang:1.18-alpine
+
+EXPOSE 3000 4000
+
+WORKDIR /app
+COPY go.mod go.sum ./
+RUN go mod download
+
+COPY . .
+
+RUN CGO_ENABLED=0 go install -ldflags "-s -w -extldflags '-static'" github.com/go-delve/delve/cmd/dlv@latest
+
+RUN CGO_ENABLED=0 go build -gcflags "all=-N -l" -o go-debugger .
+
+
+CMD [ "/go/bin/dlv", "--listen=:4000", "--headless=true", "--log=true", "--accept-multiclient", "--api-version=2", "exec", "/app/go-debugger" ]
diff --git a/src/gateway/application/usecase/get_orders_grpc.go b/src/gateway/application/usecase/get_orders_grpc.go
@@ -2,10 +2,12 @@ package usecase
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/jeferagudeloc/grpc-http-gateway/src/gateway/application/adapter/logger"
 	"github.com/jeferagudeloc/grpc-http-gateway/src/gateway/domain"
+	"github.com/jeferagudeloc/grpc-http-gateway/src/server/application/adapter/grpc/order"
 	"google.golang.org/grpc"
 )
 
@@ -34,5 +36,31 @@ func NewGetOrdersGrpcInteractor(
 }
 
 func (a GetOrdersGrpcInteractor) Execute(ctx context.Context) ([]domain.Order, error) {
-	return nil, nil
+
+	output := make([]domain.Order, 0)
+	orderClient := order.NewOrderHandlerClient(a.grpcClient)
+
+	a.logger.Infof("get orders calling grpc client")
+	response, err := orderClient.GetOrders(ctx, &order.GetOrdersRequest{})
+
+	for _, o := range response.Orders {
+		output = append(output, domain.Order{
+			ID:           o.Id,
+			OrderType:    o.OrderType,
+			Store:        o.Store,
+			Address:      o.Address,
+			CreationDate: o.CreationDate,
+			Status:       o.Status,
+		})
+	}
+
+	fmt.Printf("output server: %v\n", len(output))
+
+	if err != nil {
+		a.logger.Fatalln("Error when trying to say hello: %v", err)
+	}
+
+	a.logger.Infof("response from server: %v", response)
+
+	return output, nil
 }
diff --git a/src/gateway/go.mod b/src/gateway/go.mod
@@ -4,9 +4,10 @@ go 1.19
 
 require (
 	github.com/gorilla/mux v1.8.0
-	github.com/jeferagudeloc/grpc-http-gateway/src/server v0.0.0-20230521043111-a1f7c6b005ed
+	github.com/jeferagudeloc/grpc-http-gateway/src/server v0.0.0-20230525065623-8e19d6e95f77
 	github.com/joho/godotenv v1.5.1
 	github.com/pkg/errors v0.9.1
+	github.com/rs/cors v1.9.0
 	github.com/sirupsen/logrus v1.9.2
 	github.com/urfave/negroni v1.0.0
 	google.golang.org/grpc v1.55.0
diff --git a/src/gateway/go.sum b/src/gateway/go.sum
@@ -8,14 +8,16 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
-github.com/jeferagudeloc/grpc-http-gateway/src/server v0.0.0-20230521043111-a1f7c6b005ed h1:gZIWLnFzR0Ufn/91UR97RiSLkn3P+ShwV/cZyovxjx8=
-github.com/jeferagudeloc/grpc-http-gateway/src/server v0.0.0-20230521043111-a1f7c6b005ed/go.mod h1:XWMEqHYMaxoHe0MxTcVhZO79qTaXAMgTrM7evPYGr4k=
+github.com/jeferagudeloc/grpc-http-gateway/src/server v0.0.0-20230525065623-8e19d6e95f77 h1:nnEt9HbOULOmDTPL6+RG32/x/RNUdvbIj2BtQPboBXE=
+github.com/jeferagudeloc/grpc-http-gateway/src/server v0.0.0-20230525065623-8e19d6e95f77/go.mod h1:nYtuBCS9GhxyB8vHEEeSWOujbyO6ZIHQId5zsab2ZRU=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rs/cors v1.9.0 h1:l9HGsTsHJcvW14Nk7J9KFz8bzeAWXn3CG6bgt7LsrAE=
+github.com/rs/cors v1.9.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
 github.com/sirupsen/logrus v1.9.2 h1:oxx1eChJGI6Uks2ZC4W1zpLlVgqB8ner4EuQwV4Ik1Y=
 github.com/sirupsen/logrus v1.9.2/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
diff --git a/src/gateway/infrastructure/router/gorilla_mux.go b/src/gateway/infrastructure/router/gorilla_mux.go
@@ -10,14 +10,14 @@ import (
 	"time"
 
 	"github.com/gorilla/mux"
+	"github.com/rs/cors"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
 	"github.com/jeferagudeloc/grpc-http-gateway/src/gateway/application/adapter/api/action"
 	"github.com/jeferagudeloc/grpc-http-gateway/src/gateway/application/adapter/api/middleware"
-	"github.com/jeferagudeloc/grpc-http-gateway/src/gateway/application/usecase"
-
 	"github.com/jeferagudeloc/grpc-http-gateway/src/gateway/application/adapter/logger"
+	"github.com/jeferagudeloc/grpc-http-gateway/src/gateway/application/usecase"
 	"github.com/urfave/negroni"
 )
 
@@ -44,6 +44,16 @@ func (g gorillaMux) Listen() {
 	g.setAppHandlers(g.router)
 	g.middleware.UseHandler(g.router)
 
+	// Enable CORS middleware
+	c := cors.New(cors.Options{
+		AllowedOrigins: []string{"*"},
+		AllowedMethods: []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
+		AllowedHeaders: []string{"Content-Type", "Authorization"},
+	})
+
+	// Add the CORS middleware to Negroni
+	g.middleware.UseHandler(c.Handler(g.router))
+
 	server := &http.Server{
 		ReadTimeout:  5 * time.Second,
 		WriteTimeout: 15 * time.Second,
diff --git a/src/server/.env b/src/server/.env
@@ -1,4 +1,4 @@
-MYSQL_HOST=mysql
+MYSQL_HOST=localhost
 MYSQL_DATABASE=http_gateway_grpc
 MYSQL_PORT=3306
 MYSQL_USER=root
diff --git a/src/server/application/adapter/grpc/order/order.go b/src/server/application/adapter/grpc/order/order.go
@@ -2,7 +2,6 @@ package order
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/jeferagudeloc/grpc-http-gateway/src/server/application/usecase"
 )
@@ -40,17 +39,6 @@ func (s *Server) GetOrders(context context.Context, getOrdersRequest *GetOrdersR
 		},
 	}
 
-	// Accessing the orders and their properties
-	for _, order := range orders {
-		fmt.Println("Order ID:", order.Id)
-		fmt.Println("Order Type:", order.OrderType)
-		fmt.Println("Store:", order.Store)
-		fmt.Println("Address:", order.Address)
-		fmt.Println("Creation Date:", order.CreationDate)
-		fmt.Println("Status:", order.Status)
-		fmt.Println()
-	}
-
 	return &GetOrdersResponse{
 		Orders: orders,
 	}, nil
diff --git a/src/server/application/adapter/grpc/user/user.go b/src/server/application/adapter/grpc/user/user.go
@@ -2,13 +2,39 @@ package user
 
 import (
 	"context"
-	"log"
+
+	"github.com/google/uuid"
 )
 
 type Server struct {
 }
 
-func (s *Server) CreateUser(ctx context.Context, user *CreateUserRequest) (*User, error) {
-	log.Printf("Creating User: %v", user.Email)
-	return &User{ID: 1}, nil
+func (s *Server) GetUsers(context.Context, *GetUsersRequest) (*GetUsersResponse, error) {
+	users := []*User{
+		{
+			Id:       uuid.New().String(),
+			Name:     "John",
+			Lastname: "Doe",
+			Email:    "john.doe@example.com",
+			Status:   "Active",
+			Role: &Role{
+				Name:        "Admin",
+				Permissions: []string{"read", "write"},
+			},
+		},
+		{
+			Id:       uuid.New().String(),
+			Name:     "Jane",
+			Lastname: "Smith",
+			Email:    "jane.smith@example.com",
+			Status:   "Inactive",
+			Role: &Role{
+				Name:        "User",
+				Permissions: []string{"read"},
+			},
+		},
+	}
+	return &GetUsersResponse{
+		Users: users,
+	}, nil
 }
diff --git a/src/server/application/adapter/grpc/user/user.pb.go b/src/server/application/adapter/grpc/user/user.pb.go
diff --git a/src/server/application/adapter/grpc/user/user_grpc.pb.go b/src/server/application/adapter/grpc/user/user_grpc.pb.go
diff --git a/src/ui/src/__mocks__/ordersMock.ts b/src/ui/src/__mocks__/ordersMock.ts
diff --git a/src/ui/src/constants/api.ts b/src/ui/src/constants/api.ts
diff --git a/src/ui/src/store/states/orderState.ts b/src/ui/src/store/states/orderState.ts

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+FROM nginx:latest`
	`2`	`+COPY nginx.conf /etc/nginx/nginx.conf`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,14 @@`
`11`	`11`	`"mode": "auto",`
`12`	`12`	`"program": "${workspaceFolder}/main.go",`
`13`	`13`	`"args": [],`
	`14`	`+ },`
	`15`	`+ {`
	`16`	`+ "name": "Docker Debug",`
	`17`	`+ "type": "go",`
	`18`	`+ "request": "attach",`
	`19`	`+ "mode": "remote",`
	`20`	`+ "port": 4000,`
	`21`	`+ "host": "127.0.0.1"`
`14`	`22`	`}`
`15`	`23`	`]`
`16`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-MYSQL_HOST=mysql`
	`1`	`+MYSQL_HOST=localhost`
`2`	`2`	`MYSQL_DATABASE=http_gateway_grpc`
`3`	`3`	`MYSQL_PORT=3306`
`4`	`4`	`MYSQL_USER=root`