result commit

config.yaml

@@ -9,4 +9,5 @@ Database:
  user: "olegsemashko"
  password: "0000"
  dbname: "NewsDB"
+ migrationPath: "migrations"
 

internal/app/handlers.go

@@ -59,11 +59,35 @@ func (a *App) HandleUpdateNews(c *fiber.Ctx) error {
  if err := c.BodyParser(&news); err != nil {
  return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "invalid input"})
  }
- news.ID = id
- if err := a.DB.UpdateNews(&news); err != nil {
+ if news.ID != id {
+ return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "invalid id"})
+ }
+
+ oldNews, err := a.DB.GetNewsByID(id)
+ if err != nil {
+ return c.Status(fiber.StatusNotFound).JSON(fiber.Map{"error": "news not found"})
+ }
+
+ updatedNews := mergeNews(*oldNews, news)
+
+ if err := a.DB.UpdateNews(&updatedNews); err != nil {
  return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{"error": "failed to update news"})
  }
- return c.Status(fiber.StatusOK).JSON(news)
+ return c.Status(fiber.StatusOK).JSON(updatedNews)
+}
+
+func mergeNews(oldNews models.News, newNews models.News) models.News {
+ if newNews.Title != "" {
+ oldNews.Title = newNews.Title
+ }
+ if newNews.Content != "" {
+ oldNews.Content = newNews.Content
+ }
+ if len(newNews.Categories) > 0 {
+ oldNews.Categories = newNews.Categories
+ }
+
+ return oldNews
 }
 
 func (a *App) HandleDeleteNews(c *fiber.Ctx) error {

internal/config/config.go

@@ -11,12 +11,13 @@ type Config struct {
  Port int
  }
  Database struct {
- Driver string
- Host string
- Port int
- User string
- Password string
- DBName string
+ Driver string
+ Host string
+ Port int
+ User string
+ Password string
+ DBName string
+ MigrationPath string
  }
 }
 

internal/database/storage.go

@@ -91,10 +91,6 @@ func (db *DB) DeleteNews(id int64) error {
  return db.DB.Delete(news)
 }
 
-func (db *DB) CreateCategory(cat *models.Category) error {
- return db.DB.Save(cat)
-}
-
 func (db *DB) CreateNewsCategory(nc *models.NewsCategory) error {
  return db.DB.Save(nc)
 }

internal/migrations/migrations.go

@@ -14,11 +14,11 @@ var embedMigrations embed.FS
 func Migrations(cfg *config.Config, db *sql.DB) {
  goose.SetBaseFS(embedMigrations)
 
- if err := goose.SetDialect("postgres"); err != nil {
+ if err := goose.SetDialect(cfg.Database.Driver); err != nil {
  log.Fatalf("Failed to set goose dialect: %v", err)
  }
 
- if err := goose.Up(db, "migrations"); err != nil {
+ if err := goose.Up(db, cfg.Database.MigrationPath); err != nil {
  log.Fatalf("Failed to apply migrations: %v", err)
  }
 

internal/models/models.go

@@ -15,10 +15,3 @@ type NewsCategory struct {
  NewsID int64 `reform:"news_id,pk" json:"news_id"`
  CategoryID int64 `reform:"category_id" json:"category_id"`
 }
-
-//go:generate reform
-//reform:categories
-type Category struct {
- ID int64 `reform:"id,pk" json:"id"`
- Name string `reform:"name" json:"name"`
-}