Skip to content

Commit 954fa7d

Browse files
frckbricefrckbrice
committed
fix: lint errors, add jest env to integration test, clean up for ESLint v8
1 parent 254c0a0 commit 954fa7d

File tree

18 files changed

+792
-715
lines changed

18 files changed

+792
-715
lines changed

‎application-business-rules/use-cases/blogs/blog-handlers.js‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,62 @@
11
// Blog use cases (Clean Architecture)
22
module.exports = {
3-
createBlogUseCase: ({ dbBlogHandler, makeBlogModel, logEvents, errorHandlers }) =>
4-
async function createBlogUseCaseHandler(blogData) {
5-
try {
6-
const validatedBlog = await makeBlogModel({ blogData });
7-
const newBlog = await dbBlogHandler.createBlog(validatedBlog);
8-
return Object.freeze(newBlog);
9-
} catch (error) {
10-
logEvents && logEvents(error.message, 'blogUseCase.log');
11-
throw error;
12-
}
13-
},
3+
createBlogUseCase: ({ dbBlogHandler, makeBlogModel, logEvents, errorHandlers }) =>
4+
async function createBlogUseCaseHandler(blogData) {
5+
try {
6+
const validatedBlog = await makeBlogModel({ blogData });
7+
const newBlog = await dbBlogHandler.createBlog(validatedBlog);
8+
return Object.freeze(newBlog);
9+
} catch (error) {
10+
logEvents && logEvents(error.message, 'blogUseCase.log');
11+
throw error;
12+
}
13+
},
1414

15-
findAllBlogsUseCase: ({ dbBlogHandler, logEvents }) =>
16-
async function findAllBlogsUseCaseHandler() {
17-
try {
18-
const blogs = await dbBlogHandler.findAllBlogs();
19-
return blogs || [];
20-
} catch (error) {
21-
logEvents && logEvents(error.message, 'blogUseCase.log');
22-
throw error;
23-
}
24-
},
15+
findAllBlogsUseCase: ({ dbBlogHandler, logEvents }) =>
16+
async function findAllBlogsUseCaseHandler() {
17+
try {
18+
const blogs = await dbBlogHandler.findAllBlogs();
19+
return blogs || [];
20+
} catch (error) {
21+
logEvents && logEvents(error.message, 'blogUseCase.log');
22+
throw error;
23+
}
24+
},
2525

26-
findOneBlogUseCase: ({ dbBlogHandler, logEvents }) =>
27-
async function findOneBlogUseCaseHandler({ blogId }) {
28-
try {
29-
const blog = await dbBlogHandler.findOneBlog({ blogId });
30-
if (!blog) throw new Error('Blog not found');
31-
return blog;
32-
} catch (error) {
33-
logEvents && logEvents(error.message, 'blogUseCase.log');
34-
throw error;
35-
}
36-
},
26+
findOneBlogUseCase: ({ dbBlogHandler, logEvents }) =>
27+
async function findOneBlogUseCaseHandler({ blogId }) {
28+
try {
29+
const blog = await dbBlogHandler.findOneBlog({ blogId });
30+
if (!blog) throw new Error('Blog not found');
31+
return blog;
32+
} catch (error) {
33+
logEvents && logEvents(error.message, 'blogUseCase.log');
34+
throw error;
35+
}
36+
},
3737

38-
updateBlogUseCase: ({ dbBlogHandler, makeBlogModel, logEvents, errorHandlers }) =>
39-
async function updateBlogUseCaseHandler({ blogId, updateData }) {
40-
try {
41-
const existingBlog = await dbBlogHandler.findOneBlog({ blogId });
42-
if (!existingBlog) throw new Error('Blog not found');
43-
const validatedBlog = await makeBlogModel({ blogData: { ...existingBlog, ...updateData } });
44-
const updatedBlog = await dbBlogHandler.updateBlog({ blogId, ...validatedBlog });
45-
return Object.freeze(updatedBlog);
46-
} catch (error) {
47-
logEvents && logEvents(error.message, 'blogUseCase.log');
48-
throw error;
49-
}
50-
},
38+
updateBlogUseCase: ({ dbBlogHandler, makeBlogModel, logEvents, errorHandlers }) =>
39+
async function updateBlogUseCaseHandler({ blogId, updateData }) {
40+
try {
41+
const existingBlog = await dbBlogHandler.findOneBlog({ blogId });
42+
if (!existingBlog) throw new Error('Blog not found');
43+
const validatedBlog = await makeBlogModel({ blogData: { ...existingBlog, ...updateData } });
44+
const updatedBlog = await dbBlogHandler.updateBlog({ blogId, ...validatedBlog });
45+
return Object.freeze(updatedBlog);
46+
} catch (error) {
47+
logEvents && logEvents(error.message, 'blogUseCase.log');
48+
throw error;
49+
}
50+
},
5151

52-
deleteBlogUseCase: ({ dbBlogHandler, logEvents }) =>
53-
async function deleteBlogUseCaseHandler({ blogId }) {
54-
try {
55-
const deleted = await dbBlogHandler.deleteBlog({ blogId });
56-
return deleted;
57-
} catch (error) {
58-
logEvents && logEvents(error.message, 'blogUseCase.log');
59-
throw error;
60-
}
61-
},
62-
};
52+
deleteBlogUseCase: ({ dbBlogHandler, logEvents }) =>
53+
async function deleteBlogUseCaseHandler({ blogId }) {
54+
try {
55+
const deleted = await dbBlogHandler.deleteBlog({ blogId });
56+
return deleted;
57+
} catch (error) {
58+
logEvents && logEvents(error.message, 'blogUseCase.log');
59+
throw error;
60+
}
61+
},
62+
};

‎application-business-rules/use-cases/blogs/index.js‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,19 @@ const { logEvents } = require('../../../interface-adapters/middlewares/loggers/l
55
const errorHandlers = require('../../../interface-adapters/validators-errors/errors');
66

77
module.exports = {
8-
createBlogUseCaseHandler: blogUseCases.createBlogUseCase({ dbBlogHandler, makeBlogModel, logEvents, errorHandlers }),
9-
findAllBlogsUseCaseHandler: blogUseCases.findAllBlogsUseCase({ dbBlogHandler, logEvents }),
10-
findOneBlogUseCaseHandler: blogUseCases.findOneBlogUseCase({ dbBlogHandler, logEvents }),
11-
updateBlogUseCaseHandler: blogUseCases.updateBlogUseCase({ dbBlogHandler, makeBlogModel, logEvents, errorHandlers }),
12-
deleteBlogUseCaseHandler: blogUseCases.deleteBlogUseCase({ dbBlogHandler, logEvents }),
13-
};
8+
createBlogUseCaseHandler: blogUseCases.createBlogUseCase({
9+
dbBlogHandler,
10+
makeBlogModel,
11+
logEvents,
12+
errorHandlers,
13+
}),
14+
findAllBlogsUseCaseHandler: blogUseCases.findAllBlogsUseCase({ dbBlogHandler, logEvents }),
15+
findOneBlogUseCaseHandler: blogUseCases.findOneBlogUseCase({ dbBlogHandler, logEvents }),
16+
updateBlogUseCaseHandler: blogUseCases.updateBlogUseCase({
17+
dbBlogHandler,
18+
makeBlogModel,
19+
logEvents,
20+
errorHandlers,
21+
}),
22+
deleteBlogUseCaseHandler: blogUseCases.deleteBlogUseCase({ dbBlogHandler, logEvents }),
23+
};

‎enterprise-business-rules/entities/blog-model.js‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
const blogValidation = require('../validate-models/blog-validation');
22

33
module.exports = {
4-
makeBlogModel: ({ blogValidation, logEvents }) => {
5-
return async function makeBlog({ blogData }) {
6-
try {
7-
const validatedBlog = await blogValidation.blogPostValidation({ blogPostData: blogData, errorHandlers: blogValidation });
8-
// Add normalization or additional logic if needed
9-
return Object.freeze(validatedBlog);
10-
} catch (error) {
11-
logEvents && logEvents(`${error.message}`, 'blog-model.log');
12-
throw error;
13-
}
14-
};
15-
},
4+
makeBlogModel: ({ blogValidation, logEvents }) => {
5+
return async function makeBlog({ blogData }) {
6+
try {
7+
const validatedBlog = await blogValidation.blogPostValidation({
8+
blogPostData: blogData,
9+
errorHandlers: blogValidation,
10+
});
11+
// Add normalization or additional logic if needed
12+
return Object.freeze(validatedBlog);
13+
} catch (error) {
14+
logEvents && logEvents(`${error.message}`, 'blog-model.log');
15+
throw error;
16+
}
17+
};
18+
},
1619
};

‎index.js‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const corsOptions = require('./interface-adapters/middlewares/config/corsOptions
1616

1717
// database connection call function
1818
dbconnection().then((db) => {
19-
console.log("database connected: ", db.databaseName);
19+
console.log('database connected: ', db.databaseName);
2020
createIndexFn();
2121
});
2222

@@ -30,19 +30,19 @@ app.use(express.urlencoded({ extended: false }));
3030
const mainRouter = require('./routes');
3131
app.use('/', mainRouter);
3232

33-
app.use("/", (_, res) => {
34-
res.sendFile(path.join(__dirname, "public", "views", "index.html"));
33+
app.use('/', (_, res) => {
34+
res.sendFile(path.join(__dirname, 'public', 'views', 'index.html'));
3535
});
3636

3737
//for no specified endpoint that is not found. this must after all the middlewares
38-
app.all("*", (req, res) => {
38+
app.all('*', (req, res) => {
3939
res.status(404);
40-
if (req.accepts("html")) {
41-
res.sendFile(path.join(__dirname, "public", "views", "404.html"));
42-
} else if (req.accepts("json")) {
43-
res.json({ msg: "404 Not Found" });
40+
if (req.accepts('html')) {
41+
res.sendFile(path.join(__dirname, 'public', 'views', '404.html'));
42+
} else if (req.accepts('json')) {
43+
res.json({ msg: '404 Not Found' });
4444
} else {
45-
res.type("txt").send("404 Not Found");
45+
res.type('txt').send('404 Not Found');
4646
}
4747
});
4848

@@ -59,6 +59,11 @@ app.use((req, res, next) => {
5959

6060
app.use(errorHandler);
6161

62-
app.listen(PORT, () => console.log(`Server started on port http://localhost:${PORT}`));
62+
// Only call app.listen() if not in test
63+
if (require.main === module) {
64+
app.listen(PORT, () => {
65+
console.log(`Server is running on port ${PORT}`);
66+
});
67+
}
6368

64-
module.exports = app;
69+
module.exports = app;

0 commit comments

Comments
 (0)