add slices of Files to associations of SimulationModel

This commit is contained in:
Sonja Happ 2019-05-15 13:04:12 +02:00
parent 3f3a1346b7
commit 3c6e76ce7c
3 changed files with 13 additions and 0 deletions

View file

@ -184,6 +184,10 @@ func DummyPopulateDB(test_db *gorm.DB) {
checkErr(test_db.Model(&smo_A).Association("OutputMapping").Append(&outSig_A).Error) checkErr(test_db.Model(&smo_A).Association("OutputMapping").Append(&outSig_A).Error)
checkErr(test_db.Model(&smo_A).Association("OutputMapping").Append(&outSig_B).Error) checkErr(test_db.Model(&smo_A).Association("OutputMapping").Append(&outSig_B).Error)
//SimulationModel HM Files
checkErr(test_db.Model(&smo_A).Association("Files").Append(&file_A).Error)
checkErr(test_db.Model(&smo_A).Association("Files").Append(&file_B).Error)
// Visualization BT User // Visualization BT User
checkErr(test_db.Model(&vis_A).Association("User").Append(&usr_A).Error) checkErr(test_db.Model(&vis_A).Association("User").Append(&usr_A).Error)

View file

@ -38,6 +38,7 @@ func TestDummyDBAssociations(t *testing.T) {
var sigs []Signal var sigs []Signal
var smos []SimulationModel var smos []SimulationModel
var files []File var files []File
var files_sm []File
var projs []Project var projs []Project
var simns []Simulation var simns []Simulation
var viss []Visualization var viss []Visualization
@ -62,6 +63,12 @@ func TestDummyDBAssociations(t *testing.T) {
"Expected to have %v Output AND Input Signals. Has %v.", 4, len(sigs)) "Expected to have %v Output AND Input Signals. Has %v.", 4, len(sigs))
} }
a.NoError(db.Model(&smo).Related(&files_sm, "Files").Error)
if len(files_sm) != 2 {
a.Fail("Simulation Model Associations",
"Expected to have %v Files. Has %v.", 2, len(files_sm))
}
// Simulation // Simulation
a.NoError(db.Find(&simn, 1).Error, fM("Simulation")) a.NoError(db.Find(&simn, 1).Error, fM("Simulation"))

View file

@ -75,6 +75,8 @@ type SimulationModel struct {
BelongsToSimulator Simulator `gorm:"not null;association_autoupdate:false"` BelongsToSimulator Simulator `gorm:"not null;association_autoupdate:false"`
BelongsToSimulatorID uint `gorm:"not null"` BelongsToSimulatorID uint `gorm:"not null"`
//new in villasweb 2.0
Files []File `gorm:"association_autoupdate:false"`
// NOTE: order of signals is important // NOTE: order of signals is important
OutputMapping []Signal `gorm:""` OutputMapping []Signal `gorm:""`