Refactor position and team filtering logic to improve accuracy and clarity. Introduced regex for position matching and combined masks for filtering, enhancing user experience in portfolio management.

app.py

@@ -1044,7 +1044,21 @@ def parse_portfolio_on_mapped(portfolio, map_dict, map_key, filter_keys_pos, fil
         mask = low_mask & high_mask
     else:
         # String mapping - filter by inclusion in filter_keys
-        mask = mapping_port.str.contains(filter_keys_pos) | mapping_port.isin(filter_keys_team)
+        pos_mask = False
+        team_mask = False
+        
+        # Handle position filtering (for multi-position players like PG/SG)
+        if filter_keys_pos:
+            # Create a regex pattern that matches any of the selected positions
+            pos_pattern = '|'.join([f'\\b{pos}\\b' for pos in filter_keys_pos])
+            pos_mask = mapping_port.str.contains(pos_pattern, case=False, na=False, regex=True)
+        
+        # Handle team filtering
+        if filter_keys_team:
+            team_mask = mapping_port.isin(filter_keys_team)
+        
+        # Combine masks with OR logic
+        mask = pos_mask | team_mask
     
     return portfolio[mask]