Move package models/pulls to models/pull

Author: delvh

models/migrations/v214.go

@@ -5,7 +5,7 @@
 package migrations
 
 import (
-	"code.gitea.io/gitea/models/pulls"
+	"code.gitea.io/gitea/models/pull"
 	"code.gitea.io/gitea/modules/timeutil"
 
 	"xorm.io/xorm"
@@ -17,7 +17,7 @@ func addReviewViewedFiles(x *xorm.Engine) error {
 		UserID       int64                        `xorm:"NOT NULL UNIQUE(pull_commit_user)"`
 		PullID       int64                        `xorm:"NOT NULL UNIQUE(pull_commit_user) DEFAULT 0"`
 		CommitSHA    string                       `xorm:"NOT NULL VARCHAR(40) UNIQUE(pull_commit_user)"`
-		UpdatedFiles map[string]pulls.ViewedState `xorm:"NOT NULL TEXT JSON"`
+		UpdatedFiles map[string]pull.ViewedState `xorm:"NOT NULL TEXT JSON"`
 		UpdatedUnix  timeutil.TimeStamp           `xorm:"updated"`
 	}
 

models/pulls/review_state.go renamed to models/pull/review_state.go

@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
-package pulls
+package pull
 
 import (
 	"context"

routers/web/repo/pull_review.go

@@ -9,7 +9,7 @@ import (
 	"net/http"
 
 	"code.gitea.io/gitea/models"
-	"code.gitea.io/gitea/models/pulls"
+	pull_model "code.gitea.io/gitea/models/pull"
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/json"
@@ -273,18 +273,18 @@ func UpdateViewedFiles(ctx *context.Context) {
 		data.HeadCommitSHA = pull.HeadCommitID
 	}
 
-	updatedFiles := make(map[string]pulls.ViewedState, len(data.Files))
+	updatedFiles := make(map[string]pull_model.ViewedState, len(data.Files))
 	for file, viewed := range data.Files {
 
 		// Only unviewed and viewed are possible, has-changed can not be set from the outside
-		state := pulls.Unviewed
+		state := pull_model.Unviewed
 		if viewed {
-			state = pulls.Viewed
+			state = pull_model.Viewed
 		}
 		updatedFiles[file] = state
 	}
 
-	if err := pulls.UpdateReviewState(ctx, ctx.Doer.ID, pull.ID, data.HeadCommitSHA, updatedFiles); err != nil {
+	if err := pull_model.UpdateReviewState(ctx, ctx.Doer.ID, pull.ID, data.HeadCommitSHA, updatedFiles); err != nil {
 		ctx.ServerError("UpdateReview", err)
 	}
 }

services/gitdiff/gitdiff.go

@@ -22,7 +22,7 @@ import (
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/models/db"
-	"code.gitea.io/gitea/models/pulls"
+	pull_model "code.gitea.io/gitea/models/pull"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/analyze"
 	"code.gitea.io/gitea/modules/charset"
@@ -1521,7 +1521,7 @@ func SyncAndGetUserSpecificDiff(ctx context.Context, userID int64, pull *models.
 	if err != nil {
 		return nil, err
 	}
-	review, err := pulls.GetNewestReviewState(ctx, userID, pull.ID)
+	review, err := pull_model.GetNewestReviewState(ctx, userID, pull.ID)
 	if err != nil || review == nil || review.UpdatedFiles == nil {
 		return diff, err
 	}
@@ -1536,13 +1536,13 @@ func SyncAndGetUserSpecificDiff(ctx context.Context, userID int64, pull *models.
 		return diff, err
 	}
 
-	filesChangedSinceLastDiff := make(map[string]pulls.ViewedState)
+	filesChangedSinceLastDiff := make(map[string]pull_model.ViewedState)
 outer:
 	for _, diffFile := range diff.Files {
 		fileViewedState := review.UpdatedFiles[diffFile.GetDiffFileName()]
 
 		// Check whether it was previously detected that the file has changed since the last review
-		if fileViewedState == pulls.HasChanged {
+		if fileViewedState == pull_model.HasChanged {
 			diffFile.HasChangedSinceLastReview = true
 			continue
 		}
@@ -1553,12 +1553,12 @@ outer:
 		for _, changedFile := range changedFiles {
 			diffFile.HasChangedSinceLastReview = filename == changedFile
 			if diffFile.HasChangedSinceLastReview {
-				filesChangedSinceLastDiff[filename] = pulls.HasChanged
+				filesChangedSinceLastDiff[filename] = pull_model.HasChanged
 				continue outer // We don't want to check if the file is viewed here as that would fold the file, which is in this case unwanted
 			}
 		}
 		// Check whether the file has already been viewed
-		if fileViewedState == pulls.Viewed {
+		if fileViewedState == pull_model.Viewed {
 			diffFile.IsViewed = true
 			diff.NumViewedFiles++
 		}
@@ -1568,7 +1568,7 @@ outer:
 	// This has the benefit that the "Has Changed" attribute will be present as long as the user does not explicitly mark this file as viewed, so it will even survive a page reload after marking another file as viewed.
 	// On the other hand, this means that even if a commit reverting an unseen change is committed, the file will still be seen as changed.
 	if len(filesChangedSinceLastDiff) > 0 {
-		err := pulls.UpdateReviewState(ctx, review.UserID, review.PullID, review.CommitSHA, filesChangedSinceLastDiff)
+		err := pull_model.UpdateReviewState(ctx, review.UserID, review.PullID, review.CommitSHA, filesChangedSinceLastDiff)
 		if err != nil {
 			log.Warn("Could not update review for user %d, pull %d, commit %s and the changed files %v: %v", review.UserID, review.PullID, review.CommitSHA, filesChangedSinceLastDiff, err)
 			return nil, err