Merge branch 'feature/mv_db' into develop

api-v1/api.go

@@ -35,7 +35,7 @@ func main() {
 			panic("Cannot load environment")
 		}
 
-		db.SetDB(cfg.Database)
+		db.SetEntDB(cfg.Database)
 		db.SetBunDB(cfg.Database)
 		auth.SetSecretJWT(cfg.Secret)
 

api-v1/utils/db/bun.go

@@ -0,0 +1,17 @@
+package db
+
+import (
+	"database/sql"
+
+	_ "github.com/jackc/pgx/v5/stdlib"
+	"github.com/uptrace/bun"
+	"github.com/uptrace/bun/dialect/pgdialect"
+	"github.com/uptrace/bun/driver/pgdriver"
+)
+
+var BunDB *bun.DB
+
+func SetBunDB(urlDB string) {
+	sqlDB := sql.OpenDB(pgdriver.NewConnector(pgdriver.WithDSN(urlDB)))
+	BunDB = bun.NewDB(sqlDB, pgdialect.New())
+}

api-v1/utils/db/db.go → api-v1/utils/db/ent.go

@@ -7,17 +7,13 @@ import (
 	entSQL "entgo.io/ent/dialect/sql"
 
 	_ "github.com/jackc/pgx/v5/stdlib"
-	"github.com/uptrace/bun"
-	"github.com/uptrace/bun/dialect/pgdialect"
-	"github.com/uptrace/bun/driver/pgdriver"
 
 	"api-go/ent"
 )
 
 var EntDB *ent.Client
-var BunDB *bun.DB
 
-func SetDB(urlDB string) {
+func SetEntDB(urlDB string) {
 	connDB, err := sql.Open("pgx", urlDB)
 	if err != nil {
 		panic("Failed to open database connection")
@@ -31,8 +27,3 @@ func SetDB(urlDB string) {
 	sqlDB := entSQL.OpenDB(dialect.Postgres, connDB)
 	EntDB = ent.NewClient(ent.Driver(sqlDB))
 }
-
-func SetBunDB(urlDB string) {
-	sqlDB := sql.OpenDB(pgdriver.NewConnector(pgdriver.WithDSN(urlDB)))
-	BunDB = bun.NewDB(sqlDB, pgdialect.New())
-}