fix: Rework API responses (#39)

pkg/config.go

@@ -7,13 +7,9 @@ import (
 	"net/url"
 	"strings"
 	"time"
-)
 
-type ConfigUser struct {
-	Endpoint   string   `json:"endpoint" bson:"endpoint"`
-	Secret     string   `json:"secret" bson:"secret"`
-	EventTypes []string `json:"eventTypes" bson:"eventTypes"`
-}
+	"github.com/google/uuid"
+)
 
 type Config struct {
 	ConfigUser `bson:"inline"`
@@ -23,6 +19,22 @@ type Config struct {
 	UpdatedAt  time.Time `json:"updatedAt" bson:"updatedAt"`
 }
 
+type ConfigUser struct {
+	Endpoint   string   `json:"endpoint" bson:"endpoint"`
+	Secret     string   `json:"secret" bson:"secret"`
+	EventTypes []string `json:"eventTypes" bson:"eventTypes"`
+}
+
+func NewConfig(cfgUser ConfigUser) Config {
+	return Config{
+		ConfigUser: cfgUser,
+		ID:         uuid.NewString(),
+		Active:     true,
+		CreatedAt:  time.Now().UTC(),
+		UpdatedAt:  time.Now().UTC(),
+	}
+}
+
 const (
 	KeySecret     = "secret"
 	KeyEventTypes = "eventTypes"

pkg/server/activation.go

@@ -0,0 +1,63 @@
+package server
+
+import (
+	"encoding/json"
+	"net/http"
+
+	"github.com/formancehq/go-libs/sharedapi"
+	"github.com/formancehq/go-libs/sharedlogging"
+	webhooks "github.com/formancehq/webhooks/pkg"
+	"github.com/formancehq/webhooks/pkg/storage"
+	"github.com/go-chi/chi/v5"
+	"github.com/pkg/errors"
+)
+
+func (h *serverHandler) activateOneConfigHandle(w http.ResponseWriter, r *http.Request) {
+	id := chi.URLParam(r, PathParamId)
+	c, err := h.store.UpdateOneConfigActivation(r.Context(), id, true)
+	if err == nil {
+		sharedlogging.GetLogger(r.Context()).Infof("PUT %s/%s%s", PathConfigs, id, PathActivate)
+		resp := sharedapi.BaseResponse[webhooks.Config]{
+			Data: &c,
+		}
+		if err := json.NewEncoder(w).Encode(resp); err != nil {
+			sharedlogging.GetLogger(r.Context()).Errorf("json.Encoder.Encode: %s", err)
+			http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
+			return
+		}
+	} else if errors.Is(err, storage.ErrConfigNotFound) {
+		sharedlogging.GetLogger(r.Context()).Infof("PUT %s/%s%s: %s", PathConfigs, id, PathActivate, storage.ErrConfigNotFound)
+		http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
+	} else if errors.Is(err, storage.ErrConfigNotModified) {
+		sharedlogging.GetLogger(r.Context()).Infof("PUT %s/%s%s: %s", PathConfigs, id, PathActivate, storage.ErrConfigNotModified)
+		w.WriteHeader(http.StatusNotModified)
+	} else {
+		sharedlogging.GetLogger(r.Context()).Errorf("PUT %s/%s%s: %s", PathConfigs, id, PathActivate, err)
+		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
+	}
+}
+
+func (h *serverHandler) deactivateOneConfigHandle(w http.ResponseWriter, r *http.Request) {
+	id := chi.URLParam(r, PathParamId)
+	c, err := h.store.UpdateOneConfigActivation(r.Context(), id, false)
+	if err == nil {
+		sharedlogging.GetLogger(r.Context()).Infof("PUT %s/%s%s", PathConfigs, id, PathDeactivate)
+		resp := sharedapi.BaseResponse[webhooks.Config]{
+			Data: &c,
+		}
+		if err := json.NewEncoder(w).Encode(resp); err != nil {
+			sharedlogging.GetLogger(r.Context()).Errorf("json.Encoder.Encode: %s", err)
+			http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
+			return
+		}
+	} else if errors.Is(err, storage.ErrConfigNotFound) {
+		sharedlogging.GetLogger(r.Context()).Infof("PUT %s/%s%s: %s", PathConfigs, id, PathDeactivate, storage.ErrConfigNotFound)
+		http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
+	} else if errors.Is(err, storage.ErrConfigNotModified) {
+		sharedlogging.GetLogger(r.Context()).Infof("PUT %s/%s%s: %s", PathConfigs, id, PathDeactivate, storage.ErrConfigNotModified)
+		w.WriteHeader(http.StatusNotModified)
+	} else {
+		sharedlogging.GetLogger(r.Context()).Errorf("PUT %s/%s%s: %s", PathConfigs, id, PathDeactivate, err)
+		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
+	}
+}

pkg/server/delete_one.go → pkg/server/delete.go

@@ -1,20 +1,21 @@
 package server
 
 import (
-	"errors"
 	"net/http"
 
 	"github.com/formancehq/go-libs/sharedlogging"
+	"github.com/formancehq/webhooks/pkg/storage"
 	"github.com/go-chi/chi/v5"
+	"github.com/pkg/errors"
 )
 
 func (h *serverHandler) deleteOneConfigHandle(w http.ResponseWriter, r *http.Request) {
 	id := chi.URLParam(r, PathParamId)
-	err := deleteOneConfig(r.Context(), id, h.store)
+	err := h.store.DeleteOneConfig(r.Context(), id)
 	if err == nil {
 		sharedlogging.GetLogger(r.Context()).Infof("DELETE %s/%s", PathConfigs, id)
-	} else if errors.Is(err, ErrConfigNotFound) {
-		sharedlogging.GetLogger(r.Context()).Infof("DELETE %s/%s: %s", PathConfigs, id, ErrConfigNotFound)
+	} else if errors.Is(err, storage.ErrConfigNotFound) {
+		sharedlogging.GetLogger(r.Context()).Infof("DELETE %s/%s: %s", PathConfigs, id, storage.ErrConfigNotFound)
 		http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
 	} else {
 		sharedlogging.GetLogger(r.Context()).Errorf("DELETE %s/%s: %s", PathConfigs, id, err)

pkg/server/get_many.go → pkg/server/get.go

@@ -18,15 +18,17 @@ func (h *serverHandler) getManyConfigsHandle(w http.ResponseWriter, r *http.Requ
 		return
 	}
 
-	cursor, err := h.store.FindManyConfigs(r.Context(), filter)
+	cfgs, err := h.store.FindManyConfigs(r.Context(), filter)
 	if err != nil {
 		sharedlogging.GetLogger(r.Context()).Errorf("storage.store.FindManyConfigs: %s", err)
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		return
 	}
 
 	resp := sharedapi.BaseResponse[webhooks.Config]{
-		Cursor: &cursor,
+		Cursor: &sharedapi.Cursor[webhooks.Config]{
+			Data: cfgs,
+		},
 	}
 
 	if err := json.NewEncoder(w).Encode(resp); err != nil {
@@ -35,7 +37,7 @@ func (h *serverHandler) getManyConfigsHandle(w http.ResponseWriter, r *http.Requ
 		return
 	}
 
-	sharedlogging.GetLogger(r.Context()).Infof("GET /configs: %d results", len(cursor.Data))
+	sharedlogging.GetLogger(r.Context()).Infof("GET /configs: %d results", len(resp.Cursor.Data))
 }
 
 var ErrInvalidParams = errors.New("invalid params: only 'id' and 'endpoint' with a valid URL are accepted")

pkg/server/insert_one.go → pkg/server/insert.go

@@ -2,12 +2,12 @@ package server
 
 import (
 	"encoding/json"
-	"errors"
-	"fmt"
 	"net/http"
 
+	"github.com/formancehq/go-libs/sharedapi"
 	"github.com/formancehq/go-libs/sharedlogging"
 	webhooks "github.com/formancehq/webhooks/pkg"
+	"github.com/pkg/errors"
 )
 
 func (h *serverHandler) insertOneConfigHandle(w http.ResponseWriter, r *http.Request) {
@@ -24,21 +24,25 @@ func (h *serverHandler) insertOneConfigHandle(w http.ResponseWriter, r *http.Req
 	}
 
 	if err := cfg.Validate(); err != nil {
-		err := fmt.Errorf("invalid config: %w", err)
+		err := errors.Wrap(err, "invalid config")
 		sharedlogging.GetLogger(r.Context()).Errorf(err.Error())
 		http.Error(w, err.Error(), http.StatusBadRequest)
 		return
 	}
 
-	if id, err := insertOneConfig(r.Context(), cfg, h.store); err != nil {
+	c, err := h.store.InsertOneConfig(r.Context(), cfg)
+	if err == nil {
+		sharedlogging.GetLogger(r.Context()).Infof("POST %s: inserted id %s", PathConfigs, c.ID)
+		resp := sharedapi.BaseResponse[webhooks.Config]{
+			Data: &c,
+		}
+		if err := json.NewEncoder(w).Encode(resp); err != nil {
+			sharedlogging.GetLogger(r.Context()).Errorf("json.Encoder.Encode: %s", err)
+			http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
+			return
+		}
+	} else {
 		sharedlogging.GetLogger(r.Context()).Errorf("POST %s: %s", PathConfigs, err)
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-		return
-	} else if err := json.NewEncoder(w).Encode(id); err != nil {
-		sharedlogging.GetLogger(r.Context()).Errorf("json.Encoder.Encode: %s", err)
-		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-		return
-	} else {
-		sharedlogging.GetLogger(r.Context()).Infof("POST %s: inserted id %s", PathConfigs, id)
 	}
 }