diff --git a/service/planner/main.go b/service/planner/main.go index ad739aee5e07574ad63f228ef8ae403fede72491..ce0ac6fa5def54d686627bf948c9ef91e0f47e14 100644 --- a/service/planner/main.go +++ b/service/planner/main.go @@ -62,7 +62,7 @@ func main() { router.HandleFunc("/meal/ingredient/{value}", handler.SearchMealByIngredient).Methods(http.MethodGet) router.HandleFunc("/meal/ingredient", handler.GetIngredientOverview).Methods(http.MethodGet) router.HandleFunc("/meal/{id}", handler.GetMeal).Methods(http.MethodGet) - log.Infof("Server is listening on port :%v\n", port) + log.Infof("Server is listening on port :%v", port) if err := http.ListenAndServe(fmt.Sprintf(":%v", port), router); err != nil { log.Fatal(err) } diff --git a/service/planner/service/group.go b/service/planner/service/group.go index 6046f33ea0e150220c4abfffaff306e36ddad9f4..514936695139fe69c6a6255ae179083b4e6ae4f3 100644 --- a/service/planner/service/group.go +++ b/service/planner/service/group.go @@ -1,6 +1,7 @@ package service import ( + log "github.com/sirupsen/logrus" "gitlab.reutlingen-university.de/yesildas/mealplanner2go/service/planner/db" "gitlab.reutlingen-university.de/yesildas/mealplanner2go/service/planner/model" ) @@ -10,6 +11,7 @@ func CreateGroup(group *model.Group) (*model.Group, error) { if err != nil { return nil, err } + log.Infof("Group created with ID: %d", group.ID) return group, nil } @@ -19,6 +21,7 @@ func GetGroup(id int) (*model.Group, error) { if err != nil { return nil, err } + log.Infof("Group retrieved with ID: %d", group.ID) return group, nil } @@ -28,6 +31,7 @@ func GetGroups() ([]*model.GroupItem, error) { if err != nil { return nil, err } + log.Infof("Groups retrieved") return groups, nil } @@ -37,6 +41,7 @@ func DeleteGroup(id int) (*model.Group, error) { if err != nil { return nil, err } + log.Infof("Group deleted with ID: %d", group.ID) return group, nil } @@ -46,6 +51,7 @@ func CreateUserGroupRelation(userId int, groupId int) error { if err != nil { return err } + log.Infof("User added to Group with IDs: %d to %d", userId, groupId) return nil } @@ -55,6 +61,7 @@ func DeleteUserGroupRelation(userId int, groupId int) error { if err != nil { return err } + log.Infof("User removed from Group with IDs: %d from %d", userId, groupId) return nil } diff --git a/service/planner/service/meal-client.go b/service/planner/service/meal-client.go index 64086a9c33cfb84c9a32cd95b92f02d49efeb6f3..1544dea3e32c0064a8c80fc018a9ebdd3e1f63b6 100644 --- a/service/planner/service/meal-client.go +++ b/service/planner/service/meal-client.go @@ -2,9 +2,9 @@ package service import ( "context" - "log" "time" + log "github.com/sirupsen/logrus" "gitlab.reutlingen-university.de/yesildas/mealplanner2go/service/planner/client" "gitlab.reutlingen-university.de/yesildas/mealplanner2go/service/planner/client/meal" "gitlab.reutlingen-university.de/yesildas/mealplanner2go/service/planner/model" @@ -70,6 +70,7 @@ func GetRandomMeal() (*model.Meal, error) { if err != nil { return nil, err } + log.Infof("Random meal requested") return convertMealResponseToModel(res), nil } @@ -87,6 +88,7 @@ func GetMeal(id int) (*model.Meal, error) { if err != nil { return nil, err } + log.Infof("Meal requested with ID: %d", id) return convertMealResponseToModel(res), nil } @@ -104,6 +106,7 @@ func SearchMealByName(name string) ([]*model.Meal, error) { if err != nil { return nil, err } + log.Infof("Meal searched with: %s", name) return convertMealResponsesToModel(res), nil } @@ -121,6 +124,7 @@ func SearchMealBy(value string, filter model.Filter) ([]*model.MealOverview, err if err != nil { return nil, err } + log.Infof("Meal categorized / areazied / ingredientized with: %s", value) return convertMealOverviewResponsesToModel(res), nil } @@ -138,6 +142,7 @@ func GetFilter(filter model.Filter) (*model.FilterOverview, error) { if err != nil { return nil, err } + log.Infof("Meal filter requested (Category, Area, Ingredient)") return &model.FilterOverview{ ValidValues: res.ValidValues, diff --git a/service/planner/service/meal.go b/service/planner/service/meal.go index f3352e58bb54fb77e9173d4a085dfacf4029cad3..35e51a23fbf3e9d66381244d5b384be2c4975d86 100644 --- a/service/planner/service/meal.go +++ b/service/planner/service/meal.go @@ -1,6 +1,7 @@ package service import ( + log "github.com/sirupsen/logrus" "gitlab.reutlingen-university.de/yesildas/mealplanner2go/service/planner/db" "gitlab.reutlingen-university.de/yesildas/mealplanner2go/service/planner/model" ) @@ -10,6 +11,7 @@ func CreateUserMeal(meal *model.UserMeal) error { if err != nil { return err } + log.Infof("User meal added for User: %d", meal.UserID) return nil } @@ -19,6 +21,7 @@ func DeleteUserMeal(id int) error { if err != nil { return err } + log.Infof("User meal deleted") return nil } @@ -28,6 +31,7 @@ func CreateGroupMeal(meal *model.GroupMeal) error { if err != nil { return err } + log.Infof("Group meal added for Group: %d", meal.GroupID) return nil } @@ -37,6 +41,7 @@ func DeleteGroupMeal(id int) error { if err != nil { return err } + log.Infof("Group meal deleted") return nil } @@ -46,6 +51,7 @@ func CreateFavoriteMeal(userId int, mealId int) error { if err != nil { return err } + log.Infof("Favorite meal added for User: %d", userId) return nil } @@ -55,6 +61,7 @@ func DeleteFavoriteMeal(userId int, mealId int) error { if err != nil { return err } + log.Infof("Favorite meal deleted") return nil } diff --git a/service/planner/service/shopping.go b/service/planner/service/shopping.go index bdfd7e38a41e09327bd4f43efddad59874359f9f..a6c61b1b7db116c6735562b5b6fa689ac5468580 100644 --- a/service/planner/service/shopping.go +++ b/service/planner/service/shopping.go @@ -14,6 +14,7 @@ func CreateShoppingDate(shoppingDate *model.ShoppingDate) error { if err != nil { return err } + log.Infof("Shopping date added for User: %d", shoppingDate.UserID) return nil } @@ -23,12 +24,14 @@ func DeleteShoppingDate(id int) error { if err != nil { return err } + log.Infof("Shopping date deleted with ID: %d", id) return nil } func GetShoppingList(id int) ([]*model.ShoppingLists, error) { var result []*model.ShoppingLists + log.Infof("Shopping list request for User: %d", id) user, err := db.GetUser(id) if err != nil { return nil, err @@ -40,15 +43,14 @@ func GetShoppingList(id int) ([]*model.ShoppingLists, error) { return nil, err } timeNow := time.Now().Truncate(24 * time.Hour) - log.Infof("Compare time (%s, %s)", timeNow.Format(time.DateOnly), date.Format(time.DateOnly)) if timeNow.Equal(date) || timeNow.Before(date) { dates = append(dates, date) } } - log.Infof("Valid shopping dates: %d", len(dates)) + log.Infof("Possible shopping dates retrieved: %d", len(dates)) if len(dates) == 0 { - return nil, errors.New("valid shopping date is missing") + return nil, errors.New("possible shopping dates are missing") } var userList model.ShoppingLists @@ -102,13 +104,13 @@ func GetShoppingList(id int) ([]*model.ShoppingLists, error) { return nil, err } timeNow := time.Now().Truncate(24 * time.Hour) - log.Infof("Compare time (%s, %s)", timeNow.Format(time.DateOnly), date.Format(time.DateOnly)) if timeNow.Equal(date) || timeNow.Before(date) { groupDates[userId] = append(groupDates[userId], date) } } } + log.Infof("Possible shopping dates for %d group members retrieved", len(groupDates)) if len(group.Meals) != 0 { for _, v := range group.Meals { date, err := time.Parse(time.RFC3339, v.Date) @@ -129,6 +131,7 @@ func GetShoppingList(id int) ([]*model.ShoppingLists, error) { } } } + log.Infof("Check if user has to add group meal to the shopping list") if lowestDuration != 255*time.Hour*24*365 { if currentUserId == id { meal, err := GetMeal(v.MealID) @@ -143,5 +146,7 @@ func GetShoppingList(id int) ([]*model.ShoppingLists, error) { } result = append(result, &groupList) } + log.Infof("Shopping list request is Done for User: %d", id) + return result, nil } diff --git a/service/planner/service/user.go b/service/planner/service/user.go index 53e9d169db41f3fb3d0b671090201d15be063311..966fbe81ed91cb1c0222b61b7a82b128b416ddd7 100644 --- a/service/planner/service/user.go +++ b/service/planner/service/user.go @@ -1,6 +1,7 @@ package service import ( + log "github.com/sirupsen/logrus" "gitlab.reutlingen-university.de/yesildas/mealplanner2go/service/planner/db" "gitlab.reutlingen-university.de/yesildas/mealplanner2go/service/planner/model" ) @@ -10,6 +11,7 @@ func CreateUser(user *model.User) (*model.User, error) { if err != nil { return nil, err } + log.Infof("User created with ID: %d", user.ID) return user, nil } @@ -19,6 +21,7 @@ func GetUser(id int) (*model.User, error) { if err != nil { return nil, err } + log.Infof("User retrieved with ID: %d", user.ID) return user, nil } @@ -28,6 +31,7 @@ func GetUsers() ([]*model.UserItem, error) { if err != nil { return nil, err } + log.Infof("Users retrieved") return users, nil } @@ -37,6 +41,7 @@ func UpdateUser(id int, user *model.User) (*model.User, error) { if err != nil { return nil, err } + log.Infof("User updated with ID: %d", user.ID) return user, nil } @@ -46,6 +51,7 @@ func DeleteUser(id int) (*model.User, error) { if err != nil { return nil, err } + log.Infof("User deleted with ID: %d", user.ID) return user, nil }