fix(recap): if player plays both hardcore and softcore, check both for rarest achievement (#4369)

Author: Jamiras

app/Community/Actions/GenerateAnnualRecapAction.php

@@ -441,46 +441,49 @@ private function determineRarestAchievement(array &$recapData, User $user, array
 
     private function getRarestAchievement(array $gameIds, User $user, Carbon $startDate, Carbon $endDate): array
     {
-        $result = [
-            'rarestHardcoreAchievement' => null,
-            'rarestHardcoreAchievementEarnRate' => 0.0,
-            'rarestSoftcoreAchievement' => null,
-            'rarestSoftcoreAchievementEarnRate' => 0.0,
-        ];
-
-        $rarestHardcoreAchievement = PlayerAchievement::where(DB::raw('player_achievements.user_id'), $user->id)
-            ->where('unlocked_hardcore_at', '>=', $startDate)
-            ->where('unlocked_hardcore_at', '<', $endDate)
-            ->join('achievements', 'achievements.id', '=', 'player_achievements.achievement_id')
-            ->join('games', 'games.id', '=', 'achievements.game_id')
-            ->whereIn('achievements.game_id', $gameIds)
-            ->where(DB::raw('achievements.is_promoted'), true)
-            ->select('achievements.id', DB::raw('achievements.unlocks_hardcore/games.players_total as EarnRate'))
-            ->orderBy('EarnRate')
-            ->first();
-        if ($rarestHardcoreAchievement) {
-            $result['rarestHardcoreAchievement'] = Achievement::find($rarestHardcoreAchievement->id);
-            $result['rarestHardcoreAchievementEarnRate'] = sprintf("%01.2f", $rarestHardcoreAchievement->EarnRate * 100);
+        $rarestHardcoreAchievement = null;
+        if ($user->points_hardcore > 0) {
+            $rarestHardcoreAchievement = PlayerAchievement::where(DB::raw('player_achievements.user_id'), $user->id)
+                ->where('unlocked_hardcore_at', '>=', $startDate)
+                ->where('unlocked_hardcore_at', '<', $endDate)
+                ->join('achievements', 'achievements.id', '=', 'player_achievements.achievement_id')
+                ->join('games', 'games.id', '=', 'achievements.game_id')
+                ->whereIn('achievements.game_id', $gameIds)
+                ->where(DB::raw('achievements.is_promoted'), true)
+                ->select('achievements.id', DB::raw('achievements.unlocks_hardcore/games.players_total as EarnRate'))
+                ->orderBy('EarnRate')
+                ->first();
+        }
 
-            return $result; // only report rarest hardcore achievement if one was found
+        $rarestSoftcoreAchievement = null;
+        if ($user->points > 0) {
+            $rarestSoftcoreAchievement = PlayerAchievement::where(DB::raw('player_achievements.user_id'), $user->id)
+                ->where('unlocked_at', '>=', $startDate)
+                ->where('unlocked_at', '<', $endDate)
+                ->join('achievements', 'achievements.id', '=', 'player_achievements.achievement_id')
+                ->join('games', 'games.id', '=', 'achievements.game_id')
+                ->whereIn('achievements.game_id', $gameIds)
+                ->where(DB::raw('achievements.is_promoted'), true)
+                ->select('achievements.id', DB::raw('achievements.unlocks_total/games.players_total as EarnRate'))
+                ->orderBy('EarnRate')
+                ->first();
         }
 
-        $rarestSoftcoreAchievement = PlayerAchievement::where(DB::raw('player_achievements.user_id'), $user->id)
-            ->where('unlocked_at', '>=', $startDate)
-            ->where('unlocked_at', '<', $endDate)
-            ->join('achievements', 'achievements.id', '=', 'player_achievements.achievement_id')
-            ->join('games', 'games.id', '=', 'achievements.game_id')
-            ->whereIn('achievements.game_id', $gameIds)
-            ->where(DB::raw('achievements.is_promoted'), true)
-            ->select('achievements.id', DB::raw('achievements.unlocks_total/games.players_total as EarnRate'))
-            ->orderBy('EarnRate')
-            ->first();
-        if ($rarestSoftcoreAchievement) {
-            $result['rarestSoftcoreAchievement'] = Achievement::find($rarestSoftcoreAchievement->id);
-            $result['rarestSoftcoreAchievementEarnRate'] = sprintf("%01.2f", $rarestSoftcoreAchievement->EarnRate * 100);
+        // only keep the most rare achievement (regardless of softcore vs hardcore)
+        if ($rarestHardcoreAchievement && $rarestSoftcoreAchievement) {
+            if ($rarestHardcoreAchievement->EarnRate < $rarestSoftcoreAchievement->EarnRate) {
+                $rarestSoftcoreAchievement = null;
+            } else {
+                $rarestHardcoreAchievement = null;
+            }
         }
 
-        return $result;
+        return [
+            'rarestHardcoreAchievement' => $rarestHardcoreAchievement ? Achievement::find($rarestHardcoreAchievement->id) : null,
+            'rarestHardcoreAchievementEarnRate' => $rarestHardcoreAchievement ? sprintf("%01.2f", $rarestHardcoreAchievement->EarnRate * 100) : 0.0,
+            'rarestSoftcoreAchievement' => $rarestSoftcoreAchievement ? Achievement::find($rarestSoftcoreAchievement->id) : null,
+            'rarestSoftcoreAchievementEarnRate' => $rarestSoftcoreAchievement ? sprintf("%01.2f", $rarestSoftcoreAchievement->EarnRate * 100) : 0.0,
+        ];
     }
 
     private function determineRarestSubsetAchievement(array &$recapData, User $user, array $subsetGameIds, Carbon $startDate, Carbon $endDate): void