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

Compare commits

base: anthrove:2d4102be6ab0e5599bfdaf113406d39cba21c704
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:47fda2994ba528a420836de04d26d7b73e73e9a5
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. "2d4102be6ab0e5599bfdaf113406d39cba21c704" and "47fda2994ba528a420836de04d26d7b73e73e9a5" have entirely different histories.
2d4102be6a ... 47fda2994b

7 changed files with 37 additions and 440 deletions
Show Stats Expand all files Collapse all files

61
internal/postgres/tag.go
View File

@ -10,17 +10,13 @@ import (
"gorm.io/gorm" "gorm.io/gorm"
) )
func CreateTag(ctx context.Context, db *gorm.DB, tagName models.AnthroveTagName, tagType models.TagType) error { func CreateTag(ctx context.Context, db *gorm.DB, tag *models.Tag) error {
if tagName == "" { if tag == nil {
return &otterError.EntityValidationFailed{Reason: "tagName cannot be empty"} return &otterError.EntityValidationFailed{Reason: "Tag is nil"}
} }
if tagType == "" { result := db.WithContext(ctx).Create(tag)
return &otterError.EntityValidationFailed{Reason: "tagType cannot be empty"}
}
result := db.WithContext(ctx).Create(&models.Tag{Name: string(tagName), Type: tagType})
if result.Error != nil { if result.Error != nil {
if errors.Is(result.Error, gorm.ErrDuplicatedKey) { if errors.Is(result.Error, gorm.ErrDuplicatedKey) {
return &otterError.EntityAlreadyExists{} return &otterError.EntityAlreadyExists{}
@ -33,58 +29,13 @@ func CreateTag(ctx context.Context, db *gorm.DB, tagName models.AnthroveTagName,
} }
log.WithFields(log.Fields{ log.WithFields(log.Fields{
"tag_name": tagName, "tag_name": tag.Name,
"tag_type": tagType, "tag_type": tag.Type,
}).Trace("database: created tag node") }).Trace("database: created tag node")
return nil return nil
} }
func DeleteTag(ctx context.Context, db *gorm.DB, tagName models.AnthroveTagName) error {
if tagName == "" {
return &otterError.EntityValidationFailed{Reason: "tagName cannot be empty"}
}
result := db.WithContext(ctx).Delete(&models.Tag{Name: string(tagName)})
if result.Error != nil {
if errors.Is(result.Error, gorm.ErrRecordNotFound) {
return &otterError.NoDataFound{}
}
return result.Error
}
log.WithFields(log.Fields{
"tag_name": tagName,
}).Trace("database: deleted tag")
return nil
}
func GetAllTagByTagsType(ctx context.Context, db *gorm.DB, tagType models.TagType) ([]models.Tag, error) {
var tags []models.Tag
if tagType == "" {
return nil, &otterError.EntityValidationFailed{Reason: "tagType cannot be empty"}
}
result := db.WithContext(ctx).Find(&tags).Where("tag_type = ?", tagType)
if result.Error != nil {
if errors.Is(result.Error, gorm.ErrRecordNotFound) {
return nil, &otterError.NoDataFound{}
}
return nil, result.Error
}
log.WithFields(log.Fields{
"tags_length": len(tags),
}).Trace("database: got tag")
return tags, nil
}
func CreateTagAndReferenceToPost(ctx context.Context, db *gorm.DB, anthrovePostID models.AnthrovePostID, tag *models.Tag) error { func CreateTagAndReferenceToPost(ctx context.Context, db *gorm.DB, anthrovePostID models.AnthrovePostID, tag *models.Tag) error {
if anthrovePostID == "" { if anthrovePostID == "" {

196
internal/postgres/tag_test.go
View File

@ -128,7 +128,7 @@ func TestGetTags(t *testing.T) {
} }
for _, tag := range tags { for _, tag := range tags {
err = CreateTag(ctx, gormDB, models.AnthroveTagName(tag.Name), tag.Type) err = CreateTag(ctx, gormDB, &tag)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -204,8 +204,7 @@ func TestCreateTag(t *testing.T) {
type args struct { type args struct {
ctx context.Context ctx context.Context
db *gorm.DB db *gorm.DB
tagName models.AnthroveTagName tag *models.Tag
tagType models.TagType
} }
tests := []struct { tests := []struct {
name string name string
@ -217,8 +216,7 @@ func TestCreateTag(t *testing.T) {
args: args{ args: args{
ctx: ctx, ctx: ctx,
db: gormDB, db: gormDB,
tagName: models.AnthroveTagName(validTag.Name), tag: &validTag,
tagType: validTag.Type,
}, },
wantErr: false, wantErr: false,
}, },
@ -227,8 +225,7 @@ func TestCreateTag(t *testing.T) {
args: args{ args: args{
ctx: ctx, ctx: ctx,
db: gormDB, db: gormDB,
tagName: models.AnthroveTagName(validTag.Name), tag: &validTag,
tagType: validTag.Type,
}, },
wantErr: true, wantErr: true,
}, },
@ -237,15 +234,14 @@ func TestCreateTag(t *testing.T) {
args: args{ args: args{
ctx: ctx, ctx: ctx,
db: gormDB, db: gormDB,
tagName: models.AnthroveTagName(invalidTag.Name), tag: &invalidTag,
tagType: invalidTag.Type,
}, },
wantErr: true, wantErr: true,
}, },
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
if err := CreateTag(tt.args.ctx, tt.args.db, tt.args.tagName, tt.args.tagType); (err != nil) != tt.wantErr { if err := CreateTag(tt.args.ctx, tt.args.db, tt.args.tag); (err != nil) != tt.wantErr {
t.Errorf("CreateTag() error = %v, wantErr %v", err, tt.wantErr) t.Errorf("CreateTag() error = %v, wantErr %v", err, tt.wantErr)
} }
}) })
@ -273,7 +269,7 @@ func TestCreateTagAlias(t *testing.T) {
Type: models.Character, Type: models.Character,
} }
err = CreateTag(ctx, gormDB, models.AnthroveTagName(validTag.Name), validTag.Type) err = CreateTag(ctx, gormDB, validTag)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -383,7 +379,7 @@ func TestGetAllTagAlias(t *testing.T) {
}, },
} }
err = CreateTag(ctx, gormDB, models.AnthroveTagName(validTag.Name), validTag.Type) err = CreateTag(ctx, gormDB, validTag)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -460,7 +456,7 @@ func TestGetAllTagAliasByTag(t *testing.T) {
}, },
} }
err = CreateTag(ctx, gormDB, models.AnthroveTagName(validTag.Name), validTag.Type) err = CreateTag(ctx, gormDB, validTag)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -544,7 +540,7 @@ func TestDeleteTagAlias(t *testing.T) {
Type: models.Character, Type: models.Character,
} }
err = CreateTag(ctx, gormDB, models.AnthroveTagName(validTag.Name), validTag.Type) err = CreateTag(ctx, gormDB, validTag)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -622,7 +618,7 @@ func TestCreateTagGroup(t *testing.T) {
Type: models.Character, Type: models.Character,
} }
err = CreateTag(ctx, gormDB, models.AnthroveTagName(validTag.Name), validTag.Type) err = CreateTag(ctx, gormDB, validTag)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -732,7 +728,7 @@ func TestGetAllTagGroup(t *testing.T) {
}, },
} }
err = CreateTag(ctx, gormDB, models.AnthroveTagName(validTag.Name), validTag.Type) err = CreateTag(ctx, gormDB, validTag)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -809,7 +805,7 @@ func TestGetAllTagGroupByTag(t *testing.T) {
}, },
} }
err = CreateTag(ctx, gormDB, models.AnthroveTagName(validTag.Name), validTag.Type) err = CreateTag(ctx, gormDB, validTag)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -893,7 +889,7 @@ func TestDeleteTagGroup(t *testing.T) {
Type: models.Character, Type: models.Character,
} }
err = CreateTag(ctx, gormDB, models.AnthroveTagName(validTag.Name), validTag.Type) err = CreateTag(ctx, gormDB, validTag)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -949,167 +945,3 @@ func TestDeleteTagGroup(t *testing.T) {
}) })
} }
} }
func TestDeleteTag(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
validTagID := models.AnthroveTagID("toothless")
validTag := &models.Tag{
Name: string(validTagID),
Type: models.Character,
}
err = CreateTag(ctx, gormDB, models.AnthroveTagName(validTag.Name), validTag.Type)
if err != nil {
t.Fatal(err)
}
// Test
type args struct {
ctx context.Context
db *gorm.DB
tagName models.AnthroveTagName
}
tests := []struct {
name string
args args
wantErr bool
}{
{
name: "Test 1: Valid TagName",
args: args{
ctx: ctx,
db: gormDB,
tagName: models.AnthroveTagName(validTagID),
},
wantErr: false,
},
{
name: "Test 2: Invalid TagName",
args: args{
ctx: ctx,
db: gormDB,
tagName: models.AnthroveTagName("aaa"),
},
wantErr: false,
},
{
name: "Test 3: No TagName",
args: args{
ctx: ctx,
db: gormDB,
tagName: "",
},
wantErr: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if err := DeleteTag(tt.args.ctx, tt.args.db, tt.args.tagName); (err != nil) != tt.wantErr {
t.Errorf("DeleteTag() error = %v, wantErr %v", err, tt.wantErr)
}
})
}
}
func TestGetAllTagByTagType(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
validTags := []models.Tag{
{
Name: "JayTheFerret",
Type: models.Character,
},
{
Name: "SoXX",
Type: models.Character,
},
{
Name: "Alphyron",
Type: models.Character,
},
{
Name: "Dragon",
Type: models.Species,
},
}
for _, tag := range validTags {
err = CreateTag(ctx, gormDB, models.AnthroveTagName(tag.Name), tag.Type)
if err != nil {
t.Fatal(err)
}
}
// Test
type args struct {
ctx context.Context
db *gorm.DB
tagType models.TagType
}
tests := []struct {
name string
args args
want []models.Tag
wantErr bool
}{
{
name: "Test 1: Get Data",
args: args{
ctx: ctx,
db: gormDB,
tagType: models.Character,
},
want: validTags,
wantErr: false,
},
{
name: "Test 2: invalid Tag Type",
args: args{
ctx: ctx,
db: gormDB,
tagType: "aa",
},
want: validTags,
wantErr: false,
},
{
name: "Test 3: No Tag Type",
args: args{
ctx: ctx,
db: gormDB,
tagType: "",
},
want: nil,
wantErr: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got, err := GetAllTagByTagsType(tt.args.ctx, tt.args.db, tt.args.tagType)
if (err != nil) != tt.wantErr {
t.Errorf("GetAllTagByTagsType() error = %v, wantErr %v", err, tt.wantErr)
return
}
if !checkTag(got, tt.want) {
t.Errorf("GetAllTagByTagsType() got = %v, want %v", got, tt.want)
}
})
}
}

3
pkg/database/database.go
View File

@ -19,9 +19,6 @@ type OtterSpace interface {
// Source contains all function that are needed to manage the Source // Source contains all function that are needed to manage the Source
Source Source
// Tag contains all functions that are used to manage Tag
Tag
// TagAlias contains all function that are needed to manage the TagAlias // TagAlias contains all function that are needed to manage the TagAlias
TagAlias TagAlias

12
pkg/database/postgres.go
View File

@ -202,18 +202,6 @@ func (p *postgresqlConnection) DeleteTagGroup(ctx context.Context, tagGroupName
return postgres.DeleteTagGroup(ctx, p.db, tagGroupName) return postgres.DeleteTagGroup(ctx, p.db, tagGroupName)
} }
func (p *postgresqlConnection) CreateTag(ctx context.Context, tagName models.AnthroveTagName, tagType models.TagType) error {
return postgres.CreateTag(ctx, p.db, tagName, tagType)
}
func (p *postgresqlConnection) GetAllTagsByTagType(ctx context.Context, tagType models.TagType) ([]models.Tag, error) {
return postgres.GetAllTagByTagsType(ctx, p.db, tagType)
}
func (p *postgresqlConnection) DeleteTag(ctx context.Context, tagName models.AnthroveTagName) error {
return postgres.DeleteTag(ctx, p.db, tagName)
}
// HELPER // HELPER
func (p *postgresqlConnection) migrateDatabase(dbPool *gorm.DB) error { func (p *postgresqlConnection) migrateDatabase(dbPool *gorm.DB) error {

182
pkg/database/postgres_test.go
View File

@ -1704,7 +1704,7 @@ func Test_postgresqlConnection_GetAllTags(t *testing.T) {
} }
for _, tag := range tags { for _, tag := range tags {
err = postgres.CreateTag(ctx, gormDB, models.AnthroveTagName(tag.Name), tag.Type) err = postgres.CreateTag(ctx, gormDB, &tag)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -2043,7 +2043,7 @@ func Test_postgresqlConnection_CreateTagAlias(t *testing.T) {
Type: models.Character, Type: models.Character,
} }
err = postgres.CreateTag(ctx, gormDB, models.AnthroveTagName(validTag.Name), validTag.Type) err = postgres.CreateTag(ctx, gormDB, validTag)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -2151,7 +2151,7 @@ func Test_postgresqlConnection_GetAllTagAlias(t *testing.T) {
}, },
} }
err = postgres.CreateTag(ctx, gormDB, models.AnthroveTagName(validTag.Name), validTag.Type) err = postgres.CreateTag(ctx, gormDB, validTag)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -2228,7 +2228,7 @@ func Test_postgresqlConnection_GetAllTagAliasByTag(t *testing.T) {
}, },
} }
err = postgres.CreateTag(ctx, gormDB, models.AnthroveTagName(validTag.Name), validTag.Type) err = postgres.CreateTag(ctx, gormDB, validTag)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -2312,7 +2312,7 @@ func Test_postgresqlConnection_DeleteTagAlias(t *testing.T) {
Type: models.Character, Type: models.Character,
} }
err = postgres.CreateTag(ctx, gormDB, models.AnthroveTagName(validTag.Name), validTag.Type) err = postgres.CreateTag(ctx, gormDB, validTag)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -2392,7 +2392,7 @@ func Test_postgresqlConnection_CreateTagGroup(t *testing.T) {
Type: models.Character, Type: models.Character,
} }
err = postgres.CreateTag(ctx, gormDB, models.AnthroveTagName(validTag.Name), validTag.Type) err = postgres.CreateTag(ctx, gormDB, validTag)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -2500,7 +2500,7 @@ func Test_postgresqlConnection_GetAllTagGroup(t *testing.T) {
}, },
} }
err = postgres.CreateTag(ctx, gormDB, models.AnthroveTagName(validTag.Name), validTag.Type) err = postgres.CreateTag(ctx, gormDB, validTag)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -2577,7 +2577,7 @@ func Test_postgresqlConnection_GetAllTagGroupByTag(t *testing.T) {
}, },
} }
err = postgres.CreateTag(ctx, gormDB, models.AnthroveTagName(validTag.Name), validTag.Type) err = postgres.CreateTag(ctx, gormDB, validTag)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -2661,7 +2661,7 @@ func Test_postgresqlConnection_DeleteTagGroup(t *testing.T) {
Type: models.Character, Type: models.Character,
} }
err = postgres.CreateTag(ctx, gormDB, models.AnthroveTagName(validTag.Name), validTag.Type) err = postgres.CreateTag(ctx, gormDB, validTag)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -3073,167 +3073,3 @@ func Test_postgresqlConnection_UpdateUserSourceValidation(t *testing.T) {
}) })
} }
} }
func Test_postgresqlConnection_DeleteTag(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
validTagID := models.AnthroveTagID("toothless")
validTag := &models.Tag{
Name: string(validTagID),
Type: models.Character,
}
err = postgres.CreateTag(ctx, gormDB, models.AnthroveTagName(validTag.Name), validTag.Type)
if err != nil {
t.Fatal(err)
}
// Test
type args struct {
ctx context.Context
tagName models.AnthroveTagName
}
tests := []struct {
name string
args args
wantErr bool
}{
{
name: "Test 1: Valid TagName",
args: args{
ctx: ctx,
tagName: models.AnthroveTagName(validTagID),
},
wantErr: false,
},
{
name: "Test 2: Invalid TagName",
args: args{
ctx: ctx,
tagName: models.AnthroveTagName("aaa"),
},
wantErr: false,
},
{
name: "Test 3: No TagName",
args: args{
ctx: ctx,
tagName: "",
},
wantErr: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
p := &postgresqlConnection{
db: gormDB,
debug: true,
}
if err := p.DeleteTag(tt.args.ctx, tt.args.tagName); (err != nil) != tt.wantErr {
t.Errorf("DeleteTag() error = %v, wantErr %v", err, tt.wantErr)
}
})
}
}
func Test_postgresqlConnection_GetAllTagsByTagType(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
validTags := []models.Tag{
{
Name: "JayTheFerret",
Type: models.Character,
},
{
Name: "SoXX",
Type: models.Character,
},
{
Name: "Alphyron",
Type: models.Character,
},
{
Name: "Dragon",
Type: models.Species,
},
}
for _, tag := range validTags {
err = postgres.CreateTag(ctx, gormDB, models.AnthroveTagName(tag.Name), tag.Type)
if err != nil {
t.Fatal(err)
}
}
// Test
type args struct {
ctx context.Context
tagType models.TagType
}
tests := []struct {
name string
args args
want []models.Tag
wantErr bool
}{
{
name: "Test 1: Get Data",
args: args{
ctx: ctx,
tagType: models.Character,
},
want: validTags,
wantErr: false,
},
{
name: "Test 2: invalid Tag Type",
args: args{
ctx: ctx,
tagType: "aa",
},
want: validTags,
wantErr: false,
},
{
name: "Test 3: No Tag Type",
args: args{
ctx: ctx,
tagType: "",
},
want: nil,
wantErr: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
p := &postgresqlConnection{
db: gormDB,
debug: true,
}
got, err := p.GetAllTagsByTagType(tt.args.ctx, tt.args.tagType)
if (err != nil) != tt.wantErr {
t.Errorf("GetAllTagsByTagType() error = %v, wantErr %v", err, tt.wantErr)
return
}
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("GetAllTagsByTagType() got = %v, want %v", got, tt.want)
}
})
}
}

6
pkg/database/tag.go
View File

@ -7,12 +7,6 @@ import (
) )
type Tag interface { type Tag interface {
CreateTag(ctx context.Context, tagName models.AnthroveTagName, tagType models.TagType) error
// GetAllTags retrieves all tags. // GetAllTags retrieves all tags.
GetAllTags(ctx context.Context) ([]models.Tag, error) GetAllTags(ctx context.Context) ([]models.Tag, error)
GetAllTagsByTagType(ctx context.Context, tagType models.TagType) ([]models.Tag, error)
DeleteTag(ctx context.Context, tagName models.AnthroveTagName) error
} }

1
pkg/models/const.go
View File

@ -12,7 +12,6 @@ type AnthroveTagAliasName string
type AnthroveTagID string type AnthroveTagID string
type AnthroveScrapeTimeInterval int type AnthroveScrapeTimeInterval int
type AnthroveUserLastScrapeTime time.Time type AnthroveUserLastScrapeTime time.Time
type AnthroveTagName string
type Rating string type Rating string
type TagType string type TagType string