Fix loading edits and comments from deleted users (stashapp#674)

feederbox826 · Nov 15, 2023 · ee37ad8 · ee37ad8
1 parent 3ded044
commit ee37ad8
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 33 deletions.
diff --git a/pkg/api/resolver_model_edit.go b/pkg/api/resolver_model_edit.go
@@ -20,7 +20,12 @@ func (r *editResolver) ID(ctx context.Context, obj *models.Edit) (string, error)
 func (r *editResolver) User(ctx context.Context, obj *models.Edit) (*models.User, error) {
 	fac := r.getRepoFactory(ctx)
 	qb := fac.User()
-	user, err := qb.Find(obj.UserID)
+
+	if obj.UserID.UUID.IsNil() {
+		return nil, nil
+	}
+
+	user, err := qb.Find(obj.UserID.UUID)
 
 	if err != nil {
 		return nil, err

diff --git a/pkg/api/resolver_model_edit_comment.go b/pkg/api/resolver_model_edit_comment.go
@@ -24,7 +24,12 @@ func (r *editCommentResolver) Date(ctx context.Context, obj *models.EditComment)
 func (r *editCommentResolver) User(ctx context.Context, obj *models.EditComment) (*models.User, error) {
 	fac := r.getRepoFactory(ctx)
 	qb := fac.User()
-	user, err := qb.Find(obj.UserID)
+
+	if obj.UserID.UUID.IsNil() {
+		return nil, nil
+	}
+
+	user, err := qb.Find(obj.UserID.UUID)
 
 	if err != nil {
 		return nil, err

diff --git a/pkg/api/resolver_model_edit_vote.go b/pkg/api/resolver_model_edit_vote.go
@@ -30,7 +30,12 @@ func (r *editVoteResolver) User(ctx context.Context, obj *models.EditVote) (*mod
 
 	fac := r.getRepoFactory(ctx)
 	qb := fac.User()
-	user, err := qb.Find(obj.UserID)
+
+	if obj.UserID.UUID.IsNil() {
+		return nil, nil
+	}
+
+	user, err := qb.Find(obj.UserID.UUID)
 
 	if err != nil {
 		return nil, err

diff --git a/pkg/api/resolver_mutation_edit.go b/pkg/api/resolver_mutation_edit.go
@@ -74,7 +74,7 @@ func (r *mutationResolver) SceneEditUpdate(ctx context.Context, id uuid.UUID, in
 		return nil, err
 	}
 
-	if existingEdit.UserID != currentUser.ID {
+	if existingEdit.UserID.UUID != currentUser.ID {
 		return nil, ErrUnauthorizedUpdate
 	}
 
@@ -151,7 +151,7 @@ func (r *mutationResolver) StudioEditUpdate(ctx context.Context, id uuid.UUID, i
 		return nil, err
 	}
 
-	if existingEdit.UserID != currentUser.ID {
+	if existingEdit.UserID.UUID != currentUser.ID {
 		return nil, ErrUnauthorizedUpdate
 	}
 
@@ -228,7 +228,7 @@ func (r *mutationResolver) TagEditUpdate(ctx context.Context, id uuid.UUID, inpu
 		return nil, err
 	}
 
-	if existingEdit.UserID != currentUser.ID {
+	if existingEdit.UserID.UUID != currentUser.ID {
 		return nil, ErrUnauthorizedUpdate
 	}
 
@@ -311,7 +311,7 @@ func (r *mutationResolver) PerformerEditUpdate(ctx context.Context, id uuid.UUID
 		return nil, err
 	}
 
-	if existingEdit.UserID != currentUser.ID {
+	if existingEdit.UserID.UUID != currentUser.ID {
 		return nil, ErrUnauthorizedUpdate
 	}
 
@@ -354,7 +354,7 @@ func (r *mutationResolver) EditVote(ctx context.Context, input models.EditVoteIn
 			return ErrClosedEdit
 		}
 
-		if err := user.ValidateOwner(ctx, voteEdit.UserID); err == nil {
+		if err := user.ValidateOwner(ctx, voteEdit.UserID.UUID); err == nil {
 			return user.ErrUnauthorized
 		}
 
@@ -421,7 +421,7 @@ func (r *mutationResolver) CancelEdit(ctx context.Context, input models.CancelEd
 		return nil, err
 	}
 
-	if err = validateUser(ctx, e.UserID); err == nil {
+	if err = validateUser(ctx, e.UserID.UUID); err == nil {
 		return edit.CloseEdit(fac, input.ID, models.VoteStatusEnumCanceled)
 	} else if err = validateAdmin(ctx); err == nil {
 		currentUser := getCurrentUser(ctx)

diff --git a/pkg/api/resolver_mutation_user.go b/pkg/api/resolver_mutation_user.go
@@ -97,13 +97,13 @@ func (r *mutationResolver) UserDestroy(ctx context.Context, input models.UserDes
 			return err
 		}
 
-		ret, err = user.Destroy(fac, input)
-
-		if err != nil {
+		if err := fac.Edit().CancelUserEdits(input.ID); err != nil {
 			return err
 		}
 
-		return nil
+		ret, err = user.Destroy(fac, input)
+
+		return err
 	})
 
 	if err != nil {

diff --git a/pkg/manager/edit/edit.go b/pkg/manager/edit/edit.go
@@ -168,8 +168,8 @@ func ApplyEdit(fac models.Repo, editID uuid.UUID, immediate bool) (*models.Edit,
 
 		if success {
 			userPromotionThreshold := config.GetVotePromotionThreshold()
-			if userPromotionThreshold != nil {
-				return user.PromoteUserVoteRights(fac, updatedEdit.UserID, *userPromotionThreshold)
+			if userPromotionThreshold != nil && updatedEdit.UserID.Valid {
+				return user.PromoteUserVoteRights(fac, updatedEdit.UserID.UUID, *userPromotionThreshold)
 			}
 		}
 

diff --git a/pkg/manager/edit/scene.go b/pkg/manager/edit/scene.go
@@ -377,7 +377,11 @@ func (m *SceneEditProcessor) applyEdit(scene *models.Scene) (*models.Scene, erro
 
 	switch operation {
 	case models.OperationEnumCreate:
-		return m.applyCreate(data, &m.edit.UserID)
+		var userID *uuid.UUID
+		if m.edit.UserID.Valid {
+			userID = &m.edit.UserID.UUID
+		}
+		return m.applyCreate(data, userID)
 	case models.OperationEnumDestroy:
 		return m.applyDestroy(scene)
 	case models.OperationEnumModify:

diff --git a/pkg/models/edit.go b/pkg/models/edit.go
@@ -28,4 +28,5 @@ type EditRepo interface {
 	FindBySceneID(id uuid.UUID) ([]*Edit, error)
 	FindCompletedEdits(int, int, int) ([]*Edit, error)
 	FindPendingSceneCreation(input QueryExistingSceneInput) ([]*Edit, error)
+	CancelUserEdits(userID uuid.UUID) error
 }
diff --git a/pkg/models/model_edit.go b/pkg/models/model_edit.go
@@ -13,7 +13,7 @@ import (
 
 type Edit struct {
 	ID         uuid.UUID      `db:"id" json:"id"`
-	UserID     uuid.UUID      `db:"user_id" json:"user_id"`
+	UserID     uuid.NullUUID  `db:"user_id" json:"user_id"`
 	TargetType string         `db:"target_type" json:"target_type"`
 	Operation  string         `db:"operation" json:"operation"`
 	VoteCount  int            `db:"votes" json:"votes"`
@@ -27,24 +27,25 @@ type Edit struct {
 }
 
 type EditComment struct {
-	ID        uuid.UUID `db:"id" json:"id"`
-	EditID    uuid.UUID `db:"edit_id" json:"edit_id"`
-	UserID    uuid.UUID `db:"user_id" json:"user_id"`
-	CreatedAt time.Time `db:"created_at" json:"created_at"`
-	Text      string    `db:"text" json:"text"`
+	ID        uuid.UUID     `db:"id" json:"id"`
+	EditID    uuid.UUID     `db:"edit_id" json:"edit_id"`
+	UserID    uuid.NullUUID `db:"user_id" json:"user_id"`
+	CreatedAt time.Time     `db:"created_at" json:"created_at"`
+	Text      string        `db:"text" json:"text"`
 }
 
 type EditVote struct {
-	EditID    uuid.UUID `db:"edit_id" json:"edit_id"`
-	UserID    uuid.UUID `db:"user_id" json:"user_id"`
-	CreatedAt time.Time `db:"created_at" json:"created_at"`
-	Vote      string    `db:"vote" json:"vote"`
+	EditID    uuid.UUID     `db:"edit_id" json:"edit_id"`
+	UserID    uuid.NullUUID `db:"user_id" json:"user_id"`
+	CreatedAt time.Time     `db:"created_at" json:"created_at"`
+	Vote      string        `db:"vote" json:"vote"`
 }
 
-func NewEdit(uuid uuid.UUID, user *User, targetType TargetTypeEnum, input *EditInput) *Edit {
+func NewEdit(id uuid.UUID, user *User, targetType TargetTypeEnum, input *EditInput) *Edit {
+	userID := uuid.NullUUID{UUID: user.ID, Valid: true}
 	ret := &Edit{
-		ID:         uuid,
-		UserID:     user.ID,
+		ID:         id,
+		UserID:     userID,
 		TargetType: targetType.String(),
 		Status:     VoteStatusEnumPending.String(),
 		Operation:  input.Operation.String(),
@@ -60,11 +61,12 @@ func NewEdit(uuid uuid.UUID, user *User, targetType TargetTypeEnum, input *EditI
 	return ret
 }
 
-func NewEditComment(uuid uuid.UUID, user *User, edit *Edit, text string) *EditComment {
+func NewEditComment(id uuid.UUID, user *User, edit *Edit, text string) *EditComment {
+	userID := uuid.NullUUID{UUID: user.ID, Valid: true}
 	ret := &EditComment{
-		ID:        uuid,
+		ID:        id,
 		EditID:    edit.ID,
-		UserID:    user.ID,
+		UserID:    userID,
 		CreatedAt: time.Now(),
 		Text:      text,
 	}
@@ -77,9 +79,10 @@ func (e Edit) GetID() uuid.UUID {
 }
 
 func NewEditVote(user *User, edit *Edit, vote VoteTypeEnum) *EditVote {
+	userID := uuid.NullUUID{UUID: user.ID, Valid: true}
 	ret := &EditVote{
 		EditID:    edit.ID,
-		UserID:    user.ID,
+		UserID:    userID,
 		CreatedAt: time.Now(),
 		Vote:      vote.String(),
 	}

diff --git a/pkg/sqlx/querybuilder_edit.go b/pkg/sqlx/querybuilder_edit.go
@@ -457,3 +457,11 @@ func (qb *editQueryBuilder) FindPendingSceneCreation(input models.QueryExistingS
 
 	return qb.queryEdits(query, args)
 }
+
+func (qb *editQueryBuilder) CancelUserEdits(userID uuid.UUID) error {
+	var args []interface{}
+	args = append(args, userID)
+	query := `UPDATE edits SET status = 'CANCELED', updated_at = NOW() WHERE user_id = ?`
+	err := qb.dbi.RawQuery(editDBTable, query, args, nil)
+	return err
+}