From d0fee301670c37c0e73afb271e0a8dd6b622f6f6 Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Thu, 27 Apr 2023 12:03:50 +0200
Subject: [PATCH] [F3] ID remapping logic is in place, remove workaround

---
 services/f3/driver/review.go | 9 ++-------
 tests/integration/f3_test.go | 4 ++--
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/services/f3/driver/review.go b/services/f3/driver/review.go
index 06db6db049..bc4877c762 100644
--- a/services/f3/driver/review.go
+++ b/services/f3/driver/review.go
@@ -110,7 +110,8 @@ func (o *Review) FromFormat(review *format.Review) {
 	}
 	*o = Review{
 		Review: issues_model.Review{
-			ID: review.GetID(),
+			ID:         review.GetID(),
+			ReviewerID: review.ReviewerID.GetID(),
 			Reviewer: &user_model.User{
 				ID: review.ReviewerID.GetID(),
 			},
@@ -191,12 +192,6 @@ func (o *ReviewProvider) Put(ctx context.Context, user *User, project *Project,
 		comment.ID = 0
 	}
 	r.IssueID = pullRequest.IssueID
-	// this is a workaround because the id remapping logic is missing, wait until it is implemented and remove it
-	u, err := user_model.GetUserByName(ctx, r.Reviewer.Name)
-	if err != nil {
-		panic(err)
-	}
-	r.ReviewerID = u.ID
 	if err := issues_model.InsertReviews([]*issues_model.Review{r}); err != nil {
 		panic(err)
 	}
diff --git a/tests/integration/f3_test.go b/tests/integration/f3_test.go
index 5519c6dd3d..7543d8de49 100644
--- a/tests/integration/f3_test.go
+++ b/tests/integration/f3_test.go
@@ -61,7 +61,7 @@ func TestF3(t *testing.T) {
 		fixture.NewAsset()
 		fixture.NewIssueComment(nil)
 		fixture.NewPullRequestComment()
-		//		fixture.NewReview()
+		fixture.NewReview()
 		fixture.NewIssueReaction()
 		fixture.NewCommentReaction()
 
@@ -109,7 +109,7 @@ func TestF3(t *testing.T) {
 		assert.Contains(t, files, "/release/")
 		assert.Contains(t, files, "/asset/")
 		assert.Contains(t, files, "/comment/")
-		//		assert.Contains(t, files, "/review/")
+		assert.Contains(t, files, "/review/")
 		assert.Contains(t, files, "/reaction/")
 		//		f3_util.Command(context.Background(), "cp", "-a", f3.GetDirectory(), "abc")
 	})