fix reviews may be ahead of timeline

The bot may be confused if he has all the reviews, but some of them are missing
on the timeline. This may happen if a new review arrives inbetween of gitea api call.
Changing orders of API calls ensures that state of reviews is not ahead of timeline.

common/pr.go

@@ -468,7 +468,7 @@ func (rs *PRSet) IsApproved(gitea GiteaPRChecker, maintainers MaintainershipData
 				LogError("Cannot fetch gita reaviews for PR:", err)
 				return false
 			}
-			r.SetRequiredReviewers(reviewers)
+			r.RequestedReviewers = reviewers
 			prjgit.Reviews = r
 			if prjgit.Reviews.IsManualMergeOK() {
 				is_manually_reviewed_ok = true
@@ -489,7 +489,7 @@ func (rs *PRSet) IsApproved(gitea GiteaPRChecker, maintainers MaintainershipData
 					LogError("Cannot fetch gita reaviews for PR:", err)
 					return false
 				}
-				r.SetRequiredReviewers(reviewers)
+				r.RequestedReviewers = reviewers
 				pr.Reviews = r
 				if !pr.Reviews.IsManualMergeOK() {
 					LogInfo("Not approved manual merge. PR:", pr.PR.URL)
@@ -530,7 +530,7 @@ func (rs *PRSet) IsApproved(gitea GiteaPRChecker, maintainers MaintainershipData
 			LogError("Cannot fetch gitea reaviews for PR:", err)
 			return false
 		}
-		r.SetRequiredReviewers(reviewers)
+		r.RequestedReviewers = reviewers
 
 		is_manually_reviewed_ok = r.IsApproved()
 		LogDebug("PR to", pr.PR.Base.Repo.Name, "reviewed?", is_manually_reviewed_ok)

common/pr_test.go

@@ -807,8 +807,9 @@ func TestFindMissingAndExtraReviewers(t *testing.T) {
 							Base: &models.PRBranchInfo{Name: "main", Repo: &models.Repository{Name: "pkg", Owner: &models.User{UserName: "org"}}},
 						},
 						Reviews: &common.PRReviews{
-							Reviews: []*models.PullReview{{State: common.ReviewStateRequestReview, User: &models.User{UserName: "m1"}}},
-							RequestedReviewers: []*models.TimelineComment{
+							Reviews:            []*models.PullReview{{State: common.ReviewStateRequestReview, User: &models.User{UserName: "m1"}}},
+							RequestedReviewers: []string{"m1"},
+							FullTimeline: []*models.TimelineComment{
 								{User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "m1"}, Type: common.TimelineCommentType_ReviewRequested},
 							},
 						},
@@ -918,7 +919,8 @@ func TestFindMissingAndExtraReviewers(t *testing.T) {
 						},
 						Reviews: &common.PRReviews{
 							Reviews:            []*models.PullReview{{State: common.ReviewStateRequestReview, User: &models.User{UserName: "reviewer"}}},
-							RequestedReviewers: []*models.TimelineComment{{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "reviewer"}}},
+							RequestedReviewers: []string{"reviewer"},
+							FullTimeline:       []*models.TimelineComment{{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "reviewer"}}},
 						},
 					},
 					{
@@ -928,7 +930,8 @@ func TestFindMissingAndExtraReviewers(t *testing.T) {
 						},
 						Reviews: &common.PRReviews{
 							Reviews:            []*models.PullReview{{State: common.ReviewStateRequestReview, User: &models.User{UserName: "reviewer"}}},
-							RequestedReviewers: []*models.TimelineComment{{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "reviewer"}}},
+							RequestedReviewers: []string{"reviewer"},
+							FullTimeline:       []*models.TimelineComment{{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "reviewer"}}},
 						},
 					},
 				},
@@ -963,7 +966,8 @@ func TestFindMissingAndExtraReviewers(t *testing.T) {
 								{State: common.ReviewStateApproved, User: &models.User{UserName: "pkgmaintainer"}},
 								{State: common.ReviewStatePending, User: &models.User{UserName: "prjmaintainer"}},
 							},
-							RequestedReviewers: []*models.TimelineComment{
+							RequestedReviewers: []string{"user2", "pkgmaintainer", "prjmaintainer"},
+							FullTimeline: []*models.TimelineComment{
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "user2"}},
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "pkgmaintainer"}},
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "prjmaintainer"}},
@@ -981,7 +985,8 @@ func TestFindMissingAndExtraReviewers(t *testing.T) {
 								{State: common.ReviewStateRequestChanges, User: &models.User{UserName: "user1"}},
 								{State: common.ReviewStateRequestReview, User: &models.User{UserName: "autogits_obs_staging_bot"}},
 							},
-							RequestedReviewers: []*models.TimelineComment{
+							RequestedReviewers: []string{"user1", "autogits_obs_staging_bot"},
+							FullTimeline: []*models.TimelineComment{
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "user1"}},
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "autogits_obs_staging_bot"}},
 							},
@@ -1021,7 +1026,8 @@ func TestFindMissingAndExtraReviewers(t *testing.T) {
 								{State: common.ReviewStatePending, User: &models.User{UserName: "prj2"}},
 								{State: common.ReviewStatePending, User: &models.User{UserName: "someother"}},
 							},
-							RequestedReviewers: []*models.TimelineComment{
+							RequestedReviewers: []string{"user2", "pkgmaintainer", "prjmaintainer", "pkgm1", "pkgm2", "someother", "prj1", "prj2"},
+							FullTimeline: []*models.TimelineComment{
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "pkgmaintainer"}},
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "prjmaintainer"}},
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "prj1"}},
@@ -1044,7 +1050,8 @@ func TestFindMissingAndExtraReviewers(t *testing.T) {
 								{State: common.ReviewStatePending, User: &models.User{UserName: "prj1"}},
 								{State: common.ReviewStatePending, User: &models.User{UserName: "prj2"}},
 							},
-							RequestedReviewers: []*models.TimelineComment{
+							RequestedReviewers: []string{"user1", "autogits_obs_staging_bot", "prj1", "prj2"},
+							FullTimeline: []*models.TimelineComment{
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "autogits_obs_staging_bot"}},
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "prj1"}},
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "prj2"}},
@@ -1083,7 +1090,8 @@ func TestFindMissingAndExtraReviewers(t *testing.T) {
 								{State: common.ReviewStateRequestReview, User: &models.User{UserName: "prj1"}},
 								{State: common.ReviewStateRequestReview, User: &models.User{UserName: "someother"}},
 							},
-							RequestedReviewers: []*models.TimelineComment{
+							RequestedReviewers: []string{"user2", "pkgmaintainer", "prjmaintainer", "pkgm1", "someother", "prj1"},
+							FullTimeline: []*models.TimelineComment{
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "pkgm1"}},
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "pkgmaintainer"}},
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "prjmaintainer"}},
@@ -1104,7 +1112,8 @@ func TestFindMissingAndExtraReviewers(t *testing.T) {
 								{State: common.ReviewStateRequestReview, User: &models.User{UserName: "autogits_obs_staging_bot"}},
 								{State: common.ReviewStateRequestReview, User: &models.User{UserName: "prj1"}},
 							},
-							RequestedReviewers: []*models.TimelineComment{
+							RequestedReviewers: []string{"user1", "autogits_obs_staging_bot", "prj1"},
+							FullTimeline: []*models.TimelineComment{
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "autogits_obs_staging_bot"}},
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "bot"}, Assignee: &models.User{UserName: "prj1"}},
 								{Type: common.TimelineCommentType_ReviewRequested, User: &models.User{UserName: "!bot"}, Assignee: &models.User{UserName: "user1"}},
@@ -1190,9 +1199,6 @@ func TestFindMissingAndExtraReviewers(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 			test.prset.HasAutoStaging = !test.noAutoStaging
 			for idx, pr := range test.prset.PRs {
-				if pr.Reviews != nil {
-					pr.Reviews.SetRequiredReviewers(test.prset.Config.Reviewers)
-				}
 				missing, extra := test.prset.FindMissingAndExtraReviewers(test.maintainers, idx)
 
 				// avoid nil dereference below, by adding empty array elements

common/reviews.go

@@ -8,47 +8,32 @@ import (
 	"src.opensuse.org/autogits/common/gitea-generated/models"
 )
 
-type ReviewInterface interface {
-	IsManualMergeOK() bool
-	IsApproved() bool
-	MisingReviews() []string
-	FindReviewRequester(reviewer string) *models.TimelineComment
-	HasPendingReviewBy(reviewer string) bool
-	IsReviewedBy(reviewer string) bool
-	IsReviewedByOneOf(reviewers ...string) bool
-
-	SetRequiredReviewers(reviewers []string)
-}
-
 type PRReviews struct {
 	Reviews            []*models.PullReview
-	RequestedReviewers []*models.TimelineComment
+	RequestedReviewers []string
 	Comments           []*models.TimelineComment
 
-	RequiredReviewers []string
-}
-
-func (r *PRReviews) SetRequiredReviewers(reviewers []string) {
-	r.RequiredReviewers = reviewers
+	FullTimeline []*models.TimelineComment
 }
 
 func FetchGiteaReviews(rf GiteaReviewTimelineFetcher, org, repo string, no int64) (*PRReviews, error) {
-	timeline, err := rf.GetTimeline(org, repo, no)
-	if err != nil {
-		return nil, err
-	}
-
 	rawReviews, err := rf.GetPullRequestReviews(org, repo, no)
 	if err != nil {
 		return nil, err
 	}
 
+	timeline, err := rf.GetTimeline(org, repo, no)
+	if err != nil {
+		return nil, err
+	}
+
+
 	reviews := make([]*models.PullReview, 0, 10)
+	needNewReviews := []string{}
 	var comments []*models.TimelineComment
 
-	var foundUsers []string
 	alreadyHaveUserReview := func(user string) bool {
-		if slices.Contains(foundUsers, user) {
+		if slices.Contains(needNewReviews, user) {
 			return true
 		}
 		for _, r := range reviews {
@@ -64,24 +49,20 @@ func FetchGiteaReviews(rf GiteaReviewTimelineFetcher, org, repo string, no int64
 	LogDebug("Number of items in timeline:", len(timeline))
 
 	cutOffIdx := len(timeline)
-	var PendingRequestedReviews []*models.TimelineComment
 	for idx, item := range timeline {
-		if item.Type == TimelineCommentType_Review {
+		if item.Type == TimelineCommentType_Review || item.Type == TimelineCommentType_ReviewRequested {
 			for _, r := range rawReviews {
-				if r.ID == item.ReviewID && r.User != nil {
+				if r.ID == item.ReviewID {
 					if !alreadyHaveUserReview(r.User.UserName) {
-						if idx < cutOffIdx {
+						if item.Type == TimelineCommentType_Review && idx > cutOffIdx {
+							needNewReviews = append(needNewReviews, r.User.UserName)
+						} else {
 							reviews = append(reviews, r)
 						}
-						foundUsers = append(foundUsers, r.User.UserName)
 					}
 					break
 				}
 			}
-		} else if item.Type == TimelineCommentType_ReviewRequested && item.Assignee != nil && !alreadyHaveUserReview(item.Assignee.UserName) {
-			PendingRequestedReviews = append(PendingRequestedReviews, item)
-		} else if item.Type == TimelineCommentType_DismissReview && item.Assignee != nil && !alreadyHaveUserReview(item.Assignee.UserName) {
-			foundUsers = append(foundUsers, item.Assignee.UserName)
 		} else if item.Type == TimelineCommentType_Comment && cutOffIdx > idx {
 			comments = append(comments, item)
 		} else if item.Type == TimelineCommentType_PushPull && cutOffIdx == len(timeline) {
@@ -94,9 +75,9 @@ func FetchGiteaReviews(rf GiteaReviewTimelineFetcher, org, repo string, no int64
 	LogDebug("num comments:", len(comments), "timeline:", len(reviews))
 
 	return &PRReviews{
-		Reviews:            reviews,
-		Comments:           comments,
-		RequestedReviewers: PendingRequestedReviews,
+		Reviews:      reviews,
+		Comments:     comments,
+		FullTimeline: timeline,
 	}, nil
 }
 
@@ -124,7 +105,7 @@ func (r *PRReviews) IsManualMergeOK() bool {
 			continue
 		}
 		LogDebug("comment:", c.User.UserName, c.Body)
-		if slices.Contains(r.RequiredReviewers, c.User.UserName) {
+		if slices.Contains(r.RequestedReviewers, c.User.UserName) {
 			if bodyCommandManualMergeOK(c.Body) {
 				return true
 			}
@@ -135,7 +116,7 @@ func (r *PRReviews) IsManualMergeOK() bool {
 		if c.Updated != c.Submitted {
 			continue
 		}
-		if slices.Contains(r.RequiredReviewers, c.User.UserName) {
+		if slices.Contains(r.RequestedReviewers, c.User.UserName) {
 			if bodyCommandManualMergeOK(c.Body) {
 				return true
 			}
@@ -151,7 +132,7 @@ func (r *PRReviews) IsApproved() bool {
 	}
 	goodReview := true
 
-	for _, reviewer := range r.RequiredReviewers {
+	for _, reviewer := range r.RequestedReviewers {
 		goodReview = false
 		for _, review := range r.Reviews {
 			if review.User.UserName == reviewer && review.State == ReviewStateApproved && !review.Stale && !review.Dismissed {
@@ -175,7 +156,7 @@ func (r *PRReviews) MissingReviews() []string {
 		return missing
 	}
 
-	for _, reviewer := range r.RequiredReviewers {
+	for _, reviewer := range r.RequestedReviewers {
 		if !r.IsReviewedBy(reviewer) {
 			missing = append(missing, reviewer)
 		}
@@ -188,11 +169,12 @@ func (r *PRReviews) FindReviewRequester(reviewer string) *models.TimelineComment
 		return nil
 	}
 
-	for _, t := range r.RequestedReviewers {
-		if t.Assignee.UserName == reviewer {
-			return t
+	for _, r := range r.FullTimeline {
+		if r.Type == TimelineCommentType_ReviewRequested && r.Assignee.UserName == reviewer {
+			return r
 		}
 	}
+
 	return nil
 }
 
@@ -206,19 +188,10 @@ func (r *PRReviews) HasPendingReviewBy(reviewer string) bool {
 			switch r.State {
 			case ReviewStateRequestReview, ReviewStatePending:
 				return true
-			default:
-				return false
 			}
 		}
 	}
 
-	// at this point, we do not have actual review by user. Check if we have a pending review
-	for _, t := range r.RequestedReviewers {
-		if t.Assignee != nil && t.Assignee.UserName == reviewer {
-			return true
-		}
-	}
-
 	return false
 }
 
@@ -227,18 +200,20 @@ func (r *PRReviews) IsReviewedBy(reviewer string) bool {
 		return false
 	}
 
-	for _, r := range r.Reviews {
-		if r.User.UserName == reviewer && !r.Stale {
-			switch r.State {
+	res := false
+
+	for _, i := range r.Reviews {
+		if i.User.UserName == reviewer && !i.Stale {
+			switch i.State {
 			case ReviewStateApproved, ReviewStateRequestChanges:
-				return true
-			default:
+				res = true
+			case ReviewStateRequestReview, ReviewStatePending:
 				return false
 			}
 		}
 	}
 
-	return false
+	return res
 }
 
 func (r *PRReviews) IsReviewedByOneOf(reviewers ...string) bool {

common/reviews_test.go

@@ -137,61 +137,6 @@ func TestReviews(t *testing.T) {
 			isApproved:        false,
 			isReviewedByTest1: true,
 		},
-		{
-			name: "Ghost user review",
-			reviews: []*models.PullReview{
-				{State: common.ReviewStateApproved, User: nil},
-			},
-			reviewers:  []string{"user1"},
-			isApproved: false,
-		},
-		{
-			name:    "ReviewRequested predates PushPull should be seen as pending",
-			reviews: []*models.PullReview{},
-			timeline: []*models.TimelineComment{
-				{Type: common.TimelineCommentType_PushPull},
-				{Type: common.TimelineCommentType_ReviewRequested, Assignee: &models.User{UserName: "user1"}},
-			},
-			reviewers:        []string{"user1"},
-			isPendingByTest1: true,
-		},
-		{
-			name:    "ReviewRequested postdates PushPull but blocked by older dismiss",
-			reviews: []*models.PullReview{},
-			timeline: []*models.TimelineComment{
-				{Type: common.TimelineCommentType_ReviewRequested, Assignee: &models.User{UserName: "user1"}},
-				{Type: common.TimelineCommentType_PushPull},
-				{Type: common.TimelineCommentType_ReviewDismissed, Assignee: &models.User{UserName: "user1"}},
-			},
-			reviewers:        []string{"user1"},
-			isPendingByTest1: true,
-		},
-		{
-			name: "ReviewRequested predates PushPull should be seen as pending",
-			reviews: []*models.PullReview{
-				{ID: 101, State: common.ReviewStateRequestReview, User: &models.User{UserName: "user1"}},
-			},
-			timeline: []*models.TimelineComment{
-				{Type: common.TimelineCommentType_PushPull},
-				{Type: common.TimelineCommentType_ReviewRequested, Assignee: &models.User{UserName: "user1"}},
-			},
-			reviewers:        []string{"user1"},
-			isPendingByTest1: true,
-		},
-		{
-			name: "Review requested, review, then push needs re-requesting",
-			reviews: []*models.PullReview{
-				{ID: 100, State: common.ReviewStateRequestChanges, User: &models.User{UserName: "user1"}},
-			},
-			timeline: []*models.TimelineComment{
-				{Type: common.TimelineCommentType_PushPull},
-				{Type: common.TimelineCommentType_Review, ReviewID: 100},
-				{Type: common.TimelineCommentType_ReviewRequested, Assignee: &models.User{UserName: "user1"}},
-			},
-			reviewers:         []string{"user1"},
-			isReviewedByTest1: false, // Should be stale
-			isPendingByTest1:  false, // Should be stale
-		},
 	}
 
 	for _, test := range tests {
@@ -213,7 +158,7 @@ func TestReviews(t *testing.T) {
 				}
 				return
 			}
-			reviews.SetRequiredReviewers(test.reviewers)
+			reviews.RequestedReviewers = test.reviewers
 
 			if r := reviews.IsApproved(); r != test.isApproved {
 				t.Fatal("Unexpected IsReviewed():", r, "vs. expected", test.isApproved)

common/timeline.go

@@ -8,7 +8,6 @@ import (
 )
 
 const (
-	TimelineCommentType_ReviewDismissed = "dismiss_review"
 	TimelineCommentType_ReviewRequested = "review_request"
 	TimelineCommentType_Review          = "review"
 	TimelineCommentType_PushPull        = "pull_push"

integration/podman-compose.yml

@@ -8,7 +8,6 @@ services:
   gitea:
     build: ./gitea
     container_name: gitea-test
-    init: true
     environment:
       - GITEA_WORK_DIR=/var/lib/gitea
     networks:
@@ -28,7 +27,6 @@ services:
   rabbitmq:
     image: rabbitmq:3.13.7-management
     container_name: rabbitmq-test
-    init: true
     healthcheck:
       test: ["CMD", "rabbitmq-diagnostics", "check_running", "-q"]
       interval: 30s
@@ -57,7 +55,6 @@ services:
       context: ..
       dockerfile: integration/gitea-events-rabbitmq-publisher/Dockerfile${GIWTF_IMAGE_SUFFIX}
     container_name: gitea-publisher
-    init: true
     networks:
       - gitea-network
     depends_on:
@@ -78,7 +75,6 @@ services:
       context: ..
       dockerfile: integration/workflow-pr/Dockerfile${GIWTF_IMAGE_SUFFIX}
     container_name: workflow-pr
-    init: true
     networks:
       - gitea-network
     depends_on:
@@ -107,7 +103,6 @@ services:
   mock-obs:
     build: ./mock-obs
     container_name: mock-obs
-    init: true
     networks:
       - gitea-network
     ports:
@@ -121,7 +116,6 @@ services:
       context: ..
       dockerfile: integration/obs-staging-bot/Dockerfile${GIWTF_IMAGE_SUFFIX}
     container_name: obs-staging-bot
-    init: true
     networks:
       - gitea-network
     depends_on:

workflow-pr/dummy

@@ -1 +0,0 @@
-4