Update/Insert protectedBranch respect priorityes and add updateFunc for priorities

Author: 6543

models/git/protected_branch.go

@@ -411,19 +411,51 @@ func UpdateProtectBranch(ctx context.Context, repo *repo_model.Repository, prote
 	}
 	protectBranch.ApprovalsWhitelistTeamIDs = whitelist
 
-	// Make sure protectBranch.ID is not 0 for whitelists
-	if protectBranch.ID == 0 {
-		if _, err = db.GetEngine(ctx).Insert(protectBranch); err != nil {
-			return fmt.Errorf("Insert: %v", err)
+	return db.WithTx(ctx, func(ctx context.Context) error {
+		// Looks like it's a new rule
+		if protectBranch.ID == 0 {
+			// as it's a new rule and if priority was not set, we need to calc it.
+			if protectBranch.Priority == 0 {
+				var lowestPrio int64
+				db.GetEngine(ctx).Table(protectBranch).
+					Select("MAX(priority)").
+					Where("repo_id = ?", protectBranch.RepoID).
+					Get(&lowestPrio)
+				log.Trace("Create new ProtectedBranch at repo[%d] and detect current lowest priority '%d'", protectBranch.RepoID, lowestPrio)
+				protectBranch.Priority = lowestPrio + 1
+			}
+
+			if _, err = db.GetEngine(ctx).Insert(protectBranch); err != nil {
+				return fmt.Errorf("Insert: %v", err)
+			}
+			return nil
 		}
-		return nil
-	}
 
-	if _, err = db.GetEngine(ctx).ID(protectBranch.ID).AllCols().Update(protectBranch); err != nil {
-		return fmt.Errorf("Update: %v", err)
-	}
+		// update the rule
+		if _, err = db.GetEngine(ctx).ID(protectBranch.ID).AllCols().Update(protectBranch); err != nil {
+			return fmt.Errorf("Update: %v", err)
+		}
 
-	return nil
+		return nil
+	})
+}
+
+func UpdateProtectBranchPriorities(ctx context.Context, repo *repo_model.Repository, ids []int64) error {
+	prio := int64(1)
+	return db.WithTx(ctx, func(ctx context.Context) error {
+		for _, id := range ids {
+			if _, err := db.GetEngine(ctx).
+				ID(id).Where("repo_id = ?", repo.ID).
+				Cols("priority").
+				Update(&ProtectedBranch{
+					Priority: prio,
+				}); err != nil {
+				return err
+			}
+			prio++
+		}
+		return nil
+	})
 }
 
 // updateApprovalWhitelist checks whether the user whitelist changed and returns a whitelist with