ref

Olegsuus · Jun 19, 2024 · 697c513 · 697c513
1 parent 13fed01
commit 697c513
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.idea
diff --git a/internal/database/storage.go b/internal/database/storage.go
@@ -3,13 +3,12 @@ package database
 import (
  "database/sql"
  "fmt"
- "log"
- "news-api/internal/config"
- "news-api/internal/models"
-
  _ "github.com/lib/pq"
  "gopkg.in/reform.v1"
  "gopkg.in/reform.v1/dialects/postgresql"
+ "log"
+ "news-api/internal/config"
+ "news-api/internal/models"
 )
 
 type DB struct {

diff --git a/internal/migrations/migrations.go b/internal/migrations/migrations.go
@@ -5,12 +5,13 @@ import (
  "embed"
  "github.com/pressly/goose/v3"
  "log"
+ "news-api/internal/config"
 )
 
 //go:embed *.sql
 var embedMigrations embed.FS
 
-func MigrateUp(db *sql.DB) {
+func Migrations(cfg *config.Config, db *sql.DB) {
  goose.SetBaseFS(embedMigrations)
 
  if err := goose.SetDialect("postgres"); err != nil {

diff --git a/internal/models/models.go b/internal/models/models.go
@@ -17,10 +17,6 @@ func (*News) String() string {
 }
 
 // Implementing reform.Record interface
-func (n *News) String() string {
- return "News"
-}
-
 func (n *News) Values() []interface{} {
  return []interface{}{n.ID, n.Title, n.Content}
 }
@@ -45,10 +41,6 @@ func (*NewsCategory) String() string {
 }
 
 // Implementing reform.Record interface
-func (nc *NewsCategory) String() string {
- return "NewsCategory"
-}
-
 func (nc *NewsCategory) Values() []interface{} {
  return []interface{}{nc.NewsID, nc.CategoryID}
 }