Merge pull request #36 from softdev0810/feature

codinghack30 · codinghack30 · commit be2d67c2c6d6 · 2024-08-19T23:30:19.000+10:00
Feature
diff --git a/src/controllers/transaction.controller.js b/src/controllers/transaction.controller.js
@@ -84,10 +84,14 @@ const deleteTrans = async (req, res) => {
 
         // Check if transaction exists
         const transaction = await Transaction.findOne({
-            where: { user: userId, service: serviceId, status: false },
+            where: { user: userId, service: serviceId },
         });
         if (!transaction) {
-            return res.status(404).json({ msg: "Transaction not found or already paid." });
+            return res.status(404).json({ msg: "Transaction not found." });
+        }
+
+        if(transaction.status) {
+            return res.status(400).json({ msg: "Transaction already paid." });
         }
 
         // Delete transaction
diff --git a/src/controllers/user.controller.js b/src/controllers/user.controller.js
@@ -29,14 +29,15 @@ const signup = async (req, res) => {
             securityAnswer,
         } = req.body;
 
-        // Check if all fields are filled
-        if (!email || !password || !securityQuestion || !securityAnswer) {
-            return res.status(400).json({ msg: "Please fill in all fields." });
-        }
-
         const userAccount = await UserAccount.findOne({ where: { email } });
         if (userAccount) {
-            return res.status(400).json({ msg: "User already exists." });
+            if (userAccount.active !== 1) {
+                return res
+                    .status(400)
+                    .json({ msg: "User is not verified. Please verify." });
+            } else {
+                return res.status(400).json({ msg: "User already exists." });
+            }
         }
 
         // Create the user account
@@ -61,7 +62,7 @@ const signup = async (req, res) => {
         });
 
         // Respond with both created records
-        res.status(201).json({ msg: "Successfully signed up." });
+        res.status(201).json({ msg: "Successfully signed up. Please verify." });
     } catch (error) {
         res.status(500).json({ msg: error.message });
     }
@@ -77,9 +78,10 @@ const signin = async (req, res) => {
             return res.status(404).json({ msg: "User does not exist." });
         }
 
-        if (userAccount.loginTracking) {
-            return res.status(400).json({ msg: "User is already logged in." });
-        }
+        // Check if the user is already logged in
+        // if (userAccount.loginTracking) {
+        //     return res.status(400).json({ msg: "User is already logged in." });
+        // }
 
         // Check if the password is correct
         const passwordMatch = bcrypt.compareSync(
@@ -125,18 +127,9 @@ const signin = async (req, res) => {
 
 const signout = async (req, res) => {
     try {
-        const email = req.user.email;
-        console.log("user => ", req.user);
-        console.log("email => ", email);
-
-        const userAccount = await UserAccount.findOne({
-            where: { email: email },
-        });
-        if (!userAccount) {
-            return res.status(404).json({ msg: "User does not exist." });
-        }
+        const userAccount = req.user;
         userAccount.loginTracking = false;
-        userAccount.save().then(() => {
+        await userAccount.save().then(() => {
             res.status(200).json({ msg: "Successfully signed out." });
         });
     } catch (error) {
@@ -146,12 +139,13 @@ const signout = async (req, res) => {
 
 const updateUser = async (req, res) => {
     try {
-        const id = req.user.id;
+        const userAccount = req.user;
+        const { id } = userAccount;
 
         const {
             firstName,
             lastName,
-            email,
+            // email,
             address1,
             address2,
             phone1,
@@ -163,30 +157,24 @@ const updateUser = async (req, res) => {
             securityAnswer,
         } = req.body;
 
-        // Check if the user exists
-        const userAccount = await UserAccount.findOne({ where: { id: id } });
-        if (!userAccount) {
-            return res.status(404).json({ msg: "User does not exist." });
-        }
-
-        if (email) {
-            // Check if the email is already taken
-            const emailTaken = await UserAccount.findOne({
-                where: { email },
-            });
-            if (emailTaken && emailTaken.id !== id) {
-                return res.status(400).json({ msg: "Email is already taken." });
-            }
-        }
+        // if (email) {
+        //     // Check if the email is already taken
+        //     const emailTaken = await UserAccount.findOne({
+        //         where: { email },
+        //     });
+        //     if (emailTaken && emailTaken.id !== id) {
+        //         return res.status(400).json({ msg: "Email is already taken." });
+        //     }
+        // }
 
         // Update the userAccount
         await UserAccount.update(
             {
-                email,
+                // email,
                 securityQuestion,
                 securityAnswer,
             },
-            { where: { id: id } }
+            { where: { id } }
         );
 
         userAccount.isFirst = false;
@@ -197,7 +185,7 @@ const updateUser = async (req, res) => {
             {
                 firstName,
                 lastName,
-                email,
+                // email,
                 address1,
                 address2,
                 phone1,
@@ -206,62 +194,22 @@ const updateUser = async (req, res) => {
                 state,
                 zip,
             },
-            { where: { id: id } }
+            { where: { id } }
         );
 
-        const updatedUser = await User.findOne({ where: { id: id } });
+        const updatedUser = await User.findOne({ where: { id } });
 
         res.status(200).json({ msg: "Successfully.", updatedUser });
     } catch (error) {
         res.status(500).json({ msg: error.message });
     }
 };
 
-const fillUser = async (req, res) => {
-    try {
-        const { id } = req.user.id;
-        const {
-            firstName,
-            lastName,
-            address1,
-            address2,
-            phone1,
-            phone2,
-            city,
-            state,
-            zip,
-        } = req.body;
-        const user = await User.findOne({ where: { id } });
-        if (!user) {
-            return res.status(404).json({ msg: "User not found." });
-        }
-
-        const filledUser = await User.update(
-            {
-                firstName,
-                lastName,
-                address1,
-                address2,
-                phone1,
-                phone2,
-                city,
-                state,
-                zip,
-            },
-            { where: { id } }
-        );
-        const userAccount = await UserAccount.findOne({ where: { id } });
-        userAccount.isFirst = false;
-        await userAccount.save();
-        res.status(200).json({ msg: "Successfully filled.", filledUser });
-    } catch (error) {
-        res.status(500).json({ msg: error.message });
-    }
-};
-
 const search = async (req, res) => {
     try {
-        const { key } = req.params;
+        const { key } = req.query;
+
+        console.log(key);
 
         const searchedService = await ServiceProvider.findAll({
             where: {
@@ -289,7 +237,6 @@ module.exports = {
     signup,
     signin,
     signout,
-    fillUser,
     updateUser,
     search,
 };
diff --git a/src/controllers/verify.controller.js b/src/controllers/verify.controller.js
@@ -13,7 +13,7 @@ const sendCode = async (req, res) => {
 
         // Check if the user exists
         if (!userAccount) {
-            return res.status(404).json({ msg: "User does not exist." });
+            return res.status(404).json({ msg: "User did not signup. Please signup." });
         }
 
         // Check if the user is already verified
@@ -61,11 +61,14 @@ const sendCode = async (req, res) => {
 const verifyCode = async (req, res) => {
     try {
         const { email, code } = req.body;
+
         const userAccount = await UserAccount.findOne({ where: { email } });
 
         // Check if the user exists
         if (!userAccount) {
-            return res.status(404).json({ msg: "User does not exist." });
+            return res
+                .status(404)
+                .json({ msg: "User did not signup. Please signup." });
         }
 
         // Check if the user is already verified
@@ -76,16 +79,16 @@ const verifyCode = async (req, res) => {
         if (userAccount.active == 0) {
             return res
                 .status(400)
-                .json({ msg: "Don't send code. Please resend." });
+                .json({ msg: "Please resend." });
         }
         if (userAccount.active == code) {
             userAccount.active = 1;
             await userAccount.save();
-            res.status(200).json({ msg: "Email verified." });
+            res.status(200).json({ msg: "User verified. Please sign in" });
         } else {
             userAccount.active = 0;
             await userAccount.save();
-            res.status(400).json({ msg: "Invalid code." });
+            res.status(400).json({ msg: "Invalid code. Please resend." });
         }
     } catch (error) {
         res.status(500).json({ msg: error.message });
diff --git a/src/middlewares/requiredAuth.js b/src/middlewares/requiredAuth.js
@@ -9,9 +9,7 @@ const secretOrKey = process.env.JWT_ACCESS_TOKEN_SECRET_PRIVATE;
 module.exports = async (req, res, next) => {
     try {
         if (!req.headers.authorization) {
-            return res
-                .status(401)
-                .json({ msg: "No authentication." });
+            return res.status(401).json({ msg: "No authentication." });
         }
         const token = req.headers.authorization;
         if (!token) {
@@ -25,10 +23,15 @@ module.exports = async (req, res, next) => {
             }
 
             const userAccount = await UserAccount.findOne({
-                where: { id: decoded.id },
+                where: { email: decoded.email },
             });
+
+            if (!userAccount) {
+                return res.status(404).json({ msg: "User does not exist." });
+            }
+
             req.user = userAccount;
-            next();
+            await next();
         });
     } catch (error) {
         console.error("Something wrong with auth middleware.", error);
diff --git a/src/middlewares/requiredVerify.js b/src/middlewares/requiredVerify.js
@@ -8,7 +8,7 @@ module.exports = async (req, res, next) => {
         // Check if the user exists
         const userAccount = await UserAccount.findOne({ where: { email } });
         if (!userAccount) {
-            return res.status(404).json({ msg: "User does not exist." });
+            return res.status(404).json({ msg: "User does not exist. Please signed up." });
         }
 
         // Check if the user is already verified
diff --git a/src/models/profile.model.js b/src/models/profile.model.js
@@ -17,19 +17,19 @@ module.exports = (sequelize, Sequelize) => {
             onDelete: "CASCADE",
         },
         rating: {
-            type: Sequelize.INTEGER,
-            allowNull: false,
+            type: Sequelize.FLOAT,
+            defaultValue: 0,
         },
         comment: {
-            type: Sequelize.TEXT,
-            allowNull: false,
+            type: Sequelize.STRING,
+            defaultValue: "",
         },
         userFeedback: {
-            type: Sequelize.TEXT,
+            type: Sequelize.STRING,
             defaultValue: "",
         },
         serviceFeedback: {
-            type: Sequelize.TEXT,
+            type: Sequelize.STRING,
             defaultValue: "",
         },
     });
diff --git a/src/models/serviceprovider.model.js b/src/models/serviceprovider.model.js
@@ -11,7 +11,8 @@ module.exports = (sequelize, Sequelize) => {
         },
         address: {
             type: Sequelize.TEXT,
-            allowNull: false,
+            // allowNull: false,
+            defaultValue: "",
         },
         areaOfOperation: {
             type: Sequelize.TEXT,
diff --git a/src/models/transaction.model.js b/src/models/transaction.model.js
@@ -19,7 +19,6 @@ module.exports = (sequelize, Sequelize) => {
                 model: "user_accounts",
                 key: "id",
             },
-            allowNull: false,
             onDelete: "CASCADE",
         },
         service: {
@@ -28,7 +27,6 @@ module.exports = (sequelize, Sequelize) => {
                 model: "service_providers",
                 key: "id",
             },
-            allowNull: false,
             onDelete: "CASCADE",
         },
         status: {
diff --git a/src/models/user.model.js b/src/models/user.model.js
diff --git a/src/routes/api/transaction.routes.js b/src/routes/api/transaction.routes.js
diff --git a/src/routes/api/user.routes.js b/src/routes/api/user.routes.js

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ module.exports = async (req, res, next) => {`
`8`	`8`	`// Check if the user exists`
`9`	`9`	`const userAccount = await UserAccount.findOne({ where: { email } });`
`10`	`10`	`if (!userAccount) {`
`11`		`- return res.status(404).json({ msg: "User does not exist." });`
	`11`	`+ return res.status(404).json({ msg: "User does not exist. Please signed up." });`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`// Check if the user is already verified`