Skip to content

Commit f9c2275

Browse files
AchoArnoldAchoArnold
committed
Fix DB
1 parent 15ac42e commit f9c2275

1 file changed

Lines changed: 52 additions & 52 deletions

File tree

‎api/pkg/di/container.go‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -215,20 +215,20 @@ func (container *Container) YugaByteDB() (db *gorm.DB) {
215215
if container.yugaByteDB != nil {
216216
return container.yugaByteDB
217217
}
218-
219-
config := &gorm.Config{}
220-
if isLocal() {
221-
config = &gorm.Config{Logger: container.GormLogger()}
222-
}
223-
224-
db, err := gorm.Open(postgres.Open(os.Getenv("DATABASE_URL_YUGABYTE")), config)
225-
if err != nil {
226-
container.logger.Fatal(err)
227-
}
228-
229-
if err = db.Use(tracing.NewPlugin()); err != nil {
230-
container.logger.Fatal(stacktrace.Propagate(err, "cannot use GORM tracing plugin"))
231-
}
218+
//
219+
//config := &gorm.Config{}
220+
//if isLocal() {
221+
// config = &gorm.Config{Logger: container.GormLogger()}
222+
//}
223+
//
224+
//db, err := gorm.Open(postgres.Open(os.Getenv("DATABASE_URL_YUGABYTE")), config)
225+
//if err != nil {
226+
// container.logger.Fatal(err)
227+
//}
228+
//
229+
//if err = db.Use(tracing.NewPlugin()); err != nil {
230+
// container.logger.Fatal(stacktrace.Propagate(err, "cannot use GORM tracing plugin"))
231+
//}
232232
//
233233
//sql, err := db.DB()
234234
//if err != nil {
@@ -238,7 +238,7 @@ func (container *Container) YugaByteDB() (db *gorm.DB) {
238238
//sql.SetMaxOpenConns(7)
239239
//sql.SetMaxIdleConns(3)
240240
//sql.SetConnMaxLifetime(time.Minute * 10)
241-
241+
//
242242
//container.logger.Debug(fmt.Sprintf("Running migrations for yugabyte [%T]", db))
243243
//if err = db.AutoMigrate(&entities.Heartbeat{}); err != nil {
244244
// container.logger.Fatal(stacktrace.Propagate(err, fmt.Sprintf("cannot migrate %T", &entities.Heartbeat{})))
@@ -247,8 +247,8 @@ func (container *Container) YugaByteDB() (db *gorm.DB) {
247247
//if err = db.AutoMigrate(&entities.HeartbeatMonitor{}); err != nil {
248248
// container.logger.Fatal(stacktrace.Propagate(err, fmt.Sprintf("cannot migrate %T", &entities.HeartbeatMonitor{})))
249249
//}
250-
251-
container.yugaByteDB = db
250+
//
251+
//container.yugaByteDB = db
252252
return container.yugaByteDB
253253
}
254254

@@ -277,41 +277,41 @@ func (container *Container) DB() (db *gorm.DB) {
277277

278278
container.logger.Debug(fmt.Sprintf("Running migrations for %T", db))
279279

280-
//if err = db.AutoMigrate(&entities.Message{}); err != nil {
281-
// container.logger.Fatal(stacktrace.Propagate(err, fmt.Sprintf("cannot migrate %T", &entities.Message{})))
282-
//}
283-
//
284-
//if err = db.AutoMigrate(&entities.MessageThread{}); err != nil {
285-
// container.logger.Fatal(stacktrace.Propagate(err, fmt.Sprintf("cannot migrate %T", &entities.MessageThread{})))
286-
//}
287-
//
288-
//if err = db.AutoMigrate(&entities.User{}); err != nil {
289-
// container.logger.Fatal(stacktrace.Propagate(err, fmt.Sprintf("cannot migrate %T", &entities.User{})))
290-
//}
291-
//
292-
//if err = db.AutoMigrate(&entities.Phone{}); err != nil {
293-
// container.logger.Fatal(stacktrace.Propagate(err, fmt.Sprintf("cannot migrate %T", &entities.Phone{})))
294-
//}
295-
//
296-
//if err = db.AutoMigrate(&entities.PhoneNotification{}); err != nil {
297-
// container.logger.Fatal(stacktrace.Propagate(err, fmt.Sprintf("cannot migrate %T", &entities.PhoneNotification{})))
298-
//}
299-
//
300-
//if err = db.AutoMigrate(&entities.BillingUsage{}); err != nil {
301-
// container.logger.Fatal(stacktrace.Propagate(err, fmt.Sprintf("cannot migrate %T", &entities.BillingUsage{})))
302-
//}
303-
//
304-
//if err = db.AutoMigrate(&entities.Webhook{}); err != nil {
305-
// container.logger.Fatal(stacktrace.Propagate(err, fmt.Sprintf("cannot migrate %T", &entities.Webhook{})))
306-
//}
307-
//
308-
//if err = db.AutoMigrate(&entities.Discord{}); err != nil {
309-
// container.logger.Fatal(stacktrace.Propagate(err, fmt.Sprintf("cannot migrate %T", &entities.Discord{})))
310-
//}
311-
//
312-
//if err = db.AutoMigrate(&entities.Integration3CX{}); err != nil {
313-
// container.logger.Fatal(stacktrace.Propagate(err, fmt.Sprintf("cannot migrate %T", &entities.Integration3CX{})))
314-
//}
280+
if err = db.AutoMigrate(&entities.Message{}); err != nil {
281+
container.logger.Fatal(stacktrace.Propagate(err, fmt.Sprintf("cannot migrate %T", &entities.Message{})))
282+
}
283+
284+
if err = db.AutoMigrate(&entities.MessageThread{}); err != nil {
285+
container.logger.Fatal(stacktrace.Propagate(err, fmt.Sprintf("cannot migrate %T", &entities.MessageThread{})))
286+
}
287+
288+
if err = db.AutoMigrate(&entities.User{}); err != nil {
289+
container.logger.Fatal(stacktrace.Propagate(err, fmt.Sprintf("cannot migrate %T", &entities.User{})))
290+
}
291+
292+
if err = db.AutoMigrate(&entities.Phone{}); err != nil {
293+
container.logger.Fatal(stacktrace.Propagate(err, fmt.Sprintf("cannot migrate %T", &entities.Phone{})))
294+
}
295+
296+
if err = db.AutoMigrate(&entities.PhoneNotification{}); err != nil {
297+
container.logger.Fatal(stacktrace.Propagate(err, fmt.Sprintf("cannot migrate %T", &entities.PhoneNotification{})))
298+
}
299+
300+
if err = db.AutoMigrate(&entities.BillingUsage{}); err != nil {
301+
container.logger.Fatal(stacktrace.Propagate(err, fmt.Sprintf("cannot migrate %T", &entities.BillingUsage{})))
302+
}
303+
304+
if err = db.AutoMigrate(&entities.Webhook{}); err != nil {
305+
container.logger.Fatal(stacktrace.Propagate(err, fmt.Sprintf("cannot migrate %T", &entities.Webhook{})))
306+
}
307+
308+
if err = db.AutoMigrate(&entities.Discord{}); err != nil {
309+
container.logger.Fatal(stacktrace.Propagate(err, fmt.Sprintf("cannot migrate %T", &entities.Discord{})))
310+
}
311+
312+
if err = db.AutoMigrate(&entities.Integration3CX{}); err != nil {
313+
container.logger.Fatal(stacktrace.Propagate(err, fmt.Sprintf("cannot migrate %T", &entities.Integration3CX{})))
314+
}
315315

316316
return container.db
317317
}

0 commit comments

Comments
 (0)