Some ranking fixes

Author: alicealys

src/server/database/models/event_rankings.cpp

@@ -224,16 +224,20 @@ namespace database::event_rankings
 		last_update = now;
 
 		db->execute(R"(
-			with ranked_players as (
-				select player_id, value, 
-					   (select count(distinct value) + 1 
-						from event_rankings pr2 
-						where pr2.value > pr1.value) as new_rank
-				from event_rankings pr1
-			)
-			update event_rankings record
-			join ranked_players ranked_player on record.player_id = ranked_player.player_id
-			set record.player_rank = ranked_player.new_rank where record.value > 0;
+			update event_rankings event_ranking
+			join (
+				select
+					player_id,
+					event_id,
+					value,
+					case 
+						when value = 0 then 0 
+						else rank() over (partition by event_id order by value desc)
+					end as new_rank
+				from event_rankings
+			) ranked
+			on event_ranking.player_id = ranked.player_id AND event_ranking.event_id = ranked.event_id
+			set event_ranking.player_rank = ranked.new_rank;
 		)");
 	}
 

src/server/platforms/tppstm/endpoints/main/commands/cmd_get_ranking.cpp

@@ -38,15 +38,23 @@ namespace tpp
 		const auto event_id = event_id_opt.value();
 
 		const auto lookup_type = lookup_type_opt.value();
-		auto offset = index_j.get<std::uint64_t>() - 1;
+		auto offset = 0ull;
 
 		if (lookup_type == database::event_rankings::lookup_around)
 		{
 			const auto player_rank = database::event_rankings::get_player_rank(player->get_id(), event_id);
 			if (player_rank.has_value())
 			{
 				const auto page_start = player_rank.value() - (player_rank.value() % num);
-				offset += page_start;
+				offset = page_start - 1;
+			}
+		}
+		else
+		{
+			offset = index_j.get<std::uint64_t>();
+			if (offset > 0)
+			{
+				offset--;
 			}
 		}
 
@@ -59,12 +67,12 @@ namespace tpp
 			const auto& entry = entries[i];
 			auto& json_entry = result["ranking_list"][i];
 
-			json_entry["disp_rank"] = 1;
+			json_entry["disp_rank"] = 0;
 			json_entry["rank"] = entry.get_rank();
 			json_entry["fob_grade"] = entry.get_fob_grade();
 			json_entry["league_grade"] = entry.get_league_grade();
 			json_entry["score"] = entry.get_value();
-			json_entry["is_grade_top"] = 0;
+			json_entry["is_grade_top"] = lookup_type == database::event_rankings::lookup_best && offset == 0 && i == 0;
 			json_entry["player_info"] = player_info(entry.get_player_id(), entry.get_account_id());
 		}