refactor: annotations

model/album.go

@@ -40,4 +40,5 @@ type AlbumRepository interface {
 	Search(q string, offset int, size int) (Albums, error)
 	Refresh(ids ...string) error
 	PurgeEmpty() error
+	AnnotatedRepository
 }

model/annotation.go

@@ -2,29 +2,8 @@ package model
 
 import "time"
 
-const (
-	ArtistItemType = "artist"
-	AlbumItemType  = "album"
-	MediaItemType  = "media_file"
-)
-
-type Annotation struct {
-	AnnID     string    `json:"annID"        orm:"pk;column(ann_id)"`
-	UserID    string    `json:"userID"       orm:"pk;column(user_id)"`
-	ItemID    string    `json:"itemID"       orm:"pk;column(item_id)"`
-	ItemType  string    `json:"itemType"`
-	PlayCount int       `json:"playCount"`
-	PlayDate  time.Time `json:"playDate"`
-	Rating    int       `json:"rating"`
-	Starred   bool      `json:"starred"`
-	StarredAt time.Time `json:"starredAt"`
-}
-
-type AnnotationMap map[string]Annotation
-
-type AnnotationRepository interface {
-	Delete(itemType string, itemID ...string) error
-	IncPlayCount(itemType, itemID string, ts time.Time) error
-	SetStar(starred bool, itemType string, ids ...string) error
-	SetRating(rating int, itemType, itemID string) error
+type AnnotatedRepository interface {
+	IncPlayCount(itemID string, ts time.Time) error
+	SetStar(starred bool, itemIDs ...string) error
+	SetRating(rating int, itemID string) error
 }

model/artist.go

@@ -33,4 +33,5 @@ type ArtistRepository interface {
 	Refresh(ids ...string) error
 	GetIndex() (ArtistIndexes, error)
 	PurgeEmpty() error
+	AnnotatedRepository
 }

model/datastore.go

@@ -28,7 +28,6 @@ type DataStore interface {
 	Playlist(ctx context.Context) PlaylistRepository
 	Property(ctx context.Context) PropertyRepository
 	User(ctx context.Context) UserRepository
-	Annotation(ctx context.Context) AnnotationRepository
 
 	Resource(ctx context.Context, model interface{}) ResourceRepository
 

model/mediafile.go

@@ -28,11 +28,11 @@ type MediaFile struct {
 	UpdatedAt   time.Time `json:"updatedAt"`
 
 	// Annotations
-	PlayCount int       `json:"-" orm:"-"`
-	PlayDate  time.Time `json:"-" orm:"-"`
-	Rating    int       `json:"-" orm:"-"`
-	Starred   bool      `json:"-" orm:"-"`
-	StarredAt time.Time `json:"-" orm:"-"`
+	PlayCount int       `json:"-"   orm:"-"`
+	PlayDate  time.Time `json:"-"   orm:"-"`
+	Rating    int       `json:"-"   orm:"-"`
+	Starred   bool      `json:"-"   orm:"-"`
+	StarredAt time.Time `json:"-"   orm:"-"`
 }
 
 func (mf *MediaFile) ContentType() string {
@@ -53,4 +53,6 @@ type MediaFileRepository interface {
 	Search(q string, offset int, size int) (MediaFiles, error)
 	Delete(id string) error
 	DeleteByPath(path string) error
+
+	AnnotatedRepository
 }