@ruiapp/rapid-core 0.2.12 → 0.2.14

package/dist/index.js

@@ -2548,11 +2548,16 @@ async function findEntities(server, dataAccessor, options) {
     return entities;
 }
 async function findEntity(server, dataAccessor, options) {
-    const entities = await findEntities(server, dataAccessor, options);
+    const entities = await findEntities(server, dataAccessor, {
+        ...options,
+        ...{
+            limit: 1,
+        },
+    });
     return lodash.first(entities);
 }
 async function findById(server, dataAccessor, options) {
-    const { id, properties, keepNonPropertyFields, routeContext } = options;
+    const { id, properties, relations, keepNonPropertyFields, routeContext } = options;
     return await findEntity(server, dataAccessor, {
         filters: [
             {
@@ -2562,6 +2567,7 @@ async function findById(server, dataAccessor, options) {
             },
         ],
         properties,
+        relations,
         keepNonPropertyFields,
         routeContext,
     });
@@ -6333,6 +6339,11 @@ async function appendFile(path, data) {
     });
 }
 
+function getFileBaseName(pathname) {
+    const extName = path__default["default"].extname(pathname);
+    return path__default["default"].basename(pathname, extName);
+}
+
 const code$8 = "downloadDocument";
 async function handler$8(plugin, ctx, options) {
     const { server, applicationConfig, routerContext, input } = ctx;
@@ -6340,24 +6351,52 @@ async function handler$8(plugin, ctx, options) {
     const documentDataAccessor = ctx.server.getDataAccessor({
         singularCode: "ecm_document",
     });
+    const revisionDataAccessor = ctx.server.getDataAccessor({
+        singularCode: "ecm_revision",
+    });
     const storageDataAccessor = ctx.server.getDataAccessor({
         singularCode: "ecm_storage_object",
     });
-    const document = await documentDataAccessor.findById(input.documentId);
-    if (!document) {
-        ctx.output = { error: new Error("Document not found.") };
+    let storageObjectId = 0;
+    let fileName;
+    let { revisionId, documentId } = input;
+    if (revisionId) {
+        const revision = await revisionDataAccessor.findById(revisionId);
+        if (!revision) {
+            ctx.output = { error: new Error(`Revision with id "${revisionId}" was not found.`) };
+            return;
+        }
+        storageObjectId = revision.storage_object_id;
+        documentId = revision.document_id;
+        const document = await documentDataAccessor.findById(documentId);
+        if (!document) {
+            ctx.output = { error: new Error(`Document with id "${documentId}" was not found.`) };
+            return;
+        }
+        fileName = `${getFileBaseName(document.name)}${revision.ext_name}`;
+    }
+    else if (documentId) {
+        const document = await documentDataAccessor.findById(documentId);
+        if (!document) {
+            ctx.output = { error: new Error(`Document with id "${documentId}" was not found.`) };
+            return;
+        }
+        storageObjectId = document.storage_object_id;
+        fileName = document.name;
+    }
+    else {
+        ctx.output = { error: new Error(`Parameter "revisionId" or "documentId" must be provided.`) };
         return;
     }
-    const storageObject = await storageDataAccessor.findById(document.storage_object_id);
+    const storageObject = await storageDataAccessor.findById(storageObjectId);
     if (!storageObject) {
-        ctx.output = { error: new Error("Storage object not found.") };
+        ctx.output = { error: new Error(`Storage object with id "${storageObjectId}" was not found.`) };
         return;
     }
     const fileKey = storageObject.key;
     const filePathName = path__default["default"].join(server.config.localFileStoragePath, fileKey);
-    const attachmentFileName = document.name;
     response.body = await readFile(filePathName);
-    response.headers.set("Content-Disposition", `attachment; filename="${encodeURIComponent(attachmentFileName)}"`);
+    response.headers.set("Content-Disposition", `attachment; filename="${encodeURIComponent(fileName)}"`);
 }
 
 var downloadDocumentActionHandler = /*#__PURE__*/Object.freeze({

package/dist/utilities/pathUtility.d.ts

@@ -0,0 +1,3 @@
+export declare function getFileExtensionName(pathname: string): string;
+export declare function getFileName(pathname: string): string;
+export declare function getFileBaseName(pathname: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.2.12",
+  "version": "0.2.14",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/dataAccess/entityManager.ts

@@ -347,12 +347,17 @@ async function findEntities(server: IRpdServer, dataAccessor: IRpdDataAccessor,
 }
 
 async function findEntity(server: IRpdServer, dataAccessor: IRpdDataAccessor, options: FindEntityOptions) {
-  const entities = await findEntities(server, dataAccessor, options);
+  const entities = await findEntities(server, dataAccessor, {
+    ...options,
+    ...{
+      limit: 1,
+    },
+  });
   return first(entities);
 }
 
 async function findById(server: IRpdServer, dataAccessor: IRpdDataAccessor, options: FindEntityByIdOptions): Promise<any> {
-  const { id, properties, keepNonPropertyFields, routeContext } = options;
+  const { id, properties, relations, keepNonPropertyFields, routeContext } = options;
   return await findEntity(server, dataAccessor, {
     filters: [
       {
@@ -362,6 +367,7 @@ async function findById(server: IRpdServer, dataAccessor: IRpdDataAccessor, opti
       },
     ],
     properties,
+    relations,
     keepNonPropertyFields,
     routeContext,
   });

package/src/plugins/fileManage/actionHandlers/downloadDocument.ts

@@ -2,6 +2,7 @@ import path from "path";
 import { ActionHandlerContext } from "~/core/actionHandler";
 import { RapidPlugin } from "~/core/server";
 import { readFile } from "~/utilities/fsUtility";
+import { getFileBaseName } from "~/utilities/pathUtility";
 
 export const code = "downloadDocument";
 
@@ -12,25 +13,53 @@ export async function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, op
   const documentDataAccessor = ctx.server.getDataAccessor({
     singularCode: "ecm_document",
   });
+  const revisionDataAccessor = ctx.server.getDataAccessor({
+    singularCode: "ecm_revision",
+  });
   const storageDataAccessor = ctx.server.getDataAccessor({
     singularCode: "ecm_storage_object",
   });
 
-  const document = await documentDataAccessor.findById(input.documentId);
-  if (!document) {
-    ctx.output = { error: new Error("Document not found.") };
+  let storageObjectId = 0;
+  let fileName: string;
+  let { revisionId, documentId } = input;
+  if (revisionId) {
+    const revision = await revisionDataAccessor.findById(revisionId);
+    if (!revision) {
+      ctx.output = { error: new Error(`Revision with id "${revisionId}" was not found.`) };
+      return;
+    }
+    storageObjectId = revision.storage_object_id;
+
+    documentId = revision.document_id;
+    const document = await documentDataAccessor.findById(documentId);
+    if (!document) {
+      ctx.output = { error: new Error(`Document with id "${documentId}" was not found.`) };
+      return;
+    }
+    fileName = `${getFileBaseName(document.name!)}${revision.ext_name}`;
+  } else if (documentId) {
+    const document = await documentDataAccessor.findById(documentId);
+    if (!document) {
+      ctx.output = { error: new Error(`Document with id "${documentId}" was not found.`) };
+      return;
+    }
+    storageObjectId = document.storage_object_id;
+    fileName = document.name;
+  } else {
+    ctx.output = { error: new Error(`Parameter "revisionId" or "documentId" must be provided.`) };
     return;
   }
-  const storageObject = await storageDataAccessor.findById(document.storage_object_id);
+
+  const storageObject = await storageDataAccessor.findById(storageObjectId);
   if (!storageObject) {
-    ctx.output = { error: new Error("Storage object not found.") };
+    ctx.output = { error: new Error(`Storage object with id "${storageObjectId}" was not found.`) };
     return;
   }
 
   const fileKey = storageObject.key;
   const filePathName = path.join(server.config.localFileStoragePath, fileKey);
-  const attachmentFileName = document.name;
 
   response.body = await readFile(filePathName);
-  response.headers.set("Content-Disposition", `attachment; filename="${encodeURIComponent(attachmentFileName)}"`);
+  response.headers.set("Content-Disposition", `attachment; filename="${encodeURIComponent(fileName)}"`);
 }

package/src/utilities/pathUtility.ts

@@ -0,0 +1,14 @@
+import path from "path";
+
+export function getFileExtensionName(pathname: string) {
+  return path.extname(pathname);
+}
+
+export function getFileName(pathname: string) {
+  return path.basename(pathname);
+}
+
+export function getFileBaseName(pathname: string) {
+  const extName = path.extname(pathname);
+  return path.basename(pathname, extName);
+}