diff --git a/pkg/restaurants/fresh.go b/pkg/restaurants/fresh.go index f3edd50..703f129 100644 --- a/pkg/restaurants/fresh.go +++ b/pkg/restaurants/fresh.go @@ -17,6 +17,7 @@ type FreshRestaurant struct { func MakeFreshRestaurant(url string, name string) FreshRestaurant { restaurant := FreshRestaurant{} + restaurant.SetDefaultValues() restaurant.url = url restaurant.name = name return restaurant @@ -24,6 +25,7 @@ func MakeFreshRestaurant(url string, name string) FreshRestaurant { func NewFreshRestaurant(url string, name string) *FreshRestaurant { restaurant := new(FreshRestaurant) + restaurant.SetDefaultValues() restaurant.url = url restaurant.name = name return restaurant diff --git a/pkg/restaurants/menicka.go b/pkg/restaurants/menicka.go index 39b3eae..cf688f3 100644 --- a/pkg/restaurants/menicka.go +++ b/pkg/restaurants/menicka.go @@ -16,6 +16,7 @@ type MenickaRestaurant struct { func MakeMenickaRestaurant(url string, name string) MenickaRestaurant { restaurant := MenickaRestaurant{} + restaurant.SetDefaultValues() restaurant.url = url restaurant.name = name return restaurant @@ -23,6 +24,7 @@ func MakeMenickaRestaurant(url string, name string) MenickaRestaurant { func NewMenickaRestaurant(url string, name string) *MenickaRestaurant { restaurant := new(MenickaRestaurant) + restaurant.SetDefaultValues() restaurant.url = url restaurant.name = name return restaurant diff --git a/pkg/restaurants/menu.go b/pkg/restaurants/menu.go index 17b074c..821a2db 100644 --- a/pkg/restaurants/menu.go +++ b/pkg/restaurants/menu.go @@ -8,6 +8,10 @@ type Menu struct { day string } +func MakeMenuDefault() Menu { + return Menu{make([]Meal, 0), true, ""} +} + func MakeMenu(meals []Meal, day string) Menu { return Menu{meals, true, day} } diff --git a/pkg/restaurants/restaurant.go b/pkg/restaurants/restaurant.go index 3b20754..c7c990a 100644 --- a/pkg/restaurants/restaurant.go +++ b/pkg/restaurants/restaurant.go @@ -28,6 +28,13 @@ type RestaurantJSON struct { PermanentMeals []Meal `json:"permanentmeals"` } +func (restaurant *Restaurant) SetDefaultValues() { + restaurant.url = "" + restaurant.name = "" + restaurant.menus = [7]Menu{} + restaurant.permanent = []Meal{} +} + func (restaurant *Restaurant) AddPermanent(isSoup bool, name string, desc string, price int) { restaurant.AddPermanentMeal(MakeMeal(isSoup, name, desc, price)) } @@ -42,7 +49,7 @@ func (restaurant Restaurant) GetMenus() [7]Menu { func (restaurant *Restaurant) clearMenus() { for i := 0; i < 7; i++ { - restaurant.menus[i] = Menu{} + restaurant.menus[i] = MakeMenuDefault() } }