jtom38/newsbot-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'moving new rss to accept a body request' (#12) from features/new-source-body into main

Browse Source 
Reviewed-on: #12
This commit is contained in:
jtom38 2024-07-10 07:23:35 -07:00
commit 56199a795a
5 changed files with 66 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
docs/docs.go
View File

@ -719,18 +719,13 @@ const docTemplate = `{
"summary": "Creates a new rss source to monitor.",
"parameters": [
{
"type": "string",
"description": "Site Name",
"name": "name",
"in": "query",
"required": true
},
{
"type": "string",
"description": "RSS Url",
"name": "url",
"in": "query",
"required": true
"description": "body",
"name": "request",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/domain.NewSourceParamRequest"
}
}
],
"responses": {
@ -863,7 +858,7 @@ const docTemplate = `{
"parameters": [
{
"type": "integer",
"description": "uuid",
"description": "id",
"name": "id",
"in": "path",
"required": true
@ -1435,6 +1430,20 @@ const docTemplate = `{
}
}
},
"domain.NewSourceParamRequest": {
"type": "object",
"properties": {
"name": {
"type": "string"
},
"tags": {
"type": "string"
},
"url": {
"type": "string"
}
}
},
"domain.RefreshTokenRequest": {
"type": "object",
"properties": {

35
docs/swagger.json
View File

@ -710,18 +710,13 @@
"summary": "Creates a new rss source to monitor.",
"parameters": [
{
"type": "string",
"description": "Site Name",
"name": "name",
"in": "query",
"required": true
},
{
"type": "string",
"description": "RSS Url",
"name": "url",
"in": "query",
"required": true
"description": "body",
"name": "request",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/domain.NewSourceParamRequest"
}
}
],
"responses": {
@ -854,7 +849,7 @@
"parameters": [
{
"type": "integer",
"description": "uuid",
"description": "id",
"name": "id",
"in": "path",
"required": true
@ -1426,6 +1421,20 @@
}
}
},
"domain.NewSourceParamRequest": {
"type": "object",
"properties": {
"name": {
"type": "string"
},
"tags": {
"type": "string"
},
"url": {
"type": "string"
}
}
},
"domain.RefreshTokenRequest": {
"type": "object",
"properties": {

25
docs/swagger.yaml
View File

@ -99,6 +99,15 @@ definitions:
type:
type: string
type: object
domain.NewSourceParamRequest:
properties:
name:
type: string
tags:
type: string
url:
type: string
type: object
domain.RefreshTokenRequest:
properties:
refreshToken:
@ -487,7 +496,7 @@ paths:
/v1/sources/{id}:
get:
parameters:
- description: uuid
- description: id
in: path
name: id
required: true
@ -688,16 +697,12 @@ paths:
/v1/sources/new/rss:
post:
parameters:
- description: Site Name
in: query
name: name
- description: body
in: body
name: request
required: true
type: string
- description: RSS Url
in: query
name: url
required: true
type: string
schema:
$ref: '#/definitions/domain.NewSourceParamRequest'
responses:
"200":
description: ok

6
domain/requests.go
View File

@ -11,9 +11,9 @@ type GetSourceBySourceAndNameParamRequest struct {
}
type NewSourceParamRequest struct {
Name string `query:"name"`
Url string `query:"url"`
Tags string `query:"tags"`
Name string `json:"name"`
Url string `json:"url"`
Tags string `json:"tags"`
}
type RefreshTokenRequest struct {

7
internal/handler/v1/sources.go
View File

@ -397,8 +397,7 @@ func (s *Handler) newTwitchSource(c echo.Context) error {
// NewRssSource
// @Summary Creates a new rss source to monitor.
// @Param name query string true "Site Name"
// @Param url query string true "RSS Url"
// @Param request body domain.NewSourceParamRequest true "body"
// @Tags Source
// @Router /v1/sources/new/rss [post]
// @Success 200 {object} domain.SourcesResponse "ok"
@ -419,8 +418,8 @@ func (s *Handler) newRssSource(c echo.Context) error {
return c.JSON(http.StatusUnauthorized, p)
}
var param domain.NewSourceParamRequest
err = c.Bind(&param)
param := domain.NewSourceParamRequest{}
err = (&echo.DefaultBinder{}).BindBody(c, &param)
if err != nil {
p.BaseResponse.Message = err.Error()
return c.JSON(http.StatusBadRequest, p)