doc routes added

Author: saw1993

backend/app.js

@@ -19,6 +19,7 @@ const PORT = process.env.PORT || 3000;
 
 
 
+
 // Configure CORS
 const corsOptions = {
     origin: 'https://localhost:3000' // Update with your frontend URL
@@ -44,6 +45,8 @@ const credentials = { key: privateKey, cert: certificate };
 
 const httpsServer = https.createServer(credentials, app);
 
+
+
 httpsServer.listen(parseInt(PORT), () => {
     logger.info(`HTTPS Server running on port ${PORT}`);
 });

backend/config/db.js

@@ -6,15 +6,17 @@ dotenv.config();
 const createMainDBConnection = () => {
     return new Sequelize('mris', 'saw1993', '1234', {
         host: 'localhost',
-        dialect: 'mysql'
+        dialect: 'mysql',
+        logging:false,
     });
 };
 
 // Create a Sequelize instance for the agency database connection
 const createAgencyDBConnection = (agencyDetails) => {
     return new Sequelize(agencyDetails.db_name, agencyDetails.db_user, agencyDetails.db_password, {
         host: agencyDetails.db_host,
-        dialect: 'mysql'
+        dialect: 'mysql',
+        logging:false,
     });
 };
 

backend/constants/PermissionData.js

@@ -3,5 +3,14 @@ module.exports = {
     EDIT_USER: 2,
     DELETE_USER: 3,
     CREATE_USER: 4,
-    VIEW_DOCTORS: 2
+
+    VIEW_DOCTORS: 5,
+    EDIT_DOCTOR: 6,
+    DELETE_DOCTOR: 7,
+    CREATE_DOCTOR: 8,
+    
+    VIEW_CHEMISTS: 9,
+    EDIT_CHEMIST: 10,
+    DELETE_CHEMIST: 11,
+    CREATE_CHEMIST: 12
 };

backend/controllers/doctorController.js

@@ -3,19 +3,26 @@ const Town = require('../models/townModel');
 const Category = require('../models/doctorCategoryModel');
 const Speciality = require('../models/specialityModel');
 const logger = require('../config/logger');
+const { createAgencyDBConnection } = require('../config/db');
 
+//const { getAllDoctors } = require('../repositories/doctorRepository');
+const getAllDoctors = require('../usecases/doctor/getAllDoctors');
+const getRepDoctors = require('../usecases/doctor/getRepDoctors')
 const { getUserById } = require('../repositories/userRepository');
 const { getAgencyDBDetails } = require('../models/agencyModel');
 const { getDoctorsByAgency } = require('../models/doctorModel');
 
 
+
 // Fetch doctors based on user agency
 const getDoctors = async (req, res) => {
     try {
         const user = await getUserById(req.userId);
         const agency_id = user.agency_id;
         const agencyDBDetails = await getAgencyDBDetails(agency_id);
-        const doctors = await getDoctorsByAgency(agencyDBDetails);
+        const agency_DB = createAgencyDBConnection(agencyDBDetails)
+        //const doctors = await getAllDoctors(agency_DB);
+        const doctors = await getRepDoctors(user.user_id,agency_DB)
         res.json(doctors);
     } catch (error) {
         res.status(500).json({ message: error.message });

backend/logs/combined.log

@@ -557,3 +557,19 @@
 2024-11-11 07:16:29 error: Error in checkPermission middleware: Error fetching permissions
 2024-11-11 07:17:46 error: Error fetching permissions for Role ID 1: rolePermissions.map is not a function
 2024-11-11 07:17:46 error: Error in checkPermission middleware: Error fetching permissions
+2024-11-11 07:56:19 error: Invalid token: jwt expired
+2024-11-12 07:22:02 error: Invalid token: jwt expired
+2024-11-13 18:15:05 error: Invalid token: jwt expired
+2024-11-15 13:35:21 error: Invalid token: jwt expired
+2024-11-16 07:03:11 error: Error finding user by email [email protected]: Unknown column 'rep_id' in 'field list'
+2024-11-16 07:06:53 error: Error finding user by email [email protected]: Unknown column 'User.rep_id' in 'field list'
+2024-11-16 07:13:13 error: Error in checkPermission middleware: Cannot read properties of undefined (reading 'role_id')
+2024-11-16 07:13:47 error: Error in checkPermission middleware: Cannot read properties of undefined (reading 'role_id')
+2024-11-16 07:14:06 error: Error in checkPermission middleware: Cannot read properties of undefined (reading 'role_id')
+2024-11-16 07:16:26 error: Error fetching user by ID 8: Argument passed to findByPk is invalid: [object Object]
+2024-11-16 07:16:26 error: Error in checkPermission middleware: Argument passed to findByPk is invalid: [object Object]
+2024-11-16 07:18:45 error: Error fetching user by ID 8: UserHierarchy is associated to User using an alias. You've included an alias (user_hierarchy), but it does not match the alias(es) defined in your association (role).
+2024-11-16 07:18:45 error: Error in checkPermission middleware: UserHierarchy is associated to User using an alias. You've included an alias (user_hierarchy), but it does not match the alias(es) defined in your association (role).
+2024-11-16 07:22:51 error: Error fetching user by ID 8: Unknown column 'User.role_id' in 'field list'
+2024-11-16 07:22:51 error: Error in checkPermission middleware: Unknown column 'User.role_id' in 'field list'
+2024-11-16 08:54:34 error: Token verification failed: jwt expired

backend/logs/error.log

@@ -12,7 +12,6 @@ const authMiddleware = (req, res, next) => {
   try {
     const decoded = verifyToken(token);
     req.userId = decoded.id;  // Attach user ID to request
-    logger.info(`Token request verified for authMiddleware: ${decoded.toString}`);
     next();
   } catch (err) {
     logger.error(`Invalid token: ${err.message}`);

backend/middlewares/authMiddleware.js

@@ -20,19 +20,24 @@ const checkPermission = (permissionID) => {
                 return res.status(404).json({ message: 'User not found' });
             }
 
-           
-            // Check if the required permission exists in any of the roles 
+                    // Check if the required permission exists in any of the roles
             let hasPermission = false;
-            const permissions = await permissionRepository.getPermissionsForRole(user.role_id);
+            const permissions = await permissionRepository.getPermissionsForRole(user.user_hierarchy.role_id);
 
+        hasPermission = permissions.some(permission => {
 
-            hasPermission = permissions.some(permission => permission.permission_id === permissionID);
-
-            if (hasPermission) {
-                next();
-            }else {
-                return res.status(403).json({ message: 'Permission denied' });
+            if (permission.permission_id === permissionID) {
+                logger.info(`Token verified and permission granted for : ${permission.permission_name}`);  // Log the permission name
+                return true;
             }
+            return false;
+        });
+
+        if (hasPermission) {
+            next();
+        } else {
+            return res.status(403).json({ message: 'Permission denied' });
+        }
 
         } catch (error) {
             logger.error(`Error in checkPermission middleware: ${error.message}`);

backend/middlewares/checkPermissionMiddleware.js

@@ -0,0 +1,16 @@
+const { tableName } = require("./DoctorSpeciality");
+
+const ChemistRoute = sequelize.define('ChemistRouteMapping', {
+    chemist_id: {
+        type: DataTypes.INTEGER,
+        references: { model: 'Chemist', key: 'chemist_id' },
+    },
+    route_id: {
+        type: DataTypes.INTEGER,
+        references: { model: 'Route', key: 'route_id' },
+    }
+}, { 
+    tableName:"chemist_route",
+    timestamps: false });
+
+    module.exports = ChemistRoute

backend/models/definedModels/ChemistRoute.js

@@ -1,52 +1,76 @@
-// models/Doctor.js
+// src/models/Doctor.js
 const { Model, DataTypes } = require('sequelize');
+const DoctorSpeciality = require('./DoctorSpeciality'); // Import the speciality model
+const Town = require('./Towns'); // Import the town model
+const DoctorCategory = require('./DoctorCategory'); // Import the doctor category model
 
 class Doctor extends Model {
-    static initModel(sequelize) {
-        Doctor.init({
-            doctor_id: {
-                type: DataTypes.INTEGER,
-                primaryKey: true,
-                autoIncrement: true,
-            },
-            category_id: {
-                type: DataTypes.INTEGER,
-            },
-            name: {
-                type: DataTypes.STRING,
-                allowNull: false,
-            },
-            telephone: {
-                type: DataTypes.STRING,
-            },
-            email: {
-                type: DataTypes.STRING,
-            },
-            slmc_no: {
-                type: DataTypes.STRING,
-            },
-            birthday: {
-                type: DataTypes.DATE,
-            },
-            remarks: {
-                type: DataTypes.TEXT,
-            },
-            frequency: {
-                type: DataTypes.INTEGER,
-            },
-            speciality_id: {
-                type: DataTypes.INTEGER,
-            },
-            town_id: {
-                type: DataTypes.INTEGER,
-            },
-        }, {
-            sequelize,
-            modelName:'Doctors',
-            tableName: 'doctors',
-            timestamps: false,
-        });
-    }
+  // Static method to initialize the model with a dynamic sequelize instance
+  static initModel(sequelize) {
+    Doctor.init({
+      doctor_id: {
+        type: DataTypes.INTEGER,
+        primaryKey: true,
+        autoIncrement: true,
+      },
+      category_id: {
+        type: DataTypes.INTEGER,
+      },
+      name: {
+        type: DataTypes.STRING,
+        allowNull: false,
+      },
+      telephone: {
+        type: DataTypes.STRING,
+      },
+      email: {
+        type: DataTypes.STRING,
+      },
+      slmc_no: {
+        type: DataTypes.STRING,
+      },
+      birthday: {
+        type: DataTypes.DATE,
+      },
+      remarks: {
+        type: DataTypes.TEXT,
+      },
+      frequency: {
+        type: DataTypes.INTEGER,
+      },
+      speciality_id: {
+        type: DataTypes.INTEGER,
+      },
+      town_id: {
+        type: DataTypes.INTEGER,
+      },
+    }, {
+      sequelize, // Dynamically injected sequelize instance
+      modelName: "Doctor", // Class name (can be pluralized if needed)
+      tableName: 'doctors', // Explicit table name
+      timestamps: false, // Disable automatic timestamp fields
+    });
+
+      // Doctor belongs to a DoctorCategory (many-to-one relationship)
+      Doctor.belongsTo(DoctorCategory, {
+        foreignKey: 'category_id',
+        as: 'category',
+      });
+  
+      // Doctor belongs to a DoctorSpeciality (many-to-one relationship)
+      Doctor.belongsTo(DoctorSpeciality, {
+        foreignKey: 'speciality_id',
+        as: 'speciality',
+      });
+  
+      // Doctor belongs to a Town (many-to-one relationship)
+      Doctor.belongsTo(Town, {
+        foreignKey: 'town_id',
+        as: 'town',
+      });
+  }
+
+  
 }
 
 module.exports = Doctor;