diff --git a/FinlyticBackend/Controllers/CalendarController.cs b/FinlyticBackend/Controllers/CalendarController.cs index d9e7a56..bbc0421 100644 --- a/FinlyticBackend/Controllers/CalendarController.cs +++ b/FinlyticBackend/Controllers/CalendarController.cs @@ -85,13 +85,12 @@ public class CalendarController : ControllerBase } return new CalendarEventResponseDto( - Id: $"evt-{eventIsin}-{eventDate:yyyyMMdd}-{eventType}", - Symbol: string.IsNullOrWhiteSpace(ticker) ? eventIsin : ticker, + Id: e.Id.ToString(), CompanyName: companyName, EventType: eventType, EventDate: eventDate, Date: eventDate.ToString("o"), - Isin: eventIsin, + Isin: e.Isin, Ticker: ticker, Description: $"{eventType} - {companyName}", Details: $"Termin für {companyName} am {eventDate:dd.MM.yyyy}", @@ -119,9 +118,7 @@ public class CalendarController : ControllerBase { filtered = filtered.Where(e => string.Equals(e.Isin, activeSymbol, StringComparison.OrdinalIgnoreCase) || - string.Equals(e.Ticker, activeSymbol, StringComparison.OrdinalIgnoreCase) || - string.Equals(e.Symbol, activeSymbol, StringComparison.OrdinalIgnoreCase) - ); + string.Equals(e.Ticker, activeSymbol, StringComparison.OrdinalIgnoreCase)); } return Ok(filtered.OrderBy(e => e.EventDate).ToList()); diff --git a/FinlyticCore/Dtos/CalendarEventResponseDto.cs b/FinlyticCore/Dtos/CalendarEventResponseDto.cs index b53eea5..9cbec00 100644 --- a/FinlyticCore/Dtos/CalendarEventResponseDto.cs +++ b/FinlyticCore/Dtos/CalendarEventResponseDto.cs @@ -8,7 +8,6 @@ namespace FinlyticCore.Dtos; /// public record CalendarEventResponseDto( [property: JsonPropertyName("id")] string Id, - [property: JsonPropertyName("symbol")] string Symbol, [property: JsonPropertyName("companyName")] string CompanyName, [property: JsonPropertyName("eventType")] string EventType, [property: JsonPropertyName("eventDate")] DateTime EventDate, diff --git a/FinlyticFundamentals/Services/FundamentalsDbService.cs b/FinlyticFundamentals/Services/FundamentalsDbService.cs index bdcbadd..5cb24c7 100644 --- a/FinlyticFundamentals/Services/FundamentalsDbService.cs +++ b/FinlyticFundamentals/Services/FundamentalsDbService.cs @@ -477,9 +477,11 @@ public class FundamentalsDbService : IFundamentalsDbService return events.Select(e => new CorporateEventDto { Id = e.Id, + Isin = e.AssetData.Isin, Ticker = e.Ticker != null ? new TickerInfoDto { Ticker = e.Ticker.Ticker, Exchange = !string.IsNullOrWhiteSpace(e.Ticker.Exchange) ? e.Ticker.Exchange : GetExchangeDisplayName(e.Ticker.Ticker) } : new TickerInfoDto { Ticker = "Unknown", Exchange = "Unknown" }, + CompanyName = e.AssetData.Name, Type = e.Type, Date = e.Date }).OrderBy(e => e.Date).ToList(); @@ -504,6 +506,8 @@ public class FundamentalsDbService : IFundamentalsDbService return events.Select(e => new CorporateEventDto { Id = e.Id, + Isin = e.AssetData.Isin, + CompanyName = e.AssetData.Name, Ticker = e.Ticker != null ? new TickerInfoDto { Ticker = e.Ticker.Ticker, Exchange = !string.IsNullOrWhiteSpace(e.Ticker.Exchange) ? e.Ticker.Exchange : GetExchangeDisplayName(e.Ticker.Ticker) } : new TickerInfoDto { Ticker = "Unknown", Exchange = "Unknown" },