ckoch/PlantPal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update API for more simple approach.

Browse Source
This commit is contained in:
programmingPug
2025-01-14 17:50:34 -05:00
parent 2de48f1fc9
commit f65ead854c
11 changed files with 130 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
SoilMoistureAPI/Controllers/DeviceController.cs
View File

@@ -10,16 +10,16 @@ namespace SoilMoistureAPI.Controllers
[ApiController]
public class DeviceController : ControllerBase
{
private readonly SoilMoistureContext _context;
private readonly SoilMoistureFlatContext _context;
public DeviceController(SoilMoistureContext context)
public DeviceController(SoilMoistureFlatContext context)
{
_context = context;
}
// POST: api/Device
[HttpPost]
public async Task<ActionResult<Device>> CreateDevice(Device device)
public async Task<ActionResult<Device>> CreateDevice(SoilMoistureFlat device)
{
if (device == null || string.IsNullOrEmpty(device.DeviceId))
{
@@ -27,13 +27,13 @@ namespace SoilMoistureAPI.Controllers
}
// Check if device already exists
var existingDevice = await _context.Devices.FindAsync(device.DeviceId);
var existingDevice = await _context.SoilMoisturesFlat.FindAsync(device.DeviceId);
if (existingDevice != null)
{
return Conflict("Device with the same DeviceId already exists.");
}
_context.Devices.Add(device);
_context.SoilMoisturesFlat.Add(device);
await _context.SaveChangesAsync();
return CreatedAtAction(nameof(GetDevice), new { id = device.DeviceId }, device);
@@ -41,10 +41,9 @@ namespace SoilMoistureAPI.Controllers
// GET: api/Device/{id}
[HttpGet("{id}")]
public async Task<ActionResult<Device>> GetDevice(string id)
public async Task<ActionResult<SoilMoistureFlat>> GetDevice(string id)
{
var device = await _context.Devices
.Include(d => d.SoilMoistures)
var device = await _context.SoilMoisturesFlat
.FirstOrDefaultAsync(d => d.DeviceId == id);
if (device == null)
@@ -64,7 +63,7 @@ namespace SoilMoistureAPI.Controllers
return BadRequest("Nickname cannot be empty.");
}
var device = await _context.Devices.FindAsync(id);
var device = await _context.SoilMoisturesFlat.FindAsync(id);
if (device == null)
{
return NotFound("Device not found.");
@@ -95,13 +94,13 @@ namespace SoilMoistureAPI.Controllers
[HttpDelete("{id}")]
public async Task<IActionResult> DeleteDevice(string id)
{
var device = await _context.Devices.FindAsync(id);
var device = await _context.SoilMoisturesFlat.FindAsync(id);
if (device == null)
{
return NotFound("Device not found.");
}
_context.Devices.Remove(device);
_context.SoilMoisturesFlat.Remove(device);
await _context.SaveChangesAsync();
return NoContent(); // 204 No Content
@@ -109,7 +108,7 @@ namespace SoilMoistureAPI.Controllers
private bool DeviceExists(string id)
{
return _context.Devices.Any(e => e.DeviceId == id);
return _context.SoilMoisturesFlat.Any(e => e.DeviceId == id);
}
}
}

36
SoilMoistureAPI/Controllers/SoilMoistureController.cs
View File

@@ -9,9 +9,9 @@ namespace SoilMoistureAPI.Controllers
[ApiController]
public class SoilMoistureController : ControllerBase
{
private readonly SoilMoistureContext _context;
private readonly SoilMoistureFlatContext _context;
public SoilMoistureController(SoilMoistureContext context)
public SoilMoistureController(SoilMoistureFlatContext context)
{
_context = context;
}
@@ -25,58 +25,52 @@ namespace SoilMoistureAPI.Controllers
return BadRequest("No data received.");
}
// Basic validation: ensure required fields are provided.
if (string.IsNullOrEmpty(data.DeviceId))
{
ModelState.AddModelError("DeviceId", "The DeviceId field is required.");
}
// You might also want to validate moisture level here.
if (!ModelState.IsValid)
{
return BadRequest(ModelState);
}
// Check if a record for this device already exists
var existingRecord = await _context.SoilMoistures
.Include(sm => sm.Device)
// Attempt to find an existing record for the device
var existingRecord = await _context.SoilMoisturesFlat
.FirstOrDefaultAsync(sm => sm.DeviceId == data.DeviceId);
if (existingRecord != null)
{
// Update the existing record
// Update existing record
existingRecord.MoistureLevel = data.MoistureLevel;
existingRecord.Timestamp = DateTime.UtcNow;
_context.SoilMoistures.Update(existingRecord);
_context.SoilMoisturesFlat.Update(existingRecord);
await _context.SaveChangesAsync();
return Ok(existingRecord);
}
else
{
// Create a new record
var newRecord = new SoilMoisture
// Insert new record
var newRecord = new SoilMoistureFlat
{
DeviceId = data.DeviceId,
MoistureLevel = data.MoistureLevel,
Timestamp = DateTime.UtcNow,
Device = new Device
{
DeviceId = data.DeviceId,
Nickname = "Dave"
}
Nickname = "Dave"
};
_context.SoilMoistures.Add(newRecord);
_context.SoilMoisturesFlat.Add(newRecord);
await _context.SaveChangesAsync();
return Ok(newRecord);
}
}
// GET: api/SoilMoisture/5
[HttpGet("{id}")]
public async Task<ActionResult<SoilMoisture>> GetSoilMoisture(int id)
public async Task<ActionResult<SoilMoistureFlat>> GetSoilMoisture(int id)
{
var soilMoisture = await _context.SoilMoistures.FindAsync(id);
var soilMoisture = await _context.SoilMoisturesFlat.FindAsync(id);
if (soilMoisture == null)
{
@@ -88,9 +82,9 @@ namespace SoilMoistureAPI.Controllers
// GET: api/SoilMoisture
[HttpGet]
public async Task<ActionResult<IEnumerable<SoilMoisture>>> GetSoilMoistures()
public async Task<ActionResult<IEnumerable<SoilMoistureFlat>>> GetSoilMoistures()
{
return await _context.SoilMoistures.ToListAsync();
return await _context.SoilMoisturesFlat.ToListAsync();
}
}
}