api.http

@@ -1,6 +0,0 @@
-### Select Sources fro mthe top
-GET http://localhost:8081/api/v1/sources/
-
-
-### Select Sources by type
-GET http://localhost:8081/api/v1/sources/by/source?source=rss

cmd/server.go

@@ -4,11 +4,13 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 
 	_ "github.com/glebarez/go-sqlite"
 	"github.com/pressly/goose/v3"
 
 	"git.jamestombleson.com/jtom38/newsbot-api/docs"
+	"git.jamestombleson.com/jtom38/newsbot-api/internal/database"
 	v1 "git.jamestombleson.com/jtom38/newsbot-api/internal/handler/v1"
 	"git.jamestombleson.com/jtom38/newsbot-api/internal/services"
 	"git.jamestombleson.com/jtom38/newsbot-api/internal/services/cron"
@@ -40,14 +42,19 @@ func main() {
 		panic(err)
 	}
 
+	queries := database.New(db)
+
 	c := cron.NewScheduler(ctx, db)
 	c.Start()
 
-	server := v1.NewServer(ctx, configs, db)
+	server := v1.NewServer(ctx, queries, configs, db)
 
 	fmt.Println("API is online and waiting for requests.")
 	fmt.Printf("API: http://%v:8081/api\r\n", configs.ServerAddress)
 	fmt.Printf("Swagger: http://%v:8081/swagger/index.html\r\n", configs.ServerAddress)
 
-	server.Router.Start(":8081")
+	err = http.ListenAndServe(":8081", server.Router)
+	if err != nil {
+		panic(err)
+	}
 }

docs/docs.go

@@ -16,7 +16,7 @@ const docTemplate = `{
     "host": "{{.Host}}",
     "basePath": "{{.BasePath}}",
     "paths": {
-        "/v1/articles": {
+        "/articles": {
             "get": {
                 "produces": [
                     "application/json"
@@ -55,7 +55,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/articles/by/sourceid": {
+        "/articles/by/sourceid": {
             "get": {
                 "produces": [
                     "application/json"
@@ -101,7 +101,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/articles/{ID}": {
+        "/articles/{ID}": {
             "get": {
                 "produces": [
                     "application/json"
@@ -141,7 +141,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/articles/{ID}/details": {
+        "/articles/{ID}/details": {
             "get": {
                 "produces": [
                     "application/json"
@@ -181,13 +181,14 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/discord/webhooks": {
+        "/discord/webhooks": {
             "get": {
                 "produces": [
                     "application/json"
                 ],
                 "tags": [
-                    "DiscordWebhook"
+                    "Discord",
+                    "Webhook"
                 ],
                 "summary": "Returns the top 100",
                 "responses": {
@@ -212,13 +213,14 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/discord/webhooks/by/serverAndChannel": {
+        "/discord/webhooks/by/serverAndChannel": {
             "get": {
                 "produces": [
                     "application/json"
                 ],
                 "tags": [
-                    "DiscordWebhook"
+                    "Discord",
+                    "Webhook"
                 ],
                 "summary": "Returns all the known web hooks based on the Server and Channel given.",
                 "parameters": [
@@ -259,10 +261,11 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/discord/webhooks/new": {
+        "/discord/webhooks/new": {
             "post": {
                 "tags": [
-                    "DiscordWebhook"
+                    "Discord",
+                    "Webhook"
                 ],
                 "summary": "Creates a new record for a discord web hook to post data to.",
                 "parameters": [
@@ -310,10 +313,11 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/discord/webhooks/{ID}": {
+        "/discord/webhooks/{ID}": {
             "delete": {
                 "tags": [
-                    "DiscordWebhook"
+                    "Discord",
+                    "Webhook"
                 ],
                 "summary": "Deletes a record by ID.",
                 "parameters": [
@@ -347,10 +351,11 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/discord/webhooks/{ID}/disable": {
+        "/discord/webhooks/{ID}/disable": {
             "post": {
                 "tags": [
-                    "DiscordWebhook"
+                    "Discord",
+                    "Webhook"
                 ],
                 "summary": "Disables a Webhook from being used.",
                 "parameters": [
@@ -384,10 +389,11 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/discord/webhooks/{ID}/enable": {
+        "/discord/webhooks/{ID}/enable": {
             "post": {
                 "tags": [
-                    "DiscordWebhook"
+                    "Discord",
+                    "Webhook"
                 ],
                 "summary": "Enables a source to continue processing.",
                 "parameters": [
@@ -402,13 +408,14 @@ const docTemplate = `{
                 "responses": {}
             }
         },
-        "/v1/discord/webhooks/{id}": {
+        "/discord/webhooks/{id}": {
             "get": {
                 "produces": [
                     "application/json"
                 ],
                 "tags": [
-                    "DiscordWebhook"
+                    "Discord",
+                    "Webhook"
                 ],
                 "summary": "Returns the top 100 entries from the queue to be processed.",
                 "parameters": [
@@ -442,7 +449,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/queue/discord/webhooks": {
+        "/queue/discord/webhooks": {
             "get": {
                 "produces": [
                     "application/json"
@@ -461,7 +468,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/settings/{key}": {
+        "/settings/{key}": {
             "get": {
                 "produces": [
                     "application/json"
@@ -482,7 +489,7 @@ const docTemplate = `{
                 "responses": {}
             }
         },
-        "/v1/sources": {
+        "/sources": {
             "get": {
                 "produces": [
                     "application/json"
@@ -515,7 +522,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/sources/by/source": {
+        "/sources/by/source": {
             "get": {
                 "produces": [
                     "application/json"
@@ -561,7 +568,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/sources/by/sourceAndName": {
+        "/sources/by/sourceAndName": {
             "get": {
                 "produces": [
                     "application/json"
@@ -608,7 +615,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/sources/new/reddit": {
+        "/sources/new/reddit": {
             "post": {
                 "tags": [
                     "Source"
@@ -652,7 +659,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/sources/new/rss": {
+        "/sources/new/rss": {
             "post": {
                 "tags": [
                     "Source"
@@ -696,7 +703,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/sources/new/twitch": {
+        "/sources/new/twitch": {
             "post": {
                 "tags": [
                     "Source"
@@ -714,7 +721,7 @@ const docTemplate = `{
                 "responses": {}
             }
         },
-        "/v1/sources/new/youtube": {
+        "/sources/new/youtube": {
             "post": {
                 "tags": [
                     "Source"
@@ -739,7 +746,7 @@ const docTemplate = `{
                 "responses": {}
             }
         },
-        "/v1/sources/{id}": {
+        "/sources/{id}": {
             "get": {
                 "produces": [
                     "application/json"
@@ -795,7 +802,7 @@ const docTemplate = `{
                 "responses": {}
             }
         },
-        "/v1/sources/{id}/disable": {
+        "/sources/{id}/disable": {
             "post": {
                 "tags": [
                     "Source"
@@ -832,7 +839,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/sources/{id}/enable": {
+        "/sources/{id}/enable": {
             "post": {
                 "tags": [
                     "Source"
@@ -869,7 +876,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/subscriptions": {
+        "/subscriptions": {
             "get": {
                 "produces": [
                     "application/json"
@@ -900,7 +907,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/subscriptions/by/SourceId": {
+        "/subscriptions/by/SourceId": {
             "get": {
                 "produces": [
                     "application/json"
@@ -928,7 +935,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/subscriptions/by/discordId": {
+        "/subscriptions/by/discordId": {
             "get": {
                 "produces": [
                     "application/json"
@@ -968,7 +975,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/subscriptions/details": {
+        "/subscriptions/details": {
             "get": {
                 "produces": [
                     "application/json"
@@ -987,7 +994,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1/subscriptions/discord/webhook/delete": {
+        "/subscriptions/discord/webhook/delete": {
             "delete": {
                 "tags": [
                     "Subscription"
@@ -1005,7 +1012,7 @@ const docTemplate = `{
                 "responses": {}
             }
         },
-        "/v1/subscriptions/discord/webhook/new": {
+        "/subscriptions/discord/webhook/new": {
             "post": {
                 "tags": [
                     "Subscription"

docs/swagger.json

@@ -7,7 +7,7 @@
     },
     "basePath": "/api",
     "paths": {
-        "/v1/articles": {
+        "/articles": {
             "get": {
                 "produces": [
                     "application/json"
@@ -46,7 +46,7 @@
                 }
             }
         },
-        "/v1/articles/by/sourceid": {
+        "/articles/by/sourceid": {
             "get": {
                 "produces": [
                     "application/json"
@@ -92,7 +92,7 @@
                 }
             }
         },
-        "/v1/articles/{ID}": {
+        "/articles/{ID}": {
             "get": {
                 "produces": [
                     "application/json"
@@ -132,7 +132,7 @@
                 }
             }
         },
-        "/v1/articles/{ID}/details": {
+        "/articles/{ID}/details": {
             "get": {
                 "produces": [
                     "application/json"
@@ -172,13 +172,14 @@
                 }
             }
         },
-        "/v1/discord/webhooks": {
+        "/discord/webhooks": {
             "get": {
                 "produces": [
                     "application/json"
                 ],
                 "tags": [
-                    "DiscordWebhook"
+                    "Discord",
+                    "Webhook"
                 ],
                 "summary": "Returns the top 100",
                 "responses": {
@@ -203,13 +204,14 @@
                 }
             }
         },
-        "/v1/discord/webhooks/by/serverAndChannel": {
+        "/discord/webhooks/by/serverAndChannel": {
             "get": {
                 "produces": [
                     "application/json"
                 ],
                 "tags": [
-                    "DiscordWebhook"
+                    "Discord",
+                    "Webhook"
                 ],
                 "summary": "Returns all the known web hooks based on the Server and Channel given.",
                 "parameters": [
@@ -250,10 +252,11 @@
                 }
             }
         },
-        "/v1/discord/webhooks/new": {
+        "/discord/webhooks/new": {
             "post": {
                 "tags": [
-                    "DiscordWebhook"
+                    "Discord",
+                    "Webhook"
                 ],
                 "summary": "Creates a new record for a discord web hook to post data to.",
                 "parameters": [
@@ -301,10 +304,11 @@
                 }
             }
         },
-        "/v1/discord/webhooks/{ID}": {
+        "/discord/webhooks/{ID}": {
             "delete": {
                 "tags": [
-                    "DiscordWebhook"
+                    "Discord",
+                    "Webhook"
                 ],
                 "summary": "Deletes a record by ID.",
                 "parameters": [
@@ -338,10 +342,11 @@
                 }
             }
         },
-        "/v1/discord/webhooks/{ID}/disable": {
+        "/discord/webhooks/{ID}/disable": {
             "post": {
                 "tags": [
-                    "DiscordWebhook"
+                    "Discord",
+                    "Webhook"
                 ],
                 "summary": "Disables a Webhook from being used.",
                 "parameters": [
@@ -375,10 +380,11 @@
                 }
             }
         },
-        "/v1/discord/webhooks/{ID}/enable": {
+        "/discord/webhooks/{ID}/enable": {
             "post": {
                 "tags": [
-                    "DiscordWebhook"
+                    "Discord",
+                    "Webhook"
                 ],
                 "summary": "Enables a source to continue processing.",
                 "parameters": [
@@ -393,13 +399,14 @@
                 "responses": {}
             }
         },
-        "/v1/discord/webhooks/{id}": {
+        "/discord/webhooks/{id}": {
             "get": {
                 "produces": [
                     "application/json"
                 ],
                 "tags": [
-                    "DiscordWebhook"
+                    "Discord",
+                    "Webhook"
                 ],
                 "summary": "Returns the top 100 entries from the queue to be processed.",
                 "parameters": [
@@ -433,7 +440,7 @@
                 }
             }
         },
-        "/v1/queue/discord/webhooks": {
+        "/queue/discord/webhooks": {
             "get": {
                 "produces": [
                     "application/json"
@@ -452,7 +459,7 @@
                 }
             }
         },
-        "/v1/settings/{key}": {
+        "/settings/{key}": {
             "get": {
                 "produces": [
                     "application/json"
@@ -473,7 +480,7 @@
                 "responses": {}
             }
         },
-        "/v1/sources": {
+        "/sources": {
             "get": {
                 "produces": [
                     "application/json"
@@ -506,7 +513,7 @@
                 }
             }
         },
-        "/v1/sources/by/source": {
+        "/sources/by/source": {
             "get": {
                 "produces": [
                     "application/json"
@@ -552,7 +559,7 @@
                 }
             }
         },
-        "/v1/sources/by/sourceAndName": {
+        "/sources/by/sourceAndName": {
             "get": {
                 "produces": [
                     "application/json"
@@ -599,7 +606,7 @@
                 }
             }
         },
-        "/v1/sources/new/reddit": {
+        "/sources/new/reddit": {
             "post": {
                 "tags": [
                     "Source"
@@ -643,7 +650,7 @@
                 }
             }
         },
-        "/v1/sources/new/rss": {
+        "/sources/new/rss": {
             "post": {
                 "tags": [
                     "Source"
@@ -687,7 +694,7 @@
                 }
             }
         },
-        "/v1/sources/new/twitch": {
+        "/sources/new/twitch": {
             "post": {
                 "tags": [
                     "Source"
@@ -705,7 +712,7 @@
                 "responses": {}
             }
         },
-        "/v1/sources/new/youtube": {
+        "/sources/new/youtube": {
             "post": {
                 "tags": [
                     "Source"
@@ -730,7 +737,7 @@
                 "responses": {}
             }
         },
-        "/v1/sources/{id}": {
+        "/sources/{id}": {
             "get": {
                 "produces": [
                     "application/json"
@@ -786,7 +793,7 @@
                 "responses": {}
             }
         },
-        "/v1/sources/{id}/disable": {
+        "/sources/{id}/disable": {
             "post": {
                 "tags": [
                     "Source"
@@ -823,7 +830,7 @@
                 }
             }
         },
-        "/v1/sources/{id}/enable": {
+        "/sources/{id}/enable": {
             "post": {
                 "tags": [
                     "Source"
@@ -860,7 +867,7 @@
                 }
             }
         },
-        "/v1/subscriptions": {
+        "/subscriptions": {
             "get": {
                 "produces": [
                     "application/json"
@@ -891,7 +898,7 @@
                 }
             }
         },
-        "/v1/subscriptions/by/SourceId": {
+        "/subscriptions/by/SourceId": {
             "get": {
                 "produces": [
                     "application/json"
@@ -919,7 +926,7 @@
                 }
             }
         },
-        "/v1/subscriptions/by/discordId": {
+        "/subscriptions/by/discordId": {
             "get": {
                 "produces": [
                     "application/json"
@@ -959,7 +966,7 @@
                 }
             }
         },
-        "/v1/subscriptions/details": {
+        "/subscriptions/details": {
             "get": {
                 "produces": [
                     "application/json"
@@ -978,7 +985,7 @@
                 }
             }
         },
-        "/v1/subscriptions/discord/webhook/delete": {
+        "/subscriptions/discord/webhook/delete": {
             "delete": {
                 "tags": [
                     "Subscription"
@@ -996,7 +1003,7 @@
                 "responses": {}
             }
         },
-        "/v1/subscriptions/discord/webhook/new": {
+        "/subscriptions/discord/webhook/new": {
             "post": {
                 "tags": [
                     "Subscription"

docs/swagger.yaml

@@ -241,7 +241,7 @@ info:
   title: NewsBot collector
   version: "0.1"
 paths:
-  /v1/articles:
+  /articles:
     get:
       parameters:
       - description: page number
@@ -266,7 +266,7 @@ paths:
       summary: Lists the top 25 records ordering from newest to oldest.
       tags:
       - Articles
-  /v1/articles/{ID}:
+  /articles/{ID}:
     get:
       parameters:
       - description: int
@@ -292,7 +292,7 @@ paths:
       summary: Returns an article based on defined ID.
       tags:
       - Articles
-  /v1/articles/{ID}/details:
+  /articles/{ID}/details:
     get:
       parameters:
       - description: int
@@ -318,7 +318,7 @@ paths:
       summary: Returns an article and source based on defined ID.
       tags:
       - Articles
-  /v1/articles/by/sourceid:
+  /articles/by/sourceid:
     get:
       parameters:
       - description: source id
@@ -349,7 +349,7 @@ paths:
         25.
       tags:
       - Articles
-  /v1/discord/webhooks:
+  /discord/webhooks:
     get:
       produces:
       - application/json
@@ -368,8 +368,9 @@ paths:
             $ref: '#/definitions/domain.BaseResponse'
       summary: Returns the top 100
       tags:
-      - DiscordWebhook
+      - Discord
-  /v1/discord/webhooks/{ID}:
+      - Webhook
+  /discord/webhooks/{ID}:
     delete:
       parameters:
       - description: id
@@ -392,8 +393,9 @@ paths:
             $ref: '#/definitions/domain.BaseResponse'
       summary: Deletes a record by ID.
       tags:
-      - DiscordWebhook
+      - Discord
-  /v1/discord/webhooks/{ID}/disable:
+      - Webhook
+  /discord/webhooks/{ID}/disable:
     post:
       parameters:
       - description: id
@@ -416,8 +418,9 @@ paths:
             $ref: '#/definitions/domain.BaseResponse'
       summary: Disables a Webhook from being used.
       tags:
-      - DiscordWebhook
+      - Discord
-  /v1/discord/webhooks/{ID}/enable:
+      - Webhook
+  /discord/webhooks/{ID}/enable:
     post:
       parameters:
       - description: id
@@ -428,8 +431,9 @@ paths:
       responses: {}
       summary: Enables a source to continue processing.
       tags:
-      - DiscordWebhook
+      - Discord
-  /v1/discord/webhooks/{id}:
+      - Webhook
+  /discord/webhooks/{id}:
     get:
       parameters:
       - description: id
@@ -454,8 +458,9 @@ paths:
             $ref: '#/definitions/domain.BaseResponse'
       summary: Returns the top 100 entries from the queue to be processed.
       tags:
-      - DiscordWebhook
+      - Discord
-  /v1/discord/webhooks/by/serverAndChannel:
+      - Webhook
+  /discord/webhooks/by/serverAndChannel:
     get:
       parameters:
       - description: Fancy Server
@@ -485,8 +490,9 @@ paths:
             $ref: '#/definitions/domain.BaseResponse'
       summary: Returns all the known web hooks based on the Server and Channel given.
       tags:
-      - DiscordWebhook
+      - Discord
-  /v1/discord/webhooks/new:
+      - Webhook
+  /discord/webhooks/new:
     post:
       parameters:
       - description: url
@@ -519,8 +525,9 @@ paths:
             $ref: '#/definitions/domain.BaseResponse'
       summary: Creates a new record for a discord web hook to post data to.
       tags:
-      - DiscordWebhook
+      - Discord
-  /v1/queue/discord/webhooks:
+      - Webhook
+  /queue/discord/webhooks:
     get:
       produces:
       - application/json
@@ -532,7 +539,7 @@ paths:
       summary: Returns the top 100 entries from the queue to be processed.
       tags:
       - Queue
-  /v1/settings/{key}:
+  /settings/{key}:
     get:
       parameters:
       - description: Settings Key value
@@ -546,7 +553,7 @@ paths:
       summary: Returns a object based on the Key that was given.
       tags:
       - Settings
-  /v1/sources:
+  /sources:
     get:
       parameters:
       - description: page number
@@ -567,7 +574,7 @@ paths:
       summary: Lists the top 50 records
       tags:
       - Source
-  /v1/sources/{id}:
+  /sources/{id}:
     get:
       parameters:
       - description: uuid
@@ -604,7 +611,7 @@ paths:
       summary: Marks a source as deleted based on its ID value.
       tags:
       - Source
-  /v1/sources/{id}/disable:
+  /sources/{id}/disable:
     post:
       parameters:
       - description: id
@@ -628,7 +635,7 @@ paths:
       summary: Disables a source from processing.
       tags:
       - Source
-  /v1/sources/{id}/enable:
+  /sources/{id}/enable:
     post:
       parameters:
       - description: id
@@ -652,7 +659,7 @@ paths:
       summary: Enables a source to continue processing.
       tags:
       - Source
-  /v1/sources/by/source:
+  /sources/by/source:
     get:
       parameters:
       - description: Source Name
@@ -682,7 +689,7 @@ paths:
       summary: 'Lists the top 50 records based on the name given. Example: reddit'
       tags:
       - Source
-  /v1/sources/by/sourceAndName:
+  /sources/by/sourceAndName:
     get:
       parameters:
       - description: dadjokes
@@ -713,7 +720,7 @@ paths:
       summary: Returns a single entity by ID
       tags:
       - Source
-  /v1/sources/new/reddit:
+  /sources/new/reddit:
     post:
       parameters:
       - description: name
@@ -742,7 +749,7 @@ paths:
       summary: Creates a new reddit source to monitor.
       tags:
       - Source
-  /v1/sources/new/rss:
+  /sources/new/rss:
     post:
       parameters:
       - description: Site Name
@@ -771,7 +778,7 @@ paths:
       summary: Creates a new rss source to monitor.
       tags:
       - Source
-  /v1/sources/new/twitch:
+  /sources/new/twitch:
     post:
       parameters:
       - description: name
@@ -783,7 +790,7 @@ paths:
       summary: Creates a new twitch source to monitor.
       tags:
       - Source
-  /v1/sources/new/youtube:
+  /sources/new/youtube:
     post:
       parameters:
       - description: name
@@ -800,7 +807,7 @@ paths:
       summary: Creates a new youtube source to monitor.
       tags:
       - Source
-  /v1/subscriptions:
+  /subscriptions:
     get:
       produces:
       - application/json
@@ -820,7 +827,7 @@ paths:
       summary: Returns the top 100 entries from the queue to be processed.
       tags:
       - Subscription
-  /v1/subscriptions/by/SourceId:
+  /subscriptions/by/SourceId:
     get:
       parameters:
       - description: id
@@ -838,7 +845,7 @@ paths:
       summary: Returns the top 100 entries from the queue to be processed.
       tags:
       - Subscription
-  /v1/subscriptions/by/discordId:
+  /subscriptions/by/discordId:
     get:
       parameters:
       - description: id
@@ -864,7 +871,7 @@ paths:
       summary: Returns the top 100 entries from the queue to be processed.
       tags:
       - Subscription
-  /v1/subscriptions/details:
+  /subscriptions/details:
     get:
       produces:
       - application/json
@@ -876,7 +883,7 @@ paths:
       summary: Returns the top 50 entries with full deatils on the source and output.
       tags:
       - Subscription
-  /v1/subscriptions/discord/webhook/delete:
+  /subscriptions/discord/webhook/delete:
     delete:
       parameters:
       - description: id
@@ -888,7 +895,7 @@ paths:
       summary: Removes a Discord WebHook Subscription based on the Subscription ID.
       tags:
       - Subscription
-  /v1/subscriptions/discord/webhook/new:
+  /subscriptions/discord/webhook/new:
     post:
       parameters:
       - description: discordWebHookId

go.mod

@@ -22,7 +22,6 @@ require (
 require (
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
-	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
 	github.com/huandu/xstrings v1.3.2 // indirect
 	github.com/labstack/gommon v0.4.2 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
@@ -36,7 +35,6 @@ require (
 	github.com/valyala/fasttemplate v1.2.2 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/time v0.5.0 // indirect
 	modernc.org/libc v1.41.0 // indirect
 	modernc.org/mathutil v1.6.0 // indirect
 	modernc.org/memory v1.7.2 // indirect

go.sum

@@ -31,8 +31,6 @@ github.com/go-openapi/swag v0.21.1 h1:wm0rhTb5z7qpJRHBdPOMuY4QjVUMbF6/kwoYeRAOrK
 github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
 github.com/go-rod/rod v0.107.1 h1:wRxTTAXJ0JUnoSGcyGAOubpdrToWIKPCnLu3av8EDFY=
 github.com/go-rod/rod v0.107.1/go.mod h1:Au6ufsz7KyXUJVnw6Ljs1nFpsopy+9AJ/lBwGauYBVg=
-github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
-github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
 github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -163,8 +161,6 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
-golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
 golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=

internal/database/migrations/20240425083756_init.sql

@@ -12,6 +12,8 @@ CREATE TABLE Articles (
 	Url 			TEXT 		NOT NULL,
 	PubDate 		DATETIME 	NOT NULL,
 	IsVideo 		TEXT		NOT NULL,
+	--VideoHeight 	int 		NOT NULL,
+	--VideoWidth 		int 		NOT NULL,
 	ThumbnailUrl 	TEXT 		NOT NULL,
 	Description 	TEXT 		NOT NULL,
 	AuthorName 		TEXT		NOT NULL,
@@ -32,7 +34,6 @@ CREATE Table DiscordWebHooks (
 	CreatedAt 	DATETIME 	NOT NULL,
 	UpdatedAt 	DATETIME 	NOT NULL,
 	DeletedAt 	DATETIME	NOT NULL,
-	UserID 		INTEGER 	NOT NULL,
 	--Name 		TEXT 		NOT NULL, -- Defines webhook purpose
 	--Key 		TEXT,
 	Url 		TEXT 		NOT NULL, -- Webhook Url
@@ -77,9 +78,8 @@ CREATE TABLE Subscriptions (
 	CreatedAt 			DATETIME 	NOT NULL,
 	UpdatedAt 			DATETIME 	NOT NULL,
 	DeletedAt 			DATETIME,
-	DiscordWebHookID 	NUMBER 		NOT NULL,
+	DiscordWebHookId 	NUMBER 		NOT NULL,
-	SourceID 			NUMBER 		NOT NULL,
+	SourceId 			NUMBER 		NOT NULL
-	UserID				NUMBER		NOT NULL
 );
 
 CREATE TABLE Users (

internal/database/migrations/20240425092459_seed.sql

@@ -7,33 +7,33 @@ SELECT 'up SQL query';
 
 -- Final Fantasy XIV Entries
 INSERT INTO sources (CreatedAt, UpdatedAt, DeletedAt, DisplayName, Source, Enabled, Url, Tags) VALUES 
-("2024-04-25 18:37:43.852367", "2024-04-25 18:37:43.852367", "0001-01-01 00:00:00", 'Final Fantasy XIV - NA', 'ffxiv', TRUE, 'https://na.finalfantasyxiv.com/lodestone/', 'ffxiv, final, fantasy, xiv, na, lodestone');
+("2024-04-25 18:37:43.852367", "2024-04-25 18:37:43.852367", "0001-01-01 00:00:00", 'ffxiv', 'Final Fantasy XIV - NA', TRUE, 'https://na.finalfantasyxiv.com/lodestone/', 'ffxiv, final, fantasy, xiv, na, lodestone');
 INSERT INTO sources (CreatedAt, UpdatedAt, DeletedAt, DisplayName, Source, Enabled, Url, Tags) VALUES 
-("2024-04-25 18:37:43.852367", "2024-04-25 18:37:43.852367", "0001-01-01 00:00:00", 'Final Fantasy XIV - JP', 'ffxiv', FALSE, 'https://jp.finalfantasyxiv.com/lodestone/', 'ffxiv, final, fantasy, xiv, jp, lodestone');
+("2024-04-25 18:37:43.852367", "2024-04-25 18:37:43.852367", "0001-01-01 00:00:00", 'ffxiv', 'Final Fantasy XIV - JP', FALSE, 'https://jp.finalfantasyxiv.com/lodestone/', 'ffxiv, final, fantasy, xiv, jp, lodestone');
 INSERT INTO sources (CreatedAt, UpdatedAt, DeletedAt, DisplayName, Source, Enabled, Url, Tags) VALUES  
-("2024-04-25 18:37:43.852367", "2024-04-25 18:37:43.852367", "0001-01-01 00:00:00", 'Final Fantasy XIV - EU', 'ffxiv', FALSE, 'https://eu.finalfantasyxiv.com/lodestone/', 'ffxiv, final, fantasy, xiv, eu, lodestone');
+("2024-04-25 18:37:43.852367", "2024-04-25 18:37:43.852367", "0001-01-01 00:00:00", 'ffxiv', 'Final Fantasy XIV - EU', FALSE, 'https://eu.finalfantasyxiv.com/lodestone/', 'ffxiv, final, fantasy, xiv, eu, lodestone');
 INSERT INTO sources (CreatedAt, UpdatedAt, DeletedAt, DisplayName, Source, Enabled, Url, Tags) VALUES  
-("2024-04-25 18:37:43.852367", "2024-04-25 18:37:43.852367", "0001-01-01 00:00:00", 'Final Fantasy XIV - FR', 'ffxiv', FALSE, 'https://fr.finalfantasyxiv.com/lodestone/', 'ffxiv, final, fantasy, xiv, fr, lodestone');
+("2024-04-25 18:37:43.852367", "2024-04-25 18:37:43.852367", "0001-01-01 00:00:00", 'ffxiv', 'Final Fantasy XIV - FR', FALSE, 'https://fr.finalfantasyxiv.com/lodestone/', 'ffxiv, final, fantasy, xiv, fr, lodestone');
 INSERT INTO sources (CreatedAt, UpdatedAt, DeletedAt, DisplayName, Source, Enabled, Url, Tags) VALUES   
-("2024-04-25 18:37:43.852367", "2024-04-25 18:37:43.852367", "0001-01-01 00:00:00", 'Final Fantasy XIV - DE', 'ffxiv', FALSE, 'https://de.finalfantasyxiv.com/lodestone/', 'ffxiv, final, fantasy, xiv, de, lodestone');
+("2024-04-25 18:37:43.852367", "2024-04-25 18:37:43.852367", "0001-01-01 00:00:00", 'ffxiv', 'Final Fantasy XIV - DE', FALSE, 'https://de.finalfantasyxiv.com/lodestone/', 'ffxiv, final, fantasy, xiv, de, lodestone');
 
 -- Reddit Entries
 INSERT INTO sources (CreatedAt, UpdatedAt, DeletedAt, DisplayName, Source, Enabled, Url, Tags) VALUES 
-("2024-04-25 18:37:43.852367", "2024-04-25 18:37:43.852367", "0001-01-01 00:00:00", 'dadjokes', 'reddit', TRUE, 'https://reddit.com/r/dadjokes', 'reddit, dadjokes');
+("2024-04-25 18:37:43.852367", "2024-04-25 18:37:43.852367", "0001-01-01 00:00:00", 'reddit', 'dadjokes', TRUE, 'https://reddit.com/r/dadjokes', 'reddit, dadjokes');
 INSERT INTO sources (CreatedAt, UpdatedAt, DeletedAt, DisplayName, Source, Enabled, Url, Tags) VALUES   
-("2024-04-25 18:37:43.852367", "2024-04-25 18:37:43.852367", "0001-01-01 00:00:00", 'steamdeck', 'reddit', TRUE, 'https://reddit.com/r/steamdeck', 'reddit, steam deck, steam, deck');
+("2024-04-25 18:37:43.852367", "2024-04-25 18:37:43.852367", "0001-01-01 00:00:00", 'reddit', 'steamdeck', TRUE, 'https://reddit.com/r/steamdeck', 'reddit, steam deck, steam, deck');
 
 -- Youtube Entries
 INSERT INTO sources (CreatedAt, UpdatedAt, DeletedAt, DisplayName, Source, Enabled, Url, Tags) VALUES 
-("2024-04-25 18:37:43.852367", "2024-04-25 18:37:43.852367", "0001-01-01 00:00:00", 'Game Grumps', 'youtube', TRUE, 'https://www.youtube.com/user/GameGrumps', 'youtube, game grumps, game, grumps');
+("2024-04-25 18:37:43.852367", "2024-04-25 18:37:43.852367", "0001-01-01 00:00:00", 'youtube', 'Game Grumps',  TRUE, 'https://www.youtube.com/user/GameGrumps', 'youtube, game grumps, game, grumps');
 
 -- RSS Entries
 INSERT INTO sources (CreatedAt, UpdatedAt, DeletedAt, DisplayName, Source, Enabled, Url, Tags) VALUES   
-("2024-04-25 18:37:43.852367", "2024-04-25 18:37:43.852367", "0001-01-01 00:00:00", 'steampowered - steam deck', 'rss', TRUE, 'https://store.steampowered.com/feeds/news/app/1675200/?cc=US&l=english&snr=1_2108_9__2107', 'rss, steampowered, steam, deck, steam deck');
+("2024-04-25 18:37:43.852367", "2024-04-25 18:37:43.852367", "0001-01-01 00:00:00", 'steampowered', 'steam deck', TRUE, 'https://store.steampowered.com/feeds/news/app/1675200/?cc=US&l=english&snr=1_2108_9__2107', 'rss, steampowered, steam, deck, steam deck');
 
 -- Twitch Entries 
 INSERT INTO sources (CreatedAt, UpdatedAt, DeletedAt, DisplayName, Source, Enabled, Url, Tags) VALUES   
-("2024-04-25 18:37:43.852367", "2024-04-25 18:37:43.852367", "0001-01-01 00:00:00", 'Nintendo', 'twitch', TRUE, 'https://twitch.tv/nintendo', 'twitch, nintendo');
+("2024-04-25 18:37:43.852367", "2024-04-25 18:37:43.852367", "0001-01-01 00:00:00", 'twitch', 'Nintendo', TRUE, 'https://twitch.tv/nintendo', 'twitch, nintendo');
 
 -- +goose StatementEnd
 
@@ -41,10 +41,10 @@ INSERT INTO sources (CreatedAt, UpdatedAt, DeletedAt, DisplayName, Source, Enabl
 -- +goose StatementBegin
 --SELECT 'down SQL query';
 
-DELETE FROM sources where Source = 'reddit' and DisplayName = 'dadjokes';
+DELETE FROM sources where source = 'reddit' and name = 'dadjokes';
-DELETE FROM sources where Source = 'reddit' and DisplayName = 'steamdeck';
+DELETE FROM sources where source = 'reddit' and name = 'steamdeck';
-DELETE FROM sources where Source = 'ffxiv';
+DELETE FROM sources where source = 'ffxiv';
-DELETE FROM sources WHERE Source = 'twitch' and DisplayName = 'Nintendo';
+DELETE FROM sources WHERE source = 'twitch' and name = 'Nintendo';
-DELETE FROM sources WHERE Source = 'youtube' and DisplayName = 'Game Grumps';
+DELETE FROM sources WHERE source = 'youtube' and name = 'Game Grumps';
-DELETE FROM SOURCES WHERE Source = 'rss' and DisplayName = 'steampowered - steam deck';
+DELETE FROM SOURCES WHERE source = 'rss' and name = 'steam deck';
 -- +goose StatementEnd

internal/handler/v1/articles.go

@@ -14,7 +14,7 @@ import (
 // @Produce  application/json
 // @Param    page  query  string  false  "page number"
 // @Tags     Articles
-// @Router   /v1/articles [get]
+// @Router   /articles [get]
 // @Success  200  {object}  domain.ArticleResponse
 // @Failure  400  {object}  domain.BaseResponse
 // @Failure  500  {object}  domain.BaseResponse
@@ -44,7 +44,7 @@ func (s *Handler) listArticles(c echo.Context) error {
 // @Param    ID  path  string  true  "int"
 // @Produce  application/json
 // @Tags     Articles
-// @Router   /v1/articles/{ID} [get]
+// @Router   /articles/{ID} [get]
 // @Success  200  {object}  domain.ArticleResponse  "OK"
 // @Failure  400  {object}  domain.BaseResponse
 // @Failure  500  {object}  domain.BaseResponse
@@ -78,7 +78,7 @@ func (s *Handler) getArticle(c echo.Context) error {
 // @Param    ID  path  string  true  "int"
 // @Produce  application/json
 // @Tags     Articles
-// @Router   /v1/articles/{ID}/details [get]
+// @Router   /articles/{ID}/details [get]
 // @Success  200  {object}  domain.ArticleDetailedResponse  "OK"
 // @Failure  400  {object}  domain.BaseResponse
 // @Failure  500  {object}  domain.BaseResponse
@@ -119,7 +119,7 @@ func (s *Handler) getArticleDetails(c echo.Context) error {
 // @Param    page  query  int     false  "Page to query"
 // @Produce  application/json
 // @Tags     Articles
-// @Router   /v1/articles/by/sourceid [get]
+// @Router   /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

@@ -13,8 +13,8 @@ import (
 // ListDiscordWebhooks
 // @Summary  Returns the top 100
 // @Produce  application/json
-// @Tags     DiscordWebhook
+// @Tags     Discord, Webhook
-// @Router   /v1/discord/webhooks [get]
+// @Router   /discord/webhooks [get]
 // @Success  200  {object}  domain.DiscordWebhookResponse
 // @Failure  400  {object}  domain.BaseResponse
 // @Failure  500  {object}  domain.BaseResponse
@@ -37,8 +37,8 @@ func (s *Handler) ListDiscordWebHooks(c echo.Context) error {
 // @Summary  Returns the top 100 entries from the queue to be processed.
 // @Produce  application/json
 // @Param    id  path  int  true  "id"
-// @Tags     DiscordWebhook
+// @Tags     Discord, Webhook
-// @Router   /v1/discord/webhooks/{id} [get]
+// @Router   /discord/webhooks/{id} [get]
 // @Success  200  {object}  domain.DiscordWebhookResponse  "OK"
 // @Failure  400  {object}  domain.BaseResponse
 // @Failure  500  {object}  domain.BaseResponse
@@ -69,8 +69,8 @@ func (s *Handler) GetDiscordWebHooksById(c echo.Context) error {
 // @Produce  application/json
 // @Param    server   query  string  true  "Fancy Server"
 // @Param    channel  query  string  true  "memes"
-// @Tags     DiscordWebhook
+// @Tags     Discord, Webhook
-// @Router   /v1/discord/webhooks/by/serverAndChannel [get]
+// @Router   /discord/webhooks/by/serverAndChannel [get]
 // @Success  200  {object}  domain.DiscordWebhookResponse  "OK"
 // @Failure  400  {object}  domain.BaseResponse
 // @Failure  500  {object}  domain.BaseResponse
@@ -105,8 +105,8 @@ func (s *Handler) GetDiscordWebHooksByServerAndChannel(c echo.Context) error {
 // @Param    url      query  string  true  "url"
 // @Param    server   query  string  true  "Server name"
 // @Param    channel  query  string  true  "Channel name"
-// @Tags     DiscordWebhook
+// @Tags     Discord, Webhook
-// @Router   /v1/discord/webhooks/new [post]
+// @Router   /discord/webhooks/new [post]
 // @Success  200  {object}  domain.DiscordWebhookResponse  "OK"
 // @Failure  400  {object}  domain.BaseResponse
 // @Failure  500  {object}  domain.BaseResponse
@@ -164,8 +164,8 @@ func (s *Handler) NewDiscordWebHook(c echo.Context) error {
 // DisableDiscordWebHooks
 // @Summary  Disables a Webhook from being used.
 // @Param    id  path  int  true  "id"
-// @Tags     DiscordWebhook
+// @Tags     Discord, Webhook
-// @Router   /v1/discord/webhooks/{ID}/disable [post]
+// @Router   /discord/webhooks/{ID}/disable [post]
 // @Success  200  {object}  domain.DiscordWebhookResponse  "OK"
 // @Failure  400  {object}  domain.BaseResponse
 // @Failure  500  {object}  domain.BaseResponse
@@ -212,8 +212,8 @@ func (s *Handler) disableDiscordWebHook(c echo.Context) error {
 // EnableDiscordWebHook
 // @Summary  Enables a source to continue processing.
 // @Param    id  path  int  true  "id"
-// @Tags     DiscordWebhook
+// @Tags     Discord, Webhook
-// @Router   /v1/discord/webhooks/{ID}/enable [post]
+// @Router   /discord/webhooks/{ID}/enable [post]
 func (s *Handler) enableDiscordWebHook(c echo.Context) error {
 	id, err := strconv.Atoi(c.Param("ID"))
 	if err != nil {
@@ -253,8 +253,8 @@ func (s *Handler) enableDiscordWebHook(c echo.Context) error {
 // DeleteDiscordWebHook
 // @Summary  Deletes a record by ID.
 // @Param    id  path  string  true  "id"
-// @Tags     DiscordWebhook
+// @Tags     Discord, Webhook
-// @Router   /v1/discord/webhooks/{ID} [delete]
+// @Router   /discord/webhooks/{ID} [delete]
 // @Success  200  {object}  domain.DiscordWebhookResponse  "OK"
 // @Failure  400  {object}  domain.BaseResponse
 // @Failure  500  {object}  domain.BaseResponse
@@ -298,8 +298,8 @@ func (s *Handler) deleteDiscordWebHook(c echo.Context) error {
 // UpdateDiscordWebHook
 // @Summary  Updates a valid discord webhook ID based on the body given.
 // @Param    id  path  string  true  "id"
-// @Tags     DiscordWebhook
+// @Tags     Discord, Webhook
-// @Router   /v1/discord/webhooks/{id} [patch]
+// @Router   /discord/webhooks/{id} [patch]
 // @Success  200  {object}  domain.DiscordWebhookResponse  "OK"
 // @Failure  400  {object}  domain.BaseResponse
 // @Failure  500  {object}  domain.BaseResponse

internal/handler/v1/handler.go

@@ -5,19 +5,19 @@ import (
 	"database/sql"
 
 	"github.com/labstack/echo/v4"
-	"github.com/labstack/echo/v4/middleware"
+	_ "github.com/lib/pq"
 	swagger "github.com/swaggo/echo-swagger"
 
-	_ "git.jamestombleson.com/jtom38/newsbot-api/docs"
 	"git.jamestombleson.com/jtom38/newsbot-api/internal/database"
 	"git.jamestombleson.com/jtom38/newsbot-api/internal/domain"
 	"git.jamestombleson.com/jtom38/newsbot-api/internal/services"
+	"git.jamestombleson.com/jtom38/newsbot-api/internal/services/dto"
 )
 
 type Handler struct {
 	Router *echo.Echo
 	Db     *database.Queries
-	//dto    *dto.DtoClient
+	dto    *dto.DtoClient
 	config services.Configs
 	repo   services.RepositoryService
 }
@@ -39,26 +39,23 @@ var (
 	ErrUnableToConvertToJson string = "Unable to convert to json"
 )
 
-func NewServer(ctx context.Context, configs services.Configs, conn *sql.DB) *Handler {
+func NewServer(ctx context.Context, db *database.Queries, configs services.Configs, conn *sql.DB) *Handler {
 	s := &Handler{
-		//Db:     db,
+		Db:     db,
-		//dto:    dto.NewDtoClient(db),
+		dto:    dto.NewDtoClient(db),
 		config: configs,
 		repo:   services.NewRepositoryService(conn),
 	}
 
 	router := echo.New()
-	router.Pre(middleware.RemoveTrailingSlash())
-	router.Pre(middleware.Logger())
-	router.Pre(middleware.Recover())
 	router.GET("/swagger/*", swagger.WrapHandler)
 
 	v1 := router.Group("/api/v1")
 	articles := v1.Group("/articles")
-	articles.GET("", s.listArticles)
+	articles.GET("/", s.listArticles)
-	articles.GET(":id", s.getArticle)
+	articles.GET("/:id", s.getArticle)
-	articles.GET(":id/details", s.getArticleDetails)
+	articles.GET("/:id/details", s.getArticleDetails)
-	articles.GET("by/source/:id", s.ListArticlesBySourceId)
+	articles.GET("/by/source/:id", s.ListArticlesBySourceId)
 
 	//dwh := v1.Group("/discord/webhooks")
 	//dwh.GET("/", s.ListDiscordWebHooks)
@@ -76,7 +73,7 @@ func NewServer(ctx context.Context, configs services.Configs, conn *sql.DB) *Han
 	//settings.GET("/", s.getSettings)
 
 	sources := v1.Group("/sources")
-	sources.GET("", s.listSources)
+	sources.GET("/", s.listSources)
 	sources.GET("/by/source", s.listSourcesBySource)
 	sources.GET("/by/sourceAndName", s.GetSourceBySourceAndName)
 	//sources.POST("/new/reddit", s.newRedditSource)
@@ -96,7 +93,6 @@ func NewServer(ctx context.Context, configs services.Configs, conn *sql.DB) *Han
 	subs.POST("/discord/webhook/new", s.newDiscordWebHookSubscription)
 	subs.DELETE("/discord/webhook/delete", s.DeleteDiscordWebHookSubscription)
 
-	s.Router = router
 	return s
 }
 

internal/handler/v1/queue.go

@@ -3,6 +3,7 @@ package v1
 import (
 	"net/http"
 
+	"git.jamestombleson.com/jtom38/newsbot-api/internal/domain"
 	"git.jamestombleson.com/jtom38/newsbot-api/internal/domain/models"
 	"github.com/labstack/echo/v4"
 )
@@ -16,7 +17,7 @@ type ListDiscordWebHooksQueueResults struct {
 // @Summary  Returns the top 100 entries from the queue to be processed.
 // @Produce  application/json
 // @Tags     Queue
-// @Router   /v1/queue/discord/webhooks [get]
+// @Router   /queue/discord/webhooks [get]
 // @Success  200  {object}  ListDiscordWebHooksQueueResults  "ok"
 func (s *Handler) ListDiscordWebhookQueue(c echo.Context) error {
 	p := ListDiscordWebHooksQueueResults{
@@ -27,13 +28,13 @@ func (s *Handler) ListDiscordWebhookQueue(c echo.Context) error {
 	}
 
 	// Get the raw resp from sql
-	//res, err := s.dto.ListDiscordWebhookQueueDetails(c.Request().Context(), 50)
+	res, err := s.dto.ListDiscordWebhookQueueDetails(c.Request().Context(), 50)
-	//if err != nil {
+	if err != nil {
-	//	return c.JSON(http.StatusInternalServerError, domain.BaseResponse{
+		return c.JSON(http.StatusInternalServerError, domain.BaseResponse{
-	//		Message: err.Error(),
+			Message: err.Error(),
-	//	})
+		})
-	//}
+	}
 
-	//p.Payload = res
+	p.Payload = res
 	return c.JSON(http.StatusOK, p)
 }

internal/handler/v1/settings.go

@@ -14,7 +14,7 @@ import (
 // @Param    key  path  string  true  "Settings Key value"
 // @Produce  application/json
 // @Tags     Settings
-// @Router   /v1/settings/{key} [get]
+// @Router   /settings/{key} [get]
 func (s *Handler) getSettings(c echo.Context) error {
 	id := c.Param("ID")
 

internal/handler/v1/sources.go

@@ -31,7 +31,7 @@ type GetSource struct {
 // @Param    page    query  string  false  "page number"
 // @Produce  application/json
 // @Tags     Source
-// @Router   /v1/sources [get]
+// @Router   /sources [get]
 // @Success  200  {object}  domain.SourcesResponse  "ok"
 // @Failure  400  {object}  domain.BaseResponse     "Unable to reach SQL or Data problems"
 func (s *Handler) listSources(c echo.Context) error {
@@ -62,7 +62,7 @@ func (s *Handler) listSources(c echo.Context) error {
 // @Param    page  query  string  false  "page number"
 // @Produce  application/json
 // @Tags     Source
-// @Router   /v1/sources/by/source [get]
+// @Router   /sources/by/source [get]
 // @Success  200  {object}  domain.SourcesResponse  "ok"
 // @Failure  400  {object}  domain.BaseResponse     
 // @Failure  500  {object}  domain.BaseResponse     
@@ -100,7 +100,7 @@ func (s *Handler) listSourcesBySource(c echo.Context) error {
 // @Param    id  path  int  true  "uuid"
 // @Produce  application/json
 // @Tags     Source
-// @Router   /v1/sources/{id} [get]
+// @Router   /sources/{id} [get]
 // @Success  200  {object}  domain.SourcesResponse  "ok"
 // @Failure  400  {object}  domain.BaseResponse     
 // @Failure  500  {object}  domain.BaseResponse     
@@ -135,7 +135,7 @@ func (s *Handler) getSource(c echo.Context) error {
 // @Param    source  query  string  true  "reddit"
 // @Produce  application/json
 // @Tags     Source
-// @Router   /v1/sources/by/sourceAndName [get]
+// @Router   /sources/by/sourceAndName [get]
 // @Success  200  {object}  domain.SourcesResponse  "ok"
 // @Failure  400  {object}  domain.BaseResponse     
 // @Failure  500  {object}  domain.BaseResponse     
@@ -170,7 +170,7 @@ func (s *Handler) GetSourceBySourceAndName(c echo.Context) error {
 // @Param    name  query  string  true  "name"
 // @Param    url   query  string  true  "url"
 // @Tags     Source
-// @Router   /v1/sources/new/reddit [post]
+// @Router   /sources/new/reddit [post]
 // @Success  200  {object}  domain.SourcesResponse  "ok"
 // @Failure  400  {object}  domain.BaseResponse     
 // @Failure  500  {object}  domain.BaseResponse     
@@ -226,7 +226,7 @@ func (s *Handler) newRedditSource(c echo.Context) error {
 // @Param    name  query  string  true  "name"
 // @Param    url   query  string  true  "url"
 // @Tags     Source
-// @Router   /v1/sources/new/youtube [post]
+// @Router   /sources/new/youtube [post]
 func (s *Handler) newYoutubeSource(c echo.Context) error {
 	var param domain.NewSourceParamRequest
 	err := c.Bind(&param)
@@ -289,7 +289,7 @@ func (s *Handler) newYoutubeSource(c echo.Context) error {
 // @Summary  Creates a new twitch source to monitor.
 // @Param    name  query  string  true  "name"
 // @Tags     Source
-// @Router   /v1/sources/new/twitch [post]
+// @Router   /sources/new/twitch [post]
 func (s *Handler) newTwitchSource(c echo.Context) error {
 	var param domain.NewSourceParamRequest
 	err := c.Bind(&param)
@@ -337,7 +337,7 @@ func (s *Handler) newTwitchSource(c echo.Context) error {
 // @Param    name  query  string  true  "Site Name"
 // @Param    url   query  string  true  "RSS Url"
 // @Tags     Source
-// @Router   /v1/sources/new/rss [post]
+// @Router   /sources/new/rss [post]
 // @Success  200  {object}  domain.SourcesResponse  "ok"
 // @Failure  400  {object}  domain.BaseResponse     
 // @Failure  500  {object}  domain.BaseResponse     
@@ -387,7 +387,7 @@ func (s *Handler) newRssSource(c echo.Context) error {
 // @Summary  Marks a source as deleted based on its ID value.
 // @Param    id  path  string  true  "id"
 // @Tags     Source
-// @Router   /v1/sources/{id} [POST]
+// @Router   /sources/{id} [POST]
 func (s *Handler) deleteSources(c echo.Context) error {
 	id := c.Param("ID")
 	uuid, err := uuid.Parse(id)
@@ -432,7 +432,7 @@ func (s *Handler) deleteSources(c echo.Context) error {
 // @Summary  Disables a source from processing.
 // @Param    id  path  int  true  "id"
 // @Tags     Source
-// @Router   /v1/sources/{id}/disable [post]
+// @Router   /sources/{id}/disable [post]
 // @Success  200  {object}  domain.SourcesResponse  "ok"
 // @Failure  400  {object}  domain.BaseResponse     
 // @Failure  500  {object}  domain.BaseResponse     
@@ -474,7 +474,7 @@ func (s *Handler) disableSource(c echo.Context) error {
 // @Summary  Enables a source to continue processing.
 // @Param    id  path  string  true  "id"
 // @Tags     Source
-// @Router   /v1/sources/{id}/enable [post]
+// @Router   /sources/{id}/enable [post]
 // @Success  200  {object}  domain.SourcesResponse  "ok"
 // @Failure  400  {object}  domain.BaseResponse     
 // @Failure  500  {object}  domain.BaseResponse     

internal/handler/v1/subscriptions.go

@@ -31,7 +31,7 @@ type ListSubscriptionDetails struct {
 // @Summary  Returns the top 100 entries from the queue to be processed.
 // @Produce  application/json
 // @Tags     Subscription
-// @Router   /v1/subscriptions [get]
+// @Router   /subscriptions [get]
 // @Success  200  {object}  ListSubscriptions  "ok"
 // @Failure  400  {object}  ApiError           "Unable to reach SQL."
 // @Failure  500  {object}  ApiError           "Failed to process data from SQL."
@@ -43,11 +43,12 @@ func (s *Handler) ListSubscriptions(c echo.Context) error {
 		},
 	}
 
-	//res, err := s.dto.ListSubscriptions(c.Request().Context(), 50)
+	res, err := s.dto.ListSubscriptions(c.Request().Context(), 50)
-	//if err != nil {
+	if err != nil {
-	//	return s.WriteError(c, err, http.StatusBadRequest)
+		return s.WriteError(c, err, http.StatusBadRequest)
-	//}
+	}
-	//payload.Payload = res
+
+	payload.Payload = res
 	return c.JSON(http.StatusOK, payload)
 }
 
@@ -55,7 +56,7 @@ func (s *Handler) ListSubscriptions(c echo.Context) error {
 // @Summary  Returns the top 50 entries with full deatils on the source and output.
 // @Produce  application/json
 // @Tags     Subscription
-// @Router   /v1/subscriptions/details [get]
+// @Router   /subscriptions/details [get]
 // @Success  200  {object}  ListSubscriptionDetails  "ok"
 func (s *Handler) ListSubscriptionDetails(c echo.Context) error {
 	payload := ListSubscriptionDetails{
@@ -65,11 +66,12 @@ func (s *Handler) ListSubscriptionDetails(c echo.Context) error {
 		},
 	}
 
-	//res, err := s.dto.ListSubscriptionDetails(c.Request().Context(), 50)
+	res, err := s.dto.ListSubscriptionDetails(c.Request().Context(), 50)
-	//if err != nil {
+	if err != nil {
-	//	return s.WriteError(c, err, http.StatusInternalServerError)
+		return s.WriteError(c, err, http.StatusInternalServerError)
-	//}
+	}
-	//payload.Payload = res
+
+	payload.Payload = res
 	return c.JSON(http.StatusOK, payload)
 }
 
@@ -78,7 +80,7 @@ func (s *Handler) ListSubscriptionDetails(c echo.Context) error {
 // @Produce  application/json
 // @Param    id  query  string  true  "id"
 // @Tags     Subscription
-// @Router   /v1/subscriptions/by/discordId [get]
+// @Router   /subscriptions/by/discordId [get]
 // @Success  200  {object}  ListSubscriptions  "ok"
 // @Failure  400  {object}  ApiError           "Unable to reach SQL or Data problems"
 // @Failure  500  {object}  ApiError           "Data problems"
@@ -95,16 +97,18 @@ func (s *Handler) GetSubscriptionsByDiscordId(c echo.Context) error {
 		return s.WriteError(c, errors.New(ErrIdValueMissing), http.StatusBadRequest)
 	}
 
-	//uuid, err := uuid.Parse(id)
+	uuid, err := uuid.Parse(id)
-	//if err != nil {
+	if err != nil {
-	//	return s.WriteError(c, errors.New(ErrValueNotUuid), http.StatusBadRequest)
+		return s.WriteError(c, errors.New(ErrValueNotUuid), http.StatusBadRequest)
-	//}
 
-	//res, err := s.dto.ListSubscriptionsByDiscordWebhookId(context.Background(), uuid)
+	}
-	//if err != nil {
+
-	//	return s.WriteError(c, err, http.StatusNoContent)
+	res, err := s.dto.ListSubscriptionsByDiscordWebhookId(context.Background(), uuid)
-	//}
+	if err != nil {
-	//p.Payload = res
+		return s.WriteError(c, err, http.StatusNoContent)
+	}
+
+	p.Payload = res
 	return c.JSON(http.StatusOK, p)
 }
 
@@ -113,7 +117,7 @@ func (s *Handler) GetSubscriptionsByDiscordId(c echo.Context) error {
 // @Produce  application/json
 // @Param    id  query  string  true  "id"
 // @Tags     Subscription
-// @Router   /v1/subscriptions/by/SourceId [get]
+// @Router   /subscriptions/by/SourceId [get]
 // @Success  200  {object}  ListSubscriptions  "ok"
 func (s *Handler) GetSubscriptionsBySourceId(c echo.Context) error {
 	p := ListSubscriptions{
@@ -128,16 +132,17 @@ func (s *Handler) GetSubscriptionsBySourceId(c echo.Context) error {
 		return s.WriteError(c, errors.New(ErrIdValueMissing), http.StatusBadRequest)
 	}
 
-	//uuid, err := uuid.Parse(_id)
+	uuid, err := uuid.Parse(_id)
-	//if err != nil {
+	if err != nil {
-	//	return s.WriteError(c, err, http.StatusBadRequest)
+		return s.WriteError(c, err, http.StatusBadRequest)
-	//}
+	}
 
-	//res, err := s.dto.ListSubscriptionsBySourceId(context.Background(), uuid)
+	res, err := s.dto.ListSubscriptionsBySourceId(context.Background(), uuid)
-	//if err != nil {
+	if err != nil {
-	//	return s.WriteError(c, err, http.StatusNoContent)
+		return s.WriteError(c, err, http.StatusNoContent)
-	//}
+	}
-	//p.Payload = res
+
+	p.Payload = res
 	return c.JSON(http.StatusOK, p)
 }
 
@@ -146,7 +151,7 @@ func (s *Handler) GetSubscriptionsBySourceId(c echo.Context) error {
 // @Param    discordWebHookId  query  string  true  "discordWebHookId"
 // @Param    sourceId          query  string  true  "sourceId"
 // @Tags     Subscription
-// @Router   /v1/subscriptions/discord/webhook/new [post]
+// @Router   /subscriptions/discord/webhook/new [post]
 func (s *Handler) newDiscordWebHookSubscription(c echo.Context) error {
 	// Extract the values given
 	discordWebHookId := c.QueryParam("discordWebHookId")
@@ -202,7 +207,7 @@ func (s *Handler) newDiscordWebHookSubscription(c echo.Context) error {
 // @Summary  Removes a Discord WebHook Subscription based on the Subscription ID.
 // @Param    id  query  string  true  "id"
 // @Tags     Subscription
-// @Router   /v1/subscriptions/discord/webhook/delete [delete]
+// @Router   /subscriptions/discord/webhook/delete [delete]
 func (s *Handler) DeleteDiscordWebHookSubscription(c echo.Context) error {
 	var ErrMissingSubscriptionID string = "the request was missing a 'Id'"
 

internal/services/config.go

@@ -11,9 +11,9 @@ import (
 )
 
 const (
-	ServerAddress = "ServerAddress"
+	ServerAddress = "SERVER_ADDRESS"
 
-	//Sql_Connection_String = "SQL_CONNECTION_STRING"
+	Sql_Connection_String = "SQL_CONNECTION_STRING"
 
 	FEATURE_ENABLE_REDDIT_BACKEND = "FEATURE_ENABLE_REDDIT_BACKEND"
 	REDDIT_PULL_TOP               = "REDDIT_PULL_TOP"

internal/services/cron/collectors.go

@@ -10,7 +10,7 @@ import (
 
 func (c *Cron) CollectRssPosts() {
 	log.Println("Starting ")
-	sources, err := c.repo.Sources.ListBySource(c.ctx, 0, 1000, domain.SourceCollectorRss)
+	sources, err := c.repo.Sources.ListBySource(*c.ctx, 0, 1000, domain.SourceCollectorRss)
 	if err != nil {
 		log.Println(err)
 	}
@@ -27,12 +27,12 @@ func (c *Cron) CollectRssPosts() {
 		}
 
 		for _, article := range articles {
-			_, err := c.repo.Articles.GetByUrl(c.ctx, article.Url)
+			_, err := c.repo.Articles.GetByUrl(*c.ctx, article.Url)
 			if err == nil {
 				continue
 			}
 
-			rowsCreated, err := c.repo.Articles.CreateFromEntity(c.ctx, article)
+			rowsCreated, err := c.repo.Articles.CreateFromEntity(*c.ctx, article)
 			if err != nil {
 				log.Println(err)
 			}
@@ -48,7 +48,7 @@ func (c *Cron) CollectRssPosts() {
 }
 
 func (c *Cron) CollectRedditPosts() {
-	sources, err := c.repo.Sources.ListBySource(c.ctx, 0, 1000, domain.SourceCollectorReddit)
+	sources, err := c.repo.Sources.ListBySource(*c.ctx, 0, 1000, domain.SourceCollectorReddit)
 	if err != nil {
 		log.Printf("[Reddit] No sources found to query - %v\r", err)
 	}
@@ -67,12 +67,12 @@ func (c *Cron) CollectRedditPosts() {
 
 		redditArticles := rc.ConvertToArticles(raw)
 		for _, article := range redditArticles {
-			_, err := c.repo.Articles.GetByUrl(c.ctx, article.Url)
+			_, err := c.repo.Articles.GetByUrl(*c.ctx, article.Url)
 			if err == nil {
 				continue
 			}
 
-			rowsAdded, err := c.repo.Articles.CreateFromEntity(c.ctx, article)
+			rowsAdded, err := c.repo.Articles.CreateFromEntity(*c.ctx, article)
 			if err != nil {
 				log.Printf("Failed to add a new reddit article to the database: %s", err)
 			}
@@ -86,7 +86,7 @@ func (c *Cron) CollectRedditPosts() {
 }
 
 func (c *Cron) CollectYoutubePosts() {
-	sources, err := c.repo.Sources.ListBySource(c.ctx, 0, 1000, domain.SourceCollectorYoutube)
+	sources, err := c.repo.Sources.ListBySource(*c.ctx, 0, 1000, domain.SourceCollectorYoutube)
 	if err != nil {
 		log.Printf("[Youtube] No sources found to query - %v\r", err)
 	}
@@ -104,12 +104,12 @@ func (c *Cron) CollectYoutubePosts() {
 		}
 
 		for _, article := range raw {
-			_, err := c.repo.Articles.GetByUrl(c.ctx, article.Url)
+			_, err := c.repo.Articles.GetByUrl(*c.ctx, article.Url)
 			if err == nil {
 				continue
 			}
 
-			rowsAdded, err := c.repo.Articles.CreateFromEntity(c.ctx, article)
+			rowsAdded, err := c.repo.Articles.CreateFromEntity(*c.ctx, article)
 			if err != nil {
 				log.Printf("Failed to add a new youtube article to the database: %s", err)
 			}
@@ -127,7 +127,7 @@ func (c *Cron) CollectYoutubePosts() {
 }
 
 func (c *Cron) CollectFfxivPosts() {
-	sources, err := c.repo.Sources.ListBySource(c.ctx, 0, 1000, domain.SourceCollectorFfxiv)
+	sources, err := c.repo.Sources.ListBySource(*c.ctx, 0, 1000, domain.SourceCollectorFfxiv)
 	if err != nil {
 		log.Printf("[FFXIV] No sources found to query - %v\r", err)
 	}
@@ -144,12 +144,12 @@ func (c *Cron) CollectFfxivPosts() {
 		}
 
 		for _, article := range items {
-			_, err := c.repo.Articles.GetByUrl(c.ctx, article.Url)
+			_, err := c.repo.Articles.GetByUrl(*c.ctx, article.Url)
 			if err == nil {
 				continue
 			}
 
-			rowsAdded, err := c.repo.Articles.CreateFromEntity(c.ctx, article)
+			rowsAdded, err := c.repo.Articles.CreateFromEntity(*c.ctx, article)
 			if err != nil {
 				log.Printf("Failed to add a new FFXIV article to the database: %s", err)
 			}
@@ -167,7 +167,7 @@ func (c *Cron) CollectFfxivPosts() {
 }
 
 func (c *Cron) CollectTwitchPosts() {
-	sources, err := c.repo.Sources.ListBySource(c.ctx, 0, 1000, domain.SourceCollectorTwitch)
+	sources, err := c.repo.Sources.ListBySource(*c.ctx, 0, 1000, domain.SourceCollectorTwitch)
 	if err != nil {
 		log.Printf("[Twitch] No sources found to query - %v\r", err)
 	}
@@ -196,12 +196,12 @@ func (c *Cron) CollectTwitchPosts() {
 		}
 
 		for _, article := range items {
-			_, err := c.repo.Articles.GetByUrl(c.ctx, article.Url)
+			_, err := c.repo.Articles.GetByUrl(*c.ctx, article.Url)
 			if err == nil {
 				continue
 			}
 
-			rowsAdded, err := c.repo.Articles.CreateFromEntity(c.ctx, article)
+			rowsAdded, err := c.repo.Articles.CreateFromEntity(*c.ctx, article)
 			if err != nil {
 				log.Printf("Failed to add a new Twitch article to the database: %s", err)
 			}

internal/services/cron/scheduler.go

@@ -13,14 +13,14 @@ import (
 
 type Cron struct {
 	Db    *database.Queries
-	ctx   context.Context
+	ctx   *context.Context
 	timer *cron.Cron
 	repo  services.RepositoryService
 }
 
 func NewScheduler(ctx context.Context, conn *sql.DB) *Cron {
 	c := &Cron{
-		ctx:  ctx,
+		ctx:  &ctx,
 		repo: services.NewRepositoryService(conn),
 	}
 	timer := cron.New()
@@ -28,11 +28,11 @@ func NewScheduler(ctx context.Context, conn *sql.DB) *Cron {
 	//timer.AddFunc("*/5 * * * *", func()  { go CheckCache() })
 	//features := services.GetEnvConfig()
 
-	timer.AddFunc("5 * * * *", func() { go c.CollectRssPosts() })
+	timer.AddFunc("5 * * * *", c.CollectRssPosts)
-	//timer.AddFunc("10 * * * *", c.CollectRedditPosts)
+	//timer.AddFunc("5 1-23 * * *", c.CollectRedditPosts)
-	//timer.AddFunc("15 * * * *", c.CheckYoutube)
+	//timer.AddFunc("10 1-23 * * *", c.CheckYoutube)
-	//timer.AddFunc("20 * * * *", c.CheckFfxiv)
+	//timer.AddFunc("5 5,10,15,20 * * *", c.CheckFfxiv)
-	//timer.AddFunc("25 * * * *", c.CheckTwitch)
+	//timer.AddFunc("15 1-23 * * *", c.CheckTwitch)
 	//timer.AddFunc("*/5 * * * *", c.CheckDiscordQueue)
 
 	c.timer = timer

internal/services/dto/articles.go

@@ -0,0 +1,140 @@
+// The converter package lives between the database calls and the API calls.
+// This way if any new methods like RPC calls are added later, the API does not need to be reworked as much
+package dto
+
+import (
+	"context"
+	"strings"
+
+	"git.jamestombleson.com/jtom38/newsbot-api/internal/database"
+	"git.jamestombleson.com/jtom38/newsbot-api/internal/domain/models"
+	"github.com/google/uuid"
+)
+
+type DtoClient struct {
+	db *database.Queries
+}
+
+func NewDtoClient(db *database.Queries) *DtoClient {
+	return &DtoClient{
+		db: db,
+	}
+}
+
+func (c *DtoClient) ListArticles(ctx context.Context, limit, page int) ([]models.ArticleDto, error) {
+	var res []models.ArticleDto
+
+	a, err := c.db.ListArticles(ctx, database.ListArticlesParams{
+		Limit:  int32(limit),
+		Offset: int32(limit * page),
+	})
+	if err != nil {
+		return res, err
+	}
+
+	for _, article := range a {
+		res = append(res, c.convertArticle(article))
+	}
+	return res, nil
+}
+
+func (c *DtoClient) ListArticlesByPage(ctx context.Context, page, limit int32) ([]models.ArticleDto, error) {
+	var res []models.ArticleDto
+
+	a, err := c.db.ListArticlesByPage(ctx, database.ListArticlesByPageParams{
+		Limit:  limit,
+		Offset: page * limit,
+	})
+	if err != nil {
+		return res, err
+	}
+
+	for _, article := range a {
+		res = append(res, c.convertArticle(article))
+	}
+
+	return res, nil
+}
+
+func (c *DtoClient) GetArticle(ctx context.Context, ID uuid.UUID) (models.ArticleDto, error) {
+	a, err := c.db.GetArticleByID(ctx, ID)
+	if err != nil {
+		return models.ArticleDto{}, err
+	}
+
+	return c.convertArticle(a), nil
+}
+
+func (c *DtoClient) GetArticleDetails(ctx context.Context, ID uuid.UUID) (models.ArticleDetailsDto, error) {
+	a, err := c.db.GetArticleByID(ctx, ID)
+	if err != nil {
+		return models.ArticleDetailsDto{}, err
+	}
+
+	s, err := c.db.GetSourceByID(ctx, a.Sourceid)
+	if err != nil {
+		return models.ArticleDetailsDto{}, err
+	}
+
+	res := c.convertArticleDetails(a, s)
+
+	return res, nil
+}
+
+func (c *DtoClient) ListNewArticlesBySourceId(ctx context.Context, SourceID uuid.UUID, limit, page int) ([]models.ArticleDto, error) {
+	var res []models.ArticleDto
+	a, err := c.db.ListNewArticlesBySourceId(ctx, database.ListNewArticlesBySourceIdParams{
+		Sourceid: SourceID,
+		Limit:    int32(limit),
+		Offset:   int32(limit * page),
+	})
+	if err != nil {
+		return res, err
+	}
+
+	for _, article := range a {
+		res = append(res, c.convertArticle(article))
+	}
+
+	return res, nil
+}
+
+func (c *DtoClient) convertArticle(i database.Article) models.ArticleDto {
+	return models.ArticleDto{
+		ID:          i.ID,
+		Source:      i.Sourceid,
+		Tags:        c.SplitTags(i.Tags),
+		Title:       i.Title,
+		Url:         i.Url,
+		Pubdate:     i.Pubdate,
+		Video:       i.Video.String,
+		Videoheight: i.Videoheight,
+		Videowidth:  i.Videoheight,
+		Thumbnail:   i.Thumbnail,
+		Description: i.Description,
+		Authorname:  i.Authorname.String,
+		Authorimage: i.Authorimage.String,
+	}
+}
+
+func (c *DtoClient) convertArticleDetails(i database.Article, s database.Source) models.ArticleDetailsDto {
+	return models.ArticleDetailsDto{
+		ID:          i.ID,
+		Source:      c.ConvertToSource(s),
+		Tags:        c.SplitTags(i.Tags),
+		Title:       i.Title,
+		Url:         i.Url,
+		Pubdate:     i.Pubdate,
+		Video:       i.Video.String,
+		Videoheight: i.Videoheight,
+		Videowidth:  i.Videoheight,
+		Thumbnail:   i.Thumbnail,
+		Description: i.Description,
+		Authorname:  i.Authorname.String,
+		Authorimage: i.Authorimage.String,
+	}
+}
+
+func (c DtoClient) SplitTags(t string) []string {
+	return strings.Split(t, ", ")
+}

internal/services/dto/discordwebhooks.go

@@ -0,0 +1,63 @@
+package dto
+
+import (
+	"context"
+
+	"git.jamestombleson.com/jtom38/newsbot-api/internal/database"
+	"git.jamestombleson.com/jtom38/newsbot-api/internal/domain/models"
+	"github.com/google/uuid"
+)
+
+func (c *DtoClient) ListDiscordWebHooks(ctx context.Context, total int32) ([]models.DiscordWebHooksDto, error) {
+	var res []models.DiscordWebHooksDto
+
+	items, err := c.db.ListDiscordWebhooks(ctx, total)
+	if err != nil {
+		return res, nil
+	}
+
+	for _, item := range items {
+		res = append(res, c.ConvertDiscordWebhook(item))
+	}
+
+	return res, nil
+}
+
+func (c *DtoClient) GetDiscordWebhook(ctx context.Context, id uuid.UUID) (models.DiscordWebHooksDto, error) {
+	var res models.DiscordWebHooksDto
+
+	item, err := c.db.GetDiscordWebHooksByID(ctx, id)
+	if err != nil {
+		return res, err
+	}
+
+	return c.ConvertDiscordWebhook(item), nil
+}
+
+func (c *DtoClient) GetDiscordWebHookByServerAndChannel(ctx context.Context, server, channel string) ([]models.DiscordWebHooksDto, error) {
+	var res []models.DiscordWebHooksDto
+
+	items, err := c.db.GetDiscordWebHooksByServerAndChannel(ctx, database.GetDiscordWebHooksByServerAndChannelParams{
+		Server:  server,
+		Channel: channel,
+	})
+	if err != nil {
+		return res, err
+	}
+
+	for _, item := range items {
+		res = append(res, c.ConvertDiscordWebhook(item))
+	}
+
+	return res, nil
+}
+
+func (c *DtoClient) ConvertDiscordWebhook(i database.Discordwebhook) models.DiscordWebHooksDto {
+	return models.DiscordWebHooksDto{
+		ID:      i.ID,
+		Url:     i.Url,
+		Server:  i.Server,
+		Channel: i.Channel,
+		Enabled: i.Enabled,
+	}
+}

internal/services/dto/queue.go

@@ -0,0 +1,42 @@
+package dto
+
+import (
+	"context"
+
+	"git.jamestombleson.com/jtom38/newsbot-api/internal/database"
+	"git.jamestombleson.com/jtom38/newsbot-api/internal/domain/models"
+)
+
+func (c *DtoClient) ListDiscordWebhookQueue(ctx context.Context, limit int32) {
+
+}
+
+func (c *DtoClient) ListDiscordWebhookQueueDetails(ctx context.Context, limit int32) ([]models.DiscordQueueDetailsDto, error) {
+	var res []models.DiscordQueueDetailsDto
+
+	items, err := c.db.ListDiscordQueueItems(ctx, limit)
+	if err != nil {
+		return res, err
+	}
+
+	for _, item := range items {
+		article, err := c.GetArticleDetails(ctx, item.ID)
+		if err != nil {
+			return res, err
+		}
+
+		res = append(res, models.DiscordQueueDetailsDto{
+			ID:      item.ID,
+			Article: article,
+		})
+	}
+
+	return res, nil
+}
+
+func (c *DtoClient) ConvertToDiscordQueueDto(i database.Discordqueue) models.DiscordQueueDto {
+	return models.DiscordQueueDto{
+		ID:        i.ID,
+		Articleid: i.Articleid,
+	}
+}

internal/services/dto/sources.go

@@ -0,0 +1,85 @@
+package dto
+
+import (
+	"context"
+	"strings"
+
+	"git.jamestombleson.com/jtom38/newsbot-api/internal/database"
+	"git.jamestombleson.com/jtom38/newsbot-api/internal/domain/models"
+	"github.com/google/uuid"
+)
+
+func (c *DtoClient) ListSources(ctx context.Context, limit int32) ([]models.SourceDto, error) {
+	var res []models.SourceDto
+
+	items, err := c.db.ListSources(ctx, limit)
+	if err != nil {
+		return res, err
+	}
+
+	for _, item := range items {
+		res = append(res, c.ConvertToSource(item))
+	}
+
+	return res, nil
+}
+
+func (c *DtoClient) ListSourcesBySource(ctx context.Context, sourceName string) ([]models.SourceDto, error) {
+	var res []models.SourceDto
+
+	items, err := c.db.ListSourcesBySource(ctx, strings.ToLower(sourceName))
+	if err != nil {
+		return res, err
+	}
+
+	for _, item := range items {
+		res = append(res, c.ConvertToSource(item))
+	}
+
+	return res, nil
+}
+
+func (c *DtoClient) GetSourceById(ctx context.Context, id uuid.UUID) (models.SourceDto, error) {
+	var res models.SourceDto
+
+	item, err := c.db.GetSourceByID(ctx, id)
+	if err != nil {
+		return res, err
+	}
+
+	return c.ConvertToSource(item), nil
+}
+
+func (c *DtoClient) GetSourceByNameAndSource(ctx context.Context, name, source string) (models.SourceDto, error) {
+	var res models.SourceDto
+
+	item, err := c.db.GetSourceByNameAndSource(ctx, database.GetSourceByNameAndSourceParams{
+		Name:   name,
+		Source: source,
+	})
+	if err != nil {
+		return res, err
+	}
+
+	return c.ConvertToSource(item), nil
+}
+
+func (c *DtoClient) ConvertToSource(i database.Source) models.SourceDto {
+	var deleted bool
+	if !i.Deleted.Valid {
+		deleted = true
+	}
+
+	return models.SourceDto{
+		ID:      i.ID,
+		Site:    i.Site,
+		Name:    i.Name,
+		Source:  i.Source,
+		Type:    i.Type,
+		Value:   i.Value.String,
+		Enabled: i.Enabled,
+		Url:     i.Url,
+		Tags:    c.SplitTags(i.Tags),
+		Deleted: deleted,
+	}
+}

internal/services/dto/subscriptions.go

@@ -0,0 +1,91 @@
+package dto
+
+import (
+	"context"
+
+	"git.jamestombleson.com/jtom38/newsbot-api/internal/database"
+	"git.jamestombleson.com/jtom38/newsbot-api/internal/domain/models"
+	"github.com/google/uuid"
+)
+
+func (c *DtoClient) ListSubscriptions(ctx context.Context, limit int32) ([]models.SubscriptionDto, error) {
+	var res []models.SubscriptionDto
+
+	items, err := c.db.ListSubscriptions(ctx, limit)
+	if err != nil {
+		return res, err
+	}
+
+	for _, item := range items {
+		res = append(res, c.ConvertSubscription(item))
+	}
+
+	return res, nil
+}
+
+func (c *DtoClient) ListSubscriptionDetails(ctx context.Context, limit int32) ([]models.SubscriptionDetailsDto, error) {
+	var res []models.SubscriptionDetailsDto
+
+	items, err := c.ListSubscriptions(ctx, limit)
+	if err != nil {
+		return res, err
+	}
+
+	for _, item := range items {
+		dwh, err := c.GetDiscordWebhook(ctx, item.DiscordWebhookId)
+		if err != nil {
+			return res, err
+		}
+
+		source, err := c.GetSourceById(ctx, item.SourceId)
+		if err != nil {
+			return res, err
+		}
+
+		res = append(res, models.SubscriptionDetailsDto{
+			ID:             item.ID,
+			Source:         source,
+			DiscordWebHook: dwh,
+		})
+	}
+
+	return res, nil
+}
+
+func (c *DtoClient) ListSubscriptionsByDiscordWebhookId(ctx context.Context, id uuid.UUID) ([]models.SubscriptionDto, error) {
+	var res []models.SubscriptionDto
+
+	items, err := c.db.GetSubscriptionsByDiscordWebHookId(ctx, id)
+	if err != nil {
+		return res, err
+	}
+
+	for _, item := range items {
+		res = append(res, c.ConvertSubscription(item))
+	}
+
+	return res, nil
+}
+
+func (c *DtoClient) ListSubscriptionsBySourceId(ctx context.Context, id uuid.UUID) ([]models.SubscriptionDto, error) {
+	var res []models.SubscriptionDto
+
+	items, err := c.db.GetSubscriptionsBySourceID(ctx, id)
+	if err != nil {
+		return res, err
+	}
+
+	for _, item := range items {
+		res = append(res, c.ConvertSubscription(item))
+	}
+
+	return res, nil
+}
+
+func (c *DtoClient) ConvertSubscription(i database.Subscription) models.SubscriptionDto {
+	return models.SubscriptionDto{
+		ID:               i.ID,
+		DiscordWebhookId: i.Discordwebhookid,
+		SourceId:         i.Sourceid,
+	}
+}

internal/services/input/httpClient.go

@@ -2,7 +2,7 @@ package input
 
 import (
 	"crypto/tls"
-	"io"
+	"io/ioutil"
 	"log"
 	"net/http"
 )
@@ -35,7 +35,7 @@ func getHttpContent(uri string) ([]byte, error) {
 	}
 	defer resp.Body.Close()
 
-	body, err := io.ReadAll(resp.Body)
+	body, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err
 	}

internal/services/input/rss.go

@@ -39,11 +39,7 @@ func (rc rssClient) GetArticles() ([]domain.ArticleEntity, error) {
 			Description: post.Content,
 			Url:         post.Link,
 			PubDate:     *post.PublishedParsed,
-			//AuthorName:  post.Authors[0].Email,
+			AuthorName:  post.Author.Email,
-		}
-
-		if len(post.Authors) != 0 {
-			article.AuthorName = post.Authors[0].Email
 		}
 
 		var postTags []string
@@ -51,21 +47,6 @@ func (rc rssClient) GetArticles() ([]domain.ArticleEntity, error) {
 		postTags = append(postTags, post.Categories...)
 		article.Tags = strings.Join(postTags, ",")
 
-		/*
-			pageContent, err := getHttpContent(article.Url)
-			if err != nil {
-				continue
-			}
-
-			htmlNode, err := html.Parse(bytes.NewReader(pageContent))
-			if err != nil {
-				continue
-			}
-			htmlNode.
-
-			fmt.Println(htmlNode)
-		*/
-
 		if post.Image == nil {
 			article.Thumbnail = ""
 		}

makefile

@@ -12,10 +12,10 @@ docker-build: ## Generates the docker image
 	docker image ls | grep newsbot.collector.api
 
 migrate-dev: ## Apply sql migrations to dev db
-	goose -dir "./internal/database/migrations" sqlite3 ./cmd/newsbot.db up 
+	goose -dir "./internal/database/migrations" postgres "user=postgres password=postgres dbname=postgres sslmode=disable" up 
 
 migrate-dev-down: ## revert sql migrations to dev db
-	goose -dir "./internal/database/migrations" sqlite3 ./cmd/newsbot.db down 
+	goose -dir "./internal/database/migrations" postgres "user=postgres password=postgres dbname=postgres sslmode=disable" down 
 
 swag: ## Generates the swagger documentation with the swag tool
 	~/go/bin/swag f