Merge branch 'dev'

Author: bernardhanna

app/Services/Matchmaking/ProfileAvatarResolver.php

@@ -67,6 +67,11 @@ public function resolve(
             }
         }
 
+        $fuzzyMatch = $this->resolveFuzzy($candidates, $index, $isOrganisation);
+        if ($fuzzyMatch !== null) {
+            return '/' . ltrim($fuzzyMatch, '/');
+        }
+
         return null;
     }
 
@@ -133,5 +138,71 @@ private function normalize(string $value): string
     {
         return Str::slug(trim($value));
     }
+
+    /**
+     * @param array<int, string> $candidates
+     * @param array<string, string> $index
+     */
+    private function resolveFuzzy(array $candidates, array $index, bool $isOrganisation): ?string
+    {
+        $normalizedCandidates = [];
+        foreach ($candidates as $candidate) {
+            $normalized = $this->normalize($candidate);
+            if ($normalized !== '') {
+                $normalizedCandidates[] = $normalized;
+            }
+        }
+
+        if (empty($normalizedCandidates)) {
+            return null;
+        }
+
+        $bestScore = 0;
+        $bestPath = null;
+
+        foreach ($index as $key => $path) {
+            foreach ($normalizedCandidates as $candidate) {
+                $score = $this->scoreMatch($candidate, $key, $isOrganisation);
+                if ($score > $bestScore) {
+                    $bestScore = $score;
+                    $bestPath = $path;
+                }
+            }
+        }
+
+        return $bestScore >= 40 ? $bestPath : null;
+    }
+
+    private function scoreMatch(string $candidate, string $indexKey, bool $isOrganisation): int
+    {
+        if ($candidate === $indexKey) {
+            return 100;
+        }
+
+        $candidateTokens = array_values(array_filter(explode('-', $candidate)));
+        $indexTokens = array_values(array_filter(explode('-', $indexKey)));
+        $tokenOverlap = count(array_intersect($candidateTokens, $indexTokens));
+
+        if ($tokenOverlap === 0) {
+            return 0;
+        }
+
+        $candidateContainsKey = str_contains($candidate, $indexKey);
+        $keyContainsCandidate = str_contains($indexKey, $candidate);
+
+        if (($candidateContainsKey || $keyContainsCandidate) && mb_strlen($indexKey) >= 5) {
+            return 70 + min($tokenOverlap, 5);
+        }
+
+        if ($isOrganisation && $tokenOverlap >= 2) {
+            return 45 + min($tokenOverlap, 5);
+        }
+
+        if (!$isOrganisation && $tokenOverlap >= 2) {
+            return 40 + min($tokenOverlap, 5);
+        }
+
+        return 0;
+    }
 }