feat: get handlers return object slices
This commit is contained in:
5
.vscode/launch.json
vendored
5
.vscode/launch.json
vendored
@ -11,7 +11,10 @@
|
||||
"mode": "debug",
|
||||
"program": "${workspaceFolder}/main.go",
|
||||
"args": [
|
||||
"get", "menu", "-o", "yaml", "--print-config", "true"
|
||||
"get", "dishes",
|
||||
"-o", "yaml",
|
||||
"-d", "2025-07-21",
|
||||
"--print-config"
|
||||
]
|
||||
}
|
||||
]
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"git.bissendorf.co/bissendorf/unifood/m/v2/core/handler/menu"
|
||||
"git.bissendorf.co/bissendorf/unifood/m/v2/core/handler/dishes"
|
||||
"git.bissendorf.co/bissendorf/unifood/m/v2/core/interfaces"
|
||||
"git.bissendorf.co/bissendorf/unifood/m/v2/core/services/stwhbclient"
|
||||
"git.bissendorf.co/bissendorf/unifood/m/v2/model/external/stwbremen"
|
||||
@ -9,10 +9,10 @@ import (
|
||||
|
||||
var availableResources = []interfaces.ResourceCommand[any]{
|
||||
{
|
||||
Name: "menu",
|
||||
Aliases: []string{"m"},
|
||||
Name: "dishes",
|
||||
Aliases: []string{"dish", "d"},
|
||||
Verbs: []interfaces.Verb{interfaces.VerbGet},
|
||||
Handler: &menu.MenuHandler{
|
||||
Handler: &dishes.DishesHandler{
|
||||
QueryClient: stwhbclient.New[[]stwbremen.Dish](),
|
||||
},
|
||||
},
|
||||
|
||||
@ -37,7 +37,5 @@ func initRootCmd() {
|
||||
logger := jlog.New(slog.LevelDebug)
|
||||
ctx := jlog.ContextWith(context.Background(), logger)
|
||||
|
||||
logger.Debug("Register verb commands")
|
||||
rootCmd.AddCommand(getVerbs(ctx, &appConfig)...)
|
||||
logger.Debug("Verb commands registered successfully")
|
||||
}
|
||||
|
||||
10
cmd/verbs.go
10
cmd/verbs.go
@ -33,8 +33,8 @@ var verbs = []VerbItem{
|
||||
return fmt.Errorf("resource does not support GET")
|
||||
}
|
||||
|
||||
// Get item
|
||||
item, err := h.Get(ctx, params)
|
||||
// Get items
|
||||
items, err := h.Get(ctx, params)
|
||||
if err != nil {
|
||||
return fmt.Errorf("retrieving item failed: %w", err)
|
||||
}
|
||||
@ -46,7 +46,7 @@ var verbs = []VerbItem{
|
||||
}
|
||||
|
||||
// Format and output
|
||||
formatted, err := formatter.Format(item)
|
||||
formatted, err := formatter.Format(items)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to format output: %w", err)
|
||||
}
|
||||
@ -61,8 +61,6 @@ var verbs = []VerbItem{
|
||||
}
|
||||
|
||||
func getVerbs(ctx context.Context, config *AppConfig) (commands []*cobra.Command) {
|
||||
logger := jlog.FromContext(ctx)
|
||||
|
||||
for _, v := range verbs {
|
||||
verbCommand := &cobra.Command{
|
||||
Use: strings.ToLower(string(v.Name)),
|
||||
@ -115,8 +113,6 @@ func getVerbs(ctx context.Context, config *AppConfig) (commands []*cobra.Command
|
||||
)
|
||||
}
|
||||
verbCommand.AddCommand(resourceCommand)
|
||||
|
||||
logger.Debug(fmt.Sprintf("Registered %s %s", strings.ToUpper(string(v.Name)), r.Name))
|
||||
}
|
||||
|
||||
commands = append(commands, verbCommand)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package menu
|
||||
package dishes
|
||||
|
||||
import (
|
||||
"context"
|
||||
@ -12,7 +12,7 @@ import (
|
||||
"git.bissendorf.co/bissendorf/unifood/m/v2/util"
|
||||
)
|
||||
|
||||
type MenuHandler struct {
|
||||
type DishesHandler struct {
|
||||
interfaces.ResourceHandler
|
||||
interfaces.GetHandler
|
||||
|
||||
@ -24,7 +24,7 @@ const (
|
||||
paramLocation = "location"
|
||||
)
|
||||
|
||||
func (h *MenuHandler) Get(ctx context.Context, params params.Container) (any, error) {
|
||||
func (h *DishesHandler) Get(ctx context.Context, params params.Container) ([]any, error) {
|
||||
// Read parameters
|
||||
p, err := params.GetValue(paramDate)
|
||||
if err != nil {
|
||||
@ -55,20 +55,18 @@ func (h *MenuHandler) Get(ctx context.Context, params params.Container) (any, er
|
||||
}
|
||||
|
||||
// Return
|
||||
return &resources.Menu{
|
||||
Location: location.(string),
|
||||
Dishes: util.Transform(*dishes, func(i *stwbremen.Dish) resources.Dish {
|
||||
return util.Transform(*dishes, func(i *stwbremen.Dish) any {
|
||||
d, err := resources.DishFromDTO(*i)
|
||||
if err != nil {
|
||||
return resources.Dish{}
|
||||
}
|
||||
|
||||
return *d
|
||||
}),
|
||||
}, nil
|
||||
}), nil
|
||||
|
||||
}
|
||||
|
||||
func (h *MenuHandler) GetParametersForVerb(verb interfaces.Verb) []params.Registration {
|
||||
func (h *DishesHandler) GetParametersForVerb(verb interfaces.Verb) []params.Registration {
|
||||
return []params.Registration{
|
||||
{
|
||||
Name: paramDate,
|
||||
@ -19,7 +19,7 @@ type ResourceHandler interface {
|
||||
}
|
||||
|
||||
type GetHandler interface {
|
||||
Get(ctx context.Context, params params.Container) (any, error)
|
||||
Get(ctx context.Context, params params.Container) ([]any, error)
|
||||
}
|
||||
|
||||
type Verb string
|
||||
|
||||
@ -3,5 +3,5 @@ package interfaces
|
||||
import "io"
|
||||
|
||||
type Formatter interface {
|
||||
Format(object any) (io.Reader, error)
|
||||
Format(object []any) (io.Reader, error)
|
||||
}
|
||||
|
||||
@ -8,6 +8,6 @@ import (
|
||||
|
||||
type GoFormatter struct{}
|
||||
|
||||
func (f *GoFormatter) Format(object any) (io.Reader, error) {
|
||||
return strings.NewReader(fmt.Sprintf("%#v", object)), nil
|
||||
func (f *GoFormatter) Format(objects []any) (io.Reader, error) {
|
||||
return strings.NewReader(fmt.Sprintf("%#v", objects)), nil
|
||||
}
|
||||
|
||||
@ -8,8 +8,8 @@ import (
|
||||
|
||||
type JsonFormatter struct{}
|
||||
|
||||
func (f *JsonFormatter) Format(object any) (io.Reader, error) {
|
||||
func (f *JsonFormatter) Format(objects []any) (io.Reader, error) {
|
||||
var buffer = make([]byte, 0, 1024)
|
||||
outputBuffer := bytes.NewBuffer(buffer)
|
||||
return outputBuffer, json.NewEncoder(outputBuffer).Encode(object)
|
||||
return outputBuffer, json.NewEncoder(outputBuffer).Encode(objects)
|
||||
}
|
||||
|
||||
@ -9,8 +9,8 @@ import (
|
||||
|
||||
type YamlFormatter struct{}
|
||||
|
||||
func (f *YamlFormatter) Format(object any) (io.Reader, error) {
|
||||
buffer, err := yaml.Marshal(object)
|
||||
func (f *YamlFormatter) Format(objects []any) (io.Reader, error) {
|
||||
buffer, err := yaml.Marshal(objects)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@ -10,11 +10,6 @@ import (
|
||||
"git.bissendorf.co/bissendorf/unifood/m/v2/util"
|
||||
)
|
||||
|
||||
type Menu struct {
|
||||
Location string
|
||||
Dishes []Dish
|
||||
}
|
||||
|
||||
func DishFromDTO(dish stwbremen.Dish) (*Dish, error) {
|
||||
date, err := time.Parse(time.DateOnly, dish.Date)
|
||||
if err != nil {
|
||||
Reference in New Issue
Block a user