Day 2 & 3 onbording

.vscode/settings.json

@@ -0,0 +1,30 @@
+{
+  "sqltools.connections": [
+    {
+      "mysqlOptions": {
+        "authProtocol": "default",
+        "enableSsl": "Disabled"
+      },
+      "previewLimit": 50,
+      "server": "localhost",
+      "port": 3306,
+      "driver": "MySQL",
+      "name": "nodejs-hapi-template",
+      "database": "temp_dev",
+      "username": "def_user",
+      "password": "password"
+    }
+  ],
+  "redisXplorer.config": {
+    "profiles": [
+      {
+        "name": "nodejs-hapi-template",
+        "host": "redis:6379",
+        "accessKey": "",
+        "filter": "*",
+        "port": "6379"
+      }
+    ],
+    "scanLimit": 200
+  }
+}

jsconfig.json

@@ -5,7 +5,7 @@
     "allowJs": true,
     "checkJs": true,
     "baseUrl": "./",
-    "moduleResolution": "node",
+    "moduleResolution": "nodenext",
     "resolveJsonModule": true,
     "paths": {
       "@root": ["./"],

lib/models/cabs.js

@@ -0,0 +1,64 @@
+module.exports = function(sequelize, DataTypes) {
+  return sequelize.define('cabs', {
+    id: {
+      autoIncrement: true,
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      primaryKey: true
+    },
+    driverId: {
+      field: "driver_id",
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      references: {
+        model: 'drivers',
+        key: 'id'
+      }
+    },
+    carDetailsId: {
+      field: "car_details_id",
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      references: {
+        model: 'car_details',
+        key: 'id'
+      }
+    },
+    location: {
+      type: DataTypes.GEOMETRY,
+      allowNull: false
+    },
+    status: {
+      type: DataTypes.ENUM('not-available','available'),
+      allowNull: false
+    }
+  }, {
+    sequelize,
+    tableName: 'cabs',
+    timestamps: true,
+    indexes: [
+      {
+        name: "PRIMARY",
+        unique: true,
+        using: "BTREE",
+        fields: [
+          { name: "id" },
+        ]
+      },
+      {
+        name: "fk_driver",
+        using: "BTREE",
+        fields: [
+          { name: "driverId" },
+        ]
+      },
+      {
+        name: "fk_car_details",
+        using: "BTREE",
+        fields: [
+          { name: "carDetailsId" },
+        ]
+      },
+    ]
+  });
+};

lib/models/car_details.js

@@ -0,0 +1,39 @@
+module.exports = function(sequelize, DataTypes) {
+  return sequelize.define('car_details', {
+    id: {
+      autoIncrement: true,
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      primaryKey: true
+    },
+    carName: {
+      field: "car_name",
+      type: DataTypes.STRING(50),
+      allowNull: false
+    },
+    licensePlateNumber: {
+      field: "license_plate_number",
+      type: DataTypes.STRING(50),
+      allowNull: false
+    },
+    carBrand: {
+      field:"car_brand",
+      type: DataTypes.STRING(50),
+      allowNull: true
+    }
+  }, {
+    sequelize,
+    tableName: 'car_details',
+    timestamps: false,
+    indexes: [
+      {
+        name: "PRIMARY",
+        unique: true,
+        using: "BTREE",
+        fields: [
+          { name: "id" },
+        ]
+      },
+    ]
+  });
+};

lib/models/drivers.js

@@ -0,0 +1,46 @@
+module.exports = function(sequelize, DataTypes) {
+  return sequelize.define('drivers', {
+    id: {
+      autoIncrement: true,
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      primaryKey: true
+    },
+    name: {
+      type: DataTypes.STRING(255),
+      allowNull: false
+    },
+    licenseNumber: {
+      field: "license_number",
+      type: DataTypes.STRING(50),
+      allowNull: false
+    },
+    contactNumber: {
+      field: "contact_number",
+      type: DataTypes.STRING(20),
+      allowNull: false
+    },
+    ratings: {
+      type: DataTypes.DECIMAL(3,2),
+      allowNull: true
+    },
+    status: {
+      type: DataTypes.ENUM('active','inactive'),
+      allowNull: false
+    }
+  }, {
+    sequelize,
+    tableName: 'drivers',
+    timestamps: false,
+    indexes: [
+      {
+        name: "PRIMARY",
+        unique: true,
+        using: "BTREE",
+        fields: [
+          { name: "id" },
+        ]
+      },
+    ]
+  });
+};

lib/models/index.js

@@ -8,6 +8,10 @@ import oauthClientResources from './oauthClientResources';
 import oauthClientScopes from './oauthClientScopes';
 import oauthClients from './oauthClients';
 import users from './users';
+import cabs from './cabs';
+import drivers from './drivers';
+import carDetails from './car_details';
+import rides from './rides';
 
 let sequelize;
 if (process.env.NODE_ENV === 'test') {
@@ -28,6 +32,10 @@ export const models = {
   oauthClientScopes: oauthClientScopes(sequelize, Sequelize.DataTypes),
   oauthClients: oauthClients(sequelize, Sequelize.DataTypes),
   users: users(sequelize, Sequelize.DataTypes),
+  cabs: cabs(sequelize, Sequelize.DataTypes),
+  carDetails: carDetails(sequelize, Sequelize.DataTypes),
+  drivers: drivers(sequelize, Sequelize.DataTypes),
+  rides: rides(sequelize, Sequelize.DataTypes),
 };
 
 Object.keys(models).forEach((modelName) => {

lib/models/rides.js

@@ -0,0 +1,85 @@
+module.exports = function(sequelize, DataTypes) {
+  return sequelize.define('rides', {
+    id: {
+      autoIncrement: true,
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      primaryKey: true
+    },
+    userId: {
+      field: "user_id",
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      references: {
+        model: 'users',
+        key: 'id'
+      }
+    },
+    cabId: {
+      field: "cab_id",
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      references: {
+        model: 'cabs',
+        key: 'id'
+      }
+    },
+    startPoint: {
+      field: "start_point",
+      type: DataTypes.GEOMETRY,
+      allowNull: false
+    },
+    endPoint: {
+      field: "end_point",
+      type: DataTypes.GEOMETRY,
+      allowNull: false
+    },
+    timeStart: {
+      field: "time_start",
+      type: DataTypes.DATE,
+      allowNull: false
+    },
+    timeEnd: {
+      field: "time_end",
+      type: DataTypes.DATE,
+      allowNull: false
+    },
+    fare: {
+      type: DataTypes.DECIMAL(10,2),
+      allowNull: false
+    },
+    rideTime: {
+      field: "ride_time",
+      type: DataTypes.DECIMAL(10,2),
+      allowNull: false
+    }
+  }, {
+    sequelize,
+    tableName: 'rides',
+    timestamps: true,
+    indexes: [
+      {
+        name: "PRIMARY",
+        unique: true,
+        using: "BTREE",
+        fields: [
+          { name: "id" },
+        ]
+      },
+      {
+        name: "fk_user",
+        using: "BTREE",
+        fields: [
+          { name: "userId" },
+        ]
+      },
+      {
+        name: "fk_cab",
+        using: "BTREE",
+        fields: [
+          { name: "cabId" },
+        ]
+      },
+    ]
+  });
+};

lib/models/users.js

@@ -1,36 +1,51 @@
-export default function (sequelize, DataTypes) {
-  return sequelize.define(
-    'users',
-    {
-      id: {
-        type: DataTypes.INTEGER(11),
-        allowNull: false,
-        primaryKey: true,
-      },
-      firstName: {
-        field: 'first_name',
-        type: DataTypes.STRING(32),
-        allowNull: false,
-      },
-      lastName: {
-        field: 'last_name',
-        type: DataTypes.STRING(32),
-        allowNull: false,
-      },
-      email: {
-        type: DataTypes.STRING(32),
-        allowNull: false,
-      },
-      createdAt: {
-        field: 'created_at',
-        type: DataTypes.DATE,
-        allowNull: false,
-        defaultValue: sequelize.literal('CURRENT_TIMESTAMP'),
-      },
+module.exports = function(sequelize, DataTypes) {
+  return sequelize.define('users', {
+    id: {
+      autoIncrement: true,
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      primaryKey: true
     },
-    {
-      tableName: 'users',
-      timestamps: false,
+    oauth_client_id: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      references: {
+        model: 'oauth_clients',
+        key: 'id'
+      }
     },
-  );
-}
+    first_name: {
+      type: DataTypes.STRING(32),
+      allowNull: false
+    },
+    last_name: {
+      type: DataTypes.STRING(32),
+      allowNull: false
+    },
+    email: {
+      type: DataTypes.STRING(32),
+      allowNull: false
+    }
+  }, {
+    sequelize,
+    tableName: 'users',
+    timestamps: true,
+    indexes: [
+      {
+        name: "PRIMARY",
+        unique: true,
+        using: "BTREE",
+        fields: [
+          { name: "id" },
+        ]
+      },
+      {
+        name: "users_oauth_clients_id_fk",
+        using: "BTREE",
+        fields: [
+          { name: "oauth_client_id" },
+        ]
+      },
+    ]
+  });
+};

migrations/20240404070514-create-driver.js

@@ -0,0 +1,6 @@
+const { migrate } = require('./utils');
+
+module.exports = {
+  up: (queryInterface) => migrate(__filename, queryInterface),
+  down: () => Promise.reject(new Error('error')),
+};