Skip to content

dev to main #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Andersraae merged 3 commits into from
May 13, 2025
Merged

dev to main #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13dd7c6
fix for latest valid heatmap
Andersraae May 13, 2025
840a075
Merge branch 'develop' of https://github.com/BachelorProjectGroup3/Cr…
Andersraae May 13, 2025
bc772eb
SignalR sends count instead
Andersraae May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions CrowdedBackend/CrowdedBackend/Controllers/DetectedDevicesController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,11 @@
[HttpGet("getLatestValidHeatmap")]
public async Task<ActionResult<String>> GetLatestValidHeatmap()
{
var latestTimestamp = await _context.DetectedDevice
.MaxAsync(x => x.Timestamp);

var detectedDevices = await _context.DetectedDevice
.GroupBy(x => x.Timestamp)
.Select(g => g.OrderByDescending(x => x.Timestamp).First())
.Where(x => x.Timestamp == latestTimestamp)
.ToListAsync();

if (detectedDevices.IsNullOrEmpty())
Expand All @@ -68,7 +70,7 @@
return await GetDetectedDeviceTimestampHelper(detectedDevices);
}

private async Task<ActionResult<String>> GetDetectedDeviceTimestampHelper(List<DetectedDevice> detectedDevices)

Check warning on line 73 in CrowdedBackend/CrowdedBackend/Controllers/DetectedDevicesController.cs

View workflow job for this annotation

GitHub Actions / format-check 

This async method lacks 'await' operators and will run synchronously. Consider using the 'await' operator to await non-blocking API calls, or 'await Task.Run(...)' to do CPU-bound work on a background thread.
{
List<(float x, float y)> listOfDeviceLocations = [];
foreach (var detectedDevice in detectedDevices)
Expand Down
2 changes: 1 addition & 1 deletion CrowdedBackend/CrowdedBackend/Helpers/DetectedDeviceHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ await PostRaspData(new RaspData
// Notify clients
await _hubContext.Clients.All.SendAsync("NewDevicesDetected", new
{
Devices = points.Select(p => new { X = p.X, Y = p.Y, Timestamp = now })
Devices = points.Count
});

_circleUtils.WipeData();
Expand Down
Loading