Refactor irc client (#19)

* refactor: update http handlers

* feat: add trace log level

* refactir: irc handler

* refactor(definitions): add irc settings and invite cmd:

* feat: add dft values to inputs

* refactor: indexer irc forms

* refactor(definitions): fix nickserv.password var:

* feat: pre fill indexer name field

* refactor: handle stopping and updates

internal/http/action.go

@@ -2,6 +2,7 @@ package http
 
 import (
 	"encoding/json"
+	"errors"
 	"net/http"
 	"strconv"
 
@@ -17,97 +18,96 @@ type actionService interface {
 }
 
 type actionHandler struct {
-	encoder       encoder
-	actionService actionService
+	encoder encoder
+	service actionService
+}
+
+func newActionHandler(encoder encoder, service actionService) *actionHandler {
+	return &actionHandler{
+		encoder: encoder,
+		service: service,
+	}
 }
 
 func (h actionHandler) Routes(r chi.Router) {
 	r.Get("/", h.getActions)
 	r.Post("/", h.storeAction)
-	r.Delete("/{actionID}", h.deleteAction)
-	r.Put("/{actionID}", h.updateAction)
-	r.Patch("/{actionID}/toggleEnabled", h.toggleActionEnabled)
+	r.Delete("/{id}", h.deleteAction)
+	r.Put("/{id}", h.updateAction)
+	r.Patch("/{id}/toggleEnabled", h.toggleActionEnabled)
 }
 
 func (h actionHandler) getActions(w http.ResponseWriter, r *http.Request) {
-	ctx := r.Context()
-
-	actions, err := h.actionService.Fetch()
+	actions, err := h.service.Fetch()
 	if err != nil {
 		// encode error
 	}
 
-	h.encoder.StatusResponse(ctx, w, actions, http.StatusOK)
+	h.encoder.StatusResponse(r.Context(), w, actions, http.StatusOK)
 }
 
 func (h actionHandler) storeAction(w http.ResponseWriter, r *http.Request) {
-	var (
-		ctx  = r.Context()
-		data domain.Action
-	)
+	var data domain.Action
 
 	if err := json.NewDecoder(r.Body).Decode(&data); err != nil {
 		// encode error
 		return
 	}
 
-	action, err := h.actionService.Store(data)
+	action, err := h.service.Store(data)
 	if err != nil {
 		// encode error
 	}
 
-	h.encoder.StatusResponse(ctx, w, action, http.StatusCreated)
+	h.encoder.StatusResponse(r.Context(), w, action, http.StatusCreated)
 }
 
 func (h actionHandler) updateAction(w http.ResponseWriter, r *http.Request) {
-	var (
-		ctx  = r.Context()
-		data domain.Action
-	)
+	var data domain.Action
 
 	if err := json.NewDecoder(r.Body).Decode(&data); err != nil {
 		// encode error
 		return
 	}
 
-	action, err := h.actionService.Store(data)
+	action, err := h.service.Store(data)
 	if err != nil {
 		// encode error
 	}
 
-	h.encoder.StatusResponse(ctx, w, action, http.StatusCreated)
+	h.encoder.StatusResponse(r.Context(), w, action, http.StatusCreated)
 }
 
 func (h actionHandler) deleteAction(w http.ResponseWriter, r *http.Request) {
-	var (
-		ctx      = r.Context()
-		actionID = chi.URLParam(r, "actionID")
-	)
+	actionID, err := parseInt(chi.URLParam(r, "id"))
+	if err != nil {
+		h.encoder.StatusResponse(r.Context(), w, errors.New("bad param id"), http.StatusBadRequest)
+	}
 
-	// if !actionID return error
-
-	id, _ := strconv.Atoi(actionID)
-
-	if err := h.actionService.Delete(id); err != nil {
+	if err := h.service.Delete(actionID); err != nil {
 		// encode error
 	}
 
-	h.encoder.StatusResponse(ctx, w, nil, http.StatusNoContent)
+	h.encoder.StatusResponse(r.Context(), w, nil, http.StatusNoContent)
 }
 
 func (h actionHandler) toggleActionEnabled(w http.ResponseWriter, r *http.Request) {
-	var (
-		ctx      = r.Context()
-		actionID = chi.URLParam(r, "actionID")
-	)
+	actionID, err := parseInt(chi.URLParam(r, "id"))
+	if err != nil {
+		h.encoder.StatusResponse(r.Context(), w, errors.New("bad param id"), http.StatusBadRequest)
+	}
 
-	// if !actionID return error
-
-	id, _ := strconv.Atoi(actionID)
-
-	if err := h.actionService.ToggleEnabled(id); err != nil {
+	if err := h.service.ToggleEnabled(actionID); err != nil {
 		// encode error
 	}
 
-	h.encoder.StatusResponse(ctx, w, nil, http.StatusCreated)
+	h.encoder.StatusResponse(r.Context(), w, nil, http.StatusCreated)
+}
+
+func parseInt(s string) (int, error) {
+	u, err := strconv.ParseInt(s, 10, 64)
+	if err != nil {
+		return 0, err
+	}
+	return int(u), nil
 }

internal/http/auth.go

@@ -16,8 +16,15 @@ type authService interface {
 }
 
 type authHandler struct {
-	encoder     encoder
-	authService authService
+	encoder encoder
+	service authService
+}
+
+func newAuthHandler(encoder encoder, service authService) *authHandler {
+	return &authHandler{
+		encoder: encoder,
+		service: service,
+	}
 }
 
 var (
@@ -49,7 +56,7 @@ func (h authHandler) login(w http.ResponseWriter, r *http.Request) {
 	store.Options.SameSite = http.SameSiteStrictMode
 	session, _ := store.Get(r, "user_session")
 
-	_, err := h.authService.Login(data.Username, data.Password)
+	_, err := h.service.Login(data.Username, data.Password)
 	if err != nil {
 		h.encoder.StatusResponse(ctx, w, nil, http.StatusUnauthorized)
 		return

internal/http/config.go

@@ -20,6 +20,10 @@ type configHandler struct {
 	encoder encoder
 }
 
+func newConfigHandler(encoder encoder) *configHandler {
+	return &configHandler{encoder: encoder}
+}
+
 func (h configHandler) Routes(r chi.Router) {
 	r.Get("/", h.getConfig)
 }

internal/http/download_client.go

@@ -18,8 +18,15 @@ type downloadClientService interface {
 }
 
 type downloadClientHandler struct {
-	encoder               encoder
-	downloadClientService downloadClientService
+	encoder encoder
+	service downloadClientService
+}
+
+func newDownloadClientHandler(encoder encoder, service downloadClientService) *downloadClientHandler {
+	return &downloadClientHandler{
+		encoder: encoder,
+		service: service,
+	}
 }
 
 func (h downloadClientHandler) Routes(r chi.Router) {
@@ -33,7 +40,7 @@ func (h downloadClientHandler) Routes(r chi.Router) {
 func (h downloadClientHandler) listDownloadClients(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 
-	clients, err := h.downloadClientService.List()
+	clients, err := h.service.List()
 	if err != nil {
 		//
 	}
@@ -52,7 +59,7 @@ func (h downloadClientHandler) store(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	client, err := h.downloadClientService.Store(data)
+	client, err := h.service.Store(data)
 	if err != nil {
 		// encode error
 	}
@@ -72,7 +79,7 @@ func (h downloadClientHandler) test(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	err := h.downloadClientService.Test(data)
+	err := h.service.Test(data)
 	if err != nil {
 		// encode error
 		h.encoder.StatusResponse(ctx, w, nil, http.StatusBadRequest)
@@ -93,7 +100,7 @@ func (h downloadClientHandler) update(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	client, err := h.downloadClientService.Store(data)
+	client, err := h.service.Store(data)
 	if err != nil {
 		// encode error
 	}
@@ -111,7 +118,7 @@ func (h downloadClientHandler) delete(w http.ResponseWriter, r *http.Request) {
 
 	id, _ := strconv.Atoi(clientID)
 
-	if err := h.downloadClientService.Delete(id); err != nil {
+	if err := h.service.Delete(id); err != nil {
 		// encode error
 	}
 

internal/http/filter.go

@@ -20,8 +20,15 @@ type filterService interface {
 }
 
 type filterHandler struct {
-	encoder       encoder
-	filterService filterService
+	encoder encoder
+	service filterService
+}
+
+func newFilterHandler(encoder encoder, service filterService) *filterHandler {
+	return &filterHandler{
+		encoder: encoder,
+		service: service,
+	}
 }
 
 func (h filterHandler) Routes(r chi.Router) {
@@ -35,7 +42,7 @@ func (h filterHandler) Routes(r chi.Router) {
 func (h filterHandler) getFilters(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 
-	trackers, err := h.filterService.ListFilters()
+	trackers, err := h.service.ListFilters()
 	if err != nil {
 		//
 	}
@@ -51,7 +58,7 @@ func (h filterHandler) getByID(w http.ResponseWriter, r *http.Request) {
 
 	id, _ := strconv.Atoi(filterID)
 
-	filter, err := h.filterService.FindByID(id)
+	filter, err := h.service.FindByID(id)
 	if err != nil {
 		h.encoder.StatusNotFound(ctx, w)
 		return
@@ -68,7 +75,7 @@ func (h filterHandler) storeFilterAction(w http.ResponseWriter, r *http.Request)
 
 	id, _ := strconv.Atoi(filterID)
 
-	filter, err := h.filterService.FindByID(id)
+	filter, err := h.service.FindByID(id)
 	if err != nil {
 		//
 	}
@@ -87,7 +94,7 @@ func (h filterHandler) store(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	filter, err := h.filterService.Store(data)
+	filter, err := h.service.Store(data)
 	if err != nil {
 		// encode error
 		return
@@ -107,7 +114,7 @@ func (h filterHandler) update(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	filter, err := h.filterService.Update(data)
+	filter, err := h.service.Update(data)
 	if err != nil {
 		// encode error
 		return
@@ -124,7 +131,7 @@ func (h filterHandler) delete(w http.ResponseWriter, r *http.Request) {
 
 	id, _ := strconv.Atoi(filterID)
 
-	if err := h.filterService.Delete(id); err != nil {
+	if err := h.service.Delete(id); err != nil {
 		// return err
 	}
 

internal/http/indexer.go

@@ -20,8 +20,17 @@ type indexerService interface {
 }
 
 type indexerHandler struct {
-	encoder        encoder
-	indexerService indexerService
+	encoder encoder
+	service indexerService
+	ircSvc  ircService
+}
+
+func newIndexerHandler(encoder encoder, service indexerService, ircSvc ircService) *indexerHandler {
+	return &indexerHandler{
+		encoder: encoder,
+		service: service,
+		ircSvc:  ircSvc,
+	}
 }
 
 func (h indexerHandler) Routes(r chi.Router) {
@@ -36,7 +45,7 @@ func (h indexerHandler) Routes(r chi.Router) {
 func (h indexerHandler) getSchema(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 
-	indexers, err := h.indexerService.GetTemplates()
+	indexers, err := h.service.GetTemplates()
 	if err != nil {
 		//
 	}
@@ -45,21 +54,20 @@ func (h indexerHandler) getSchema(w http.ResponseWriter, r *http.Request) {
 }
 
 func (h indexerHandler) store(w http.ResponseWriter, r *http.Request) {
-	var (
-		ctx  = r.Context()
-		data domain.Indexer
-	)
+	var data domain.Indexer
 
 	if err := json.NewDecoder(r.Body).Decode(&data); err != nil {
 		return
 	}
 
-	indexer, err := h.indexerService.Store(data)
+	indexer, err := h.service.Store(data)
 	if err != nil {
 		//
+		h.encoder.StatusResponse(r.Context(), w, nil, http.StatusBadRequest)
+		return
 	}
 
-	h.encoder.StatusResponse(ctx, w, indexer, http.StatusCreated)
+	h.encoder.StatusResponse(r.Context(), w, indexer, http.StatusCreated)
 }
 
 func (h indexerHandler) update(w http.ResponseWriter, r *http.Request) {
@@ -72,7 +80,7 @@ func (h indexerHandler) update(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	indexer, err := h.indexerService.Update(data)
+	indexer, err := h.service.Update(data)
 	if err != nil {
 		//
 	}
@@ -88,7 +96,7 @@ func (h indexerHandler) delete(w http.ResponseWriter, r *http.Request) {
 
 	id, _ := strconv.Atoi(idParam)
 
-	if err := h.indexerService.Delete(id); err != nil {
+	if err := h.service.Delete(id); err != nil {
 		// return err
 	}
 
@@ -98,7 +106,7 @@ func (h indexerHandler) delete(w http.ResponseWriter, r *http.Request) {
 func (h indexerHandler) getAll(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 
-	indexers, err := h.indexerService.GetAll()
+	indexers, err := h.service.GetAll()
 	if err != nil {
 		//
 	}
@@ -109,7 +117,7 @@ func (h indexerHandler) getAll(w http.ResponseWriter, r *http.Request) {
 func (h indexerHandler) list(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 
-	indexers, err := h.indexerService.List()
+	indexers, err := h.service.List()
 	if err != nil {
 		//
 	}

internal/http/irc.go

@@ -21,8 +21,15 @@ type ircService interface {
 }
 
 type ircHandler struct {
-	encoder    encoder
-	ircService ircService
+	encoder encoder
+	service ircService
+}
+
+func newIrcHandler(encoder encoder, service ircService) *ircHandler {
+	return &ircHandler{
+		encoder: encoder,
+		service: service,
+	}
 }
 
 func (h ircHandler) Routes(r chi.Router) {
@@ -38,7 +45,7 @@ func (h ircHandler) Routes(r chi.Router) {
 func (h ircHandler) listNetworks(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 
-	networks, err := h.ircService.ListNetworks(ctx)
+	networks, err := h.service.ListNetworks(ctx)
 	if err != nil {
 		//
 	}
@@ -54,7 +61,7 @@ func (h ircHandler) getNetworkByID(w http.ResponseWriter, r *http.Request) {
 
 	id, _ := strconv.Atoi(networkID)
 
-	network, err := h.ircService.GetNetworkByID(int64(id))
+	network, err := h.service.GetNetworkByID(int64(id))
 	if err != nil {
 		//
 	}
@@ -72,9 +79,11 @@ func (h ircHandler) storeNetwork(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	err := h.ircService.StoreNetwork(&data)
+	err := h.service.StoreNetwork(&data)
 	if err != nil {
 		//
+		h.encoder.StatusResponse(ctx, w, nil, http.StatusBadRequest)
+		return
 	}
 
 	h.encoder.StatusResponse(ctx, w, nil, http.StatusCreated)
@@ -93,7 +102,7 @@ func (h ircHandler) storeChannel(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	err := h.ircService.StoreChannel(int64(id), &data)
+	err := h.service.StoreChannel(int64(id), &data)
 	if err != nil {
 		//
 	}
@@ -107,7 +116,7 @@ func (h ircHandler) stopNetwork(w http.ResponseWriter, r *http.Request) {
 		networkID = chi.URLParam(r, "networkID")
 	)
 
-	err := h.ircService.StopNetwork(networkID)
+	err := h.service.StopNetwork(networkID)
 	if err != nil {
 		//
 	}
@@ -123,7 +132,7 @@ func (h ircHandler) deleteNetwork(w http.ResponseWriter, r *http.Request) {
 
 	id, _ := strconv.Atoi(networkID)
 
-	err := h.ircService.DeleteNetwork(ctx, int64(id))
+	err := h.service.DeleteNetwork(ctx, int64(id))
 	if err != nil {
 		//
 	}

internal/http/server.go

@@ -64,56 +64,19 @@ func (s Server) Handler() http.Handler {
 		fileSystem.ServeHTTP(w, r)
 	})
 
-	authHandler := authHandler{
-		encoder:     encoder,
-		authService: s.authService,
-	}
-
-	r.Route("/api/auth", authHandler.Routes)
+	r.Route("/api/auth", newAuthHandler(encoder, s.authService).Routes)
 
 	r.Group(func(r chi.Router) {
 		r.Use(IsAuthenticated)
 
-		actionHandler := actionHandler{
-			encoder:       encoder,
-			actionService: s.actionService,
-		}
-
-		r.Route("/api/actions", actionHandler.Routes)
-
-		downloadClientHandler := downloadClientHandler{
-			encoder:               encoder,
-			downloadClientService: s.downloadClientService,
-		}
-
-		r.Route("/api/download_clients", downloadClientHandler.Routes)
-
-		filterHandler := filterHandler{
-			encoder:       encoder,
-			filterService: s.filterService,
-		}
-
-		r.Route("/api/filters", filterHandler.Routes)
-
-		ircHandler := ircHandler{
-			encoder:    encoder,
-			ircService: s.ircService,
-		}
-
-		r.Route("/api/irc", ircHandler.Routes)
-
-		indexerHandler := indexerHandler{
-			encoder:        encoder,
-			indexerService: s.indexerService,
-		}
-
-		r.Route("/api/indexer", indexerHandler.Routes)
-
-		configHandler := configHandler{
-			encoder: encoder,
-		}
-
-		r.Route("/api/config", configHandler.Routes)
+		r.Route("/api", func(r chi.Router) {
+			r.Route("/actions", newActionHandler(encoder, s.actionService).Routes)
+			r.Route("/config", newConfigHandler(encoder).Routes)
+			r.Route("/download_clients", newDownloadClientHandler(encoder, s.downloadClientService).Routes)
+			r.Route("/filters", newFilterHandler(encoder, s.filterService).Routes)
+			r.Route("/irc", newIrcHandler(encoder, s.ircService).Routes)
+			r.Route("/indexer", newIndexerHandler(encoder, s.indexerService, s.ircService).Routes)
+		})
 	})
 
 	//r.HandleFunc("/*", handler.ServeHTTP)