fix: get all device
This commit is contained in:
@@ -1,18 +1,17 @@
|
|||||||
const DeviceService = require('../services/device.service');
|
const DeviceService = require('../services/device.service');
|
||||||
const { deviceSchema } = require('../helpers/validation');
|
const { deviceSchema, deviceUpdateSchema } = require('../helpers/validation');
|
||||||
const { setResponse } = require('../helpers/utils');
|
const { setResponse } = require('../helpers/utils');
|
||||||
|
|
||||||
class DeviceController {
|
class DeviceController {
|
||||||
// Get all devices
|
// Get all devices
|
||||||
static async getAll(req, res) {
|
static async getAll(req, res) {
|
||||||
try {
|
try {
|
||||||
const devices = await DeviceService.getAllDevices();
|
const { search } = req.query;
|
||||||
return res.status(200).json(
|
const devices = await DeviceService.getAllDevices(search || '');
|
||||||
setResponse(devices, 'Devices retrieved successfully', 200)
|
return res.status(200).json(setResponse(devices, 'Devices retrieved successfully', 200));
|
||||||
);
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
return res.status(err.statusCode || 500).json(
|
return res.status(err.statusCode || 500).json(
|
||||||
setResponse([], err.message || 'Failed to get devices', err.statusCode || 500)
|
setResponse([], err.message || 'Failed to retrieve devices', err.statusCode || 500)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -22,12 +21,10 @@ class DeviceController {
|
|||||||
try {
|
try {
|
||||||
const { id } = req.params;
|
const { id } = req.params;
|
||||||
const device = await DeviceService.getDeviceById(id);
|
const device = await DeviceService.getDeviceById(id);
|
||||||
return res.status(200).json(
|
return res.status(200).json(setResponse(device, 'Device retrieved successfully', 200));
|
||||||
setResponse(device, 'Device retrieved successfully', 200)
|
|
||||||
);
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
return res.status(err.statusCode || 500).json(
|
return res.status(err.statusCode || 500).json(
|
||||||
setResponse([], err.message || 'Failed to get device', err.statusCode || 500)
|
setResponse([], err.message || 'Device not found', err.statusCode || 500)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -61,7 +58,7 @@ class DeviceController {
|
|||||||
static async update(req, res) {
|
static async update(req, res) {
|
||||||
try {
|
try {
|
||||||
const { id } = req.params;
|
const { id } = req.params;
|
||||||
const { error, value } = deviceSchema.validate(req.body || {}, { abortEarly: false });
|
const { error, value } = deviceUpdateSchema.validate(req.body || {}, { abortEarly: false });
|
||||||
if (error) {
|
if (error) {
|
||||||
const errors = error.details.reduce((acc, cur) => {
|
const errors = error.details.reduce((acc, cur) => {
|
||||||
const field = Array.isArray(cur.path) ? cur.path.join('.') : String(cur.path);
|
const field = Array.isArray(cur.path) ? cur.path.join('.') : String(cur.path);
|
||||||
@@ -72,9 +69,10 @@ class DeviceController {
|
|||||||
return res.status(400).json(setResponse(errors, 'Validation failed', 400));
|
return res.status(400).json(setResponse(errors, 'Validation failed', 400));
|
||||||
}
|
}
|
||||||
|
|
||||||
await DeviceService.updateDevice(id, value, req.user.userId);
|
const updatedDevice = await DeviceService.updateDevice(id, value, req.user.userId);
|
||||||
|
|
||||||
return res.status(200).json(
|
return res.status(200).json(
|
||||||
setResponse([], 'Device updated successfully', 200)
|
setResponse(updatedDevice.data, 'Device updated successfully', 200)
|
||||||
);
|
);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
return res.status(err.statusCode || 500).json(
|
return res.status(err.statusCode || 500).json(
|
||||||
|
|||||||
Reference in New Issue
Block a user