Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix updating of drafted edits #885

Merged
merged 2 commits into from
Jan 3, 2025
Merged

Fix updating of drafted edits #885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff2de74
Fix updating of drafted edits
InfiniteStash Jan 3, 2025
9a605f5
Fix validation
InfiniteStash Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkg/api/resolver_mutation_edit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func (r *mutationResolver) SceneEdit(ctx context.Context, input models.SceneEdit
err = fac.WithTxn(func() error {
p := edit.Scene(fac, newEdit)
inputArgs := utils.Arguments(ctx).Field("input")
if err := p.Edit(input, inputArgs); err != nil {
if err := p.Edit(input, inputArgs, false); err != nil {
return err
}

Expand Down Expand Up @@ -95,7 +95,7 @@ func (r *mutationResolver) SceneEditUpdate(ctx context.Context, id uuid.UUID, in
err = fac.WithTxn(func() error {
p := edit.Scene(fac, existingEdit)
inputArgs := utils.Arguments(ctx).Field("input")
if err := p.Edit(input, inputArgs); err != nil {
if err := p.Edit(input, inputArgs, true); err != nil {
return err
}

Expand Down Expand Up @@ -286,7 +286,7 @@ func (r *mutationResolver) PerformerEdit(ctx context.Context, input models.Perfo
err = fac.WithTxn(func() error {
p := edit.Performer(fac, newEdit)
inputArgs := utils.Arguments(ctx).Field("input")
if err := p.Edit(input, inputArgs); err != nil {
if err := p.Edit(input, inputArgs, false); err != nil {
return err
}

Expand Down Expand Up @@ -332,7 +332,7 @@ func (r *mutationResolver) PerformerEditUpdate(ctx context.Context, id uuid.UUID
err = fac.WithTxn(func() error {
p := edit.Performer(fac, existingEdit)
inputArgs := utils.Arguments(ctx).Field("input")
if err := p.Edit(input, inputArgs); err != nil {
if err := p.Edit(input, inputArgs, true); err != nil {
return err
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/manager/edit/performer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ func Performer(fac models.Repo, edit *models.Edit) *PerformerEditProcessor {
}
}

func (m *PerformerEditProcessor) Edit(input models.PerformerEditInput, inputArgs utils.ArgumentsQuery) error {
if err := validatePerformerEditInput(m.fac, input); err != nil {
func (m *PerformerEditProcessor) Edit(input models.PerformerEditInput, inputArgs utils.ArgumentsQuery, update bool) error {
if err := validatePerformerEditInput(m.fac, input, m.edit, update); err != nil {
return err
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/manager/edit/scene.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ func Scene(fac models.Repo, edit *models.Edit) *SceneEditProcessor {
}
}

func (m *SceneEditProcessor) Edit(input models.SceneEditInput, inputArgs utils.ArgumentsQuery) error {
if err := validateSceneEditInput(m.fac, input); err != nil {
func (m *SceneEditProcessor) Edit(input models.SceneEditInput, inputArgs utils.ArgumentsQuery, update bool) error {
if err := validateSceneEditInput(m.fac, input, m.edit, update); err != nil {
return err
}

Expand Down
62 changes: 48 additions & 14 deletions pkg/manager/edit/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,37 @@ func validateEditPrerequisites(fac models.Repo, edit *models.Edit) error {
return nil
}

func validateSceneEditInput(fac models.Repo, input models.SceneEditInput) error {
func validateSceneEditInput(fac models.Repo, input models.SceneEditInput, edit *models.Edit, update bool) error {
if input.Details == nil {
return nil
}

if input.Details.DraftID != nil {
draft, err := fac.Draft().Find(*input.Details.DraftID)
if err != nil {
return err
}
if draft == nil {
return fmt.Errorf("%w: %s", ErrInvalidDraft, *input.Details.DraftID)
if !update {
draft, err := fac.Draft().Find(*input.Details.DraftID)
if err != nil {
return err
}
if draft == nil {
return fmt.Errorf("%w: %s", ErrInvalidDraft, *input.Details.DraftID)
}
} else {
edit, err := fac.Edit().Find(edit.ID)
if err != nil {
return err
}

data, err := edit.GetSceneData()
if err != nil {
return err
}

if data.New.DraftID == nil || *data.New.DraftID != *input.Details.DraftID {
return fmt.Errorf("%w: %s", ErrInvalidDraft, *input.Details.DraftID)
}
}
}

if input.Details.StudioID != nil {
draft, err := fac.Studio().Find(*input.Details.StudioID)
if err != nil {
Expand Down Expand Up @@ -136,20 +153,37 @@ func validateSceneEditInput(fac models.Repo, input models.SceneEditInput) error
return nil
}

func validatePerformerEditInput(fac models.Repo, input models.PerformerEditInput) error {
func validatePerformerEditInput(fac models.Repo, input models.PerformerEditInput, edit *models.Edit, update bool) error {
if input.Details == nil {
return nil
}

if input.Details.DraftID != nil {
draft, err := fac.Draft().Find(*input.Details.DraftID)
if err != nil {
return err
}
if draft == nil {
return fmt.Errorf("%w: %s", ErrInvalidDraft, *input.Details.DraftID)
if !update {
draft, err := fac.Draft().Find(*input.Details.DraftID)
if err != nil {
return err
}
if draft == nil {
return fmt.Errorf("%w: %s", ErrInvalidDraft, *input.Details.DraftID)
}
} else {
edit, err := fac.Edit().Find(edit.ID)
if err != nil {
return err
}

data, err := edit.GetPerformerData()
if err != nil {
return err
}

if data.New.DraftID == nil || *data.New.DraftID != *input.Details.DraftID {
return fmt.Errorf("%w: %s", ErrInvalidDraft, *input.Details.DraftID)
}
}
}

if len(input.Details.ImageIds) > 0 {
images, errs := fac.Image().FindByIds(input.Details.ImageIds)
for i := range images {
Expand Down
Loading