Adds server options

This commit is contained in:
Miguel de la Cruz 2023-07-04 12:48:16 +02:00
parent dee94e838d
commit 6c14403ff4
4 changed files with 59 additions and 23 deletions

22
server/options.go Normal file
View file

@ -0,0 +1,22 @@
package server
import (
"git.ctrlz.es/mgdelacroix/birthdaybot/model"
"github.com/charmbracelet/log"
)
type Option func(*Server) *Server
func WithConfig(config *model.Config) Option {
return func(server *Server) *Server {
server.config = config
return server
}
}
func WithLogger(logger *log.Logger) Option {
return func(server *Server) *Server {
server.Logger = logger
return server
}
}

View file

@ -3,7 +3,6 @@ package server
import (
"errors"
"fmt"
"os"
"git.ctrlz.es/mgdelacroix/birthdaybot/model"
"git.ctrlz.es/mgdelacroix/birthdaybot/notification"
@ -39,30 +38,33 @@ func createNotificationServices(logger *log.Logger, config *model.Config) ([]not
return notificationServices, nil
}
func New(config *model.Config) (*Server, error) {
logger := log.New(os.Stderr)
logger.Debug("parsing CSV file", "birthdayFile", config.BirthdayFile)
birthdays, err := parser.ParseCSV(config.BirthdayFile)
if err != nil {
logger.Error("cannot parse CSV file", "birthdayFile", config.BirthdayFile, "error", err)
return nil, fmt.Errorf("cannot parse CSV file %s: %w", config.BirthdayFile, err)
func New(options ...Option) (*Server, error) {
srv := &Server{}
for _, option := range options {
srv = option(srv)
}
logger.Debug("creating notification services from config")
srv.Logger.Debug("parsing CSV file", "birthdayFile", srv.config.BirthdayFile)
notificationServices, err := createNotificationServices(logger, config)
birthdays, err := parser.ParseCSV(srv.config.BirthdayFile)
if err != nil {
logger.Error("error creating notification services", "error", err)
srv.Logger.Error("cannot parse CSV file", "birthdayFile", srv.config.BirthdayFile, "error", err)
return nil, fmt.Errorf("cannot parse CSV file %s: %w", srv.config.BirthdayFile, err)
}
srv.Logger.Debug("creating notification services from config")
notificationServices, err := createNotificationServices(srv.Logger, srv.config)
if err != nil {
srv.Logger.Error("error creating notification services", "error", err)
return nil, err
}
logger.Info("creating server")
srv.Logger.Info("creating server")
server := &Server{
Logger: logger,
config: config,
Logger: srv.Logger,
config: srv.config,
birthdays: birthdays,
notificationServices: notificationServices,
}