anthrove/otter-space-sdk
Archived
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

Compare commits

base: anthrove:5f9ace9bd35077cf7eb55801e46f18f900bb6ba9
Branches Tags
anthrove:main
anthrove:develop/master
anthrove:v2.2.0
anthrove:v2.1.0
anthrove:v2.0.0
anthrove:v1.5.0
anthrove:v1.4.0
anthrove:v1.3.1
anthrove:v1.3.0
anthrove:v1.2.0
anthrove:v1.1.0
anthrove:v1.0.0
..
compare: anthrove:d759e072f77751f725e3f2f46fa34f79b3781917
Branches Tags
anthrove:main
anthrove:develop/master
anthrove:v2.2.0
anthrove:v2.1.0
anthrove:v2.0.0
anthrove:v1.5.0
anthrove:v1.4.0
anthrove:v1.3.1
anthrove:v1.3.0
anthrove:v1.2.0
anthrove:v1.1.0
anthrove:v1.0.0

No commits in common. "5f9ace9bd35077cf7eb55801e46f18f900bb6ba9" and "d759e072f77751f725e3f2f46fa34f79b3781917" have entirely different histories.
5f9ace9bd3 ... d759e072f7

6 changed files with 16 additions and 838 deletions
Show Stats Expand all files Collapse all files

113
internal/postgres/user.go
View File

@ -3,7 +3,6 @@ package postgres
import ( import (
"context" "context"
"errors" "errors"
"time"
otterError "git.dragse.it/anthrove/otter-space-sdk/pkg/error" otterError "git.dragse.it/anthrove/otter-space-sdk/pkg/error"
"git.dragse.it/anthrove/otter-space-sdk/pkg/models" "git.dragse.it/anthrove/otter-space-sdk/pkg/models"
@ -12,13 +11,6 @@ import (
"gorm.io/gorm" "gorm.io/gorm"
) )
// Workaround, should be changed later maybe, but its not that bad right now
type selectFrequencyTag struct {
tagName string `gorm:"tag_name"`
count int64 `gorm:"count"`
tagType models.TagType `gorm:"tag_type"`
}
func CreateUser(ctx context.Context, db *gorm.DB, anthroveUserID models.AnthroveUserID) error { func CreateUser(ctx context.Context, db *gorm.DB, anthroveUserID models.AnthroveUserID) error {
if anthroveUserID == "" { if anthroveUserID == "" {
@ -275,6 +267,13 @@ func GetUserFavoriteWithPagination(ctx context.Context, db *gorm.DB, anthroveUse
return &models.FavoriteList{Posts: favoritePosts}, nil return &models.FavoriteList{Posts: favoritePosts}, nil
} }
// Workaround, should be changed later maybe, but its not that bad right now
type selectFrequencyTag struct {
tagName string `gorm:"tag_name"`
count int64 `gorm:"count"`
tagType models.TagType `gorm:"tag_type"`
}
func GetUserTagWitRelationToFavedPosts(ctx context.Context, db *gorm.DB, anthroveUserID models.AnthroveUserID) ([]models.TagsWithFrequency, error) { func GetUserTagWitRelationToFavedPosts(ctx context.Context, db *gorm.DB, anthroveUserID models.AnthroveUserID) ([]models.TagsWithFrequency, error) {
var queryUserFavorites []selectFrequencyTag var queryUserFavorites []selectFrequencyTag
@ -321,101 +320,3 @@ func GetUserTagWitRelationToFavedPosts(ctx context.Context, db *gorm.DB, anthrov
return userFavoritesFrequency, nil return userFavoritesFrequency, nil
} }
func UpdateUserSourceScrapeTimeInterval(ctx context.Context, db *gorm.DB, anthroveUserID models.AnthroveUserID, sourceID models.AnthroveSourceID, scrapeTime models.AnthroveScrapeTimeInterval) error {
if anthroveUserID == "" {
return &otterError.EntityValidationFailed{Reason: otterError.AnthroveUserIDIsEmpty}
}
if len(anthroveUserID) != 25 {
return &otterError.EntityValidationFailed{Reason: otterError.AnthroveUserIDToShort}
}
if sourceID == "" {
return &otterError.EntityValidationFailed{Reason: otterError.AnthroveSourceIDEmpty}
}
if len(sourceID) != 25 {
return &otterError.EntityValidationFailed{Reason: otterError.AnthroveSourceIDToShort}
}
if scrapeTime == 0 {
return &otterError.EntityValidationFailed{Reason: "ScrapeTimeInterval cannot be empty"}
}
userSource := &models.UserSource{
UserID: string(anthroveUserID),
}
result := db.WithContext(ctx).Model(&userSource).Update("scrape_time_interval", scrapeTime)
if result.Error != nil {
return result.Error
}
return nil
}
func UpdateUserSourceLastScrapeTime(ctx context.Context, db *gorm.DB, anthroveUserID models.AnthroveUserID, sourceID models.AnthroveSourceID, lastScrapeTime models.AnthroveUserLastScrapeTime) error {
if anthroveUserID == "" {
return &otterError.EntityValidationFailed{Reason: otterError.AnthroveUserIDIsEmpty}
}
if len(anthroveUserID) != 25 {
return &otterError.EntityValidationFailed{Reason: otterError.AnthroveUserIDToShort}
}
if sourceID == "" {
return &otterError.EntityValidationFailed{Reason: otterError.AnthroveSourceIDEmpty}
}
if len(sourceID) != 25 {
return &otterError.EntityValidationFailed{Reason: otterError.AnthroveSourceIDToShort}
}
if time.Time.IsZero(time.Time(lastScrapeTime)) {
return &otterError.EntityValidationFailed{Reason: "LastScrapeTime cannot be empty"}
}
userSource := &models.UserSource{
UserID: string(anthroveUserID),
}
result := db.WithContext(ctx).Model(&userSource).Update("last_scrape_time", time.Time(lastScrapeTime))
if result.Error != nil {
return result.Error
}
return nil
}
func UpdateUserSourceValidation(ctx context.Context, db *gorm.DB, anthroveUserID models.AnthroveUserID, sourceID models.AnthroveSourceID, valid bool) error {
if anthroveUserID == "" {
return &otterError.EntityValidationFailed{Reason: otterError.AnthroveUserIDIsEmpty}
}
if len(anthroveUserID) != 25 {
return &otterError.EntityValidationFailed{Reason: otterError.AnthroveUserIDToShort}
}
if sourceID == "" {
return &otterError.EntityValidationFailed{Reason: otterError.AnthroveSourceIDEmpty}
}
if len(sourceID) != 25 {
return &otterError.EntityValidationFailed{Reason: otterError.AnthroveSourceIDToShort}
}
userSource := &models.UserSource{
UserID: string(anthroveUserID),
}
result := db.WithContext(ctx).Model(&userSource).Update("account_validate", valid)
if result.Error != nil {
return result.Error
}
return nil
}

365
internal/postgres/user_test.go
View File

@ -5,7 +5,6 @@ import (
"fmt" "fmt"
"reflect" "reflect"
"testing" "testing"
"time"
"git.dragse.it/anthrove/otter-space-sdk/pkg/models" "git.dragse.it/anthrove/otter-space-sdk/pkg/models"
"git.dragse.it/anthrove/otter-space-sdk/test" "git.dragse.it/anthrove/otter-space-sdk/test"
@ -987,367 +986,3 @@ func checkUserSource(got *models.UserSource, want *models.UserSource) bool {
return true return true
} }
func TestUpdateUserSourceScrapeTimeInterval(t *testing.T) {
// Setup trow away container
ctx := context.Background()
container, gormDB, err := test.StartPostgresContainer(ctx)
if err != nil {
t.Fatalf("Could not start PostgreSQL container: %v", err)
}
defer container.Terminate(ctx)
// Setup Test
validUserID := models.AnthroveUserID(fmt.Sprintf("%025s", "User1"))
invalidUserID := models.AnthroveUserID("XXX")
validSourceID := models.AnthroveSourceID(fmt.Sprintf("%025s", "Source1"))
source := &models.Source{
BaseModel: models.BaseModel[models.AnthroveSourceID]{
ID: validSourceID,
},
DisplayName: "e621",
Domain: "e621.net",
Icon: "https://e621.icon",
}
err = CreateSource(ctx, gormDB, source)
if err != nil {
t.Fatal(err)
}
err = CreateUserWithRelationToSource(ctx, gormDB, validUserID, validSourceID, "e66e6e6e6", "euser")
if err != nil {
t.Fatal(err)
}
// Test
type args struct {
ctx context.Context
db *gorm.DB
anthroveUserID models.AnthroveUserID
sourceID models.AnthroveSourceID
scrapeTime models.AnthroveScrapeTimeInterval
}
tests := []struct {
name string
args args
wantErr bool
}{
{
name: "Test 1: Valid Data",
args: args{
ctx: ctx,
db: gormDB,
anthroveUserID: validUserID,
sourceID: validSourceID,
scrapeTime: 10,
},
wantErr: false,
},
{
name: "Test 2: anthroveUserID to short",
args: args{
ctx: ctx,
db: gormDB,
anthroveUserID: invalidUserID,
sourceID: validSourceID,
scrapeTime: 10,
},
wantErr: true,
},
{
name: "Test 3: anthroveUserID is empty",
args: args{
ctx: ctx,
db: gormDB,
anthroveUserID: "",
sourceID: validSourceID,
scrapeTime: 10,
},
wantErr: true,
},
{
name: "Test 4: anthroveUserID to short",
args: args{
ctx: ctx,
db: gormDB,
anthroveUserID: validUserID,
sourceID: "111",
scrapeTime: 10,
},
wantErr: true,
},
{
name: "Test 5: anthroveUserID is empty",
args: args{
ctx: ctx,
db: gormDB,
anthroveUserID: validUserID,
sourceID: "",
scrapeTime: 10,
},
wantErr: true,
},
{
name: "Test 5: scrapeTime is empty",
args: args{
ctx: ctx,
db: gormDB,
anthroveUserID: validUserID,
sourceID: validSourceID,
scrapeTime: 0,
},
wantErr: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if err := UpdateUserSourceScrapeTimeInterval(tt.args.ctx, tt.args.db, tt.args.anthroveUserID, tt.args.sourceID, tt.args.scrapeTime); (err != nil) != tt.wantErr {
t.Errorf("UpdateUserSourceScrapeTimeInterval() error = %v, wantErr %v", err, tt.wantErr)
}
})
}
}
func TestUpdateUserSourceLastScrapeTime(t *testing.T) {
// Setup trow away container
ctx := context.Background()
container, gormDB, err := test.StartPostgresContainer(ctx)
if err != nil {
t.Fatalf("Could not start PostgreSQL container: %v", err)
}
defer container.Terminate(ctx)
// Setup Test
validUserID := models.AnthroveUserID(fmt.Sprintf("%025s", "User1"))
invalidUserID := models.AnthroveUserID("XXX")
validSourceID := models.AnthroveSourceID(fmt.Sprintf("%025s", "Source1"))
validScrapeTime := models.AnthroveUserLastScrapeTime(time.Now())
inValidScrapeTime := models.AnthroveUserLastScrapeTime{}
source := &models.Source{
BaseModel: models.BaseModel[models.AnthroveSourceID]{
ID: validSourceID,
},
DisplayName: "e621",
Domain: "e621.net",
Icon: "https://e621.icon",
}
err = CreateSource(ctx, gormDB, source)
if err != nil {
t.Fatal(err)
}
err = CreateUserWithRelationToSource(ctx, gormDB, validUserID, validSourceID, "e66e6e6e6", "euser")
if err != nil {
t.Fatal(err)
}
// Test
type args struct {
ctx context.Context
db *gorm.DB
anthroveUserID models.AnthroveUserID
sourceID models.AnthroveSourceID
lastScrapeTime models.AnthroveUserLastScrapeTime
}
tests := []struct {
name string
args args
wantErr bool
}{
{
name: "Test 1: Valid Data",
args: args{
ctx: ctx,
db: gormDB,
anthroveUserID: validUserID,
sourceID: validSourceID,
lastScrapeTime: validScrapeTime,
},
wantErr: false,
},
{
name: "Test 2: anthroveUserID to short",
args: args{
ctx: ctx,
db: gormDB,
anthroveUserID: invalidUserID,
sourceID: validSourceID,
lastScrapeTime: validScrapeTime,
},
wantErr: true,
},
{
name: "Test 3: anthroveUserID is empty",
args: args{
ctx: ctx,
db: gormDB,
anthroveUserID: "",
sourceID: validSourceID,
lastScrapeTime: validScrapeTime,
},
wantErr: true,
},
{
name: "Test 4: anthroveUserID to short",
args: args{
ctx: ctx,
db: gormDB,
anthroveUserID: validUserID,
sourceID: "111",
lastScrapeTime: validScrapeTime,
},
wantErr: true,
},
{
name: "Test 5: anthroveUserID is empty",
args: args{
ctx: ctx,
db: gormDB,
anthroveUserID: validUserID,
sourceID: "",
lastScrapeTime: validScrapeTime,
},
wantErr: true,
},
{
name: "Test 5: scrapeTime is empty",
args: args{
ctx: ctx,
db: gormDB,
anthroveUserID: validUserID,
sourceID: validSourceID,
lastScrapeTime: inValidScrapeTime,
},
wantErr: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if err := UpdateUserSourceLastScrapeTime(tt.args.ctx, tt.args.db, tt.args.anthroveUserID, tt.args.sourceID, tt.args.lastScrapeTime); (err != nil) != tt.wantErr {
t.Errorf("UpdateUserSourceLastScrapeTime() error = %v, wantErr %v", err, tt.wantErr)
}
})
}
}
func TestUpdateUserSourceValidation(t *testing.T) {
// Setup trow away container
ctx := context.Background()
container, gormDB, err := test.StartPostgresContainer(ctx)
if err != nil {
t.Fatalf("Could not start PostgreSQL container: %v", err)
}
defer container.Terminate(ctx)
// Setup Test
validUserID := models.AnthroveUserID(fmt.Sprintf("%025s", "User1"))
invalidUserID := models.AnthroveUserID("XXX")
validSourceID := models.AnthroveSourceID(fmt.Sprintf("%025s", "Source1"))
source := &models.Source{
BaseModel: models.BaseModel[models.AnthroveSourceID]{
ID: validSourceID,
},
DisplayName: "e621",
Domain: "e621.net",
Icon: "https://e621.icon",
}
err = CreateSource(ctx, gormDB, source)
if err != nil {
t.Fatal(err)
}
err = CreateUserWithRelationToSource(ctx, gormDB, validUserID, validSourceID, "e66e6e6e6", "euser")
if err != nil {
t.Fatal(err)
}
// Test
type args struct {
ctx context.Context
db *gorm.DB
anthroveUserID models.AnthroveUserID
sourceID models.AnthroveSourceID
valid bool
}
tests := []struct {
name string
args args
wantErr bool
}{
{
name: "Test 1: Valid Data",
args: args{
ctx: ctx,
db: gormDB,
anthroveUserID: validUserID,
sourceID: validSourceID,
valid: true,
},
wantErr: false,
},
{
name: "Test 2: anthroveUserID to short",
args: args{
ctx: ctx,
db: gormDB,
anthroveUserID: invalidUserID,
sourceID: validSourceID,
valid: true,
},
wantErr: true,
},
{
name: "Test 3: anthroveUserID is empty",
args: args{
ctx: ctx,
db: gormDB,
anthroveUserID: "",
sourceID: validSourceID,
valid: true,
},
wantErr: true,
},
{
name: "Test 4: anthroveUserID to short",
args: args{
ctx: ctx,
db: gormDB,
anthroveUserID: validUserID,
sourceID: "111",
valid: true,
},
wantErr: true,
},
{
name: "Test 5: anthroveUserID is empty",
args: args{
ctx: ctx,
db: gormDB,
anthroveUserID: validUserID,
sourceID: "",
valid: true,
},
wantErr: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if err := UpdateUserSourceValidation(tt.args.ctx, tt.args.db, tt.args.anthroveUserID, tt.args.sourceID, tt.args.valid); (err != nil) != tt.wantErr {
t.Errorf("UpdateUserSourceValidation() error = %v, wantErr %v", err, tt.wantErr)
}
})
}
}

9
pkg/database/postgres.go
View File

@ -151,15 +151,18 @@ func (p *postgresqlConnection) GetSourceByDomain(ctx context.Context, sourceDoma
// NEW FUNCTIONS // NEW FUNCTIONS
func (p *postgresqlConnection) UpdateUserSourceScrapeTimeInterval(ctx context.Context, anthroveUserID models.AnthroveUserID, sourceID models.AnthroveSourceID, scrapeTime models.AnthroveScrapeTimeInterval) error { func (p *postgresqlConnection) UpdateUserSourceScrapeTimeInterval(ctx context.Context, anthroveUserID models.AnthroveUserID, sourceID models.AnthroveSourceID, scrapeTime models.AnthroveScrapeTimeInterval) error {
return postgres.UpdateUserSourceScrapeTimeInterval(ctx, p.db, anthroveUserID, sourceID, scrapeTime) //TODO implement me
panic("implement me")
} }
func (p *postgresqlConnection) UpdateUserSourceLastScrapeTime(ctx context.Context, anthroveUserID models.AnthroveUserID, sourceID models.AnthroveSourceID, lastScrapeTime models.AnthroveUserLastScrapeTime) error { func (p *postgresqlConnection) UpdateUserSourceLastScrapeTime(ctx context.Context, anthroveUserID models.AnthroveUserID, sourceID models.AnthroveSourceID, lastScrapeTime models.AnthroveUserLastScrapeTime) error {
return postgres.UpdateUserSourceLastScrapeTime(ctx, p.db, anthroveUserID, sourceID, lastScrapeTime) //TODO implement me
panic("implement me")
} }
func (p *postgresqlConnection) UpdateUserSourceValidation(ctx context.Context, anthroveUserID models.AnthroveUserID, sourceID models.AnthroveSourceID, valid bool) error { func (p *postgresqlConnection) UpdateUserSourceValidation(ctx context.Context, anthroveUserID models.AnthroveUserID, sourceID models.AnthroveSourceID, valid bool) error {
return postgres.UpdateUserSourceValidation(ctx, p.db, anthroveUserID, sourceID, valid) //TODO implement me
panic("implement me")
} }
func (p *postgresqlConnection) CreateTagAlias(ctx context.Context, tagAliasName models.AnthroveTagAliasName, tagID models.AnthroveTagID) error { func (p *postgresqlConnection) CreateTagAlias(ctx context.Context, tagAliasName models.AnthroveTagAliasName, tagID models.AnthroveTagID) error {

357
pkg/database/postgres_test.go
View File

@ -5,7 +5,6 @@ import (
"fmt" "fmt"
"reflect" "reflect"
"testing" "testing"
"time"
"git.dragse.it/anthrove/otter-space-sdk/internal/postgres" "git.dragse.it/anthrove/otter-space-sdk/internal/postgres"
"git.dragse.it/anthrove/otter-space-sdk/pkg/models" "git.dragse.it/anthrove/otter-space-sdk/pkg/models"
@ -2717,359 +2716,3 @@ func Test_postgresqlConnection_DeleteTagGroup(t *testing.T) {
}) })
} }
} }
func Test_postgresqlConnection_UpdateUserSourceScrapeTimeInterval(t *testing.T) {
// Setup trow away container
ctx := context.Background()
container, gormDB, err := test.StartPostgresContainer(ctx)
if err != nil {
t.Fatalf("Could not start PostgreSQL container: %v", err)
}
defer container.Terminate(ctx)
// Setup Test
validUserID := models.AnthroveUserID(fmt.Sprintf("%025s", "User1"))
invalidUserID := models.AnthroveUserID("XXX")
validSourceID := models.AnthroveSourceID(fmt.Sprintf("%025s", "Source1"))
source := &models.Source{
BaseModel: models.BaseModel[models.AnthroveSourceID]{
ID: validSourceID,
},
DisplayName: "e621",
Domain: "e621.net",
Icon: "https://e621.icon",
}
err = postgres.CreateSource(ctx, gormDB, source)
if err != nil {
t.Fatal(err)
}
err = postgres.CreateUserWithRelationToSource(ctx, gormDB, validUserID, validSourceID, "e66e6e6e6", "euser")
if err != nil {
t.Fatal(err)
}
// Test
type args struct {
ctx context.Context
anthroveUserID models.AnthroveUserID
sourceID models.AnthroveSourceID
scrapeTime models.AnthroveScrapeTimeInterval
}
tests := []struct {
name string
args args
wantErr bool
}{
{
name: "Test 1: Valid Data",
args: args{
ctx: ctx,
anthroveUserID: validUserID,
sourceID: validSourceID,
scrapeTime: 10,
},
wantErr: false,
},
{
name: "Test 2: anthroveUserID to short",
args: args{
ctx: ctx,
anthroveUserID: invalidUserID,
sourceID: validSourceID,
scrapeTime: 10,
},
wantErr: true,
},
{
name: "Test 3: anthroveUserID is empty",
args: args{
ctx: ctx,
anthroveUserID: "",
sourceID: validSourceID,
scrapeTime: 10,
},
wantErr: true,
},
{
name: "Test 4: anthroveUserID to short",
args: args{
ctx: ctx,
anthroveUserID: validUserID,
sourceID: "111",
scrapeTime: 10,
},
wantErr: true,
},
{
name: "Test 5: anthroveUserID is empty",
args: args{
ctx: ctx,
anthroveUserID: validUserID,
sourceID: "",
scrapeTime: 10,
},
wantErr: true,
},
{
name: "Test 5: scrapeTime is empty",
args: args{
ctx: ctx,
anthroveUserID: validUserID,
sourceID: validSourceID,
scrapeTime: 0,
},
wantErr: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
p := &postgresqlConnection{
db: gormDB,
debug: true,
}
if err := p.UpdateUserSourceScrapeTimeInterval(tt.args.ctx, tt.args.anthroveUserID, tt.args.sourceID, tt.args.scrapeTime); (err != nil) != tt.wantErr {
t.Errorf("UpdateUserSourceScrapeTimeInterval() error = %v, wantErr %v", err, tt.wantErr)
}
})
}
}
func Test_postgresqlConnection_UpdateUserSourceLastScrapeTime(t *testing.T) {
// Setup trow away container
ctx := context.Background()
container, gormDB, err := test.StartPostgresContainer(ctx)
if err != nil {
t.Fatalf("Could not start PostgreSQL container: %v", err)
}
defer container.Terminate(ctx)
// Setup Test
validUserID := models.AnthroveUserID(fmt.Sprintf("%025s", "User1"))
invalidUserID := models.AnthroveUserID("XXX")
validSourceID := models.AnthroveSourceID(fmt.Sprintf("%025s", "Source1"))
validScrapeTime := models.AnthroveUserLastScrapeTime(time.Now())
inValidScrapeTime := models.AnthroveUserLastScrapeTime{}
source := &models.Source{
BaseModel: models.BaseModel[models.AnthroveSourceID]{
ID: validSourceID,
},
DisplayName: "e621",
Domain: "e621.net",
Icon: "https://e621.icon",
}
err = postgres.CreateSource(ctx, gormDB, source)
if err != nil {
t.Fatal(err)
}
err = postgres.CreateUserWithRelationToSource(ctx, gormDB, validUserID, validSourceID, "e66e6e6e6", "euser")
if err != nil {
t.Fatal(err)
}
// Test
type args struct {
ctx context.Context
anthroveUserID models.AnthroveUserID
sourceID models.AnthroveSourceID
lastScrapeTime models.AnthroveUserLastScrapeTime
}
tests := []struct {
name string
args args
wantErr bool
}{
{
name: "Test 1: Valid Data",
args: args{
ctx: ctx,
anthroveUserID: validUserID,
sourceID: validSourceID,
lastScrapeTime: validScrapeTime,
},
wantErr: false,
},
{
name: "Test 2: anthroveUserID to short",
args: args{
ctx: ctx,
anthroveUserID: invalidUserID,
sourceID: validSourceID,
lastScrapeTime: validScrapeTime,
},
wantErr: true,
},
{
name: "Test 3: anthroveUserID is empty",
args: args{
ctx: ctx,
anthroveUserID: "",
sourceID: validSourceID,
lastScrapeTime: validScrapeTime,
},
wantErr: true,
},
{
name: "Test 4: anthroveUserID to short",
args: args{
ctx: ctx,
anthroveUserID: validUserID,
sourceID: "111",
lastScrapeTime: validScrapeTime,
},
wantErr: true,
},
{
name: "Test 5: anthroveUserID is empty",
args: args{
ctx: ctx,
anthroveUserID: validUserID,
sourceID: "",
lastScrapeTime: validScrapeTime,
},
wantErr: true,
},
{
name: "Test 5: scrapeTime is empty",
args: args{
ctx: ctx,
anthroveUserID: validUserID,
sourceID: validSourceID,
lastScrapeTime: inValidScrapeTime,
},
wantErr: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
p := &postgresqlConnection{
db: gormDB,
debug: true,
}
if err := p.UpdateUserSourceLastScrapeTime(tt.args.ctx, tt.args.anthroveUserID, tt.args.sourceID, tt.args.lastScrapeTime); (err != nil) != tt.wantErr {
t.Errorf("UpdateUserSourceLastScrapeTime() error = %v, wantErr %v", err, tt.wantErr)
}
})
}
}
func Test_postgresqlConnection_UpdateUserSourceValidation(t *testing.T) {
// Setup trow away container
ctx := context.Background()
container, gormDB, err := test.StartPostgresContainer(ctx)
if err != nil {
t.Fatalf("Could not start PostgreSQL container: %v", err)
}
defer container.Terminate(ctx)
// Setup Test
validUserID := models.AnthroveUserID(fmt.Sprintf("%025s", "User1"))
invalidUserID := models.AnthroveUserID("XXX")
validSourceID := models.AnthroveSourceID(fmt.Sprintf("%025s", "Source1"))
source := &models.Source{
BaseModel: models.BaseModel[models.AnthroveSourceID]{
ID: validSourceID,
},
DisplayName: "e621",
Domain: "e621.net",
Icon: "https://e621.icon",
}
err = postgres.CreateSource(ctx, gormDB, source)
if err != nil {
t.Fatal(err)
}
err = postgres.CreateUserWithRelationToSource(ctx, gormDB, validUserID, validSourceID, "e66e6e6e6", "euser")
if err != nil {
t.Fatal(err)
}
// Test
type args struct {
ctx context.Context
anthroveUserID models.AnthroveUserID
sourceID models.AnthroveSourceID
valid bool
}
tests := []struct {
name string
args args
wantErr bool
}{
{
name: "Test 1: Valid Data",
args: args{
ctx: ctx,
anthroveUserID: validUserID,
sourceID: validSourceID,
valid: true,
},
wantErr: false,
},
{
name: "Test 2: anthroveUserID to short",
args: args{
ctx: ctx,
anthroveUserID: invalidUserID,
sourceID: validSourceID,
valid: true,
},
wantErr: true,
},
{
name: "Test 3: anthroveUserID is empty",
args: args{
ctx: ctx,
anthroveUserID: "",
sourceID: validSourceID,
valid: true,
},
wantErr: true,
},
{
name: "Test 4: anthroveUserID to short",
args: args{
ctx: ctx,
anthroveUserID: validUserID,
sourceID: "111",
valid: true,
},
wantErr: true,
},
{
name: "Test 5: anthroveUserID is empty",
args: args{
ctx: ctx,
anthroveUserID: validUserID,
sourceID: "",
valid: true,
},
wantErr: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
p := &postgresqlConnection{
db: gormDB,
debug: true,
}
if err := p.UpdateUserSourceValidation(tt.args.ctx, tt.args.anthroveUserID, tt.args.sourceID, tt.args.valid); (err != nil) != tt.wantErr {
t.Errorf("UpdateUserSourceValidation() error = %v, wantErr %v", err, tt.wantErr)
}
})
}
}

6
pkg/error/validation.go
View File

@ -3,10 +3,8 @@ package error
import "fmt" import "fmt"
const ( const (
AnthroveUserIDIsEmpty = "anthrovePostID cannot be empty" AnthroveUserIDIsEmpty = "anthrovePostID cannot be empty"
AnthroveUserIDToShort = "anthrovePostID needs to be 25 characters long" AnthroveUserIDToShort = "anthrovePostID needs to be 25 characters long"
AnthroveSourceIDEmpty = "anthroveSourceID cannot be empty"
AnthroveSourceIDToShort = "anthroveSourceID needs to be 25 characters long"
) )
type EntityValidationFailed struct { type EntityValidationFailed struct {

4
pkg/models/const.go
View File

@ -1,7 +1,5 @@
package models package models
import "time"
type AnthroveUserID string type AnthroveUserID string
type AnthrovePostID string type AnthrovePostID string
type AnthroveSourceID string type AnthroveSourceID string
@ -11,7 +9,7 @@ type AnthroveTagGroupName string
type AnthroveTagAliasName string type AnthroveTagAliasName string
type AnthroveTagID string type AnthroveTagID string
type AnthroveScrapeTimeInterval int type AnthroveScrapeTimeInterval int
type AnthroveUserLastScrapeTime time.Time type AnthroveUserLastScrapeTime int
type Rating string type Rating string
type TagType string type TagType string