bookmark api changes
This commit is contained in:
parent
0ddb6d603a
commit
a3fe3e4d33
16
main.go
16
main.go
@ -885,13 +885,14 @@ func main() {
|
|||||||
|
|
||||||
// Define the struct for holding the query results
|
// Define the struct for holding the query results
|
||||||
bookmarks := []struct {
|
bookmarks := []struct {
|
||||||
|
Id string `db:"id" json:"id"`
|
||||||
UserId string `db:"user_id" json:"user_id"`
|
UserId string `db:"user_id" json:"user_id"`
|
||||||
Dataset string `db:"dataset" json:"dataset"`
|
Dataset string `db:"dataset" json:"dataset"`
|
||||||
}{}
|
}{}
|
||||||
|
|
||||||
// Execute the query
|
// Execute the query
|
||||||
err := app.DB().
|
err := app.DB().
|
||||||
Select("user_id", "dataset").
|
Select("id", "user_id", "dataset").
|
||||||
From("bookmark").
|
From("bookmark").
|
||||||
Where(dbx.HashExp{"user_id": user_id}).
|
Where(dbx.HashExp{"user_id": user_id}).
|
||||||
All(&bookmarks)
|
All(&bookmarks)
|
||||||
@ -913,13 +914,18 @@ func main() {
|
|||||||
for _, bookmark := range bookmarks {
|
for _, bookmark := range bookmarks {
|
||||||
dataSets := struct {
|
dataSets := struct {
|
||||||
DataSet string `db:"data_set" json:"data_set"`
|
DataSet string `db:"data_set" json:"data_set"`
|
||||||
|
MainTopic string `db:"main_topic" json:"main_topic"`
|
||||||
|
SubTopic string `db:"sub_topic" json:"sub_topic"`
|
||||||
DataSetTileHeading string `db:"data_set_tile_heading" json:"data_set_tile_heading"`
|
DataSetTileHeading string `db:"data_set_tile_heading" json:"data_set_tile_heading"`
|
||||||
ValueSource string `db:"value_source" json:"value_source"`
|
ValueSource string `db:"value_source" json:"value_source"`
|
||||||
Value string `db:"value" json:"value"`
|
Value string `db:"value" json:"value"`
|
||||||
|
ColorPattern string `db:"color_pattern" json:"color_pattern"`
|
||||||
}{}
|
}{}
|
||||||
|
|
||||||
languageSpecificColumn := "data_set_tile_heading_" + language
|
data_set_tile_heading := "data_set_tile_heading_" + language
|
||||||
query := ` SELECT data_set,` + languageSpecificColumn + ` AS data_set_tile_heading,value_source,value FROM uae_numbers_screen WHERE data_set = {:bookmark} `
|
main_topic := "main_topic_" + language
|
||||||
|
sub_topic := "sub_topic_" + language
|
||||||
|
query := ` SELECT id,data_set,` + data_set_tile_heading + ` AS data_set_tile_heading,` + main_topic + ` AS main_topic,` + sub_topic + ` AS sub_topic,color_pattern,value_source,value FROM uae_numbers_screen WHERE data_set = {:bookmark} `
|
||||||
err := app.DB().
|
err := app.DB().
|
||||||
NewQuery(query).
|
NewQuery(query).
|
||||||
Bind(dbx.Params{
|
Bind(dbx.Params{
|
||||||
@ -934,10 +940,14 @@ func main() {
|
|||||||
|
|
||||||
// Add the main topic and its sub-topics to the result
|
// Add the main topic and its sub-topics to the result
|
||||||
result = append(result, map[string]interface{}{
|
result = append(result, map[string]interface{}{
|
||||||
|
"id": bookmark.Id,
|
||||||
"data_set": dataSets.DataSet,
|
"data_set": dataSets.DataSet,
|
||||||
"data_set_tile_heading": dataSets.DataSetTileHeading,
|
"data_set_tile_heading": dataSets.DataSetTileHeading,
|
||||||
"value_source": dataSets.ValueSource,
|
"value_source": dataSets.ValueSource,
|
||||||
"value": dataSets.Value,
|
"value": dataSets.Value,
|
||||||
|
"main_topic": dataSets.MainTopic,
|
||||||
|
"sub_topic": dataSets.SubTopic,
|
||||||
|
"color_pattern": dataSets.ColorPattern,
|
||||||
})
|
})
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user