Skip to content
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

Jump to bottom

FIX: remove extra data property within data property #95

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

FIX: remove extra data property within data property #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 9 additions & 15 deletions src/api/v1/controllers/departmentController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ export const createDepartment = async (req, res, next) => {
`;
let rows = await db.query(sql, body);

return responseHandler(res, 201, {
data: rows[0].id,
});
return responseHandler(res, 201, rows[0].id);
} catch (error) {
const err = new CustomError(400, {
status: "error",
Expand Down Expand Up @@ -46,9 +44,7 @@ export const updateDepartment = async (req, res, next) => {
`;
let rows = await db.query(sql, body);

return responseHandler(res, 200, {
data: rows[0].name,
});
return responseHandler(res, 200, rows[0].name);
} catch (error) {
const err = new CustomError(400, {
status: "error",
Expand All @@ -70,9 +66,11 @@ export const deleteDepartment = async (req, res, next) => {
return next(err);
}
await db.query(`DELETE FROM departments WHERE id=${departmentId}`);
return responseHandler(res, 204, {
data: `${department[0].name} deleted successfully`,
});
return responseHandler(
res,
204,
`${department[0].name} deleted successfully`
);
} catch (error) {
console.log(error);
const err = new CustomError(400, {
Expand All @@ -95,9 +93,7 @@ export const getSingleDepartment = async (req, res, next) => {
return next(err);
}

return responseHandler(res, 200, {
data: department[0].name,
});
return responseHandler(res, 200, department[0].name);
} catch (error) {
const err = new CustomError(400, {
status: "error",
Expand All @@ -114,9 +110,7 @@ export const getAllDepartments = async (req, res, next) => {
const err = new CustomError(400, "no department found");
return next(err);
}
return responseHandler(res, 200, {
data: department,
});
return responseHandler(res, 200, department);
} catch (error) {
const err = new CustomError(400, {
status: "error",
Expand Down
20 changes: 8 additions & 12 deletions src/api/v1/controllers/employeeController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ export const createEmployee = async (req, res, next) => {
`;
let rows = await db.query(sql, body);

return responseHandler(res, 201, {
data: rows[0].id,
});
return responseHandler(res, 201, rows[0].id);
} catch (error) {
const err = new CustomError(400, {
status: "error",
Expand All @@ -54,9 +52,11 @@ export const deleteEmployee = async (req, res, next) => {
return next(err);
}
await db.query(`DELETE FROM employee WHERE id=${employeeId}`);
return responseHandler(res, 204, {
data: `${employee[0].first_name} ${employee[0].last_name} deleted successfully`,
});
return responseHandler(
res,
204,
`${employee[0].first_name} ${employee[0].last_name} deleted successfully`
);
} catch (error) {
console.log(error);
const err = new CustomError(400, {
Expand All @@ -79,9 +79,7 @@ export const getSingleEmployee = async (req, res, next) => {
return next(err);
}

return responseHandler(res, 200, {
data: employee[0].name,
});
return responseHandler(res, 200, employee[0].name);
} catch (error) {
const err = new CustomError(400, {
status: "error",
Expand All @@ -98,9 +96,7 @@ export const getAllEmployees = async (req, res, next) => {
const err = new CustomError(400, "no employees found");
return next(err);
}
return responseHandler(res, 200, {
data: employees,
});
return responseHandler(res, 200, employees);
} catch (error) {
const err = new CustomError(400, {
status: "error",
Expand Down