diff --git a/routes/endpoints_test.go b/routes/endpoints_test.go index 7110e15..06903b2 100644 --- a/routes/endpoints_test.go +++ b/routes/endpoints_test.go @@ -39,8 +39,8 @@ var user_B = common.UserResponse{ } var myUsers = []common.UserResponse{ - user_B, user_A, + user_B, } var msgUsers = common.ResponseMsgUsers{ diff --git a/routes/model/modelQueries.go b/routes/model/modelQueries.go index 1b46dc3..784eb59 100644 --- a/routes/model/modelQueries.go +++ b/routes/model/modelQueries.go @@ -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 } diff --git a/routes/simulation/simulationQueries.go b/routes/simulation/simulationQueries.go index 957746a..382128e 100644 --- a/routes/simulation/simulationQueries.go +++ b/routes/simulation/simulationQueries.go @@ -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 } diff --git a/routes/simulator/simulatorQueries.go b/routes/simulator/simulatorQueries.go index 44046e5..b52285c 100644 --- a/routes/simulator/simulatorQueries.go +++ b/routes/simulator/simulatorQueries.go @@ -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 } diff --git a/routes/user/userQueries.go b/routes/user/userQueries.go index 6bdc812..82d3613 100644 --- a/routes/user/userQueries.go +++ b/routes/user/userQueries.go @@ -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 } diff --git a/routes/visualization/visualizationQueries.go b/routes/visualization/visualizationQueries.go index da5f70b..0f20f7d 100644 --- a/routes/visualization/visualizationQueries.go +++ b/routes/visualization/visualizationQueries.go @@ -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 } diff --git a/routes/widget/widgetQueries.go b/routes/widget/widgetQueries.go index f67b091..2278622 100644 --- a/routes/widget/widgetQueries.go +++ b/routes/widget/widgetQueries.go @@ -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 }