Fixing option security symbols

Author: shuky19

name.abuchen.portfolio.tests/src/name/abuchen/portfolio/datatransfer/ibflex/IBFlexStatementExtractorTest.java

@@ -2806,10 +2806,10 @@ public void testIBFlexStatementFile24() throws IOException
                         .collect(Collectors.toList());
 
         assertThat(errors, empty());
-        assertThat(securityItems.size(), is(3));
+        assertThat(securityItems.size(), is(2));
         assertThat(buySellTransactions.size(), is(0));
         assertThat(accountTransactions.size(), is(4));
-        assertThat(results.size(), is(7));
+        assertThat(results.size(), is(6));
         new AssertImportActions().check(results, CurrencyUnit.USD, CurrencyUnit.EUR);
 
         assertThat(results, hasItem(sellOption( //

name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/ibflex/IBFlexStatementExtractor.java

@@ -1030,9 +1030,18 @@ private Security getOrCreateSecurity(Element element, boolean doCreate)
 
             if (Arrays.asList(ASSETKEY_OPTION, ASSETKEY_FUTURE_OPTION).contains(element.getAttribute("assetCategory")))
             {
-                // Converting symbol into Option name only to keep a single security per option trading asset
-                computedTickerSymbol = tickerSymbol.map(t -> t.replaceAll("\\s+.*", ""));
-                description = computedTickerSymbol.get();
+                if (element.hasAttribute("underlyingSymbol")) {
+                    // Using the underlying symbol if possible
+                    computedTickerSymbol = Optional.ofNullable(element.getAttribute("underlyingSymbol"));
+                    description = computedTickerSymbol.get();
+                    quoteFeed = YahooFinanceQuoteFeed.ID;
+                }
+                else
+                {
+                    // Converting symbol into the trading asset (SPXW  20251207...) -> SPXW
+                    computedTickerSymbol = tickerSymbol.map(t -> t.replaceAll("\\s+.*", ""));
+                    description = computedTickerSymbol.get();
+                }
             }
 
             if (Arrays.asList(ASSETKEY_STOCK, ASSETKEY_FUND, ASSETKEY_CERTIFICATE)