From 16a9c8f9bc47a2d0e847c636953664b6324898d1 Mon Sep 17 00:00:00 2001 From: Andrey Ivanov Date: Sun, 27 Sep 2020 09:56:35 +0300 Subject: [PATCH] HW13 WIP --- hw12_13_14_15_calendar/internal/logger/logger.go | 9 +++------ hw12_13_14_15_calendar/internal/storage/sql/sql.go | 11 +++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/hw12_13_14_15_calendar/internal/logger/logger.go b/hw12_13_14_15_calendar/internal/logger/logger.go index b2482dc..edd91ef 100644 --- a/hw12_13_14_15_calendar/internal/logger/logger.go +++ b/hw12_13_14_15_calendar/internal/logger/logger.go @@ -22,8 +22,10 @@ type Logger struct { Logger amitralog.Logger } +var validLevel = map[string]bool{"debug": true, "info":true, "warn": true, "error": true, "fatal": true} + func New(conf config.Config) (Interface, error) { - if conf.Logger.File == "" || !validLevel(conf.Logger.Level) { + if conf.Logger.File == "" || !validLevel[strings.ToLower(conf.Logger.Level)] { return nil, errors.New("invalid logger config") } @@ -64,8 +66,3 @@ func (l *Logger) Fatalf(format string, args ...interface{}) { l.Logger.Fatalf(format, args) os.Exit(2) } - -func validLevel(level string) bool { - var l = map[string]int{"debug": 1, "info": 1, "warn": 1, "error": 1, "fatal": 1} - return l[strings.ToLower(level)] == 1 -} diff --git a/hw12_13_14_15_calendar/internal/storage/sql/sql.go b/hw12_13_14_15_calendar/internal/storage/sql/sql.go index 4476f30..fcf9a39 100644 --- a/hw12_13_14_15_calendar/internal/storage/sql/sql.go +++ b/hw12_13_14_15_calendar/internal/storage/sql/sql.go @@ -83,10 +83,9 @@ func (s *Storage) Delete(id event.ID) error { func (s *Storage) List() (map[event.ID]event.Event, error) { res := make(map[event.ID]event.Event) - results, err := s.db.Query( - `SELECT (id,title,date,latency,note,userID,notifyTime) from events ORDER BY id`) + results, err := s.db.Query( `SELECT (id,title,date,latency,note,userID,notifyTime) from events ORDER BY id`) if err != nil { - return map[event.ID]event.Event{}, err + return nil, err } defer results.Close() for results.Next() { @@ -95,16 +94,16 @@ func (s *Storage) List() (map[event.ID]event.Event, error) { var dateRaw string err = results.Scan(&id, &evt.Title, &dateRaw, &evt.Latency, &evt.Note, &evt.UserID, &evt.NotifyTime) if err != nil { - return map[event.ID]event.Event{}, err + return nil, err } evt.Date, err = time.Parse(dateTimeLayout, dateRaw) if err != nil { - return map[event.ID]event.Event{}, err + return nil, err } res[id] = evt } if results.Err() != nil { - return map[event.ID]event.Event{}, results.Err() + return nil, results.Err() } return res, nil }