Mirrors/VILLASweb-backend-go
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web-backend-go/ synced 2025-03-30 00:00:12 +01:00
Code Issues Releases Wiki Activity

deterministic order of elements based on ID if multiple elements are extracted from DB

Browse source
This commit is contained in:
Sonja Happ 2019-05-24 16:31:28 +02:00
parent 196beafcf9
commit e7790f82a4
7 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
routes/endpoints_test.go
View file

@ -39,8 +39,8 @@ var user_B = common.UserResponse{
}
var myUsers = []common.UserResponse{
user_B,
user_A,
user_B,
}
var msgUsers = common.ResponseMsgUsers{

2
routes/model/modelQueries.go
View file

@ -17,7 +17,7 @@ func FindAllModels(simID int) ([]common.Model, int, error) {
return models, 0, err
}
err = db.Model(sim).Related(&models, "Models").Error
err = db.Order("ID asc").Model(sim).Related(&models, "Models").Error
return models, len(models), err
}

8
routes/simulation/simulationQueries.go
View file

@ -4,17 +4,21 @@ import (
"git.rwth-aachen.de/acs/public/villas/villasweb-backend-go/common"
)
type Simulation struct{
common.Simulation
}
func FindAllSimulations() ([]common.Simulation, int, error) {
db := common.GetDB()
var simulations []common.Simulation
err := db.Find(&simulations).Error
err := db.Order("ID asc").Find(&simulations).Error
return simulations, len(simulations), err
}
func FindUserSimulations(user *common.User) ([]common.Simulation, int, error) {
db := common.GetDB()
var simulations []common.Simulation
err := db.Model(user).Related(&simulations, "Simulations").Error
err := db.Order("ID asc").Model(user).Related(&simulations, "Simulations").Error
return simulations, len(simulations), err
}

2
routes/simulator/simulatorQueries.go
View file

@ -7,7 +7,7 @@ import (
func FindAllSimulators() ([]common.Simulator, int, error) {
db := common.GetDB()
var simulators []common.Simulator
err := db.Find(&simulators).Error
err := db.Order("ID asc").Find(&simulators).Error
return simulators, len(simulators), err
}

4
routes/user/userQueries.go
View file

@ -7,14 +7,14 @@ import (
func FindAllUsers() ([]common.User, int, error) {
db := common.GetDB()
var users []common.User
err := db.Find(&users).Error
err := db.Order("ID asc").Find(&users).Error
return users, len(users), err
}
func FindAllUsersSim(sim *common.Simulation) ([]common.User, int, error) {
db := common.GetDB()
var users []common.User
err := db.Model(sim).Related(&users, "Users").Error
err := db.Order("ID asc").Model(sim).Related(&users, "Users").Error
return users, len(users), err
}

2
routes/visualization/visualizationQueries.go
View file

@ -7,7 +7,7 @@ import (
func FindAllVisualizationsOfSim(sim *common.Simulation) ([]common.Visualization, int, error) {
db := common.GetDB()
var visualizations []common.Visualization
err := db.Model(sim).Related(&visualizations, "Visualizations").Error
err := db.Order("ID asc").Model(sim).Related(&visualizations, "Visualizations").Error
return visualizations, len(visualizations), err
}

4
routes/widget/widgetQueries.go
View file

@ -7,7 +7,7 @@ import (
func FindVisualizationWidgets(visualization *common.Visualization) ([]common.Widget, int, error) {
db := common.GetDB()
var widgets []common.Widget
err := db.Model(visualization).Related(&widgets, "Widgets").Error
err := db.Order("ID asc").Model(visualization).Related(&widgets, "Widgets").Error
return widgets, len(widgets), err
}
@ -23,7 +23,7 @@ func FindWidget(widgetID int) (common.Widget, error){
func FindWidgetsOfVisualization(vis * common.Visualization) ([]common.Widget, int, error) {
db := common.GetDB()
var widgets []common.Widget
err := db.Model(vis).Related(&vis, "Widgets").Error
err := db.Order("ID asc").Model(vis).Related(&vis, "Widgets").Error
return widgets, len(widgets), err
}