Add Details, Studio Code, and Photographer to Images (#4217)

* Add Details, Code, and Photographer to Images
* Add date and details to image card
---------
Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>

graphql/documents/data/image-slim.graphql

@@ -1,8 +1,11 @@
 fragment SlimImageData on Image {
   id
   title
+  code
   date
   urls
+  details
+  photographer
   rating100
   organized
   o_counter

graphql/documents/data/image.graphql

@@ -1,9 +1,12 @@
 fragment ImageData on Image {
   id
   title
+  code
   rating100
   date
   urls
+  details
+  photographer
   organized
   o_counter
   created_at

graphql/schema/types/filters.graphql

@@ -443,6 +443,7 @@ input ImageFilterType {
   NOT: ImageFilterType
 
   title: StringCriterionInput
+  details: StringCriterionInput
 
   " Filter by image id"
   id: IntCriterionInput
@@ -486,6 +487,10 @@ input ImageFilterType {
   created_at: TimestampCriterionInput
   "Filter by last update time"
   updated_at: TimestampCriterionInput
+  "Filter by studio code"
+  code: StringCriterionInput
+  "Filter by photographer"
+  photographer: StringCriterionInput
 }
 
 enum CriterionModifier {

graphql/schema/types/image.graphql

@@ -1,11 +1,14 @@
 type Image {
   id: ID!
   title: String
+  code: String
   # rating expressed as 1-100
   rating100: Int
   url: String @deprecated(reason: "Use urls")
   urls: [String!]!
   date: String
+  details: String
+  photographer: String
   o_counter: Int
   organized: Boolean!
   created_at: Time!
@@ -37,12 +40,15 @@ input ImageUpdateInput {
   clientMutationId: String
   id: ID!
   title: String
+  code: String
   # rating expressed as 1-100
   rating100: Int
   organized: Boolean
   url: String @deprecated(reason: "Use urls")
   urls: [String!]
   date: String
+  details: String
+  photographer: String
 
   studio_id: ID
   performer_ids: [ID!]
@@ -56,12 +62,15 @@ input BulkImageUpdateInput {
   clientMutationId: String
   ids: [ID!]
   title: String
+  code: String
   # rating expressed as 1-100
   rating100: Int
   organized: Boolean
   url: String @deprecated(reason: "Use urls")
   urls: BulkUpdateStrings
   date: String
+  details: String
+  photographer: String
 
   studio_id: ID
   performer_ids: BulkUpdateIds

internal/api/resolver_mutation_image.go

@@ -107,6 +107,9 @@ func (r *mutationResolver) imageUpdate(ctx context.Context, input ImageUpdateInp
 	updatedImage := models.NewImagePartial()
 
 	updatedImage.Title = translator.optionalString(input.Title, "title")
+	updatedImage.Code = translator.optionalString(input.Code, "code")
+	updatedImage.Details = translator.optionalString(input.Details, "details")
+	updatedImage.Photographer = translator.optionalString(input.Photographer, "photographer")
 	updatedImage.Rating = translator.optionalInt(input.Rating100, "rating100")
 	updatedImage.Organized = translator.optionalBool(input.Organized, "organized")
 
@@ -203,6 +206,9 @@ func (r *mutationResolver) BulkImageUpdate(ctx context.Context, input BulkImageU
 	updatedImage := models.NewImagePartial()
 
 	updatedImage.Title = translator.optionalString(input.Title, "title")
+	updatedImage.Code = translator.optionalString(input.Code, "code")
+	updatedImage.Details = translator.optionalString(input.Details, "details")
+	updatedImage.Photographer = translator.optionalString(input.Photographer, "photographer")
 	updatedImage.Rating = translator.optionalInt(input.Rating100, "rating100")
 	updatedImage.Organized = translator.optionalBool(input.Organized, "organized")
 

pkg/image/export.go

@@ -13,10 +13,13 @@ import (
 // of cover image.
 func ToBasicJSON(image *models.Image) *jsonschema.Image {
 	newImageJSON := jsonschema.Image{
-		Title:     image.Title,
-		URLs:      image.URLs.List(),
-		CreatedAt: json.JSONTime{Time: image.CreatedAt},
-		UpdatedAt: json.JSONTime{Time: image.UpdatedAt},
+		Title:        image.Title,
+		Code:         image.Code,
+		URLs:         image.URLs.List(),
+		Details:      image.Details,
+		Photographer: image.Photographer,
+		CreatedAt:    json.JSONTime{Time: image.CreatedAt},
+		UpdatedAt:    json.JSONTime{Time: image.UpdatedAt},
 	}
 
 	if image.Rating != nil {

pkg/image/import.go

@@ -76,6 +76,15 @@ func (i *Importer) imageJSONToImage(imageJSON jsonschema.Image) models.Image {
 	if imageJSON.Title != "" {
 		newImage.Title = imageJSON.Title
 	}
+	if imageJSON.Code != "" {
+		newImage.Code = imageJSON.Code
+	}
+	if imageJSON.Details != "" {
+		newImage.Details = imageJSON.Details
+	}
+	if imageJSON.Photographer != "" {
+		newImage.Photographer = imageJSON.Photographer
+	}
 	if imageJSON.Rating != 0 {
 		newImage.Rating = &imageJSON.Rating
 	}

pkg/models/image.go

@@ -3,11 +3,14 @@ package models
 import "context"
 
 type ImageFilterType struct {
-	And   *ImageFilterType      `json:"AND"`
-	Or    *ImageFilterType      `json:"OR"`
-	Not   *ImageFilterType      `json:"NOT"`
-	ID    *IntCriterionInput    `json:"id"`
-	Title *StringCriterionInput `json:"title"`
+	And          *ImageFilterType      `json:"AND"`
+	Or           *ImageFilterType      `json:"OR"`
+	Not          *ImageFilterType      `json:"NOT"`
+	ID           *IntCriterionInput    `json:"id"`
+	Title        *StringCriterionInput `json:"title"`
+	Code         *StringCriterionInput `json:"code"`
+	Details      *StringCriterionInput `json:"details"`
+	Photographer *StringCriterionInput `json:"photographer"`
 	// Filter by file checksum
 	Checksum *StringCriterionInput `json:"checksum"`
 	// Filter by path

pkg/models/jsonschema/image.go

@@ -11,22 +11,25 @@ import (
 
 type Image struct {
 	Title  string `json:"title,omitempty"`
+	Code   string `json:"code,omitempty"`
 	Studio string `json:"studio,omitempty"`
 	Rating int    `json:"rating,omitempty"`
 
 	// deprecated - for import only
 	URL string `json:"url,omitempty"`
 
-	URLs       []string      `json:"urls,omitempty"`
-	Date       string        `json:"date,omitempty"`
-	Organized  bool          `json:"organized,omitempty"`
-	OCounter   int           `json:"o_counter,omitempty"`
-	Galleries  []GalleryRef  `json:"galleries,omitempty"`
-	Performers []string      `json:"performers,omitempty"`
-	Tags       []string      `json:"tags,omitempty"`
-	Files      []string      `json:"files,omitempty"`
-	CreatedAt  json.JSONTime `json:"created_at,omitempty"`
-	UpdatedAt  json.JSONTime `json:"updated_at,omitempty"`
+	URLs         []string      `json:"urls,omitempty"`
+	Date         string        `json:"date,omitempty"`
+	Details      string        `json:"details,omitempty"`
+	Photographer string        `json:"photographer,omitempty"`
+	Organized    bool          `json:"organized,omitempty"`
+	OCounter     int           `json:"o_counter,omitempty"`
+	Galleries    []GalleryRef  `json:"galleries,omitempty"`
+	Performers   []string      `json:"performers,omitempty"`
+	Tags         []string      `json:"tags,omitempty"`
+	Files        []string      `json:"files,omitempty"`
+	CreatedAt    json.JSONTime `json:"created_at,omitempty"`
+	UpdatedAt    json.JSONTime `json:"updated_at,omitempty"`
 }
 
 func (s Image) Filename(basename string, hash string) string {

pkg/models/model_image.go

@@ -11,7 +11,10 @@ import (
 type Image struct {
 	ID int `json:"id"`
 
-	Title string `json:"title"`
+	Title        string `json:"title"`
+	Code         string `json:"code"`
+	Details      string `json:"details"`
+	Photographer string `json:"photographer"`
 	// Rating expressed in 1-100 scale
 	Rating    *int           `json:"rating"`
 	Organized bool           `json:"organized"`
@@ -46,15 +49,18 @@ func NewImage() Image {
 
 type ImagePartial struct {
 	Title OptionalString
+	Code  OptionalString
 	// Rating expressed in 1-100 scale
-	Rating    OptionalInt
-	URLs      *UpdateStrings
-	Date      OptionalDate
-	Organized OptionalBool
-	OCounter  OptionalInt
-	StudioID  OptionalInt
-	CreatedAt OptionalTime
-	UpdatedAt OptionalTime
+	Rating       OptionalInt
+	URLs         *UpdateStrings
+	Date         OptionalDate
+	Details      OptionalString
+	Photographer OptionalString
+	Organized    OptionalBool
+	OCounter     OptionalInt
+	StudioID     OptionalInt
+	CreatedAt    OptionalTime
+	UpdatedAt    OptionalTime
 
 	GalleryIDs    *UpdateIDs
 	TagIDs        *UpdateIDs

pkg/sqlite/database.go

@@ -33,7 +33,7 @@ const (
 	dbConnTimeout = 30
 )
 
-var appSchemaVersion uint = 53
+var appSchemaVersion uint = 54
 
 //go:embed migrations/*.sql
 var migrationsBox embed.FS

pkg/sqlite/image.go

@@ -31,21 +31,27 @@ const (
 type imageRow struct {
 	ID    int         `db:"id" goqu:"skipinsert"`
 	Title zero.String `db:"title"`
+	Code  zero.String `db:"code"`
 	// expressed as 1-100
-	Rating    null.Int  `db:"rating"`
-	Date      NullDate  `db:"date"`
-	Organized bool      `db:"organized"`
-	OCounter  int       `db:"o_counter"`
-	StudioID  null.Int  `db:"studio_id,omitempty"`
-	CreatedAt Timestamp `db:"created_at"`
-	UpdatedAt Timestamp `db:"updated_at"`
+	Rating       null.Int    `db:"rating"`
+	Date         NullDate    `db:"date"`
+	Details      zero.String `db:"details"`
+	Photographer zero.String `db:"photographer"`
+	Organized    bool        `db:"organized"`
+	OCounter     int         `db:"o_counter"`
+	StudioID     null.Int    `db:"studio_id,omitempty"`
+	CreatedAt    Timestamp   `db:"created_at"`
+	UpdatedAt    Timestamp   `db:"updated_at"`
 }
 
 func (r *imageRow) fromImage(i models.Image) {
 	r.ID = i.ID
 	r.Title = zero.StringFrom(i.Title)
+	r.Code = zero.StringFrom(i.Code)
 	r.Rating = intFromPtr(i.Rating)
 	r.Date = NullDateFromDatePtr(i.Date)
+	r.Details = zero.StringFrom(i.Details)
+	r.Photographer = zero.StringFrom(i.Photographer)
 	r.Organized = i.Organized
 	r.OCounter = i.OCounter
 	r.StudioID = intFromPtr(i.StudioID)
@@ -63,13 +69,16 @@ type imageQueryRow struct {
 
 func (r *imageQueryRow) resolve() *models.Image {
 	ret := &models.Image{
-		ID:        r.ID,
-		Title:     r.Title.String,
-		Rating:    nullIntPtr(r.Rating),
-		Date:      r.Date.DatePtr(),
-		Organized: r.Organized,
-		OCounter:  r.OCounter,
-		StudioID:  nullIntPtr(r.StudioID),
+		ID:           r.ID,
+		Title:        r.Title.String,
+		Code:         r.Code.String,
+		Rating:       nullIntPtr(r.Rating),
+		Date:         r.Date.DatePtr(),
+		Details:      r.Details.String,
+		Photographer: r.Photographer.String,
+		Organized:    r.Organized,
+		OCounter:     r.OCounter,
+		StudioID:     nullIntPtr(r.StudioID),
 
 		PrimaryFileID: nullIntFileIDPtr(r.PrimaryFileID),
 		Checksum:      r.PrimaryFileChecksum.String,
@@ -91,8 +100,11 @@ type imageRowRecord struct {
 
 func (r *imageRowRecord) fromPartial(i models.ImagePartial) {
 	r.setNullString("title", i.Title)
+	r.setNullString("code", i.Code)
 	r.setNullInt("rating", i.Rating)
 	r.setNullDate("date", i.Date)
+	r.setNullString("details", i.Details)
+	r.setNullString("photographer", i.Photographer)
 	r.setBool("organized", i.Organized)
 	r.setInt("o_counter", i.OCounter)
 	r.setNullInt("studio_id", i.StudioID)
@@ -672,6 +684,9 @@ func (qb *ImageStore) makeFilter(ctx context.Context, imageFilter *models.ImageF
 		stringCriterionHandler(imageFilter.Checksum, "fingerprints_md5.fingerprint")(ctx, f)
 	}))
 	query.handleCriterion(ctx, stringCriterionHandler(imageFilter.Title, "images.title"))
+	query.handleCriterion(ctx, stringCriterionHandler(imageFilter.Code, "images.code"))
+	query.handleCriterion(ctx, stringCriterionHandler(imageFilter.Details, "images.details"))
+	query.handleCriterion(ctx, stringCriterionHandler(imageFilter.Photographer, "images.photographer"))
 
 	query.handleCriterion(ctx, pathCriterionHandler(imageFilter.Path, "folders.path", "files.basename", qb.addFoldersTable))
 	query.handleCriterion(ctx, imageFileCountCriterionHandler(qb, imageFilter.FileCount))