updated subscription routes to have beter logid and swagger details
This commit is contained in:
parent
025a503aff
commit
bb880342e9
@ -5,64 +5,113 @@ import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
|
||||
"github.com/go-chi/chi/v5"
|
||||
"github.com/google/uuid"
|
||||
"github.com/jtom38/newsbot/collector/database"
|
||||
)
|
||||
|
||||
func (s *Server) GetSubscriptionsRouter() http.Handler {
|
||||
r := chi.NewRouter()
|
||||
|
||||
r.Get("/", s.ListSubscriptions)
|
||||
r.Get("/by/discordId", s.GetSubscriptionsByDiscordId)
|
||||
r.Get("/by/sourceId", s.GetSubscriptionsBySourceId)
|
||||
r.Post("/discord/webhook/new", s.newDiscordWebHookSubscription)
|
||||
r.Delete("/discord/webhook/delete", s.DeleteDiscordWebHookSubscription)
|
||||
|
||||
return r
|
||||
}
|
||||
|
||||
type ListSubscriptionResults struct {
|
||||
StatusCode int `json:"status"`
|
||||
Message string `json:"message"`
|
||||
Payload []database.SubscriptionDto `json:"payload"`
|
||||
}
|
||||
|
||||
// GetSubscriptions
|
||||
// @Summary Returns the top 100 entries from the queue to be processed.
|
||||
// @Produce application/json
|
||||
// @Tags Subscription
|
||||
// @Router /subscriptions [get]
|
||||
// @Success 200 {object} ListSubscriptionResults "ok"
|
||||
// @Failure 400 {object} models.ApiError "Unable to reach SQL."
|
||||
// @Failure 500 {object} models.ApiError "Failed to process data from SQL."
|
||||
func (s *Server) ListSubscriptions(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
|
||||
res, err := s.Db.ListSubscriptions(*s.ctx, 100)
|
||||
if err != nil {
|
||||
w.Write([]byte(err.Error()))
|
||||
panic(err)
|
||||
payload := ListSubscriptionResults{
|
||||
StatusCode: http.StatusOK,
|
||||
Message: "OK",
|
||||
}
|
||||
|
||||
bres, err := json.Marshal(res)
|
||||
res, err := s.Db.ListSubscriptions(*s.ctx, 100)
|
||||
if err != nil {
|
||||
http.Error(w, ErrUnableToConvertToJson, http.StatusBadRequest)
|
||||
panic(err)
|
||||
s.WriteError(w, err.Error(), http.StatusBadRequest, nil)
|
||||
return
|
||||
}
|
||||
|
||||
for _, item := range res {
|
||||
payload.Payload = append(payload.Payload, database.ConvertToSubscriptionDto(item))
|
||||
}
|
||||
|
||||
bres, err := json.Marshal(payload)
|
||||
if err != nil {
|
||||
s.WriteError(w, err.Error(), http.StatusInternalServerError, nil)
|
||||
return
|
||||
}
|
||||
|
||||
w.Write(bres)
|
||||
}
|
||||
|
||||
type GetSubscriptionResults struct {
|
||||
StatusCode int `json:"status"`
|
||||
Message string `json:"message"`
|
||||
Payload database.SubscriptionDto `json:"payload"`
|
||||
}
|
||||
|
||||
// GetSubscriptionsByDiscordId
|
||||
// @Summary Returns the top 100 entries from the queue to be processed.
|
||||
// @Produce application/json
|
||||
// @Param id query string true "id"
|
||||
// @Tags Subscription
|
||||
// @Router /subscriptions/byDiscordId [get]
|
||||
// @Router /subscriptions/by/discordId [get]
|
||||
// @Success 200 {object} ListSubscriptionResults "ok"
|
||||
// @Failure 400 {object} models.ApiError "Unable to reach SQL or Data problems"
|
||||
// @Failure 500 {object} models.ApiError "Data problems"
|
||||
func (s *Server) GetSubscriptionsByDiscordId(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
|
||||
p := ListSubscriptionResults {
|
||||
StatusCode: http.StatusOK,
|
||||
Message: "OK",
|
||||
}
|
||||
|
||||
query := r.URL.Query()
|
||||
_id := query["id"][0]
|
||||
if _id == "" {
|
||||
http.Error(w, ErrIdValueMissing, http.StatusBadRequest)
|
||||
s.WriteError(w, ErrIdValueMissing, http.StatusBadRequest, nil)
|
||||
return
|
||||
}
|
||||
|
||||
uuid, err := uuid.Parse(_id)
|
||||
if err != nil {
|
||||
http.Error(w, ErrValueNotUuid, http.StatusBadRequest)
|
||||
s.WriteError(w, ErrValueNotUuid, http.StatusBadRequest, nil)
|
||||
return
|
||||
}
|
||||
|
||||
res, err := s.Db.GetSubscriptionsByDiscordWebHookId(*s.ctx, uuid)
|
||||
if err != nil {
|
||||
http.Error(w, ErrNoRecordFound, http.StatusBadRequest)
|
||||
s.WriteError(w, err.Error(), http.StatusNoContent, nil)
|
||||
return
|
||||
}
|
||||
|
||||
bres, err := json.Marshal(res)
|
||||
for _, item := range res {
|
||||
p.Payload = append(p.Payload, database.ConvertToSubscriptionDto(item))
|
||||
}
|
||||
|
||||
bres, err := json.Marshal(p)
|
||||
if err != nil {
|
||||
http.Error(w, ErrUnableToConvertToJson, http.StatusBadRequest)
|
||||
s.WriteError(w, err.Error(), http.StatusInternalServerError, nil)
|
||||
return
|
||||
}
|
||||
|
||||
@ -74,32 +123,42 @@ func (s *Server) GetSubscriptionsByDiscordId(w http.ResponseWriter, r *http.Requ
|
||||
// @Produce application/json
|
||||
// @Param id query string true "id"
|
||||
// @Tags Subscription
|
||||
// @Router /subscriptions/bySourceId [get]
|
||||
// @Router /subscriptions/by/SourceId [get]
|
||||
// @Success 200 {object} ListSubscriptionResults "ok"
|
||||
func (s *Server) GetSubscriptionsBySourceId(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
|
||||
p := ListSubscriptionResults {
|
||||
StatusCode: http.StatusOK,
|
||||
Message: "OK",
|
||||
}
|
||||
|
||||
query := r.URL.Query()
|
||||
_id := query["id"][0]
|
||||
if _id == "" {
|
||||
http.Error(w, ErrIdValueMissing, http.StatusBadRequest)
|
||||
s.WriteError(w, ErrIdValueMissing, http.StatusBadRequest, nil)
|
||||
return
|
||||
}
|
||||
|
||||
uuid, err := uuid.Parse(_id)
|
||||
if err != nil {
|
||||
http.Error(w, ErrValueNotUuid, http.StatusBadRequest)
|
||||
s.WriteError(w, err.Error(), http.StatusBadRequest, nil)
|
||||
return
|
||||
}
|
||||
|
||||
res, err := s.Db.GetSubscriptionsByDiscordWebHookId(*s.ctx, uuid)
|
||||
if err != nil {
|
||||
http.Error(w, ErrNoRecordFound, http.StatusBadRequest)
|
||||
s.WriteError(w, err.Error(), http.StatusNoContent, nil)
|
||||
return
|
||||
}
|
||||
|
||||
bres, err := json.Marshal(res)
|
||||
for _, item := range res {
|
||||
p.Payload = append(p.Payload, database.ConvertToSubscriptionDto(item))
|
||||
}
|
||||
|
||||
bres, err := json.Marshal(p)
|
||||
if err != nil {
|
||||
http.Error(w, ErrUnableToConvertToJson, http.StatusBadRequest)
|
||||
s.WriteError(w, err.Error(), http.StatusInternalServerError, nil)
|
||||
return
|
||||
}
|
||||
|
||||
@ -111,48 +170,44 @@ func (s *Server) GetSubscriptionsBySourceId(w http.ResponseWriter, r *http.Reque
|
||||
// @Param discordWebHookId query string true "discordWebHookId"
|
||||
// @Param sourceId query string true "sourceId"
|
||||
// @Tags Subscription
|
||||
// @Router /subscriptions/new/discordwebhook [post]
|
||||
// @Router /subscriptions/new/discord/webhook [post]
|
||||
func (s *Server) newDiscordWebHookSubscription(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
|
||||
// Extract the values given
|
||||
query := r.URL.Query()
|
||||
discordWebHookId := query["discordWebHookId"][0]
|
||||
sourceId := query["sourceId"][0]
|
||||
|
||||
// Check to make we didnt get a null
|
||||
// Check to make we didn't get a null
|
||||
if discordWebHookId == "" {
|
||||
http.Error(w, "invalid discordWebHooksId given", http.StatusBadRequest)
|
||||
s.WriteError(w, "invalid discordWebHooksId given", http.StatusBadRequest, nil)
|
||||
return
|
||||
}
|
||||
if sourceId == "" {
|
||||
http.Error(w, "invalid sourceID given", http.StatusBadRequest)
|
||||
s.WriteError(w, "invalid sourceID given", http.StatusBadRequest, nil)
|
||||
return
|
||||
}
|
||||
|
||||
// Valide they are UUID values
|
||||
// Validate they are UUID values
|
||||
uHook, err := uuid.Parse(discordWebHookId)
|
||||
if err != nil {
|
||||
http.Error(w, "DiscordWebHooksID was not a uuid value.", http.StatusBadRequest)
|
||||
s.WriteError(w, err.Error(), http.StatusBadRequest, nil)
|
||||
return
|
||||
}
|
||||
uSource, err := uuid.Parse(sourceId)
|
||||
if err != nil {
|
||||
http.Error(w, "SourceId was not a uuid value", http.StatusBadRequest)
|
||||
s.WriteError(w, err.Error(), http.StatusBadRequest, nil)
|
||||
return
|
||||
}
|
||||
|
||||
// Check if the sub already exists
|
||||
item, err := s.Db.QuerySubscriptions(*s.ctx, database.QuerySubscriptionsParams{
|
||||
_, err = s.Db.QuerySubscriptions(*s.ctx, database.QuerySubscriptionsParams{
|
||||
Discordwebhookid: uHook,
|
||||
Sourceid: uSource,
|
||||
})
|
||||
if err == nil {
|
||||
bJson, err := json.Marshal(&item)
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
w.Write(bJson)
|
||||
s.WriteError(w, "a subscription already exists between these two entities", http.StatusBadRequest, nil)
|
||||
return
|
||||
}
|
||||
|
||||
@ -162,29 +217,39 @@ func (s *Server) newDiscordWebHookSubscription(w http.ResponseWriter, r *http.Re
|
||||
Discordwebhookid: uHook,
|
||||
Sourceid: uSource,
|
||||
}
|
||||
s.Db.CreateSubscription(*s.ctx, params)
|
||||
err = s.Db.CreateSubscription(*s.ctx, params)
|
||||
if err != nil {
|
||||
s.WriteError(w, err.Error(), http.StatusInternalServerError, nil)
|
||||
return
|
||||
}
|
||||
|
||||
bJson, err := json.Marshal(¶ms)
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||
s.WriteError(w, err.Error(), http.StatusInternalServerError, nil)
|
||||
return
|
||||
}
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
|
||||
w.Write(bJson)
|
||||
}
|
||||
|
||||
// DeleteDiscordWebHookSubscription
|
||||
// @Summary Removes a Discord WebHook Subscription based on the Subscription ID.
|
||||
// @Param Id query string true "Id"
|
||||
// @Tags Config, Source, Discord, Subscription
|
||||
// @Tags Subscription
|
||||
// @Router /subscriptions/discord/webhook/delete [delete]
|
||||
func (s *Server) DeleteDiscordWebHookSubscription(w http.ResponseWriter, r *http.Request) {
|
||||
var ErrMissingSubscriptionID string = "Request was missing a 'Id' or was a invalid UUID."
|
||||
var ErrMissingSubscriptionID string = "the request was missing a 'Id'"
|
||||
query := r.URL.Query()
|
||||
|
||||
id := query["Id"][0]
|
||||
if id == "" {
|
||||
s.WriteError(w, ErrMissingSubscriptionID, http.StatusBadRequest, nil)
|
||||
return
|
||||
}
|
||||
|
||||
uid, err := uuid.Parse(query["Id"][0])
|
||||
if err != nil {
|
||||
http.Error(w, ErrMissingSubscriptionID, http.StatusBadRequest)
|
||||
s.WriteError(w, err.Error(), http.StatusBadRequest, nil)
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user