#13 issue

mohsenkhashei · Apr 28, 2024 · 4cfa3c7 · 4cfa3c7
1 parent 7627e57
commit 4cfa3c7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/controllers/PersonnelController.js b/controllers/PersonnelController.js
@@ -22,7 +22,7 @@ module.exports = {
               where: { id: serviceType.id }
           }]
         });
-console.log(serviceType.id);
+
         const message = await Message.findOne({ where: { service_type_id: serviceType.id } });
         if (!message) throw new Error('Message not found for this service type');
 
@@ -37,7 +37,7 @@ console.log(serviceType.id);
       <p>There is a new task:</p>
       <ul>
         <li>Room ID: ${room_id}</li>
-        <li>Service Type: ${serviceTypeModel.title}</li>
+        <li>Service Type: ${serviceType.title}</li>
         <li>Task Token: ${newTask.token}</li>
       </ul>
       <p>Please click on the following link to claim the task:</p>
@@ -60,7 +60,7 @@ console.log(serviceType.id);
     });
 
     } catch (error) {
-      console.error('An error occurred:', error);
+      console.error('An error occurred:', error.message);
       return res.status(500).json({
         success: false,
         message: "Internal server error."

diff --git a/database.sqlite b/database.sqlite
diff --git a/migrations/20240427212159-create-task.js b/migrations/20240427212159-create-task.js
@@ -28,7 +28,7 @@ module.exports = {
       },
       personnel_id: {
         type: Sequelize.INTEGER,
-        allowNull: false,
+        allowNull: true,
         references: {
           model: 'Personnel',
           key: 'id'

diff --git a/schemas/associations.js b/schemas/associations.js
@@ -6,7 +6,7 @@ const PersonnelServiceType = require('./personnel_service_type');
 
 Personnel.belongsToMany(ServiceType, { through: PersonnelServiceType, foreignKey: 'personnel_id' });
 ServiceType.belongsToMany(Personnel, { through: PersonnelServiceType, foreignKey: 'service_type_id' });
-// Message.belongsTo(ServiceType, { foreignKey: 'service_type_id' });
+
 
 (async () => {
   await sequelize.sync();

diff --git a/schemas/task.js b/schemas/task.js
@@ -15,12 +15,20 @@ const Task = sequelize.define('Tasks', {
   },
   service_type_id: {
     type: DataTypes.INTEGER,
-    allowNull: false
-  },
-  personnel_id: {
-    type: DataTypes.INTEGER, 
-    allowNull: false
-  },
+    allowNull: true,
+    references: {
+        model: 'ServiceTypes',
+        key: 'id'
+    }
+},
+    personnel_id: {
+        type: DataTypes.INTEGER,
+        allowNull: true,
+        references: {
+            model: 'Personnel',
+            key: 'id'
+        }
+},
   claimed_at: {
     type: DataTypes.DATE,
     allowNull: true