diff --git a/pkg/restaurants/fresh.go b/pkg/restaurants/fresh.go index 9de5e46..dc0230b 100644 --- a/pkg/restaurants/fresh.go +++ b/pkg/restaurants/fresh.go @@ -15,17 +15,10 @@ type FreshRestaurant struct { Restaurant } -func MakeFreshRestaurant(url string, name string) FreshRestaurant { - restaurant := FreshRestaurant{} - restaurant.SetDefaultValues() - restaurant.url = url - restaurant.name = name - return restaurant -} - -func NewFreshRestaurant(url string, name string) *FreshRestaurant { +func NewFreshRestaurant(url string, name string, id int) *FreshRestaurant { restaurant := new(FreshRestaurant) restaurant.SetDefaultValues() + restaurant.id = id restaurant.url = url restaurant.name = name return restaurant diff --git a/pkg/restaurants/menicka.go b/pkg/restaurants/menicka.go index cf688f3..d8b176a 100644 --- a/pkg/restaurants/menicka.go +++ b/pkg/restaurants/menicka.go @@ -14,17 +14,10 @@ type MenickaRestaurant struct { Restaurant } -func MakeMenickaRestaurant(url string, name string) MenickaRestaurant { - restaurant := MenickaRestaurant{} - restaurant.SetDefaultValues() - restaurant.url = url - restaurant.name = name - return restaurant -} - -func NewMenickaRestaurant(url string, name string) *MenickaRestaurant { +func NewMenickaRestaurant(url string, name string, id int) *MenickaRestaurant { restaurant := new(MenickaRestaurant) restaurant.SetDefaultValues() + restaurant.id = id restaurant.url = url restaurant.name = name return restaurant diff --git a/pkg/restaurants/restaurant.go b/pkg/restaurants/restaurant.go index c7c990a..0fd5a46 100644 --- a/pkg/restaurants/restaurant.go +++ b/pkg/restaurants/restaurant.go @@ -16,6 +16,7 @@ type RestaurantInterface interface { type Restaurant struct { RestaurantInterface + id int url string name string menus [7]Menu @@ -23,6 +24,7 @@ type Restaurant struct { } type RestaurantJSON struct { + Id int `json:"id"` Restaurant string `json:"restaurant"` DailyMenus []Menu `json:"dailymenus"` PermanentMeals []Meal `json:"permanentmeals"` @@ -55,6 +57,7 @@ func (restaurant *Restaurant) clearMenus() { func (restaurant *Restaurant) MarshalJSON() ([]byte, error) { return json.Marshal(&RestaurantJSON{ + Id: restaurant.id, Restaurant: restaurant.name, DailyMenus: restaurant.menus[:], PermanentMeals: restaurant.permanent,