Merge pull request #7 from amiparadis250/ft-mybrand-ci

Ft mybrand ci

--Test--/sample.test.ts

@@ -59,8 +59,8 @@ describe('Aunthetications', () => {
         const response = await supertest(app)
             .post('/api/users/login')
             .send({
-                "password": "12345790003Us*@",
-                "email": "pishimweaime5000@gmail.com"
+                "password": "0791966291Is*",
+                "email": "amiparadis250@gmail.com"
             });
 
         // Check if the response status is 200
@@ -213,14 +213,14 @@ describe('blogs controllers',()=>{
             });
 
  it("POST api/blogs/:id :Updating blog", async()=>{
-    const response=await supertest(app).put('/api/blogs/'+blogID).
+    const response=await supertest(app).patch('/api/blogs/'+blogID).
     set('Authorization', `Bearer ${  Authtoken }`);
     expect(response.statusCode).toBe(200);
     expect(response.body.status).toBe('success')
 
 });
 it("POST api/blogs/:id :Updating blog without Authorization", async()=>{
-    const response=await supertest(app).put('/api/blogs/'+blogID);
+    const response=await supertest(app).patch('/api/blogs/'+blogID);
     expect(response.statusCode).toBe(401);
     expect(response.body.status).toBe('error');
     expect(response.body.message).toBe('Unauthorized. Token not provided.')
@@ -347,4 +347,4 @@ describe("Creation Comments", () => {
         expect(response.statusCode).toBe(500);
     });
 });
-});
+});

.vscode/settings.json

@@ -1,3 +1,3 @@
 {
-    "liveServer.settings.port": 5501
+    "liveServer.settings.port": 5502
 }

package.json

@@ -29,6 +29,7 @@
     "debug": "^4.3.4",
     "dotenv": "^16.4.4",
     "express": "^4.18.2",
+    "form-data-extended": "^0.0.10",
     "install": "^0.13.0",
     "joi": "^17.12.1",
     "join": "^3.0.0",

src/controllers/blogsCtrl.ts

@@ -70,10 +70,6 @@ export const uploadImageToCloudinary = async (buffer: Buffer): Promise<string> =
     }
 };
 
-// ... (rest of your code)
-
-
-// ... (rest of your code)
 
 
 

src/controllers/commentsCtl.ts

@@ -173,29 +173,24 @@ export const deleteComment = async (req: Request, res: Response) => {
     const commentId = req.params.commentId;
 
     try {
-        // Find the blog by ID
-        const blog = await Blog.findById(blogId);
-
-        if (!blog) {
+        // Use findByIdAndUpdate to remove the comment directly
+        const result = await Blog.findByIdAndUpdate(
+            blogId,
+            { $pull: { comments: { _id: commentId } } },
+            { new: true }
+        ).populate('comments');
+
+        if (!result) {
             return res.status(404).json({
                 status: 'error',
                 message: 'Blog not found',
             });
         }
 
-        // Remove the comment by ID from the comments array
-        blog.comments = blog.comments.filter(comment => comment._id.toString() !== commentId);
-
-        // Save the updated blog
-        await blog.save();
-
-        // Populate comments before responding
-        await blog.populate('comments');
-
         // Respond with success and the updated comments array
         res.json({
             status: 'success',
-            data: blog.comments,
+            data: result.comments,
         });
     } catch (err) {
         console.error('Error in deleteComment:', err);
@@ -204,4 +199,4 @@ export const deleteComment = async (req: Request, res: Response) => {
             message: err.message,
         });
     }
-};
+};

src/model/User.ts

@@ -20,7 +20,7 @@ const userSchema = new mongoose.Schema({
   },
   isAdmin: {
     type: Boolean,
-    default: true,
+    default: false,
   },
   blogs: [
     {

src/routes/blogRoutes.ts

@@ -1,7 +1,7 @@
 // routes/Blogs/allRoutes.js
 import express from 'express';
 import multer from 'multer';
-import { createBlogValidation, updateBlogValidation,  } from '../validations/blogsValidatio';
+import { createBlogValidation  } from '../validations/blogsValidatio';
 import {
     createBlog,
     updateBlogById,
@@ -45,18 +45,9 @@ router.post('/', upload.single('file'),isLogin,isAdmin, async (req:any, res) =>
 });
 
 // Update a blog by ID
-router.put('/:id', upload.single('file'),isLogin,isAdmin, async (req:any, res) => {
+router.patch('/:id', upload.single('file'), isLogin, isAdmin, async (req: any, res) => {
     try {
-        // Validate request body
-        const { error } = updateBlogValidation.validate(req.body);
-        if (error) {
-            return res.status(400).json({
-                status: 'error',
-                message: error.details[0].message,
-            });
-        }
-
-        // Continue with updating the blog
+        // Continue with updating the blog without validation
         await updateBlogById(req, res);
     } catch (err) {
         res.status(500).json({

src/swagger.json

@@ -83,6 +83,7 @@
       "post": {
         "summary": "Create an account",
         "tags": ["Authentication"],
+        "security": [], 
         "requestBody": {
           "content": {
             "application/json": {
@@ -125,6 +126,7 @@
       "post": {
         "summary": "User Login",
         "tags": ["Authentication"],
+        "security": [], 
         "requestBody": {
           "content": {
             "application/json": {
@@ -160,6 +162,7 @@
           "400": {
             "description": "Bad Request"
           }
+
         }
       }
     },
@@ -285,6 +288,7 @@
       "get": {
         "summary": "Read blogs",
         "tags": ["Blogs"],
+        "security": [], 
         "responses": {
           "200": {
             "description": "OK",
@@ -333,6 +337,7 @@
       "get": {
         "summary": "Read a single blog",
         "tags": ["Blogs"],
+        "security": [], 
         "parameters": [
           {
             "name": "id",
@@ -396,7 +401,7 @@
           }
         }
       },
-      "put": {
+      "patch": {
         "summary": "Update a blog",
         "tags": ["Blogs"],
         "parameters": [
@@ -554,6 +559,7 @@
       "post": {
         "summary": "Add a comment to a blog",
         "tags": ["Comments"],
+        "security": [], 
         "parameters": [
           {
             "name": "id",
@@ -622,6 +628,7 @@
       "get": {
         "summary": "Read comments for a blog",
         "tags": ["Comments"],
+        "security": [], 
         "parameters": [
           {
             "name": "id",
@@ -644,6 +651,7 @@
       "post": {
         "summary": "Create a user query",
         "tags": ["Queries"],
+        "security": [], 
         "consumes": ["application/json"],
         "produces": ["application/json"],
         "requestBody": {
@@ -737,6 +745,7 @@
       "post": {
         "summary": "Add a like to a blog",
         "tags": ["Likes"],
+        "security": [], 
         "parameters": [
           {
             "name": "id",
@@ -759,6 +768,7 @@
       "post": {
         "summary": "Remove like from a blog",
         "tags": ["Likes"],
+        "security": [], 
         "parameters": [
           {
             "name": "id",
@@ -781,6 +791,7 @@
       "post": {
         "summary": "Add views to a blog",
         "tags": ["Likes"],
+        "security": [], 
         "parameters": [
           {
             "name": "id",

src/validations/blogsValidatio.ts

@@ -4,7 +4,7 @@ import Joi from 'joi';
 export const createBlogValidation = Joi.object({
     title: Joi.string().required().max(255),
     desc: Joi.string().required().max(500),
-    content: Joi.string().required().max(5000),
+    content: Joi.string().required().max(1000000),
 
 });