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.

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

Folder refactoring #16

Open
wants to merge 10 commits into
base: folder-refactoring
Choose a base branch
from
8 changes: 4 additions & 4 deletions app/controllers/links/addLink.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const addLink = require('express').Router();
const Link = require('../../models/links');
const sendResponse = require('../../helpers/sendResponse');
const { createLink } = require('../../services/database/link');
const log4js = require('log4js');

const logger = log4js.getLogger();
Expand All @@ -18,11 +18,11 @@ addLink.post('/', async (req, res) => {
}

try {
const linkData = new Link({
const linkData = {
linkName: req.body.linkName,
linkAdd: req.body.linkAdd,
});
await linkData.save();
};
await createLink(linkData);
return sendResponse(res, 200, [], 'data saved successfully');
} catch (err) {
logger.error(err);
Expand Down
6 changes: 3 additions & 3 deletions app/controllers/links/deleteLink.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const deleteLink = require('express').Router();
const Link = require('../../models/links');
const { removeLink } = require('../../services/database/link');
const sendResponse = require('../../helpers/sendResponse');
const log4js = require('log4js');

Expand All @@ -17,8 +17,8 @@ deleteLink.delete('/:id', async (req, res) => {

try {
const { id } = req.params;
await Link.findByIdAndRemove(id);
return sendResponse(res, 200, [], 'deleted data successfully');
await removeLink(id);
return sendResponse(res, 200, [], 'Link deleted successfully');
} catch (err) {
logger.error(err);
return sendResponse(res, 500, [], 'something went wrong');
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/links/getAllLinks.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const getAllLinks = require('express').Router();
const Link = require('../../models/links');
const { findAllLinks } = require('../../services/database/link');
const sendResponse = require('../../helpers/sendResponse');
const log4js = require('log4js');

Expand All @@ -8,7 +8,7 @@ logger.level = 'error';

getAllLinks.get('/', async (req, res) => {
try {
const data = await Link.find();
const data = await findAllLinks();
return sendResponse(res, 200, data, 'Get data successfully');
} catch (err) {
logger.error(err);
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/links/getOneLink.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const getOneLink = require('express').Router();
const Link = require('../../models/links');
const sendResponse = require('../../helpers/sendResponse');
const { findLinkById } = require('../../services/database/link');
const log4js = require('log4js');

const logger = log4js.getLogger();
Expand All @@ -16,7 +16,7 @@ getOneLink.get('/:id', async (req, res) => {

try {
const { id } = req.params;
const data = await Link.findById(id);
const data = await findLinkById(id);
return sendResponse(res, 200, data, 'Get data successfully');
} catch (err) {
logger.error(err);
Expand Down
10 changes: 10 additions & 0 deletions app/helpers/errorHandlers.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// TODO: file name plural or singular

const errorHandler = fn => (...params) => fn(...params).catch((err) => {
console.log('Error occured', err);
// TODO: Add sentry or notification service
});

module.exports = {
errorHandler,
};
20 changes: 20 additions & 0 deletions app/services/database/link/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
const Link = require('../../../models/links');
const { errorHandler } = require('../../../helpers/errorHandlers');

const createLink = async (linkData) => {
const newLink = new Link(linkData);
await newLink.save();
};

const removeLink = async id => Link.findByIdAndRemove(id);

const findAllLinks = async () => Link.find();

const findLinkById = async id => Link.findById(id);

module.exports = {
createLink: errorHandler(createLink),
removeLink: errorHandler(removeLink),
findAllLinks: errorHandler(findAllLinks),
findLinkById: errorHandler(findLinkById),
};