@kipicore/dbcore 1.1.592 → 1.1.593

package/dist/constants/app.d.ts

@@ -1462,6 +1462,7 @@ export declare enum RMS_TRANSACTION_TYPE {
     DAMAGE = "DAMAGE",
     LOST = "LOST",
     EXPIRED = "EXPIRED",
+    SCRAP = "SCRAP",
     RESERVE = "RESERVE",
     UNRESERVE = "UNRESERVE",
     ISSUE = "ISSUE"
@@ -1503,7 +1504,8 @@ export declare enum RMS_ASSET_LIFECYCLE {
     UNDER_MAINTENANCE = "UNDER_MAINTENANCE",
     RETIRED = "RETIRED",
     DISPOSED = "DISPOSED",
-    LOST = "LOST"
+    LOST = "LOST",
+    DAMAGE = "DAMAGE"
 }
 export declare enum RMS_BOOK_COPY_STATUS {
     AVAILABLE = "AVAILABLE",

package/dist/constants/app.js

@@ -1767,6 +1767,7 @@ var RMS_TRANSACTION_TYPE;
     RMS_TRANSACTION_TYPE["DAMAGE"] = "DAMAGE";
     RMS_TRANSACTION_TYPE["LOST"] = "LOST";
     RMS_TRANSACTION_TYPE["EXPIRED"] = "EXPIRED";
+    RMS_TRANSACTION_TYPE["SCRAP"] = "SCRAP";
     RMS_TRANSACTION_TYPE["RESERVE"] = "RESERVE";
     RMS_TRANSACTION_TYPE["UNRESERVE"] = "UNRESERVE";
     RMS_TRANSACTION_TYPE["ISSUE"] = "ISSUE";
@@ -1815,6 +1816,7 @@ var RMS_ASSET_LIFECYCLE;
     RMS_ASSET_LIFECYCLE["RETIRED"] = "RETIRED";
     RMS_ASSET_LIFECYCLE["DISPOSED"] = "DISPOSED";
     RMS_ASSET_LIFECYCLE["LOST"] = "LOST";
+    RMS_ASSET_LIFECYCLE["DAMAGE"] = "DAMAGE";
 })(RMS_ASSET_LIFECYCLE || (exports.RMS_ASSET_LIFECYCLE = RMS_ASSET_LIFECYCLE = {}));
 var RMS_BOOK_COPY_STATUS;
 (function (RMS_BOOK_COPY_STATUS) {

package/dist/db/psql/migrations/20260617060730-update_rms_resource_fields.d.ts

@@ -0,0 +1,2 @@
+declare const _exports: import("sequelize-cli").Migration;
+export = _exports;

package/dist/db/psql/migrations/20260617060730-update_rms_resource_fields.js

@@ -0,0 +1,84 @@
+'use strict';
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+    async up(queryInterface, Sequelize) {
+        const tableName = 'rms_resources';
+        // 1. Drop the foreign key constraint on custodian_id if it exists
+        try {
+            // Sequelize default naming convention for FKs
+            await queryInterface.removeConstraint(tableName, 'rms_resources_custodian_id_fkey');
+        }
+        catch (error) {
+            console.log('Constraint rms_resources_custodian_id_fkey not found or already dropped. Continuing...');
+        }
+        // 2. Change custodian_id to ARRAY(STRING)
+        try {
+            await queryInterface.sequelize.query(`
+                ALTER TABLE "${tableName}" 
+                ALTER COLUMN custodian_id TYPE STRING[] 
+                USING ARRAY[custodian_id]::STRING[];
+            `);
+        }
+        catch (error) {
+            console.log('Error altering custodian_id to STRING[]:', error.message);
+        }
+        // 3. Drop unwanted columns if they exist
+        const tableDescription = await queryInterface.describeTable(tableName);
+        if (tableDescription.reorder_level) {
+            await queryInterface.removeColumn(tableName, 'reorder_level');
+        }
+        if (tableDescription.is_batch_tracked) {
+            await queryInterface.removeColumn(tableName, 'is_batch_tracked');
+        }
+        if (tableDescription.is_expiry_tracked) {
+            await queryInterface.removeColumn(tableName, 'is_expiry_tracked');
+        }
+    },
+    async down(queryInterface, Sequelize) {
+        const tableName = 'rms_resources';
+        // Re-add removed columns
+        await queryInterface.addColumn(tableName, 'reorder_level', {
+            type: Sequelize.INTEGER,
+            allowNull: false,
+            defaultValue: 0,
+        });
+        await queryInterface.addColumn(tableName, 'is_batch_tracked', {
+            type: Sequelize.BOOLEAN,
+            allowNull: false,
+            defaultValue: false,
+        });
+        await queryInterface.addColumn(tableName, 'is_expiry_tracked', {
+            type: Sequelize.BOOLEAN,
+            allowNull: false,
+            defaultValue: false,
+        });
+        // Revert custodian_id array to single element
+        try {
+            await queryInterface.sequelize.query(`
+                ALTER TABLE "${tableName}" 
+                ALTER COLUMN custodian_id TYPE UUID 
+                USING custodian_id[1];
+            `);
+        }
+        catch (error) {
+            console.log('Error reverting custodian_id to UUID:', error.message);
+        }
+        // Try adding foreign key back
+        try {
+            await queryInterface.addConstraint(tableName, {
+                fields: ['custodian_id'],
+                type: 'foreign key',
+                name: 'rms_resources_custodian_id_fkey',
+                references: {
+                    table: 'users',
+                    field: 'id'
+                },
+                onDelete: 'SET NULL',
+                onUpdate: 'CASCADE'
+            });
+        }
+        catch (error) {
+            console.log('Error adding constraint back:', error.message);
+        }
+    }
+};

package/dist/db/psql/migrations/20260617061804-add_expiry_tracking_to_assets_grn_items.d.ts

@@ -0,0 +1,2 @@
+declare const _exports: import("sequelize-cli").Migration;
+export = _exports;

package/dist/db/psql/migrations/20260617061804-add_expiry_tracking_to_assets_grn_items.js

@@ -0,0 +1,34 @@
+'use strict';
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+    async up(queryInterface, Sequelize) {
+        // Add columns to rms_assets
+        await queryInterface.addColumn('rms_assets', 'is_expiry_tracked', {
+            type: Sequelize.BOOLEAN,
+            allowNull: true,
+            defaultValue: false,
+        });
+        await queryInterface.addColumn('rms_assets', 'expiry_date', {
+            type: Sequelize.DATE,
+            allowNull: true,
+        });
+        // Add columns to rms_grn_items
+        await queryInterface.addColumn('rms_grn_items', 'is_expiry_tracked', {
+            type: Sequelize.BOOLEAN,
+            allowNull: true,
+            defaultValue: false,
+        });
+        await queryInterface.addColumn('rms_grn_items', 'expiry_date', {
+            type: Sequelize.DATE,
+            allowNull: true,
+        });
+    },
+    async down(queryInterface, Sequelize) {
+        // Remove columns from rms_assets
+        await queryInterface.removeColumn('rms_assets', 'is_expiry_tracked');
+        await queryInterface.removeColumn('rms_assets', 'expiry_date');
+        // Remove columns from rms_grn_items
+        await queryInterface.removeColumn('rms_grn_items', 'is_expiry_tracked');
+        await queryInterface.removeColumn('rms_grn_items', 'expiry_date');
+    }
+};

package/dist/interfaces/rmsAssetInterface.d.ts

@@ -10,6 +10,8 @@ export interface IRmsAssetAttributes extends IDefaultAttributes {
     condition?: string | null;
     assignedTo?: string | null;
     locationId?: string | null;
+    isExpiryTracked?: boolean | null;
+    expiryDate?: Date | null;
     lifecycleStatus: RMS_ASSET_LIFECYCLE;
     status: string;
 }

package/dist/interfaces/rmsGrnItemInterface.d.ts

@@ -9,5 +9,7 @@ export interface IRmsGrnItemAttributes extends IDefaultAttributes {
     receivedQuantity: number;
     acceptedQuantity: number;
     rejectedQuantity: number;
+    isExpiryTracked?: boolean | null;
+    expiryDate?: Date | null;
     remarks?: string | null;
 }

package/dist/interfaces/rmsResourceInterface.d.ts

@@ -12,12 +12,9 @@ export interface IRmsResourceAttributes extends IDefaultAttributes {
     unit: RMS_RESOURCE_UNIT;
     departmentId?: string | null;
     defaultLocationId?: string | null;
-    custodianId?: string | null;
+    custodianId?: string[] | null;
     description?: string | null;
     minStockLevel: number;
-    reorderLevel: number;
-    isBatchTracked: boolean;
-    isExpiryTracked: boolean;
     metadata?: object | null;
     status: COMMAN_STATUS;
 }

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

@@ -12,6 +12,8 @@ declare class RmsAssetModel extends Model<IRmsAssetAttributes, TRmsAssetCreation
     condition?: string | null;
     assignedTo?: string | null;
     locationId?: string | null;
+    isExpiryTracked?: boolean | null;
+    expiryDate?: Date | null;
     lifecycleStatus: RMS_ASSET_LIFECYCLE;
     status: COMMAN_STATUS;
     createdBy?: string | null;

package/dist/models/psql/rmsAssetModel.js

@@ -60,6 +60,17 @@ RmsAssetModel.init({
         type: sequelize_1.DataTypes.UUID,
         allowNull: true,
     },
+    isExpiryTracked: {
+        type: sequelize_1.DataTypes.BOOLEAN,
+        allowNull: true,
+        defaultValue: false,
+        field: 'is_expiry_tracked',
+    },
+    expiryDate: {
+        type: sequelize_1.DataTypes.DATE,
+        allowNull: true,
+        field: 'expiry_date',
+    },
     lifecycleStatus: {
         type: sequelize_1.DataTypes.STRING,
         allowNull: false,

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

@@ -11,6 +11,8 @@ declare class RmsGrnItemModel extends Model<IRmsGrnItemAttributes, TRmsGrnItemCr
     receivedQuantity: number;
     acceptedQuantity: number;
     rejectedQuantity: number;
+    isExpiryTracked?: boolean | null;
+    expiryDate?: Date | null;
     remarks?: string | null;
     createdBy?: string | null;
     updatedBy?: string | null;

package/dist/models/psql/rmsGrnItemModel.js

@@ -61,6 +61,17 @@ RmsGrnItemModel.init({
         allowNull: false,
         defaultValue: 0,
     },
+    isExpiryTracked: {
+        type: sequelize_1.DataTypes.BOOLEAN,
+        allowNull: true,
+        defaultValue: false,
+        field: 'is_expiry_tracked',
+    },
+    expiryDate: {
+        type: sequelize_1.DataTypes.DATE,
+        allowNull: true,
+        field: 'expiry_date',
+    },
     remarks: {
         type: sequelize_1.DataTypes.TEXT,
         allowNull: true,

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

@@ -14,12 +14,9 @@ declare class RmsResourceModel extends Model<IRmsResourceAttributes, TRmsResourc
     unit: RMS_RESOURCE_UNIT;
     departmentId?: string | null;
     defaultLocationId?: string | null;
-    custodianId?: string | null;
+    custodianId?: string[] | null;
     description?: string | null;
     minStockLevel: number;
-    reorderLevel: number;
-    isBatchTracked: boolean;
-    isExpiryTracked: boolean;
     metadata?: object | null;
     status: COMMAN_STATUS;
     createdBy: string;

package/dist/models/psql/rmsResourceModel.js

@@ -12,13 +12,11 @@ class RmsResourceModel extends sequelize_1.Model {
         RmsResourceModel.belongsTo(ProductModel, { foreignKey: 'productId', as: 'product' });
         RmsResourceModel.belongsTo(RmsDepartmentModel, { foreignKey: 'departmentId', as: 'department' });
         RmsResourceModel.belongsTo(RmsLocationModel, { foreignKey: 'defaultLocationId', as: 'defaultLocation' });
-        RmsResourceModel.belongsTo(UserModel, { foreignKey: 'custodianId', as: 'custodian' });
         CategoriesModel.hasMany(RmsResourceModel, { foreignKey: 'categoryId', as: 'resources' });
         SubCategoriesModel.hasMany(RmsResourceModel, { foreignKey: 'subCategoryId', as: 'resources' });
         ProductModel.hasMany(RmsResourceModel, { foreignKey: 'productId', as: 'resources' });
         RmsDepartmentModel.hasMany(RmsResourceModel, { foreignKey: 'departmentId', as: 'resources' });
         RmsLocationModel.hasMany(RmsResourceModel, { foreignKey: 'defaultLocationId', as: 'resources' });
-        UserModel.hasMany(RmsResourceModel, { foreignKey: 'custodianId', as: 'resources' });
         InstituteModel.hasMany(RmsResourceModel, { foreignKey: 'instituteId', as: 'resources' });
         RmsResourceModel.belongsTo(UserModel, { foreignKey: { name: 'createdBy', field: 'created_by', allowNull: true }, as: 'createdByUser' });
         RmsResourceModel.belongsTo(UserModel, { foreignKey: { name: 'updatedBy', field: 'updated_by', allowNull: true }, as: 'updatedByUser' });
@@ -81,7 +79,7 @@ RmsResourceModel.init({
         field: 'default_location_id',
     },
     custodianId: {
-        type: sequelize_1.DataTypes.UUID,
+        type: sequelize_1.DataTypes.ARRAY(sequelize_1.DataTypes.STRING),
         allowNull: true,
         field: 'custodian_id',
     },
@@ -95,24 +93,6 @@ RmsResourceModel.init({
         defaultValue: 0,
         field: 'min_stock_level',
     },
-    reorderLevel: {
-        type: sequelize_1.DataTypes.INTEGER,
-        allowNull: false,
-        defaultValue: 0,
-        field: 'reorder_level',
-    },
-    isBatchTracked: {
-        type: sequelize_1.DataTypes.BOOLEAN,
-        allowNull: false,
-        defaultValue: false,
-        field: 'is_batch_tracked',
-    },
-    isExpiryTracked: {
-        type: sequelize_1.DataTypes.BOOLEAN,
-        allowNull: false,
-        defaultValue: false,
-        field: 'is_expiry_tracked',
-    },
     metadata: {
         type: sequelize_1.DataTypes.JSONB,
         allowNull: true,

package/package.json

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