Gallery URLs (#4114)

* Initial backend changes
* Fix unit tests
* UI changes
* Fix missing URL filters

pkg/models/gallery.go

@@ -59,7 +59,7 @@ type GalleryUpdateInput struct {
 	ClientMutationID *string  `json:"clientMutationId"`
 	ID               string   `json:"id"`
 	Title            *string  `json:"title"`
-	URL              *string  `json:"url"`
+	Urls             []string `json:"urls"`
 	Date             *string  `json:"date"`
 	Details          *string  `json:"details"`
 	Rating           *int     `json:"rating"`
@@ -70,6 +70,9 @@ type GalleryUpdateInput struct {
 	TagIds           []string `json:"tag_ids"`
 	PerformerIds     []string `json:"performer_ids"`
 	PrimaryFileID    *string  `json:"primary_file_id"`
+
+	// deprecated
+	URL *string `json:"url"`
 }
 
 type GalleryDestroyInput struct {

pkg/models/jsonschema/gallery.go

@@ -21,7 +21,7 @@ type Gallery struct {
 	ZipFiles   []string         `json:"zip_files,omitempty"`
 	FolderPath string           `json:"folder_path,omitempty"`
 	Title      string           `json:"title,omitempty"`
-	URL        string           `json:"url,omitempty"`
+	URLs       []string         `json:"urls,omitempty"`
 	Date       string           `json:"date,omitempty"`
 	Details    string           `json:"details,omitempty"`
 	Rating     int              `json:"rating,omitempty"`
@@ -32,6 +32,9 @@ type Gallery struct {
 	Tags       []string         `json:"tags,omitempty"`
 	CreatedAt  json.JSONTime    `json:"created_at,omitempty"`
 	UpdatedAt  json.JSONTime    `json:"updated_at,omitempty"`
+
+	// deprecated - for import only
+	URL string `json:"url,omitempty"`
 }
 
 func (s Gallery) Filename(basename string, hash string) string {

pkg/models/mocks/GalleryReaderWriter.go

@@ -533,6 +533,29 @@ func (_m *GalleryReaderWriter) GetTagIDs(ctx context.Context, relatedID int) ([]
 	return r0, r1
 }
 
+// GetURLs provides a mock function with given fields: ctx, relatedID
+func (_m *GalleryReaderWriter) GetURLs(ctx context.Context, relatedID int) ([]string, error) {
+	ret := _m.Called(ctx, relatedID)
+
+	var r0 []string
+	if rf, ok := ret.Get(0).(func(context.Context, int) []string); ok {
+		r0 = rf(ctx, relatedID)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]string)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, int) error); ok {
+		r1 = rf(ctx, relatedID)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // Query provides a mock function with given fields: ctx, galleryFilter, findFilter
 func (_m *GalleryReaderWriter) Query(ctx context.Context, galleryFilter *models.GalleryFilterType, findFilter *models.FindFilterType) ([]*models.Gallery, int, error) {
 	ret := _m.Called(ctx, galleryFilter, findFilter)

pkg/models/model_gallery.go

@@ -11,7 +11,6 @@ type Gallery struct {
 	ID int `json:"id"`
 
 	Title   string `json:"title"`
-	URL     string `json:"url"`
 	Date    *Date  `json:"date"`
 	Details string `json:"details"`
 	// Rating expressed in 1-100 scale
@@ -31,9 +30,10 @@ type Gallery struct {
 	CreatedAt time.Time `json:"created_at"`
 	UpdatedAt time.Time `json:"updated_at"`
 
-	SceneIDs     RelatedIDs `json:"scene_ids"`
-	TagIDs       RelatedIDs `json:"tag_ids"`
-	PerformerIDs RelatedIDs `json:"performer_ids"`
+	URLs         RelatedStrings `json:"urls"`
+	SceneIDs     RelatedIDs     `json:"scene_ids"`
+	TagIDs       RelatedIDs     `json:"tag_ids"`
+	PerformerIDs RelatedIDs     `json:"performer_ids"`
 }
 
 func NewGallery() Gallery {
@@ -51,7 +51,7 @@ type GalleryPartial struct {
 	// Checksum    OptionalString
 	// Zip         OptionalBool
 	Title   OptionalString
-	URL     OptionalString
+	URLs    *UpdateStrings
 	Date    OptionalDate
 	Details OptionalString
 	// Rating expressed in 1-100 scale
@@ -81,6 +81,12 @@ func (g *Gallery) IsUserCreated() bool {
 	return g.PrimaryFileID == nil && g.FolderID == nil
 }
 
+func (g *Gallery) LoadURLs(ctx context.Context, l URLLoader) error {
+	return g.URLs.load(func() ([]string, error) {
+		return l.GetURLs(ctx, g.ID)
+	})
+}
+
 func (g *Gallery) LoadFiles(ctx context.Context, l FileLoader) error {
 	return g.Files.load(func() ([]File, error) {
 		return l.GetFiles(ctx, g.ID)

pkg/models/repository_gallery.go

@@ -63,6 +63,7 @@ type GalleryReader interface {
 	GalleryQueryer
 	GalleryCounter
 
+	URLLoader
 	FileIDLoader
 	ImageIDLoader
 	SceneIDLoader