Skipping MRs with Merge Error.

Whyeasy · Jul 15, 2020 · cf0fb57 · cf0fb57
1 parent 065cef1
commit cf0fb57
Showing 1 changed file with 34 additions and 30 deletions.
diff --git a/lib/client/mergeRequest.go b/lib/client/mergeRequest.go
@@ -192,21 +192,23 @@ func getMergedMergeRequests(c *gitlab.Client, errCh chan<- error, wg *sync.WaitG
 			return nil
 		}
 
-		duration, _ := time.ParseDuration(result.MergedAt.Sub(*result.CreatedAt).String())
-
-		resultMerged = append(resultMerged, MergeMergedStats{
-			MergedAt: result.MergedAt,
-			Duration: duration.Seconds(),
-			MergeRequest: MergeRequestStats{
-				ProjectID:    strconv.Itoa(result.ProjectID),
-				ID:           strconv.Itoa(result.ID),
-				CreatedAt:    result.CreatedAt,
-				LastUpdated:  result.UpdatedAt,
-				ChangeCount:  result.ChangesCount,
-				Assignees:    len(result.Assignees),
-				SourceBranch: result.SourceBranch,
-			},
-		})
+		if result.MergeError == "" {
+			duration, _ := time.ParseDuration(result.MergedAt.Sub(*result.CreatedAt).String())
+
+			resultMerged = append(resultMerged, MergeMergedStats{
+				MergedAt: result.MergedAt,
+				Duration: duration.Seconds(),
+				MergeRequest: MergeRequestStats{
+					ProjectID:    strconv.Itoa(result.ProjectID),
+					ID:           strconv.Itoa(result.ID),
+					CreatedAt:    result.CreatedAt,
+					LastUpdated:  result.UpdatedAt,
+					ChangeCount:  result.ChangesCount,
+					Assignees:    len(result.Assignees),
+					SourceBranch: result.SourceBranch,
+				},
+			})
+		}
 	}
 	log.Info(len(resultMerged), " Merged MRs")
 	wg.Done()
@@ -226,21 +228,23 @@ func getClosedMergeRequests(c *gitlab.Client, errCh chan<- error, wg *sync.WaitG
 			return nil
 		}
 
-		duration, _ := time.ParseDuration(result.ClosedAt.Sub(*result.CreatedAt).String())
-
-		resultClosed = append(resultClosed, MergeClosedStats{
-			ClosedAt: result.ClosedAt,
-			Duration: duration.Seconds(),
-			MergeRequest: MergeRequestStats{
-				ProjectID:    strconv.Itoa(result.ProjectID),
-				ID:           strconv.Itoa(result.ID),
-				CreatedAt:    result.CreatedAt,
-				LastUpdated:  result.UpdatedAt,
-				ChangeCount:  result.ChangesCount,
-				Assignees:    len(result.Assignees),
-				SourceBranch: result.SourceBranch,
-			},
-		})
+		if result.MergeError == "" {
+			duration, _ := time.ParseDuration(result.ClosedAt.Sub(*result.CreatedAt).String())
+
+			resultClosed = append(resultClosed, MergeClosedStats{
+				ClosedAt: result.ClosedAt,
+				Duration: duration.Seconds(),
+				MergeRequest: MergeRequestStats{
+					ProjectID:    strconv.Itoa(result.ProjectID),
+					ID:           strconv.Itoa(result.ID),
+					CreatedAt:    result.CreatedAt,
+					LastUpdated:  result.UpdatedAt,
+					ChangeCount:  result.ChangesCount,
+					Assignees:    len(result.Assignees),
+					SourceBranch: result.SourceBranch,
+				},
+			})
+		}
 
 	}
 	log.Info(len(resultClosed), " Closed MRs")