Export types to json
This commit is contained in:
@@ -11,19 +11,19 @@ type (
|
|||||||
db *DB
|
db *DB
|
||||||
}
|
}
|
||||||
Food struct {
|
Food struct {
|
||||||
rowid int64
|
rowid int64 `json:"rowid"`
|
||||||
date string
|
date string `json:"date"`
|
||||||
food string
|
food string `json:"food"`
|
||||||
descripton string
|
descripton string `json:"description"`
|
||||||
amount float32
|
amount float32 `json:"amount"`
|
||||||
per100 float32
|
per100 float32 `json:"per100"`
|
||||||
energy float32
|
energy float32 `json:"energy"`
|
||||||
}
|
}
|
||||||
AggregatedFood struct {
|
AggregatedFood struct {
|
||||||
period string
|
period string `json:"period"`
|
||||||
amount float32
|
amount float32 `json:"amount"`
|
||||||
avgPer100 float32
|
avgPer100 float32 `json:"avgPer100"`
|
||||||
energy float32
|
energy float32 `json:"energy"`
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -32,7 +32,7 @@ const foodAggregatedColumns = "period, amount, avgPer100, energy"
|
|||||||
|
|
||||||
func (s *FoodService) GetRecent() ([]Food, error) {
|
func (s *FoodService) GetRecent() ([]Food, error) {
|
||||||
var res []Food
|
var res []Food
|
||||||
if s.db == nil || !s.db.Ready {
|
if s.db == nil || !s.db.Ready {
|
||||||
return res, fmt.Errorf("cannot get recent food, db is nil or is not ready")
|
return res, fmt.Errorf("cannot get recent food, db is nil or is not ready")
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -66,7 +66,7 @@ func (s *FoodService) Create(food Food) (Food, error) {
|
|||||||
if food.amount <= 0 {
|
if food.amount <= 0 {
|
||||||
return food, fmt.Errorf("cannot create food, amount is less than or equal to 0")
|
return food, fmt.Errorf("cannot create food, amount is less than or equal to 0")
|
||||||
}
|
}
|
||||||
|
|
||||||
var res sql.Result
|
var res sql.Result
|
||||||
var err error
|
var err error
|
||||||
if food.per100 > 0 {
|
if food.per100 > 0 {
|
||||||
@@ -237,4 +237,4 @@ func (s *FoodService) GetYearly() ([]AggregatedFood, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
|
@@ -13,21 +13,21 @@ type (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type settings struct {
|
type settings struct {
|
||||||
FoodDaysLookback int
|
FoodDaysLookback int `default:"30" json:"foodDaysLookback"`
|
||||||
FoodAggregatedDaysLookback int
|
FoodAggregatedDaysLookback int `default:"30" json:"foodAggregatedDaysLookback"`
|
||||||
FoodDailyLookback int
|
FoodDailyLookback int `default:"30" json:"foodDailyLookback"`
|
||||||
FoodWeeklyLookback int
|
FoodWeeklyLookback int `default:"4" json:"foodWeeklyLookback"`
|
||||||
FoodMonthlyLookback int
|
FoodMonthlyLookback int `default:"4" json:"foodMonthlyLookback"`
|
||||||
FoodYearlyLookback int
|
FoodYearlyLookback int `default:"2" json:"foodYearlyLookback"`
|
||||||
|
|
||||||
WeightDaysLookback int
|
WeightDaysLookback int `default:"30" json:"weightDaysLookback"`
|
||||||
WeightAggregatedDaysLookback int
|
WeightAggregatedDaysLookback int `default:"30" json:"weightAggregatedDaysLookback"`
|
||||||
WeightDailyLookback int
|
WeightDailyLookback int `default:"30" json:"weightDailyLookback"`
|
||||||
WeightWeeklyLookback int
|
WeightWeeklyLookback int `default:"4" json:"weightWeeklyLookback"`
|
||||||
WeightMonthlyLookback int
|
WeightMonthlyLookback int `default:"4" json:"weightMonthlyLookback"`
|
||||||
WeightYearlyLookback int
|
WeightYearlyLookback int `default:"2" json:"weightYearlyLookback"`
|
||||||
|
|
||||||
Target int
|
Target int `default:"2000" json:"target"`
|
||||||
}
|
}
|
||||||
|
|
||||||
var Settings settings
|
var Settings settings
|
||||||
|
Reference in New Issue
Block a user