5 files changed, 298 insertions, 299 deletions

diff --git a/code/api/src/Endpoints/V1/Entries/CreateEntryRoute.cs b/code/api/src/Endpoints/V1/Entries/CreateEntryRoute.cs
index 854ff59..45d8f32 100644
--- a/code/api/src/Endpoints/V1/Entries/CreateEntryRoute.cs
+++ b/code/api/src/Endpoints/V1/Entries/CreateEntryRoute.cs
@@ -2,65 +2,66 @@ namespace IOL.GreatOffice.Api.Endpoints.V1.Entries;
 
 public class CreateEntryRoute : RouteBaseSync.WithRequest<TimeEntry.TimeEntryDto>.WithActionResult<TimeEntry.TimeEntryDto>
 {
-	private readonly AppDbContext _context;
+    private readonly MainAppDatabase _database;
 
-	public CreateEntryRoute(AppDbContext context) {
-		_context = context;
-	}
+    public CreateEntryRoute(MainAppDatabase database) {
+        _database = database;
+    }
 
-	/// <summary>
-	/// Create a time entry.
-	/// </summary>
-	/// <param name="timeEntryTimeEntryDto"></param>
-	/// <returns></returns>
-	[ApiVersion(ApiSpecV1.VERSION_STRING)]
-	[BasicAuthentication(AppConstants.TOKEN_ALLOW_CREATE)]
-	[ProducesResponseType(200)]
-	[ProducesResponseType(400, Type = typeof(KnownProblemModel))]
-	[ProducesResponseType(404, Type = typeof(KnownProblemModel))]
-	[HttpPost("~/v{version:apiVersion}/entries/create")]
-	public override ActionResult<TimeEntry.TimeEntryDto> Handle(TimeEntry.TimeEntryDto timeEntryTimeEntryDto) {
-		if (timeEntryTimeEntryDto.Stop == default) {
-			return BadRequest(new KnownProblemModel("Invalid form", "A stop date is required"));
-		}
+    /// <summary>
+    /// Create a time entry.
+    /// </summary>
+    /// <param name="timeEntryTimeEntryDto"></param>
+    /// <returns></returns>
+    [ApiVersion(ApiSpecV1.VERSION_STRING)]
+    [BasicAuthentication(AppConstants.TOKEN_ALLOW_CREATE)]
+    [ProducesResponseType(200)]
+    [ProducesResponseType(400, Type = typeof(KnownProblemModel))]
+    [ProducesResponseType(404, Type = typeof(KnownProblemModel))]
+    [HttpPost("~/v{version:apiVersion}/entries/create")]
+    public override ActionResult<TimeEntry.TimeEntryDto> Handle(TimeEntry.TimeEntryDto timeEntryTimeEntryDto) {
+        if (timeEntryTimeEntryDto.Stop == default) {
+            return BadRequest(new KnownProblemModel("Invalid form", "A stop date is required"));
+        }
 
-		if (timeEntryTimeEntryDto.Start == default) {
-			return BadRequest(new KnownProblemModel("Invalid form", "A start date is required"));
-		}
+        if (timeEntryTimeEntryDto.Start == default) {
+            return BadRequest(new KnownProblemModel("Invalid form", "A start date is required"));
+        }
 
-		if (timeEntryTimeEntryDto.Category == default) {
-			return BadRequest(new KnownProblemModel("Invalid form", "A category is required"));
-		}
+        if (timeEntryTimeEntryDto.Category == default) {
+            return BadRequest(new KnownProblemModel("Invalid form", "A category is required"));
+        }
 
-		var category = _context.TimeCategories
-							   .Where(c => c.UserId == LoggedInUser.Id)
-							   .SingleOrDefault(c => c.Id == timeEntryTimeEntryDto.Category.Id);
-		
-		if (category == default) {
-			return NotFound(new KnownProblemModel("Not found", $"Could not find category {timeEntryTimeEntryDto.Category.Name}"));
-		}
+        var category = _database.TimeCategories
+            .Where(c => c.UserId == LoggedInUser.Id)
+            .SingleOrDefault(c => c.Id == timeEntryTimeEntryDto.Category.Id);
 
-		var entry = new TimeEntry(LoggedInUser.Id) {
-				Category = category,
-				Start = timeEntryTimeEntryDto.Start.ToUniversalTime(),
-				Stop = timeEntryTimeEntryDto.Stop.ToUniversalTime(),
-				Description = timeEntryTimeEntryDto.Description,
-		};
+        if (category == default) {
+            return NotFound(new KnownProblemModel("Not found", $"Could not find category {timeEntryTimeEntryDto.Category.Name}"));
+        }
 
-		if (timeEntryTimeEntryDto.Labels?.Count > 0) {
-			var labels = _context.TimeLabels
-								 .Where(c => c.UserId == LoggedInUser.Id)
-								 .Where(c => timeEntryTimeEntryDto.Labels.Select(p => p.Id).Contains(c.Id))
-								 .ToList();
-			if (labels.Count != timeEntryTimeEntryDto.Labels.Count) {
-				return NotFound(new KnownProblemModel("Not found", "Could not find all of the specified labels"));
-			}
+        var entry = new TimeEntry(LoggedInUser) {
+            Category = category,
+            Start = timeEntryTimeEntryDto.Start.ToUniversalTime(),
+            Stop = timeEntryTimeEntryDto.Stop.ToUniversalTime(),
+            Description = timeEntryTimeEntryDto.Description,
+        };
+        entry.SetOwnerIds(LoggedInUser.Id);
 
-			entry.Labels = labels;
-		}
+        if (timeEntryTimeEntryDto.Labels?.Count > 0) {
+            var labels = _database.TimeLabels
+                .Where(c => c.UserId == LoggedInUser.Id)
+                .Where(c => timeEntryTimeEntryDto.Labels.Select(p => p.Id).Contains(c.Id))
+                .ToList();
+            if (labels.Count != timeEntryTimeEntryDto.Labels.Count) {
+                return NotFound(new KnownProblemModel("Not found", "Could not find all of the specified labels"));
+            }
 
-		_context.TimeEntries.Add(entry);
-		_context.SaveChanges();
-		return Ok(entry.AsDto);
-	}
-}
+            entry.Labels = labels;
+        }
+
+        _database.TimeEntries.Add(entry);
+        _database.SaveChanges();
+        return Ok(entry.AsDto);
+    }
+}
\ No newline at end of file
diff --git a/code/api/src/Endpoints/V1/Entries/DeleteEntryRoute.cs b/code/api/src/Endpoints/V1/Entries/DeleteEntryRoute.cs
index 0850af0..c488ed5 100644
--- a/code/api/src/Endpoints/V1/Entries/DeleteEntryRoute.cs
+++ b/code/api/src/Endpoints/V1/Entries/DeleteEntryRoute.cs
@@ -1,35 +1,33 @@
 namespace IOL.GreatOffice.Api.Endpoints.V1.Entries;
 
-/// <inheritdoc />
 public class DeleteEntryRoute : RouteBaseSync.WithRequest<Guid>.WithActionResult
 {
-	private readonly AppDbContext _context;
+    private readonly MainAppDatabase _database;
 
-	/// <inheritdoc />
-	public DeleteEntryRoute(AppDbContext context) {
-		_context = context;
-	}
+    public DeleteEntryRoute(MainAppDatabase database) {
+        _database = database;
+    }
 
-	/// <summary>
-	/// Delete a time entry.
-	/// </summary>
-	/// <param name="id"></param>
-	/// <returns></returns>
-	[ApiVersion(ApiSpecV1.VERSION_STRING)]
-	[BasicAuthentication(AppConstants.TOKEN_ALLOW_DELETE)]
-	[HttpDelete("~/v{version:apiVersion}/entries/{id:guid}/delete")]
-	[ProducesResponseType(404)]
-	[ProducesResponseType(200)]
-	public override ActionResult Handle(Guid id) {
-		var entry = _context.TimeEntries
-							.Where(c => c.UserId == LoggedInUser.Id)
-							.SingleOrDefault(c => c.Id == id);
-		if (entry == default) {
-			return NotFound();
-		}
+    /// <summary>
+    /// Delete a time entry.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [ApiVersion(ApiSpecV1.VERSION_STRING)]
+    [BasicAuthentication(AppConstants.TOKEN_ALLOW_DELETE)]
+    [HttpDelete("~/v{version:apiVersion}/entries/{id:guid}/delete")]
+    [ProducesResponseType(404)]
+    [ProducesResponseType(200)]
+    public override ActionResult Handle(Guid id) {
+        var entry = _database.TimeEntries
+            .Where(c => c.UserId == LoggedInUser.Id)
+            .SingleOrDefault(c => c.Id == id);
+        if (entry == default) {
+            return NotFound();
+        }
 
-		_context.TimeEntries.Remove(entry);
-		_context.SaveChanges();
-		return Ok();
-	}
-}
+        _database.TimeEntries.Remove(entry);
+        _database.SaveChanges();
+        return Ok();
+    }
+}
\ No newline at end of file
diff --git a/code/api/src/Endpoints/V1/Entries/EntryQueryRoute.cs b/code/api/src/Endpoints/V1/Entries/EntryQueryRoute.cs
index ec6003c..03a64d2 100644
--- a/code/api/src/Endpoints/V1/Entries/EntryQueryRoute.cs
+++ b/code/api/src/Endpoints/V1/Entries/EntryQueryRoute.cs
@@ -2,185 +2,185 @@ namespace IOL.GreatOffice.Api.Endpoints.V1.Entries;
 
 public class EntryQueryRoute : RouteBaseSync.WithRequest<EntryQueryPayload>.WithActionResult<EntryQueryResponse>
 {
-	private readonly ILogger<EntryQueryRoute> _logger;
-	private readonly AppDbContext _context;
+    private readonly ILogger<EntryQueryRoute> _logger;
+    private readonly MainAppDatabase _database;
 
-	public EntryQueryRoute(ILogger<EntryQueryRoute> logger, AppDbContext context) {
-		_logger = logger;
-		_context = context;
-	}
+    public EntryQueryRoute(ILogger<EntryQueryRoute> logger, MainAppDatabase database) {
+        _logger = logger;
+        _database = database;
+    }
 
-	/// <summary>
-	/// Get a list of entries based on a given query.
-	/// </summary>
-	/// <param name="entryQuery"></param>
-	/// <returns></returns>
-	/// <exception cref="ArgumentOutOfRangeException"></exception>
-	[ApiVersion(ApiSpecV1.VERSION_STRING)]
-	[BasicAuthentication(AppConstants.TOKEN_ALLOW_READ)]
-	[HttpPost("~/v{version:apiVersion}/entries/query")]
-	[ProducesResponseType(204)]
-	[ProducesResponseType(400, Type = typeof(KnownProblemModel))]
-	[ProducesResponseType(200, Type = typeof(EntryQueryResponse))]
-	public override ActionResult<EntryQueryResponse> Handle(EntryQueryPayload entryQuery) {
-		var result = new TimeQueryDto();
+    /// <summary>
+    /// Get a list of entries based on a given query.
+    /// </summary>
+    /// <param name="entryQuery"></param>
+    /// <returns></returns>
+    /// <exception cref="ArgumentOutOfRangeException"></exception>
+    [ApiVersion(ApiSpecV1.VERSION_STRING)]
+    [BasicAuthentication(AppConstants.TOKEN_ALLOW_READ)]
+    [HttpPost("~/v{version:apiVersion}/entries/query")]
+    [ProducesResponseType(204)]
+    [ProducesResponseType(400, Type = typeof(KnownProblemModel))]
+    [ProducesResponseType(200, Type = typeof(EntryQueryResponse))]
+    public override ActionResult<EntryQueryResponse> Handle(EntryQueryPayload entryQuery) {
+        var result = new TimeQueryDto();
 
-		Request.Headers.TryGetValue(AppHeaders.BROWSER_TIME_ZONE, out var timeZoneHeader);
-		var tz = TimeZoneInfo.FindSystemTimeZoneById(timeZoneHeader.ToString().HasValue() ? timeZoneHeader.ToString() : "UTC");
-		var offsetInHours = tz.BaseUtcOffset.Hours;
+        Request.Headers.TryGetValue(AppHeaders.BROWSER_TIME_ZONE, out var timeZoneHeader);
+        var tz = TimeZoneInfo.FindSystemTimeZoneById(timeZoneHeader.ToString().HasValue() ? timeZoneHeader.ToString() : "UTC");
+        var offsetInHours = tz.BaseUtcOffset.Hours;
 
-		// this is fine as long as the client is not connecting from Australia: Lord Howe Island
-		// according to https://en.wikipedia.org/wiki/Daylight_saving_time_by_country
-		if (tz.IsDaylightSavingTime(AppDateTime.UtcNow)) {
-			offsetInHours++;
-		}
+        // this is fine as long as the client is not connecting from Australia: Lord Howe Island
+        // according to https://en.wikipedia.org/wiki/Daylight_saving_time_by_country
+        if (tz.IsDaylightSavingTime(AppDateTime.UtcNow)) {
+            offsetInHours++;
+        }
 
-		_logger.LogInformation("Request time zone (" + tz.Id + ") offset is: " + offsetInHours + " hours");
-		var requestDateTime = TimeZoneInfo.ConvertTimeFromUtc(AppDateTime.UtcNow, tz);
-		_logger.LogInformation("Querying data with date time: " + requestDateTime.ToString("u"));
+        _logger.LogInformation("Request time zone (" + tz.Id + ") offset is: " + offsetInHours + " hours");
+        var requestDateTime = TimeZoneInfo.ConvertTimeFromUtc(AppDateTime.UtcNow, tz);
+        _logger.LogInformation("Querying data with date time: " + requestDateTime.ToString("u"));
 
-		var skipCount = 0;
-		if (entryQuery.Page > 1) {
-			skipCount = entryQuery.PageSize * entryQuery.Page;
-		}
+        var skipCount = 0;
+        if (entryQuery.Page > 1) {
+            skipCount = entryQuery.PageSize * entryQuery.Page;
+        }
 
-		result.Page = entryQuery.Page;
-		result.PageSize = entryQuery.PageSize;
+        result.Page = entryQuery.Page;
+        result.PageSize = entryQuery.PageSize;
 
-		var baseQuery = _context.TimeEntries
-								.AsNoTracking()
-								.Include(c => c.Category)
-								.Include(c => c.Labels)
-								.Where(c => c.UserId == LoggedInUser.Id)
-								.ConditionalWhere(entryQuery.Categories?.Any() ?? false, c => entryQuery.Categories.Any(p => p.Id == c.Category.Id))
-								.ConditionalWhere(entryQuery.Labels?.Any() ?? false, c => c.Labels.Any(l => entryQuery.Labels.Any(p => p.Id == l.Id)))
-								.OrderByDescending(c => c.Start);
+        var baseQuery = _database.TimeEntries
+            .AsNoTracking()
+            .Include(c => c.Category)
+            .Include(c => c.Labels)
+            .Where(c => c.UserId == LoggedInUser.Id)
+            .ConditionalWhere(entryQuery.Categories?.Any() ?? false, c => entryQuery.Categories.Any(p => p.Id == c.Category.Id))
+            .ConditionalWhere(entryQuery.Labels?.Any() ?? false, c => c.Labels.Any(l => entryQuery.Labels.Any(p => p.Id == l.Id)))
+            .OrderByDescending(c => c.Start);
 
-		switch (entryQuery.Duration) {
-			case TimeEntryQueryDuration.TODAY:
-				var baseTodaysEntries = baseQuery
-						.Where(c => DateTime.Compare(c.Start.AddHours(offsetInHours).Date, AppDateTime.UtcNow.Date) == 0);
-				var baseTodaysEntriesCount = baseTodaysEntries.Count();
+        switch (entryQuery.Duration) {
+            case TimeEntryQueryDuration.TODAY:
+                var baseTodaysEntries = baseQuery
+                    .Where(c => DateTime.Compare(c.Start.AddHours(offsetInHours).Date, AppDateTime.UtcNow.Date) == 0);
+                var baseTodaysEntriesCount = baseTodaysEntries.Count();
 
-				if (baseTodaysEntriesCount == 0) {
-					return NoContent();
-				}
+                if (baseTodaysEntriesCount == 0) {
+                    return NoContent();
+                }
 
-				result.TotalSize = baseTodaysEntriesCount;
-				result.TotalPageCount = Convert.ToInt32(Math.Round((double)baseTodaysEntriesCount / entryQuery.PageSize));
+                result.TotalSize = baseTodaysEntriesCount;
+                result.TotalPageCount = Convert.ToInt32(Math.Round((double) baseTodaysEntriesCount / entryQuery.PageSize));
 
-				var pagedTodaysEntries = baseTodaysEntries.Skip(skipCount).Take(entryQuery.PageSize);
+                var pagedTodaysEntries = baseTodaysEntries.Skip(skipCount).Take(entryQuery.PageSize);
 
-				result.Results.AddRange(pagedTodaysEntries.Select(c => c.AsDto));
-				break;
-			case TimeEntryQueryDuration.THIS_WEEK:
-				var lastMonday = AppDateTime.UtcNow.StartOfWeek(DayOfWeek.Monday);
+                result.Results.AddRange(pagedTodaysEntries.Select(c => c.AsDto));
+                break;
+            case TimeEntryQueryDuration.THIS_WEEK:
+                var lastMonday = AppDateTime.UtcNow.StartOfWeek(DayOfWeek.Monday);
 
-				var baseEntriesThisWeek = baseQuery
-						.Where(c => c.Start.AddHours(offsetInHours).Date >= lastMonday.Date && c.Start.AddHours(offsetInHours).Date <= AppDateTime.UtcNow.Date);
+                var baseEntriesThisWeek = baseQuery
+                    .Where(c => c.Start.AddHours(offsetInHours).Date >= lastMonday.Date && c.Start.AddHours(offsetInHours).Date <= AppDateTime.UtcNow.Date);
 
-				var baseEntriesThisWeekCount = baseEntriesThisWeek.Count();
+                var baseEntriesThisWeekCount = baseEntriesThisWeek.Count();
 
-				if (baseEntriesThisWeekCount == 0) {
-					return NoContent();
-				}
+                if (baseEntriesThisWeekCount == 0) {
+                    return NoContent();
+                }
 
-				result.TotalSize = baseEntriesThisWeekCount;
-				result.TotalPageCount = Convert.ToInt32(Math.Round((double)baseEntriesThisWeekCount / entryQuery.PageSize));
+                result.TotalSize = baseEntriesThisWeekCount;
+                result.TotalPageCount = Convert.ToInt32(Math.Round((double) baseEntriesThisWeekCount / entryQuery.PageSize));
 
-				var pagedEntriesThisWeek = baseEntriesThisWeek.Skip(skipCount).Take(entryQuery.PageSize);
+                var pagedEntriesThisWeek = baseEntriesThisWeek.Skip(skipCount).Take(entryQuery.PageSize);
 
-				result.Results.AddRange(pagedEntriesThisWeek.Select(c => c.AsDto));
-				break;
-			case TimeEntryQueryDuration.THIS_MONTH:
-				var baseEntriesThisMonth = baseQuery
-						.Where(c => c.Start.AddHours(offsetInHours).Month == AppDateTime.UtcNow.Month
-									&& c.Start.AddHours(offsetInHours).Year == AppDateTime.UtcNow.Year);
-				var baseEntriesThisMonthCount = baseEntriesThisMonth.Count();
-				if (baseEntriesThisMonthCount == 0) {
-					return NoContent();
-				}
+                result.Results.AddRange(pagedEntriesThisWeek.Select(c => c.AsDto));
+                break;
+            case TimeEntryQueryDuration.THIS_MONTH:
+                var baseEntriesThisMonth = baseQuery
+                    .Where(c => c.Start.AddHours(offsetInHours).Month == AppDateTime.UtcNow.Month
+                                && c.Start.AddHours(offsetInHours).Year == AppDateTime.UtcNow.Year);
+                var baseEntriesThisMonthCount = baseEntriesThisMonth.Count();
+                if (baseEntriesThisMonthCount == 0) {
+                    return NoContent();
+                }
 
-				result.TotalSize = baseEntriesThisMonthCount;
-				result.TotalPageCount = Convert.ToInt32(Math.Round((double)baseEntriesThisMonthCount / entryQuery.PageSize));
+                result.TotalSize = baseEntriesThisMonthCount;
+                result.TotalPageCount = Convert.ToInt32(Math.Round((double) baseEntriesThisMonthCount / entryQuery.PageSize));
 
-				var pagedEntriesThisMonth = baseEntriesThisMonth.Skip(skipCount).Take(entryQuery.PageSize);
+                var pagedEntriesThisMonth = baseEntriesThisMonth.Skip(skipCount).Take(entryQuery.PageSize);
 
-				result.Results.AddRange(pagedEntriesThisMonth.Select(c => c.AsDto));
-				break;
-			case TimeEntryQueryDuration.THIS_YEAR:
-				var baseEntriesThisYear = baseQuery
-						.Where(c => c.Start.AddHours(offsetInHours).Year == AppDateTime.UtcNow.Year);
+                result.Results.AddRange(pagedEntriesThisMonth.Select(c => c.AsDto));
+                break;
+            case TimeEntryQueryDuration.THIS_YEAR:
+                var baseEntriesThisYear = baseQuery
+                    .Where(c => c.Start.AddHours(offsetInHours).Year == AppDateTime.UtcNow.Year);
 
-				var baseEntriesThisYearCount = baseEntriesThisYear.Count();
-				if (baseEntriesThisYearCount == 0) {
-					return NoContent();
-				}
+                var baseEntriesThisYearCount = baseEntriesThisYear.Count();
+                if (baseEntriesThisYearCount == 0) {
+                    return NoContent();
+                }
 
-				result.TotalSize = baseEntriesThisYearCount;
-				result.TotalPageCount = Convert.ToInt32(Math.Round((double)baseEntriesThisYearCount / entryQuery.PageSize));
+                result.TotalSize = baseEntriesThisYearCount;
+                result.TotalPageCount = Convert.ToInt32(Math.Round((double) baseEntriesThisYearCount / entryQuery.PageSize));
 
-				var pagedEntriesThisYear = baseEntriesThisYear.Skip(skipCount).Take(entryQuery.PageSize);
+                var pagedEntriesThisYear = baseEntriesThisYear.Skip(skipCount).Take(entryQuery.PageSize);
 
-				result.Results.AddRange(pagedEntriesThisYear.Select(c => c.AsDto));
-				break;
-			case TimeEntryQueryDuration.SPECIFIC_DATE:
-				var date = DateTime.SpecifyKind(entryQuery.SpecificDate, DateTimeKind.Utc);
-				var baseEntriesOnThisDate = baseQuery.Where(c => c.Start.AddHours(offsetInHours).Date == date.Date);
-				var baseEntriesOnThisDateCount = baseEntriesOnThisDate.Count();
+                result.Results.AddRange(pagedEntriesThisYear.Select(c => c.AsDto));
+                break;
+            case TimeEntryQueryDuration.SPECIFIC_DATE:
+                var date = DateTime.SpecifyKind(entryQuery.SpecificDate, DateTimeKind.Utc);
+                var baseEntriesOnThisDate = baseQuery.Where(c => c.Start.AddHours(offsetInHours).Date == date.Date);
+                var baseEntriesOnThisDateCount = baseEntriesOnThisDate.Count();
 
-				if (baseEntriesOnThisDateCount == 0) {
-					return NoContent();
-				}
+                if (baseEntriesOnThisDateCount == 0) {
+                    return NoContent();
+                }
 
-				result.TotalSize = baseEntriesOnThisDateCount;
-				result.TotalPageCount = Convert.ToInt32(Math.Round((double)baseEntriesOnThisDateCount / entryQuery.PageSize));
+                result.TotalSize = baseEntriesOnThisDateCount;
+                result.TotalPageCount = Convert.ToInt32(Math.Round((double) baseEntriesOnThisDateCount / entryQuery.PageSize));
 
-				var pagedEntriesOnThisDate = baseEntriesOnThisDate.Skip(skipCount).Take(entryQuery.PageSize);
+                var pagedEntriesOnThisDate = baseEntriesOnThisDate.Skip(skipCount).Take(entryQuery.PageSize);
 
-				result.Results.AddRange(pagedEntriesOnThisDate.Select(c => c.AsDto));
-				break;
-			case TimeEntryQueryDuration.DATE_RANGE:
-				if (entryQuery.DateRange.From == default) {
-					return BadRequest(new KnownProblemModel("Invalid query", "From date cannot be empty"));
-				}
+                result.Results.AddRange(pagedEntriesOnThisDate.Select(c => c.AsDto));
+                break;
+            case TimeEntryQueryDuration.DATE_RANGE:
+                if (entryQuery.DateRange.From == default) {
+                    return BadRequest(new KnownProblemModel("Invalid query", "From date cannot be empty"));
+                }
 
-				var fromDate = DateTime.SpecifyKind(entryQuery.DateRange.From, DateTimeKind.Utc);
+                var fromDate = DateTime.SpecifyKind(entryQuery.DateRange.From, DateTimeKind.Utc);
 
-				if (entryQuery.DateRange.To == default) {
-					return BadRequest(new KnownProblemModel("Invalid query", "To date cannot be empty"));
-				}
+                if (entryQuery.DateRange.To == default) {
+                    return BadRequest(new KnownProblemModel("Invalid query", "To date cannot be empty"));
+                }
 
-				var toDate = DateTime.SpecifyKind(entryQuery.DateRange.To, DateTimeKind.Utc);
+                var toDate = DateTime.SpecifyKind(entryQuery.DateRange.To, DateTimeKind.Utc);
 
-				if (DateTime.Compare(fromDate, toDate) > 0) {
-					return BadRequest(new KnownProblemModel("Invalid query", "To date cannot be less than From date"));
-				}
+                if (DateTime.Compare(fromDate, toDate) > 0) {
+                    return BadRequest(new KnownProblemModel("Invalid query", "To date cannot be less than From date"));
+                }
 
-				var baseDateRangeEntries = baseQuery
-						.Where(c => c.Start.AddHours(offsetInHours).Date > fromDate && c.Start.AddHours(offsetInHours).Date <= toDate);
+                var baseDateRangeEntries = baseQuery
+                    .Where(c => c.Start.AddHours(offsetInHours).Date > fromDate && c.Start.AddHours(offsetInHours).Date <= toDate);
 
-				var baseDateRangeEntriesCount = baseDateRangeEntries.Count();
-				if (baseDateRangeEntriesCount == 0) {
-					return NoContent();
-				}
+                var baseDateRangeEntriesCount = baseDateRangeEntries.Count();
+                if (baseDateRangeEntriesCount == 0) {
+                    return NoContent();
+                }
 
-				result.TotalSize = baseDateRangeEntriesCount;
-				result.TotalPageCount = Convert.ToInt32(Math.Round((double)baseDateRangeEntriesCount / entryQuery.PageSize));
+                result.TotalSize = baseDateRangeEntriesCount;
+                result.TotalPageCount = Convert.ToInt32(Math.Round((double) baseDateRangeEntriesCount / entryQuery.PageSize));
 
-				var pagedDateRangeEntries = baseDateRangeEntries.Skip(skipCount).Take(entryQuery.PageSize);
+                var pagedDateRangeEntries = baseDateRangeEntries.Skip(skipCount).Take(entryQuery.PageSize);
 
-				result.Results.AddRange(pagedDateRangeEntries.Select(c => c.AsDto));
-				break;
-			default:
-				throw new ArgumentOutOfRangeException(nameof(entryQuery), "Unknown duration for query");
-		}
+                result.Results.AddRange(pagedDateRangeEntries.Select(c => c.AsDto));
+                break;
+            default:
+                throw new ArgumentOutOfRangeException(nameof(entryQuery), "Unknown duration for query");
+        }
 
-		if (result.Results.Any() && result.Page == 0) {
-			result.Page = 1;
-			result.TotalPageCount = 1;
-		}
+        if (result.Results.Any() && result.Page == 0) {
+            result.Page = 1;
+            result.TotalPageCount = 1;
+        }
 
-		return Ok(result);
-	}
-}
+        return Ok(result);
+    }
+}
\ No newline at end of file
diff --git a/code/api/src/Endpoints/V1/Entries/GetEntryRoute.cs b/code/api/src/Endpoints/V1/Entries/GetEntryRoute.cs
index 87038db..6e064c7 100644
--- a/code/api/src/Endpoints/V1/Entries/GetEntryRoute.cs
+++ b/code/api/src/Endpoints/V1/Entries/GetEntryRoute.cs
@@ -2,33 +2,33 @@ namespace IOL.GreatOffice.Api.Endpoints.V1.Entries;
 
 public class GetEntryRoute : RouteBaseSync.WithRequest<Guid>.WithActionResult<TimeEntry.TimeEntryDto>
 {
-	private readonly AppDbContext _context;
+    private readonly MainAppDatabase _database;
 
-	public GetEntryRoute(AppDbContext context) {
-		_context = context;
-	}
+    public GetEntryRoute(MainAppDatabase database) {
+        _database = database;
+    }
 
-	/// <summary>
-	/// Get a spesific time entry.
-	/// </summary>
-	/// <param name="id"></param>
-	/// <returns></returns>
-	[ApiVersion(ApiSpecV1.VERSION_STRING)]
-	[BasicAuthentication(AppConstants.TOKEN_ALLOW_READ)]
-	[HttpGet("~/v{version:apiVersion}/entries/{id:guid}")]
-	[ProducesResponseType(404)]
-	[ProducesResponseType(200, Type = typeof(TimeEntry.TimeEntryDto))]
-	public override ActionResult<TimeEntry.TimeEntryDto> Handle(Guid id) {
-		var entry = _context.TimeEntries
-							.Where(c => c.UserId == LoggedInUser.Id)
-							.Include(c => c.Category)
-							.Include(c => c.Labels)
-							.SingleOrDefault(c => c.Id == id);
+    /// <summary>
+    /// Get a spesific time entry.
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [ApiVersion(ApiSpecV1.VERSION_STRING)]
+    [BasicAuthentication(AppConstants.TOKEN_ALLOW_READ)]
+    [HttpGet("~/v{version:apiVersion}/entries/{id:guid}")]
+    [ProducesResponseType(404)]
+    [ProducesResponseType(200, Type = typeof(TimeEntry.TimeEntryDto))]
+    public override ActionResult<TimeEntry.TimeEntryDto> Handle(Guid id) {
+        var entry = _database.TimeEntries
+            .Where(c => c.UserId == LoggedInUser.Id)
+            .Include(c => c.Category)
+            .Include(c => c.Labels)
+            .SingleOrDefault(c => c.Id == id);
 
-		if (entry == default) {
-			return NotFound();
-		}
+        if (entry == default) {
+            return NotFound();
+        }
 
-		return Ok(entry);
-	}
-}
+        return Ok(entry);
+    }
+}
\ No newline at end of file
diff --git a/code/api/src/Endpoints/V1/Entries/UpdateEntryRoute.cs b/code/api/src/Endpoints/V1/Entries/UpdateEntryRoute.cs
index 09e3b9c..2254214 100644
--- a/code/api/src/Endpoints/V1/Entries/UpdateEntryRoute.cs
+++ b/code/api/src/Endpoints/V1/Entries/UpdateEntryRoute.cs
@@ -2,65 +2,65 @@ namespace IOL.GreatOffice.Api.Endpoints.V1.Entries;
 
 public class UpdateEntryRoute : RouteBaseSync.WithRequest<TimeEntry.TimeEntryDto>.WithActionResult<TimeEntry.TimeEntryDto>
 {
-	private readonly AppDbContext _context;
+    private readonly MainAppDatabase _database;
 
-	public UpdateEntryRoute(AppDbContext context) {
-		_context = context;
-	}
+    public UpdateEntryRoute(MainAppDatabase database) {
+        _database = database;
+    }
 
-	/// <summary>
-	/// Update a time entry.
-	/// </summary>
-	/// <param name="timeEntryTimeEntryDto"></param>
-	/// <returns></returns>
-	[ApiVersion(ApiSpecV1.VERSION_STRING)]
-	[BasicAuthentication(AppConstants.TOKEN_ALLOW_UPDATE)]
-	[HttpPost("~/v{version:apiVersion}/entries/update")]
-	[ProducesResponseType(404, Type = typeof(KnownProblemModel))]
-	[ProducesResponseType(200, Type = typeof(TimeEntry.TimeEntryDto))]
-	public override ActionResult<TimeEntry.TimeEntryDto> Handle(TimeEntry.TimeEntryDto timeEntryTimeEntryDto) {
-		var entry = _context.TimeEntries
-							.Where(c => c.UserId == LoggedInUser.Id)
-							.Include(c => c.Labels)
-							.SingleOrDefault(c => c.Id == timeEntryTimeEntryDto.Id);
+    /// <summary>
+    /// Update a time entry.
+    /// </summary>
+    /// <param name="timeEntryTimeEntryDto"></param>
+    /// <returns></returns>
+    [ApiVersion(ApiSpecV1.VERSION_STRING)]
+    [BasicAuthentication(AppConstants.TOKEN_ALLOW_UPDATE)]
+    [HttpPost("~/v{version:apiVersion}/entries/update")]
+    [ProducesResponseType(404, Type = typeof(KnownProblemModel))]
+    [ProducesResponseType(200, Type = typeof(TimeEntry.TimeEntryDto))]
+    public override ActionResult<TimeEntry.TimeEntryDto> Handle(TimeEntry.TimeEntryDto timeEntryTimeEntryDto) {
+        var entry = _database.TimeEntries
+            .Where(c => c.UserId == LoggedInUser.Id)
+            .Include(c => c.Labels)
+            .SingleOrDefault(c => c.Id == timeEntryTimeEntryDto.Id);
 
-		if (entry == default) {
-			return NotFound();
-		}
+        if (entry == default) {
+            return NotFound();
+        }
 
-		var category = _context.TimeCategories
-							   .Where(c => c.UserId == LoggedInUser.Id)
-							   .SingleOrDefault(c => c.Id == timeEntryTimeEntryDto.Category.Id);
-		if (category == default) {
-			return NotFound(new KnownProblemModel("Not found", $"Could not find category {timeEntryTimeEntryDto.Category.Name}"));
-		}
+        var category = _database.TimeCategories
+            .Where(c => c.UserId == LoggedInUser.Id)
+            .SingleOrDefault(c => c.Id == timeEntryTimeEntryDto.Category.Id);
+        if (category == default) {
+            return NotFound(new KnownProblemModel("Not found", $"Could not find category {timeEntryTimeEntryDto.Category.Name}"));
+        }
 
-		entry.Start = timeEntryTimeEntryDto.Start.ToUniversalTime();
-		entry.Stop = timeEntryTimeEntryDto.Stop.ToUniversalTime();
-		entry.Description = timeEntryTimeEntryDto.Description;
-		entry.Category = category;
+        entry.Start = timeEntryTimeEntryDto.Start.ToUniversalTime();
+        entry.Stop = timeEntryTimeEntryDto.Stop.ToUniversalTime();
+        entry.Description = timeEntryTimeEntryDto.Description;
+        entry.Category = category;
 
-		if (timeEntryTimeEntryDto.Labels?.Count > 0) {
-			var labels = new List<TimeLabel>();
+        if (timeEntryTimeEntryDto.Labels?.Count > 0) {
+            var labels = new List<TimeLabel>();
 
-			foreach (var labelDto in timeEntryTimeEntryDto.Labels) {
-				var label = _context.TimeLabels
-									.Where(c => c.UserId == LoggedInUser.Id)
-									.SingleOrDefault(c => c.Id == labelDto.Id);
+            foreach (var labelDto in timeEntryTimeEntryDto.Labels) {
+                var label = _database.TimeLabels
+                    .Where(c => c.UserId == LoggedInUser.Id)
+                    .SingleOrDefault(c => c.Id == labelDto.Id);
 
-				if (label == default) {
-					continue;
-				}
+                if (label == default) {
+                    continue;
+                }
 
-				labels.Add(label);
-			}
+                labels.Add(label);
+            }
 
-			entry.Labels = labels;
-		} else {
-			entry.Labels = default;
-		}
+            entry.Labels = labels;
+        } else {
+            entry.Labels = default;
+        }
 
-		_context.SaveChanges();
-		return Ok(entry.AsDto);
-	}
-}
+        _database.SaveChanges();
+        return Ok(entry.AsDto);
+    }
+}
\ No newline at end of file