go.mod

@@ -6,11 +6,9 @@ require (
 	github.com/PuerkitoBio/goquery v1.8.0
 	github.com/glebarez/go-sqlite v1.22.0
 	github.com/go-rod/rod v0.107.1
-	github.com/golang-jwt/jwt/v5 v5.2.1
 	github.com/google/uuid v1.6.0
 	github.com/huandu/go-sqlbuilder v1.27.1
 	github.com/joho/godotenv v1.4.0
-	github.com/labstack/echo-jwt/v4 v4.2.0
 	github.com/labstack/echo/v4 v4.12.0
 	github.com/mmcdole/gofeed v1.1.3
 	github.com/nicklaw5/helix/v2 v2.4.0

go.sum

@@ -35,8 +35,6 @@ github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keL
 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/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
-github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
 github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
@@ -62,8 +60,6 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/labstack/echo-jwt/v4 v4.2.0 h1:odSISV9JgcSCuhgQSV/6Io3i7nUmfM/QkBeR5GVJj5c=
-github.com/labstack/echo-jwt/v4 v4.2.0/go.mod h1:MA2RqdXdEn4/uEglx0HcUOgQSyBaTh5JcaHIan3biwU=
 github.com/labstack/echo/v4 v4.12.0 h1:IKpw49IMryVB2p1a4dzwlhP1O2Tf2E0Ir/450lH+kI0=
 github.com/labstack/echo/v4 v4.12.0/go.mod h1:UP9Cr2DJXbOK3Kr9ONYzNowSh7HP0aG0ShAyycHSJvM=
 github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=

internal/database/migrations/20240425083756_init.sql

@@ -72,36 +72,15 @@ CREATE Table Sources (
 	Tags 		TEXT 		NOT NULL
 );
 
-/*
 CREATE TABLE Subscriptions (
 	ID 					INTEGER		PRIMARY KEY AUTOINCREMENT,
 	CreatedAt 			DATETIME 	NOT NULL,
 	UpdatedAt 			DATETIME 	NOT NULL,
-	DeletedAt 			DATETIME 	NOT NULL,
+	DeletedAt 			DATETIME,
 	DiscordWebHookID 	NUMBER 		NOT NULL,
 	SourceID 			NUMBER 		NOT NULL,
 	UserID				NUMBER		NOT NULL
 );
-*/
-
-CREATE TABLE UserSourceSubscriptions (
-	ID 					INTEGER		PRIMARY KEY AUTOINCREMENT,
-	CreatedAt 			DATETIME 	NOT NULL,
-	UpdatedAt 			DATETIME 	NOT NULL,
-	DeletedAt 			DATETIME 	NOT NULL,
-	UserID				NUMBER		NOT NULL,
-	SourceID 			NUMBER 		NOT NULL
-);
-
-CREATE TABLE AlertDiscord (
-	ID 					INTEGER		PRIMARY KEY AUTOINCREMENT,
-	CreatedAt 			DATETIME 	NOT NULL,
-	UpdatedAt 			DATETIME 	NOT NULL,
-	DeletedAt 			DATETIME 	NOT NULL,
-	UserID				NUMBER 		NOT NULL,
-	SourceID 			NUMBER 		NOT NULL,
-	DiscordWebHookID 	NUMBER 		NOT NULL
-);
 
 CREATE TABLE Users (
     ID          INTEGER     PRIMARY KEY AUTOINCREMENT,

internal/domain/entity.go

@@ -4,18 +4,6 @@ import (
 	"time"
 )
 
-// This links a source to a discord webhook.
-// It is owned by a user so they can remove the link
-type AlertDiscordEntity struct {
-	ID               int64
-	CreatedAt        time.Time
-	UpdatedAt        time.Time
-	DeletedAt        time.Time
-	UserID           int64
-	SourceID         int64
-	DiscordWebHookId int64
-}
-
 type ArticleEntity struct {
 	ID             int64
 	CreatedAt      time.Time
@@ -47,11 +35,10 @@ type DiscordWebHookEntity struct {
 	CreatedAt time.Time
 	UpdatedAt time.Time
 	DeletedAt time.Time
-	UserID    int64
+	Url     string
-	Url       string
+	Server  string
-	Server    string
+	Channel string
-	Channel   string
+	Enabled bool
-	Enabled   bool
 }
 
 type IconEntity struct {
@@ -74,50 +61,38 @@ type SettingEntity struct {
 }
 
 type SourceEntity struct {
-	ID        int64
+	ID          int64
-	CreatedAt time.Time
+	CreatedAt   time.Time
-	UpdatedAt time.Time
+	UpdatedAt   time.Time
-	DeletedAt time.Time
+	DeletedAt   time.Time
 
 	// Who will collect from it.  Used 
 	// domain.SourceCollector...
-	Source string
+	Source      string
 
 	// Human Readable value to state what is getting collected
 	DisplayName string
 
 	// Tells the parser where to look for data
-	Url string
+	Url         string
 	
 	// Static tags for this defined record
-	Tags string
+	Tags        string
 
 	// If the record is disabled, then it will be skipped on processing
-	Enabled bool
+	Enabled     bool
 }
 
-//type SubscriptionEntity struct {
+type SubscriptionEntity struct {
-//	ID        int64
+	ID          int64
-//	CreatedAt time.Time
+	CreatedAt   time.Time
-//	UpdatedAt time.Time
+	UpdatedAt   time.Time
-//	DeletedAt time.Time
+	DeletedAt   time.Time
-//	UserID    int64
+	SourceID    int64
-//	SourceID  int64
+	SourceType  string
-//	//SourceType  string
+	SourceName  string
-//	//SourceName  string
+	DiscordID   int64
-//	DiscordID int64
+	DiscordName string
-//	//DiscordName string
-//}
-
-// This defines what sources a user wants to follow.
-// These will show up for the user as a front page
-type UserSourceSubscriptionEntity struct {
-	ID        int64
-	CreatedAt time.Time
-	UpdatedAt time.Time
-	DeletedAt time.Time
-	UserID    int64
-	SourceID  int64
 }
 
 type UserEntity struct {

internal/domain/scopes.go

@@ -1,6 +0,0 @@
-package domain
-
-const (
-	ScopeAll  = "newsbot:all"
-	ScopeRead = "newsbot:read"
-)

internal/handler/v1/discordwebhooks.go

@@ -111,13 +111,6 @@ func (s *Handler) GetDiscordWebHooksByServerAndChannel(c echo.Context) error {
 // @Failure  400  {object}  domain.BaseResponse
 // @Failure  500  {object}  domain.BaseResponse
 func (s *Handler) NewDiscordWebHook(c echo.Context) error {
-	token, err := s.getJwtToken(c)
-	if err != nil {
-		return c.JSON(http.StatusUnauthorized, domain.BaseResponse{
-			Message: ErrJwtMissing,
-		})
-	}
-
 	_url := c.QueryParam("url")
 	_server := c.QueryParam("server")
 	_channel := c.QueryParam("channel")
@@ -143,12 +136,7 @@ func (s *Handler) NewDiscordWebHook(c echo.Context) error {
 		})
 	}
 
-	user, err := s.repo.Users.GetByName(token.UserName)
+	rows, err := s.repo.DiscordWebHooks.Create(c.Request().Context(), _url, _server, _channel, true)
-	if err != nil {
-		s.WriteMessage(c, ErrUserUnknown, http.StatusBadRequest)
-	}
-
-	rows, err := s.repo.DiscordWebHooks.Create(c.Request().Context(), user.ID, _url, _server, _channel, true)
 	if err != nil {
 		s.WriteError(c, err, http.StatusInternalServerError)
 	}

internal/handler/v1/handler.go

@@ -3,10 +3,7 @@ package v1
 import (
 	"context"
 	"database/sql"
-	"errors"
 
-	"github.com/golang-jwt/jwt/v5"
-	echojwt "github.com/labstack/echo-jwt/v4"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	swagger "github.com/swaggo/echo-swagger"
@@ -20,6 +17,7 @@ import (
 type Handler struct {
 	Router *echo.Echo
 	Db     *database.Queries
+	//dto    *dto.DtoClient
 	config services.Configs
 	repo   services.RepositoryService
 }
@@ -30,7 +28,6 @@ const (
 	ErrUnableToParseId      = "Unable to parse the requested ID"
 	ErrRecordMissing        = "The requested record was not found"
 	ErrFailedToCreateRecord = "The record was not created due to a database problem"
-	ErrUserUnknown          = "User is unknown"
 
 	ResponseMessageSuccess = "Success"
 )
@@ -50,13 +47,6 @@ func NewServer(ctx context.Context, configs services.Configs, conn *sql.DB) *Han
 		repo:   services.NewRepositoryService(conn),
 	}
 
-	jwtConfig := echojwt.Config{
-		NewClaimsFunc: func(c echo.Context) jwt.Claims {
-			return new(JwtToken)
-		},
-		SigningKey: []byte(configs.JwtSecret),
-	}
-
 	router := echo.New()
 	router.Pre(middleware.RemoveTrailingSlash())
 	router.Pre(middleware.Logger())
@@ -65,7 +55,6 @@ func NewServer(ctx context.Context, configs services.Configs, conn *sql.DB) *Han
 
 	v1 := router.Group("/api/v1")
 	articles := v1.Group("/articles")
-	articles.Use(echojwt.WithConfig(jwtConfig))
 	articles.GET("", s.listArticles)
 	articles.GET(":id", s.getArticle)
 	articles.GET(":id/details", s.getArticleDetails)
@@ -87,7 +76,6 @@ func NewServer(ctx context.Context, configs services.Configs, conn *sql.DB) *Han
 	//settings.GET("/", s.getSettings)
 
 	sources := v1.Group("/sources")
-	sources.Use(echojwt.WithConfig(jwtConfig))
 	sources.GET("", s.listSources)
 	sources.GET("/by/source", s.listSourcesBySource)
 	sources.GET("/by/sourceAndName", s.GetSourceBySourceAndName)
@@ -101,7 +89,6 @@ func NewServer(ctx context.Context, configs services.Configs, conn *sql.DB) *Han
 	sources.POST("/:ID/enable", s.enableSource)
 
 	subs := v1.Group("/subscriptions")
-	subs.Use(echojwt.WithConfig(jwtConfig))
 	subs.GET("/", s.ListSubscriptions)
 	subs.GET("/details", s.ListSubscriptionDetails)
 	subs.GET("/by/discordId", s.GetSubscriptionsByDiscordId)
@@ -133,19 +120,3 @@ func (s *Handler) WriteMessage(c echo.Context, msg string, HttpStatusCode int) e
 		Message: msg,
 	})
 }
-
-func (h *Handler) getJwtToken(c echo.Context) (JwtToken, error) {
-	// Make sure that the request came with a jwtToken
-	token, ok := c.Get("user").(*jwt.Token)
-	if !ok {
-		return JwtToken{}, errors.New(ErrJwtMissing)
-	}
-
-	// Generate the claims from the token
-	claims, ok := token.Claims.(*JwtToken)
-	if !ok {
-		return JwtToken{}, errors.New(ErrJwtClaimsMissing)
-	}
-
-	return *claims, nil
-}

internal/handler/v1/jwt.go

@@ -1,99 +0,0 @@
-package v1
-
-import (
-	"errors"
-	"strings"
-	"time"
-
-	"git.jamestombleson.com/jtom38/newsbot-api/internal/domain"
-	"github.com/golang-jwt/jwt/v5"
-)
-
-const (
-	ErrJwtMissing       = "auth token is missing"
-	ErrJwtClaimsMissing = "claims missing on token"
-	ErrJwtExpired       = "auth token has expired"
-	ErrJwtScopeMissing  = "required scope is missing"
-)
-
-type JwtToken struct {
-	Exp        time.Time `json:"exp"`
-	Iss        string    `json:"iss"`
-	Authorized bool      `json:"authorized"`
-	UserName   string    `json:"username"`
-	Scopes     []string  `json:"scopes"`
-	jwt.RegisteredClaims
-}
-
-func (j JwtToken) IsValid(scope string) error {
-	err := j.hasExpired()
-	if err != nil {
-		return err
-	}
-
-	err = j.hasScope(scope)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (j JwtToken) GetUsername() string {
-	return j.UserName
-}
-
-func (j JwtToken) hasExpired() error {
-	// Check to see if the token has expired
-	hasExpired := j.Exp.Compare(time.Now())
-	if hasExpired == -1 {
-		return errors.New(ErrJwtExpired)
-	}
-	return nil
-}
-
-func (j JwtToken) hasScope(scope string) error {
-	// they have the scope to access everything, so let them pass.
-	if strings.Contains(domain.ScopeAll, scope) {
-		return nil
-	}
-
-	for _, s := range j.Scopes {
-		if strings.Contains(s, scope) {
-			return nil
-		}
-	}
-	return errors.New(ErrJwtScopeMissing)
-}
-
-func (h *Handler) generateJwt(username, issuer string) (string, error) {
-	return h.generateJwtWithExp(username, issuer, time.Now().Add(10*time.Minute))
-}
-
-func (h *Handler) generateJwtWithExp(username, issuer string, expiresAt time.Time) (string, error) {
-	secret := []byte(h.config.JwtSecret)
-
-	// Anyone who wants to decrypt the key needs to use the same method
-	token := jwt.New(jwt.SigningMethodHS256)
-	claims := token.Claims.(jwt.MapClaims)
-	claims["exp"] = expiresAt
-	claims["authorized"] = true
-	claims["username"] = username
-	claims["iss"] = issuer
-
-	var scopes []string
-	if username == "admin" {
-		scopes = append(scopes, domain.ScopeAll)
-		claims["scopes"] = scopes
-	} else {
-		scopes = append(scopes, domain.ScopeRead)
-		claims["scopes"] = scopes
-	}
-
-	tokenString, err := token.SignedString(secret)
-	if err != nil {
-		return "", err
-	}
-
-	return tokenString, nil
-}

internal/handler/v1/settings.go

@@ -0,0 +1,39 @@
+package v1
+
+import (
+	"encoding/json"
+	"net/http"
+
+	"git.jamestombleson.com/jtom38/newsbot-api/internal/domain"
+	"github.com/google/uuid"
+	"github.com/labstack/echo/v4"
+)
+
+// GetSettings
+// @Summary  Returns a object based on the Key that was given.
+// @Param    key  path  string  true  "Settings Key value"
+// @Produce  application/json
+// @Tags     Settings
+// @Router   /v1/settings/{key} [get]
+func (s *Handler) getSettings(c echo.Context) error {
+	id := c.Param("ID")
+
+	uuid, err := uuid.Parse(id)
+	if err != nil {
+		return c.JSON(http.StatusBadRequest, domain.BaseResponse{
+			Message: err.Error(),
+		})
+	}
+
+	res, err := s.Db.GetSourceByID(c.Request().Context(), uuid)
+	if err != nil {
+		return c.JSON(http.StatusInternalServerError, err.Error())
+	}
+
+	bResult, err := json.Marshal(res)
+	if err != nil {
+		return c.JSON(http.StatusInternalServerError, err.Error())
+	}
+
+	return c.JSON(http.StatusOK, bResult)
+}

internal/handler/v1/sources.go

@@ -10,11 +10,22 @@ import (
 
 	"git.jamestombleson.com/jtom38/newsbot-api/internal/database"
 	"git.jamestombleson.com/jtom38/newsbot-api/internal/domain"
+	"git.jamestombleson.com/jtom38/newsbot-api/internal/domain/models"
 	"git.jamestombleson.com/jtom38/newsbot-api/internal/services"
 	"github.com/google/uuid"
 	"github.com/labstack/echo/v4"
 )
 
+type ListSources struct {
+	ApiStatusModel
+	Payload []models.SourceDto `json:"payload"`
+}
+
+type GetSource struct {
+	ApiStatusModel
+	Payload models.SourceDto `json:"payload"`
+}
+
 // ListSources
 // @Summary  Lists the top 50 records
 // @Param    page    query  string  false  "page number"
@@ -24,7 +35,7 @@ import (
 // @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 {
-	resp := domain.SourcesResponse{
+	resp := domain.SourcesResponse {
 		BaseResponse: domain.BaseResponse{
 			Message: ResponseMessageSuccess,
 		},
@@ -426,7 +437,7 @@ func (s *Handler) deleteSources(c echo.Context) error {
 // @Failure  400  {object}  domain.BaseResponse     
 // @Failure  500  {object}  domain.BaseResponse     
 func (s *Handler) disableSource(c echo.Context) error {
-	resp := domain.SourcesResponse{
+	resp := domain.SourcesResponse {
 		BaseResponse: domain.BaseResponse{
 			Message: ResponseMessageSuccess,
 		},
@@ -468,7 +479,7 @@ func (s *Handler) disableSource(c echo.Context) error {
 // @Failure  400  {object}  domain.BaseResponse     
 // @Failure  500  {object}  domain.BaseResponse     
 func (s *Handler) enableSource(c echo.Context) error {
-	resp := domain.SourcesResponse{
+	resp := domain.SourcesResponse {
 		BaseResponse: domain.BaseResponse{
 			Message: ResponseMessageSuccess,
 		},

internal/repository/alertDiscord.go

@@ -1,122 +0,0 @@
-package repository
-
-import (
-	"context"
-	"database/sql"
-	"errors"
-	"fmt"
-	"time"
-
-	"git.jamestombleson.com/jtom38/newsbot-api/internal/domain"
-	"github.com/huandu/go-sqlbuilder"
-)
-
-type AlertDiscordRepo interface {
-	Create(ctx context.Context, userId, sourceId, webhookId int64) (int64, error)
-	SoftDelete(ctx context.Context, id int64) (int64, error)
-	Restore(ctx context.Context, id int64) (int64, error)
-	Delete(ctx context.Context, id int64) (int64, error)
-	ListByUser(ctx context.Context, page, limit int, userId int64) ([]domain.AlertDiscordEntity, error)
-}
-
-type alertDiscordRepository struct {
-	conn          *sql.DB
-	defaultLimit  int
-	defaultOffset int
-}
-
-func NewAlertDiscordRepository(conn *sql.DB) alertDiscordRepository {
-	return alertDiscordRepository{
-		conn:          conn,
-		defaultLimit:  50,
-		defaultOffset: 50,
-	}
-}
-
-func (r alertDiscordRepository) Create(ctx context.Context, userId, sourceId, webhookId int64) (int64, error) {
-	dt := time.Now()
-	queryBuilder := sqlbuilder.NewInsertBuilder()
-	queryBuilder.InsertInto("AlertDiscord")
-	queryBuilder.Cols("UpdatedAt", "CreatedAt", "DeletedAt", "UserID", "SourceID", "DiscordWebHookID")
-	queryBuilder.Values(dt, dt, timeZero, userId, sourceId, webhookId)
-	query, args := queryBuilder.Build()
-
-	_, err := r.conn.ExecContext(ctx, query, args...)
-	if err != nil {
-		return 0, err
-	}
-
-	return 1, nil
-}
-
-func (r alertDiscordRepository) SoftDelete(ctx context.Context, id int64) (int64, error) {
-	return softDeleteRow(ctx, r.conn, "AlertDiscord", id)
-}
-
-func (r alertDiscordRepository) Restore(ctx context.Context, id int64) (int64, error) {
-	return restoreRow(ctx, r.conn, "AlertDiscord", id)
-}
-
-func (r alertDiscordRepository) Delete(ctx context.Context, id int64) (int64, error) {
-	return deleteFromTable(ctx, r.conn, "AlertDiscord", id)
-}
-
-func (r alertDiscordRepository) ListByUser(ctx context.Context, page, limit int, userId int64) ([]domain.AlertDiscordEntity, error) {
-	builder := sqlbuilder.NewSelectBuilder()
-	builder.Select("*")
-	builder.From("AlertDiscord")
-	builder.Where(
-		builder.Equal("UserID", userId),
-	)
-	builder.Offset(page * limit)
-	builder.Limit(limit)
-
-	query, args := builder.Build()
-	rows, err := r.conn.QueryContext(ctx, query, args...)
-	if err != nil {
-		return []domain.AlertDiscordEntity{}, err
-	}
-
-	data := r.processRows(rows)
-	if len(data) == 0 {
-		return []domain.AlertDiscordEntity{}, errors.New(ErrUserNotFound)
-	}
-
-	return data, nil
-}
-
-func (ur alertDiscordRepository) processRows(rows *sql.Rows) []domain.AlertDiscordEntity {
-	items := []domain.AlertDiscordEntity{}
-
-	for rows.Next() {
-		var id int64
-		var createdAt time.Time
-		var updatedAt time.Time
-		var deletedAt time.Time
-		var userId int64
-		var sourceId int64
-		var webhookId int64
-
-		err := rows.Scan(
-			&id, &createdAt, &updatedAt, &deletedAt,
-			&userId, &sourceId, &webhookId,
-		)
-		if err != nil {
-			fmt.Println(err)
-		}
-
-		item := domain.AlertDiscordEntity{
-			ID:               id,
-			CreatedAt:        createdAt,
-			UpdatedAt:        updatedAt,
-			DeletedAt:        deletedAt,
-			UserID:           userId,
-			SourceID:         sourceId,
-			DiscordWebHookId: webhookId,
-		}
-
-		items = append(items, item)
-	}
-
-	return items
-}

internal/repository/alertDiscord_test.go

@@ -1,63 +0,0 @@
-package repository_test
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"git.jamestombleson.com/jtom38/newsbot-api/internal/domain"
-	"git.jamestombleson.com/jtom38/newsbot-api/internal/repository"
-)
-
-func TestAlertDiscordCreate(t *testing.T) {
-	t.Log(time.Time{})
-	db, err := setupInMemoryDb()
-	if err != nil {
-		t.Log(err)
-		t.FailNow()
-	}
-	defer db.Close()
-
-	r := repository.NewAlertDiscordRepository(db)
-	created, err := r.Create(context.Background(), 1, 1, 1)
-	if err != nil {
-		t.Log(err)
-		t.FailNow()
-	}
-
-	if created != 1 {
-		t.Log("failed to create the record")
-		t.FailNow()
-	}
-}
-
-func TestAlertDiscordCreateAndValidate(t *testing.T) {
-	t.Log(time.Time{})
-	db, err := setupInMemoryDb()
-	if err != nil {
-		t.Log(err)
-		t.FailNow()
-	}
-	defer db.Close()
-
-	source := repository.NewSourceRepository(db)
-	source.Create(context.Background(), domain.SourceCollectorRss, "Unit Testing", "www.fake.com", "testing,units", true)
-	sourceRecord, _ := source.GetBySourceAndName(context.Background(), domain.SourceCollectorRss, "Unit Testing")
-
-	webhookRepo := repository.NewDiscordWebHookRepository(db)
-	webhookRepo.Create(context.Background(), 999, "discord.com", "Unit Testing", "memes", true)
-	webhook, _ := webhookRepo.GetByUrl(context.Background(), "discord.com")
-	
-	r := repository.NewAlertDiscordRepository(db)
-	r.Create(context.Background(), 999, sourceRecord.ID, webhook.ID)
-	alert, err := r.ListByUser(context.Background(), 0, 10, 999)
-	if err != nil {
-		t.Error(err)
-		t.FailNow()
-	}
-
-	if len(alert) != 1 {
-		t.Error("got the incorrect number of rows back")
-		t.FailNow()
-	}
-}

internal/repository/discordWebHooks.go

@@ -9,8 +9,8 @@ import (
 	"github.com/huandu/go-sqlbuilder"
 )
 
-type DiscordWebHookRepo interface {
+type DiscordWebHookRepo interface{
-	Create(ctx context.Context, userId int64, url, server, channel string, enabled bool) (int64, error)
+	Create(ctx context.Context, url, server, channel string, enabled bool) (int64, error)
 	Enable(ctx context.Context, id int64) (int64, error)
 	Disable(ctx context.Context, id int64) (int64, error)
 	SoftDelete(ctx context.Context, id int64) (int64, error)
@@ -32,12 +32,12 @@ func NewDiscordWebHookRepository(conn *sql.DB) discordWebHookRepository {
 	}
 }
 
-func (r discordWebHookRepository) Create(ctx context.Context, userId int64, url, server, channel string, enabled bool) (int64, error) {
+func (r discordWebHookRepository) Create(ctx context.Context, url, server, channel string, enabled bool) (int64, error) {
 	dt := time.Now()
 	queryBuilder := sqlbuilder.NewInsertBuilder()
 	queryBuilder.InsertInto("DiscordWebHooks")
-	queryBuilder.Cols("UpdatedAt", "CreatedAt", "DeletedAt", "UserID", "Url", "Server", "Channel", "Enabled")
+	queryBuilder.Cols("UpdatedAt", "CreatedAt", "DeletedAt", "Url", "Server", "Channel", "Enabled")
-	queryBuilder.Values(dt, dt, timeZero, userId, url, server, channel, enabled)
+	queryBuilder.Values(dt, dt, timeZero, url, server, channel, enabled)
 	query, args := queryBuilder.Build()
 
 	_, err := r.conn.ExecContext(ctx, query, args...)
@@ -195,14 +195,13 @@ func (r discordWebHookRepository) processRows(rows *sql.Rows) ([]domain.DiscordW
 		var createdAt time.Time
 		var updatedAt time.Time
 		var deletedAt time.Time
-		var userId int64
 		var url string
 		var server string
 		var channel string
 		var enabled bool
 		err := rows.Scan(
 			&id, &createdAt, &updatedAt,
-			&deletedAt, &userId, &url, &server,
+			&deletedAt, &url, &server,
 			&channel, &enabled,
 		)
 		if err != nil {
@@ -214,7 +213,6 @@ func (r discordWebHookRepository) processRows(rows *sql.Rows) ([]domain.DiscordW
 			CreatedAt: createdAt,
 			UpdatedAt: updatedAt,
 			DeletedAt: deletedAt,
-			UserID:    userId,
 			Url:       url,
 			Server:    server,
 			Channel:   channel,

internal/repository/discordWebHooks_test.go

@@ -17,7 +17,7 @@ func TestCreateDiscordWebHookRecord(t *testing.T) {
 	defer db.Close()
 
 	r := repository.NewDiscordWebHookRepository(db)
-	created, err := r.Create(context.Background(), 999, "www.discord.com/bad/webhook", "Unit Testing", "memes", true)
+	created, err := r.Create(context.Background(), "www.discord.com/bad/webhook", "Unit Testing", "memes", true)
 	if err != nil {
 		t.Log(err)
 		t.FailNow()
@@ -38,7 +38,7 @@ func TestDiscordWebHookGetById(t *testing.T) {
 	defer db.Close()
 	ctx := context.Background()
 	r := repository.NewDiscordWebHookRepository(db)
-	created, err := r.Create(ctx, 999, "www.discord.com/bad/webhook", "Unit Testing", "memes", true)
+	created, err := r.Create(ctx, "www.discord.com/bad/webhook", "Unit Testing", "memes", true)
 	if err != nil {
 		t.Log(err)
 		t.FailNow()
@@ -71,7 +71,7 @@ func TestDiscordWebHookGetByUrl(t *testing.T) {
 
 	ctx := context.Background()
 	r := repository.NewDiscordWebHookRepository(db)
-	_, _ = r.Create(ctx, 999, "www.discord.com/bad/webhook", "Unit Testing", "memes", true)
+	_, _ = r.Create(ctx, "www.discord.com/bad/webhook", "Unit Testing", "memes", true)
 	item, err := r.GetByUrl(ctx, "www.discord.com/bad/webhook")
 	if err != nil {
 		t.Log(err)
@@ -95,7 +95,7 @@ func TestDiscordWebHookListByServerName(t *testing.T) {
 	ctx := context.Background()
 	serverName := "Unit Testing"
 	r := repository.NewDiscordWebHookRepository(db)
-	_, _ = r.Create(ctx, 999, "www.discord.com/bad/webhook", serverName, "memes", true)
+	_, _ = r.Create(ctx, "www.discord.com/bad/webhook", serverName, "memes", true)
 
 	item, err := r.ListByServerName(ctx, serverName)
 	if err != nil {
@@ -121,7 +121,7 @@ func TestDiscordWebHookListByServerAndChannel(t *testing.T) {
 	serverName := "Unit Testing"
 	channel := "memes"
 	r := repository.NewDiscordWebHookRepository(db)
-	_, _ = r.Create(ctx, 999, "www.discord.com/bad/webhook", serverName, channel, true)
+	_, _ = r.Create(ctx, "www.discord.com/bad/webhook", serverName, channel, true)
 
 	item, err := r.ListByServerAndChannel(ctx, serverName, channel)
 	if err != nil {
@@ -152,7 +152,7 @@ func TestDiscordWebHookEnableRecord(t *testing.T) {
 	serverName := "Unit Testing"
 	channel := "memes"
 	r := repository.NewDiscordWebHookRepository(db)
-	_, _ = r.Create(ctx, 999, "www.discord.com/bad/webhook", serverName, channel, false)
+	_, _ = r.Create(ctx, "www.discord.com/bad/webhook", serverName, channel, false)
 
 	item, err := r.GetById(ctx, 1)
 	if err != nil {
@@ -195,7 +195,7 @@ func TestDiscordWebHookDisableRecord(t *testing.T) {
 	serverName := "Unit Testing"
 	channel := "memes"
 	r := repository.NewDiscordWebHookRepository(db)
-	_, _ = r.Create(ctx, 999, "www.discord.com/bad/webhook", serverName, channel, true)
+	_, _ = r.Create(ctx, "www.discord.com/bad/webhook", serverName, channel, true)
 
 	item, err := r.GetById(ctx, 1)
 	if err != nil {
@@ -238,7 +238,7 @@ func TestDiscordWebHookSoftDelete(t *testing.T) {
 	serverName := "Unit Testing"
 	channel := "memes"
 	r := repository.NewDiscordWebHookRepository(db)
-	_, _ = r.Create(ctx, 999, "www.discord.com/bad/webhook", serverName, channel, true)
+	_, _ = r.Create(ctx, "www.discord.com/bad/webhook", serverName, channel, true)
 	_, err = r.SoftDelete(ctx, 1)
 	if err != nil {
 		t.Log(err)
@@ -263,7 +263,7 @@ func TestDiscordWebHookRestore(t *testing.T) {
 	timeZero := time.Time{}
 
 	r := repository.NewDiscordWebHookRepository(db)
-	_, _ = r.Create(ctx, 999, "www.discord.com/bad/webhook", serverName, channel, true)
+	_, _ = r.Create(ctx, "www.discord.com/bad/webhook", serverName, channel, true)
 	item, _ := r.GetById(ctx, 1)
 	if item.DeletedAt != timeZero {
 		t.Log("DeletedAt was not zero")

internal/repository/userSourceSubscription.go

@@ -1,120 +0,0 @@
-package repository
-
-import (
-	"context"
-	"database/sql"
-	"errors"
-	"fmt"
-	"time"
-
-	"git.jamestombleson.com/jtom38/newsbot-api/internal/domain"
-	"github.com/huandu/go-sqlbuilder"
-)
-
-type UserSourceRepo interface {
-	Create(ctx context.Context, userId, sourceId int64) (int64, error)
-	SoftDelete(ctx context.Context, id int64) (int64, error)
-	Restore(ctx context.Context, id int64) (int64, error)
-	Delete(ctx context.Context, id int64) (int64, error)
-	ListByUser(ctx context.Context, page, limit int, userId int64) ([]domain.UserSourceSubscriptionEntity, error)
-}
-
-type userSourceRepository struct {
-	conn          *sql.DB
-	defaultLimit  int
-	defaultOffset int
-}
-
-func NewUserSourceRepository(conn *sql.DB) userSourceRepository {
-	return userSourceRepository{
-		conn:          conn,
-		defaultLimit:  50,
-		defaultOffset: 50,
-	}
-}
-
-func (r userSourceRepository) Create(ctx context.Context, userId, sourceId int64) (int64, error) {
-	dt := time.Now()
-	queryBuilder := sqlbuilder.NewInsertBuilder()
-	queryBuilder.InsertInto("UserSourceSubscriptions")
-	queryBuilder.Cols("UpdatedAt", "CreatedAt", "DeletedAt", "UserID", "SourceID")
-	queryBuilder.Values(dt, dt, timeZero, userId, sourceId)
-	query, args := queryBuilder.Build()
-
-	_, err := r.conn.ExecContext(ctx, query, args...)
-	if err != nil {
-		return 0, err
-	}
-
-	return 1, nil
-}
-
-func (r userSourceRepository) SoftDelete(ctx context.Context, id int64) (int64, error) {
-	return softDeleteRow(ctx, r.conn, "UserSourceSubscriptions", id)
-}
-
-func (r userSourceRepository) Restore(ctx context.Context, id int64) (int64, error) {
-	return restoreRow(ctx, r.conn, "UserSourceSubscriptions", id)
-}
-
-func (r userSourceRepository) Delete(ctx context.Context, id int64) (int64, error) {
-	return deleteFromTable(ctx, r.conn, "UserSourceSubscriptions", id)
-}
-
-func (r userSourceRepository) ListByUser(ctx context.Context, page, limit int, userId int64) ([]domain.UserSourceSubscriptionEntity, error) {
-	builder := sqlbuilder.NewSelectBuilder()
-	builder.Select("*")
-	builder.From("UserSourceSubscriptions")
-	builder.Where(
-		builder.Equal("UserID", userId),
-	)
-	builder.Offset(page * limit)
-	builder.Limit(limit)
-
-	query, args := builder.Build()
-	rows, err := r.conn.QueryContext(ctx, query, args...)
-	if err != nil {
-		return []domain.UserSourceSubscriptionEntity{}, err
-	}
-
-	data := r.processRows(rows)
-	if len(data) == 0 {
-		return []domain.UserSourceSubscriptionEntity{}, errors.New(ErrUserNotFound)
-	}
-
-	return data, nil
-}
-
-func (ur userSourceRepository) processRows(rows *sql.Rows) []domain.UserSourceSubscriptionEntity {
-	items := []domain.UserSourceSubscriptionEntity{}
-
-	for rows.Next() {
-		var id int64
-		var createdAt time.Time
-		var updatedAt time.Time
-		var deletedAt time.Time
-		var userId int64
-		var sourceId int64
-
-		err := rows.Scan(
-			&id, &createdAt, &updatedAt, &deletedAt,
-			&userId, &sourceId,
-		)
-		if err != nil {
-			fmt.Println(err)
-		}
-
-		item := domain.UserSourceSubscriptionEntity{
-			ID:               id,
-			CreatedAt:        createdAt,
-			UpdatedAt:        updatedAt,
-			DeletedAt:        deletedAt,
-			UserID:           userId,
-			SourceID:         sourceId,
-		}
-
-		items = append(items, item)
-	}
-
-	return items
-}

internal/services/config.go

@@ -34,7 +34,6 @@ const (
 
 type Configs struct {
 	ServerAddress string
-	JwtSecret     string
 
 	RedditEnabled  bool
 	RedditPullTop  bool
@@ -65,7 +64,6 @@ func NewConfig() ConfigClient {
 func GetEnvConfig() Configs {
 	return Configs{
 		ServerAddress: os.Getenv(ServerAddress),
-		JwtSecret: os.Getenv("JwtSecret"),
 
 		RedditEnabled:  processBoolConfig(os.Getenv(FEATURE_ENABLE_REDDIT_BACKEND)),
 		RedditPullTop:  processBoolConfig(os.Getenv(REDDIT_PULL_TOP)),

internal/services/database.go

@@ -7,23 +7,19 @@ import (
 )
 
 type RepositoryService struct {
-	AlertDiscord            repository.AlertDiscordRepo
+	Articles        repository.ArticlesRepo
-	Articles                repository.ArticlesRepo
+	DiscordWebHooks repository.DiscordWebHookRepo
-	DiscordWebHooks         repository.DiscordWebHookRepo
+	Sources         repository.Sources
-	RefreshTokens           repository.RefreshToken
+	Users           repository.Users
-	Sources                 repository.Sources
+	RefreshTokens   repository.RefreshToken
-	Users                   repository.Users
-	UserSourceSubscriptions repository.UserSourceRepo
 }
 
 func NewRepositoryService(conn *sql.DB) RepositoryService {
 	return RepositoryService{
-		AlertDiscord:            repository.NewAlertDiscordRepository(conn),
+		Articles:        repository.NewArticleRepository(conn),
-		Articles:                repository.NewArticleRepository(conn),
+		DiscordWebHooks: repository.NewDiscordWebHookRepository(conn),
-		DiscordWebHooks:         repository.NewDiscordWebHookRepository(conn),
+		Sources:         repository.NewSourceRepository(conn),
-		RefreshTokens:           repository.NewRefreshTokenRepository(conn),
+		Users:           repository.NewUserRepository(conn),
-		Sources:                 repository.NewSourceRepository(conn),
+		RefreshTokens:   repository.NewRefreshTokenRepository(conn),
-		Users:                   repository.NewUserRepository(conn),
-		UserSourceSubscriptions: repository.NewUserSourceRepository(conn),
 	}
 }

makefile

@@ -6,7 +6,6 @@ build: ## builds the application with the current go runtime
 	~/go/bin/swag f
 	~/go/bin/swag init -g cmd/server.go
 	go build cmd/server.go
-	ls -lh server
 	
 docker-build: ## Generates the docker image
 	docker build -t "newsbot.collector.api" .