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

convert server to use relative imports

Browse Source
This commit is contained in:
mgerb42
2017-01-12 14:51:25 +01:00
parent a68c97fa3c
commit 148721e071
6 changed files with 44 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@ import (
"log"
"time"
"mywebsite/server/db"
"../../db"
)
const (
@@ -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,omitempty" bson:"updated"`
Updated time.Time `json:"updated,omitempty" bson:"updated"`
}
//convert struct to json string
@@ -211,35 +211,34 @@ type UniqueDates struct{
*/
type Years struct {
Year int `json:"year", bson:"year"`
Months []Month `json:"months", bson:"months"`
Year int `json:"year", bson:"year"`
Months []Month `json:"months", bson:"months"`
}
type Month struct {
Month int `json:"month", bson:"month"`
MonthName string `json:"monthname", bson:"monthname"`
Month int `json:"month", bson:"month"`
MonthName string `json:"monthname", bson:"monthname"`
}
func GetUniqueSensorDates(sensor_location string) ([]Years, error){
func GetUniqueSensorDates(sensor_location string) ([]Years, error) {
d := []Years{}
if db.Mongo.Connected() == true {
session := db.Mongo.Session.Copy()
defer session.Close()
c := session.DB(db.Mongo.Info.Database).C(collection)
err := c.Pipe([]bson.M{bson.M{"$match": bson.M{"location": sensor_location}},
bson.M{"$group": bson.M{"_id": "$year", "months": bson.M{"$addToSet": bson.M{"month": "$month", "monthname": "$monthname"}}}},
bson.M{"$project": bson.M{"year": "$_id", "months": "$months"}},
bson.M{"$unwind": "$months"},
bson.M{"$sort": bson.M{"months.month": -1}},
bson.M{"$group": bson.M{"_id": "$year", "months": bson.M{"$push": "$months"}}},
bson.M{"$project": bson.M{"year": "$_id", "months": "$months"}},
bson.M{"$group": bson.M{"_id": "$year", "months": bson.M{"$addToSet": bson.M{"month": "$month", "monthname": "$monthname"}}}},
bson.M{"$project": bson.M{"year": "$_id", "months": "$months"}},
bson.M{"$unwind": "$months"},
bson.M{"$sort": bson.M{"months.month": -1}},
bson.M{"$group": bson.M{"_id": "$year", "months": bson.M{"$push": "$months"}}},
bson.M{"$project": bson.M{"year": "$_id", "months": "$months"}},
}).All(&d)
if err != nil {
log.Println(err)
return d, nil
@@ -250,4 +249,4 @@ func GetUniqueSensorDates(sensor_location string) ([]Years, error){
} else {
return d, errors.New("Query failed")
}
}
}