-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
9 changed files
with
76 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,59 @@ | ||
| package database | ||
|
|
||
| import ( | ||
| "database/sql" | ||
| "fmt" | ||
| "log" | ||
| "news-api/internal/config" | ||
| "news-api/internal/models" | ||
|
|
||
| "github.com/jmoiron/sqlx" | ||
| _ "github.com/lib/pq" | ||
| "gopkg.in/reform.v1" | ||
| "gopkg.in/reform.v1/dialects/postgresql" | ||
| ) | ||
|
|
||
| type DataBase struct { | ||
| DB *sqlx.DB | ||
| type DB struct { | ||
| DB *reform.DB | ||
| } | ||
|
|
||
| func (db *DataBase) GetStorage(cfg *config.Config) { | ||
| func NewDB(cfg *config.Config) *DB { | ||
| dsn := fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=disable", | ||
| cfg.Database.Host, cfg.Database.Port, cfg.Database.User, cfg.Database.Password, cfg.Database.DBName) | ||
|
|
||
| sqlDB, err := sqlx.Open("postgres", dsn) | ||
| sqlDB, err := sql.Open("postgres", dsn) | ||
| if err != nil { | ||
| log.Fatalf("Failed to open database: %v", err) | ||
| } | ||
|
|
||
| db.DB = sqlDB | ||
| db := reform.NewDB(sqlDB, postgresql.Dialect, nil) | ||
| return &DB{DB: db} | ||
| } | ||
|
|
||
| func (db *DataBase) Stop() error { | ||
| return db.DB.Close() | ||
| func (db *DB) Close() error { | ||
| return db.DB.DBInterface().(*sql.DB).Close() | ||
| } | ||
|
|
||
| func (db *DataBase) GetAllNews() ([]models.News, error) { | ||
| func (db *DB) GetAllNews(limit, offset int) ([]models.News, error) { | ||
| var newsList []models.News | ||
| err := db.DB.Select(&newsList, "SELECT * FROM news") | ||
| err := db.DB.SelectAllFrom(models.NewsTable, "LIMIT ? OFFSET ?", limit, offset, &newsList) | ||
| return newsList, err | ||
| } | ||
|
|
||
| func (db *DataBase) GetNewsByID(id int64) (*models.News, error) { | ||
| var news models.News | ||
| err := db.DB.Get(&news, "SELECT * FROM news WHERE id=$1", id) | ||
| return &news, err | ||
| func (db *DB) GetNewsByID(id int64) (*models.News, error) { | ||
| news := &models.News{} | ||
| err := db.DB.FindByPrimaryKeyTo(news, id) | ||
| return news, err | ||
| } | ||
|
|
||
| func (db *DataBase) CreateNews(news *models.News) error { | ||
| _, err := db.DB.NamedExec("INSERT INTO news (title, content) VALUES (:title, :content)", news) | ||
| return err | ||
| func (db *DB) CreateNews(news *models.News) error { | ||
| return db.DB.Save(news) | ||
| } | ||
|
|
||
| func (db *DataBase) UpdateNews(news *models.News) error { | ||
| _, err := db.DB.NamedExec("UPDATE news SET title=:title, content=:content WHERE id=:id", news) | ||
| return err | ||
| func (db *DB) UpdateNews(news *models.News) error { | ||
| return db.DB.Update(news) | ||
| } | ||
|
|
||
| func (db *DataBase) DeleteNews(id int64) error { | ||
| _, err := db.DB.Exec("DELETE FROM news WHERE id=$1", id) | ||
| return err | ||
| func (db *DB) DeleteNews(id int64) error { | ||
| news := &models.News{ID: id} | ||
| return db.DB.Delete(news) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,22 @@ | ||
| package models | ||
|
|
||
| // News представляет структуру новости. | ||
| import ( | ||
| "time" | ||
| ) | ||
|
|
||
| type News struct { | ||
| ID int64 `db:"id" json:"id"` | ||
| Title string `db:"title" json:"title"` | ||
| Content string `db:"content" json:"content"` | ||
| ID int64 `reform:"id,pk" json:"id"` | ||
| Title string `reform:"title" json:"title"` | ||
| Content string `reform:"content" json:"content"` | ||
| CreatedAt time.Time `reform:"created_at" json:"created_at"` | ||
| UpdatedAt time.Time `reform:"updated_at" json:"updated_at"` | ||
| } | ||
|
|
||
| // NewsTable is the reform table identifier for News. | ||
| const NewsTable = "news" | ||
|
|
||
| // NewsCategory represents the relationship between news and categories. | ||
| type NewsCategory struct { | ||
| NewsID int64 `reform:"news_id,pk" json:"news_id"` | ||
| CategoryID int64 `reform:"category_id,pk" json:"category_id"` | ||
| } |