@kipicore/dbcore 1.1.341 → 1.1.343

package/dist/helpers/s3Uploader.js

@@ -11,8 +11,6 @@ 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);
@@ -37,26 +35,28 @@ 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;
-    }
+    // if (fileStorage.expiredAt && fileStorage.filePath) {
+    //     const currentDate = getTime(subMinutes(new Date(), 5));
+    //     const expireDate = getTime(new Date(fileStorage.expiredAt));
+    //     if (currentDate < expireDate) return fileStorage.filePath as string;
+    // }
     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) {
-        await psql_1.FileStorageModel.update({
-            filePath: signedUrl,
-            expiredAt: (0, date_fns_1.addDays)(new Date(), 1),
-        }, {
-            where: { id: fileStorage.id },
-        });
-    }
+    // if (fileStorage.id) {
+    //     await FileStorageModel.update(
+    //         {
+    //             filePath: signedUrl,
+    //             expiredAt: addDays(new Date(), 1),
+    //         },I
+    //         {
+    //             where: { id: fileStorage.id },
+    //         },
+    //     );
+    // }
     return signedUrl;
 };
 exports.getPresignedUrl = getPresignedUrl;

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

@@ -3,6 +3,5 @@ import { IFileStorageAttributes } from '../../interfaces/fileStorageInterface';
 import { TFileStorageModelCreationAttributes } from '../../types/fileStorageType';
 declare class FileStorageModel extends Model<IFileStorageAttributes, TFileStorageModelCreationAttributes> {
     static associate(models: any): void;
-    static addHooks(): void;
 }
 export default FileStorageModel;

package/dist/models/psql/fileStorageModel.js

@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const sequelize_1 = require("sequelize");
 const index_1 = require("./index");
 const app_1 = require("../../constants/app");
-const helpers_1 = require("../../helpers");
-const configs_1 = require("../../configs");
 class FileStorageModel extends sequelize_1.Model {
     static associate(models) {
         const { UserModel, UserDirectoryModel } = models;
@@ -49,23 +47,6 @@ class FileStorageModel extends sequelize_1.Model {
             as: 'userDirectoryFile',
         });
     }
-    static addHooks() {
-        FileStorageModel.afterFind(async (instances) => {
-            if (!instances)
-                return;
-            const instanceArray = Array.isArray(instances) ? instances : [instances];
-            await Promise.all(instanceArray.map(async (instance) => {
-                const data = typeof instance.get === 'function' ? instance.get() : instance;
-                const signedUrl = await (0, helpers_1.getPresignedUrl)(configs_1.ENV_VARIABLE.AWS_BUCKET_NAME, data);
-                if (typeof instance.setDataValue === 'function') {
-                    instance.setDataValue('filePath', signedUrl);
-                }
-                else {
-                    instance.filePath = signedUrl;
-                }
-            }));
-        });
-    }
 }
 FileStorageModel.init({
     id: {

package/package.json

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