@kipicore/dbcore 1.1.336 → 1.1.338

package/dist/db/psql/migrations/20260324084437-add-expired-at-file-storage-model.d.ts

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

package/dist/db/psql/migrations/20260324084437-add-expired-at-file-storage-model.js

@@ -0,0 +1,21 @@
+'use strict';
+const up = async (queryInterface, Sequelize) => {
+    const table = await queryInterface.describeTable('file_storage');
+    if (!table.expired_at) {
+        await queryInterface.addColumn('file_storage', 'expired_at', {
+            type: Sequelize.DATE,
+            allowNull: true,
+            field: 'expired_at',
+        });
+    }
+};
+const down = async (queryInterface) => {
+    const table = await queryInterface.describeTable('file_storage');
+    if (table.expired_at) {
+        await queryInterface.removeColumn('file_storage', 'expired_at');
+    }
+};
+module.exports = {
+    up,
+    down,
+};

package/dist/helpers/s3Uploader.js

@@ -11,6 +11,8 @@ const aws_1 = require("../configs/aws");
 const env_1 = require("../configs/env");
 const client_s3_1 = require("@aws-sdk/client-s3");
 const s3_request_presigner_1 = require("@aws-sdk/s3-request-presigner");
+const date_fns_1 = require("date-fns");
+const psql_1 = require("../models/psql");
 const uploadFileToS3 = async (localFilePath, s3Key, s3Bucket = env_1.ENV_VARIABLE.AWS_BUCKET_NAME) => {
     try {
         const fileContent = fs_1.default.readFileSync(localFilePath);
@@ -35,12 +37,26 @@ const uploadFileToS3 = async (localFilePath, s3Key, s3Bucket = env_1.ENV_VARIABL
 };
 exports.uploadFileToS3 = uploadFileToS3;
 const getPresignedUrl = async (bucket, fileStorage, expiresIn = 60 * 60 * 24) => {
+    if (fileStorage.expiredAt && fileStorage.filePath) {
+        const currentDate = (0, date_fns_1.getTime)((0, date_fns_1.subMinutes)(new Date(), 5));
+        const expireDate = (0, date_fns_1.getTime)(new Date(fileStorage.expiredAt));
+        if (currentDate < expireDate)
+            return fileStorage.filePath;
+    }
     const s3Key = `${fileStorage.storagePath}/${fileStorage.storageFileName}`;
     const command = new client_s3_1.GetObjectCommand({
         Bucket: bucket,
         Key: s3Key,
     });
     const signedUrl = await (0, s3_request_presigner_1.getSignedUrl)(aws_1.s3, command, { expiresIn }); // in seconds
+    if (fileStorage.id) {
+        psql_1.FileStorageModel.update({
+            filePath: signedUrl,
+            expiredAt: (0, date_fns_1.addDays)(new Date(), 1),
+        }, {
+            where: { id: fileStorage.id },
+        });
+    }
     return signedUrl;
 };
 exports.getPresignedUrl = getPresignedUrl;

package/dist/interfaces/fileStorageInterface.d.ts

@@ -12,4 +12,5 @@ export interface IFileStorageAttributes extends IDefaultAttributes {
     fileSize?: number;
     storageUserId?: string;
     userDirectoryId?: string;
+    expiredAt?: Date;
 }

package/dist/interfaces/finalMarkSheetInterface.d.ts

@@ -3,11 +3,11 @@ import { IDefaultAttributes } from './commonInterface';
 export interface IFinalMarkSheetModelAttributes extends IDefaultAttributes, Document {
     id: string;
     date: Date;
-    resultId: string;
+    fileStorageId: string;
     userIds: string[];
     instituteId: string;
     academicCalendarId?: string;
     markSheetConfigurationId: string;
-    stdId: string;
+    standardId: string;
     batchId: string;
 }

package/dist/interfaces/markSheetConfigurationInterface.d.ts

@@ -10,6 +10,7 @@ export interface IMarkSheetArrangement {
     subjectId: string;
     markConsiderType: string[];
     totalMark: number;
+    passingMarks: number;
 }
 export interface IMarkSheetConfigurationModelAttributes extends IDefaultAttributes, Document {
     id: string;

package/dist/models/mongodb/finalMarkSheetModel.js

@@ -37,9 +37,9 @@ const mongoose_1 = __importStar(require("mongoose"));
 const finalMarkSheetModelSchema = new mongoose_1.Schema({
     instituteId: { type: String, required: false },
     academicCalendarId: { type: String, required: false },
-    resultId: { type: String, required: false },
+    fileStorageId: { type: String, required: false },
     markSheetConfigurationId: { type: String, required: false },
-    stdId: { type: String, required: false },
+    standardId: { type: String, required: false },
     batchId: { type: String, required: false },
     userIds: { type: [String], default: [] },
     date: { type: Date, required: false },

package/dist/models/mongodb/markSheetConfigurationModel.js

@@ -44,6 +44,7 @@ const markSheetArrangementSchema = new mongoose_1.Schema({
     subjectId: { type: String, required: false },
     markConsiderType: { type: [String], default: [] },
     totalMark: { type: Number, required: false },
+    passingMarks: { type: Number, required: false },
 }, { _id: false });
 const marksConfigurationModelSchema = new mongoose_1.Schema({
     instituteId: { type: String, required: false },

package/dist/models/psql/fileStorageModel.js

@@ -96,6 +96,11 @@ FileStorageModel.init({
         field: 'user_directory_id',
         allowNull: true,
     },
+    expiredAt: {
+        type: sequelize_1.DataTypes.DATE,
+        field: 'expired_at',
+        allowNull: true,
+    },
 }, {
     modelName: 'FileStorageModel',
     tableName: 'file_storage',

package/package.json

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