refactor: new persistence, more SQL, less ORM

model/album.go

@@ -3,26 +3,33 @@ package model
 import "time"
 
 type Album struct {
-	ID           string
-	Name         string
-	ArtistID     string
-	CoverArtPath string
-	CoverArtId   string
-	Artist       string
-	AlbumArtist  string
-	Year         int
-	Compilation  bool
-	SongCount    int
-	Duration     int
-	Genre        string
-	CreatedAt    time.Time
-	UpdatedAt    time.Time
+	ID           string    `json:"id"            orm:"column(id)"`
+	Name         string    `json:"name"`
+	ArtistID     string    `json:"artistId"`
+	CoverArtPath string    `json:"-"`
+	CoverArtId   string    `json:"-"`
+	Artist       string    `json:"artist"`
+	AlbumArtist  string    `json:"albumArtist"`
+	Year         int       `json:"year"`
+	Compilation  bool      `json:"compilation"`
+	SongCount    int       `json:"songCount"`
+	Duration     int       `json:"duration"`
+	Genre        string    `json:"genre"`
+	CreatedAt    time.Time `json:"createdAt"`
+	UpdatedAt    time.Time `json:"updatedAt"`
+
+	// Annotations
+	PlayCount int       `orm:"-"`
+	PlayDate  time.Time `orm:"-"`
+	Rating    int       `orm:"-"`
+	Starred   bool      `orm:"-"`
+	StarredAt time.Time `orm:"-"`
 }
 
 type Albums []Album
 
 type AlbumRepository interface {
-	CountAll() (int64, error)
+	CountAll(...QueryOptions) (int64, error)
 	Exists(id string) (bool, error)
 	Put(m *Album) error
 	Get(id string) (*Album, error)

model/annotation.go

@@ -5,7 +5,7 @@ import "time"
 const (
 	ArtistItemType = "artist"
 	AlbumItemType  = "album"
-	MediaItemType  = "mediaFile"
+	MediaItemType  = "media_file"
 )
 
 type Annotation struct {

model/artist.go

@@ -1,10 +1,20 @@
 package model
 
+import "time"
+
 type Artist struct {
-	ID         string
-	Name       string
-	AlbumCount int
+	ID         string `json:"id"          orm:"column(id)"`
+	Name       string `json:"name"`
+	AlbumCount int    `json:"albumCount"  orm:"column(album_count)"`
+
+	// Annotations
+	PlayCount int       `json:"playCount"`
+	PlayDate  time.Time `json:"playDate"`
+	Rating    int       `json:"rating"`
+	Starred   bool      `json:"starred"`
+	StarredAt time.Time `json:"starredAt"`
 }
+
 type Artists []Artist
 
 type ArtistIndex struct {
@@ -14,12 +24,11 @@ type ArtistIndex struct {
 type ArtistIndexes []ArtistIndex
 
 type ArtistRepository interface {
-	CountAll() (int64, error)
+	CountAll(options ...QueryOptions) (int64, error)
 	Exists(id string) (bool, error)
 	Put(m *Artist) error
 	Get(id string) (*Artist, error)
 	GetStarred(userId string, options ...QueryOptions) (Artists, error)
-	SetStar(star bool, ids ...string) error
 	Search(q string, offset int, size int) (Artists, error)
 	Refresh(ids ...string) error
 	GetIndex() (ArtistIndexes, error)

model/datastore.go

@@ -20,7 +20,6 @@ type QueryOptions struct {
 
 type ResourceRepository interface {
 	rest.Repository
-	rest.Persistable
 }
 
 type DataStore interface {

model/mediafile.go

@@ -6,26 +6,33 @@ import (
 )
 
 type MediaFile struct {
-	ID          string
-	Path        string
-	Title       string
-	Album       string
-	Artist      string
-	ArtistID    string
-	AlbumArtist string
-	AlbumID     string
-	HasCoverArt bool
-	TrackNumber int
-	DiscNumber  int
-	Year        int
-	Size        int
-	Suffix      string
-	Duration    int
-	BitRate     int
-	Genre       string
-	Compilation bool
-	CreatedAt   time.Time
-	UpdatedAt   time.Time
+	ID          string    `json:"id"            orm:"pk;column(id)"`
+	Path        string    `json:"path"`
+	Title       string    `json:"title"`
+	Album       string    `json:"album"`
+	Artist      string    `json:"artist"`
+	ArtistID    string    `json:"artistId"`
+	AlbumArtist string    `json:"albumArtist"`
+	AlbumID     string    `json:"albumId"`
+	HasCoverArt bool      `json:"hasCoverArt"`
+	TrackNumber int       `json:"trackNumber"`
+	DiscNumber  int       `json:"discNumber"`
+	Year        int       `json:"year"`
+	Size        int       `json:"size"`
+	Suffix      string    `json:"suffix"`
+	Duration    int       `json:"duration"`
+	BitRate     int       `json:"bitRate"`
+	Genre       string    `json:"genre"`
+	Compilation bool      `json:"compilation"`
+	CreatedAt   time.Time `json:"createdAt"`
+	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:"-"`
 }
 
 func (mf *MediaFile) ContentType() string {
@@ -35,12 +42,13 @@ func (mf *MediaFile) ContentType() string {
 type MediaFiles []MediaFile
 
 type MediaFileRepository interface {
-	CountAll() (int64, error)
+	CountAll(options ...QueryOptions) (int64, error)
 	Exists(id string) (bool, error)
 	Put(m *MediaFile) error
 	Get(id string) (*MediaFile, error)
 	FindByAlbum(albumId string) (MediaFiles, error)
 	FindByPath(path string) (MediaFiles, error)
+	// TODO Remove userId
 	GetStarred(userId string, options ...QueryOptions) (MediaFiles, error)
 	GetRandom(options ...QueryOptions) (MediaFiles, error)
 	Search(q string, offset int, size int) (MediaFiles, error)

model/user.go

@@ -3,18 +3,21 @@ package model
 import "time"
 
 type User struct {
-	ID           string
-	UserName     string
-	Name         string
-	Email        string
-	Password     string
-	IsAdmin      bool
-	LastLoginAt  *time.Time
-	LastAccessAt *time.Time
-	CreatedAt    time.Time
-	UpdatedAt    time.Time
+	ID           string     `json:"id" orm:"column(id)"`
+	UserName     string     `json:"userName"`
+	Name         string     `json:"name"`
+	Email        string     `json:"email"`
+	Password     string     `json:"password"`
+	IsAdmin      bool       `json:"isAdmin"`
+	LastLoginAt  *time.Time `json:"lastLoginAt"`
+	LastAccessAt *time.Time `json:"lastAccessAt"`
+	CreatedAt    time.Time  `json:"createdAt"`
+	UpdatedAt    time.Time  `json:"updatedAt"`
+	// TODO ChangePassword string     `json:"password"`
 }
 
+type Users []User
+
 type UserRepository interface {
 	CountAll(...QueryOptions) (int64, error)
 	Get(id string) (*User, error)