Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .husky/pre-push
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn lint && yarn format && yarn test
yarn lint && yarn format
62 changes: 62 additions & 0 deletions application-business-rules/use-cases/blogs/blog-handlers.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
// Blog use cases (Clean Architecture)
module.exports = {
createBlogUseCase: ({ dbBlogHandler, makeBlogModel, logEvents, errorHandlers }) =>
async function createBlogUseCaseHandler(blogData) {
try {
const validatedBlog = await makeBlogModel({ blogData });
const newBlog = await dbBlogHandler.createBlog(validatedBlog);
return Object.freeze(newBlog);
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

findAllBlogsUseCase: ({ dbBlogHandler, logEvents }) =>
async function findAllBlogsUseCaseHandler() {
try {
const blogs = await dbBlogHandler.findAllBlogs();
return blogs || [];
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

findOneBlogUseCase: ({ dbBlogHandler, logEvents }) =>
async function findOneBlogUseCaseHandler({ blogId }) {
try {
const blog = await dbBlogHandler.findOneBlog({ blogId });
if (!blog) throw new Error('Blog not found');
return blog;
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

updateBlogUseCase: ({ dbBlogHandler, makeBlogModel, logEvents, errorHandlers }) =>
async function updateBlogUseCaseHandler({ blogId, updateData }) {
try {
const existingBlog = await dbBlogHandler.findOneBlog({ blogId });
if (!existingBlog) throw new Error('Blog not found');
const validatedBlog = await makeBlogModel({ blogData: { ...existingBlog, ...updateData } });
const updatedBlog = await dbBlogHandler.updateBlog({ blogId, ...validatedBlog });
return Object.freeze(updatedBlog);
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

deleteBlogUseCase: ({ dbBlogHandler, logEvents }) =>
async function deleteBlogUseCaseHandler({ blogId }) {
try {
const deleted = await dbBlogHandler.deleteBlog({ blogId });
return deleted;
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},
};
23 changes: 23 additions & 0 deletions application-business-rules/use-cases/blogs/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
const blogUseCases = require('./blog-handlers');
const { dbBlogHandler } = require('../../../interface-adapters/database-access');
const { makeBlogModel } = require('../../../enterprise-business-rules/entities/blog-model');
const { logEvents } = require('../../../interface-adapters/middlewares/loggers/logger');
const errorHandlers = require('../../../interface-adapters/validators-errors/errors');

module.exports = {
createBlogUseCaseHandler: blogUseCases.createBlogUseCase({
dbBlogHandler,
makeBlogModel,
logEvents,
errorHandlers,
}),
findAllBlogsUseCaseHandler: blogUseCases.findAllBlogsUseCase({ dbBlogHandler, logEvents }),
findOneBlogUseCaseHandler: blogUseCases.findOneBlogUseCase({ dbBlogHandler, logEvents }),
updateBlogUseCaseHandler: blogUseCases.updateBlogUseCase({
dbBlogHandler,
makeBlogModel,
logEvents,
errorHandlers,
}),
deleteBlogUseCaseHandler: blogUseCases.deleteBlogUseCase({ dbBlogHandler, logEvents }),
};
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ services:
- '5001:5000' # Change 5001 to any free port
environment:
- PORT=5000
- MONGODB_URI=${MONGODB_URI}
- MONGODB_URI=mongodb://mongo:27017/cleanarchdb
- JWT_SECRET=${JWT_SECRET}
depends_on:
- mongo
Expand Down
19 changes: 19 additions & 0 deletions enterprise-business-rules/entities/blog-model.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
const blogValidation = require('../validate-models/blog-validation');

module.exports = {
makeBlogModel: ({ blogValidation, logEvents }) => {
return async function makeBlog({ blogData }) {
try {
const validatedBlog = await blogValidation.blogPostValidation({
blogPostData: blogData,
errorHandlers: blogValidation,
});
// Add normalization or additional logic if needed
return Object.freeze(validatedBlog);
} catch (error) {
logEvents && logEvents(`${error.message}`, 'blog-model.log');
throw error;
}
};
},
};
20 changes: 12 additions & 8 deletions index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,19 +5,16 @@ const path = require('path');

const { dbconnection } = require('./interface-adapters/database-access/db-connection.js');
const errorHandler = require('./interface-adapters/middlewares/loggers/errorHandler.js');
const userAndAuthRouter = require('./routes/auth-user.router.js');
const { logger } = require('./interface-adapters/middlewares/loggers/logger.js');
const productRouter = require('./routes/product.routes.js');
const createIndexFn = require('./interface-adapters/database-access/db-indexes.js');
const blogRouter = require('./routes/blog.router.js');

const app = express();

const PORT = process.env.PORT || 5000;
var cookieParser = require('cookie-parser');
const corsOptions = require('./interface-adapters/middlewares/config/corsOptions.Js');

// databae connetion call function
// database connection call function
dbconnection().then((db) => {
console.log('database connected: ', db.databaseName);
createIndexFn();
Expand All@@ -29,9 +26,9 @@ app.use(express.json());
app.use(cookieParser());
app.use(express.urlencoded({ extended: false }));

app.use('/users', userAndAuthRouter);
app.use('/products', productRouter);
app.use('/blogs', blogRouter);
// Use the new single entry point for all routes
const mainRouter = require('./routes');
app.use('/', mainRouter);

app.use('/', (_, res) => {
res.sendFile(path.join(__dirname, 'public', 'views', 'index.html'));
Expand DownExpand Up@@ -62,4 +59,11 @@ app.use((req, res, next) => {

app.use(errorHandler);

app.listen(PORT, () => console.log(`Server started on port http://localhost:${PORT}`));
// Only call app.listen() if not in test
if (require.main === module) {
app.listen(PORT, () => {
console.log(`Server is running on port ${PORT}`);
});
}

module.exports = app;
141 changes: 141 additions & 0 deletions interface-adapters/controllers/blogs/blog-controller.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
// Blog controller factories (Clean Architecture)
const defaultHeaders = {
'Content-Type': 'application/json',
'x-content-type-options': 'nosniff',
};

const createBlogController = ({ createBlogUseCaseHandler, errorHandlers, logEvents }) =>
async function createBlogControllerHandler(httpRequest) {
const { body } = httpRequest;
if (!body || Object.keys(body).length === 0) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog data provided',
};
}
try {
const createdBlog = await createBlogUseCaseHandler(body);
return {
headers: defaultHeaders,
statusCode: 201,
data: { createdBlog },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const findAllBlogsController = ({ findAllBlogsUseCaseHandler, logEvents }) =>
async function findAllBlogsControllerHandler(httpRequest) {
try {
const blogs = await findAllBlogsUseCaseHandler();
return {
headers: defaultHeaders,
statusCode: 200,
data: { blogs },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const findOneBlogController = ({ findOneBlogUseCaseHandler, logEvents }) =>
async function findOneBlogControllerHandler(httpRequest) {
const { blogId } = httpRequest.params;
if (!blogId) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog Id provided',
};
}
try {
const blog = await findOneBlogUseCaseHandler({ blogId });
return {
headers: defaultHeaders,
statusCode: 200,
data: { blog },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const updateBlogController = ({ updateBlogUseCaseHandler, logEvents }) =>
async function updateBlogControllerHandler(httpRequest) {
const { blogId } = httpRequest.params;
const updateData = httpRequest.body;
if (!blogId || !updateData) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog Id or update data provided',
};
}
try {
const updatedBlog = await updateBlogUseCaseHandler({ blogId, updateData });
return {
headers: defaultHeaders,
statusCode: 200,
data: { updatedBlog },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const deleteBlogController = ({ deleteBlogUseCaseHandler, logEvents }) =>
async function deleteBlogControllerHandler(httpRequest) {
const { blogId } = httpRequest.params;
if (!blogId) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog Id provided',
};
}
try {
const deleted = await deleteBlogUseCaseHandler({ blogId });
return {
headers: defaultHeaders,
statusCode: 200,
data: deleted,
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

module.exports = {
createBlogController,
findAllBlogsController,
findOneBlogController,
updateBlogController,
deleteBlogController,
};
28 changes: 28 additions & 0 deletions interface-adapters/controllers/blogs/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
const blogController = require('./blog-controller');
const blogUseCaseHandlers = require('../../../application-business-rules/use-cases/blogs');
const { logEvents } = require('../../middlewares/loggers/logger');
const errorHandlers = require('../../validators-errors/errors');

module.exports = {
createBlogControllerHandler: blogController.createBlogController({
createBlogUseCaseHandler: blogUseCaseHandlers.createBlogUseCaseHandler,
errorHandlers,
logEvents,
}),
findAllBlogsControllerHandler: blogController.findAllBlogsController({
findAllBlogsUseCaseHandler: blogUseCaseHandlers.findAllBlogsUseCaseHandler,
logEvents,
}),
findOneBlogControllerHandler: blogController.findOneBlogController({
findOneBlogUseCaseHandler: blogUseCaseHandlers.findOneBlogUseCaseHandler,
logEvents,
}),
updateBlogControllerHandler: blogController.updateBlogController({
updateBlogUseCaseHandler: blogUseCaseHandlers.updateBlogUseCaseHandler,
logEvents,
}),
deleteBlogControllerHandler: blogController.deleteBlogController({
deleteBlogUseCaseHandler: blogUseCaseHandlers.deleteBlogUseCaseHandler,
logEvents,
}),
};
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .husky/pre-push
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn lint && yarn format && yarn test
yarn lint && yarn format
62 changes: 62 additions & 0 deletions application-business-rules/use-cases/blogs/blog-handlers.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
// Blog use cases (Clean Architecture)
module.exports = {
createBlogUseCase: ({ dbBlogHandler, makeBlogModel, logEvents, errorHandlers }) =>
async function createBlogUseCaseHandler(blogData) {
try {
const validatedBlog = await makeBlogModel({ blogData });
const newBlog = await dbBlogHandler.createBlog(validatedBlog);
return Object.freeze(newBlog);
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

findAllBlogsUseCase: ({ dbBlogHandler, logEvents }) =>
async function findAllBlogsUseCaseHandler() {
try {
const blogs = await dbBlogHandler.findAllBlogs();
return blogs || [];
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

findOneBlogUseCase: ({ dbBlogHandler, logEvents }) =>
async function findOneBlogUseCaseHandler({ blogId }) {
try {
const blog = await dbBlogHandler.findOneBlog({ blogId });
if (!blog) throw new Error('Blog not found');
return blog;
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

updateBlogUseCase: ({ dbBlogHandler, makeBlogModel, logEvents, errorHandlers }) =>
async function updateBlogUseCaseHandler({ blogId, updateData }) {
try {
const existingBlog = await dbBlogHandler.findOneBlog({ blogId });
if (!existingBlog) throw new Error('Blog not found');
const validatedBlog = await makeBlogModel({ blogData: { ...existingBlog, ...updateData } });
const updatedBlog = await dbBlogHandler.updateBlog({ blogId, ...validatedBlog });
return Object.freeze(updatedBlog);
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

deleteBlogUseCase: ({ dbBlogHandler, logEvents }) =>
async function deleteBlogUseCaseHandler({ blogId }) {
try {
const deleted = await dbBlogHandler.deleteBlog({ blogId });
return deleted;
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},
};
23 changes: 23 additions & 0 deletions application-business-rules/use-cases/blogs/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
const blogUseCases = require('./blog-handlers');
const { dbBlogHandler } = require('../../../interface-adapters/database-access');
const { makeBlogModel } = require('../../../enterprise-business-rules/entities/blog-model');
const { logEvents } = require('../../../interface-adapters/middlewares/loggers/logger');
const errorHandlers = require('../../../interface-adapters/validators-errors/errors');

module.exports = {
createBlogUseCaseHandler: blogUseCases.createBlogUseCase({
dbBlogHandler,
makeBlogModel,
logEvents,
errorHandlers,
}),
findAllBlogsUseCaseHandler: blogUseCases.findAllBlogsUseCase({ dbBlogHandler, logEvents }),
findOneBlogUseCaseHandler: blogUseCases.findOneBlogUseCase({ dbBlogHandler, logEvents }),
updateBlogUseCaseHandler: blogUseCases.updateBlogUseCase({
dbBlogHandler,
makeBlogModel,
logEvents,
errorHandlers,
}),
deleteBlogUseCaseHandler: blogUseCases.deleteBlogUseCase({ dbBlogHandler, logEvents }),
};
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ services:
- '5001:5000' # Change 5001 to any free port
environment:
- PORT=5000
- MONGODB_URI=${MONGODB_URI}
- MONGODB_URI=mongodb://mongo:27017/cleanarchdb
- JWT_SECRET=${JWT_SECRET}
depends_on:
- mongo
Expand Down
19 changes: 19 additions & 0 deletions enterprise-business-rules/entities/blog-model.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
const blogValidation = require('../validate-models/blog-validation');

module.exports = {
makeBlogModel: ({ blogValidation, logEvents }) => {
return async function makeBlog({ blogData }) {
try {
const validatedBlog = await blogValidation.blogPostValidation({
blogPostData: blogData,
errorHandlers: blogValidation,
});
// Add normalization or additional logic if needed
return Object.freeze(validatedBlog);
} catch (error) {
logEvents && logEvents(`${error.message}`, 'blog-model.log');
throw error;
}
};
},
};
20 changes: 12 additions & 8 deletions index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,19 +5,16 @@ const path = require('path');

const { dbconnection } = require('./interface-adapters/database-access/db-connection.js');
const errorHandler = require('./interface-adapters/middlewares/loggers/errorHandler.js');
const userAndAuthRouter = require('./routes/auth-user.router.js');
const { logger } = require('./interface-adapters/middlewares/loggers/logger.js');
const productRouter = require('./routes/product.routes.js');
const createIndexFn = require('./interface-adapters/database-access/db-indexes.js');
const blogRouter = require('./routes/blog.router.js');

const app = express();

const PORT = process.env.PORT || 5000;
var cookieParser = require('cookie-parser');
const corsOptions = require('./interface-adapters/middlewares/config/corsOptions.Js');

// databae connetion call function
// database connection call function
dbconnection().then((db) => {
console.log('database connected: ', db.databaseName);
createIndexFn();
Expand All@@ -29,9 +26,9 @@ app.use(express.json());
app.use(cookieParser());
app.use(express.urlencoded({ extended: false }));

app.use('/users', userAndAuthRouter);
app.use('/products', productRouter);
app.use('/blogs', blogRouter);
// Use the new single entry point for all routes
const mainRouter = require('./routes');
app.use('/', mainRouter);

app.use('/', (_, res) => {
res.sendFile(path.join(__dirname, 'public', 'views', 'index.html'));
Expand DownExpand Up@@ -62,4 +59,11 @@ app.use((req, res, next) => {

app.use(errorHandler);

app.listen(PORT, () => console.log(`Server started on port http://localhost:${PORT}`));
// Only call app.listen() if not in test
if (require.main === module) {
app.listen(PORT, () => {
console.log(`Server is running on port ${PORT}`);
});
}

module.exports = app;
141 changes: 141 additions & 0 deletions interface-adapters/controllers/blogs/blog-controller.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
// Blog controller factories (Clean Architecture)
const defaultHeaders = {
'Content-Type': 'application/json',
'x-content-type-options': 'nosniff',
};

const createBlogController = ({ createBlogUseCaseHandler, errorHandlers, logEvents }) =>
async function createBlogControllerHandler(httpRequest) {
const { body } = httpRequest;
if (!body || Object.keys(body).length === 0) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog data provided',
};
}
try {
const createdBlog = await createBlogUseCaseHandler(body);
return {
headers: defaultHeaders,
statusCode: 201,
data: { createdBlog },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const findAllBlogsController = ({ findAllBlogsUseCaseHandler, logEvents }) =>
async function findAllBlogsControllerHandler(httpRequest) {
try {
const blogs = await findAllBlogsUseCaseHandler();
return {
headers: defaultHeaders,
statusCode: 200,
data: { blogs },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const findOneBlogController = ({ findOneBlogUseCaseHandler, logEvents }) =>
async function findOneBlogControllerHandler(httpRequest) {
const { blogId } = httpRequest.params;
if (!blogId) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog Id provided',
};
}
try {
const blog = await findOneBlogUseCaseHandler({ blogId });
return {
headers: defaultHeaders,
statusCode: 200,
data: { blog },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const updateBlogController = ({ updateBlogUseCaseHandler, logEvents }) =>
async function updateBlogControllerHandler(httpRequest) {
const { blogId } = httpRequest.params;
const updateData = httpRequest.body;
if (!blogId || !updateData) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog Id or update data provided',
};
}
try {
const updatedBlog = await updateBlogUseCaseHandler({ blogId, updateData });
return {
headers: defaultHeaders,
statusCode: 200,
data: { updatedBlog },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const deleteBlogController = ({ deleteBlogUseCaseHandler, logEvents }) =>
async function deleteBlogControllerHandler(httpRequest) {
const { blogId } = httpRequest.params;
if (!blogId) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog Id provided',
};
}
try {
const deleted = await deleteBlogUseCaseHandler({ blogId });
return {
headers: defaultHeaders,
statusCode: 200,
data: deleted,
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

module.exports = {
createBlogController,
findAllBlogsController,
findOneBlogController,
updateBlogController,
deleteBlogController,
};
28 changes: 28 additions & 0 deletions interface-adapters/controllers/blogs/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
const blogController = require('./blog-controller');
const blogUseCaseHandlers = require('../../../application-business-rules/use-cases/blogs');
const { logEvents } = require('../../middlewares/loggers/logger');
const errorHandlers = require('../../validators-errors/errors');

module.exports = {
createBlogControllerHandler: blogController.createBlogController({
createBlogUseCaseHandler: blogUseCaseHandlers.createBlogUseCaseHandler,
errorHandlers,
logEvents,
}),
findAllBlogsControllerHandler: blogController.findAllBlogsController({
findAllBlogsUseCaseHandler: blogUseCaseHandlers.findAllBlogsUseCaseHandler,
logEvents,
}),
findOneBlogControllerHandler: blogController.findOneBlogController({
findOneBlogUseCaseHandler: blogUseCaseHandlers.findOneBlogUseCaseHandler,
logEvents,
}),
updateBlogControllerHandler: blogController.updateBlogController({
updateBlogUseCaseHandler: blogUseCaseHandlers.updateBlogUseCaseHandler,
logEvents,
}),
deleteBlogControllerHandler: blogController.deleteBlogController({
deleteBlogUseCaseHandler: blogUseCaseHandlers.deleteBlogUseCaseHandler,
logEvents,
}),
};
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .husky/pre-push
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn lint && yarn format && yarn test
yarn lint && yarn format
62 changes: 62 additions & 0 deletions application-business-rules/use-cases/blogs/blog-handlers.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
// Blog use cases (Clean Architecture)
module.exports = {
createBlogUseCase: ({ dbBlogHandler, makeBlogModel, logEvents, errorHandlers }) =>
async function createBlogUseCaseHandler(blogData) {
try {
const validatedBlog = await makeBlogModel({ blogData });
const newBlog = await dbBlogHandler.createBlog(validatedBlog);
return Object.freeze(newBlog);
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

findAllBlogsUseCase: ({ dbBlogHandler, logEvents }) =>
async function findAllBlogsUseCaseHandler() {
try {
const blogs = await dbBlogHandler.findAllBlogs();
return blogs || [];
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

findOneBlogUseCase: ({ dbBlogHandler, logEvents }) =>
async function findOneBlogUseCaseHandler({ blogId }) {
try {
const blog = await dbBlogHandler.findOneBlog({ blogId });
if (!blog) throw new Error('Blog not found');
return blog;
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

updateBlogUseCase: ({ dbBlogHandler, makeBlogModel, logEvents, errorHandlers }) =>
async function updateBlogUseCaseHandler({ blogId, updateData }) {
try {
const existingBlog = await dbBlogHandler.findOneBlog({ blogId });
if (!existingBlog) throw new Error('Blog not found');
const validatedBlog = await makeBlogModel({ blogData: { ...existingBlog, ...updateData } });
const updatedBlog = await dbBlogHandler.updateBlog({ blogId, ...validatedBlog });
return Object.freeze(updatedBlog);
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

deleteBlogUseCase: ({ dbBlogHandler, logEvents }) =>
async function deleteBlogUseCaseHandler({ blogId }) {
try {
const deleted = await dbBlogHandler.deleteBlog({ blogId });
return deleted;
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},
};
23 changes: 23 additions & 0 deletions application-business-rules/use-cases/blogs/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
const blogUseCases = require('./blog-handlers');
const { dbBlogHandler } = require('../../../interface-adapters/database-access');
const { makeBlogModel } = require('../../../enterprise-business-rules/entities/blog-model');
const { logEvents } = require('../../../interface-adapters/middlewares/loggers/logger');
const errorHandlers = require('../../../interface-adapters/validators-errors/errors');

module.exports = {
createBlogUseCaseHandler: blogUseCases.createBlogUseCase({
dbBlogHandler,
makeBlogModel,
logEvents,
errorHandlers,
}),
findAllBlogsUseCaseHandler: blogUseCases.findAllBlogsUseCase({ dbBlogHandler, logEvents }),
findOneBlogUseCaseHandler: blogUseCases.findOneBlogUseCase({ dbBlogHandler, logEvents }),
updateBlogUseCaseHandler: blogUseCases.updateBlogUseCase({
dbBlogHandler,
makeBlogModel,
logEvents,
errorHandlers,
}),
deleteBlogUseCaseHandler: blogUseCases.deleteBlogUseCase({ dbBlogHandler, logEvents }),
};
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ services:
- '5001:5000' # Change 5001 to any free port
environment:
- PORT=5000
- MONGODB_URI=${MONGODB_URI}
- MONGODB_URI=mongodb://mongo:27017/cleanarchdb
- JWT_SECRET=${JWT_SECRET}
depends_on:
- mongo
Expand Down
19 changes: 19 additions & 0 deletions enterprise-business-rules/entities/blog-model.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
const blogValidation = require('../validate-models/blog-validation');

module.exports = {
makeBlogModel: ({ blogValidation, logEvents }) => {
return async function makeBlog({ blogData }) {
try {
const validatedBlog = await blogValidation.blogPostValidation({
blogPostData: blogData,
errorHandlers: blogValidation,
});
// Add normalization or additional logic if needed
return Object.freeze(validatedBlog);
} catch (error) {
logEvents && logEvents(`${error.message}`, 'blog-model.log');
throw error;
}
};
},
};
20 changes: 12 additions & 8 deletions index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,19 +5,16 @@ const path = require('path');

const { dbconnection } = require('./interface-adapters/database-access/db-connection.js');
const errorHandler = require('./interface-adapters/middlewares/loggers/errorHandler.js');
const userAndAuthRouter = require('./routes/auth-user.router.js');
const { logger } = require('./interface-adapters/middlewares/loggers/logger.js');
const productRouter = require('./routes/product.routes.js');
const createIndexFn = require('./interface-adapters/database-access/db-indexes.js');
const blogRouter = require('./routes/blog.router.js');

const app = express();

const PORT = process.env.PORT || 5000;
var cookieParser = require('cookie-parser');
const corsOptions = require('./interface-adapters/middlewares/config/corsOptions.Js');

// databae connetion call function
// database connection call function
dbconnection().then((db) => {
console.log('database connected: ', db.databaseName);
createIndexFn();
Expand All@@ -29,9 +26,9 @@ app.use(express.json());
app.use(cookieParser());
app.use(express.urlencoded({ extended: false }));

app.use('/users', userAndAuthRouter);
app.use('/products', productRouter);
app.use('/blogs', blogRouter);
// Use the new single entry point for all routes
const mainRouter = require('./routes');
app.use('/', mainRouter);

app.use('/', (_, res) => {
res.sendFile(path.join(__dirname, 'public', 'views', 'index.html'));
Expand DownExpand Up@@ -62,4 +59,11 @@ app.use((req, res, next) => {

app.use(errorHandler);

app.listen(PORT, () => console.log(`Server started on port http://localhost:${PORT}`));
// Only call app.listen() if not in test
if (require.main === module) {
app.listen(PORT, () => {
console.log(`Server is running on port ${PORT}`);
});
}

module.exports = app;
141 changes: 141 additions & 0 deletions interface-adapters/controllers/blogs/blog-controller.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
// Blog controller factories (Clean Architecture)
const defaultHeaders = {
'Content-Type': 'application/json',
'x-content-type-options': 'nosniff',
};

const createBlogController = ({ createBlogUseCaseHandler, errorHandlers, logEvents }) =>
async function createBlogControllerHandler(httpRequest) {
const { body } = httpRequest;
if (!body || Object.keys(body).length === 0) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog data provided',
};
}
try {
const createdBlog = await createBlogUseCaseHandler(body);
return {
headers: defaultHeaders,
statusCode: 201,
data: { createdBlog },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const findAllBlogsController = ({ findAllBlogsUseCaseHandler, logEvents }) =>
async function findAllBlogsControllerHandler(httpRequest) {
try {
const blogs = await findAllBlogsUseCaseHandler();
return {
headers: defaultHeaders,
statusCode: 200,
data: { blogs },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const findOneBlogController = ({ findOneBlogUseCaseHandler, logEvents }) =>
async function findOneBlogControllerHandler(httpRequest) {
const { blogId } = httpRequest.params;
if (!blogId) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog Id provided',
};
}
try {
const blog = await findOneBlogUseCaseHandler({ blogId });
return {
headers: defaultHeaders,
statusCode: 200,
data: { blog },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const updateBlogController = ({ updateBlogUseCaseHandler, logEvents }) =>
async function updateBlogControllerHandler(httpRequest) {
const { blogId } = httpRequest.params;
const updateData = httpRequest.body;
if (!blogId || !updateData) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog Id or update data provided',
};
}
try {
const updatedBlog = await updateBlogUseCaseHandler({ blogId, updateData });
return {
headers: defaultHeaders,
statusCode: 200,
data: { updatedBlog },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const deleteBlogController = ({ deleteBlogUseCaseHandler, logEvents }) =>
async function deleteBlogControllerHandler(httpRequest) {
const { blogId } = httpRequest.params;
if (!blogId) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog Id provided',
};
}
try {
const deleted = await deleteBlogUseCaseHandler({ blogId });
return {
headers: defaultHeaders,
statusCode: 200,
data: deleted,
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

module.exports = {
createBlogController,
findAllBlogsController,
findOneBlogController,
updateBlogController,
deleteBlogController,
};
28 changes: 28 additions & 0 deletions interface-adapters/controllers/blogs/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
const blogController = require('./blog-controller');
const blogUseCaseHandlers = require('../../../application-business-rules/use-cases/blogs');
const { logEvents } = require('../../middlewares/loggers/logger');
const errorHandlers = require('../../validators-errors/errors');

module.exports = {
createBlogControllerHandler: blogController.createBlogController({
createBlogUseCaseHandler: blogUseCaseHandlers.createBlogUseCaseHandler,
errorHandlers,
logEvents,
}),
findAllBlogsControllerHandler: blogController.findAllBlogsController({
findAllBlogsUseCaseHandler: blogUseCaseHandlers.findAllBlogsUseCaseHandler,
logEvents,
}),
findOneBlogControllerHandler: blogController.findOneBlogController({
findOneBlogUseCaseHandler: blogUseCaseHandlers.findOneBlogUseCaseHandler,
logEvents,
}),
updateBlogControllerHandler: blogController.updateBlogController({
updateBlogUseCaseHandler: blogUseCaseHandlers.updateBlogUseCaseHandler,
logEvents,
}),
deleteBlogControllerHandler: blogController.deleteBlogController({
deleteBlogUseCaseHandler: blogUseCaseHandlers.deleteBlogUseCaseHandler,
logEvents,
}),
};
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .husky/pre-push
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn lint && yarn format && yarn test
yarn lint && yarn format
62 changes: 62 additions & 0 deletions application-business-rules/use-cases/blogs/blog-handlers.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
// Blog use cases (Clean Architecture)
module.exports = {
createBlogUseCase: ({ dbBlogHandler, makeBlogModel, logEvents, errorHandlers }) =>
async function createBlogUseCaseHandler(blogData) {
try {
const validatedBlog = await makeBlogModel({ blogData });
const newBlog = await dbBlogHandler.createBlog(validatedBlog);
return Object.freeze(newBlog);
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

findAllBlogsUseCase: ({ dbBlogHandler, logEvents }) =>
async function findAllBlogsUseCaseHandler() {
try {
const blogs = await dbBlogHandler.findAllBlogs();
return blogs || [];
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

findOneBlogUseCase: ({ dbBlogHandler, logEvents }) =>
async function findOneBlogUseCaseHandler({ blogId }) {
try {
const blog = await dbBlogHandler.findOneBlog({ blogId });
if (!blog) throw new Error('Blog not found');
return blog;
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

updateBlogUseCase: ({ dbBlogHandler, makeBlogModel, logEvents, errorHandlers }) =>
async function updateBlogUseCaseHandler({ blogId, updateData }) {
try {
const existingBlog = await dbBlogHandler.findOneBlog({ blogId });
if (!existingBlog) throw new Error('Blog not found');
const validatedBlog = await makeBlogModel({ blogData: { ...existingBlog, ...updateData } });
const updatedBlog = await dbBlogHandler.updateBlog({ blogId, ...validatedBlog });
return Object.freeze(updatedBlog);
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

deleteBlogUseCase: ({ dbBlogHandler, logEvents }) =>
async function deleteBlogUseCaseHandler({ blogId }) {
try {
const deleted = await dbBlogHandler.deleteBlog({ blogId });
return deleted;
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},
};
23 changes: 23 additions & 0 deletions application-business-rules/use-cases/blogs/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
const blogUseCases = require('./blog-handlers');
const { dbBlogHandler } = require('../../../interface-adapters/database-access');
const { makeBlogModel } = require('../../../enterprise-business-rules/entities/blog-model');
const { logEvents } = require('../../../interface-adapters/middlewares/loggers/logger');
const errorHandlers = require('../../../interface-adapters/validators-errors/errors');

module.exports = {
createBlogUseCaseHandler: blogUseCases.createBlogUseCase({
dbBlogHandler,
makeBlogModel,
logEvents,
errorHandlers,
}),
findAllBlogsUseCaseHandler: blogUseCases.findAllBlogsUseCase({ dbBlogHandler, logEvents }),
findOneBlogUseCaseHandler: blogUseCases.findOneBlogUseCase({ dbBlogHandler, logEvents }),
updateBlogUseCaseHandler: blogUseCases.updateBlogUseCase({
dbBlogHandler,
makeBlogModel,
logEvents,
errorHandlers,
}),
deleteBlogUseCaseHandler: blogUseCases.deleteBlogUseCase({ dbBlogHandler, logEvents }),
};
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ services:
- '5001:5000' # Change 5001 to any free port
environment:
- PORT=5000
- MONGODB_URI=${MONGODB_URI}
- MONGODB_URI=mongodb://mongo:27017/cleanarchdb
- JWT_SECRET=${JWT_SECRET}
depends_on:
- mongo
Expand Down
19 changes: 19 additions & 0 deletions enterprise-business-rules/entities/blog-model.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
const blogValidation = require('../validate-models/blog-validation');

module.exports = {
makeBlogModel: ({ blogValidation, logEvents }) => {
return async function makeBlog({ blogData }) {
try {
const validatedBlog = await blogValidation.blogPostValidation({
blogPostData: blogData,
errorHandlers: blogValidation,
});
// Add normalization or additional logic if needed
return Object.freeze(validatedBlog);
} catch (error) {
logEvents && logEvents(`${error.message}`, 'blog-model.log');
throw error;
}
};
},
};
20 changes: 12 additions & 8 deletions index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,19 +5,16 @@ const path = require('path');

const { dbconnection } = require('./interface-adapters/database-access/db-connection.js');
const errorHandler = require('./interface-adapters/middlewares/loggers/errorHandler.js');
const userAndAuthRouter = require('./routes/auth-user.router.js');
const { logger } = require('./interface-adapters/middlewares/loggers/logger.js');
const productRouter = require('./routes/product.routes.js');
const createIndexFn = require('./interface-adapters/database-access/db-indexes.js');
const blogRouter = require('./routes/blog.router.js');

const app = express();

const PORT = process.env.PORT || 5000;
var cookieParser = require('cookie-parser');
const corsOptions = require('./interface-adapters/middlewares/config/corsOptions.Js');

// databae connetion call function
// database connection call function
dbconnection().then((db) => {
console.log('database connected: ', db.databaseName);
createIndexFn();
Expand All@@ -29,9 +26,9 @@ app.use(express.json());
app.use(cookieParser());
app.use(express.urlencoded({ extended: false }));

app.use('/users', userAndAuthRouter);
app.use('/products', productRouter);
app.use('/blogs', blogRouter);
// Use the new single entry point for all routes
const mainRouter = require('./routes');
app.use('/', mainRouter);

app.use('/', (_, res) => {
res.sendFile(path.join(__dirname, 'public', 'views', 'index.html'));
Expand DownExpand Up@@ -62,4 +59,11 @@ app.use((req, res, next) => {

app.use(errorHandler);

app.listen(PORT, () => console.log(`Server started on port http://localhost:${PORT}`));
// Only call app.listen() if not in test
if (require.main === module) {
app.listen(PORT, () => {
console.log(`Server is running on port ${PORT}`);
});
}

module.exports = app;
141 changes: 141 additions & 0 deletions interface-adapters/controllers/blogs/blog-controller.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
// Blog controller factories (Clean Architecture)
const defaultHeaders = {
'Content-Type': 'application/json',
'x-content-type-options': 'nosniff',
};

const createBlogController = ({ createBlogUseCaseHandler, errorHandlers, logEvents }) =>
async function createBlogControllerHandler(httpRequest) {
const { body } = httpRequest;
if (!body || Object.keys(body).length === 0) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog data provided',
};
}
try {
const createdBlog = await createBlogUseCaseHandler(body);
return {
headers: defaultHeaders,
statusCode: 201,
data: { createdBlog },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const findAllBlogsController = ({ findAllBlogsUseCaseHandler, logEvents }) =>
async function findAllBlogsControllerHandler(httpRequest) {
try {
const blogs = await findAllBlogsUseCaseHandler();
return {
headers: defaultHeaders,
statusCode: 200,
data: { blogs },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const findOneBlogController = ({ findOneBlogUseCaseHandler, logEvents }) =>
async function findOneBlogControllerHandler(httpRequest) {
const { blogId } = httpRequest.params;
if (!blogId) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog Id provided',
};
}
try {
const blog = await findOneBlogUseCaseHandler({ blogId });
return {
headers: defaultHeaders,
statusCode: 200,
data: { blog },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const updateBlogController = ({ updateBlogUseCaseHandler, logEvents }) =>
async function updateBlogControllerHandler(httpRequest) {
const { blogId } = httpRequest.params;
const updateData = httpRequest.body;
if (!blogId || !updateData) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog Id or update data provided',
};
}
try {
const updatedBlog = await updateBlogUseCaseHandler({ blogId, updateData });
return {
headers: defaultHeaders,
statusCode: 200,
data: { updatedBlog },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const deleteBlogController = ({ deleteBlogUseCaseHandler, logEvents }) =>
async function deleteBlogControllerHandler(httpRequest) {
const { blogId } = httpRequest.params;
if (!blogId) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog Id provided',
};
}
try {
const deleted = await deleteBlogUseCaseHandler({ blogId });
return {
headers: defaultHeaders,
statusCode: 200,
data: deleted,
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

module.exports = {
createBlogController,
findAllBlogsController,
findOneBlogController,
updateBlogController,
deleteBlogController,
};
28 changes: 28 additions & 0 deletions interface-adapters/controllers/blogs/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
const blogController = require('./blog-controller');
const blogUseCaseHandlers = require('../../../application-business-rules/use-cases/blogs');
const { logEvents } = require('../../middlewares/loggers/logger');
const errorHandlers = require('../../validators-errors/errors');

module.exports = {
createBlogControllerHandler: blogController.createBlogController({
createBlogUseCaseHandler: blogUseCaseHandlers.createBlogUseCaseHandler,
errorHandlers,
logEvents,
}),
findAllBlogsControllerHandler: blogController.findAllBlogsController({
findAllBlogsUseCaseHandler: blogUseCaseHandlers.findAllBlogsUseCaseHandler,
logEvents,
}),
findOneBlogControllerHandler: blogController.findOneBlogController({
findOneBlogUseCaseHandler: blogUseCaseHandlers.findOneBlogUseCaseHandler,
logEvents,
}),
updateBlogControllerHandler: blogController.updateBlogController({
updateBlogUseCaseHandler: blogUseCaseHandlers.updateBlogUseCaseHandler,
logEvents,
}),
deleteBlogControllerHandler: blogController.deleteBlogController({
deleteBlogUseCaseHandler: blogUseCaseHandlers.deleteBlogUseCaseHandler,
logEvents,
}),
};
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .husky/pre-push
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn lint && yarn format && yarn test
yarn lint && yarn format
62 changes: 62 additions & 0 deletions application-business-rules/use-cases/blogs/blog-handlers.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
// Blog use cases (Clean Architecture)
module.exports = {
createBlogUseCase: ({ dbBlogHandler, makeBlogModel, logEvents, errorHandlers }) =>
async function createBlogUseCaseHandler(blogData) {
try {
const validatedBlog = await makeBlogModel({ blogData });
const newBlog = await dbBlogHandler.createBlog(validatedBlog);
return Object.freeze(newBlog);
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

findAllBlogsUseCase: ({ dbBlogHandler, logEvents }) =>
async function findAllBlogsUseCaseHandler() {
try {
const blogs = await dbBlogHandler.findAllBlogs();
return blogs || [];
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

findOneBlogUseCase: ({ dbBlogHandler, logEvents }) =>
async function findOneBlogUseCaseHandler({ blogId }) {
try {
const blog = await dbBlogHandler.findOneBlog({ blogId });
if (!blog) throw new Error('Blog not found');
return blog;
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

updateBlogUseCase: ({ dbBlogHandler, makeBlogModel, logEvents, errorHandlers }) =>
async function updateBlogUseCaseHandler({ blogId, updateData }) {
try {
const existingBlog = await dbBlogHandler.findOneBlog({ blogId });
if (!existingBlog) throw new Error('Blog not found');
const validatedBlog = await makeBlogModel({ blogData: { ...existingBlog, ...updateData } });
const updatedBlog = await dbBlogHandler.updateBlog({ blogId, ...validatedBlog });
return Object.freeze(updatedBlog);
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

deleteBlogUseCase: ({ dbBlogHandler, logEvents }) =>
async function deleteBlogUseCaseHandler({ blogId }) {
try {
const deleted = await dbBlogHandler.deleteBlog({ blogId });
return deleted;
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},
};
23 changes: 23 additions & 0 deletions application-business-rules/use-cases/blogs/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
const blogUseCases = require('./blog-handlers');
const { dbBlogHandler } = require('../../../interface-adapters/database-access');
const { makeBlogModel } = require('../../../enterprise-business-rules/entities/blog-model');
const { logEvents } = require('../../../interface-adapters/middlewares/loggers/logger');
const errorHandlers = require('../../../interface-adapters/validators-errors/errors');

module.exports = {
createBlogUseCaseHandler: blogUseCases.createBlogUseCase({
dbBlogHandler,
makeBlogModel,
logEvents,
errorHandlers,
}),
findAllBlogsUseCaseHandler: blogUseCases.findAllBlogsUseCase({ dbBlogHandler, logEvents }),
findOneBlogUseCaseHandler: blogUseCases.findOneBlogUseCase({ dbBlogHandler, logEvents }),
updateBlogUseCaseHandler: blogUseCases.updateBlogUseCase({
dbBlogHandler,
makeBlogModel,
logEvents,
errorHandlers,
}),
deleteBlogUseCaseHandler: blogUseCases.deleteBlogUseCase({ dbBlogHandler, logEvents }),
};
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ services:
- '5001:5000' # Change 5001 to any free port
environment:
- PORT=5000
- MONGODB_URI=${MONGODB_URI}
- MONGODB_URI=mongodb://mongo:27017/cleanarchdb
- JWT_SECRET=${JWT_SECRET}
depends_on:
- mongo
Expand Down
19 changes: 19 additions & 0 deletions enterprise-business-rules/entities/blog-model.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
const blogValidation = require('../validate-models/blog-validation');

module.exports = {
makeBlogModel: ({ blogValidation, logEvents }) => {
return async function makeBlog({ blogData }) {
try {
const validatedBlog = await blogValidation.blogPostValidation({
blogPostData: blogData,
errorHandlers: blogValidation,
});
// Add normalization or additional logic if needed
return Object.freeze(validatedBlog);
} catch (error) {
logEvents && logEvents(`${error.message}`, 'blog-model.log');
throw error;
}
};
},
};
20 changes: 12 additions & 8 deletions index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,19 +5,16 @@ const path = require('path');

const { dbconnection } = require('./interface-adapters/database-access/db-connection.js');
const errorHandler = require('./interface-adapters/middlewares/loggers/errorHandler.js');
const userAndAuthRouter = require('./routes/auth-user.router.js');
const { logger } = require('./interface-adapters/middlewares/loggers/logger.js');
const productRouter = require('./routes/product.routes.js');
const createIndexFn = require('./interface-adapters/database-access/db-indexes.js');
const blogRouter = require('./routes/blog.router.js');

const app = express();

const PORT = process.env.PORT || 5000;
var cookieParser = require('cookie-parser');
const corsOptions = require('./interface-adapters/middlewares/config/corsOptions.Js');

// databae connetion call function
// database connection call function
dbconnection().then((db) => {
console.log('database connected: ', db.databaseName);
createIndexFn();
Expand All@@ -29,9 +26,9 @@ app.use(express.json());
app.use(cookieParser());
app.use(express.urlencoded({ extended: false }));

app.use('/users', userAndAuthRouter);
app.use('/products', productRouter);
app.use('/blogs', blogRouter);
// Use the new single entry point for all routes
const mainRouter = require('./routes');
app.use('/', mainRouter);

app.use('/', (_, res) => {
res.sendFile(path.join(__dirname, 'public', 'views', 'index.html'));
Expand DownExpand Up@@ -62,4 +59,11 @@ app.use((req, res, next) => {

app.use(errorHandler);

app.listen(PORT, () => console.log(`Server started on port http://localhost:${PORT}`));
// Only call app.listen() if not in test
if (require.main === module) {
app.listen(PORT, () => {
console.log(`Server is running on port ${PORT}`);
});
}

module.exports = app;
141 changes: 141 additions & 0 deletions interface-adapters/controllers/blogs/blog-controller.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
// Blog controller factories (Clean Architecture)
const defaultHeaders = {
'Content-Type': 'application/json',
'x-content-type-options': 'nosniff',
};

const createBlogController = ({ createBlogUseCaseHandler, errorHandlers, logEvents }) =>
async function createBlogControllerHandler(httpRequest) {
const { body } = httpRequest;
if (!body || Object.keys(body).length === 0) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog data provided',
};
}
try {
const createdBlog = await createBlogUseCaseHandler(body);
return {
headers: defaultHeaders,
statusCode: 201,
data: { createdBlog },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const findAllBlogsController = ({ findAllBlogsUseCaseHandler, logEvents }) =>
async function findAllBlogsControllerHandler(httpRequest) {
try {
const blogs = await findAllBlogsUseCaseHandler();
return {
headers: defaultHeaders,
statusCode: 200,
data: { blogs },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const findOneBlogController = ({ findOneBlogUseCaseHandler, logEvents }) =>
async function findOneBlogControllerHandler(httpRequest) {
const { blogId } = httpRequest.params;
if (!blogId) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog Id provided',
};
}
try {
const blog = await findOneBlogUseCaseHandler({ blogId });
return {
headers: defaultHeaders,
statusCode: 200,
data: { blog },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const updateBlogController = ({ updateBlogUseCaseHandler, logEvents }) =>
async function updateBlogControllerHandler(httpRequest) {
const { blogId } = httpRequest.params;
const updateData = httpRequest.body;
if (!blogId || !updateData) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog Id or update data provided',
};
}
try {
const updatedBlog = await updateBlogUseCaseHandler({ blogId, updateData });
return {
headers: defaultHeaders,
statusCode: 200,
data: { updatedBlog },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const deleteBlogController = ({ deleteBlogUseCaseHandler, logEvents }) =>
async function deleteBlogControllerHandler(httpRequest) {
const { blogId } = httpRequest.params;
if (!blogId) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog Id provided',
};
}
try {
const deleted = await deleteBlogUseCaseHandler({ blogId });
return {
headers: defaultHeaders,
statusCode: 200,
data: deleted,
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

module.exports = {
createBlogController,
findAllBlogsController,
findOneBlogController,
updateBlogController,
deleteBlogController,
};
28 changes: 28 additions & 0 deletions interface-adapters/controllers/blogs/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
const blogController = require('./blog-controller');
const blogUseCaseHandlers = require('../../../application-business-rules/use-cases/blogs');
const { logEvents } = require('../../middlewares/loggers/logger');
const errorHandlers = require('../../validators-errors/errors');

module.exports = {
createBlogControllerHandler: blogController.createBlogController({
createBlogUseCaseHandler: blogUseCaseHandlers.createBlogUseCaseHandler,
errorHandlers,
logEvents,
}),
findAllBlogsControllerHandler: blogController.findAllBlogsController({
findAllBlogsUseCaseHandler: blogUseCaseHandlers.findAllBlogsUseCaseHandler,
logEvents,
}),
findOneBlogControllerHandler: blogController.findOneBlogController({
findOneBlogUseCaseHandler: blogUseCaseHandlers.findOneBlogUseCaseHandler,
logEvents,
}),
updateBlogControllerHandler: blogController.updateBlogController({
updateBlogUseCaseHandler: blogUseCaseHandlers.updateBlogUseCaseHandler,
logEvents,
}),
deleteBlogControllerHandler: blogController.deleteBlogController({
deleteBlogUseCaseHandler: blogUseCaseHandlers.deleteBlogUseCaseHandler,
logEvents,
}),
};
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .husky/pre-push
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn lint && yarn format && yarn test
yarn lint && yarn format
62 changes: 62 additions & 0 deletions application-business-rules/use-cases/blogs/blog-handlers.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
// Blog use cases (Clean Architecture)
module.exports = {
createBlogUseCase: ({ dbBlogHandler, makeBlogModel, logEvents, errorHandlers }) =>
async function createBlogUseCaseHandler(blogData) {
try {
const validatedBlog = await makeBlogModel({ blogData });
const newBlog = await dbBlogHandler.createBlog(validatedBlog);
return Object.freeze(newBlog);
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

findAllBlogsUseCase: ({ dbBlogHandler, logEvents }) =>
async function findAllBlogsUseCaseHandler() {
try {
const blogs = await dbBlogHandler.findAllBlogs();
return blogs || [];
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

findOneBlogUseCase: ({ dbBlogHandler, logEvents }) =>
async function findOneBlogUseCaseHandler({ blogId }) {
try {
const blog = await dbBlogHandler.findOneBlog({ blogId });
if (!blog) throw new Error('Blog not found');
return blog;
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

updateBlogUseCase: ({ dbBlogHandler, makeBlogModel, logEvents, errorHandlers }) =>
async function updateBlogUseCaseHandler({ blogId, updateData }) {
try {
const existingBlog = await dbBlogHandler.findOneBlog({ blogId });
if (!existingBlog) throw new Error('Blog not found');
const validatedBlog = await makeBlogModel({ blogData: { ...existingBlog, ...updateData } });
const updatedBlog = await dbBlogHandler.updateBlog({ blogId, ...validatedBlog });
return Object.freeze(updatedBlog);
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

deleteBlogUseCase: ({ dbBlogHandler, logEvents }) =>
async function deleteBlogUseCaseHandler({ blogId }) {
try {
const deleted = await dbBlogHandler.deleteBlog({ blogId });
return deleted;
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},
};
23 changes: 23 additions & 0 deletions application-business-rules/use-cases/blogs/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
const blogUseCases = require('./blog-handlers');
const { dbBlogHandler } = require('../../../interface-adapters/database-access');
const { makeBlogModel } = require('../../../enterprise-business-rules/entities/blog-model');
const { logEvents } = require('../../../interface-adapters/middlewares/loggers/logger');
const errorHandlers = require('../../../interface-adapters/validators-errors/errors');

module.exports = {
createBlogUseCaseHandler: blogUseCases.createBlogUseCase({
dbBlogHandler,
makeBlogModel,
logEvents,
errorHandlers,
}),
findAllBlogsUseCaseHandler: blogUseCases.findAllBlogsUseCase({ dbBlogHandler, logEvents }),
findOneBlogUseCaseHandler: blogUseCases.findOneBlogUseCase({ dbBlogHandler, logEvents }),
updateBlogUseCaseHandler: blogUseCases.updateBlogUseCase({
dbBlogHandler,
makeBlogModel,
logEvents,
errorHandlers,
}),
deleteBlogUseCaseHandler: blogUseCases.deleteBlogUseCase({ dbBlogHandler, logEvents }),
};
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ services:
- '5001:5000' # Change 5001 to any free port
environment:
- PORT=5000
- MONGODB_URI=${MONGODB_URI}
- MONGODB_URI=mongodb://mongo:27017/cleanarchdb
- JWT_SECRET=${JWT_SECRET}
depends_on:
- mongo
Expand Down
19 changes: 19 additions & 0 deletions enterprise-business-rules/entities/blog-model.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
const blogValidation = require('../validate-models/blog-validation');

module.exports = {
makeBlogModel: ({ blogValidation, logEvents }) => {
return async function makeBlog({ blogData }) {
try {
const validatedBlog = await blogValidation.blogPostValidation({
blogPostData: blogData,
errorHandlers: blogValidation,
});
// Add normalization or additional logic if needed
return Object.freeze(validatedBlog);
} catch (error) {
logEvents && logEvents(`${error.message}`, 'blog-model.log');
throw error;
}
};
},
};
20 changes: 12 additions & 8 deletions index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,19 +5,16 @@ const path = require('path');

const { dbconnection } = require('./interface-adapters/database-access/db-connection.js');
const errorHandler = require('./interface-adapters/middlewares/loggers/errorHandler.js');
const userAndAuthRouter = require('./routes/auth-user.router.js');
const { logger } = require('./interface-adapters/middlewares/loggers/logger.js');
const productRouter = require('./routes/product.routes.js');
const createIndexFn = require('./interface-adapters/database-access/db-indexes.js');
const blogRouter = require('./routes/blog.router.js');

const app = express();

const PORT = process.env.PORT || 5000;
var cookieParser = require('cookie-parser');
const corsOptions = require('./interface-adapters/middlewares/config/corsOptions.Js');

// databae connetion call function
// database connection call function
dbconnection().then((db) => {
console.log('database connected: ', db.databaseName);
createIndexFn();
Expand All@@ -29,9 +26,9 @@ app.use(express.json());
app.use(cookieParser());
app.use(express.urlencoded({ extended: false }));

app.use('/users', userAndAuthRouter);
app.use('/products', productRouter);
app.use('/blogs', blogRouter);
// Use the new single entry point for all routes
const mainRouter = require('./routes');
app.use('/', mainRouter);

app.use('/', (_, res) => {
res.sendFile(path.join(__dirname, 'public', 'views', 'index.html'));
Expand DownExpand Up@@ -62,4 +59,11 @@ app.use((req, res, next) => {

app.use(errorHandler);

app.listen(PORT, () => console.log(`Server started on port http://localhost:${PORT}`));
// Only call app.listen() if not in test
if (require.main === module) {
app.listen(PORT, () => {
console.log(`Server is running on port ${PORT}`);
});
}

module.exports = app;
141 changes: 141 additions & 0 deletions interface-adapters/controllers/blogs/blog-controller.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
// Blog controller factories (Clean Architecture)
const defaultHeaders = {
'Content-Type': 'application/json',
'x-content-type-options': 'nosniff',
};

const createBlogController = ({ createBlogUseCaseHandler, errorHandlers, logEvents }) =>
async function createBlogControllerHandler(httpRequest) {
const { body } = httpRequest;
if (!body || Object.keys(body).length === 0) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog data provided',
};
}
try {
const createdBlog = await createBlogUseCaseHandler(body);
return {
headers: defaultHeaders,
statusCode: 201,
data: { createdBlog },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const findAllBlogsController = ({ findAllBlogsUseCaseHandler, logEvents }) =>
async function findAllBlogsControllerHandler(httpRequest) {
try {
const blogs = await findAllBlogsUseCaseHandler();
return {
headers: defaultHeaders,
statusCode: 200,
data: { blogs },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const findOneBlogController = ({ findOneBlogUseCaseHandler, logEvents }) =>
async function findOneBlogControllerHandler(httpRequest) {
const { blogId } = httpRequest.params;
if (!blogId) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog Id provided',
};
}
try {
const blog = await findOneBlogUseCaseHandler({ blogId });
return {
headers: defaultHeaders,
statusCode: 200,
data: { blog },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const updateBlogController = ({ updateBlogUseCaseHandler, logEvents }) =>
async function updateBlogControllerHandler(httpRequest) {
const { blogId } = httpRequest.params;
const updateData = httpRequest.body;
if (!blogId || !updateData) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog Id or update data provided',
};
}
try {
const updatedBlog = await updateBlogUseCaseHandler({ blogId, updateData });
return {
headers: defaultHeaders,
statusCode: 200,
data: { updatedBlog },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const deleteBlogController = ({ deleteBlogUseCaseHandler, logEvents }) =>
async function deleteBlogControllerHandler(httpRequest) {
const { blogId } = httpRequest.params;
if (!blogId) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog Id provided',
};
}
try {
const deleted = await deleteBlogUseCaseHandler({ blogId });
return {
headers: defaultHeaders,
statusCode: 200,
data: deleted,
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

module.exports = {
createBlogController,
findAllBlogsController,
findOneBlogController,
updateBlogController,
deleteBlogController,
};
28 changes: 28 additions & 0 deletions interface-adapters/controllers/blogs/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
const blogController = require('./blog-controller');
const blogUseCaseHandlers = require('../../../application-business-rules/use-cases/blogs');
const { logEvents } = require('../../middlewares/loggers/logger');
const errorHandlers = require('../../validators-errors/errors');

module.exports = {
createBlogControllerHandler: blogController.createBlogController({
createBlogUseCaseHandler: blogUseCaseHandlers.createBlogUseCaseHandler,
errorHandlers,
logEvents,
}),
findAllBlogsControllerHandler: blogController.findAllBlogsController({
findAllBlogsUseCaseHandler: blogUseCaseHandlers.findAllBlogsUseCaseHandler,
logEvents,
}),
findOneBlogControllerHandler: blogController.findOneBlogController({
findOneBlogUseCaseHandler: blogUseCaseHandlers.findOneBlogUseCaseHandler,
logEvents,
}),
updateBlogControllerHandler: blogController.updateBlogController({
updateBlogUseCaseHandler: blogUseCaseHandlers.updateBlogUseCaseHandler,
logEvents,
}),
deleteBlogControllerHandler: blogController.deleteBlogController({
deleteBlogUseCaseHandler: blogUseCaseHandlers.deleteBlogUseCaseHandler,
logEvents,
}),
};
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .husky/pre-push
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn lint && yarn format && yarn test
yarn lint && yarn format
62 changes: 62 additions & 0 deletions application-business-rules/use-cases/blogs/blog-handlers.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
// Blog use cases (Clean Architecture)
module.exports = {
createBlogUseCase: ({ dbBlogHandler, makeBlogModel, logEvents, errorHandlers }) =>
async function createBlogUseCaseHandler(blogData) {
try {
const validatedBlog = await makeBlogModel({ blogData });
const newBlog = await dbBlogHandler.createBlog(validatedBlog);
return Object.freeze(newBlog);
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

findAllBlogsUseCase: ({ dbBlogHandler, logEvents }) =>
async function findAllBlogsUseCaseHandler() {
try {
const blogs = await dbBlogHandler.findAllBlogs();
return blogs || [];
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

findOneBlogUseCase: ({ dbBlogHandler, logEvents }) =>
async function findOneBlogUseCaseHandler({ blogId }) {
try {
const blog = await dbBlogHandler.findOneBlog({ blogId });
if (!blog) throw new Error('Blog not found');
return blog;
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

updateBlogUseCase: ({ dbBlogHandler, makeBlogModel, logEvents, errorHandlers }) =>
async function updateBlogUseCaseHandler({ blogId, updateData }) {
try {
const existingBlog = await dbBlogHandler.findOneBlog({ blogId });
if (!existingBlog) throw new Error('Blog not found');
const validatedBlog = await makeBlogModel({ blogData: { ...existingBlog, ...updateData } });
const updatedBlog = await dbBlogHandler.updateBlog({ blogId, ...validatedBlog });
return Object.freeze(updatedBlog);
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

deleteBlogUseCase: ({ dbBlogHandler, logEvents }) =>
async function deleteBlogUseCaseHandler({ blogId }) {
try {
const deleted = await dbBlogHandler.deleteBlog({ blogId });
return deleted;
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},
};
23 changes: 23 additions & 0 deletions application-business-rules/use-cases/blogs/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
const blogUseCases = require('./blog-handlers');
const { dbBlogHandler } = require('../../../interface-adapters/database-access');
const { makeBlogModel } = require('../../../enterprise-business-rules/entities/blog-model');
const { logEvents } = require('../../../interface-adapters/middlewares/loggers/logger');
const errorHandlers = require('../../../interface-adapters/validators-errors/errors');

module.exports = {
createBlogUseCaseHandler: blogUseCases.createBlogUseCase({
dbBlogHandler,
makeBlogModel,
logEvents,
errorHandlers,
}),
findAllBlogsUseCaseHandler: blogUseCases.findAllBlogsUseCase({ dbBlogHandler, logEvents }),
findOneBlogUseCaseHandler: blogUseCases.findOneBlogUseCase({ dbBlogHandler, logEvents }),
updateBlogUseCaseHandler: blogUseCases.updateBlogUseCase({
dbBlogHandler,
makeBlogModel,
logEvents,
errorHandlers,
}),
deleteBlogUseCaseHandler: blogUseCases.deleteBlogUseCase({ dbBlogHandler, logEvents }),
};
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ services:
- '5001:5000' # Change 5001 to any free port
environment:
- PORT=5000
- MONGODB_URI=${MONGODB_URI}
- MONGODB_URI=mongodb://mongo:27017/cleanarchdb
- JWT_SECRET=${JWT_SECRET}
depends_on:
- mongo
Expand Down
19 changes: 19 additions & 0 deletions enterprise-business-rules/entities/blog-model.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
const blogValidation = require('../validate-models/blog-validation');

module.exports = {
makeBlogModel: ({ blogValidation, logEvents }) => {
return async function makeBlog({ blogData }) {
try {
const validatedBlog = await blogValidation.blogPostValidation({
blogPostData: blogData,
errorHandlers: blogValidation,
});
// Add normalization or additional logic if needed
return Object.freeze(validatedBlog);
} catch (error) {
logEvents && logEvents(`${error.message}`, 'blog-model.log');
throw error;
}
};
},
};
20 changes: 12 additions & 8 deletions index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,19 +5,16 @@ const path = require('path');

const { dbconnection } = require('./interface-adapters/database-access/db-connection.js');
const errorHandler = require('./interface-adapters/middlewares/loggers/errorHandler.js');
const userAndAuthRouter = require('./routes/auth-user.router.js');
const { logger } = require('./interface-adapters/middlewares/loggers/logger.js');
const productRouter = require('./routes/product.routes.js');
const createIndexFn = require('./interface-adapters/database-access/db-indexes.js');
const blogRouter = require('./routes/blog.router.js');

const app = express();

const PORT = process.env.PORT || 5000;
var cookieParser = require('cookie-parser');
const corsOptions = require('./interface-adapters/middlewares/config/corsOptions.Js');

// databae connetion call function
// database connection call function
dbconnection().then((db) => {
console.log('database connected: ', db.databaseName);
createIndexFn();
Expand All@@ -29,9 +26,9 @@ app.use(express.json());
app.use(cookieParser());
app.use(express.urlencoded({ extended: false }));

app.use('/users', userAndAuthRouter);
app.use('/products', productRouter);
app.use('/blogs', blogRouter);
// Use the new single entry point for all routes
const mainRouter = require('./routes');
app.use('/', mainRouter);

app.use('/', (_, res) => {
res.sendFile(path.join(__dirname, 'public', 'views', 'index.html'));
Expand DownExpand Up@@ -62,4 +59,11 @@ app.use((req, res, next) => {

app.use(errorHandler);

app.listen(PORT, () => console.log(`Server started on port http://localhost:${PORT}`));
// Only call app.listen() if not in test
if (require.main === module) {
app.listen(PORT, () => {
console.log(`Server is running on port ${PORT}`);
});
}

module.exports = app;
141 changes: 141 additions & 0 deletions interface-adapters/controllers/blogs/blog-controller.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
// Blog controller factories (Clean Architecture)
const defaultHeaders = {
'Content-Type': 'application/json',
'x-content-type-options': 'nosniff',
};

const createBlogController = ({ createBlogUseCaseHandler, errorHandlers, logEvents }) =>
async function createBlogControllerHandler(httpRequest) {
const { body } = httpRequest;
if (!body || Object.keys(body).length === 0) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog data provided',
};
}
try {
const createdBlog = await createBlogUseCaseHandler(body);
return {
headers: defaultHeaders,
statusCode: 201,
data: { createdBlog },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const findAllBlogsController = ({ findAllBlogsUseCaseHandler, logEvents }) =>
async function findAllBlogsControllerHandler(httpRequest) {
try {
const blogs = await findAllBlogsUseCaseHandler();
return {
headers: defaultHeaders,
statusCode: 200,
data: { blogs },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const findOneBlogController = ({ findOneBlogUseCaseHandler, logEvents }) =>
async function findOneBlogControllerHandler(httpRequest) {
const { blogId } = httpRequest.params;
if (!blogId) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog Id provided',
};
}
try {
const blog = await findOneBlogUseCaseHandler({ blogId });
return {
headers: defaultHeaders,
statusCode: 200,
data: { blog },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const updateBlogController = ({ updateBlogUseCaseHandler, logEvents }) =>
async function updateBlogControllerHandler(httpRequest) {
const { blogId } = httpRequest.params;
const updateData = httpRequest.body;
if (!blogId || !updateData) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog Id or update data provided',
};
}
try {
const updatedBlog = await updateBlogUseCaseHandler({ blogId, updateData });
return {
headers: defaultHeaders,
statusCode: 200,
data: { updatedBlog },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const deleteBlogController = ({ deleteBlogUseCaseHandler, logEvents }) =>
async function deleteBlogControllerHandler(httpRequest) {
const { blogId } = httpRequest.params;
if (!blogId) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog Id provided',
};
}
try {
const deleted = await deleteBlogUseCaseHandler({ blogId });
return {
headers: defaultHeaders,
statusCode: 200,
data: deleted,
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

module.exports = {
createBlogController,
findAllBlogsController,
findOneBlogController,
updateBlogController,
deleteBlogController,
};
28 changes: 28 additions & 0 deletions interface-adapters/controllers/blogs/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
const blogController = require('./blog-controller');
const blogUseCaseHandlers = require('../../../application-business-rules/use-cases/blogs');
const { logEvents } = require('../../middlewares/loggers/logger');
const errorHandlers = require('../../validators-errors/errors');

module.exports = {
createBlogControllerHandler: blogController.createBlogController({
createBlogUseCaseHandler: blogUseCaseHandlers.createBlogUseCaseHandler,
errorHandlers,
logEvents,
}),
findAllBlogsControllerHandler: blogController.findAllBlogsController({
findAllBlogsUseCaseHandler: blogUseCaseHandlers.findAllBlogsUseCaseHandler,
logEvents,
}),
findOneBlogControllerHandler: blogController.findOneBlogController({
findOneBlogUseCaseHandler: blogUseCaseHandlers.findOneBlogUseCaseHandler,
logEvents,
}),
updateBlogControllerHandler: blogController.updateBlogController({
updateBlogUseCaseHandler: blogUseCaseHandlers.updateBlogUseCaseHandler,
logEvents,
}),
deleteBlogControllerHandler: blogController.deleteBlogController({
deleteBlogUseCaseHandler: blogUseCaseHandlers.deleteBlogUseCaseHandler,
logEvents,
}),
};
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .husky/pre-push
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn lint && yarn format && yarn test
yarn lint && yarn format
62 changes: 62 additions & 0 deletions application-business-rules/use-cases/blogs/blog-handlers.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
// Blog use cases (Clean Architecture)
module.exports = {
createBlogUseCase: ({ dbBlogHandler, makeBlogModel, logEvents, errorHandlers }) =>
async function createBlogUseCaseHandler(blogData) {
try {
const validatedBlog = await makeBlogModel({ blogData });
const newBlog = await dbBlogHandler.createBlog(validatedBlog);
return Object.freeze(newBlog);
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

findAllBlogsUseCase: ({ dbBlogHandler, logEvents }) =>
async function findAllBlogsUseCaseHandler() {
try {
const blogs = await dbBlogHandler.findAllBlogs();
return blogs || [];
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

findOneBlogUseCase: ({ dbBlogHandler, logEvents }) =>
async function findOneBlogUseCaseHandler({ blogId }) {
try {
const blog = await dbBlogHandler.findOneBlog({ blogId });
if (!blog) throw new Error('Blog not found');
return blog;
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

updateBlogUseCase: ({ dbBlogHandler, makeBlogModel, logEvents, errorHandlers }) =>
async function updateBlogUseCaseHandler({ blogId, updateData }) {
try {
const existingBlog = await dbBlogHandler.findOneBlog({ blogId });
if (!existingBlog) throw new Error('Blog not found');
const validatedBlog = await makeBlogModel({ blogData: { ...existingBlog, ...updateData } });
const updatedBlog = await dbBlogHandler.updateBlog({ blogId, ...validatedBlog });
return Object.freeze(updatedBlog);
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},

deleteBlogUseCase: ({ dbBlogHandler, logEvents }) =>
async function deleteBlogUseCaseHandler({ blogId }) {
try {
const deleted = await dbBlogHandler.deleteBlog({ blogId });
return deleted;
} catch (error) {
logEvents && logEvents(error.message, 'blogUseCase.log');
throw error;
}
},
};
23 changes: 23 additions & 0 deletions application-business-rules/use-cases/blogs/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
const blogUseCases = require('./blog-handlers');
const { dbBlogHandler } = require('../../../interface-adapters/database-access');
const { makeBlogModel } = require('../../../enterprise-business-rules/entities/blog-model');
const { logEvents } = require('../../../interface-adapters/middlewares/loggers/logger');
const errorHandlers = require('../../../interface-adapters/validators-errors/errors');

module.exports = {
createBlogUseCaseHandler: blogUseCases.createBlogUseCase({
dbBlogHandler,
makeBlogModel,
logEvents,
errorHandlers,
}),
findAllBlogsUseCaseHandler: blogUseCases.findAllBlogsUseCase({ dbBlogHandler, logEvents }),
findOneBlogUseCaseHandler: blogUseCases.findOneBlogUseCase({ dbBlogHandler, logEvents }),
updateBlogUseCaseHandler: blogUseCases.updateBlogUseCase({
dbBlogHandler,
makeBlogModel,
logEvents,
errorHandlers,
}),
deleteBlogUseCaseHandler: blogUseCases.deleteBlogUseCase({ dbBlogHandler, logEvents }),
};
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ services:
- '5001:5000' # Change 5001 to any free port
environment:
- PORT=5000
- MONGODB_URI=${MONGODB_URI}
- MONGODB_URI=mongodb://mongo:27017/cleanarchdb
- JWT_SECRET=${JWT_SECRET}
depends_on:
- mongo
Expand Down
19 changes: 19 additions & 0 deletions enterprise-business-rules/entities/blog-model.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
const blogValidation = require('../validate-models/blog-validation');

module.exports = {
makeBlogModel: ({ blogValidation, logEvents }) => {
return async function makeBlog({ blogData }) {
try {
const validatedBlog = await blogValidation.blogPostValidation({
blogPostData: blogData,
errorHandlers: blogValidation,
});
// Add normalization or additional logic if needed
return Object.freeze(validatedBlog);
} catch (error) {
logEvents && logEvents(`${error.message}`, 'blog-model.log');
throw error;
}
};
},
};
20 changes: 12 additions & 8 deletions index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,19 +5,16 @@ const path = require('path');

const { dbconnection } = require('./interface-adapters/database-access/db-connection.js');
const errorHandler = require('./interface-adapters/middlewares/loggers/errorHandler.js');
const userAndAuthRouter = require('./routes/auth-user.router.js');
const { logger } = require('./interface-adapters/middlewares/loggers/logger.js');
const productRouter = require('./routes/product.routes.js');
const createIndexFn = require('./interface-adapters/database-access/db-indexes.js');
const blogRouter = require('./routes/blog.router.js');

const app = express();

const PORT = process.env.PORT || 5000;
var cookieParser = require('cookie-parser');
const corsOptions = require('./interface-adapters/middlewares/config/corsOptions.Js');

// databae connetion call function
// database connection call function
dbconnection().then((db) => {
console.log('database connected: ', db.databaseName);
createIndexFn();
Expand All@@ -29,9 +26,9 @@ app.use(express.json());
app.use(cookieParser());
app.use(express.urlencoded({ extended: false }));

app.use('/users', userAndAuthRouter);
app.use('/products', productRouter);
app.use('/blogs', blogRouter);
// Use the new single entry point for all routes
const mainRouter = require('./routes');
app.use('/', mainRouter);

app.use('/', (_, res) => {
res.sendFile(path.join(__dirname, 'public', 'views', 'index.html'));
Expand DownExpand Up@@ -62,4 +59,11 @@ app.use((req, res, next) => {

app.use(errorHandler);

app.listen(PORT, () => console.log(`Server started on port http://localhost:${PORT}`));
// Only call app.listen() if not in test
if (require.main === module) {
app.listen(PORT, () => {
console.log(`Server is running on port ${PORT}`);
});
}

module.exports = app;
141 changes: 141 additions & 0 deletions interface-adapters/controllers/blogs/blog-controller.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
// Blog controller factories (Clean Architecture)
const defaultHeaders = {
'Content-Type': 'application/json',
'x-content-type-options': 'nosniff',
};

const createBlogController = ({ createBlogUseCaseHandler, errorHandlers, logEvents }) =>
async function createBlogControllerHandler(httpRequest) {
const { body } = httpRequest;
if (!body || Object.keys(body).length === 0) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog data provided',
};
}
try {
const createdBlog = await createBlogUseCaseHandler(body);
return {
headers: defaultHeaders,
statusCode: 201,
data: { createdBlog },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const findAllBlogsController = ({ findAllBlogsUseCaseHandler, logEvents }) =>
async function findAllBlogsControllerHandler(httpRequest) {
try {
const blogs = await findAllBlogsUseCaseHandler();
return {
headers: defaultHeaders,
statusCode: 200,
data: { blogs },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const findOneBlogController = ({ findOneBlogUseCaseHandler, logEvents }) =>
async function findOneBlogControllerHandler(httpRequest) {
const { blogId } = httpRequest.params;
if (!blogId) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog Id provided',
};
}
try {
const blog = await findOneBlogUseCaseHandler({ blogId });
return {
headers: defaultHeaders,
statusCode: 200,
data: { blog },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const updateBlogController = ({ updateBlogUseCaseHandler, logEvents }) =>
async function updateBlogControllerHandler(httpRequest) {
const { blogId } = httpRequest.params;
const updateData = httpRequest.body;
if (!blogId || !updateData) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog Id or update data provided',
};
}
try {
const updatedBlog = await updateBlogUseCaseHandler({ blogId, updateData });
return {
headers: defaultHeaders,
statusCode: 200,
data: { updatedBlog },
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

const deleteBlogController = ({ deleteBlogUseCaseHandler, logEvents }) =>
async function deleteBlogControllerHandler(httpRequest) {
const { blogId } = httpRequest.params;
if (!blogId) {
return {
headers: defaultHeaders,
statusCode: 400,
errorMessage: 'No blog Id provided',
};
}
try {
const deleted = await deleteBlogUseCaseHandler({ blogId });
return {
headers: defaultHeaders,
statusCode: 200,
data: deleted,
};
} catch (e) {
logEvents && logEvents(e.message, 'blogController.log');
return {
headers: defaultHeaders,
statusCode: 500,
errorMessage: e.message,
};
}
};

module.exports = {
createBlogController,
findAllBlogsController,
findOneBlogController,
updateBlogController,
deleteBlogController,
};
28 changes: 28 additions & 0 deletions interface-adapters/controllers/blogs/index.js
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
const blogController = require('./blog-controller');
const blogUseCaseHandlers = require('../../../application-business-rules/use-cases/blogs');
const { logEvents } = require('../../middlewares/loggers/logger');
const errorHandlers = require('../../validators-errors/errors');

module.exports = {
createBlogControllerHandler: blogController.createBlogController({
createBlogUseCaseHandler: blogUseCaseHandlers.createBlogUseCaseHandler,
errorHandlers,
logEvents,
}),
findAllBlogsControllerHandler: blogController.findAllBlogsController({
findAllBlogsUseCaseHandler: blogUseCaseHandlers.findAllBlogsUseCaseHandler,
logEvents,
}),
findOneBlogControllerHandler: blogController.findOneBlogController({
findOneBlogUseCaseHandler: blogUseCaseHandlers.findOneBlogUseCaseHandler,
logEvents,
}),
updateBlogControllerHandler: blogController.updateBlogController({
updateBlogUseCaseHandler: blogUseCaseHandlers.updateBlogUseCaseHandler,
logEvents,
}),
deleteBlogControllerHandler: blogController.deleteBlogController({
deleteBlogUseCaseHandler: blogUseCaseHandlers.deleteBlogUseCaseHandler,
logEvents,
}),
};
Loading
Loading