fix

Author: bhaak

lib/junethack/trophy_calculations.rb

@@ -1025,7 +1025,7 @@ def all_stuff_streak(column, len, user_id, variant)
 
   distinct_values = {}
   games.each {|game|
-    if game.ascended == 't'
+    if game.ascended
       distinct_values[game.column] = 1
     else
       distinct_values = {}

lib/junethack/trophyscore.rb

@@ -30,30 +30,55 @@ def fastest_ascension_gametime(variant=nil)
 
 # returns a list of all ascension streaks per variant
 def ascension_streaks(variant=nil)
-    games = repository.adapter.select "select ascended, user_id, server_id, endtime, 0 as streaks from games where version = ? and user_id in (select user_id from games where ascended='t') order by server_id, endtime desc", variant
+  sql = <<-SQL
+    SELECT ascended,
+          user_id,
+          server_id,
+          endtime,
+          0 AS streaks
+    FROM games
+    WHERE version = ?
+    AND   user_id IN (SELECT user_id FROM games WHERE ascended = 't')
+    ORDER BY server_id,
+            endtime DESC
+  SQL
 
-    # calculate streaks
-    streaks = Hash.new(0)
-    max_streaks = Hash.new(0)
-    # streaks are per server and per variant
-    server_id = 0
-    games.each {|game|
-        streaks[game.user_id] = 0 if game.ascended == 'f' or game.server_id != server_id
-        server_id = game.server_id
+  games = repository.adapter.select(sql, variant)
 
-        streaks[game.user_id] += 1 if game.ascended == 't'
+  # calculate streaks
+  streaks = Hash.new(0)
+  max_streaks = Hash.new(0)
+  # streaks are per server and per variant
+  server_id = 0
+  games.each { |game|
+    streaks[game.user_id] = 0 if !game.ascended or game.server_id != server_id
+    server_id = game.server_id
 
-        if streaks[game.user_id] > max_streaks[game.user_id]
-            max_streaks[game.user_id] = streaks[game.user_id]
-        end
-    }
+    streaks[game.user_id] += 1 if game.ascended
+
+    if streaks[game.user_id] > max_streaks[game.user_id]
+      max_streaks[game.user_id] = streaks[game.user_id]
+    end
+  }
+
+  # construct return object
+  sql = <<-SQL
+    SELECT user_id,
+        (SELECT login FROM users WHERE user_id = id) AS USER,
+        max(endtime) AS endtime,
+        0 AS streaks
+    FROM games
+    WHERE version = ?
+    AND   user_id IN (SELECT user_id FROM games WHERE ascended = 't')
+    GROUP BY user_id
+    ORDER BY max(endtime) DESC
+  SQL
 
-    # construct return object
-    streaks = repository.adapter.select "select user_id, (select name from users where user_id = id) as user, endtime, 0 as streaks from games where version = ? and user_id in (select user_id from games where ascended='t') group by user_id order by endtime desc", variant
-    return streaks.delete_if {|game|
-        game.streaks = max_streaks[game.user_id]
-        game.streaks == 1
-    }.sort_by {|game| -game.streaks }
+  streaks = repository.adapter.select(sql, variant)
+  return streaks.delete_if { |game|
+    game.streaks = max_streaks[game.user_id]
+    game.streaks == 1
+  }.sort_by {|game| -game.streaks }
 end
 
 def longest_ascension_streaks(variant=nil)

lib/junethack/userscore.rb

@@ -55,12 +55,12 @@ def longest_ascension_streak(variant=nil)
     # streaks are per server and per variant
     server_id = 0
     games_ascended.each {|game|
-        asc = 0 if game.ascended == 'f' or game.server_id != server_id
+        asc = 0 if !game.ascended or game.server_id != server_id
         server_id = game.server_id
 
-        asc += 1 if game.ascended == 't'
+        asc += 1 if game.ascended
 
-        max_asc = asc if asc > max_asc 
+        max_asc = asc if asc > max_asc
     }
     return max_asc
 end

spec/unittests/trophies_achievements/trophy_spec.rb

@@ -4,6 +4,9 @@
 require 'userscore'
 
 describe TrophyScore do
+  before do
+    Game.destroy
+  end
 
   context "given 2 ascended games from the same user with identical score points" do
     server = Server.create(name: 'server_highscore')