mitchell/mywebsite
1
0
Fork 0
mirror of https://github.com/mgerb/mywebsite synced 2026-01-10 09:52:51 +00:00
Code Issues Releases Wiki Activity

added end point for getting unique list of dates

Browse Source
This commit is contained in:
mgerb42
2016-09-10 20:42:30 +00:00
parent 0539eb740f
commit e2cb0969d7
3 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/model/daily_sensor/daily_sensor.go
View File

@@ -23,7 +23,7 @@ type Data struct {
MonthName string `json:"monthname,omitempty" bson:"monthname"`
Day int `json:"day,omitempty" bson:"day"`
Year int `json:"year,omitempty" bson:"year"`
Updated time.Time `json:"updated" bson:"updated"`
Updated time.Time `json:"updated,omitempty" bson:"updated"`
}
//convert struct to json string
@@ -132,7 +132,6 @@ func GetAllSensorInfo(sensor_location string) ([]Data, error) {
c := session.DB(db.Mongo.Info.Database).C(collection)
//err := c.Find(bson.M{"location": sensor_location}).Sort("-year, -month").All(&d)
err := c.Pipe([]bson.M{{"$match": bson.M{"location": sensor_location}},
{"$sort": bson.M{"year": -1, "month": 1}}}).All(&d)
@@ -201,9 +200,13 @@ func GetAllSensorInfoByMonth(sensor_location string, year int, monthname string)
}
}
/*
type UniqueDates struct{
Dates []Data `json:"dates" bson:"dates"`
}
func GetUniqueSensorDates(sensor_location string) ([]Data, error){
d := []Data{}
temp := UniqueDates{};
if db.Mongo.Connected() == true {
@@ -213,9 +216,11 @@ func GetUniqueSensorDates(sensor_location string) ([]Data, error){
c := session.DB(db.Mongo.Info.Database).C(collection)
err := c.Pipe([]bson.M{{"$match": bson.M{"location": sensor_location}},
{"$project": bson.M{""}},
{"$sort": bson.M{"year": -1, "month": 1}}}).All(&d)
{"$group": bson.M{"_id": "null", "dates": bson.M{"$addToSet": bson.M{"month": "$month", "monthname": "$monthname", "year": "$year"}}}},
}).One(&temp)
d = temp.Dates;
if err != nil {
log.Println(err)
return d, nil
@@ -227,4 +232,3 @@ func GetUniqueSensorDates(sensor_location string) ([]Data, error){
return d, errors.New("Query failed")
}
}
*/