2 files changed, 4 insertions, 2 deletions
diff --git a/BackEnd/Timeline/Services/HighlightTimelineService.cs b/BackEnd/Timeline/Services/HighlightTimelineService.cs
index ea3e4c7e..b19efe21 100644
--- a/BackEnd/Timeline/Services/HighlightTimelineService.cs
+++ b/BackEnd/Timeline/Services/HighlightTimelineService.cs
@@ -108,13 +108,13 @@ namespace Timeline.Services
 
         public async Task<List<TimelineInfo>> GetHighlightTimelines()
         {
-            var entities = await _database.HighlightTimelines.OrderBy(t => t.Order).Select(t => new { t.Id }).ToListAsync();
+            var entities = await _database.HighlightTimelines.OrderBy(t => t.Order).Select(t => new { t.TimelineId }).ToListAsync();
 
             var result = new List<TimelineInfo>();
 
             foreach (var entity in entities)
             {
-                result.Add(await _timelineService.GetTimelineById(entity.Id));
+                result.Add(await _timelineService.GetTimelineById(entity.TimelineId));
             }
 
             return result;
diff --git a/BackEnd/Timeline/Startup.cs b/BackEnd/Timeline/Startup.cs
index bf34f9e2..d20fc54b 100644
--- a/BackEnd/Timeline/Startup.cs
+++ b/BackEnd/Timeline/Startup.cs
@@ -101,6 +101,8 @@ namespace Timeline
             services.AddScoped<ITimelineService, TimelineService>();
             services.AddScoped<ITimelinePostService, TimelinePostService>();
 
+            services.AddScoped<IHighlightTimelineService, HighlightTimelineService>();
+
             services.AddDbContext<DatabaseContext>((services, options) =>
             {
                 var pathProvider = services.GetRequiredService<IPathProvider>();