dev3 resolve conflict

cmd/realtime/main.go

@@ -4,17 +4,17 @@ import (
 	"fmt"
 	"net"
 
+	"github.com/joho/godotenv"
 	"google.golang.org/grpc"
 
 	rt "github.com/go-park-mail-ru/2023_2_OND_team/internal/api/realtime"
 	"github.com/go-park-mail-ru/2023_2_OND_team/internal/microservices/realtime"
 	grpcMetrics "github.com/go-park-mail-ru/2023_2_OND_team/internal/pkg/metrics/grpc"
 	"github.com/go-park-mail-ru/2023_2_OND_team/internal/pkg/middleware/grpc/interceptor"
 	"github.com/go-park-mail-ru/2023_2_OND_team/pkg/logger"
-	"github.com/joho/godotenv"
 )
 
-const _address = "0.0.0.0:8090"
+const _address = "localhost:8090"
 
 func main() {
 	godotenv.Load()

configs/config.yml

@@ -1,6 +1,6 @@
 app:
   server:
-    host: 0.0.0.0
+    host: 127.0.0.1
     port: 8080
     https: true
     certFile: /home/ond_team/cert/fullchain.pem

deployments/docker-compose.yml

@@ -178,7 +178,7 @@ services:
       - /:/rootfs:ro
     ports:
      - "9100:9100"
-    
+
 volumes:
   postgres_storage: {}
   redis_storage: {}

go.mod

@@ -3,7 +3,6 @@ module github.com/go-park-mail-ru/2023_2_OND_team
 go 1.19
 
 require (
-	cloud.google.com/go/vision v1.2.0
 	cloud.google.com/go/vision/v2 v2.7.5
 	github.com/IBM/sarama v1.42.1
 	github.com/Masterminds/squirrel v1.5.4
@@ -29,6 +28,7 @@ require (
 	go.uber.org/zap v1.26.0
 	golang.org/x/crypto v0.14.0
 	golang.org/x/image v0.13.0
+	google.golang.org/api v0.149.0
 	google.golang.org/grpc v1.60.0
 	google.golang.org/protobuf v1.31.0
 	nhooyr.io/websocket v1.8.10
@@ -100,7 +100,6 @@ require (
 	golang.org/x/sys v0.13.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/tools v0.14.0 // indirect
-	google.golang.org/api v0.149.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20231211222908-989df2bf70f3 // indirect

internal/app/app.go

@@ -70,15 +70,13 @@ func Run(ctx context.Context, log *log.Logger, cfg ConfigFiles) {
 	}
 	defer pool.Close()
 
-	// connMessMS, err := grpc.Dial("localhost:8095", grpc.WithTransportCredentials(insecure.NewCredentials()))
 	connMessMS, err := grpc.Dial(os.Getenv("MESSENGER_SERVICE_HOST")+":"+os.Getenv("MESSENGER_SERVICE_PORT"), grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		log.Error(err.Error())
 		return
 	}
 	defer connMessMS.Close()
 
-	// connRealtime, err := grpc.Dial("localhost:8090", grpc.WithTransportCredentials(insecure.NewCredentials()))
 	connRealtime, err := grpc.Dial(os.Getenv("REALTIME_SERVICE_HOST")+":"+os.Getenv("REALTIME_SERVICE_PORT"), grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		log.Error(err.Error())

internal/app/auth/auth.go

@@ -55,15 +55,10 @@ func Run(ctx context.Context, log *logger.Logger, cfg Config) {
 	ctxRedis, cancelCtxRedis := context.WithTimeout(ctx, _timeoutForConnRedis)
 	defer cancelCtxRedis()
 
-	// redisCfg, err := app.NewConfig(cfg.RedisFileConfig)
 	redisCfg := app.RedisConfig{
 		Addr:     os.Getenv("REDIS_HOST") + ":" + os.Getenv("REDIS_PORT"),
 		Password: os.Getenv("REDIS_PASSWORD"),
 	}
-	// if err != nil {
-	// 	log.Error(err.Error())
-	// 	return
-	// }
 
 	redisCl, err := app.NewRedisClient(ctxRedis, redisCfg)
 	if err != nil {

internal/pkg/delivery/http/v1/search_errors.go

@@ -0,0 +1,23 @@
+package v1
+
+import errPkg "github.com/go-park-mail-ru/2023_2_OND_team/internal/pkg/errors"
+
+type ErrNoData struct{}
+
+func (e *ErrNoData) Error() string {
+	return "Can't find any user/board/pin"
+}
+
+func (e *ErrNoData) Type() errPkg.Type {
+	return errPkg.ErrNotFound
+}
+
+type ErrInvalidTemplate struct{}
+
+func (e *ErrInvalidTemplate) Error() string {
+	return "Invalid template has been provided"
+}
+
+func (e *ErrInvalidTemplate) Type() errPkg.Type {
+	return errPkg.ErrInvalidInput
+}