@kipicore/dbcore 1.1.156 → 1.1.157

package/dist/db/psql/migrations/20251216101816-add_campus_id_driver.d.ts

@@ -0,0 +1,2 @@
+export function up(queryInterface: any, Sequelize: any): Promise<void>;
+export function down(queryInterface: any, Sequelize: any): Promise<void>;

package/dist/db/psql/migrations/20251216101816-add_campus_id_driver.js

@@ -0,0 +1,81 @@
+'use strict';
+const up = async (queryInterface, Sequelize) => {
+    const table = await queryInterface.describeTable('drivers');
+    if (!table.profile_image) {
+        await queryInterface.addColumn('drivers', 'profile_image', {
+            type: Sequelize.UUID,
+            defaultValue: null,
+            allowNull: true,
+            field: 'profile_image',
+        });
+    }
+    if (!table.campus_id) {
+        await queryInterface.addColumn('drivers', 'campus_id', {
+            type: Sequelize.UUID,
+            defaultValue: null,
+            allowNull: true,
+            field: 'campus_id',
+        });
+    }
+    if (!table.mobile) {
+        await queryInterface.addColumn('drivers', 'mobile', {
+            type: Sequelize.STRING,
+            defaultValue: null,
+            allowNull: true,
+            field: 'mobile',
+        });
+    }
+    const vehicle = await queryInterface.describeTable('vehicles');
+    if (!vehicle.academic_calendar_id) {
+        await queryInterface.addColumn('vehicles', 'academic_calendar_id', {
+            type: Sequelize.UUID,
+            defaultValue: null,
+            allowNull: true,
+            field: 'academic_calendar_id',
+        });
+    }
+    if (!vehicle.user_id) {
+        await queryInterface.addColumn('vehicles', 'user_id', {
+            type: Sequelize.UUID,
+            defaultValue: null,
+            allowNull: true,
+            field: 'user_id',
+        });
+    }
+    const trips = await queryInterface.describeTable('trips');
+    if (!trips.slot_id) {
+        await queryInterface.addColumn('trips', 'slot_id', {
+            type: Sequelize.ARRAY(Sequelize.STRING),
+            defaultValue: [],
+            allowNull: true,
+            field: 'slot_id',
+        });
+    }
+};
+const down = async (queryInterface, Sequelize) => {
+    const drivers = await queryInterface.describeTable('drivers');
+    if (drivers.profile_image) {
+        await queryInterface.removeColumn('drivers', 'profile_image');
+    }
+    if (drivers.campus_id) {
+        await queryInterface.removeColumn('drivers', 'campus_id');
+    }
+    if (drivers.mobile) {
+        await queryInterface.removeColumn('drivers', 'mobile');
+    }
+    const vehicles = await queryInterface.describeTable('vehicles');
+    if (vehicles.academic_calendar_id) {
+        await queryInterface.removeColumn('vehicles', 'academic_calendar_id');
+    }
+    if (vehicles.user_id) {
+        await queryInterface.removeColumn('vehicles', 'user_id');
+    }
+    const trips = await queryInterface.describeTable('trips');
+    if (trips.slot_id) {
+        await queryInterface.removeColumn('trips', 'slot_id');
+    }
+};
+module.exports = {
+    up,
+    down,
+};

package/dist/db/psql/migrations/20251218055418-remove_index_vehicle.d.ts

@@ -0,0 +1 @@
+export function up(queryInterface: any, Sequelize: any): Promise<void>;

package/dist/db/psql/migrations/20251218055418-remove_index_vehicle.js

@@ -0,0 +1,12 @@
+'use strict';
+const up = async (queryInterface, Sequelize) => {
+    // Remove old index if exists
+    const oldIndexes = await queryInterface.showIndex('vehicles');
+    const hasOldIndex = oldIndexes.some(idx => idx.name === 'vehicle_unique_number');
+    if (hasOldIndex) {
+        await queryInterface.removeIndex('vehicles', 'vehicle_unique_number');
+    }
+};
+module.exports = {
+    up,
+};

package/dist/interfaces/driverInterface.d.ts

@@ -15,6 +15,9 @@ export interface IDriverModelAttributes extends IDefaultAttributes {
     aadharCardNumber: string;
     aadharCard: string;
     drivingLicenseNumber: string;
+    profileImage?: string;
+    campusId?: string;
+    mobile?: string;
     drivingLicense: string;
     appType?: APP_TYPE;
     status: COMMAN_STATUS;

package/dist/interfaces/tripInterface.d.ts

@@ -6,6 +6,7 @@ export interface ITripModelAttributes extends IDefaultAttributes {
     vehicleId: string;
     driverId: string;
     shiftId: string[];
+    slotId: string[];
     area: string[];
     instituteId: string;
     departure: Date;

package/dist/interfaces/userInstituteMetaInterface.d.ts

@@ -7,9 +7,15 @@ export interface IUserInstituteMetaSlots {
     presentStartTime: number;
     presentEndTime: number;
 }
+export interface IUserTrip {
+    tripId: String;
+    pickUpNo: Number;
+    dropNo: Number;
+}
 export interface IUserInstituteMetaAttributes extends IDefaultAttributes, Document {
     id: string;
     entities?: string[];
+    tripDetails?: IUserTrip[];
     additionalField?: object;
     userId: string;
     instituteId?: string;

package/dist/interfaces/vehicleInterface.d.ts

@@ -8,4 +8,6 @@ export interface IVehicleModelAttributes extends IDefaultAttributes {
     capacity: number;
     rcBookFileId: string;
     instituteId: string;
+    academicCalendarId?: string;
+    userId: string;
 }

package/dist/models/mongodb/userInstituteMetaModel.js

@@ -55,10 +55,19 @@ const userInstituteMetaSlotsSchema = new mongoose_1.Schema({
         required: false,
     },
 }, { _id: false });
+const userTripSchema = new mongoose_1.Schema({
+    tripId: { type: String },
+    pickUpNo: { type: Number },
+    dropNo: { type: Number },
+}, { _id: false });
 const userInstituteMetaSchema = new mongoose_1.Schema({
     entities: {
         type: [{ type: String }],
     },
+    tripDetails: {
+        type: [userTripSchema],
+        default: [],
+    },
     secondarySubject: {
         type: [{ type: String }],
     },
@@ -196,8 +205,8 @@ const userInstituteMetaSchema = new mongoose_1.Schema({
     },
     previousEntities: {
         type: [String],
-        required: false
-    }
+        required: false,
+    },
 }, {
     timestamps: true,
     versionKey: false,

package/dist/models/psql/driverModel.d.ts

@@ -10,6 +10,9 @@ export declare class DriverModel extends Model<IDriverModelAttributes, TDriverMo
     address1: string;
     address2?: string;
     pinCode: string;
+    profileImage?: string;
+    campusId?: string;
+    mobile?: string;
     city: number;
     state: number;
     country: number;

package/dist/models/psql/driverModel.js

@@ -11,7 +11,7 @@ const instituteModel_1 = __importDefault(require("./instituteModel"));
 const errorMessages_1 = require("../../constants/errorMessages");
 class DriverModel extends sequelize_1.Model {
     static associate(models) {
-        const { UserModel, InstituteModel, CountryModel, StateModel, CityModel, FileStorageModel } = models;
+        const { UserModel, InstituteModel, CountryModel, StateModel, CityModel, FileStorageModel, CampusModel } = models;
         DriverModel.belongsTo(UserModel, {
             foreignKey: { name: 'createdBy', allowNull: true, field: 'created_by' },
             as: 'createdByUser',
@@ -44,6 +44,10 @@ class DriverModel extends sequelize_1.Model {
             foreignKey: 'aadharCard',
             as: 'aadharCardDetails',
         });
+        DriverModel.belongsTo(FileStorageModel, {
+            foreignKey: 'profileImage',
+            as: 'drivingProfileImage',
+        });
         DriverModel.belongsTo(InstituteModel, {
             foreignKey: 'instituteId',
             as: 'driverInstitute',
@@ -52,6 +56,14 @@ class DriverModel extends sequelize_1.Model {
             foreignKey: 'instituteId',
             as: 'instituteHasDrivers',
         });
+        DriverModel.belongsTo(CampusModel, {
+            foreignKey: 'campusId',
+            as: 'driverCampus',
+        });
+        CampusModel.hasMany(DriverModel, {
+            foreignKey: 'campusId',
+            as: 'campusHasDrivers',
+        });
     }
     static addHooks() {
         const beforeCreateOrUpdateHook = async (driver) => {
@@ -122,6 +134,20 @@ DriverModel.init({
         type: sequelize_1.DataTypes.UUID,
         allowNull: true,
     },
+    profileImage: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'profile_image',
+        allowNull: true,
+    },
+    campusId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'campus_id',
+        allowNull: true,
+    },
+    mobile: {
+        type: sequelize_1.DataTypes.STRING,
+        allowNull: true,
+    },
     drivingLicenseNumber: {
         type: sequelize_1.DataTypes.STRING,
         allowNull: true,

package/dist/models/psql/tripModel.d.ts

@@ -8,6 +8,7 @@ declare class TripModel extends Model<ITripModelAttributes, TTripModelCreationAt
     vehicleId: string;
     driverId: string;
     shiftId: string[];
+    slotId: string[];
     area: string[];
     instituteId: string;
     departure: Date;

package/dist/models/psql/tripModel.js

@@ -91,6 +91,11 @@ TripModel.init({
         defaultValue: [],
         allowNull: true,
     },
+    slotId: {
+        type: sequelize_1.DataTypes.ARRAY(sequelize_1.DataTypes.UUID),
+        defaultValue: [],
+        allowNull: true,
+    },
     area: {
         type: sequelize_1.DataTypes.ARRAY(sequelize_1.DataTypes.STRING),
         defaultValue: [],

package/dist/models/psql/vehicleModel.d.ts

@@ -10,6 +10,8 @@ declare class VehicleModel extends Model<IVehicleModelAttributes, TVehicleModelC
     capacity: number;
     rcBookFileId: string;
     instituteId: string;
+    userId: string;
+    academicCalendarId: string;
     createdBy: string;
     updatedBy: string;
     deletedBy: string;

package/dist/models/psql/vehicleModel.js

@@ -5,7 +5,7 @@ const index_1 = require("./index");
 const app_1 = require("../../constants/app");
 class VehicleModel extends sequelize_1.Model {
     static associate(models) {
-        const { InstituteModel, FileStorageModel, UserModel } = models;
+        const { InstituteModel, FileStorageModel, UserModel, AcademicCalendarModel } = models;
         VehicleModel.belongsTo(InstituteModel, {
             foreignKey: { name: 'instituteId', field: 'institute_id' },
             as: 'vehicleInstitute',
@@ -14,6 +14,22 @@ class VehicleModel extends sequelize_1.Model {
             foreignKey: { name: 'instituteId', field: 'institute_id' },
             as: 'instituteVehicleList',
         });
+        VehicleModel.belongsTo(AcademicCalendarModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'vehicleAcademic',
+        });
+        AcademicCalendarModel.hasMany(VehicleModel, {
+            foreignKey: { name: 'academicCalendarId', field: 'academic_calendar_id' },
+            as: 'academicVehicleList',
+        });
+        VehicleModel.belongsTo(UserModel, {
+            foreignKey: { name: 'userId', field: 'user_id' },
+            as: 'vehicleUser',
+        });
+        UserModel.hasMany(VehicleModel, {
+            foreignKey: { name: 'userId', field: 'user_id' },
+            as: 'userVehicleList',
+        });
         VehicleModel.belongsTo(FileStorageModel, {
             foreignKey: { name: 'rcBookFileId', field: 'rc_book_file_id' },
             as: 'vehicleRcBookFile',
@@ -67,18 +83,20 @@ VehicleModel.init({
         field: 'institute_id',
         allowNull: false,
     },
+    userId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'user_id',
+        allowNull: true,
+    },
+    academicCalendarId: {
+        type: sequelize_1.DataTypes.UUID,
+        field: 'academic_calendar_id',
+        allowNull: true,
+    },
 }, {
     modelName: 'VehicleModel',
     tableName: 'vehicles',
     timestamps: true,
-    indexes: [
-        {
-            name: 'vehicle_unique_number',
-            unique: true,
-            fields: ['number', 'institute_id'],
-            where: { deleted_at: null },
-        },
-    ],
     sequelize: index_1.sequelize,
 });
 exports.default = VehicleModel;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kipicore/dbcore",
-    "version": "1.1.156",
+    "version": "1.1.157",
     "description": "Reusable DB core package with Postgres, MongoDB, models, services, interfaces, and types",
     "types": "dist/index.d.ts",
     "main": "dist/index.js",