ReiMerc/temperature-alarm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimize query to fetch logs within date period

Browse Source
This commit is contained in:
Reimar 2025-04-02 13:36:51 +02:00
parent 9686e27ba3
commit b390d4a108
Signed by: Reimar
GPG Key ID: 93549FA07F0AE268
7 changed files with 224 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backend/Api/BusinessLogic/DeviceLogic.cs
View File

@ -76,19 +76,9 @@ namespace Api.BusinessLogic
if (device == null) { return new ConflictObjectResult(new { message = "Could not find device" }); }
var logs = await _dbAccess.ReadLogs(deviceId);
var logs = await _dbAccess.ReadLogs(deviceId, dateTimeRange);
if (logs.Count == 0) { return new ConflictObjectResult(new { message = "Could not find any logs connected to the device" }); }
if (dateTimeRange.DateTimeStart == dateTimeRange.DateTimeEnd) { return new OkObjectResult(logs); }
List<TemperatureLogs> rangedLogs = new List<TemperatureLogs>();
foreach (var log in logs)
{
if (log.Date >= dateTimeRange.DateTimeStart && log.Date <= dateTimeRange.DateTimeEnd) { rangedLogs.Add(log); }
}
return new OkObjectResult(rangedLogs);
return new OkObjectResult(logs);
}
/// <summary>

15
backend/Api/DBAccess/DBAccess.cs
View File

@ -311,16 +311,15 @@ namespace Api.DBAccess
/// Returns the logs from the device
/// </summary>
/// <param name="deviceId">Has the id for the device that the los belong too</param>
/// <param name="range">Return only logs within the specified datetime range</param>
/// <returns></returns>
public async Task<List<TemperatureLogs>> ReadLogs(int deviceId)
public async Task<List<TemperatureLogs>> ReadLogs(int deviceId, DateTimeRange range)
{
var device = await _context.Devices.Include(d => d.Logs).FirstOrDefaultAsync(d => d.Id == deviceId);
if (device == null || device.Logs == null) { return new List<TemperatureLogs>(); }
var logs = device.Logs;
return logs;
return _context.TemperatureLogs
.Where(log => log.DeviceId == deviceId)
.Where(log => log.Date > range.DateTimeStart)
.Where(log => log.Date < range.DateTimeEnd)
.ToList();
}
/// <summary>

3
backend/Api/DBAccess/DBContext.cs
View File

@ -1,4 +1,5 @@
using Microsoft.EntityFrameworkCore;
using Api.Models;
using Api.Models.Users;
using Api.Models.Devices;
@ -10,6 +11,8 @@ namespace Api
public DbSet<Device> Devices { get; set; }
public DbSet<TemperatureLogs> TemperatureLogs { get; set; }
public DBContext(DbContextOptions<DBContext> options) : base(options) { }
}
}

140
backend/Api/Migrations/20250402113522_ChangeModelsNamespace.Designer.cs generated Normal file
View File

@ -0,0 +1,140 @@
// <auto-generated />
using System;
using Api;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
namespace Api.Migrations
{
[DbContext(typeof(DBContext))]
[Migration("20250402113522_ChangeModelsNamespace")]
partial class ChangeModelsNamespace
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder.HasAnnotation("ProductVersion", "9.0.3");
modelBuilder.Entity("Api.Models.Devices.Device", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("TEXT");
b.Property<string>("ReferenceId")
.HasColumnType("TEXT");
b.Property<double>("TempHigh")
.HasColumnType("REAL");
b.Property<double>("TempLow")
.HasColumnType("REAL");
b.Property<int?>("UserId")
.HasColumnType("INTEGER");
b.HasKey("Id");
b.HasIndex("UserId");
b.ToTable("Devices");
});
modelBuilder.Entity("Api.Models.TemperatureLogs", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<DateTime>("Date")
.HasColumnType("TEXT");
b.Property<int>("DeviceId")
.HasColumnType("INTEGER");
b.Property<double>("TempHigh")
.HasColumnType("REAL");
b.Property<double>("TempLow")
.HasColumnType("REAL");
b.Property<double>("Temperature")
.HasColumnType("REAL");
b.HasKey("Id");
b.HasIndex("DeviceId");
b.ToTable("TemperatureLogs");
});
modelBuilder.Entity("Api.Models.Users.User", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("Email")
.IsRequired()
.HasColumnType("TEXT");
b.Property<string>("Password")
.IsRequired()
.HasColumnType("TEXT");
b.Property<string>("RefreshToken")
.HasColumnType("TEXT");
b.Property<DateTime>("RefreshTokenExpiresAt")
.HasColumnType("TEXT");
b.Property<string>("Salt")
.HasColumnType("TEXT");
b.Property<string>("UserName")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("Id");
b.ToTable("Users");
});
modelBuilder.Entity("Api.Models.Devices.Device", b =>
{
b.HasOne("Api.Models.Users.User", null)
.WithMany("Devices")
.HasForeignKey("UserId");
});
modelBuilder.Entity("Api.Models.TemperatureLogs", b =>
{
b.HasOne("Api.Models.Devices.Device", null)
.WithMany("Logs")
.HasForeignKey("DeviceId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Api.Models.Devices.Device", b =>
{
b.Navigation("Logs");
});
modelBuilder.Entity("Api.Models.Users.User", b =>
{
b.Navigation("Devices");
});
#pragma warning restore 612, 618
}
}
}

59
backend/Api/Migrations/20250402113522_ChangeModelsNamespace.cs Normal file
View File

@ -0,0 +1,59 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Api.Migrations
{
/// <inheritdoc />
public partial class ChangeModelsNamespace : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_TemperatureLogs_Devices_DeviceId",
table: "TemperatureLogs");
migrationBuilder.AlterColumn<int>(
name: "DeviceId",
table: "TemperatureLogs",
type: "INTEGER",
nullable: false,
defaultValue: 0,
oldClrType: typeof(int),
oldType: "INTEGER",
oldNullable: true);
migrationBuilder.AddForeignKey(
name: "FK_TemperatureLogs_Devices_DeviceId",
table: "TemperatureLogs",
column: "DeviceId",
principalTable: "Devices",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_TemperatureLogs_Devices_DeviceId",
table: "TemperatureLogs");
migrationBuilder.AlterColumn<int>(
name: "DeviceId",
table: "TemperatureLogs",
type: "INTEGER",
nullable: true,
oldClrType: typeof(int),
oldType: "INTEGER");
migrationBuilder.AddForeignKey(
name: "FK_TemperatureLogs_Devices_DeviceId",
table: "TemperatureLogs",
column: "DeviceId",
principalTable: "Devices",
principalColumn: "Id");
}
}
}

20
backend/Api/Migrations/DBContextModelSnapshot.cs
View File

@ -17,7 +17,7 @@ namespace Api.Migrations
#pragma warning disable 612, 618
modelBuilder.HasAnnotation("ProductVersion", "9.0.3");
modelBuilder.Entity("Api.Models.Device", b =>
modelBuilder.Entity("Api.Models.Devices.Device", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@ -55,7 +55,7 @@ namespace Api.Migrations
b.Property<DateTime>("Date")
.HasColumnType("TEXT");
b.Property<int?>("DeviceId")
b.Property<int>("DeviceId")
.HasColumnType("INTEGER");
b.Property<double>("TempHigh")
@ -74,7 +74,7 @@ namespace Api.Migrations
b.ToTable("TemperatureLogs");
});
modelBuilder.Entity("Api.Models.User", b =>
modelBuilder.Entity("Api.Models.Users.User", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@ -106,26 +106,28 @@ namespace Api.Migrations
b.ToTable("Users");
});
modelBuilder.Entity("Api.Models.Device", b =>
modelBuilder.Entity("Api.Models.Devices.Device", b =>
{
b.HasOne("Api.Models.User", null)
b.HasOne("Api.Models.Users.User", null)
.WithMany("Devices")
.HasForeignKey("UserId");
});
modelBuilder.Entity("Api.Models.TemperatureLogs", b =>
{
b.HasOne("Api.Models.Device", null)
b.HasOne("Api.Models.Devices.Device", null)
.WithMany("Logs")
.HasForeignKey("DeviceId");
.HasForeignKey("DeviceId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Api.Models.Device", b =>
modelBuilder.Entity("Api.Models.Devices.Device", b =>
{
b.Navigation("Logs");
});
modelBuilder.Entity("Api.Models.User", b =>
modelBuilder.Entity("Api.Models.Users.User", b =>
{
b.Navigation("Devices");
});

2
backend/Api/Models/TemperatureLogs.cs
View File

@ -4,6 +4,8 @@
{
public int Id { get; set; }
public int DeviceId { get; set; }
public double Temperature { get; set; }
public DateTime Date { get; set; }