refactor: v1 deprecation — migrate legacy tables to V4

src/API/Nocturne.API/Controllers/V1/CountController.cs

@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Nocturne.API.Attributes;
+using Nocturne.Core.Contracts.Entries;
 using Nocturne.Core.Contracts.Repositories;
 
 namespace Nocturne.API.Controllers.V1;
@@ -8,7 +9,7 @@ namespace Nocturne.API.Controllers.V1;
 /// Count controller that provides 1:1 compatibility with Nightscout count endpoints.
 /// Implements the /api/v1/count/* endpoints from the legacy JavaScript implementation.
 /// </summary>
-/// <seealso cref="IEntryRepository"/>
+/// <seealso cref="IEntryStore"/>
 /// <seealso cref="ITreatmentRepository"/>
 /// <seealso cref="IDeviceStatusRepository"/>
 /// <seealso cref="IProfileRepository"/>
@@ -18,7 +19,7 @@ namespace Nocturne.API.Controllers.V1;
 [Route("api/v1/[controller]")]
 public class CountController : ControllerBase
 {
-    private readonly IEntryRepository _entryRepository;
+    private readonly IEntryStore _entryStore;
     private readonly ITreatmentRepository _treatmentRepository;
     private readonly IDeviceStatusRepository _deviceStatusRepository;
     private readonly IProfileRepository _profileRepository;
@@ -29,15 +30,15 @@ public class CountController : ControllerBase
     /// <summary>
     /// Initializes a new instance of <see cref="CountController"/>.
     /// </summary>
-    /// <param name="entryRepository">Repository for glucose entry records.</param>
+    /// <param name="entryStore">Store for glucose entry records.</param>
     /// <param name="treatmentRepository">Repository for treatment records.</param>
     /// <param name="deviceStatusRepository">Repository for device status records.</param>
     /// <param name="profileRepository">Repository for profile records.</param>
     /// <param name="foodRepository">Repository for food records.</param>
     /// <param name="activityRepository">Repository for activity records.</param>
     /// <param name="logger">Logger instance.</param>
     public CountController(
-        IEntryRepository entryRepository,
+        IEntryStore entryStore,
         ITreatmentRepository treatmentRepository,
         IDeviceStatusRepository deviceStatusRepository,
         IProfileRepository profileRepository,
@@ -46,7 +47,7 @@ public CountController(
         ILogger<CountController> logger
     )
     {
-        _entryRepository = entryRepository;
+        _entryStore = entryStore;
         _treatmentRepository = treatmentRepository;
         _deviceStatusRepository = deviceStatusRepository;
         _profileRepository = profileRepository;
@@ -80,7 +81,7 @@ public async Task<ActionResult<CountResponse>> CountEntries(
 
         try
         {
-            var count = await _entryRepository.CountEntriesAsync(find, type, cancellationToken);
+            var count = await _entryStore.CountAsync(find, type, cancellationToken);
 
             _logger.LogDebug("Found {Count} entries matching criteria", count);
             return Ok(new CountResponse { Count = count });
@@ -287,7 +288,7 @@ public async Task<ActionResult<CountResponse>> CountGeneric(
             switch (storage.ToLowerInvariant())
             {
                 case "entries":
-                    count = await _entryRepository.CountEntriesAsync(
+                    count = await _entryStore.CountAsync(
                         find,
                         type,
                         cancellationToken

src/API/Nocturne.API/Controllers/V1/DebugController.cs

@@ -1,24 +1,24 @@
 using Microsoft.AspNetCore.Mvc;
+using Nocturne.Core.Contracts.Entries;
 using Nocturne.Core.Models;
-using Nocturne.Core.Contracts.Repositories;
 
 namespace Nocturne.API.Controllers.V1;
 
 /// <summary>
 /// V1 debug controller for development and diagnostics.
 /// Provides basic database connectivity tests against the PostgreSQL data store.
 /// </summary>
-/// <seealso cref="IEntryRepository"/>
+/// <seealso cref="IEntryStore"/>
 [ApiController]
 [Route("api/v1/[controller]")]
 public class DebugController : ControllerBase
 {
-    private readonly IEntryRepository _entryRepository;
+    private readonly IEntryStore _store;
     private readonly ILogger<DebugController> _logger;
 
-    public DebugController(IEntryRepository entryRepository, ILogger<DebugController> logger)
+    public DebugController(IEntryStore store, ILogger<DebugController> logger)
     {
-        _entryRepository = entryRepository;
+        _store = store;
         _logger = logger;
     }
 
@@ -29,20 +29,15 @@ public async Task<IActionResult> TestPostgreSqlConnection()
         {
             _logger.LogInformation("Testing PostgreSQL connection");
 
-            // Count documents
-            var count = await _entryRepository.CountEntriesAsync();
-            _logger.LogInformation("Entries table document count: {Count}", count);
-
-            // Try to get recent entries
-            var entries = await _entryRepository.GetEntriesAsync("sgv", 1, 0);
+            // Try to get recent entries as a connectivity check
+            var entries = await _store.QueryAsync(new EntryQuery { Type = "sgv", Count = 1 });
             var firstEntry = entries.FirstOrDefault();
 
             return Ok(
                 new
                 {
                     DatabaseType = "PostgreSQL",
-                    TableName = "entries",
-                    DocumentCount = count,
+                    HasEntries = firstEntry != null,
                     SampleEntry = firstEntry,
                     Status = "Success",
                 }
@@ -68,7 +63,7 @@ public async Task<IActionResult> GetEntriesDirect()
     {
         try
         {
-            var entries = await _entryRepository.GetEntriesAsync("sgv", 5, 0);
+            var entries = await _store.QueryAsync(new EntryQuery { Type = "sgv", Count = 5 });
             return Ok(entries);
         }
         catch (Exception ex)

src/API/Nocturne.API/Controllers/V3/EntriesController.cs

@@ -9,16 +9,13 @@
 using Nocturne.Core.Contracts.Alerts;
 using Nocturne.Core.Models;
 using Nocturne.Core.Models.Extensions;
-using Nocturne.Core.Contracts.Repositories;
-
 namespace Nocturne.API.Controllers.V3;
 
 /// <summary>
 /// V3 Entries controller that provides full V3 API compatibility with Nightscout entries endpoints.
 /// Implements the /api/v3/entries endpoints with pagination, field selection, sorting, and advanced filtering.
 /// </summary>
 /// <seealso cref="IEntryService"/>
-/// <seealso cref="IEntryRepository"/>
 /// <seealso cref="IAlertOrchestrator"/>
 /// <seealso cref="Entry"/>
 /// <seealso cref="BaseV3Controller{T}"/>
@@ -27,20 +24,17 @@ namespace Nocturne.API.Controllers.V3;
 [Authorize(Policy = PolicyNames.HasPermissions)]
 public class EntriesController : BaseV3Controller<Entry>
 {
-    private readonly IEntryRepository _entries;
     private readonly IEntryService _entryService;
     private readonly IAlertOrchestrator _alertOrchestrator;
 
     public EntriesController(
-        IEntryRepository entries,
         IDocumentProcessingService documentProcessingService,
         IEntryService entryService,
         IAlertOrchestrator alertOrchestrator,
         ILogger<EntriesController> logger
     )
         : base(documentProcessingService, logger)
     {
-        _entries = entries;
         _entryService = entryService;
         _alertOrchestrator = alertOrchestrator;
     }
@@ -94,8 +88,8 @@ public async Task<ActionResult> GetEntries(CancellationToken cancellationToken =
             var hasSortDesc = HttpContext?.Request.Query.ContainsKey("sort$desc") ?? false;
             var reverseResults = !hasSortDesc && ExtractSortDirection(parameters.Sort);
 
-            // Get entries using existing V1 backend with V3 parameters
-            var entries = await _entries.GetEntriesWithAdvancedFilterAsync(
+            // Get entries using service layer with V3 parameters
+            var entries = await _entryService.GetEntriesWithAdvancedFilterAsync(
                 type: type,
                 count: parameters.Limit,
                 skip: parameters.Offset,
@@ -159,7 +153,7 @@ public async Task<ActionResult<Entry>> GetEntry(
 
         try
         {
-            var entry = await _entries.GetEntryByIdAsync(id, cancellationToken);
+            var entry = await _entryService.GetEntryByIdAsync(id, cancellationToken);
 
             if (entry == null)
             {
@@ -406,7 +400,7 @@ public async Task<ActionResult<Entry>> UpdateEntry(
             var processedEntry = _documentProcessingService.ProcessEntry(entry);
 
             // Update in database
-            var updatedEntry = await _entries.UpdateEntryAsync(
+            var updatedEntry = await _entryService.UpdateEntryAsync(
                 id,
                 processedEntry,
                 cancellationToken
@@ -458,7 +452,7 @@ public async Task<ActionResult> DeleteEntry(
 
         try
         {
-            var deleted = await _entries.DeleteEntryAsync(id, cancellationToken);
+            var deleted = await _entryService.DeleteEntryAsync(id, cancellationToken);
 
             if (!deleted)
             {
@@ -509,10 +503,16 @@ public async Task<ActionResult> GetEntryHistory(
         {
             limit = Math.Min(Math.Max(limit, 1), 1000);
 
-            var entries = await _entries.GetEntriesModifiedSinceAsync(
-                lastModified,
-                limit,
-                cancellationToken
+            // Build a find query for entries since the given timestamp
+            var findQuery = $"{{\"date\":{{\"$gte\":{lastModified}}}}}";
+            var entries = await _entryService.GetEntriesWithAdvancedFilterAsync(
+                type: null,
+                count: limit,
+                skip: 0,
+                findQuery: findQuery,
+                dateString: null,
+                reverseResults: false,
+                cancellationToken: cancellationToken
             );
             var v3Entries = entries.ToV3Responses().ToList();
             return CreateV3SuccessResponse(v3Entries);
@@ -637,25 +637,6 @@ public async Task<ActionResult> GetEntryHistory(
         return JsonSerializer.Serialize(conditions);
     }
 
-    private async Task<long> GetTotalCountAsync(
-        string? type,
-        string? findQuery,
-        CancellationToken cancellationToken
-    )
-    {
-        try
-        {
-            // Use the count endpoint to get total
-            return await _entries.CountEntriesAsync(findQuery, type, cancellationToken);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogWarning(ex, "Failed to get total count for V3 entries, using estimate");
-            // Return a reasonable estimate if count fails
-            return 1000;
-        }
-    }
-
     private DateTimeOffset GetLastModified(List<Entry> entries)
     {
         if (entries.Count == 0)

src/API/Nocturne.API/Controllers/V4/Analytics/RetrospectiveController.cs

@@ -6,7 +6,6 @@
 using Nocturne.Core.Contracts.Treatments;
 using Nocturne.Core.Contracts.Glucose;
 using Nocturne.Core.Models;
-using Nocturne.Core.Contracts.Repositories;
 namespace Nocturne.API.Controllers.V4.Analytics;
 /// <summary>
 /// Controller providing retrospective (day-in-review) diabetes data.
@@ -40,7 +39,6 @@ public class RetrospectiveController : ControllerBase
     private readonly ITreatmentService _treatmentService;
     private readonly IDeviceStatusService _deviceStatusService;
     private readonly IProfileService _profileService;
-    private readonly IEntryRepository _entryRepository;
     private readonly ILogger<RetrospectiveController> _logger;
     public RetrospectiveController(
         IIobService iobService,
@@ -49,7 +47,6 @@ public RetrospectiveController(
         ITreatmentService treatmentService,
         IDeviceStatusService deviceStatusService,
         IProfileService profileService,
-        IEntryRepository entryRepository,
         ILogger<RetrospectiveController> logger
     )
     {
@@ -59,7 +56,6 @@ ILogger<RetrospectiveController> logger
         _treatmentService = treatmentService;
         _deviceStatusService = deviceStatusService;
         _profileService = profileService;
-        _entryRepository = entryRepository;
         _logger = logger;
     }
     /// <summary>
@@ -93,11 +89,13 @@ public async Task<ActionResult<RetrospectiveDataResponse>> GetRetrospectiveData(
             var fromMills = time - (30 * 60 * 1000); // 30 minutes before
             var toMills = time + (5 * 60 * 1000);    // 5 minutes after
             var findQuery = $"{{\"mills\":{{\"$gte\":{fromMills},\"$lte\":{toMills}}}}}";
-            var entries = await _entryRepository.GetEntriesWithAdvancedFilterAsync(
+            var entries = await _entryService.GetEntriesWithAdvancedFilterAsync(
                 type: "sgv",
                 count: 50,
                 skip: 0,
                 findQuery: findQuery,
+                dateString: null,
+                reverseResults: false,
                 cancellationToken: cancellationToken
             );
             var entryList = entries?.ToList() ?? new List<Entry>();

src/API/Nocturne.API/Controllers/V4/DevOnly/DevAdminController.cs

@@ -656,7 +656,9 @@ public async Task<ActionResult<List<DevTenantSummaryDto>>> ListTenants(Cancellat
         {
             await SetTenantGuc(tenant.Id, ct);
 
-            var entryCount = await _db.Entries.LongCountAsync(ct);
+            var entryCount = (long)await _db.SensorGlucose.CountAsync(ct)
+                + await _db.MeterGlucose.CountAsync(ct)
+                + await _db.Calibrations.CountAsync(ct);
             var treatmentCount = await _db.Treatments.LongCountAsync(ct);
             var deviceStatusCount = await _db.DeviceStatuses.LongCountAsync(ct);
             var profileCount = await _db.Profiles.CountAsync(ct);
@@ -673,9 +675,9 @@ public async Task<ActionResult<List<DevTenantSummaryDto>>> ListTenants(Cancellat
                     c.LastErrorMessage))
                 .ToListAsync(ct);
 
-            var latestEntry = await _db.Entries
-                .OrderByDescending(e => e.SysCreatedAt)
-                .Select(e => (DateTime?)e.SysCreatedAt)
+            var latestEntry = await _db.SensorGlucose
+                .OrderByDescending(e => e.Timestamp)
+                .Select(e => (DateTime?)e.Timestamp)
                 .FirstOrDefaultAsync(ct);
 
             summaries.Add(new DevTenantSummaryDto(

src/API/Nocturne.API/Controllers/V4/Platform/ServicesController.cs

@@ -3,8 +3,8 @@
 using Nocturne.API.Models;
 using Nocturne.API.Services.Connectors;
 using Nocturne.Core.Contracts.Connectors;
-using Nocturne.Core.Models.Services;
 using Nocturne.Core.Contracts.Repositories;
+using Nocturne.Core.Models.Services;
 
 namespace Nocturne.API.Controllers.V4.Platform;
 
@@ -22,7 +22,6 @@ namespace Nocturne.API.Controllers.V4.Platform;
 public class ServicesController : ControllerBase
 {
     private readonly IDataSourceService _dataSourceService;
-    private readonly IEntryRepository _entryRepository;
     private readonly ITreatmentRepository _treatmentRepository;
     private readonly IConnectorHealthService _connectorHealthService;
     private readonly IConnectorSyncService _connectorSyncService;
@@ -33,15 +32,13 @@ public class ServicesController : ControllerBase
     /// Initializes a new instance of <see cref="ServicesController"/>.
     /// </summary>
     /// <param name="dataSourceService">Service for querying active data sources and their status.</param>
-    /// <param name="entryRepository">Repository used to compute last-entry timestamps.</param>
     /// <param name="treatmentRepository">Repository used to compute last-treatment timestamps.</param>
     /// <param name="connectorHealthService">Service for connector health state queries.</param>
     /// <param name="connectorSyncService">Service for triggering on-demand connector syncs.</param>
     /// <param name="logger">Logger instance.</param>
     /// <param name="configuration">Application configuration for base URL resolution.</param>
     public ServicesController(
         IDataSourceService dataSourceService,
-        IEntryRepository entryRepository,
         ITreatmentRepository treatmentRepository,
         IConnectorHealthService connectorHealthService,
         IConnectorSyncService connectorSyncService,
@@ -50,7 +47,6 @@ IConfiguration configuration
     )
     {
         _dataSourceService = dataSourceService;
-        _entryRepository = entryRepository;
         _treatmentRepository = treatmentRepository;
         _connectorHealthService = connectorHealthService;
         _connectorSyncService = connectorSyncService;
@@ -473,14 +469,14 @@ public async Task<ActionResult<ConnectorSyncStatus>> GetConnectorSyncStatus(
             // Map connector ID to data source name used in database
             var dataSource = MapConnectorIdToDataSource(id);
 
-            // Get latest timestamps from database
-            var entryTimestamp = await _entryRepository.GetLatestEntryTimestampBySourceAsync(
+            // Get latest timestamps from V4 glucose tables
+            var entryTimestamp = await _dataSourceService.GetLatestGlucoseTimestampBySourceAsync(
                 dataSource,
                 cancellationToken
             );
 
             var oldestEntryTimestamp =
-                await _entryRepository.GetOldestEntryTimestampBySourceAsync(
+                await _dataSourceService.GetOldestGlucoseTimestampBySourceAsync(
                     dataSource,
                     cancellationToken
                 );