.gitignore

@@ -3,7 +3,6 @@ dev.session.sql
 __debug_bin
 server
 .vscode
-openapi.json
 
 # Binaries for programs and plugins
 *.exe
@@ -13,7 +12,6 @@ openapi.json
 *.dylib
 collector
 newsbot.db
-tmp/
 
 # Test binary, built with `go test -c`
 *.test

api/client.yaml

@@ -1,6 +0,0 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/deepmap/oapi-codegen/HEAD/configuration-schema.json
-package: api
-output: api.gen.go
-generate:
-  models: true
-  client: true

docs/docs.go

@@ -32,11 +32,10 @@ const docTemplate = `{
                 "summary": "Lists the top 25 records ordering from newest to oldest.",
                 "parameters": [
                     {
-                        "type": "integer",
+                        "type": "string",
                         "description": "page number",
                         "name": "page",
-                        "in": "query",
+                        "in": "query"
-                        "required": true
                     }
                 ],
                 "responses": {
@@ -61,7 +60,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/articles/by/source/{id}": {
+        "/v1/articles/by/sourceId": {
             "get": {
                 "security": [
                     {
@@ -80,7 +79,7 @@ const docTemplate = `{
                         "type": "string",
                         "description": "source id",
                         "name": "id",
-                        "in": "path",
+                        "in": "query",
                         "required": true
                     },
                     {
@@ -112,7 +111,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/articles/{id}": {
+        "/v1/articles/{ID}": {
             "get": {
                 "security": [
                     {
@@ -130,7 +129,7 @@ const docTemplate = `{
                     {
                         "type": "string",
                         "description": "int",
-                        "name": "id",
+                        "name": "ID",
                         "in": "path",
                         "required": true
                     }
@@ -157,7 +156,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/articles/{id}/details": {
+        "/v1/articles/{ID}/details": {
             "get": {
                 "security": [
                     {
@@ -175,7 +174,7 @@ const docTemplate = `{
                     {
                         "type": "string",
                         "description": "int",
-                        "name": "id",
+                        "name": "ID",
                         "in": "path",
                         "required": true
                     }
@@ -346,50 +345,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/discord/webhooks/{id}": {
+        "/v1/discord/webhooks/{ID}": {
-            "get": {
-                "security": [
-                    {
-                        "Bearer": []
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "DiscordWebhook"
-                ],
-                "summary": "Returns the top 100 entries from the queue to be processed.",
-                "parameters": [
-                    {
-                        "type": "integer",
-                        "description": "id",
-                        "name": "id",
-                        "in": "path",
-                        "required": true
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/domain.DiscordWebhookResponse"
-                        }
-                    },
-                    "400": {
-                        "description": "Bad Request",
-                        "schema": {
-                            "$ref": "#/definitions/domain.DiscordWebhookResponse"
-                        }
-                    },
-                    "500": {
-                        "description": "Internal Server Error",
-                        "schema": {
-                            "$ref": "#/definitions/domain.DiscordWebhookResponse"
-                        }
-                    }
-                }
-            },
             "delete": {
                 "security": [
                     {
@@ -431,7 +387,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/discord/webhooks/{id}/disable": {
+        "/v1/discord/webhooks/{ID}/disable": {
             "post": {
                 "security": [
                     {
@@ -473,7 +429,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/discord/webhooks/{id}/enable": {
+        "/v1/discord/webhooks/{ID}/enable": {
             "post": {
                 "security": [
                     {
@@ -515,6 +471,51 @@ const docTemplate = `{
                 }
             }
         },
+        "/v1/discord/webhooks/{id}": {
+            "get": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "DiscordWebhook"
+                ],
+                "summary": "Returns the top 100 entries from the queue to be processed.",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "id",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/domain.DiscordWebhookResponse"
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/domain.DiscordWebhookResponse"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/domain.DiscordWebhookResponse"
+                        }
+                    }
+                }
+            }
+        },
         "/v1/sources": {
             "get": {
                 "security": [
@@ -1511,16 +1512,24 @@ const docTemplate = `{
                 }
             }
         }
+    },
+    "securityDefinitions": {
+        "Bearer": {
+            "description": "Type \"Bearer\" followed by a space and JWT token.",
+            "type": "apiKey",
+            "name": "Authorization",
+            "in": "header"
+        }
     }
 }`
 
 // SwaggerInfo holds exported Swagger Info so clients can modify it
 var SwaggerInfo = &swag.Spec{
-	Version:          "",
+	Version:          "0.1",
 	Host:             "",
-	BasePath:         "",
+	BasePath:         "/api",
 	Schemes:          []string{},
-	Title:            "",
+	Title:            "NewsBot collector",
 	Description:      "",
 	InfoInstanceName: "swagger",
 	SwaggerTemplate:  docTemplate,

docs/swagger.json

@@ -1,8 +1,11 @@
 {
     "swagger": "2.0",
     "info": {
-        "contact": {}
+        "title": "NewsBot collector",
+        "contact": {},
+        "version": "0.1"
     },
+    "basePath": "/api",
     "paths": {
         "/v1/articles": {
             "get": {
@@ -20,11 +23,10 @@
                 "summary": "Lists the top 25 records ordering from newest to oldest.",
                 "parameters": [
                     {
-                        "type": "integer",
+                        "type": "string",
                         "description": "page number",
                         "name": "page",
-                        "in": "query",
+                        "in": "query"
-                        "required": true
                     }
                 ],
                 "responses": {
@@ -49,7 +51,7 @@
                 }
             }
         },
-        "/v1/articles/by/source/{id}": {
+        "/v1/articles/by/sourceId": {
             "get": {
                 "security": [
                     {
@@ -68,7 +70,7 @@
                         "type": "string",
                         "description": "source id",
                         "name": "id",
-                        "in": "path",
+                        "in": "query",
                         "required": true
                     },
                     {
@@ -100,7 +102,7 @@
                 }
             }
         },
-        "/v1/articles/{id}": {
+        "/v1/articles/{ID}": {
             "get": {
                 "security": [
                     {
@@ -118,7 +120,7 @@
                     {
                         "type": "string",
                         "description": "int",
-                        "name": "id",
+                        "name": "ID",
                         "in": "path",
                         "required": true
                     }
@@ -145,7 +147,7 @@
                 }
             }
         },
-        "/v1/articles/{id}/details": {
+        "/v1/articles/{ID}/details": {
             "get": {
                 "security": [
                     {
@@ -163,7 +165,7 @@
                     {
                         "type": "string",
                         "description": "int",
-                        "name": "id",
+                        "name": "ID",
                         "in": "path",
                         "required": true
                     }
@@ -334,50 +336,7 @@
                 }
             }
         },
-        "/v1/discord/webhooks/{id}": {
+        "/v1/discord/webhooks/{ID}": {
-            "get": {
-                "security": [
-                    {
-                        "Bearer": []
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "DiscordWebhook"
-                ],
-                "summary": "Returns the top 100 entries from the queue to be processed.",
-                "parameters": [
-                    {
-                        "type": "integer",
-                        "description": "id",
-                        "name": "id",
-                        "in": "path",
-                        "required": true
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/domain.DiscordWebhookResponse"
-                        }
-                    },
-                    "400": {
-                        "description": "Bad Request",
-                        "schema": {
-                            "$ref": "#/definitions/domain.DiscordWebhookResponse"
-                        }
-                    },
-                    "500": {
-                        "description": "Internal Server Error",
-                        "schema": {
-                            "$ref": "#/definitions/domain.DiscordWebhookResponse"
-                        }
-                    }
-                }
-            },
             "delete": {
                 "security": [
                     {
@@ -419,7 +378,7 @@
                 }
             }
         },
-        "/v1/discord/webhooks/{id}/disable": {
+        "/v1/discord/webhooks/{ID}/disable": {
             "post": {
                 "security": [
                     {
@@ -461,7 +420,7 @@
                 }
             }
         },
-        "/v1/discord/webhooks/{id}/enable": {
+        "/v1/discord/webhooks/{ID}/enable": {
             "post": {
                 "security": [
                     {
@@ -503,6 +462,51 @@
                 }
             }
         },
+        "/v1/discord/webhooks/{id}": {
+            "get": {
+                "security": [
+                    {
+                        "Bearer": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "DiscordWebhook"
+                ],
+                "summary": "Returns the top 100 entries from the queue to be processed.",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "id",
+                        "name": "id",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/domain.DiscordWebhookResponse"
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/domain.DiscordWebhookResponse"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/domain.DiscordWebhookResponse"
+                        }
+                    }
+                }
+            }
+        },
         "/v1/sources": {
             "get": {
                 "security": [
@@ -1499,5 +1503,13 @@
                 }
             }
         }
+    },
+    "securityDefinitions": {
+        "Bearer": {
+            "description": "Type \"Bearer\" followed by a space and JWT token.",
+            "type": "apiKey",
+            "name": "Authorization",
+            "in": "header"
+        }
     }
 }

docs/swagger.yaml

@@ -1,3 +1,4 @@
+basePath: /api
 definitions:
   domain.ArticleAndSourceModel:
     properties:
@@ -153,6 +154,8 @@ definitions:
     type: object
 info:
   contact: {}
+  title: NewsBot collector
+  version: "0.1"
 paths:
   /v1/articles:
     get:
@@ -160,8 +163,7 @@ paths:
       - description: page number
         in: query
         name: page
-        required: true
+        type: string
-        type: integer
       produces:
       - application/json
       responses:
@@ -182,12 +184,12 @@ paths:
       summary: Lists the top 25 records ordering from newest to oldest.
       tags:
       - Articles
-  /v1/articles/{id}:
+  /v1/articles/{ID}:
     get:
       parameters:
       - description: int
         in: path
-        name: id
+        name: ID
         required: true
         type: string
       produces:
@@ -210,12 +212,12 @@ paths:
       summary: Returns an article based on defined ID.
       tags:
       - Articles
-  /v1/articles/{id}/details:
+  /v1/articles/{ID}/details:
     get:
       parameters:
       - description: int
         in: path
-        name: id
+        name: ID
         required: true
         type: string
       produces:
@@ -238,11 +240,11 @@ paths:
       summary: Returns an article and source based on defined ID.
       tags:
       - Articles
-  /v1/articles/by/source/{id}:
+  /v1/articles/by/sourceId:
     get:
       parameters:
       - description: source id
-        in: path
+        in: query
         name: id
         required: true
         type: string
@@ -293,7 +295,7 @@ paths:
       summary: Returns the top 100
       tags:
       - DiscordWebhook
-  /v1/discord/webhooks/{id}:
+  /v1/discord/webhooks/{ID}:
     delete:
       parameters:
       - description: id
@@ -319,34 +321,7 @@ paths:
       summary: Deletes a record by ID.
       tags:
       - DiscordWebhook
-    get:
+  /v1/discord/webhooks/{ID}/disable:
-      parameters:
-      - description: id
-        in: path
-        name: id
-        required: true
-        type: integer
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/domain.DiscordWebhookResponse'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/domain.DiscordWebhookResponse'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/domain.DiscordWebhookResponse'
-      security:
-      - Bearer: []
-      summary: Returns the top 100 entries from the queue to be processed.
-      tags:
-      - DiscordWebhook
-  /v1/discord/webhooks/{id}/disable:
     post:
       parameters:
       - description: id
@@ -372,7 +347,7 @@ paths:
       summary: Disables a Webhook from being used.
       tags:
       - DiscordWebhook
-  /v1/discord/webhooks/{id}/enable:
+  /v1/discord/webhooks/{ID}/enable:
     post:
       parameters:
       - description: id
@@ -398,6 +373,34 @@ paths:
       summary: Enables a source to continue processing.
       tags:
       - DiscordWebhook
+  /v1/discord/webhooks/{id}:
+    get:
+      parameters:
+      - description: id
+        in: path
+        name: id
+        required: true
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/domain.DiscordWebhookResponse'
+        "400":
+          description: Bad Request
+          schema:
+            $ref: '#/definitions/domain.DiscordWebhookResponse'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/domain.DiscordWebhookResponse'
+      security:
+      - Bearer: []
+      summary: Returns the top 100 entries from the queue to be processed.
+      tags:
+      - DiscordWebhook
   /v1/discord/webhooks/by/serverAndChannel:
     get:
       parameters:
@@ -942,4 +945,10 @@ paths:
       summary: Adds a new scope to a user account
       tags:
       - Users
+securityDefinitions:
+  Bearer:
+    description: Type "Bearer" followed by a space and JWT token.
+    in: header
+    name: Authorization
+    type: apiKey
 swagger: "2.0"

internal/handler/v1/articles.go

@@ -12,7 +12,7 @@ import (
 // ListArticles
 // @Summary   Lists the top 25 records ordering from newest to oldest.
 // @Produce   application/json
-//  @Param     page  query  int  true  "page number"  test
+// @Param     page  query  string  false  "page number"
 // @Tags      Articles
 // @Router    /v1/articles [get]
 // @Success   200  {object}  domain.ArticleResponse
@@ -49,10 +49,10 @@ func (s *Handler) listArticles(c echo.Context) error {
 
 // GetArticle
 // @Summary   Returns an article based on defined ID.
-//  @Param     id  path  string  true  "int"
+// @Param     ID  path  string  true  "int"
 // @Produce   application/json
 // @Tags      Articles
-//  @Router    /v1/articles/{id} [get]
+// @Router    /v1/articles/{ID} [get]
 // @Success   200  {object}  domain.ArticleResponse  "OK"
 // @Failure   400  {object}  domain.BaseResponse
 // @Failure   500  {object}  domain.BaseResponse
@@ -91,10 +91,10 @@ func (s *Handler) getArticle(c echo.Context) error {
 
 // GetArticleDetails
 // @Summary   Returns an article and source based on defined ID.
-//  @Param     id  path  string  true  "int"
+// @Param     ID  path  string  true  "int"
 // @Produce   application/json
 // @Tags      Articles
-//  @Router    /v1/articles/{id}/details [get]
+// @Router    /v1/articles/{ID}/details [get]
 // @Success   200  {object}  domain.ArticleDetailedResponse  "OK"
 // @Failure   400  {object}  domain.BaseResponse
 // @Failure   500  {object}  domain.BaseResponse
@@ -136,11 +136,11 @@ func (s *Handler) getArticleDetails(c echo.Context) error {
 
 // ListArticlesBySourceID
 // @Summary   Finds the articles based on the SourceID provided.  Returns the top 25.
-//  @Param     id    path   string  true   "source id"
+// @Param     id    query  string  true   "source id"
 // @Param     page  query  int     false  "Page to query"
 // @Produce   application/json
 // @Tags      Articles
-//  @Router    /v1/articles/by/source/{id} [get]
+// @Router    /v1/articles/by/sourceId [get]
 // @Success   200  {object}  domain.ArticleResponse  "OK"
 // @Failure   400  {object}  domain.BaseResponse
 // @Failure   500  {object}  domain.BaseResponse

internal/handler/v1/discordwebhooks.go

@@ -211,7 +211,7 @@ func (s *Handler) NewDiscordWebHook(c echo.Context) error {
 // @Summary   Disables a Webhook from being used.
 // @Param     id  path  int  true  "id"
 // @Tags      DiscordWebhook
-//  @Router    /v1/discord/webhooks/{id}/disable [post]
+// @Router    /v1/discord/webhooks/{ID}/disable [post]
 // @Success   200  {object}  domain.DiscordWebhookResponse  "OK"
 // @Failure   400  {object}  domain.DiscordWebhookResponse
 // @Failure   500  {object}  domain.DiscordWebhookResponse
@@ -279,7 +279,7 @@ func (s *Handler) disableDiscordWebHook(c echo.Context) error {
 // @Summary   Enables a source to continue processing.
 // @Param     id  path  int  true  "id"
 // @Tags      DiscordWebhook
-//  @Router    /v1/discord/webhooks/{id}/enable [post]
+// @Router    /v1/discord/webhooks/{ID}/enable [post]
 // @Success   200  {object}  domain.DiscordWebhookResponse  "OK"
 // @Failure   400  {object}  domain.DiscordWebhookResponse
 // @Failure   500  {object}  domain.DiscordWebhookResponse
@@ -345,7 +345,7 @@ func (s *Handler) enableDiscordWebHook(c echo.Context) error {
 // @Summary   Deletes a record by ID.
 // @Param     id  path  string  true  "id"
 // @Tags      DiscordWebhook
-//  @Router    /v1/discord/webhooks/{id} [delete]
+// @Router    /v1/discord/webhooks/{ID} [delete]
 // @Success   200  {object}  domain.DiscordWebhookResponse  "OK"
 // @Failure   400  {object}  domain.DiscordWebhookResponse
 // @Failure   500  {object}  domain.DiscordWebhookResponse

internal/handler/v1/sources.go

@@ -8,7 +8,6 @@ import (
 
 	"git.jamestombleson.com/jtom38/newsbot-api/domain"
 	"git.jamestombleson.com/jtom38/newsbot-api/internal/dtoconv"
-	"git.jamestombleson.com/jtom38/newsbot-api/internal/entity"
 	"github.com/labstack/echo/v4"
 )
 
@@ -420,8 +419,7 @@ func (s *Handler) newRssSource(c echo.Context) error {
 	}
 
 	param := domain.NewSourceParamRequest{}
-	err = c.Bind(&param)
+	err = (&echo.DefaultBinder{}).BindBody(c, &param)
-	//err = (&echo.DefaultBinder{}).BindBody(c, &param)
 	if err != nil {
 		p.BaseResponse.Message = err.Error()
 		return c.JSON(http.StatusBadRequest, p)
@@ -433,15 +431,8 @@ func (s *Handler) newRssSource(c echo.Context) error {
 	}
 
 	// Check if the record already exists
-	blankRecord := entity.SourceEntity{}
 	item, err := s.repo.Sources.GetBySourceAndName(c.Request().Context(), domain.SourceCollectorRss, param.Name)
-	if err != nil {
+	if err == nil {
-		p.IsError = true
-		return c.JSON(http.StatusInternalServerError, p)
-	}
-
-	// No record was found, but no error returned
-	if item != blankRecord {
 		var dto []domain.SourceDto
 		dto = append(dto, dtoconv.SourceToDto(item))
 		p.Payload = dto
@@ -449,14 +440,6 @@ func (s *Handler) newRssSource(c echo.Context) error {
 		return c.JSON(http.StatusOK, p)
 	}
 
-	//if err == nil {
-	//	var dto []domain.SourceDto
-	//	dto = append(dto, dtoconv.SourceToDto(item))
-	//	p.Payload = dto
-	//	p.BaseResponse.IsError = false
-	//	return c.JSON(http.StatusOK, p)
-	//}
-
 	tags := fmt.Sprintf("rss, %v, %s", param.Name, param.Tags)
 	rows, err := s.repo.Sources.Create(c.Request().Context(), domain.SourceCollectorRss, param.Name, param.Url, tags, true)
 	if err != nil {

internal/repository/source.go

@@ -121,7 +121,7 @@ func (r sourceRepository) GetBySourceAndName(ctx context.Context, source, name s
 	b.Select("*")
 	b.From("Sources").Where(
 		b.Equal("Source", source),
-		b.Equal("DisplayName", name),
+		b.Equal("Name", name),
 	)
 	b.Limit(1)
 	query, args := b.Build()

makefile

@@ -19,13 +19,8 @@ migrate-dev-down: ## revert sql migrations to dev db
 	goose -dir "./internal/database/migrations" sqlite3 ./cmd/newsbot.db down 
 
 swag: ## Generates the swagger documentation with the swag tool
-	~/go/bin/swag f -g cmd/server.go
+	~/go/bin/swag f 
 	~/go/bin/swag init -g cmd/server.go
-	go run tools/swaggertoopenapi/main.go
-	oapi-codegen -config api/client.yaml docs/openapi.json
-	mv api.gen.go api/
 
-install-tools: ## Installs the required tools for this project
+gensql: ## Generates SQL code with sqlc
-	go install github.com/swaggo/swag/cmd/swag@v1.8.1
+	sqlc generate
-	go install github.com/pressly/goose/v3/cmd/goose@latest
-	go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@v2.3.0

tools/swaggertoopenapi/main.go

@@ -1,17 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-
-	"git.jamestombleson.com/jtom38/newsbot-api/tools/swaggertoopenapi/src"
-)
-
-
-func main() {
-	err := src.ConvertToOpenApi("docs/swagger.json", "docs/openapi.json", true)
-	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
-}

tools/swaggertoopenapi/src/online.go

@@ -1,70 +0,0 @@
-package src
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"log"
-	"net/http"
-	"os"
-)
-
-const (
-	ApplicationJson = "application/json"
-)
-
-func ConvertToOpenApi(filePath, outputPath string, force bool) error {
-	// check if the file already exists
-	exists, err := os.Stat(outputPath)
-	if exists != nil {
-		// if force was given, attempt to remove it
-		if force {
-			err = os.Remove(outputPath)
-			if err != nil {
-				return err
-			}
-		} else {
-			return fmt.Errorf("'%s' already exists and force was not approved", outputPath)
-		}
-	}
-
-	log.Printf("Reading '%s'", filePath)
-	content, err := os.ReadFile(filePath)
-	if err != nil {
-		return err
-	}
-
-	client := http.Client{}
-	req, err := http.NewRequest(http.MethodPost, "https://converter.swagger.io/api/convert", bytes.NewReader(content))
-	if err != nil {
-		return err
-	}
-	req.Header.Add("Accept", ApplicationJson)
-	req.Header.Add("Content-Type", ApplicationJson)
-
-	log.Println("Converting to OpenAPI spec")
-	resp, err := client.Do(req)
-	if err != nil {
-		return err
-	}
-
-	log.Println("Reading the response")
-	respContent, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return err
-	}
-
-	log.Println("Writing converted data to openapi.json")
-	writer, err := os.Create(outputPath)
-	if err != nil {
-		return err
-	}
-	defer writer.Close()
-
-	_, err = writer.Write(respContent)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}

tools/swaggertoopenapi/src/online_test.go

@@ -1,14 +0,0 @@
-package src_test
-
-import (
-	"testing"
-
-	"git.jamestombleson.com/jtom38/newsbot-api/tools/swaggerToOpenapi/src"
-)
-
-func TestConvertOnline(t *testing.T) {
-	err := src.ConvertToOpenApi("../../docs/swagger.json", "../../docs/openapi.json", true)
-	if err != nil {
-		t.FailNow()
-	}
-}