feat: resource list and table output formatter

.gitignore

@@ -1,3 +1,2 @@
 unifood
 __bin*
-__debug*

.vscode/launch.json

@@ -11,7 +11,8 @@
             "mode": "debug",
             "program": "${workspaceFolder}/main.go",
             "args": [
-                "get", "meals",
+                "get", "dishes", 
+                "-o", "yaml", 
             ]
         }
     ]

cmd/config.go

@@ -1,11 +1,7 @@
 package cmd
 
-const DefaultRequestTimeout uint = 30
-
 type AppConfig struct {
-	OutputVerbose         bool
+	OutputVerbose   bool
-	OutputFormatter       string
+	OutputFormatter string
-	OutputOrderReverse    bool
+	PrintConfig     bool
-	PrintConfig           bool
-	RequestTimeoutSeconds uint
 }

cmd/resources.go

@@ -1,82 +1,19 @@
 package cmd
 
 import (
-	"context"
+	"git.bissendorf.co/bissendorf/unifood/m/v2/core/handler/dishes"
-	"slices"
-	"strings"
-
-	"git.bissendorf.co/bissendorf/unifood/m/v2/core/handler/meals"
-	"git.bissendorf.co/bissendorf/unifood/m/v2/core/handler/universities"
 	"git.bissendorf.co/bissendorf/unifood/m/v2/core/interfaces"
-	"git.bissendorf.co/bissendorf/unifood/m/v2/core/interfaces/params"
 	"git.bissendorf.co/bissendorf/unifood/m/v2/core/services/stwhbclient"
 	"git.bissendorf.co/bissendorf/unifood/m/v2/model/external/stwbremen"
-	"git.bissendorf.co/bissendorf/unifood/m/v2/model/resources"
-	"git.bissendorf.co/bissendorf/unifood/m/v2/util"
 )
 
 var availableResources = []interfaces.ResourceCommand[any]{
 	{
-		Name:        "resources",
+		Name:    "dishes",
-		Aliases:     []string{"resource"},
+		Aliases: []string{"dish", "d"},
-		Description: "A meta resource representing all other object kinds of this CLI.",
+		Verbs:   []interfaces.Verb{interfaces.VerbGet},
-		Verbs:       []interfaces.Verb{interfaces.VerbGet},
+		Handler: &dishes.DishesHandler{
-		Handler:     &registeredResourcesHandler{},
+			QueryClient: stwhbclient.New[[]stwbremen.Dish](),
-	},
-	{
-		Name:        "meals",
-		Aliases:     []string{"meal", "m"},
-		Description: "A meal represents a cooked combination of ingredients that can be bought and consumed.",
-		Verbs:       []interfaces.Verb{interfaces.VerbGet},
-		Handler: &meals.MealsHandler{
-			QueryClient: stwhbclient.New[[]stwbremen.Meal](),
-		},
-	},
-	{
-		Name:        "universities",
-		Aliases:     []string{"university", "unis", "uni", "u"},
-		Description: "A facility that is hosting one or multiple restaurants.",
-		Verbs:       []interfaces.Verb{interfaces.VerbGet},
-		Handler: &universities.UniversityHandler{
-			QueryClient: stwhbclient.New[stwbremen.RestaurantList](),
-		},
-	},
-	{
-		Name:        "restaurants",
-		Aliases:     []string{"restaurant", "r"},
-		Description: "A place to eat meals",
-		Verbs:       []interfaces.Verb{interfaces.VerbGet},
-		Handler: &universities.RestaurantHandler{
-			QueryClient:           stwhbclient.New[stwbremen.RestaurantList](),
-			QueryClientRestaurant: stwhbclient.New[stwbremen.Restaurant](),
 		},
 	},
 }
-
-type registeredResourcesHandler struct{}
-
-func (h *registeredResourcesHandler) Get(ctx context.Context, name string, params params.Container) (*interfaces.ResourceList, error) {
-	lowerName := strings.ToLower(name)
-	list := util.Select(availableResources, func(i *interfaces.ResourceCommand[any]) bool {
-		return name == "" || i.Name == lowerName
-	})
-
-	slices.SortFunc(list, func(a, b interfaces.ResourceCommand[any]) int {
-		return strings.Compare(a.Name, b.Name)
-	})
-
-	return &interfaces.ResourceList{
-		ItemKind: resources.ResourceResource,
-		Items: util.Transform(list, func(i *interfaces.ResourceCommand[any]) interfaces.Resource {
-			return &resources.Resource{
-				ResourceName: i.Name,
-				Aliases:      i.Aliases,
-				Description:  i.Description,
-			}
-		}),
-	}, nil
-}
-
-func (h *registeredResourcesHandler) GetParametersForVerb(verb interfaces.Verb) []params.Registration {
-	return []params.Registration{}
-}

cmd/root.go

@@ -32,13 +32,10 @@ func initRootCmd() {
 
 	rootCmd.PersistentFlags().BoolVarP(&appConfig.OutputVerbose, "verbose", "v", false, "Enable verbose output")
 	rootCmd.PersistentFlags().StringVarP(&appConfig.OutputFormatter, "output", "o", "table", "Set output format")
-	rootCmd.PersistentFlags().BoolVar(&appConfig.OutputOrderReverse, "reverse", false, "Reverses output item order")
 	rootCmd.PersistentFlags().BoolVar(&appConfig.PrintConfig, "print-config", false, "Enable printing the application config")
-	rootCmd.PersistentFlags().UintVar(&appConfig.RequestTimeoutSeconds, "timeout", DefaultRequestTimeout, "Set the request timeout in seconds")
 
 	logger := jlog.New(slog.LevelDebug)
 	ctx := jlog.ContextWith(context.Background(), logger)
 
-	rootCmd.AddCommand(&versionCmd)
 	rootCmd.AddCommand(getVerbs(ctx, &appConfig)...)
 }

cmd/verbs.go

@@ -8,7 +8,6 @@ import (
 	"os"
 	"slices"
 	"strings"
-	"time"
 
 	"git.bissendorf.co/bissendorf/unifood/m/v2/core/interfaces"
 	"git.bissendorf.co/bissendorf/unifood/m/v2/core/interfaces/params"
@@ -21,27 +20,24 @@ type VerbItem struct {
 	Name        interfaces.Verb
 	Aliases     []string
 	Description string
-	RunFn       func(ctx context.Context, config *AppConfig, handler interfaces.ResourceHandler, params params.Container, name string) error
+	RunFn       func(ctx context.Context, config *AppConfig, handler interfaces.ResourceHandler, params params.Container) error
 }
 
 var verbs = []VerbItem{
 	{
 		Name:        interfaces.VerbGet,
 		Description: "Retrieve a list of resources",
-		RunFn: func(ctx context.Context, config *AppConfig, handler interfaces.ResourceHandler, params params.Container, name string) error {
+		RunFn: func(ctx context.Context, config *AppConfig, handler interfaces.ResourceHandler, params params.Container) error {
 			h, ok := handler.(interfaces.GetHandler)
 			if !ok {
 				return fmt.Errorf("resource does not support GET")
 			}
 
 			// Get items
-			items, err := h.Get(ctx, name, params)
+			items, err := h.Get(ctx, params)
 			if err != nil {
 				return fmt.Errorf("retrieving item failed: %w", err)
 			}
-			if config.OutputOrderReverse {
-				slices.Reverse(items.Items)
-			}
 
 			formatterName := strings.ToLower(config.OutputFormatter)
 			formatter, exists := output.Formatters[formatterName]
@@ -84,7 +80,6 @@ func getVerbs(ctx context.Context, config *AppConfig) (commands []*cobra.Command
 				Use:     r.Name,
 				Aliases: r.Aliases,
 				Short:   r.Description,
-				Args:    cobra.MaximumNArgs(1),
 				Run: func(cmd *cobra.Command, args []string) {
 					// Configure log
 					var logLevel = slog.LevelWarn
@@ -93,20 +88,13 @@ func getVerbs(ctx context.Context, config *AppConfig) (commands []*cobra.Command
 					}
 					logger := jlog.New(logLevel)
 					ctx := jlog.ContextWith(context.Background(), logger)
-					ctx, cancel := context.WithTimeout(ctx, time.Duration(config.RequestTimeoutSeconds)*time.Second)
-					defer cancel()
 
 					// Print config
 					if config.PrintConfig {
 						logger.WarnContext(ctx, "Printing app config", slog.Any("config", config), slog.Any("parameters", params.ToMap()))
 					}
 
-					var name string
+					err := v.RunFn(ctx, config, r.Handler, params)
-					if len(args) > 0 {
-						name = args[0]
-					}
-
-					err := v.RunFn(ctx, config, r.Handler, params, name)
 					if err != nil {
 						logger.ErrorContext(ctx, fmt.Sprintf("%s %s failed", strings.ToUpper(string(v.Name)), r.Name), "error", err.Error())
 						os.Exit(1)
@@ -124,7 +112,6 @@ func getVerbs(ctx context.Context, config *AppConfig) (commands []*cobra.Command
 					param.Description,
 				)
 			}
-
 			verbCommand.AddCommand(resourceCommand)
 		}
 

cmd/version.go

@@ -1,16 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-
-	"git.bissendorf.co/bissendorf/unifood/m/v2/util"
-	"github.com/spf13/cobra"
-)
-
-var versionCmd = cobra.Command{
-	Use:     "version",
-	Aliases: []string{"v"},
-	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println(util.AppVersion)
-	},
-}

core/handler/dishes/handler.go

@@ -0,0 +1,89 @@
+package dishes
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"git.bissendorf.co/bissendorf/unifood/m/v2/core/interfaces"
+	"git.bissendorf.co/bissendorf/unifood/m/v2/core/interfaces/params"
+	"git.bissendorf.co/bissendorf/unifood/m/v2/model/external/stwbremen"
+	"git.bissendorf.co/bissendorf/unifood/m/v2/model/resources"
+	"git.bissendorf.co/bissendorf/unifood/m/v2/util"
+)
+
+type DishesHandler struct {
+	interfaces.ResourceHandler
+	interfaces.GetHandler
+
+	QueryClient interfaces.QueryClient[[]stwbremen.Dish]
+}
+
+const (
+	paramDate     = "date"
+	paramLocation = "location"
+)
+
+func (h *DishesHandler) Get(ctx context.Context, params params.Container) (*interfaces.ResourceList, error) {
+	// Read parameters
+	p, err := params.GetValue(paramDate)
+	if err != nil {
+		return nil, fmt.Errorf("unable to parse date parameter: %w", err)
+	}
+	date := p.(time.Time)
+
+	location, err := params.GetValue(paramLocation)
+	if err != nil {
+		return nil, fmt.Errorf("unable to parse location parameter: %w", err)
+	}
+
+	// Build query
+	query := fmt.Sprintf(
+		`page('meals').children.filterBy('location', '%s').filterBy('date', '%s').filterBy('printonly', 0)`,
+		location,
+		date.Format(time.DateOnly),
+	)
+
+	// Run query
+	dishes, err := h.QueryClient.Get(ctx,
+		query,
+		`{"title":true,"ingredients":"page.ingredients.toObject","prices":"page.prices.toObject","location":true,"counter":true,"date":true,"mealadds":true,"mark":true,"frei3":true,"printonly":true,"kombicategory":true,"categories":"page.categories.split"}`,
+		false,
+	)
+	if err != nil {
+		return nil, fmt.Errorf("querying menu failed: %w", err)
+	}
+
+	// Return
+	return &interfaces.ResourceList{
+		ItemKind: resources.ResourceDish,
+		Items: util.Transform(*dishes, func(i *stwbremen.Dish) interfaces.Resource {
+			d, err := resources.DishFromDTO(*i)
+			if err != nil {
+				return &resources.Dish{}
+			}
+
+			return d
+		}),
+	}, nil
+
+}
+
+func (h *DishesHandler) GetParametersForVerb(verb interfaces.Verb) []params.Registration {
+	return []params.Registration{
+		{
+			Name:        paramDate,
+			ShortHand:   "d",
+			Description: "Menu date",
+			DefaultFunc: func() string { return time.Now().Format(time.DateOnly) },
+			ParseFunc:   func(value string) (any, error) { return time.Parse(time.DateOnly, value) },
+		},
+		{
+			Name:        paramLocation,
+			ShortHand:   "l",
+			Description: "Define the restaurant",
+			DefaultFunc: func() string { return "330" },
+			ParseFunc:   params.ParseString,
+		},
+	}
+}

core/handler/meals/handler.go

@@ -1,108 +0,0 @@
-package meals
-
-import (
-	"context"
-	"fmt"
-	"slices"
-	"strings"
-	"time"
-
-	"git.bissendorf.co/bissendorf/unifood/m/v2/core/handler"
-	"git.bissendorf.co/bissendorf/unifood/m/v2/core/interfaces"
-	"git.bissendorf.co/bissendorf/unifood/m/v2/core/interfaces/params"
-	"git.bissendorf.co/bissendorf/unifood/m/v2/model/external/stwbremen"
-	"git.bissendorf.co/bissendorf/unifood/m/v2/model/resources"
-	"git.bissendorf.co/bissendorf/unifood/m/v2/util"
-)
-
-type MealsHandler struct {
-	interfaces.ResourceHandler
-	interfaces.GetHandler
-
-	QueryClient interfaces.QueryClient[[]stwbremen.Meal]
-}
-
-func (h *MealsHandler) Get(ctx context.Context, name string, params params.Container) (*interfaces.ResourceList, error) {
-	// Read parameters
-	date, err := params.GetValue(handler.ParamDate)
-	if err != nil {
-		return nil, fmt.Errorf("unable to parse date parameter: %w", err)
-	}
-
-	restaurant, err := params.GetValue(handler.ParamRestaurant)
-	if err != nil {
-		return nil, fmt.Errorf("unable to parse restaurant parameter: %w", err)
-	}
-
-	// Build query
-	query := "page('meals').children.filterBy('printonly', 0)"
-	if date != "" {
-		parsed, err := time.Parse(time.DateOnly, date.(string))
-		if err != nil {
-			return nil, fmt.Errorf("unable to parse date parameter: %w", err)
-		}
-		query += fmt.Sprintf(".filterBy('date', '%s')", parsed.Format(time.DateOnly))
-	}
-	if restaurant != "" {
-		query += fmt.Sprintf(".filterBy('location', '%s')", restaurant.(string))
-	}
-	if name != "" {
-		query += fmt.Sprintf(".filterBy('id', 'meals/%s')", name)
-	}
-
-	// Run query
-	meals, err := h.QueryClient.Get(ctx,
-		query,
-		`{"title":true,"id":"page.id","ingredients":"page.ingredients.toObject","prices":"page.prices.toObject","location":true,"counter":true,"date":true,"mealadds":true,"mark":true,"frei3":true,"printonly":true,"kombicategory":true,"categories":"page.categories.split"}`,
-		false,
-	)
-	if err != nil {
-		return nil, fmt.Errorf("querying menu failed: %w", err)
-	}
-
-	// Transform to meal resource
-	items := util.Transform(*meals, func(i *stwbremen.Meal) *resources.Meal {
-		d, err := resources.MealFromDTO(*i)
-		if err != nil {
-			return &resources.Meal{}
-		}
-
-		return d
-	})
-
-	// Sort by date, restaurant and title - need to apply stable sorts in reverse order to achieve this
-	slices.SortFunc(items, func(a, b *resources.Meal) int {
-		return strings.Compare(a.Title, b.Title)
-	})
-	slices.SortStableFunc(items, func(a, b *resources.Meal) int {
-		return strings.Compare(a.RestaurantID, b.RestaurantID)
-	})
-	slices.SortStableFunc(items, func(a, b *resources.Meal) int {
-		return a.Date.Compare(b.Date)
-	})
-
-	// Return
-	return &interfaces.ResourceList{
-		ItemKind: resources.ResourceMeal,
-		Items:    util.Transform(items, func(i **resources.Meal) interfaces.Resource { return *i }),
-	}, nil
-}
-
-func (h *MealsHandler) GetParametersForVerb(verb interfaces.Verb) []params.Registration {
-	return []params.Registration{
-		{
-			Name:        handler.ParamDate,
-			ShortHand:   "d",
-			Description: "Meal date",
-			DefaultFunc: func() string { return "" },
-			ParseFunc:   params.ParseString,
-		},
-		{
-			Name:        handler.ParamRestaurant,
-			ShortHand:   "r",
-			Description: "Select a restaurant",
-			DefaultFunc: func() string { return "" },
-			ParseFunc:   params.ParseString,
-		},
-	}
-}

core/handler/params.go

@@ -1,6 +0,0 @@
-package handler
-
-const (
-	ParamDate       string = "date"
-	ParamRestaurant string = "restaurant"
-)

core/handler/universities/restaurant-handler.go

@@ -1,93 +0,0 @@
-package universities
-
-import (
-	"context"
-	"fmt"
-	"slices"
-	"strings"
-	"sync"
-
-	"git.bissendorf.co/bissendorf/unifood/m/v2/core/interfaces"
-	"git.bissendorf.co/bissendorf/unifood/m/v2/core/interfaces/params"
-	"git.bissendorf.co/bissendorf/unifood/m/v2/model/external/stwbremen"
-	"git.bissendorf.co/bissendorf/unifood/m/v2/model/resources"
-	"git.bissendorf.co/bissendorf/unifood/m/v2/util"
-)
-
-type RestaurantHandler struct {
-	QueryClient           interfaces.QueryClient[stwbremen.RestaurantList]
-	QueryClientRestaurant interfaces.QueryClient[stwbremen.Restaurant]
-}
-
-func (h *RestaurantHandler) Get(ctx context.Context, name string, params params.Container) (*interfaces.ResourceList, error) {
-	var list []string = []string{name}
-
-	// If no name provided, get list of all available restaurants
-	if name == "" {
-		fetchedNames, err := getRestaurantList(ctx, h.QueryClient)
-		if err != nil {
-			return nil, err
-		}
-
-		list = fetchedNames
-	}
-
-	// Get restaurant information in parallel
-	var wg sync.WaitGroup
-	var mutex sync.Mutex
-	restaurants := make([]resources.Restaurant, 0, len(list))
-	for _, name := range list {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-
-			restaurant, err := h.getRestaurantInfo(ctx, name)
-
-			// Append restaurant in critical section
-			if err == nil {
-				mutex.Lock()
-				restaurants = append(restaurants, *restaurant)
-				mutex.Unlock()
-			}
-		}()
-	}
-	wg.Wait()
-
-	// Sort by name
-	slices.SortFunc(restaurants, func(a, b resources.Restaurant) int { return strings.Compare(a.Name, b.Name) })
-
-	// Return
-	return &interfaces.ResourceList{
-		ItemKind: resources.ResourceRestaurant,
-		Items:    util.Transform(restaurants, func(i *resources.Restaurant) interfaces.Resource { return i }),
-	}, nil
-
-}
-
-func (h *RestaurantHandler) getRestaurantInfo(ctx context.Context, name string) (*resources.Restaurant, error) {
-	r, err := h.QueryClientRestaurant.Get(ctx,
-		fmt.Sprintf("page('essen-und-trinken/%s')", name),
-		`{"title": "page.title","id": "page.content.mensalocationid","image": "page.files.first().url","address": "page.content.address","openingTimes": {"query": "page.openingTimes.toStructure()","select": {"weekday": "structureItem.day","openingTime": "structureItem.open","closingTime": "structureItem.close"}},"offseasonOpeningTimes": {"query": "page.offseasonOpeningTimes.toStructure()","select": {"weekday": "structureItem.day","openingTime": "structureItem.open","closingTime": "structureItem.close"}},"offseasonStart": true,"offseasonEnd": true,"changedTimes": {"query": "page.changedTimes.toStructure()","select": {"startDate": "structureItem.startChangedDate","endDate": "structureItem.endChangedDate","openingTime": "structureItem.openChangedTime","closingTime": "structureItem.closedChangedTime"}}}`,
-		false,
-	)
-	if err != nil {
-		return nil, fmt.Errorf("failed to load restaurant %s: %w", name, err)
-	}
-
-	if r.Title == "" {
-		return nil, fmt.Errorf("restaurant not found: %s", name)
-	}
-
-	return &resources.Restaurant{
-		Name:         name,
-		Title:        r.Title,
-		ID:           r.ID,
-		Address:      r.Address,
-		Image:        r.Image,
-		OpeningHours: r.OpeningHours,
-	}, nil
-}
-
-func (h *RestaurantHandler) GetParametersForVerb(verb interfaces.Verb) []params.Registration {
-	return []params.Registration{}
-}

core/handler/universities/shared.go

@@ -1,31 +0,0 @@
-package universities
-
-import (
-	"context"
-	"fmt"
-	"strings"
-
-	"git.bissendorf.co/bissendorf/unifood/m/v2/core/interfaces"
-	"git.bissendorf.co/bissendorf/unifood/m/v2/model/external/stwbremen"
-	"git.bissendorf.co/bissendorf/unifood/m/v2/util"
-)
-
-func getRestaurantList(ctx context.Context, client interfaces.QueryClient[stwbremen.RestaurantList]) ([]string, error) {
-	list, err := client.Get(ctx,
-		`page('essen-und-trinken')`,
-		`{"items": "page.children.children"}`,
-		false,
-	)
-	if err != nil {
-		return nil, fmt.Errorf("failed to load university list: %w", err)
-	}
-
-	return util.Transform(list.Items, func(i *string) string {
-		parts := strings.SplitN(*i, "/", 2)
-		if len(parts) < 2 {
-			return parts[0]
-		}
-
-		return parts[1]
-	}), nil
-}

core/handler/universities/uni-handler.go

@@ -1,64 +0,0 @@
-package universities
-
-import (
-	"context"
-	"strings"
-
-	"git.bissendorf.co/bissendorf/unifood/m/v2/core/interfaces"
-	"git.bissendorf.co/bissendorf/unifood/m/v2/core/interfaces/params"
-	"git.bissendorf.co/bissendorf/unifood/m/v2/model/external/stwbremen"
-	"git.bissendorf.co/bissendorf/unifood/m/v2/model/resources"
-	"git.bissendorf.co/bissendorf/unifood/m/v2/util"
-)
-
-type UniversityHandler struct {
-	QueryClient interfaces.QueryClient[stwbremen.RestaurantList]
-}
-
-func (h *UniversityHandler) Get(ctx context.Context, name string, params params.Container) (*interfaces.ResourceList, error) {
-	// Get list of restaurants
-	list, err := getRestaurantList(ctx, h.QueryClient)
-	if err != nil {
-		return nil, err
-	}
-
-	// Group restaurants into universities
-	unis := util.Group(list, func(i *string) (string, string) {
-		parts := strings.SplitN(*i, "/", 2)
-		if len(parts) <= 1 {
-			return *i, *i
-		}
-
-		return parts[0], *i
-	})
-
-	// If name is provided remove all other unis
-	if name != "" {
-		uni, exists := unis[name]
-		unis = make(map[string][]string)
-
-		if exists {
-			unis[name] = uni
-		}
-	}
-
-	// Map into resource
-	uniItems := make([]resources.University, 0, len(unis))
-	for uni, restaurants := range unis {
-		uniItems = append(uniItems, resources.University{
-			Name:        uni,
-			Restaurants: restaurants,
-		})
-	}
-
-	// Return
-	return &interfaces.ResourceList{
-		ItemKind: resources.ResourceUniversity,
-		Items:    util.Transform(uniItems, func(i *resources.University) interfaces.Resource { return i }),
-	}, nil
-
-}
-
-func (h *UniversityHandler) GetParametersForVerb(verb interfaces.Verb) []params.Registration {
-	return []params.Registration{}
-}

core/interfaces/handler.go

@@ -19,7 +19,7 @@ type ResourceHandler interface {
 }
 
 type GetHandler interface {
-	Get(ctx context.Context, name string, params params.Container) (*ResourceList, error)
+	Get(ctx context.Context, params params.Container) (*ResourceList, error)
 }
 
 type Verb string

core/interfaces/resource.go

@@ -3,7 +3,7 @@ package interfaces
 type Resource interface {
 	Kind() string
 
-	ItemName() string
+	Name() string
 }
 
 type ResourceList struct {

core/output/table.go

@@ -55,7 +55,7 @@ func (f *TableFormatter) Format(list *interfaces.ResourceList) (io.Reader, error
 
 	// Write rows
 	for _, item := range list.Items {
-		rowOutput := []any{item.ItemName()}
+		rowOutput := []any{item.Name()}
 
 		itemFormatter, ok := item.(interfaces.TableOutput)
 		if ok {

model/external/stwbremen/dish.go

@@ -1,8 +1,7 @@
 package stwbremen
 
-type Meal struct {
+type Dish struct {
 	Title       string       `json:"title"`
-	ID          string       `json:"id"`
 	Ingredients []Ingredient `json:"ingredients"`
 	Prices      []Price      `json:"prices"`
 	Location    string       `json:"location"`

model/external/stwbremen/restaurant.go

@@ -1,35 +0,0 @@
-package stwbremen
-
-type RestaurantList struct {
-	Items []string `json:"items"`
-}
-
-type Restaurant struct {
-	Title   string `json:"title"`
-	ID      string `json:"id"`
-	Image   string `json:"image"`
-	Address string `json:"address"`
-
-	OpeningHours
-}
-
-type OpeningHours struct {
-	OpeningTimes          []OpeningTime `json:"openingTimes"`
-	OffseasonOpeningTimes []OpeningTime `json:"offseasonOpeningTimes"`
-	OffseasonStart        DateOnly      `json:"offseasonStart"`
-	OffseasonEnd          DateOnly      `json:"offseasonEnd"`
-	ChangedTimes          []ChangedTime `json:"changedTimes"`
-}
-
-type OpeningTime struct {
-	Weekday     string   `json:"weekday"`
-	OpeningTime TimeOnly `json:"openingTime"`
-	ClosingTime TimeOnly `json:"closingTime"`
-}
-
-type ChangedTime struct {
-	StartDate   DateOnly `json:"startDate"`
-	EndDate     DateOnly `json:"endDate"`
-	OpeningTime TimeOnly `json:"openingTime"`
-	ClosingTime TimeOnly `json:"closingTime"`
-}

model/external/stwbremen/types.go

@@ -1,53 +0,0 @@
-package stwbremen
-
-import (
-	"encoding/json"
-	"time"
-)
-
-type TimeOnly struct {
-	time.Time
-}
-
-// UnmarshalJSON parses a JSON string in HH:MM:SS format into a TimeOnly
-func (t *TimeOnly) UnmarshalJSON(b []byte) error {
-	var s string
-	if err := json.Unmarshal(b, &s); err != nil {
-		return err
-	}
-	parsed, err := time.Parse(time.TimeOnly, s)
-	if err != nil {
-		return err
-	}
-	t.Time = parsed
-	return nil
-}
-
-// MarshalJSON converts the TimeOnly to a JSON string in HH:MM:SS format
-func (t TimeOnly) MarshalJSON() ([]byte, error) {
-	return json.Marshal(t.Format(time.TimeOnly))
-}
-
-type DateOnly struct {
-	time.Time
-}
-
-// UnmarshalJSON parses a JSON string in YYYY-MM-DD format into a DateOnly
-func (d *DateOnly) UnmarshalJSON(b []byte) error {
-	var s string
-	if err := json.Unmarshal(b, &s); err != nil {
-		return err
-	}
-	parsed, err := time.Parse(time.DateOnly, s)
-	if err != nil {
-		d.Time = time.Time{}
-	} else {
-		d.Time = parsed
-	}
-	return nil
-}
-
-// MarshalJSON converts the DateOnly to a JSON string in YYYY-MM-DD format
-func (d DateOnly) MarshalJSON() ([]byte, error) {
-	return json.Marshal(d.Format(time.DateOnly))
-}

model/resources/dish.go

@@ -0,0 +1,64 @@
+package resources
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
+	"git.bissendorf.co/bissendorf/unifood/m/v2/model/external/stwbremen"
+	"git.bissendorf.co/bissendorf/unifood/m/v2/util"
+)
+
+func DishFromDTO(dish stwbremen.Dish) (*Dish, error) {
+	date, err := time.Parse(time.DateOnly, dish.Date)
+	if err != nil {
+		return nil, fmt.Errorf("unable to parse dish date: %w", err)
+	}
+
+	return &Dish{
+		Title:    dish.Title,
+		Location: dish.Location,
+		Date:     date,
+		Tags:     strings.Split(strings.Replace(dish.Tags, " ", "", -1), ","),
+		Counter:  dish.Counter,
+		Prices: util.Map(dish.Prices, func(i *stwbremen.Price) (string, float32) {
+			p, err := strconv.ParseFloat(strings.Trim(i.Price, " "), 32)
+			if err != nil {
+				p = 0
+			}
+			return i.Label, float32(p)
+		}),
+		Ingredients: util.Select(util.Transform(dish.Ingredients, func(i *stwbremen.Ingredient) ingredient {
+			return ingredient{
+				Name:        i.Label,
+				Additionals: i.Additionals,
+			}
+		}), func(i *ingredient) bool { return i.Name != "" }),
+	}, nil
+}
+
+const ResourceDish = "dish"
+
+type Dish struct {
+	Title       string
+	Location    string
+	Ingredients []ingredient
+	Prices      map[string]float32
+	Date        time.Time
+	Counter     string
+	Tags        []string
+}
+
+type ingredient struct {
+	Name        string
+	Additionals []string
+}
+
+func (d *Dish) Kind() string { return ResourceDish }
+func (d *Dish) Name() string { return d.Title }
+
+func (d *Dish) ColumnNames() []string { return []string{"Location", "Date", "Counter", "Price"} }
+func (d *Dish) Columns() []any {
+	return []any{d.Location, d.Date.Format(time.DateOnly), d.Counter, d.Prices["Studierende"]}
+}

model/resources/meals.go

@@ -1,71 +0,0 @@
-package resources
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-	"time"
-
-	"git.bissendorf.co/bissendorf/unifood/m/v2/model/external/stwbremen"
-	"git.bissendorf.co/bissendorf/unifood/m/v2/util"
-)
-
-func MealFromDTO(meal stwbremen.Meal) (*Meal, error) {
-	date, err := time.Parse(time.DateOnly, meal.Date)
-	if err != nil {
-		return nil, fmt.Errorf("unable to parse meal date: %w", err)
-	}
-
-	id, _ := strings.CutPrefix(meal.ID, "meals/")
-
-	return &Meal{
-		Title:        meal.Title,
-		RestaurantID: meal.Location,
-		ID:           id,
-		Date:         date,
-		Tags:         strings.Split(strings.Replace(meal.Tags, " ", "", -1), ","),
-		Counter:      meal.Counter,
-		Prices: util.Map(meal.Prices, func(i *stwbremen.Price) (string, float32) {
-			p, err := strconv.ParseFloat(strings.Trim(i.Price, " "), 32)
-			if err != nil {
-				p = 0
-			}
-			return i.Label, float32(p)
-		}),
-		Ingredients: util.Select(util.Transform(meal.Ingredients, func(i *stwbremen.Ingredient) ingredient {
-			return ingredient{
-				Name:        i.Label,
-				Additionals: i.Additionals,
-			}
-		}), func(i *ingredient) bool { return i.Name != "" }),
-	}, nil
-}
-
-const ResourceMeal = "meal"
-
-type Meal struct {
-	Title        string
-	ID           string
-	RestaurantID string
-	Ingredients  []ingredient
-	Prices       map[string]float32
-	Date         time.Time
-	Counter      string
-	Tags         []string
-}
-
-type ingredient struct {
-	Name        string
-	Additionals []string
-}
-
-func (d *Meal) Kind() string     { return ResourceMeal }
-func (d *Meal) ItemName() string { return d.ID }
-
-// Table output
-func (d *Meal) ColumnNames() []string {
-	return []string{"Date", "Restaurant", "Title", "Counter", "Price"}
-}
-func (d *Meal) Columns() []any {
-	return []any{d.Date.Format(time.DateOnly), d.RestaurantID, d.Title, d.Counter, d.Prices["Studierende"]}
-}

model/resources/resources.go

@@ -1,20 +0,0 @@
-package resources
-
-import "strings"
-
-const ResourceResource = "resource"
-
-type Resource struct {
-	ResourceName string
-	Aliases      []string
-	Description  string
-}
-
-func (r *Resource) Kind() string     { return ResourceResource }
-func (r *Resource) ItemName() string { return r.ResourceName }
-
-// Table output
-func (r *Resource) ColumnNames() []string { return []string{"Aliases", "Description"} }
-func (r *Resource) Columns() []any {
-	return []any{strings.Join(r.Aliases, ", "), r.Description}
-}

model/resources/restaurant.go

@@ -1,21 +0,0 @@
-package resources
-
-const ResourceRestaurant = "restaurant"
-
-type Restaurant struct {
-	Name         string
-	Title        string
-	ID           string
-	Address      string
-	Image        string
-	OpeningHours any
-}
-
-func (r *Restaurant) Kind() string     { return ResourceRestaurant }
-func (r *Restaurant) ItemName() string { return r.Name }
-
-// Table output
-func (r *Restaurant) ColumnNames() []string { return []string{"ID", "Title"} }
-func (r *Restaurant) Columns() []any {
-	return []any{r.ID, r.Title}
-}

model/resources/university.go

@@ -1,19 +0,0 @@
-package resources
-
-import "strings"
-
-const ResourceUniversity = "university"
-
-type University struct {
-	Name        string
-	Restaurants []string
-}
-
-func (u *University) Kind() string     { return ResourceUniversity }
-func (u *University) ItemName() string { return u.Name }
-
-// Table output
-func (u *University) ColumnNames() []string { return []string{"Restaurants"} }
-func (u *University) Columns() []any {
-	return []any{strings.Join(u.Restaurants, "\r\n")}
-}

util/slices.go

@@ -31,18 +31,3 @@ func Map[T any, Tkey comparable, Tval any](s []T, transformFn func(i *T) (Tkey,
 
 	return
 }
-
-func Group[T any, Tkey comparable, Tval any](s []T, groupFn func(i *T) (groupKey Tkey, value Tval)) (out map[Tkey][]Tval) {
-	out = make(map[Tkey][]Tval)
-	for _, i := range s {
-		key, value := groupFn(&i)
-		list, exists := out[key]
-		if !exists {
-			list = make([]Tval, 0, 2)
-		}
-
-		out[key] = append(list, value)
-	}
-
-	return
-}

util/version.go

@@ -1,3 +0,0 @@
-package util
-
-const AppVersion = "v0.1"