optimize attachement linking

Author: sapk

models/attachment.go

@@ -153,6 +153,11 @@ func GetAttachmentByUUID(uuid string) (*Attachment, error) {
 	return getAttachmentByUUID(x, uuid)
 }
 
+// GetAttachmentsByUUIDs returns attachment by given UUID list.
+func GetAttachmentsByUUIDs(uuids []string) ([]*Attachment, error) {
+	return getAttachmentsByUUIDs(x, uuids)
+}
+
 // GetAttachmentByReleaseIDFileName returns attachment by given releaseId and fileName.
 func GetAttachmentByReleaseIDFileName(releaseID int64, fileName string) (*Attachment, error) {
 	return getAttachmentByReleaseIDFileName(x, releaseID, fileName)

models/issue.go

@@ -1164,21 +1164,23 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) {
 		return err
 	}
 
-	/* TODO set this at upload
 	if len(opts.Attachments) > 0 {
 		attachments, err := getAttachmentsByUUIDs(e, opts.Attachments)
 		if err != nil {
 			return fmt.Errorf("getAttachmentsByUUIDs [uuids: %v]: %v", opts.Attachments, err)
 		}
 
 		for i := 0; i < len(attachments); i++ {
+			if !attachments[i].IsNotAttached(){
+				log.Error("newIssue [%s]: skipping already linked attachement", attachments[i].UUID)
+				continue
+			}
 			attachments[i].IssueID = opts.Issue.ID
 			if _, err = e.ID(attachments[i].ID).Update(attachments[i]); err != nil {
 				return fmt.Errorf("update attachment [id: %d]: %v", attachments[i].ID, err)
 			}
 		}
 	}
-	*/
 
 	return opts.Issue.loadAttributes(e)
 }

models/issue_comment.go

@@ -604,29 +604,26 @@ func sendCreateCommentAction(e *xorm.Session, opts *CreateCommentOptions, commen
 		if _, err = e.Exec("UPDATE `issue` SET num_comments=num_comments+1 WHERE id=?", opts.Issue.ID); err != nil {
 			return err
 		}
-/* TODO set it at upload
+		
 		// Check attachments
-		attachments := make([]*Attachment, 0, len(opts.Attachments))
-		for _, uuid := range opts.Attachments {
-			attach, err := getAttachmentByUUID(e, uuid)
-			if err != nil {
-				if IsErrAttachmentNotExist(err) {
-					continue
-				}
-				return fmt.Errorf("getAttachmentByUUID [%s]: %v", uuid, err)
-			}
-			attachments = append(attachments, attach)
+		attachments, err := getAttachmentsByUUIDs(e, opts.Attachments)
+		if err != nil {
+			return fmt.Errorf("getAttachmentsByUUIDs [uuids: %v]: %v", opts.Attachments, err)
 		}
 
 		for i := range attachments {
+			if !attachments[i].IsNotAttached(){
+				log.Error("sendCreateCommentAction [%s]: skipping already linked attachement", attachments[i].UUID)
+				continue
+			}
 			attachments[i].IssueID = opts.Issue.ID
 			attachments[i].CommentID = comment.ID
 			// No assign value could be 0, so ignore AllCols().
 			if _, err = e.ID(attachments[i].ID).Update(attachments[i]); err != nil {
 				return fmt.Errorf("update attachment [%d]: %v", attachments[i].ID, err)
 			}
 		}
-*/
+
 	case CommentTypeReopen:
 		act.OpType = ActionReopenIssue
 		if opts.Issue.IsPull {

models/release.go

@@ -150,23 +150,16 @@ func createTag(gitRepo *git.Repository, rel *Release) error {
 
 func linkReleaseAttachments(releaseID int64, attachmentUUIDs []string) (err error) {
 	// Check attachments
-	var attachments = make([]*Attachment, 0)
-	for _, uuid := range attachmentUUIDs {
-		attach, err := getAttachmentByUUID(x, uuid)
+	attachments, err := GetAttachmentsByUUIDs(attachmentUUIDs)
 		if err != nil {
-			if IsErrAttachmentNotExist(err) {
-				continue
-			}
-			return fmt.Errorf("getAttachmentByUUID [%s]: %v", uuid, err)
-		}
-		if !attach.IsNotAttached(){
-			log.Error("getAttachmentByUUID [%s]: skipping already linked attachement", uuid)
-			continue
+			return fmt.Errorf("getAttachmentsByUUIDs [uuids: %v]: %v", attachmentUUIDs, err)
 		}
-		attachments = append(attachments, attach)
-	}
 
 	for i := range attachments {
+		if !attachments[i].IsNotAttached(){
+			log.Error("linkReleaseAttachments [%s]: skipping already linked attachement", attachments[i].UUID)
+			continue
+		}
 		attachments[i].ReleaseID = releaseID
 		// No assign value could be 0, so ignore AllCols().
 		if _, err = x.ID(attachments[i].ID).Update(attachments[i]); err != nil {