Remove remaining orm struct tags

navidrome · Dec 8, 2023 · a8c1d21 · a8c1d21
1 parent 19a1285
commit a8c1d21
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 46 deletions.
diff --git a/model/album.go b/model/album.go
@@ -10,14 +10,14 @@ import (
 type Album struct {
 	Annotations `structs:"-"`
 
-	ID                    string    `structs:"id" json:"id"            orm:"column(id)"`
+	ID                    string    `structs:"id" json:"id"`
 	Name                  string    `structs:"name" json:"name"`
 	EmbedArtPath          string    `structs:"embed_art_path" json:"embedArtPath"`
-	ArtistID              string    `structs:"artist_id" json:"artistId"      orm:"column(artist_id)"`
+	ArtistID              string    `structs:"artist_id" json:"artistId"`
 	Artist                string    `structs:"artist" json:"artist"`
-	AlbumArtistID         string    `structs:"album_artist_id" json:"albumArtistId" orm:"column(album_artist_id)"`
+	AlbumArtistID         string    `structs:"album_artist_id" json:"albumArtistId"`
 	AlbumArtist           string    `structs:"album_artist" json:"albumArtist"`
-	AllArtistIDs          string    `structs:"all_artist_ids" json:"allArtistIds"  orm:"column(all_artist_ids)"`
+	AllArtistIDs          string    `structs:"all_artist_ids" json:"allArtistIds"`
 	MaxYear               int       `structs:"max_year" json:"maxYear"`
 	MinYear               int       `structs:"min_year" json:"minYear"`
 	Date                  string    `structs:"date" json:"date,omitempty"`
@@ -40,8 +40,8 @@ type Album struct {
 	OrderAlbumName        string    `structs:"order_album_name" json:"orderAlbumName"`
 	OrderAlbumArtistName  string    `structs:"order_album_artist_name" json:"orderAlbumArtistName"`
 	CatalogNum            string    `structs:"catalog_num" json:"catalogNum,omitempty"`
-	MbzAlbumID            string    `structs:"mbz_album_id" json:"mbzAlbumId,omitempty"         orm:"column(mbz_album_id)"`
-	MbzAlbumArtistID      string    `structs:"mbz_album_artist_id" json:"mbzAlbumArtistId,omitempty"   orm:"column(mbz_album_artist_id)"`
+	MbzAlbumID            string    `structs:"mbz_album_id" json:"mbzAlbumId,omitempty"`
+	MbzAlbumArtistID      string    `structs:"mbz_album_artist_id" json:"mbzAlbumArtistId,omitempty"`
 	MbzAlbumType          string    `structs:"mbz_album_type" json:"mbzAlbumType,omitempty"`
 	MbzAlbumComment       string    `structs:"mbz_album_comment" json:"mbzAlbumComment,omitempty"`
 	ImageFiles            string    `structs:"image_files" json:"imageFiles,omitempty"`
@@ -50,7 +50,7 @@ type Album struct {
 	SmallImageUrl         string    `structs:"small_image_url" json:"smallImageUrl,omitempty"`
 	MediumImageUrl        string    `structs:"medium_image_url" json:"mediumImageUrl,omitempty"`
 	LargeImageUrl         string    `structs:"large_image_url" json:"largeImageUrl,omitempty"`
-	ExternalUrl           string    `structs:"external_url" json:"externalUrl,omitempty"      orm:"column(external_url)"`
+	ExternalUrl           string    `structs:"external_url" json:"externalUrl,omitempty"`
 	ExternalInfoUpdatedAt time.Time `structs:"external_info_updated_at" json:"externalInfoUpdatedAt"`
 	CreatedAt             time.Time `structs:"created_at" json:"createdAt"`
 	UpdatedAt             time.Time `structs:"updated_at" json:"updatedAt"`

diff --git a/model/artist.go b/model/artist.go
@@ -5,7 +5,7 @@ import "time"
 type Artist struct {
 	Annotations `structs:"-"`
 
-	ID                    string    `structs:"id" json:"id"               orm:"column(id)"`
+	ID                    string    `structs:"id" json:"id"`
 	Name                  string    `structs:"name" json:"name"`
 	AlbumCount            int       `structs:"album_count" json:"albumCount"`
 	SongCount             int       `structs:"song_count" json:"songCount"`
@@ -14,13 +14,13 @@ type Artist struct {
 	SortArtistName        string    `structs:"sort_artist_name" json:"sortArtistName,omitempty"`
 	OrderArtistName       string    `structs:"order_artist_name" json:"orderArtistName"`
 	Size                  int64     `structs:"size" json:"size"`
-	MbzArtistID           string    `structs:"mbz_artist_id" json:"mbzArtistId,omitempty"      orm:"column(mbz_artist_id)"`
+	MbzArtistID           string    `structs:"mbz_artist_id" json:"mbzArtistId,omitempty"`
 	Biography             string    `structs:"biography" json:"biography,omitempty"`
 	SmallImageUrl         string    `structs:"small_image_url" json:"smallImageUrl,omitempty"`
 	MediumImageUrl        string    `structs:"medium_image_url" json:"mediumImageUrl,omitempty"`
 	LargeImageUrl         string    `structs:"large_image_url" json:"largeImageUrl,omitempty"`
-	ExternalUrl           string    `structs:"external_url" json:"externalUrl,omitempty"      orm:"column(external_url)"`
-	SimilarArtists        Artists   `structs:"similar_artists"  json:"-"   orm:"-"`
+	ExternalUrl           string    `structs:"external_url" json:"externalUrl,omitempty"`
+	SimilarArtists        Artists   `structs:"similar_artists"  json:"-"`
 	ExternalInfoUpdatedAt time.Time `structs:"external_info_updated_at" json:"externalInfoUpdatedAt"`
 }
 

diff --git a/model/genre.go b/model/genre.go
@@ -1,7 +1,7 @@
 package model
 
 type Genre struct {
-	ID         string `structs:"id" json:"id"               orm:"column(id)"`
+	ID         string `structs:"id" json:"id"`
 	Name       string `structs:"name" json:"name"`
 	SongCount  int    `structs:"-" json:"-"`
 	AlbumCount int    `structs:"-" json:"-"`

diff --git a/model/mediafile.go b/model/mediafile.go
@@ -19,15 +19,15 @@ type MediaFile struct {
 	Annotations  `structs:"-"`
 	Bookmarkable `structs:"-"`
 
-	ID                   string  `structs:"id" json:"id"            orm:"pk;column(id)"`
+	ID                   string  `structs:"id" json:"id"`
 	Path                 string  `structs:"path" json:"path"`
 	Title                string  `structs:"title" json:"title"`
 	Album                string  `structs:"album" json:"album"`
-	ArtistID             string  `structs:"artist_id" json:"artistId"      orm:"pk;column(artist_id)"`
+	ArtistID             string  `structs:"artist_id" json:"artistId"`
 	Artist               string  `structs:"artist" json:"artist"`
-	AlbumArtistID        string  `structs:"album_artist_id" json:"albumArtistId" orm:"pk;column(album_artist_id)"`
+	AlbumArtistID        string  `structs:"album_artist_id" json:"albumArtistId"`
 	AlbumArtist          string  `structs:"album_artist" json:"albumArtist"`
-	AlbumID              string  `structs:"album_id" json:"albumId"       orm:"pk;column(album_id)"`
+	AlbumID              string  `structs:"album_id" json:"albumId"`
 	HasCoverArt          bool    `structs:"has_cover_art" json:"hasCoverArt"`
 	TrackNumber          int     `structs:"track_number" json:"trackNumber"`
 	DiscNumber           int     `structs:"disc_number" json:"discNumber"`
@@ -59,17 +59,17 @@ type MediaFile struct {
 	Lyrics               string  `structs:"lyrics" json:"lyrics,omitempty"`
 	Bpm                  int     `structs:"bpm" json:"bpm,omitempty"`
 	CatalogNum           string  `structs:"catalog_num" json:"catalogNum,omitempty"`
-	MbzRecordingID       string  `structs:"mbz_recording_id" json:"mbzRecordingID,omitempty"         orm:"column(mbz_recording_id)"`
-	MbzReleaseTrackID    string  `structs:"mbz_release_track_id" json:"mbzReleaseTrackId,omitempty" orm:"column(mbz_release_track_id)"`
-	MbzAlbumID           string  `structs:"mbz_album_id" json:"mbzAlbumId,omitempty"         orm:"column(mbz_album_id)"`
-	MbzArtistID          string  `structs:"mbz_artist_id" json:"mbzArtistId,omitempty"        orm:"column(mbz_artist_id)"`
-	MbzAlbumArtistID     string  `structs:"mbz_album_artist_id" json:"mbzAlbumArtistId,omitempty"   orm:"column(mbz_album_artist_id)"`
+	MbzRecordingID       string  `structs:"mbz_recording_id" json:"mbzRecordingID,omitempty"`
+	MbzReleaseTrackID    string  `structs:"mbz_release_track_id" json:"mbzReleaseTrackId,omitempty"`
+	MbzAlbumID           string  `structs:"mbz_album_id" json:"mbzAlbumId,omitempty"`
+	MbzArtistID          string  `structs:"mbz_artist_id" json:"mbzArtistId,omitempty"`
+	MbzAlbumArtistID     string  `structs:"mbz_album_artist_id" json:"mbzAlbumArtistId,omitempty"`
 	MbzAlbumType         string  `structs:"mbz_album_type" json:"mbzAlbumType,omitempty"`
 	MbzAlbumComment      string  `structs:"mbz_album_comment" json:"mbzAlbumComment,omitempty"`
-	RGAlbumGain          float64 `structs:"rg_album_gain" json:"rgAlbumGain" orm:"column(rg_album_gain)"`
-	RGAlbumPeak          float64 `structs:"rg_album_peak" json:"rgAlbumPeak" orm:"column(rg_album_peak)"`
-	RGTrackGain          float64 `structs:"rg_track_gain" json:"rgTrackGain" orm:"column(rg_track_gain)"`
-	RGTrackPeak          float64 `structs:"rg_track_peak" json:"rgTrackPeak" orm:"column(rg_track_peak)"`
+	RGAlbumGain          float64 `structs:"rg_album_gain" json:"rgAlbumGain"`
+	RGAlbumPeak          float64 `structs:"rg_album_peak" json:"rgAlbumPeak"`
+	RGTrackGain          float64 `structs:"rg_track_gain" json:"rgTrackGain"`
+	RGTrackPeak          float64 `structs:"rg_track_peak" json:"rgTrackPeak"`
 
 	CreatedAt time.Time `structs:"created_at" json:"createdAt"` // Time this entry was created in the DB
 	UpdatedAt time.Time `structs:"updated_at" json:"updatedAt"` // Time of file last update (mtime)

diff --git a/model/player.go b/model/player.go
@@ -5,7 +5,7 @@ import (
 )
 
 type Player struct {
-	ID              string    `structs:"id" json:"id"            orm:"column(id)"`
+	ID              string    `structs:"id" json:"id"`
 	Name            string    `structs:"name" json:"name"`
 	UserAgent       string    `structs:"user_agent" json:"userAgent"`
 	UserName        string    `structs:"user_name" json:"userName"`

diff --git a/model/playlist.go b/model/playlist.go
@@ -11,14 +11,14 @@ import (
 )
 
 type Playlist struct {
-	ID        string         `structs:"id" json:"id"          orm:"column(id)"`
+	ID        string         `structs:"id" json:"id"`
 	Name      string         `structs:"name" json:"name"`
 	Comment   string         `structs:"comment" json:"comment"`
 	Duration  float32        `structs:"duration" json:"duration"`
 	Size      int64          `structs:"size" json:"size"`
 	SongCount int            `structs:"song_count" json:"songCount"`
 	OwnerName string         `structs:"-" json:"ownerName"`
-	OwnerID   string         `structs:"owner_id" json:"ownerId"  orm:"column(owner_id)"`
+	OwnerID   string         `structs:"owner_id" json:"ownerId"`
 	Public    bool           `structs:"public" json:"public"`
 	Tracks    PlaylistTracks `structs:"-" json:"tracks,omitempty"`
 	Path      string         `structs:"path" json:"path"`
@@ -114,9 +114,9 @@ type PlaylistRepository interface {
 }
 
 type PlaylistTrack struct {
-	ID          string `json:"id"          orm:"column(id)"`
-	MediaFileID string `json:"mediaFileId" orm:"column(media_file_id)"`
-	PlaylistID  string `json:"playlistId" orm:"column(playlist_id)"`
+	ID          string `json:"id"`
+	MediaFileID string `json:"mediaFileId"`
+	PlaylistID  string `json:"playlistId"`
 	MediaFile
 }
 

diff --git a/model/playqueue.go b/model/playqueue.go
@@ -5,8 +5,8 @@ import (
 )
 
 type PlayQueue struct {
-	ID        string     `structs:"id" json:"id"          orm:"column(id)"`
-	UserID    string     `structs:"user_id" json:"userId"      orm:"column(user_id)"`
+	ID        string     `structs:"id" json:"id"`
+	UserID    string     `structs:"user_id" json:"userId"`
 	Current   string     `structs:"current" json:"current"`
 	Position  int64      `structs:"position" json:"position"`
 	ChangedBy string     `structs:"changed_by" json:"changedBy"`

diff --git a/model/radio.go b/model/radio.go
@@ -3,10 +3,10 @@ package model
 import "time"
 
 type Radio struct {
-	ID          string    `structs:"id"            json:"id" orm:"pk;column(id)"`
+	ID          string    `structs:"id"            json:"id"`
 	StreamUrl   string    `structs:"stream_url"    json:"streamUrl"`
 	Name        string    `structs:"name"          json:"name"`
-	HomePageUrl string    `structs:"home_page_url" json:"homePageUrl" orm:"column(home_page_url)"`
+	HomePageUrl string    `structs:"home_page_url" json:"homePageUrl"`
 	CreatedAt   time.Time `structs:"created_at"    json:"createdAt"`
 	UpdatedAt   time.Time `structs:"updated_at"    json:"updatedAt"`
 }

diff --git a/model/scrobble_buffer.go b/model/scrobble_buffer.go
@@ -5,7 +5,7 @@ import "time"
 type ScrobbleEntry struct {
 	MediaFile
 	Service     string
-	UserID      string `structs:"user_id" orm:"column(user_id)"`
+	UserID      string `structs:"user_id"`
 	PlayTime    time.Time
 	EnqueueTime time.Time
 }

diff --git a/model/share.go b/model/share.go
@@ -8,25 +8,25 @@ import (
 )
 
 type Share struct {
-	ID            string     `structs:"id" json:"id,omitempty"           orm:"column(id)"`
-	UserID        string     `structs:"user_id" json:"userId,omitempty"  orm:"column(user_id)"`
-	Username      string     `structs:"-" json:"username,omitempty"      orm:"-"`
+	ID            string     `structs:"id" json:"id,omitempty"`
+	UserID        string     `structs:"user_id" json:"userId,omitempty"`
+	Username      string     `structs:"-" json:"username,omitempty"`
 	Description   string     `structs:"description" json:"description,omitempty"`
 	Downloadable  bool       `structs:"downloadable" json:"downloadable"`
 	ExpiresAt     time.Time  `structs:"expires_at" json:"expiresAt,omitempty"`
 	LastVisitedAt time.Time  `structs:"last_visited_at" json:"lastVisitedAt,omitempty"`
-	ResourceIDs   string     `structs:"resource_ids" json:"resourceIds,omitempty"   orm:"column(resource_ids)"`
+	ResourceIDs   string     `structs:"resource_ids" json:"resourceIds,omitempty"`
 	ResourceType  string     `structs:"resource_type" json:"resourceType,omitempty"`
 	Contents      string     `structs:"contents" json:"contents,omitempty"`
 	Format        string     `structs:"format" json:"format,omitempty"`
 	MaxBitRate    int        `structs:"max_bit_rate" json:"maxBitRate,omitempty"`
 	VisitCount    int        `structs:"visit_count" json:"visitCount,omitempty"`
 	CreatedAt     time.Time  `structs:"created_at" json:"createdAt,omitempty"`
 	UpdatedAt     time.Time  `structs:"updated_at" json:"updatedAt,omitempty"`
-	Tracks        MediaFiles `structs:"-" json:"tracks,omitempty"      orm:"-"`
-	Albums        Albums     `structs:"-" json:"albums,omitempty"      orm:"-"`
-	URL           string     `structs:"-" json:"-"      orm:"-"`
-	ImageURL      string     `structs:"-" json:"-"      orm:"-"`
+	Tracks        MediaFiles `structs:"-" json:"tracks,omitempty"`
+	Albums        Albums     `structs:"-" json:"albums,omitempty"`
+	URL           string     `structs:"-" json:"-"`
+	ImageURL      string     `structs:"-" json:"-"`
 }
 
 func (s Share) CoverArtID() ArtworkID {

diff --git a/model/transcoding.go b/model/transcoding.go
@@ -1,7 +1,7 @@
 package model
 
 type Transcoding struct {
-	ID             string `structs:"id" json:"id"            orm:"column(id)"`
+	ID             string `structs:"id" json:"id"`
 	Name           string `structs:"name" json:"name"`
 	TargetFormat   string `structs:"target_format" json:"targetFormat"`
 	Command        string `structs:"command" json:"command"`

diff --git a/model/user.go b/model/user.go
@@ -3,7 +3,7 @@ package model
 import "time"
 
 type User struct {
-	ID           string    `structs:"id" json:"id" orm:"column(id)"`
+	ID           string    `structs:"id" json:"id"`
 	UserName     string    `structs:"user_name" json:"userName"`
 	Name         string    `structs:"name" json:"name"`
 	Email        string    `structs:"email" json:"email"`