From 543e8d8eabc76be8cd0ea9641919be93982907d3 Mon Sep 17 00:00:00 2001 From: James Tombleson Date: Tue, 23 Apr 2024 07:15:38 -0700 Subject: [PATCH] moving code into the internal package --- .github/workflows/docker.build.yaml | 64 ------------------- .github/workflows/go-build.yml | 23 ------- main.go => cmd/main.go | 20 +++--- go.mod | 4 +- {database => internal/database}/db.go | 0 {database => internal/database}/dto.go | 0 .../migrations/20220522083756_init.sql | 0 .../migrations/20220529082459_seed.sql | 0 .../20220619085634_subscriptions.sql | 0 .../20221207213427_source_delete.sql | 0 {database => internal/database}/models.go | 0 {database => internal/database}/query.sql.go | 0 .../database}/schema/query.sql | 0 .../database}/schema/schema.sql | 0 internal/domain/dto.go | 1 + .../database.go => internal/domain/entity.go | 2 +- .../domain}/interfaces/source.go | 0 .../cache.go => internal/domain/models.go | 6 +- {domain => internal/domain}/models/dto.go | 2 +- .../domain/modelsReddit.go | 2 +- {routes => internal/handler/v1}/articles.go | 7 +- .../handler/v1}/discordwebhooks.go | 6 +- {routes => internal/handler/v1}/queue.go | 4 +- internal/handler/v1/root_test.go | 1 + {routes => internal/handler/v1}/server.go | 18 +++--- {routes => internal/handler/v1}/settings.go | 2 +- {routes => internal/handler/v1}/sources.go | 6 +- .../handler/v1}/subscriptions.go | 6 +- .../services}/cache/cache.go | 12 ++-- .../services}/cache/cache_test.go | 2 +- .../services}/cache/common.go | 4 +- .../services}/cache/monitor.go | 6 +- .../services}/cache/monitor_test.go | 2 +- .../config => internal/services}/config.go | 4 +- internal/services/config_test.go | 22 +++++++ .../services}/cron/scheduler.go | 24 +++---- .../services}/cron/scheduler_test.go | 8 +-- {dto => internal/services/dto}/articles.go | 14 ++-- .../services/dto}/discordwebhooks.go | 4 +- {dto => internal/services/dto}/queue.go | 4 +- {dto => internal/services/dto}/sources.go | 6 +- .../services/dto}/subscriptions.go | 4 +- .../services}/input/common.go | 0 .../services}/input/ffxiv.go | 4 +- .../services}/input/ffxiv_test.go | 4 +- .../services}/input/httpClient.go | 0 .../services}/input/reddit.go | 30 ++++----- .../services}/input/reddit_test.go | 4 +- {services => internal/services}/input/rss.go | 8 +-- .../services}/input/rss_test.go | 6 +- .../services}/input/twitch.go | 14 ++-- .../services}/input/twitch_test.go | 4 +- .../services}/input/youtube.go | 6 +- .../services}/input/youtube_test.go | 4 +- .../services}/output/discordwebhook.go | 2 +- .../services}/output/discordwebhook_test.go | 5 +- .../services}/output/interface.go | 0 makefile | 4 +- routes/root_test.go | 1 - services/config/config_test.go | 22 ------- 60 files changed, 158 insertions(+), 250 deletions(-) delete mode 100644 .github/workflows/docker.build.yaml delete mode 100644 .github/workflows/go-build.yml rename main.go => cmd/main.go (52%) rename {database => internal/database}/db.go (100%) rename {database => internal/database}/dto.go (100%) rename {database => internal/database}/migrations/20220522083756_init.sql (100%) rename {database => internal/database}/migrations/20220529082459_seed.sql (100%) rename {database => internal/database}/migrations/20220619085634_subscriptions.sql (100%) rename {database => internal/database}/migrations/20221207213427_source_delete.sql (100%) rename {database => internal/database}/models.go (100%) rename {database => internal/database}/query.sql.go (100%) rename {database => internal/database}/schema/query.sql (100%) rename {database => internal/database}/schema/schema.sql (100%) create mode 100644 internal/domain/dto.go rename domain/models/database.go => internal/domain/entity.go (99%) rename {domain => internal/domain}/interfaces/source.go (100%) rename domain/models/cache.go => internal/domain/models.go (84%) rename {domain => internal/domain}/models/dto.go (98%) rename domain/models/reddit.go => internal/domain/modelsReddit.go (99%) rename {routes => internal/handler/v1}/articles.go (98%) rename {routes => internal/handler/v1}/discordwebhooks.go (98%) rename {routes => internal/handler/v1}/queue.go (92%) create mode 100644 internal/handler/v1/root_test.go rename {routes => internal/handler/v1}/server.go (89%) rename {routes => internal/handler/v1}/settings.go (98%) rename {routes => internal/handler/v1}/sources.go (98%) rename {routes => internal/handler/v1}/subscriptions.go (98%) rename {services => internal/services}/cache/cache.go (78%) rename {services => internal/services}/cache/cache_test.go (93%) rename {services => internal/services}/cache/common.go (56%) rename {services => internal/services}/cache/monitor.go (87%) rename {services => internal/services}/cache/monitor_test.go (70%) rename {services/config => internal/services}/config.go (97%) create mode 100644 internal/services/config_test.go rename {services => internal/services}/cron/scheduler.go (89%) rename {services => internal/services}/cron/scheduler_test.go (74%) rename {dto => internal/services/dto}/articles.go (92%) rename {dto => internal/services/dto}/discordwebhooks.go (91%) rename {dto => internal/services/dto}/queue.go (86%) rename {dto => internal/services/dto}/sources.go (92%) rename {dto => internal/services/dto}/subscriptions.go (93%) rename {services => internal/services}/input/common.go (100%) rename {services => internal/services}/input/ffxiv.go (98%) rename {services => internal/services}/input/ffxiv_test.go (96%) rename {services => internal/services}/input/httpClient.go (100%) rename {services => internal/services}/input/reddit.go (83%) rename {services => internal/services}/input/reddit_test.go (82%) rename {services => internal/services}/input/rss.go (79%) rename {services => internal/services}/input/rss_test.go (73%) rename {services => internal/services}/input/twitch.go (93%) rename {services => internal/services}/input/twitch_test.go (97%) rename {services => internal/services}/input/youtube.go (99%) rename {services => internal/services}/input/youtube_test.go (95%) rename {services => internal/services}/output/discordwebhook.go (98%) rename {services => internal/services}/output/discordwebhook_test.go (95%) rename {services => internal/services}/output/interface.go (100%) delete mode 100644 routes/root_test.go delete mode 100644 services/config/config_test.go diff --git a/.github/workflows/docker.build.yaml b/.github/workflows/docker.build.yaml deleted file mode 100644 index 7b4e750..0000000 --- a/.github/workflows/docker.build.yaml +++ /dev/null @@ -1,64 +0,0 @@ -name: Docker - -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. - -on: - #schedule: - # - cron: '21 19 * * *' - push: - branches: [ master ] - # Publish semver tags as releases. - tags: [ 'v*.*.*' ] - #pull_request: - # branches: [ master ] - -env: - # Use docker.io for Docker Hub if empty - REGISTRY: ghcr.io - # github.repository as / - IMAGE_NAME: ${{ github.repository }} - - -jobs: - build: - - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - # Login against a Docker registry except on PR - # https://github.com/docker/login-action - - name: Log into registry ${{ env.REGISTRY }} - if: github.event_name != 'pull_request' - uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - # Extract metadata (tags, labels) for Docker - # https://github.com/docker/metadata-action - - name: Extract Docker metadata - id: meta - uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - #images: ${{ env.REGISTRY }}/newsbot.worker - - # Build and push Docker image with Buildx (don't push on PR) - # https://github.com/docker/build-push-action - - name: Build and push Docker image - uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc - with: - context: . - push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file diff --git a/.github/workflows/go-build.yml b/.github/workflows/go-build.yml deleted file mode 100644 index b3e752a..0000000 --- a/.github/workflows/go-build.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Go - -on: - pull_request: - branches: [ master ] - -jobs: - - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - - name: Set up Go - uses: actions/setup-go@v3 - with: - go-version: 1.18 - - - name: Build - run: go build -v ./... - - #- name: Test - # run: go test -v ./... diff --git a/main.go b/cmd/main.go similarity index 52% rename from main.go rename to cmd/main.go index d5c35a0..5cbdc34 100644 --- a/main.go +++ b/cmd/main.go @@ -6,33 +6,33 @@ import ( "fmt" "net/http" - "github.com/jtom38/newsbot/collector/database" - "github.com/jtom38/newsbot/collector/docs" - "github.com/jtom38/newsbot/collector/routes" - "github.com/jtom38/newsbot/collector/services/config" - "github.com/jtom38/newsbot/collector/services/cron" + "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" ) // @title NewsBot collector // @version 0.1 // @BasePath /api func main() { - cfg := config.New() - address := cfg.GetConfig(config.ServerAddress) + cfg := services.NewConfig() + address := cfg.GetConfig(services.ServerAddress) docs.SwaggerInfo.Host = fmt.Sprintf("%v:8081", address) ctx := context.Background() - db, err := sql.Open("postgres", cfg.GetConfig(config.Sql_Connection_String)) + db, err := sql.Open("postgres", cfg.GetConfig(services.Sql_Connection_String)) if err != nil { panic(err) } queries := database.New(db) - c := cron.New(ctx) + c := cron.NewScheduler(ctx) c.Start() - server := routes.NewServer(ctx, queries) + server := v1.NewServer(ctx, queries) fmt.Println("API is online and waiting for requests.") fmt.Printf("API: http://%v:8081/api\r\n", address) diff --git a/go.mod b/go.mod index 6e44a8e..1ba1234 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ -module github.com/jtom38/newsbot/collector +module git.jamestombleson.com/jtom38/newsbot-api -go 1.18 +go 1.22 require ( github.com/PuerkitoBio/goquery v1.8.0 diff --git a/database/db.go b/internal/database/db.go similarity index 100% rename from database/db.go rename to internal/database/db.go diff --git a/database/dto.go b/internal/database/dto.go similarity index 100% rename from database/dto.go rename to internal/database/dto.go diff --git a/database/migrations/20220522083756_init.sql b/internal/database/migrations/20220522083756_init.sql similarity index 100% rename from database/migrations/20220522083756_init.sql rename to internal/database/migrations/20220522083756_init.sql diff --git a/database/migrations/20220529082459_seed.sql b/internal/database/migrations/20220529082459_seed.sql similarity index 100% rename from database/migrations/20220529082459_seed.sql rename to internal/database/migrations/20220529082459_seed.sql diff --git a/database/migrations/20220619085634_subscriptions.sql b/internal/database/migrations/20220619085634_subscriptions.sql similarity index 100% rename from database/migrations/20220619085634_subscriptions.sql rename to internal/database/migrations/20220619085634_subscriptions.sql diff --git a/database/migrations/20221207213427_source_delete.sql b/internal/database/migrations/20221207213427_source_delete.sql similarity index 100% rename from database/migrations/20221207213427_source_delete.sql rename to internal/database/migrations/20221207213427_source_delete.sql diff --git a/database/models.go b/internal/database/models.go similarity index 100% rename from database/models.go rename to internal/database/models.go diff --git a/database/query.sql.go b/internal/database/query.sql.go similarity index 100% rename from database/query.sql.go rename to internal/database/query.sql.go diff --git a/database/schema/query.sql b/internal/database/schema/query.sql similarity index 100% rename from database/schema/query.sql rename to internal/database/schema/query.sql diff --git a/database/schema/schema.sql b/internal/database/schema/schema.sql similarity index 100% rename from database/schema/schema.sql rename to internal/database/schema/schema.sql diff --git a/internal/domain/dto.go b/internal/domain/dto.go new file mode 100644 index 0000000..7d0427a --- /dev/null +++ b/internal/domain/dto.go @@ -0,0 +1 @@ +package domain \ No newline at end of file diff --git a/domain/models/database.go b/internal/domain/entity.go similarity index 99% rename from domain/models/database.go rename to internal/domain/entity.go index 1ebd6c1..c5dfa9c 100644 --- a/domain/models/database.go +++ b/internal/domain/entity.go @@ -1,4 +1,4 @@ -package models +package domain import ( "time" diff --git a/domain/interfaces/source.go b/internal/domain/interfaces/source.go similarity index 100% rename from domain/interfaces/source.go rename to internal/domain/interfaces/source.go diff --git a/domain/models/cache.go b/internal/domain/models.go similarity index 84% rename from domain/models/cache.go rename to internal/domain/models.go index 1c192b1..780e986 100644 --- a/domain/models/cache.go +++ b/internal/domain/models.go @@ -1,8 +1,6 @@ -package models +package domain -import ( - "time" -) +import "time" type CacheItem struct { Key string diff --git a/domain/models/dto.go b/internal/domain/models/dto.go similarity index 98% rename from domain/models/dto.go rename to internal/domain/models/dto.go index 4775204..4fc48e5 100644 --- a/domain/models/dto.go +++ b/internal/domain/models/dto.go @@ -6,7 +6,7 @@ import ( "github.com/google/uuid" - "github.com/jtom38/newsbot/collector/database" + "git.jamestombleson.com/jtom38/newsbot-api/internal/database" ) type ArticleDto struct { diff --git a/domain/models/reddit.go b/internal/domain/modelsReddit.go similarity index 99% rename from domain/models/reddit.go rename to internal/domain/modelsReddit.go index 316967e..20ac242 100644 --- a/domain/models/reddit.go +++ b/internal/domain/modelsReddit.go @@ -1,4 +1,4 @@ -package models +package domain // This is the root Json object. It does not contain data that we care about though. type RedditJsonContent struct { diff --git a/routes/articles.go b/internal/handler/v1/articles.go similarity index 98% rename from routes/articles.go rename to internal/handler/v1/articles.go index 6e88c20..cc9968a 100644 --- a/routes/articles.go +++ b/internal/handler/v1/articles.go @@ -1,12 +1,12 @@ -package routes +package v1 import ( "net/http" "strconv" + "git.jamestombleson.com/jtom38/newsbot-api/internal/domain/models" "github.com/go-chi/chi/v5" "github.com/google/uuid" - "github.com/jtom38/newsbot/collector/domain/models" ) func (s *Server) GetArticleRouter() http.Handler { @@ -168,12 +168,11 @@ func (s *Server) ListArticlesBySourceId(w http.ResponseWriter, r *http.Request) query := r.URL.Query() _id := query["id"][0] - uuid, err := uuid.Parse(_id) if err != nil { s.WriteError(w, err.Error(), http.StatusBadRequest) return - } + } // if a page number was sent, process it if len(query["page"]) >= 1 { diff --git a/routes/discordwebhooks.go b/internal/handler/v1/discordwebhooks.go similarity index 98% rename from routes/discordwebhooks.go rename to internal/handler/v1/discordwebhooks.go index cc86cfd..c0bf57c 100644 --- a/routes/discordwebhooks.go +++ b/internal/handler/v1/discordwebhooks.go @@ -1,4 +1,4 @@ -package routes +package v1 import ( "encoding/json" @@ -6,10 +6,10 @@ import ( "net/http" "strings" + "git.jamestombleson.com/jtom38/newsbot-api/internal/database" + "git.jamestombleson.com/jtom38/newsbot-api/internal/domain/models" "github.com/go-chi/chi/v5" "github.com/google/uuid" - "github.com/jtom38/newsbot/collector/database" - "github.com/jtom38/newsbot/collector/domain/models" ) type ListDiscordWebhooks struct { diff --git a/routes/queue.go b/internal/handler/v1/queue.go similarity index 92% rename from routes/queue.go rename to internal/handler/v1/queue.go index a43b296..1ea3521 100644 --- a/routes/queue.go +++ b/internal/handler/v1/queue.go @@ -1,10 +1,10 @@ -package routes +package v1 import ( "net/http" + "git.jamestombleson.com/jtom38/newsbot-api/internal/domain/models" "github.com/go-chi/chi/v5" - "github.com/jtom38/newsbot/collector/domain/models" ) type ListDiscordWebHooksQueueResults struct { diff --git a/internal/handler/v1/root_test.go b/internal/handler/v1/root_test.go new file mode 100644 index 0000000..ba42722 --- /dev/null +++ b/internal/handler/v1/root_test.go @@ -0,0 +1 @@ +package v1_test diff --git a/routes/server.go b/internal/handler/v1/server.go similarity index 89% rename from routes/server.go rename to internal/handler/v1/server.go index 4f30e80..4c4c288 100644 --- a/routes/server.go +++ b/internal/handler/v1/server.go @@ -1,4 +1,4 @@ -package routes +package v1 import ( "context" @@ -11,9 +11,9 @@ import ( _ "github.com/lib/pq" httpSwagger "github.com/swaggo/http-swagger" - "github.com/jtom38/newsbot/collector/database" - "github.com/jtom38/newsbot/collector/dto" - "github.com/jtom38/newsbot/collector/services/config" + "git.jamestombleson.com/jtom38/newsbot-api/internal/database" + "git.jamestombleson.com/jtom38/newsbot-api/internal/services" + "git.jamestombleson.com/jtom38/newsbot-api/internal/services/dto" ) type Server struct { @@ -56,8 +56,8 @@ func NewServer(ctx context.Context, db *database.Queries) *Server { } func openDatabase(ctx context.Context) (*database.Queries, error) { - _env := config.New() - connString := _env.GetConfig(config.Sql_Connection_String) + _env := services.NewConfig() + connString := _env.GetConfig(services.Sql_Connection_String) db, err := sql.Open("postgres", connString) if err != nil { panic(err) @@ -81,7 +81,7 @@ func (s *Server) MountRoutes() { s.Router.Mount("/api/articles", s.GetArticleRouter()) s.Router.Mount("/api/queue", s.GetQueueRouter()) s.Router.Mount("/api/discord/webhooks", s.DiscordWebHookRouter()) - + //s.Router.Get("/api/settings", s.getSettings) s.Router.Mount("/api/sources", s.GetSourcesRouter()) @@ -116,7 +116,7 @@ func (s *Server) WriteError(w http.ResponseWriter, errMessage string, HttpStatus func (s *Server) WriteJson(w http.ResponseWriter, model interface{}) { w.Header().Set(HeaderContentType, ApplicationJson) - + bres, err := json.Marshal(model) if err != nil { s.WriteError(w, err.Error(), http.StatusInternalServerError) @@ -124,4 +124,4 @@ func (s *Server) WriteJson(w http.ResponseWriter, model interface{}) { } w.Write(bres) -} \ No newline at end of file +} diff --git a/routes/settings.go b/internal/handler/v1/settings.go similarity index 98% rename from routes/settings.go rename to internal/handler/v1/settings.go index 8ea6e3d..8628fbb 100644 --- a/routes/settings.go +++ b/internal/handler/v1/settings.go @@ -1,4 +1,4 @@ -package routes +package v1 import ( "encoding/json" diff --git a/routes/sources.go b/internal/handler/v1/sources.go similarity index 98% rename from routes/sources.go rename to internal/handler/v1/sources.go index 28c8031..c9751ec 100644 --- a/routes/sources.go +++ b/internal/handler/v1/sources.go @@ -1,4 +1,4 @@ -package routes +package v1 import ( "encoding/json" @@ -6,10 +6,10 @@ import ( "net/http" "strings" + "git.jamestombleson.com/jtom38/newsbot-api/internal/database" + "git.jamestombleson.com/jtom38/newsbot-api/internal/domain/models" "github.com/go-chi/chi/v5" "github.com/google/uuid" - "github.com/jtom38/newsbot/collector/database" - "github.com/jtom38/newsbot/collector/domain/models" ) func (s *Server) GetSourcesRouter() http.Handler { diff --git a/routes/subscriptions.go b/internal/handler/v1/subscriptions.go similarity index 98% rename from routes/subscriptions.go rename to internal/handler/v1/subscriptions.go index 3b51c46..f6de352 100644 --- a/routes/subscriptions.go +++ b/internal/handler/v1/subscriptions.go @@ -1,14 +1,14 @@ -package routes +package v1 import ( "context" "encoding/json" "net/http" + "git.jamestombleson.com/jtom38/newsbot-api/internal/database" + "git.jamestombleson.com/jtom38/newsbot-api/internal/domain/models" "github.com/go-chi/chi/v5" "github.com/google/uuid" - "github.com/jtom38/newsbot/collector/database" - "github.com/jtom38/newsbot/collector/domain/models" ) func (s *Server) GetSubscriptionsRouter() http.Handler { diff --git a/services/cache/cache.go b/internal/services/cache/cache.go similarity index 78% rename from services/cache/cache.go rename to internal/services/cache/cache.go index eddefdf..78e56f4 100644 --- a/services/cache/cache.go +++ b/internal/services/cache/cache.go @@ -3,7 +3,7 @@ package cache import ( "time" - "github.com/jtom38/newsbot/collector/domain/models" + "git.jamestombleson.com/jtom38/newsbot-api/internal/domain" ) type CacheClient struct { @@ -19,7 +19,7 @@ func NewCacheClient(group string) CacheClient { } func (cc *CacheClient) Insert(key string, value string) { - item := models.CacheItem{ + item := domain.CacheItem{ Key: key, Value: value, Group: cc.group, @@ -29,7 +29,7 @@ func (cc *CacheClient) Insert(key string, value string) { cacheStorage = append(cacheStorage, &item) } -func (cc *CacheClient) FindByKey(key string) (*models.CacheItem, error) { +func (cc *CacheClient) FindByKey(key string) (*domain.CacheItem, error) { for _, item := range cacheStorage { if item.Group != cc.group { continue @@ -46,10 +46,10 @@ func (cc *CacheClient) FindByKey(key string) (*models.CacheItem, error) { return item, nil } - return &models.CacheItem{}, ErrCacheRecordMissing + return &domain.CacheItem{}, ErrCacheRecordMissing } -func (cc *CacheClient) FindByValue(value string) (*models.CacheItem, error) { +func (cc *CacheClient) FindByValue(value string) (*domain.CacheItem, error) { for _, item := range cacheStorage { if item.Group != cc.group { continue @@ -65,5 +65,5 @@ func (cc *CacheClient) FindByValue(value string) (*models.CacheItem, error) { } return item, nil } - return &models.CacheItem{}, ErrCacheRecordMissing + return &domain.CacheItem{}, ErrCacheRecordMissing } diff --git a/services/cache/cache_test.go b/internal/services/cache/cache_test.go similarity index 93% rename from services/cache/cache_test.go rename to internal/services/cache/cache_test.go index 5ee76be..b65b1a1 100644 --- a/services/cache/cache_test.go +++ b/internal/services/cache/cache_test.go @@ -3,7 +3,7 @@ package cache_test import ( "testing" - "github.com/jtom38/newsbot/collector/services/cache" + "git.jamestombleson.com/jtom38/newsbot-api/internal/services/cache" ) func TestNewCacheClient(t *testing.T) { diff --git a/services/cache/common.go b/internal/services/cache/common.go similarity index 56% rename from services/cache/common.go rename to internal/services/cache/common.go index b53d5fe..9c45761 100644 --- a/services/cache/common.go +++ b/internal/services/cache/common.go @@ -3,11 +3,11 @@ package cache import ( "errors" - "github.com/jtom38/newsbot/collector/domain/models" + "git.jamestombleson.com/jtom38/newsbot-api/internal/domain" ) var ( - cacheStorage []*models.CacheItem + cacheStorage []*domain.CacheItem ErrCacheRecordMissing = errors.New("unable to find the requested record") ) diff --git a/services/cache/monitor.go b/internal/services/cache/monitor.go similarity index 87% rename from services/cache/monitor.go rename to internal/services/cache/monitor.go index e6481f2..2883212 100644 --- a/services/cache/monitor.go +++ b/internal/services/cache/monitor.go @@ -3,7 +3,7 @@ package cache import ( "time" - "github.com/jtom38/newsbot/collector/domain/models" + "git.jamestombleson.com/jtom38/newsbot-api/internal/domain" ) // When a record becomes tainted, it needs to be renewed or it will be dropped from the cache. @@ -36,8 +36,8 @@ func (cam CacheAgeMonitor) CheckExpiredEntries() { } // This creates a new slice and skips over the item that needs to be dropped -func (cam CacheAgeMonitor) removeEntry(index int) []*models.CacheItem { - var temp []*models.CacheItem +func (cam CacheAgeMonitor) removeEntry(index int) []*domain.CacheItem { + var temp []*domain.CacheItem for i, item := range cacheStorage { if i != index { temp = append(temp, item) diff --git a/services/cache/monitor_test.go b/internal/services/cache/monitor_test.go similarity index 70% rename from services/cache/monitor_test.go rename to internal/services/cache/monitor_test.go index bd9bb7d..40d9ae7 100644 --- a/services/cache/monitor_test.go +++ b/internal/services/cache/monitor_test.go @@ -3,7 +3,7 @@ package cache_test import ( "testing" - "github.com/jtom38/newsbot/collector/services/cache" + "git.jamestombleson.com/jtom38/newsbot-api/internal/services/cache" ) func TestCacheTaintItem(t *testing.T) { diff --git a/services/config/config.go b/internal/services/config.go similarity index 97% rename from services/config/config.go rename to internal/services/config.go index 2463372..d38ecc2 100644 --- a/services/config/config.go +++ b/internal/services/config.go @@ -1,4 +1,4 @@ -package config +package services import ( "errors" @@ -34,7 +34,7 @@ const ( type ConfigClient struct{} -func New() ConfigClient { +func NewConfig() ConfigClient { c := ConfigClient{} c.RefreshEnv() diff --git a/internal/services/config_test.go b/internal/services/config_test.go new file mode 100644 index 0000000..d3d57d2 --- /dev/null +++ b/internal/services/config_test.go @@ -0,0 +1,22 @@ +package services_test + +import ( + "os" + "testing" + + "git.jamestombleson.com/jtom38/newsbot-api/internal/services" +) + +func TestNewClient(t *testing.T) { + services.NewConfig() +} + +func TestGetConfigExpectNull(t *testing.T) { + cc := services.NewConfig() + os.Setenv(services.REDDIT_PULL_HOT, "") + res := cc.GetConfig(services.REDDIT_PULL_HOT) + if res != "" { + panic("expected blank") + } + +} diff --git a/services/cron/scheduler.go b/internal/services/cron/scheduler.go similarity index 89% rename from services/cron/scheduler.go rename to internal/services/cron/scheduler.go index 1136840..edb89a0 100644 --- a/services/cron/scheduler.go +++ b/internal/services/cron/scheduler.go @@ -11,10 +11,10 @@ import ( _ "github.com/lib/pq" "github.com/robfig/cron/v3" - "github.com/jtom38/newsbot/collector/database" - "github.com/jtom38/newsbot/collector/services/config" - "github.com/jtom38/newsbot/collector/services/input" - "github.com/jtom38/newsbot/collector/services/output" + "git.jamestombleson.com/jtom38/newsbot-api/internal/database" + "git.jamestombleson.com/jtom38/newsbot-api/internal/services" + "git.jamestombleson.com/jtom38/newsbot-api/internal/services/input" + "git.jamestombleson.com/jtom38/newsbot-api/internal/services/output" ) type Cron struct { @@ -24,8 +24,8 @@ type Cron struct { } func openDatabase() (*database.Queries, error) { - _env := config.New() - connString := _env.GetConfig(config.Sql_Connection_String) + _env := services.NewConfig() + connString := _env.GetConfig(services.Sql_Connection_String) if connString == "" { panic("Connection String is null!") } @@ -38,7 +38,7 @@ func openDatabase() (*database.Queries, error) { return queries, err } -func New(ctx context.Context) *Cron { +func NewScheduler(ctx context.Context) *Cron { c := &Cron{ ctx: &ctx, } @@ -51,28 +51,28 @@ func New(ctx context.Context) *Cron { c.Db = queries //timer.AddFunc("*/5 * * * *", func() { go CheckCache() }) - features := config.New() + features := services.NewConfig() - res, _ := features.GetFeature(config.FEATURE_ENABLE_REDDIT_BACKEND) + res, _ := features.GetFeature(services.FEATURE_ENABLE_REDDIT_BACKEND) if res { timer.AddFunc("5 1-23 * * *", func() { go c.CheckReddit() }) log.Print("[Input] Reddit backend was enabled") //go c.CheckReddit() } - res, _ = features.GetFeature(config.FEATURE_ENABLE_YOUTUBE_BACKEND) + res, _ = features.GetFeature(services.FEATURE_ENABLE_YOUTUBE_BACKEND) if res { timer.AddFunc("10 1-23 * * *", func() { go c.CheckYoutube() }) log.Print("[Input] YouTube backend was enabled") } - res, _ = features.GetFeature(config.FEATURE_ENABLE_FFXIV_BACKEND) + res, _ = features.GetFeature(services.FEATURE_ENABLE_FFXIV_BACKEND) if res { timer.AddFunc("5 5,10,15,20 * * *", func() { go c.CheckFfxiv() }) log.Print("[Input] FFXIV backend was enabled") } - res, _ = features.GetFeature(config.FEATURE_ENABLE_TWITCH_BACKEND) + res, _ = features.GetFeature(services.FEATURE_ENABLE_TWITCH_BACKEND) if res { timer.AddFunc("15 1-23 * * *", func() { go c.CheckTwitch() }) log.Print("[Input] Twitch backend was enabled") diff --git a/services/cron/scheduler_test.go b/internal/services/cron/scheduler_test.go similarity index 74% rename from services/cron/scheduler_test.go rename to internal/services/cron/scheduler_test.go index 74c4d44..14bbd38 100644 --- a/services/cron/scheduler_test.go +++ b/internal/services/cron/scheduler_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/jtom38/newsbot/collector/services/cron" + "git.jamestombleson.com/jtom38/newsbot-api/internal/services/cron" ) func TestInvokeTwitch(t *testing.T) { @@ -14,19 +14,19 @@ func TestInvokeTwitch(t *testing.T) { // TODO add database mocks but not sure how to do that yet. func TestCheckReddit(t *testing.T) { ctx := context.Background() - c := cron.New(ctx) + c := cron.NewScheduler(ctx) c.CheckReddit() } func TestCheckYouTube(t *testing.T) { ctx := context.Background() - c := cron.New(ctx) + c := cron.NewScheduler(ctx) c.CheckYoutube() } func TestCheckTwitch(t *testing.T) { ctx := context.Background() - c := cron.New(ctx) + c := cron.NewScheduler(ctx) err := c.CheckTwitch() if err != nil { t.Error(err) diff --git a/dto/articles.go b/internal/services/dto/articles.go similarity index 92% rename from dto/articles.go rename to internal/services/dto/articles.go index b41366f..d144780 100644 --- a/dto/articles.go +++ b/internal/services/dto/articles.go @@ -6,9 +6,9 @@ import ( "context" "strings" + "git.jamestombleson.com/jtom38/newsbot-api/internal/database" + "git.jamestombleson.com/jtom38/newsbot-api/internal/domain/models" "github.com/google/uuid" - "github.com/jtom38/newsbot/collector/database" - "github.com/jtom38/newsbot/collector/domain/models" ) type DtoClient struct { @@ -25,7 +25,7 @@ func (c *DtoClient) ListArticles(ctx context.Context, limit, page int) ([]models var res []models.ArticleDto a, err := c.db.ListArticles(ctx, database.ListArticlesParams{ - Limit: int32(limit), + Limit: int32(limit), Offset: int32(limit * page), }) if err != nil { @@ -38,11 +38,11 @@ func (c *DtoClient) ListArticles(ctx context.Context, limit, page int) ([]models return res, nil } -func (c *DtoClient) ListArticlesByPage(ctx context.Context, page, limit int32 ) ([]models.ArticleDto, error) { +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, + Limit: limit, Offset: page * limit, }) if err != nil { @@ -85,8 +85,8 @@ func (c *DtoClient) ListNewArticlesBySourceId(ctx context.Context, SourceID uuid var res []models.ArticleDto a, err := c.db.ListNewArticlesBySourceId(ctx, database.ListNewArticlesBySourceIdParams{ Sourceid: SourceID, - Limit: int32(limit), - Offset: int32(limit * page), + Limit: int32(limit), + Offset: int32(limit * page), }) if err != nil { return res, err diff --git a/dto/discordwebhooks.go b/internal/services/dto/discordwebhooks.go similarity index 91% rename from dto/discordwebhooks.go rename to internal/services/dto/discordwebhooks.go index 5e20df1..881083c 100644 --- a/dto/discordwebhooks.go +++ b/internal/services/dto/discordwebhooks.go @@ -3,9 +3,9 @@ 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" - "github.com/jtom38/newsbot/collector/database" - "github.com/jtom38/newsbot/collector/domain/models" ) func (c *DtoClient) ListDiscordWebHooks(ctx context.Context, total int32) ([]models.DiscordWebHooksDto, error) { diff --git a/dto/queue.go b/internal/services/dto/queue.go similarity index 86% rename from dto/queue.go rename to internal/services/dto/queue.go index fe2724e..ce61fc4 100644 --- a/dto/queue.go +++ b/internal/services/dto/queue.go @@ -3,8 +3,8 @@ package dto import ( "context" - "github.com/jtom38/newsbot/collector/database" - "github.com/jtom38/newsbot/collector/domain/models" + "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) { diff --git a/dto/sources.go b/internal/services/dto/sources.go similarity index 92% rename from dto/sources.go rename to internal/services/dto/sources.go index baab2d1..8bdae27 100644 --- a/dto/sources.go +++ b/internal/services/dto/sources.go @@ -4,9 +4,9 @@ import ( "context" "strings" + "git.jamestombleson.com/jtom38/newsbot-api/internal/database" + "git.jamestombleson.com/jtom38/newsbot-api/internal/domain/models" "github.com/google/uuid" - "github.com/jtom38/newsbot/collector/database" - "github.com/jtom38/newsbot/collector/domain/models" ) func (c *DtoClient) ListSources(ctx context.Context, limit int32) ([]models.SourceDto, error) { @@ -54,7 +54,7 @@ func (c *DtoClient) GetSourceByNameAndSource(ctx context.Context, name, source s var res models.SourceDto item, err := c.db.GetSourceByNameAndSource(ctx, database.GetSourceByNameAndSourceParams{ - Name: name, + Name: name, Source: source, }) if err != nil { diff --git a/dto/subscriptions.go b/internal/services/dto/subscriptions.go similarity index 93% rename from dto/subscriptions.go rename to internal/services/dto/subscriptions.go index 522b7ac..6d0f24b 100644 --- a/dto/subscriptions.go +++ b/internal/services/dto/subscriptions.go @@ -3,9 +3,9 @@ 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" - "github.com/jtom38/newsbot/collector/database" - "github.com/jtom38/newsbot/collector/domain/models" ) func (c *DtoClient) ListSubscriptions(ctx context.Context, limit int32) ([]models.SubscriptionDto, error) { diff --git a/services/input/common.go b/internal/services/input/common.go similarity index 100% rename from services/input/common.go rename to internal/services/input/common.go diff --git a/services/input/ffxiv.go b/internal/services/input/ffxiv.go similarity index 98% rename from services/input/ffxiv.go rename to internal/services/input/ffxiv.go index 2b04f8f..581eeb9 100644 --- a/services/input/ffxiv.go +++ b/internal/services/input/ffxiv.go @@ -13,8 +13,8 @@ import ( "github.com/go-rod/rod/lib/launcher" "github.com/google/uuid" - "github.com/jtom38/newsbot/collector/database" - "github.com/jtom38/newsbot/collector/services/cache" + "git.jamestombleson.com/jtom38/newsbot-api/internal/database" + "git.jamestombleson.com/jtom38/newsbot-api/internal/services/cache" ) const ( diff --git a/services/input/ffxiv_test.go b/internal/services/input/ffxiv_test.go similarity index 96% rename from services/input/ffxiv_test.go rename to internal/services/input/ffxiv_test.go index 9d705bf..bb29542 100644 --- a/services/input/ffxiv_test.go +++ b/internal/services/input/ffxiv_test.go @@ -3,9 +3,9 @@ package input_test import ( "testing" + "git.jamestombleson.com/jtom38/newsbot-api/internal/database" + ffxiv "git.jamestombleson.com/jtom38/newsbot-api/internal/services/input" "github.com/google/uuid" - "github.com/jtom38/newsbot/collector/database" - ffxiv "github.com/jtom38/newsbot/collector/services/input" ) var FFXIVRecord database.Source = database.Source{ diff --git a/services/input/httpClient.go b/internal/services/input/httpClient.go similarity index 100% rename from services/input/httpClient.go rename to internal/services/input/httpClient.go diff --git a/services/input/reddit.go b/internal/services/input/reddit.go similarity index 83% rename from services/input/reddit.go rename to internal/services/input/reddit.go index 145c978..9f6c455 100644 --- a/services/input/reddit.go +++ b/internal/services/input/reddit.go @@ -9,11 +9,11 @@ import ( "strings" "time" + "git.jamestombleson.com/jtom38/newsbot-api/internal/database" + "git.jamestombleson.com/jtom38/newsbot-api/internal/domain" + "git.jamestombleson.com/jtom38/newsbot-api/internal/services" "github.com/go-rod/rod" "github.com/go-rod/rod/lib/launcher" - "github.com/jtom38/newsbot/collector/database" - "github.com/jtom38/newsbot/collector/domain/models" - "github.com/jtom38/newsbot/collector/services/config" ) type RedditClient struct { @@ -31,10 +31,10 @@ func NewRedditClient(Record database.Source) *RedditClient { rc := RedditClient{ record: Record, } - cc := config.New() - rc.config.PullHot = cc.GetConfig(config.REDDIT_PULL_HOT) - rc.config.PullNSFW = cc.GetConfig(config.REDDIT_PULL_NSFW) - rc.config.PullTop = cc.GetConfig(config.REDDIT_PULL_TOP) + cc := services.NewConfig() + rc.config.PullHot = cc.GetConfig(services.REDDIT_PULL_HOT) + rc.config.PullNSFW = cc.GetConfig(services.REDDIT_PULL_NSFW) + rc.config.PullTop = cc.GetConfig(services.REDDIT_PULL_TOP) //rc.disableHttp2Client() @@ -65,8 +65,8 @@ func (rc *RedditClient) GetPage(parser *rod.Browser, url string) *rod.Page { // GetContent() reaches out to Reddit and pulls the Json data. // It will then convert the data to a struct and return the struct. -func (rc *RedditClient) GetContent() (models.RedditJsonContent, error) { - var items models.RedditJsonContent = models.RedditJsonContent{} +func (rc *RedditClient) GetContent() (domain.RedditJsonContent, error) { + var items domain.RedditJsonContent = domain.RedditJsonContent{} // TODO Wire this to support the config options Url := fmt.Sprintf("%v.json", rc.record.Url) @@ -88,7 +88,7 @@ func (rc *RedditClient) GetContent() (models.RedditJsonContent, error) { return items, nil } -func (rc *RedditClient) ConvertToArticles(items models.RedditJsonContent) []database.Article { +func (rc *RedditClient) ConvertToArticles(items domain.RedditJsonContent) []database.Article { var redditArticles []database.Article for _, item := range items.Data.Children { var article database.Article @@ -104,7 +104,7 @@ func (rc *RedditClient) ConvertToArticles(items models.RedditJsonContent) []data // ConvertToArticle() will take the reddit model struct and convert them over to Article structs. // This data can be passed to the database. -func (rc *RedditClient) convertToArticle(source models.RedditPost) (database.Article, error) { +func (rc *RedditClient) convertToArticle(source domain.RedditPost) (database.Article, error) { var item database.Article if source.Content == "" && source.Url != "" { @@ -131,7 +131,7 @@ func (rc *RedditClient) convertToArticle(source models.RedditPost) (database.Art return item, nil } -func (rc *RedditClient) convertPicturePost(source models.RedditPost) database.Article { +func (rc *RedditClient) convertPicturePost(source domain.RedditPost) database.Article { var item = database.Article{ Sourceid: rc.record.ID, Title: source.Title, @@ -149,7 +149,7 @@ func (rc *RedditClient) convertPicturePost(source models.RedditPost) database.Ar return item } -func (rc *RedditClient) convertTextPost(source models.RedditPost) database.Article { +func (rc *RedditClient) convertTextPost(source domain.RedditPost) database.Article { var item = database.Article{ Sourceid: rc.record.ID, Tags: "a", @@ -164,7 +164,7 @@ func (rc *RedditClient) convertTextPost(source models.RedditPost) database.Artic return item } -func (rc *RedditClient) convertVideoPost(source models.RedditPost) database.Article { +func (rc *RedditClient) convertVideoPost(source domain.RedditPost) database.Article { var item = database.Article{ Sourceid: rc.record.ID, Tags: "a", @@ -180,7 +180,7 @@ func (rc *RedditClient) convertVideoPost(source models.RedditPost) database.Arti } // This post is nothing more then a redirect to another location. -func (rc *RedditClient) convertRedirectPost(source models.RedditPost) database.Article { +func (rc *RedditClient) convertRedirectPost(source domain.RedditPost) database.Article { var item = database.Article{ Sourceid: rc.record.ID, Tags: "a", diff --git a/services/input/reddit_test.go b/internal/services/input/reddit_test.go similarity index 82% rename from services/input/reddit_test.go rename to internal/services/input/reddit_test.go index 6043a39..a87af6d 100644 --- a/services/input/reddit_test.go +++ b/internal/services/input/reddit_test.go @@ -3,9 +3,9 @@ package input_test import ( "testing" + "git.jamestombleson.com/jtom38/newsbot-api/internal/database" + "git.jamestombleson.com/jtom38/newsbot-api/internal/services/input" "github.com/google/uuid" - "github.com/jtom38/newsbot/collector/database" - "github.com/jtom38/newsbot/collector/services/input" ) var RedditRecord database.Source = database.Source{ diff --git a/services/input/rss.go b/internal/services/input/rss.go similarity index 79% rename from services/input/rss.go rename to internal/services/input/rss.go index 7d46f22..820a54e 100644 --- a/services/input/rss.go +++ b/internal/services/input/rss.go @@ -4,16 +4,16 @@ import ( "fmt" "log" - "github.com/jtom38/newsbot/collector/domain/models" - "github.com/jtom38/newsbot/collector/services/cache" + "git.jamestombleson.com/jtom38/newsbot-api/internal/domain" + "git.jamestombleson.com/jtom38/newsbot-api/internal/services/cache" "github.com/mmcdole/gofeed" ) type rssClient struct { - SourceRecord models.Sources + SourceRecord domain.Sources } -func NewRssClient(sourceRecord models.Sources) rssClient { +func NewRssClient(sourceRecord domain.Sources) rssClient { client := rssClient{ SourceRecord: sourceRecord, } diff --git a/services/input/rss_test.go b/internal/services/input/rss_test.go similarity index 73% rename from services/input/rss_test.go rename to internal/services/input/rss_test.go index 05c0731..70da8b8 100644 --- a/services/input/rss_test.go +++ b/internal/services/input/rss_test.go @@ -3,11 +3,11 @@ package input_test import ( "testing" - "github.com/jtom38/newsbot/collector/domain/models" - "github.com/jtom38/newsbot/collector/services/input" + "git.jamestombleson.com/jtom38/newsbot-api/internal/domain" + "git.jamestombleson.com/jtom38/newsbot-api/internal/services/input" ) -var rssRecord = models.Sources{ +var rssRecord = domain.Sources{ ID: 1, Name: "ArsTechnica", Url: "https://feeds.arstechnica.com/arstechnica/index", diff --git a/services/input/twitch.go b/internal/services/input/twitch.go similarity index 93% rename from services/input/twitch.go rename to internal/services/input/twitch.go index c9d9654..566b8c4 100644 --- a/services/input/twitch.go +++ b/internal/services/input/twitch.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/jtom38/newsbot/collector/database" - "github.com/jtom38/newsbot/collector/services/config" + "git.jamestombleson.com/jtom38/newsbot-api/internal/database" + "git.jamestombleson.com/jtom38/newsbot-api/internal/services" "github.com/nicklaw5/helix/v2" ) @@ -31,14 +31,14 @@ var ( ) func NewTwitchClient() (TwitchClient, error) { - c := config.New() + c := services.NewConfig() - id := c.GetConfig(config.TWITCH_CLIENT_ID) + id := c.GetConfig(services.TWITCH_CLIENT_ID) if id == "" { return TwitchClient{}, ErrTwitchClientIdMissing } - secret := c.GetConfig(config.TWITCH_CLIENT_SECRET) + secret := c.GetConfig(services.TWITCH_CLIENT_SECRET) if secret == "" { return TwitchClient{}, ErrTwitchClientSecretMissing } @@ -50,8 +50,8 @@ func NewTwitchClient() (TwitchClient, error) { client := TwitchClient{ //SourceRecord: &source, - monitorClips: c.GetConfig(config.TWITCH_MONITOR_CLIPS), - monitorVod: c.GetConfig(config.TWITCH_MONITOR_VOD), + monitorClips: c.GetConfig(services.TWITCH_MONITOR_CLIPS), + monitorVod: c.GetConfig(services.TWITCH_MONITOR_VOD), api: &api, } diff --git a/services/input/twitch_test.go b/internal/services/input/twitch_test.go similarity index 97% rename from services/input/twitch_test.go rename to internal/services/input/twitch_test.go index 49782bb..887bb1e 100644 --- a/services/input/twitch_test.go +++ b/internal/services/input/twitch_test.go @@ -4,9 +4,9 @@ import ( "log" "testing" + "git.jamestombleson.com/jtom38/newsbot-api/internal/database" + "git.jamestombleson.com/jtom38/newsbot-api/internal/services/input" "github.com/google/uuid" - "github.com/jtom38/newsbot/collector/database" - "github.com/jtom38/newsbot/collector/services/input" ) var TwitchSourceRecord = database.Source{ diff --git a/services/input/youtube.go b/internal/services/input/youtube.go similarity index 99% rename from services/input/youtube.go rename to internal/services/input/youtube.go index b8dacdb..379e7b9 100644 --- a/services/input/youtube.go +++ b/internal/services/input/youtube.go @@ -7,14 +7,12 @@ import ( "log" "net/http" - //"strconv" - "github.com/PuerkitoBio/goquery" "github.com/go-rod/rod" "github.com/go-rod/rod/lib/launcher" "github.com/mmcdole/gofeed" - "github.com/jtom38/newsbot/collector/database" + "git.jamestombleson.com/jtom38/newsbot-api/internal/database" ) type YoutubeClient struct { @@ -110,7 +108,7 @@ func (yc *YoutubeClient) GetBrowser() (*rod.Browser, error) { if err != nil { return browser, err } - + browser = rod.New().ControlURL(u).MustConnect() } return browser, nil diff --git a/services/input/youtube_test.go b/internal/services/input/youtube_test.go similarity index 95% rename from services/input/youtube_test.go rename to internal/services/input/youtube_test.go index a723e4c..4005f96 100644 --- a/services/input/youtube_test.go +++ b/internal/services/input/youtube_test.go @@ -3,9 +3,9 @@ package input_test import ( "testing" + "git.jamestombleson.com/jtom38/newsbot-api/internal/database" + "git.jamestombleson.com/jtom38/newsbot-api/internal/services/input" "github.com/google/uuid" - "github.com/jtom38/newsbot/collector/database" - "github.com/jtom38/newsbot/collector/services/input" ) var YouTubeRecord database.Source = database.Source{ diff --git a/services/output/discordwebhook.go b/internal/services/output/discordwebhook.go similarity index 98% rename from services/output/discordwebhook.go rename to internal/services/output/discordwebhook.go index 31107c6..f6a5c7e 100644 --- a/services/output/discordwebhook.go +++ b/internal/services/output/discordwebhook.go @@ -8,7 +8,7 @@ import ( "net/http" "strings" - "github.com/jtom38/newsbot/collector/database" + "git.jamestombleson.com/jtom38/newsbot-api/internal/database" ) type discordField struct { diff --git a/services/output/discordwebhook_test.go b/internal/services/output/discordwebhook_test.go similarity index 95% rename from services/output/discordwebhook_test.go rename to internal/services/output/discordwebhook_test.go index 65a3abb..2628d7a 100644 --- a/services/output/discordwebhook_test.go +++ b/internal/services/output/discordwebhook_test.go @@ -4,12 +4,11 @@ import ( "os" "strings" "testing" - //"time" + "git.jamestombleson.com/jtom38/newsbot-api/internal/database" + "git.jamestombleson.com/jtom38/newsbot-api/internal/services/output" "github.com/google/uuid" "github.com/joho/godotenv" - "github.com/jtom38/newsbot/collector/database" - "github.com/jtom38/newsbot/collector/services/output" ) var ( diff --git a/services/output/interface.go b/internal/services/output/interface.go similarity index 100% rename from services/output/interface.go rename to internal/services/output/interface.go diff --git a/makefile b/makefile index 7fa24b5..7a62368 100644 --- a/makefile +++ b/makefile @@ -13,10 +13,10 @@ docker-build: ## Generates the docker image docker image ls | grep newsbot.collector.api migrate-dev: ## Apply sql migrations to dev db - goose -dir "./database/migrations" postgres "user=postgres password=postgres dbname=postgres sslmode=disable" 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 "./database/migrations" postgres "user=postgres password=postgres dbname=postgres sslmode=disable" 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 diff --git a/routes/root_test.go b/routes/root_test.go deleted file mode 100644 index 307f035..0000000 --- a/routes/root_test.go +++ /dev/null @@ -1 +0,0 @@ -package routes_test diff --git a/services/config/config_test.go b/services/config/config_test.go deleted file mode 100644 index 4d679ce..0000000 --- a/services/config/config_test.go +++ /dev/null @@ -1,22 +0,0 @@ -package config_test - -import ( - "os" - "testing" - - "github.com/jtom38/newsbot/collector/services/config" -) - -func TestNewClient(t *testing.T) { - config.New() -} - -func TestGetConfigExpectNull(t *testing.T) { - cc := config.New() - os.Setenv(config.REDDIT_PULL_HOT, "") - res := cc.GetConfig(config.REDDIT_PULL_HOT) - if res != "" { - panic("expected blank") - } - -}