Project structure working, updating proto errors definitions

cmd/server/app.go

@@ -8,7 +8,8 @@ import (
 	"syscall"
 
 	"github.com/Falokut/cinema_service/internal/config"
-	"github.com/Falokut/cinema_service/internal/repository"
+	"github.com/Falokut/cinema_service/internal/repository/postgresrepository"
+	"github.com/Falokut/cinema_service/internal/repository/rediscache"
 	"github.com/Falokut/cinema_service/internal/service"
 	cinema_service "github.com/Falokut/cinema_service/pkg/cinema_service/v1/protos"
 	jaegerTracer "github.com/Falokut/cinema_service/pkg/jaeger"
@@ -59,14 +60,14 @@ func main() {
 		}
 	}()
 
-	cinemaDB, err := repository.NewPostgreDB(cfg.DBConfig)
+	cinemaDB, err := postgresrepository.NewPostgreDB(cfg.DBConfig)
 	if err != nil {
 		logger.Errorf("Shutting down, connection to the database not established %v", err)
 		return
 	}
 	defer cinemaDB.Close()
 
-	citiesCinemas, err := repository.NewRedisCache(&redis.Options{
+	citiesCinemas, err := rediscache.NewRedisCache(&redis.Options{
 		Network:  cfg.CitiesCinemasCache.Network,
 		Addr:     cfg.CitiesCinemasCache.Addr,
 		DB:       cfg.CitiesCinemasCache.DB,
@@ -78,7 +79,7 @@ func main() {
 	}
 	defer citiesCinemas.Close()
 
-	cinemasRdb, err := repository.NewRedisCache(&redis.Options{
+	cinemasRdb, err := rediscache.NewRedisCache(&redis.Options{
 		Network:  cfg.CinemasCache.Network,
 		Addr:     cfg.CinemasCache.Addr,
 		DB:       cfg.CinemasCache.DB,
@@ -90,7 +91,7 @@ func main() {
 	}
 	defer cinemasRdb.Close()
 
-	citiesRdb, err := repository.NewRedisCache(&redis.Options{
+	citiesRdb, err := rediscache.NewRedisCache(&redis.Options{
 		Network:  cfg.CitiesCache.Network,
 		Addr:     cfg.CitiesCache.Addr,
 		DB:       cfg.CitiesCache.DB,
@@ -102,7 +103,7 @@ func main() {
 	}
 	defer citiesRdb.Close()
 
-	hallsRdb, err := repository.NewRedisCache(&redis.Options{
+	hallsRdb, err := rediscache.NewRedisCache(&redis.Options{
 		Network:  cfg.HallsCache.Network,
 		Addr:     cfg.HallsCache.Addr,
 		DB:       cfg.HallsCache.DB,
@@ -114,7 +115,7 @@ func main() {
 	}
 	defer hallsRdb.Close()
 
-	hallsConfigurationsRdb, err := repository.NewRedisCache(&redis.Options{
+	hallsConfigurationsRdb, err := rediscache.NewRedisCache(&redis.Options{
 		Network:  cfg.HallsConfigurationCache.Network,
 		Addr:     cfg.HallsConfigurationCache.Addr,
 		DB:       cfg.HallsConfigurationCache.DB,
@@ -126,7 +127,7 @@ func main() {
 	}
 	defer hallsConfigurationsRdb.Close()
 
-	cinemaCache := repository.NewCinemaCache(logger.Logger, citiesCinemas, cinemasRdb, citiesRdb,
+	cinemaCache := rediscache.NewCinemaCache(logger.Logger, citiesCinemas, cinemasRdb, citiesRdb,
 		hallsConfigurationsRdb, hallsRdb)
 	go func() {
 		logger.Info("Healthcheck initializing")
@@ -139,7 +140,7 @@ func main() {
 		}
 	}()
 
-	cinemaRepo := repository.NewCinemaRepository(logger.Logger, cinemaDB)
+	cinemaRepo := postgresrepository.NewCinemaRepository(logger.Logger, cinemaDB)
 	repository := service.NewCinemaRepositoryWrapper(logger.Logger, cinemaRepo, cinemaCache,
 		service.CacheConfig{
 			HallConfigurationTTL: cfg.HallsCache.TTL,

go.mod

@@ -11,19 +11,17 @@ require (
 	github.com/ilyakaznacheev/cleanenv v1.5.0
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/opentracing/opentracing-go v1.2.0
-	github.com/prometheus/client_golang v1.17.0
+	github.com/prometheus/client_golang v1.18.0
 	github.com/sirupsen/logrus v1.9.3
 	github.com/uber/jaeger-client-go v2.30.0+incompatible
-	google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe
-	google.golang.org/grpc v1.61.0
+	google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9
+	google.golang.org/grpc v1.61.1
 	google.golang.org/protobuf v1.32.0
 )
 
-require github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
-
 require (
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/redis/go-redis/v9 v9.4.0
+	github.com/redis/go-redis/v9 v9.5.0
 )
 
 require (
@@ -39,24 +37,25 @@ require (
 	github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
-	github.com/jackc/pgx/v5 v5.5.2
+	github.com/jackc/pgx/v5 v5.5.3
 	github.com/jackc/puddle/v2 v2.2.1 // indirect
 	github.com/joho/godotenv v1.5.1 // indirect
+	github.com/mennanov/fmutils v0.2.1
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_model v0.5.0 // indirect
-	github.com/prometheus/common v0.44.0 // indirect
+	github.com/prometheus/client_model v0.6.0 // indirect
+	github.com/prometheus/common v0.47.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/soheilhy/cmux v0.1.5 // indirect
 	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
 	go.uber.org/atomic v1.11.0 // indirect
-	golang.org/x/crypto v0.18.0 // indirect
-	golang.org/x/exp v0.0.0-20240119083558-1b970713d09a
-	golang.org/x/net v0.20.0 // indirect
+	golang.org/x/crypto v0.19.0 // indirect
+	golang.org/x/exp v0.0.0-20240213143201-ec583247a57a
+	golang.org/x/net v0.21.0 // indirect
 	golang.org/x/sync v0.6.0 // indirect
-	golang.org/x/sys v0.16.0 // indirect
+	golang.org/x/sys v0.17.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect
+	google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	olympos.io/encoding/edn v0.0.0-20201019073823-d3554ca0b0a3 // indirect
 )