Merge branch 'dev' into feature/accounting

Author: CZnavody19

.github/workflows/unit_testing.yaml

@@ -1,23 +1,49 @@
-name: 'Unit Tests'
+name: Unit-Tests-No-Dagger
 
 on: pull_request
 
 jobs:
+
+
   Testing:
     runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres:13.7-alpine
+        ports:
+          - "5432:5432"
+        env:
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: delta-eats
+          POSTGRES_USER: postgres
+
+
     steps:
       - uses: actions/checkout@v2
-      
-      - name: Install Go
+
+      - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: '>=1.20'
-        
-      - name: Install Dagger CLI
+          go-version: 1.21.5
+
+      - name: Install go deps
+        run: |
+          go install github.com/bufbuild/buf/cmd/buf@latest
+          go install github.com/pressly/goose/v3/cmd/goose@latest
+          go mod tidy
+          go get github.com/99designs/gqlgen
+          go get github.com/go-jet/jet/v2/cmd/jet@v2.10.1
+
+      - name: apply migrations
+        env:
+          DATABASE_URL: postgres://postgres:postgres@localhost:5432/delta-eats?sslmode=disable
+        run: |
+          cd migrations
+          goose postgres postgres://postgres:postgres@localhost:5432/delta-eats?sslmode=disable up
+
+      - name: generate modules and tables
         run: |
-          cd /usr/local
-          curl -L https://dl.dagger.io/dagger/install.sh | sh
+          go run github.com/go-jet/jet/v2/cmd/jet -dsn=postgres://postgres:postgres@localhost:5432/delta-eats?sslmode=disable -path=./internal/ports/database/gen
 
-      - name: Run unit tests
-        run: dagger run go run cmd/ci_cd/main.go test
-           
+      - name: testing
+        run: go test -v ./...

Tiltfile

@@ -72,4 +72,5 @@ docker_build_with_restart('delta-eats-migrations',
 )
 
 
-k8s_resource("delta-eats", port_forwards=["0.0.0.0:8080:8080"], resource_deps=['postgresql'], labels=["BE"])
+k8s_resource("delta-eats", port_forwards=["0.0.0.0:8080:8080"], resource_deps=['postgresql'], labels=["BE"])
+k8s_resource('delta-eats-cron', labels=["BE"], resource_deps=['postgresql'])

ci/delta-eats.yaml

@@ -26,3 +26,59 @@ spec:
           value: "false"
         - name: VALIDATOR_URL
           value: https://validate.menuroo.cz
+        - name: ENABLE_FILE_LOGGER
+          value: "true"
+        - name: ENABLE_DEBUG_LOGGER
+          value: "false"
+        - name: FILE_LOG_OUTPUT
+          value: "stdout"
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: delta-eats-cron
+  labels:
+    app: delta-eats-cron
+spec:
+  replicas: 1
+  strategy:
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 1
+    type: RollingUpdate
+  selector:
+    matchLabels:
+      app: delta-eats-cron
+  template:
+    metadata:
+      labels:
+        app: delta-eats-cron
+    spec:
+      containers:
+        - name: delta-eats-cron
+          image: delta-eats
+          env:
+            - name: MODE
+              value: cron
+            - name: DATABASE_URL
+              value: "postgres://postgres:postgres@postgresql-delta-eats:5432/delta-eats?sslmode=disable"
+            - name: FIO_ACTIVE
+              value: "true"
+            - name: ENABLE_FILE_LOGGER
+              value: "true"
+            - name: ENABLE_DEBUG_LOGGER
+              value: "false"
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: delta-eats
+  labels:
+    app: delta-eats
+spec:
+  ports:
+    - port: 8080
+      targetPort: 8080
+      protocol: TCP
+  selector:
+    app: delta-eats

cmd/main.go

@@ -5,15 +5,29 @@ package main
 //go:generate go run github.com/go-jet/jet/v2/cmd/jet -dsn=postgres://postgres:postgres@localhost:5434/delta-eats?sslmode=disable -path=../internal/ports/database/gen
 //go:generate go run github.com/99designs/gqlgen generate
 import (
-	"delta-eats/cmd/server"
-	"fmt"
+	"delta-eats/cmd/runner"
+	"log"
 	"os"
 )
 
 func main() {
-	err := server.Run()
-	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
+	services := os.Args[1:]
+	if len(services) == 0 {
+		services = []string{
+			os.Getenv("MODE"),
+		}
+	}
+	if services[0] == "cron" {
+		err := runner.SetupCron()
+		if err != nil {
+			log.Println("Error: ", err)
+			os.Exit(1)
+		}
+	} else {
+		err := runner.Serve()
+		if err != nil {
+			log.Println("Error: ", err)
+			os.Exit(1)
+		}
 	}
 }

cmd/runner/cron.go

@@ -0,0 +1,17 @@
+package runner
+
+import (
+	"delta-eats/internal/config"
+
+	"github.com/nextap-solutions/goNextService"
+)
+
+func SetupCron() error {
+	configuration := config.LoadConfig()
+	menurooApi, err := setupService(configuration)
+	if err != nil {
+		return err
+	}
+	app := goNextService.NewApplications(menurooApi.cron, menurooApi.cleanup)
+	return app.Run()
+}

cmd/runner/runner.go

@@ -0,0 +1,98 @@
+package runner
+
+import (
+	"context"
+	"delta-eats/graph/generated"
+	"delta-eats/internal/config"
+	"delta-eats/internal/middleware"
+	"delta-eats/internal/setup"
+	"encoding/json"
+	"log"
+	"net/http"
+	"time"
+
+	"github.com/99designs/gqlgen/graphql/handler"
+	"github.com/99designs/gqlgen/graphql/playground"
+	"github.com/go-co-op/gocron"
+	"github.com/gorilla/mux"
+	"github.com/nextap-solutions/goNextService"
+	"github.com/nextap-solutions/goNextService/components"
+	"github.com/rs/cors"
+	"go.uber.org/zap"
+)
+
+type MenurooServerComponents struct {
+	httpServer goNextService.Component
+	cron       goNextService.Component
+	cleanup    goNextService.Component
+}
+
+func Serve() error {
+	configuration := config.LoadConfig()
+	menurooApi, err := setupService(configuration)
+	if err != nil {
+		return err
+	}
+	app := goNextService.NewApplications(menurooApi.httpServer)
+	return app.Run()
+}
+
+func setupService(configuration *config.Config) (*MenurooServerComponents, error) {
+	logger := setup.InitLogger(*configuration)
+	s, _ := json.MarshalIndent(configuration, "", "\t")
+	zap.L().Info("Logger initialized successfully")
+	logger.Info(string(s))
+	dbConn, err := setup.SetupDb(configuration)
+	if err != nil {
+		log.Println("Error while connecting to database")
+		return nil, err
+	}
+
+	resolver, err := setup.NewResolver(dbConn, *configuration)
+	if err != nil {
+		return nil, err
+	}
+	srv := handler.NewDefaultServer(generated.NewExecutableSchema(generated.Config{
+		Resolvers: resolver,
+	}))
+
+	router := mux.NewRouter()
+	router.Use(middleware.Authentication(resolver.AuthUsecase))
+	router.Handle("/", playground.Handler("GraphQL playground", "/query"))
+	router.Handle("/query", srv)
+	corsMiddleware := cors.New(cors.Options{
+		AllowedOrigins:   []string{"*"},
+		AllowedHeaders:   []string{"*"},
+		AllowCredentials: true,
+	})
+
+	handler := corsMiddleware.Handler(router)
+	api := http.Server{
+		Addr:         "0.0.0.0:" + configuration.Server.Port,
+		ReadTimeout:  configuration.Server.ReadTimeout,
+		WriteTimeout: configuration.Server.WriteTimeout,
+		Handler:      handler,
+	}
+	httpComponent := components.NewHttpComponent(handler, components.WithHttpServer(&api))
+
+	scheduler := gocron.NewScheduler(time.UTC)
+	_, err = scheduler.Cron(configuration.FioConfig.RefreshJob).
+		Tag("BankRefresh").
+		SingletonMode().
+		Do(resolver.MailUsecase.ParseAndStorePayments)
+	if err != nil {
+		return nil, err
+	}
+
+	return &MenurooServerComponents{
+		httpServer: httpComponent,
+		cron:       components.NewCronComponent(scheduler),
+		cleanup: components.NewLifecycleComponent(nil, func(ctx context.Context) error {
+			select {}
+		}, []components.LifeCycleFunc{
+			func(ctx context.Context) error {
+				return nil
+			},
+		}),
+	}, nil
+}