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

Fixed Pagination & modles #14

Merged
fenpaws merged 6 commits from develop/orchestrator-fixes into main 2024-07-16 11:14:09 +00:00
Conversation 0 Commits 6 Files Changed 12 +46 -45
8 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 251611c5a0 - Show all commits

11
pkg/models/orm.go
View File

@ -1,9 +1,10 @@
package models package models
import ( import (
"time"
gonanoid "github.com/matoous/go-nanoid/v2" gonanoid "github.com/matoous/go-nanoid/v2"
"gorm.io/gorm" "gorm.io/gorm"
"time"
) )
type ID interface { type ID interface {
@ -11,10 +12,10 @@ type ID interface {
} }
type BaseModel[T ID] struct { type BaseModel[T ID] struct {
ID T `gorm:"primaryKey"` ID T `json:"id" gorm:"primaryKey"`
CreatedAt time.Time CreatedAt time.Time `json:"-"`
UpdatedAt time.Time UpdatedAt time.Time `json:"-"`
DeletedAt gorm.DeletedAt `gorm:"index"` DeletedAt gorm.DeletedAt `json:"-" gorm:"index"`
} }
func (base *BaseModel[T]) BeforeCreate(db *gorm.DB) error { func (base *BaseModel[T]) BeforeCreate(db *gorm.DB) error {

8
pkg/models/post.go
View File

@ -3,10 +3,10 @@ package models
// Post model // Post model
type Post struct { type Post struct {
BaseModel[AnthrovePostID] BaseModel[AnthrovePostID]
Rating Rating `gorm:"type:enum('safe','questionable','explicit')"` Rating Rating `json:"rating" gorm:"type:enum('safe','questionable','explicit')"`
Tags []Tag `gorm:"many2many:post_tags;"` Tags []Tag `json:"tags" gorm:"many2many:post_tags;"`
Favorites []UserFavorites `gorm:"foreignKey:PostID"` Favorites []UserFavorites `json:"-" gorm:"foreignKey:PostID"`
References []PostReference `gorm:"foreignKey:PostID"` References []PostReference `json:"-" gorm:"foreignKey:PostID"`
} }
func (Post) TableName() string { func (Post) TableName() string {

14
pkg/models/postReference.go
View File

@ -1,17 +1,17 @@
package models package models
type PostReference struct { type PostReference struct {
PostID string `gorm:"primaryKey"` PostID string `json:"post_id" gorm:"primaryKey"`
SourceID string `gorm:"primaryKey"` SourceID string `json:"source_id" gorm:"primaryKey"`
URL string `gorm:"primaryKey"` URL string `json:"url" gorm:"primaryKey"`
PostReferenceConfig PostReferenceConfig
} }
type PostReferenceConfig struct { type PostReferenceConfig struct {
SourcePostID string SourcePostID string `json:"source_post_id"`
FullFileURL string FullFileURL string `json:"full_file_url"`
PreviewFileURL string PreviewFileURL string `json:"preview_file_url"`
SampleFileURL string SampleFileURL string `json:"sample_file_url"`
} }
func (PostReference) TableName() string { func (PostReference) TableName() string {

10
pkg/models/source.go
View File

@ -3,11 +3,11 @@ package models
// Source model // Source model
type Source struct { type Source struct {
BaseModel[AnthroveSourceID] BaseModel[AnthroveSourceID]
DisplayName string DisplayName string `json:"display_name" `
Domain string `gorm:"not null;unique"` Domain string `json:"domain" gorm:"not null;unique"`
Icon string `gorm:"not null"` Icon string `json:"icon" gorm:"not null"`
UserSources []UserSource `gorm:"foreignKey:SourceID"` UserSources []UserSource `json:"-" gorm:"foreignKey:SourceID"`
References []PostReference `gorm:"foreignKey:SourceID"` References []PostReference `json:"references" gorm:"foreignKey:SourceID"`
} }
func (Source) TableName() string { func (Source) TableName() string {

18
pkg/models/tag.go
View File

@ -2,11 +2,11 @@ package models
// Tag models // Tag models
type Tag struct { type Tag struct {
Name string `gorm:"primaryKey"` Name string `json:"name" gorm:"primaryKey"`
Type TagType `gorm:"column:tag_type"` Type TagType `json:"type" gorm:"column:tag_type"`
Aliases []TagAlias `gorm:"foreignKey:TagID"` Aliases []TagAlias `json:"aliases" gorm:"foreignKey:TagID"`
Groups []TagGroup `gorm:"foreignKey:TagID"` Groups []TagGroup `json:"groups" gorm:"foreignKey:TagID"`
Posts []Post `gorm:"many2many:post_tags;"` Posts []Post `json:"posts" gorm:"many2many:post_tags;"`
} }
func (Tag) TableName() string { func (Tag) TableName() string {
@ -15,8 +15,8 @@ func (Tag) TableName() string {
// TagAlias model // TagAlias model
type TagAlias struct { type TagAlias struct {
Name string `gorm:"primaryKey"` Name string `json:"name" gorm:"primaryKey"`
TagID string TagID string `json:"tag_id"`
} }
func (TagAlias) TableName() string { func (TagAlias) TableName() string {
@ -25,8 +25,8 @@ func (TagAlias) TableName() string {
// TagGroup model // TagGroup model
type TagGroup struct { type TagGroup struct {
Name string `gorm:"primaryKey"` Name string `json:"name" gorm:"primaryKey"`
TagID string TagID string `json:"tag_id"`
} }
func (TagGroup) TableName() string { func (TagGroup) TableName() string {

4
pkg/models/user.go
View File

@ -3,8 +3,8 @@ package models
// User model // User model
type User struct { type User struct {
BaseModel[AnthroveUserID] BaseModel[AnthroveUserID]
Favorites []UserFavorites `gorm:"foreignKey:UserID"` Favorites []UserFavorites `json:"-" gorm:"foreignKey:UserID"`
Sources []UserSource `gorm:"foreignKey:UserID"` Sources []UserSource `json:"-" gorm:"foreignKey:UserID"`
} }
func (User) TableName() string { func (User) TableName() string {

6
pkg/models/userFavorite.go
View File

@ -3,9 +3,9 @@ package models
import "time" import "time"
type UserFavorites struct { type UserFavorites struct {
UserID string `gorm:"primaryKey"` UserID string `json:"user_id" gorm:"primaryKey"`
PostID string `gorm:"primaryKey"` PostID string `json:"post_id" gorm:"primaryKey"`
CreatedAt time.Time CreatedAt time.Time `json:"-"`
} }
func (UserFavorites) TableName() string { func (UserFavorites) TableName() string {

20
pkg/models/userSource.go
View File

@ -3,16 +3,16 @@ package models
import "time" import "time"
type UserSource struct { type UserSource struct {
User User `gorm:"foreignKey:ID;references:UserID"` User User `json:"user" gorm:"foreignKey:ID;references:UserID"`
UserID string `gorm:"primaryKey"` UserID string `json:"user_id" gorm:"primaryKey"`
Source Source `gorm:"foreignKey:ID;references:SourceID"` Source Source `json:"source" gorm:"foreignKey:ID;references:SourceID"`
SourceID string `gorm:"primaryKey"` SourceID string `json:"source_id" gorm:"primaryKey"`
ScrapeTimeInterval string ScrapeTimeInterval string `json:"scrape_time_interval"`
AccountUsername string AccountUsername string `json:"account_username"`
AccountID string AccountID string `json:"account_id"`
LastScrapeTime time.Time LastScrapeTime time.Time `json:"last_scrape_time"`
AccountValidate bool AccountValidate bool `json:"account_validate"`
AccountValidationKey string AccountValidationKey string `json:"-"`
} }
func (UserSource) TableName() string { func (UserSource) TableName() string {