From 49b9805cbed071ea77d25e3daddc026a076ef936 Mon Sep 17 00:00:00 2001 From: valitovgaziz Date: Wed, 11 Feb 2026 06:30:14 +0500 Subject: [PATCH] modified: main_dc/yalarba/api_yal/internal/database/psql_db.go modified: main_dc/yalarba/api_yal/internal/models/account.go renamed: main_dc/yalarba/api_yal/internal/models/Object.go -> "main_dc/yalarba/api_yal/internal/models/\320\276bject.go" add Onwer Account ass foregn key into Object --- main_dc/yalarba/api_yal/internal/database/psql_db.go | 1 + main_dc/yalarba/api_yal/internal/models/account.go | 4 ++++ .../yalarba/api_yal/internal/models/{Object.go => оbject.go} | 3 +++ 3 files changed, 8 insertions(+) rename main_dc/yalarba/api_yal/internal/models/{Object.go => оbject.go} (86%) diff --git a/main_dc/yalarba/api_yal/internal/database/psql_db.go b/main_dc/yalarba/api_yal/internal/database/psql_db.go index edd1d70..59288ef 100644 --- a/main_dc/yalarba/api_yal/internal/database/psql_db.go +++ b/main_dc/yalarba/api_yal/internal/database/psql_db.go @@ -43,6 +43,7 @@ func autoMigrate(db *gorm.DB) error { models := []interface{}{ &models.Account{}, &models.UpdateHistory{}, + &models.Object{}, } for _, model := range models { diff --git a/main_dc/yalarba/api_yal/internal/models/account.go b/main_dc/yalarba/api_yal/internal/models/account.go index 43d88d5..2c74f0e 100644 --- a/main_dc/yalarba/api_yal/internal/models/account.go +++ b/main_dc/yalarba/api_yal/internal/models/account.go @@ -26,4 +26,8 @@ type Account struct { IsActive bool `gorm:"default:true" json:"is_active"` IsVerified bool `gorm:"default:false" json:"is_verified"` Role string `gorm:"default:user" json:"role"` // user, admin, moderator + + + // Связь: один Account имеет много Objects + Objects []Оbject `json:"objects"` // Обратная связь } diff --git a/main_dc/yalarba/api_yal/internal/models/Object.go b/main_dc/yalarba/api_yal/internal/models/оbject.go similarity index 86% rename from main_dc/yalarba/api_yal/internal/models/Object.go rename to main_dc/yalarba/api_yal/internal/models/оbject.go index e30b338..62fef25 100644 --- a/main_dc/yalarba/api_yal/internal/models/Object.go +++ b/main_dc/yalarba/api_yal/internal/models/оbject.go @@ -6,6 +6,9 @@ type Object struct { /*ID, CreatedAt, UpdatedAt, DeletedAt (Update's history)*/ Base Base `gorm:"embedded"` + // owner account ID + Owner Account `gorm:"foreignKey:OwnerID" json:"owner"` + // Основная информация Short_Name string `gorm:"not null" json:"name"` Long_Name string `json:"long_name"`