merge with remote changes

Makefile

@@ -1,14 +1,53 @@
-.PHONY:
+# ==================================================================================== #
+# HELPERS
+# ==================================================================================== #
 
+.PHONY: help
+help:
+	@echo 'Usage:'
+	@sed -n 's/^##//p' ${MAKEFILE_LIST} | column -t -s ':' |  sed -e 's/^/ /'
+
+.PHONY: confirm
+confirm:
+	@echo -n 'Are you sure? [y/N] ' && read ans && [ $${ans:-N} = y ]
+
+.PHONY: no-dirty
+no-dirty:
+	git diff --exit-code
+
+# ==================================================================================== #
+# QUALITY CONTROL
+# ==================================================================================== #
+
+## tidy: format code and tidy modfile
+.PHONY: tidy
+tidy:
+	go fmt ./...
+	go mod tidy -v
+
+## audit: run quality control checks
+.PHONY: audit
+audit:
+	go mod verify
+	go vet ./...
+	go run honnef.co/go/tools/cmd/staticcheck@latest -checks=all,-ST1000,-U1000 ./...
+	go run golang.org/x/vuln/cmd/govulncheck@latest ./...
+	go test -race -buildvcs -vet=off ./...
+
+# ==================================================================================== #
+# DEVELOPMENT
+# ==================================================================================== #
+
+## build: build containers and services
 build:
 	docker compose up --build -d
 up:
-	docker compose up -d --force-recreate && docker compose logs -f gateway auth_service user_service consumer_service crypton_service
+	docker compose up -d --force-recreate && docker compose logs -f gateway auth_service user_service consumer_service
 compose-down:
 	docker compose down --remove-orphans
 
 logs_follow:
-	docker compose logs -f gateway auth_service user_service consumer_service crypton_service
+	docker compose logs -f gateway auth_service user_service consumer_service
 
 .PHONY: tester
 tester:
@@ -34,6 +73,22 @@ static_analysis:
 	go vet ./...
 	staticcheck ./...
 
+check_static:
+	#go install honnef.co/go/tools/cmd/staticcheck@latest
+	staticcheck ./...
+check_callvis:
+	#go install github.com/ofabry/go-callvis@latest
+	go-callvis github.com/RafalSalwa/interview-app-srv/cmd/gateway
+check_goreporter:
+	#go get -u github.com/360EntSecGroup-Skylar/goreporter
+
+check_revive:
+	#go install github.com/mgechev/revive@latest
+	revive -config revive.toml -formatter unix ./...
+
+check_review_dog:
+	#go install github.com/reviewdog/reviewdog/cmd/reviewdog@latest
+
 .PHONY: proto
 proto:
 	@ if ! which protoc > /dev/null; then \

build/.golangci.yaml

@@ -78,7 +78,7 @@ linters-settings:
       - func
     disable-dec-order-check: false
     disable-init-func-first-check: false
-    disable-dec-num-check: true
+    disable-dec-num-check: false
 
   errcheck:
     check-type-assertions: false

cmd/auth_service/config/config.go

@@ -2,6 +2,7 @@ package config
 
 import (
 	"errors"
+
 	"github.com/RafalSalwa/interview-app-srv/pkg/email"
 	"github.com/RafalSalwa/interview-app-srv/pkg/env"
 	"github.com/RafalSalwa/interview-app-srv/pkg/grpc"

cmd/auth_service/internal/repository/redis.go

@@ -3,10 +3,16 @@ package repository
 import (
 	"context"
 
+	"github.com/RafalSalwa/interview-app-srv/pkg/logger"
 	"github.com/RafalSalwa/interview-app-srv/pkg/models"
 	"github.com/go-redis/redis/v8"
 )
 
+type RedisRepository struct {
+	log         *logger.Logger
+	redisClient redis.UniversalClient
+}
+
 type RedisAdapter struct {
 	DB *redis.UniversalClient
 }

cmd/auth_service/internal/rpc/auth.go

@@ -3,6 +3,7 @@ package rpc
 import (
 	"context"
 	"errors"
+
 	"github.com/RafalSalwa/interview-app-srv/pkg/encdec"
 	"github.com/RafalSalwa/interview-app-srv/pkg/models"
 	"github.com/RafalSalwa/interview-app-srv/pkg/tracing"
@@ -95,7 +96,7 @@ func (a *Auth) SignUpUser(ctx context.Context, req *pb.SignUpUserInput) (*pb.Sig
 func (a *Auth) GetVerificationKey(
 	ctx context.Context,
 	in *pb.VerificationCodeRequest) (*pb.VerificationCodeResponse, error) {
-	ur, err := a.authService.GetVerificationKey(ctx, in.Email)
+	ur, err := a.authService.GetVerificationKey(ctx, in.GetEmail())
 	if err != nil {
 		a.logger.Error().Err(err).Msg("rpc:service:getkey")
 		if err.Error() == "record not found" {

cmd/auth_service/internal/services/auth_service.go

@@ -2,7 +2,6 @@ package services
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/RafalSalwa/interview-app-srv/pkg/encdec"
 	"github.com/RafalSalwa/interview-app-srv/pkg/tracing"
@@ -97,7 +96,6 @@ func (a *AuthServiceImpl) SignInUser(ctx context.Context, reqUser *models.SignIn
 		Verified: true,
 		Active:   true,
 	}
-	fmt.Printf("SignInUser: %+v\n %s\n", udb, reqUser.Email)
 	udb, err := a.repository.FindOne(ctx, udb)
 	if err != nil {
 		tracing.RecordError(span, err)

cmd/auth_service/internal/services/user_sql_service.go

@@ -128,19 +128,6 @@ func (s *SQLServiceImpl) LoginUser(u *models.SignInUserRequest) (*models.UserRes
 		return nil, err
 	}
 
-	// roles, err := phpserialize.Decode(user.RolesJson)
-
-	if err != nil {
-		return nil, err
-	}
-
-	// v, ok := roles.(map[interface{}]interface{})
-	// if ok {
-	//	for _, s := range v {
-	//		user.Roles = append(user.Roles, fmt.Sprintf("%v", s))
-	//	}
-	//}
-
 	return &user, nil
 }
 

cmd/consumer_service/internal/handlers/customer_account_confirmation_requested.go

@@ -3,10 +3,11 @@ package handlers
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/RafalSalwa/interview-app-srv/pkg/encdec"
 	"log"
 	"net/mail"
 
+	"github.com/RafalSalwa/interview-app-srv/pkg/encdec"
+
 	"github.com/RafalSalwa/interview-app-srv/cmd/consumer_service/config"
 	"github.com/RafalSalwa/interview-app-srv/pkg/email"
 	"github.com/RafalSalwa/interview-app-srv/pkg/models"

cmd/gateway/internal/cqrs/command/sign_up.go

@@ -1,37 +1,38 @@
 package command
 
 import (
-    "context"
-    "go.opentelemetry.io/otel"
+	"context"
 
-    "github.com/RafalSalwa/interview-app-srv/pkg/models"
-    intrvproto "github.com/RafalSalwa/interview-app-srv/proto/grpc"
+	"go.opentelemetry.io/otel"
+
+	"github.com/RafalSalwa/interview-app-srv/pkg/models"
+	intrvproto "github.com/RafalSalwa/interview-app-srv/proto/grpc"
 )
 
 type SignUpUser struct {
-    User models.SignUpUserRequest
+	User models.SignUpUserRequest
 }
 
 type SignUpHandler struct {
-    authClient intrvproto.AuthServiceClient
+	authClient intrvproto.AuthServiceClient
 }
 
 func NewSignUpHandler(authClient intrvproto.AuthServiceClient) SignUpHandler {
-    return SignUpHandler{authClient: authClient}
+	return SignUpHandler{authClient: authClient}
 }
 
 func (h SignUpHandler) Handle(ctx context.Context, req models.SignUpUserRequest) error {
-    ctx, span := otel.GetTracerProvider().Tracer("CQRS").Start(ctx, "Command/SignUpUser")
-    defer span.End()
-    
-    _, err := h.authClient.SignUpUser(ctx, &intrvproto.SignUpUserInput{
-        Email:           req.Email,
-        Password:        req.Password,
-        PasswordConfirm: req.PasswordConfirm,
-    })
-
-    if err != nil {
-        return err
-    }
-    return nil
+	ctx, span := otel.GetTracerProvider().Tracer("CQRS").Start(ctx, "Command/SignUpUser")
+	defer span.End()
+
+	_, err := h.authClient.SignUpUser(ctx, &intrvproto.SignUpUserInput{
+		Email:           req.Email,
+		Password:        req.Password,
+		PasswordConfirm: req.PasswordConfirm,
+	})
+
+	if err != nil {
+		return err
+	}
+	return nil
 }