Use roulette for single codebase rouletteextract-danger-roulette

2 files changed, 19 insertions, 12 deletions

diff --git a/danger/single_codebase/Dangerfile b/danger/single_codebase/Dangerfile
index a5938cd6783..d1f538bec7f 100644
--- a/danger/single_codebase/Dangerfile
+++ b/danger/single_codebase/Dangerfile
@@ -1,29 +1,36 @@
+def new_teammates(usernames)
+  usernames.map { |u| ::Gitlab::Danger::Teammate.new('username' => u) }
+end
+
 def mention_single_codebase_approvers
-  frontend_maintainers = %w(@filipa @iamphill)
-  backend_maintainers = %w(@rspeicher @rymai @yorickpeterse @godfat)
+  canonical_branch_name =
+    roulette.canonical_branch_name(gitlab.mr_json['source_branch'])
+
+  random = roulette.new_random(canonical_branch_name)
+
+  frontend_maintainers = new_teammates(%w[filipa iamphill])
+  backend_maintainers = new_teammates(%w[rspeicher rymai yorickpeterse godfat])
 
   rows = []
-  users = []
 
   if gitlab.mr_labels.include?('frontend')
-    frontend_maintainer = frontend_maintainers.sample
+    frontend_maintainer =
+      roulette.spin_for_person(frontend_maintainers, random: random)
 
-    rows << "| ~frontend | `#{frontend_maintainer}`"
-    users << frontend_maintainer
+    rows << "| ~frontend | #{frontend_maintainer.markdown_name}"
   end
 
   if gitlab.mr_labels.include?('backend')
-    backend_maintainer = backend_maintainers.sample
+    backend_maintainer =
+      roulette.spin_for_person(backend_maintainers, random: random)
 
-    rows << "| ~backend | `#{backend_maintainer}`"
-    users << backend_maintainer
+    rows << "| ~backend | #{backend_maintainer.markdown_name}"
   end
 
   if rows.empty?
     backup_maintainer = backend_maintainers.sample
 
-    rows << "| ~frontend / ~backend | `#{backup_maintainer}`"
-    users << backup_maintainer
+    rows << "| ~frontend / ~backend | #{backup_maintainer.markdown_name}"
   end
 
   markdown(<<~MARKDOWN.strip)
diff --git a/lib/gitlab/danger/teammate.rb b/lib/gitlab/danger/teammate.rb
index bfada512727..c4e66da8ed1 100644
--- a/lib/gitlab/danger/teammate.rb
+++ b/lib/gitlab/danger/teammate.rb
@@ -6,8 +6,8 @@ module Gitlab
       attr_reader :name, :username, :projects
 
       def initialize(options = {})
-        @name = options['name']
         @username = options['username']
+        @name = options['name'] || @username
         @projects = options['projects']
       end