add MediaLofi in kontor-gin (#97)

Co-authored-by: Thomas Peetz <thomas.peetz@cimt-ag.de>
Reviewed-on: #97

kontor-gin/internal/api/data.go

@@ -3,6 +3,7 @@ package api
 import (
 	"encoding/json"
 	"fmt"
+	"kontor-api-gin/internal/config"
 	"kontor-api-gin/internal/models"
 	"log/slog"
 	"os"
@@ -21,7 +22,7 @@ type LoginResponse struct {
 
 type ExportData struct {
 	Sport              models.SportDTOList            `json:"sport"`
-	Player             []models.PlayerDTO             `json:"player"`
+	Player             models.PlayerDTOList           `json:"player"`
 	Team               []models.TeamDTO               `json:"team"`
 	Position           []models.PositionDTO           `json:"field_position"`
 	Rooster            []models.RoosterDTO            `json:"rooster"`
@@ -64,6 +65,8 @@ func (e *ExportData) GetMap() map[string]any {
 		switch path {
 		case "tysc/sports":
 			dataMap["sports"] = value
+		case "tysc/players":
+			dataMap["players"] = value
 		}
 	}
 	return dataMap
@@ -110,14 +113,33 @@ var (
 
 var Registry map[string]any
 
-func GetData(server, apiVersion string) (data *ExportData, err error) {
+func GetToken(client *resty.Client, server config.Server) (token string) {
+	var login LoginResponse
+
+	_, err := client.R().
+		SetBody(Login{
+			Email:    "thomas.peetz@thpeetz.de",
+			Password: "admin",
+		}).
+		SetHeader("Accept", "application/json").
+		SetResult(&login).
+		Post("http://127.0.0.1:8550/api/login")
+	if err != nil {
+		slog.Info("Health", "error", err.Error())
+	}
+	slog.Info("health", "token", login.Token)
+	return login.Token
+}
+
+func GetData(server config.Server, apiVersion string) (data *ExportData, err error) {
 	var login LoginResponse
 
 	client := resty.New()
-	PostJSON(client, fmt.Sprintf("%s/%s/%s", server, "api", "login"), &login)
+	client.SetLoggerWarnLevel(true)
+	PostJSON(client, server, "api/login", &login)
 
 	for path, value := range Registry {
-		GetJSON(client, login.Token, fmt.Sprintf("%s/%s/%s", server, apiVersion, path), value)
+		GetJSON(client, login.Token, server, path, value)
 	}
 	export := ExportData{
 		Sport:              Sports,
@@ -176,7 +198,11 @@ func WriteJson(data *ExportData, fileName string) error {
 	return nil
 }
 
-func GetJSON(client *resty.Client, token string, url string, v any) {
+func GetJSON(client *resty.Client, token string, server config.Server, path string, v any) {
+	url := fmt.Sprintf("%s/%s/%s", server.Url, config.Config.ApiVersion, path)
+	if config.Verbose > 2 {
+		slog.Info("GetJSON", "url", url)
+	}
 	_, err := client.R().
 		SetAuthToken(token).
 		SetHeader("Accept", "application/json").
@@ -185,21 +211,30 @@ func GetJSON(client *resty.Client, token string, url string, v any) {
 	if err != nil {
 		slog.Info(url, "error", err.Error())
 	}
+	if config.Verbose > 2 {
+		slog.Info("GetJSON", "value", v)
+	}
 }
 
-func PostJSON(client *resty.Client, url string, v any) {
+func PostJSON(client *resty.Client, server config.Server, path string, v any) {
+	url := fmt.Sprintf("%s/%s", server.Url, path)
+	if config.Verbose > 2 {
+		slog.Info("PostJSON", "url", url)
+	}
 	_, err := client.R().
 		SetBody(Login{
-			Email:    "thomas.peetz@thpeetz.de",
-			Password: "admin",
+			Email:    server.Username,
+			Password: server.Password,
 		}).
 		SetHeader("Accept", "application/json").
 		SetResult(v).
 		Post(url)
 	if err != nil {
-		slog.Info("Health", "error", err.Error())
+		slog.Info("PostJSON", "error", err.Error())
+	}
+	if config.Verbose > 2 {
+		slog.Info(url, "token", v)
 	}
-	slog.Info(url, "token", v)
 }
 
 func init() {

kontor-gin/internal/cmd/add-links.go

@@ -2,6 +2,8 @@ package cmd
 
 import (
 	"fmt"
+	"kontor-api-gin/internal/api"
+	"kontor-api-gin/internal/config"
 	"kontor-api-gin/internal/helpers"
 	"kontor-api-gin/internal/models"
 	"log/slog"
@@ -11,6 +13,10 @@ import (
 	"resty.dev/v3"
 )
 
+var (
+	servername string
+)
+
 var addLinksCmd = &cobra.Command{
 	Use:   "add-links [file]",
 	Short: "Add Links",
@@ -25,18 +31,24 @@ var addLinksCmd = &cobra.Command{
 			slog.Warn("add links failed", "error", err)
 			os.Exit(1)
 		}
-		var login LoginResponse
+		client := resty.New()
+		localServer := config.Config.Server[servername]
+		token := api.GetToken(client, localServer)
 		for _, line := range lines {
 			lofiAdd := models.MediaLofiAdd{Url: line}
-			client := resty.New()
-			PostJSON(client, fmt.Sprintf("%s/%s/%s", server, "api", "login"), &login)
+			addResult := &models.MediaLoFi{}
 			response, err := client.R().
 				SetBody(lofiAdd).
+				SetAuthToken(token).
 				SetHeader("Accept", "application/json").
-				Post("http://localhost:8550/api/v1/media/lofi")
+				SetResult(addResult).
+				Post("http://localhost:8550/api/v1/media/lofis")
 			if err != nil {
 				slog.Info("Add Lofi", "error", err.Error())
 			}
+			if addResult != nil {
+				slog.Info("Lofi added", "lofi", addResult)
+			}
 			slog.Info("Add Lofi", "status", response.StatusCode(), "body", response.Body)
 		}
 	},

kontor-gin/internal/cmd/check.go

@@ -1,7 +1,8 @@
 package cmd
 
 import (
-	"kontor-api-gin/internal/models"
+	"kontor-api-gin/internal/api"
+	"kontor-api-gin/internal/config"
 	"log/slog"
 
 	"github.com/spf13/cobra"
@@ -24,39 +25,17 @@ var checkCmd = &cobra.Command{
 	// Args:  cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		slog.Info("check kontor")
-		slog.Info("Verbosity level", "level", verbose)
-		var login LoginResponse
+		slog.Info("Verbosity level", "level", config.Verbose)
 		client := resty.New()
-		_, err := client.R().
-			SetBody(Login{
-				Email:    "thomas.peetz@thpeetz.de",
-				Password: "admin",
-			}).
-			SetHeader("Accept", "application/json").
-			SetResult(&login).
-			Post("http://127.0.0.1:8550/api/login")
-		if err != nil {
-			slog.Info("Health", "error", err.Error())
-		}
-		slog.Info("health", "token", login.Token)
-
-		type ExportData struct {
-			Sport []models.SportDTO `json:"sport"`
-			Comic []models.ComicDTO `json:"comic"`
-		}
-
-		var comics []models.ComicDTO
-		_, err = client.R().
-			SetAuthToken(login.Token).
-			SetHeader("Accept", "application/json").
-			SetResult(&comics).
-			Get("http://127.0.0.1:8550/api/v1/comics/comics")
-		if err != nil {
-			slog.Info("comics", "error", err.Error())
-		}
-		// slog.Info("comics", "res", comics)
-
 		defer client.Close()
+		localServer := config.Config.Server["local"]
+		mainServer := config.Config.Server["main"]
+
+		localData, _ := api.GetData(localServer, config.Config.ApiVersion)
+		mainData, _ := api.GetData(mainServer, config.Config.ApiVersion)
+
+		slog.Info("comics local", "count", len(localData.Comic))
+		slog.Info("comics main", "count", len(mainData.Comic))
 
 		slog.Info("kontor.check_kontor.check_duplicate_links")
 		// check_duplicate_links(first_server, dirs)

kontor-gin/internal/cmd/config.go

@@ -0,0 +1,32 @@
+package cmd
+
+import (
+	"kontor-api-gin/internal/config"
+	"log/slog"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+)
+
+var configCmd = &cobra.Command{
+	Use:              "config",
+	TraverseChildren: true,
+	Short:            "show current config",
+	Long:             "show current config",
+	// Args:  cobra.ExactArgs(2),
+	Run: func(cmd *cobra.Command, args []string) {
+		slog.Info("show config")
+		var config config.CliConfig
+		if err := viper.Unmarshal(&config); err != nil {
+			slog.Info("unable to decode config", "error", err.Error())
+		}
+		for name, server := range config.Server {
+			slog.Info("show config", "server", name, "URL", server.Url)
+		}
+		slog.Info("show config", "config", config)
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(configCmd)
+}

kontor-gin/internal/cmd/export.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"kontor-api-gin/internal/api"
+	"kontor-api-gin/internal/config"
 	"log/slog"
 
 	"github.com/spf13/cobra"
@@ -10,11 +11,7 @@ import (
 	"resty.dev/v3"
 )
 
-var (
-	server     string
-	filename   string
-	apiVersion string
-)
+var filename string
 
 var exportCmd = &cobra.Command{
 	Use:   "export",
@@ -23,17 +20,14 @@ var exportCmd = &cobra.Command{
 	// Args:  cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		slog.Info("export kontor")
-		slog.Info("Verbosity level", "level", verbose)
-		slog.Info(fmt.Sprintf("Using server: %s", server))
-		var login LoginResponse
+		slog.Info("Verbosity level", "level", config.Verbose)
+		slog.Info(fmt.Sprintf("Using server: %s", config.ServerName))
 
 		client := resty.New()
-		PostJSON(client, fmt.Sprintf("%s/%s/%s", server, "api", "login"), &login)
+		defer client.Close()
+		localServer := config.Config.Server[config.ServerName]
 
-		for path, value := range api.Registry {
-			GetJSON(client, login.Token, fmt.Sprintf("%s/%s/%s", server, apiVersion, path), value)
-		}
-		export, _ := api.GetData(server, apiVersion)
+		export, _ := api.GetData(localServer, config.Config.ApiVersion)
 		err := api.WriteJson(export, filename)
 		if err != nil {
 			slog.Info("WriteJon failed", "Error:", err)
@@ -42,39 +36,11 @@ var exportCmd = &cobra.Command{
 	},
 }
 
-func GetJSON(client *resty.Client, token string, url string, v any) {
-	_, err := client.R().
-		SetAuthToken(token).
-		SetHeader("Accept", "application/json").
-		SetResult(v).
-		Get(url)
-	if err != nil {
-		slog.Info(url, "error", err.Error())
-	}
-}
-
-func PostJSON(client *resty.Client, url string, v any) {
-	_, err := client.R().
-		SetBody(Login{
-			Email:    "thomas.peetz@thpeetz.de",
-			Password: "admin",
-		}).
-		SetHeader("Accept", "application/json").
-		SetResult(v).
-		Post(url)
-	if err != nil {
-		slog.Info("Health", "error", err.Error())
-	}
-	slog.Info(url, "token", v)
-}
-
 func init() {
 	rootCmd.AddCommand(exportCmd)
 
-	exportCmd.PersistentFlags().StringVarP(&server, "server", "s", "http://127.0.0.1:8550", "Define server to get Kontor items")
-	viper.BindPFlag("server", exportCmd.PersistentFlags().Lookup("server"))
 	exportCmd.PersistentFlags().StringVarP(&filename, "file", "f", "/home/tpeetz/.sync/media/data-gin.json", "Filename to store data")
 	viper.BindPFlag("file", exportCmd.PersistentFlags().Lookup("file"))
-	exportCmd.PersistentFlags().StringVarP(&apiVersion, "api", "a", "api/v1", "API Version")
+	exportCmd.PersistentFlags().StringVarP(&config.Config.ApiVersion, "api", "a", "api/v1", "API Version")
 	viper.BindPFlag("api", exportCmd.PersistentFlags().Lookup("api"))
 }

kontor-gin/internal/cmd/init.go

@@ -0,0 +1,42 @@
+package cmd
+
+import (
+	"kontor-api-gin/internal/config"
+	"log/slog"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+)
+
+var configInitcmd = &cobra.Command{
+	Use:   "init",
+	Short: "create config",
+	Long:  "create config file with defaults",
+	// Args:  cobra.ExactArgs(2),
+	Run: func(cmd *cobra.Command, args []string) {
+		slog.Info("create config")
+		config := config.CliConfig{
+			Server: map[string]config.Server{
+				"main": {
+					Url:      "https://kontor-gin.thpeetz.de",
+					Username: "user",
+					Password: "password",
+				},
+				"local": {
+					Url:      "http://localhost:8550",
+					Username: "user",
+					Password: "password",
+				},
+			},
+		}
+		viper.Set("server", config.Server)
+		if err := viper.WriteConfig(); err != nil {
+			slog.Info("write config failed", "error", err.Error())
+		}
+	},
+}
+
+func init() {
+	configInitcmd.Flags().BoolVarP(&config.Overwrite, "overwrite", "y", false, "overwrite existing config")
+	configCmd.AddCommand(configInitcmd)
+}

kontor-gin/internal/cmd/root.go

@@ -2,30 +2,25 @@ package cmd
 
 import (
 	"fmt"
+	"kontor-api-gin/internal/config"
 	"log/slog"
 	"os"
 
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 )
 
-var cfgFile string
-var verbose int
-
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
-	Use:   "kontor-cli",
-	Short: "A brief description of your application",
-	Long: `A longer description that spans multiple lines and likely contains
-examples and usage of using your application. For example:
-
-Cobra is a CLI library for Go that empowers applications.
-This application is a tool to generate the needed files
-to quickly create a Cobra application.`,
+	Use:              "kontor-cli",
+	TraverseChildren: true,
+	Short:            "A brief description of your application",
+	Long:             ``,
 	// Uncomment the following line if your bare application
 	// has an action associated with it:
 	Run: func(cmd *cobra.Command, args []string) {
 		cmd.Help()
-		slog.Info("Verbosity level", "level", verbose)
+		slog.Info("Verbosity level", "level", config.Verbose)
 	},
 }
 
@@ -37,6 +32,10 @@ func Execute() {
 }
 
 func init() {
-	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "c", "config file (default is $HOME/.config/kli.yaml)")
-	rootCmd.PersistentFlags().CountVarP(&verbose, "verbose", "v", "increase verbosity (-v, -vv, -vvv)")
+	rootCmd.PersistentFlags().StringVarP(&config.CfgFile, "config", "c", "/home/tpeetz/.config/kli.yaml", "config file")
+	rootCmd.PersistentFlags().CountVarP(&config.Verbose, "verbose", "v", "increase verbosity (-v, -vv, -vvv)")
+	viper.BindPFlag("config", rootCmd.PersistentFlags().Lookup("config"))
+	exportCmd.Flags().StringVarP(&config.ServerName, "servername", "s", "local", "Define server to get Kontor items")
+	viper.BindPFlag("server", exportCmd.PersistentFlags().Lookup("server"))
+	cobra.OnInitialize(config.InitCliConfig)
 }

kontor-gin/internal/cmd/sync.go

@@ -2,10 +2,12 @@ package cmd
 
 import (
 	"kontor-api-gin/internal/api"
+	"kontor-api-gin/internal/config"
 	"log/slog"
 	"reflect"
 
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 )
 
 var syncCmd = &cobra.Command{
@@ -15,16 +17,25 @@ var syncCmd = &cobra.Command{
 	// Args:  cobra.ExactArgs(2),
 	Run: func(cmd *cobra.Command, args []string) {
 		slog.Info("sync kontor")
-		sourceData, _ := api.GetData(server, apiVersion)
-		targetData, _ := api.GetData("https://kontor-gin.thpeetz.de", apiVersion)
-		slog.Info("Size of targetData", "size", reflect.TypeOf(targetData).Size())
+		apiVersion := viper.GetString("api")
+		mainServer := config.Config.Server["main"]
+		if config.Verbose > 2 {
+			slog.Info("syncCmd#Run", "mainServer", mainServer)
+		}
+		localServer := config.Config.Server["local"]
+		sourceData, _ := api.GetData(mainServer, apiVersion)
+		targetData, _ := api.GetData(localServer, apiVersion)
+		if config.Verbose > 2 {
+			slog.Info("Size of targetData", "size", reflect.TypeOf(targetData).Size())
+		}
 		// find missing items in target and collect items not available in source
 		for table, item_list := range sourceData.GetMap() {
 			slog.Info("iterate sourceData", "table", table, "count", reflect.TypeOf(item_list).Size())
 			switch table {
 			case "sports":
 				sourceData.Sport.CompareIds(&targetData.Sport)
-
+			case "players":
+				sourceData.Player.CompareIds(&targetData.Player)
 			}
 
 		}

kontor-gin/internal/config/config.go

@@ -8,6 +8,55 @@ import (
 	"github.com/spf13/viper"
 )
 
+var (
+	CfgFile    string
+	Verbose    int
+	Overwrite  bool
+	ServerName string
+	Config     CliConfig
+)
+
+type Server struct {
+	Url      string `mapstructure:"url"`
+	Username string `mapstructure:"username"`
+	Password string `mapstructure:"password"`
+}
+
+type CliConfig struct {
+	ApiVersion string
+	Server     map[string]Server `mapstructure:"server"`
+}
+
+func InitCliConfig() {
+	slog.Info("InitCliConfig")
+	if CfgFile != "" {
+		viper.SetConfigFile(CfgFile)
+	} else {
+		viper.SetConfigName("kli") // without extension
+		viper.SetConfigType("yaml")
+		viper.AddConfigPath(".") // look for config in working directory
+		viper.AddConfigPath("/home/tpeetz/.config")
+	}
+
+	// Read the configuration file
+	if err := viper.ReadInConfig(); err != nil {
+		// Handle the case where config file is not found
+		if _, ok := err.(viper.ConfigFileNotFoundError); ok {
+			slog.Info("No config file found, using defaults")
+			if err := viper.SafeWriteConfig(); err != nil {
+				slog.Info("error writing config file", "error", err.Error())
+			}
+		} else {
+			slog.Info("error reading config file", "error", err.Error())
+		}
+	} else {
+		slog.Info("initConfig", "Using config file: ", viper.ConfigFileUsed())
+		if err := viper.Unmarshal(&Config); err != nil {
+			slog.Info("parsing of config file failed", "error", err.Error())
+		}
+	}
+}
+
 func InitConfig() error {
 	viper.SetDefault("db.host", "localhost")
 	viper.SetDefault("db.port", 5432)
@@ -20,7 +69,7 @@ func InitConfig() error {
 	viper.SetConfigName("kontor-gin")
 	viper.SetConfigType("yaml")
 	viper.AddConfigPath(".")
-	viper.AddConfigPath("$HOME/.config")
+	viper.AddConfigPath("/home/tpeetz/.config")
 	viper.AddConfigPath("/etc/kontor")
 	viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
 	viper.AutomaticEnv()
@@ -30,11 +79,16 @@ func InitConfig() error {
 		// Handle the case where config file is not found
 		if _, ok := err.(viper.ConfigFileNotFoundError); ok {
 			slog.Info("No config file found, using defaults")
-			return nil
+			if err := viper.SafeWriteConfig(); err != nil {
+				slog.Info("error writing config file", "error", err.Error())
+				return fmt.Errorf("error writing config file: %w", err)
+			}
+		} else {
+			return fmt.Errorf("error reading config file: %w", err)
 		}
-		return fmt.Errorf("error reading config file: %w", err)
+	} else {
+		slog.Info("initConfig", "Using config file: ", viper.ConfigFileUsed())
 	}
 
-	slog.Info("initConfig", "Using config file: ", viper.ConfigFileUsed())
 	return nil
 }

kontor-gin/internal/handlers/media_actor.go

@@ -43,6 +43,21 @@ func (handler *MediaActorHandler) Get(c *gin.Context) {
 	c.JSON(http.StatusOK, actor)
 }
 
+func (handler *MediaActorHandler) Add(c *gin.Context) {
+	var input models.MediaActorAdd
+
+	if err := c.ShouldBindJSON(&input); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		return
+	}
+	actor, err := handler.Service.Add(c.Request.Context(), input.WebLink)
+	if err != nil {
+		c.JSON(http.StatusNotFound, gin.H{"error": "lofi not added"})
+		return
+	}
+	c.JSON(http.StatusOK, actor)
+}
+
 func (handler *MediaActorHandler) Delete(c *gin.Context) {
 	id := c.Param("id")
 	err := handler.Service.Delete(c.Request.Context(), id)

kontor-gin/internal/handlers/media_actor_file.go

@@ -33,6 +33,41 @@ func (handler *MediaActorFileHandler) List(c *gin.Context) {
 	c.JSON(http.StatusOK, dtos)
 }
 
+func (handler *MediaActorFileHandler) Get(c *gin.Context) {
+	id := c.Param("id")
+	actor, err := handler.Service.Get(c.Request.Context(), id)
+	if err != nil {
+		c.JSON(http.StatusNotFound, gin.H{"error": "sport not found"})
+		return
+	}
+	c.JSON(http.StatusOK, actor)
+}
+
+func (handler *MediaActorFileHandler) Add(c *gin.Context) {
+	var input models.MediaActorFileAdd
+
+	if err := c.ShouldBindJSON(&input); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		return
+	}
+	actorfile, err := handler.Service.Add(c.Request.Context(), input.MediaActorID, input.MediaFileID)
+	if err != nil {
+		c.JSON(http.StatusNotFound, gin.H{"error": "lofi not added"})
+		return
+	}
+	c.JSON(http.StatusOK, actorfile)
+}
+
+func (handler *MediaActorFileHandler) Delete(c *gin.Context) {
+	id := c.Param("id")
+	err := handler.Service.Delete(c.Request.Context(), id)
+	if err != nil {
+		c.JSON(http.StatusNotFound, gin.H{"error": "sport not found"})
+		return
+	}
+	c.JSON(http.StatusOK, gin.H{"ok": "true"})
+}
+
 func (handler *MediaActorFileHandler) ListPage(c *gin.Context) {
 	session := sessions.Default(c)
 	user := session.Get(globals.UserKey)

kontor-gin/internal/handlers/media_file.go

@@ -36,6 +36,31 @@ func (handler *MediaFileHandler) List(c *gin.Context) {
 	c.JSON(http.StatusOK, dtos)
 }
 
+func (handler *MediaFileHandler) Add(c *gin.Context) {
+	var input models.MediaFileAdd
+
+	if err := c.ShouldBindJSON(&input); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		return
+	}
+	lofi, err := handler.Service.Add(c.Request.Context(), input.Url)
+	if err != nil {
+		c.JSON(http.StatusNotFound, gin.H{"error": "lofi not added"})
+		return
+	}
+	c.JSON(http.StatusOK, lofi)
+}
+
+func (handler *MediaFileHandler) Delete(c *gin.Context) {
+	id := c.Param("id")
+	err := handler.Service.Delete(c.Request.Context(), id)
+	if err != nil {
+		c.JSON(http.StatusNotFound, gin.H{"error": "lofi not found"})
+		return
+	}
+	c.JSON(http.StatusOK, gin.H{"ok": "true"})
+}
+
 func (handler *MediaFileHandler) ListPage(c *gin.Context) {
 	session := sessions.Default(c)
 	user := session.Get(globals.UserKey)

kontor-gin/internal/helpers/url.go

@@ -0,0 +1,22 @@
+package helpers
+
+import (
+	"log/slog"
+	"net/url"
+)
+
+func StripUrl(webLink string, keepParam string) string {
+	u, err := url.Parse(webLink)
+	if err != nil {
+		slog.Info("StripUrl", "error", err)
+		return webLink
+	}
+	values := u.Query()
+	for key := range values {
+		if key != keepParam {
+			values.Del(key)
+		}
+	}
+	u.RawQuery = values.Encode()
+	return u.String()
+}

kontor-gin/internal/models/media_actor.go

@@ -31,6 +31,10 @@ type MediaActorDTO struct {
 	WebLink   string             `json:"url"`
 }
 
+type MediaActorAdd struct {
+	WebLink string `json:"url"`
+}
+
 func ConvertMediaActorsToDtos(actors []MediaActor) []MediaActorDTO {
 	dtos := make([]MediaActorDTO, len(actors))
 	for i, actor := range actors {

kontor-gin/internal/models/media_actor_file.go

@@ -21,6 +21,11 @@ func (media_file *MediaActorFile) TableName() string {
 	return "media_actor_file"
 }
 
+type MediaActorFileAdd struct {
+	MediaActorID string `json:"media_actor_id"`
+	MediaFileID  string `json:"media_file_id"`
+}
+
 type MediaActorFileDTO struct {
 	ID           string             `json:"id"                  binding:"required"`
 	CreatedAt    helpers.KontorTime `json:"created_date"`

kontor-gin/internal/models/media_file.go

@@ -26,6 +26,10 @@ func (media_file *MediaFile) TableName() string {
 	return "media_file"
 }
 
+type MediaFileAdd struct {
+	Url string `json:"url"`
+}
+
 type MediaFileDTO struct {
 	ID             string             `json:"id"                     binding:"required"`
 	CreatedAt      helpers.KontorTime `json:"created_date"`

kontor-gin/internal/models/player.go

@@ -1,7 +1,9 @@
 package models
 
 import (
+	"fmt"
 	"kontor-api-gin/internal/helpers"
+	"log/slog"
 	"time"
 )
 
@@ -30,6 +32,36 @@ type PlayerDTO struct {
 	LastName  string             `json:"last_name"              binding:"required"`
 }
 
+type PlayerDTOList []PlayerDTO
+
+func (playerList *PlayerDTOList) CompareIds(target *PlayerDTOList) (missing, obsolete []string) {
+	sources := make(map[string]PlayerDTO, len(*playerList))
+	targets := make(map[string]PlayerDTO, len(*target))
+	for _, source := range *playerList {
+		sources[source.ID] = source
+	}
+	for _, target := range *target {
+		targets[target.ID] = target
+	}
+	// iterate source IDs
+	for id := range sources {
+		if _, ok := targets[id]; ok {
+			slog.Info(fmt.Sprintf("ID %s found in both lists", id))
+		} else {
+			missing = append(missing, id)
+		}
+	}
+	for id := range targets {
+		if _, ok := sources[id]; ok {
+			slog.Info(fmt.Sprintf("ID %s found in both lists", id))
+		} else {
+			obsolete = append(obsolete, id)
+		}
+	}
+	slog.Info("CompareIds", "missing", missing, "obsolete", obsolete)
+	return missing, obsolete
+}
+
 func ConvertPlayersToDtos(players []Player) []PlayerDTO {
 	dtos := make([]PlayerDTO, len(players))
 	for i, player := range players {

kontor-gin/internal/repository/media_actor.go

@@ -2,6 +2,7 @@ package repository
 
 import (
 	"context"
+	"fmt"
 	"kontor-api-gin/internal/models"
 	"log/slog"
 
@@ -26,14 +27,19 @@ func (repository *MediaActorRepository) FindAll(context context.Context) ([]mode
 	return actors, nil
 }
 
-func (repository *MediaActorRepository) GetById(context context.Context, id string) (models.MediaActor, error) {
+func (repository *MediaActorRepository) GetById(context context.Context, id string) (*models.MediaActor, error) {
 	var actor = models.MediaActor{ID: id}
 	slog.Info("MediaActorRepository#GetById", "id", id)
 	result := repository.db.First(&actor)
 	if result.Error != nil {
 		slog.Info("SportRepository#GetById", "error", result.Error.Error())
 	}
-	return actor, result.Error
+	return &actor, result.Error
+}
+
+func (repository *MediaActorRepository) Add(context context.Context, url string) (*models.MediaActor, error) {
+	slog.Info("MediaActorRepository#Add", "url", url)
+	return nil, fmt.Errorf("unimplemented method MediaFileRepository#Add")
 }
 
 func (repository *MediaActorRepository) Delete(context context.Context, id string) error {

kontor-gin/internal/repository/media_actor_file.go

@@ -2,6 +2,7 @@ package repository
 
 import (
 	"context"
+	"fmt"
 	"kontor-api-gin/internal/models"
 	"log/slog"
 
@@ -25,3 +26,29 @@ func (repository *MediaActorFileRepository) FindAll(context context.Context) ([]
 
 	return actor_files, nil
 }
+
+func (repository *MediaActorFileRepository) GetById(context context.Context, id string) (*models.MediaActorFile, error) {
+	var actorfile = models.MediaActorFile{ID: id}
+	slog.Info("MediaActorFileRepository#GetById", "id", id)
+	result := repository.db.First(&actorfile)
+	if result.Error != nil {
+		slog.Info("MediaActorFileRepository#GetById", "error", result.Error.Error())
+		return nil, result.Error
+	}
+	return &actorfile, result.Error
+}
+
+func (repository *MediaActorFileRepository) Add(context context.Context, media_actor_id, media_file_id string) (*models.MediaActorFile, error) {
+	slog.Info("MediaActorFileRepository#Add", "actor_id", media_actor_id, "file_id", media_file_id)
+	return nil, fmt.Errorf("unimplemented method MediaActorFileRepository#Add")
+}
+
+func (repository *MediaActorFileRepository) Delete(context context.Context, id string) error {
+	var file = models.MediaActorFile{ID: id}
+	slog.Info("MediaActorFileRepository#Delete", "id", id)
+	result := repository.db.Delete(&file)
+	if result.Error != nil {
+		slog.Info("MediaActorFileRepository#Delete", "error", result.Error.Error())
+	}
+	return result.Error
+}

kontor-gin/internal/repository/media_file.go

@@ -2,6 +2,7 @@ package repository
 
 import (
 	"context"
+	"fmt"
 	"kontor-api-gin/internal/models"
 	"log/slog"
 
@@ -25,3 +26,29 @@ func (repository *MediaFileRepository) FindAll(context context.Context) ([]model
 
 	return files, nil
 }
+
+func (repository *MediaFileRepository) GetById(context context.Context, id string) (*models.MediaFile, error) {
+	var file = models.MediaFile{ID: id}
+	slog.Info("MediaFileRepository#GetById", "id", id)
+	result := repository.db.First(&file)
+	if result.Error != nil {
+		slog.Info("MediaFileRepository#GetById", "error", result.Error.Error())
+		return nil, result.Error
+	}
+	return &file, result.Error
+}
+
+func (repository *MediaFileRepository) Add(context context.Context, url string) (*models.MediaFile, error) {
+	slog.Info("MediaFileRepository#Add", "url", url)
+	return nil, fmt.Errorf("unimplemented method MediaFileRepository#Add")
+}
+
+func (repository *MediaFileRepository) Delete(context context.Context, id string) error {
+	var file = models.MediaFile{ID: id}
+	slog.Info("MediaFileRepository#Delete", "id", id)
+	result := repository.db.Delete(&file)
+	if result.Error != nil {
+		slog.Info("MediaFileRepository#Delete", "error", result.Error.Error())
+	}
+	return result.Error
+}

kontor-gin/internal/repository/media_lofi.go

@@ -2,9 +2,14 @@ package repository
 
 import (
 	"context"
+	"errors"
+	"fmt"
+	"kontor-api-gin/internal/helpers"
 	"kontor-api-gin/internal/models"
 	"log/slog"
+	"time"
 
+	"github.com/google/uuid"
 	"gorm.io/gorm"
 )
 
@@ -26,19 +31,51 @@ func (repository *MediaLoFiRepository) FindAll(context context.Context) ([]model
 	return lofis, nil
 }
 
-func (repository *MediaLoFiRepository) GetById(context context.Context, id string) (models.MediaLoFi, error) {
+func (repository *MediaLoFiRepository) GetById(context context.Context, id string) (*models.MediaLoFi, error) {
 	var lofi = models.MediaLoFi{ID: id}
 	slog.Info("MediaLoFiRepository#GetById", "id", id)
 	result := repository.db.First(&lofi)
 	if result.Error != nil {
 		slog.Info("MediaLoFiRepository#GetById", "error", result.Error.Error())
 	}
-	return lofi, result.Error
+	return &lofi, result.Error
 }
 
-func (repository *MediaLoFiRepository) Add(context context.Context, url string) (models.MediaLoFi, error) {
+func (repository *MediaLoFiRepository) Add(context context.Context, url string) (*models.MediaLoFi, error) {
 	slog.Info("MediaLoFiRepository#Add", "url", url)
-	panic("unimplemented")
+	webLink := helpers.StripUrl(url, "v")
+	var lofi models.MediaLoFi
+	search_result := repository.db.Where("url = ?", webLink).First(&lofi)
+	if search_result.RowsAffected > 0 {
+		slog.Info("search for existing url", "result", search_result, "lofi", lofi)
+		return &lofi, nil
+	}
+	if errors.Is(search_result.Error, gorm.ErrRecordNotFound) {
+		slog.Info("MediaLoFiRepository#Add URL not found", "url", webLink)
+		lofi = models.MediaLoFi{
+			ID:             uuid.NewString(),
+			CreatedAt:      time.Now(),
+			UpdatedAt:      time.Now(),
+			DeletedAt:      nil,
+			Version:        0,
+			WebLink:        webLink,
+			ShouldDownload: false,
+			Review:         true,
+			Title:          "",
+			FileName:       "",
+		}
+		add_result := repository.db.Create(&lofi)
+		if add_result.Error != nil {
+			slog.Info("add new MediaLofi", "error", add_result.Error)
+			return nil, add_result.Error
+		}
+		slog.Info("add new MediaLofi", "lofi", lofi)
+		return &lofi, nil
+	}
+	if search_result.Error != nil {
+		return nil, search_result.Error
+	}
+	return nil, fmt.Errorf("MediaLoFiRepository#Add unknown error")
 }
 
 func (repository *MediaLoFiRepository) Delete(context context.Context, id string) error {

kontor-gin/internal/router/router.go

@@ -103,15 +103,19 @@ func New(admin *handlers.AdminHandler, bookshelf *handlers.BookshelfHandler, com
 		secured.GET("comics/issueworks", comics.IssueworkHandler.List)
 		mediaGroup := secured.Group("/media")
 		mediaGroup.GET("/files", media.MediaFileHandler.List)
+		mediaGroup.POST("/files", media.MediaFileHandler.Add)
 		mediaGroup.GET("/videos", media.MediaVideoHandler.List)
 		mediaGroup.GET("/lofis", media.MediaLoFiHandler.List)
 		mediaGroup.POST("/lofis", media.MediaLoFiHandler.Add)
 		mediaGroup.GET("/lofis/:id", media.MediaLoFiHandler.Get)
 		mediaGroup.DELETE("/lofis", media.MediaLoFiHandler.Delete)
 		mediaGroup.GET("/actors", media.MediaActorHandler.List)
+		mediaGroup.POST("/actors", media.MediaActorHandler.Add)
 		mediaGroup.GET("/actors/:id", media.MediaActorHandler.Get)
 		mediaGroup.DELETE("/actors/:id", media.MediaActorHandler.Delete)
 		mediaGroup.GET("/actorfiles", media.MediaActorFileHandler.List)
+		mediaGroup.POST("/actorfiles", media.MediaActorFileHandler.Add)
+		mediaGroup.DELETE("/actorfiles", media.MediaActorFileHandler.Delete)
 	}
 	return router
 }

kontor-gin/internal/service/media_actor.go

@@ -21,11 +21,16 @@ func (service *MediaActorService) List(context context.Context) ([]models.MediaA
 	return service.repository.FindAll(context)
 }
 
-func (service *MediaActorService) Get(context context.Context, id string) (models.MediaActor, error) {
+func (service *MediaActorService) Get(context context.Context, id string) (*models.MediaActor, error) {
 	slog.Info("MediaActorService#Get")
 	return service.repository.GetById(context, id)
 }
 
+func (service *MediaActorService) Add(context context.Context, url string) (*models.MediaActor, error) {
+	slog.Info("MediaActorService#Add")
+	return service.repository.Add(context, url)
+}
+
 func (service *MediaActorService) Delete(context context.Context, id string) error {
 	slog.Info("MediaActorService#Delete")
 	return service.repository.Delete(context, id)

kontor-gin/internal/service/media_actor_file.go

@@ -20,3 +20,18 @@ func (service *MediaActorFileService) List(context context.Context) ([]models.Me
 	slog.Info("MediaActorFileService#List")
 	return service.repository.FindAll(context)
 }
+
+func (service *MediaActorFileService) Get(context context.Context, id string) (*models.MediaActorFile, error) {
+	slog.Info("MediaActorFileService#Get")
+	return service.repository.GetById(context, id)
+}
+
+func (service *MediaActorFileService) Add(context context.Context, media_actor_id, media_file_id string) (*models.MediaActorFile, error) {
+	slog.Info("MediaActorFileService#Add")
+	return service.repository.Add(context, media_actor_id, media_file_id)
+}
+
+func (service *MediaActorFileService) Delete(context context.Context, id string) error {
+	slog.Info("MediaActorFileService#Delete")
+	return service.repository.Delete(context, id)
+}

kontor-gin/internal/service/media_file.go

@@ -20,3 +20,18 @@ func (service *MediaFileService) List(context context.Context) ([]models.MediaFi
 	slog.Info("MediaFileService#List")
 	return service.repository.FindAll(context)
 }
+
+func (service *MediaFileService) Get(context context.Context, id string) (*models.MediaFile, error) {
+	slog.Info("MediaFileService#Get")
+	return service.repository.GetById(context, id)
+}
+
+func (service *MediaFileService) Add(context context.Context, url string) (*models.MediaFile, error) {
+	slog.Info("MediaFileService#Add")
+	return service.repository.Add(context, url)
+}
+
+func (service *MediaFileService) Delete(context context.Context, id string) error {
+	slog.Info("MediaFileService#Delete")
+	return service.repository.Delete(context, id)
+}

kontor-gin/internal/service/media_lofi.go

@@ -21,12 +21,12 @@ func (service *MediaLoFiService) List(context context.Context) ([]models.MediaLo
 	return service.repository.FindAll(context)
 }
 
-func (service *MediaLoFiService) Get(context context.Context, id string) (models.MediaLoFi, error) {
+func (service *MediaLoFiService) Get(context context.Context, id string) (*models.MediaLoFi, error) {
 	slog.Info("MediaLoFiService#Get")
 	return service.repository.GetById(context, id)
 }
 
-func (service *MediaLoFiService) Add(context context.Context, url string) (models.MediaLoFi, error) {
+func (service *MediaLoFiService) Add(context context.Context, url string) (*models.MediaLoFi, error) {
 	slog.Info("MediaLoFiService#Add")
 	return service.repository.Add(context, url)
 }