From 20ec963e780cf5e2470fdd5ad9337d5d78f9ba0f Mon Sep 17 00:00:00 2001 From: James Tombleson Date: Thu, 2 May 2024 17:38:30 -0700 Subject: [PATCH] minor updates --- api.http | 6 ++++++ cmd/server.go | 11 ++--------- go.mod | 2 ++ go.sum | 4 ++++ makefile | 4 ++-- 5 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 api.http diff --git a/api.http b/api.http new file mode 100644 index 0000000..c87abcc --- /dev/null +++ b/api.http @@ -0,0 +1,6 @@ +### 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 diff --git a/cmd/server.go b/cmd/server.go index 15ade00..48f4826 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -4,13 +4,11 @@ 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" @@ -42,19 +40,14 @@ func main() { panic(err) } - queries := database.New(db) - c := cron.NewScheduler(ctx, db) c.Start() - server := v1.NewServer(ctx, queries, configs, db) + server := v1.NewServer(ctx, 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) - err = http.ListenAndServe(":8081", server.Router) - if err != nil { - panic(err) - } + server.Router.Start(":8081") } diff --git a/go.mod b/go.mod index 6dd1414..f4bf926 100644 --- a/go.mod +++ b/go.mod @@ -22,6 +22,7 @@ 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 @@ -35,6 +36,7 @@ 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 diff --git a/go.sum b/go.sum index 1e6558b..a92e69f 100644 --- a/go.sum +++ b/go.sum @@ -31,6 +31,8 @@ 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= @@ -161,6 +163,8 @@ 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= diff --git a/makefile b/makefile index 55689f2..b2d1ed4 100644 --- a/makefile +++ b/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" postgres "user=postgres password=postgres dbname=postgres sslmode=disable" up + goose -dir "./internal/database/migrations" sqlite3 ./cmd/newsbot.db up migrate-dev-down: ## revert sql migrations to dev db - goose -dir "./internal/database/migrations" postgres "user=postgres password=postgres dbname=postgres sslmode=disable" down + goose -dir "./internal/database/migrations" sqlite3 ./cmd/newsbot.db down swag: ## Generates the swagger documentation with the swag tool ~/go/bin/swag f