@ruiapp/rapid-core 0.7.3 → 0.7.5

package/dist/index.d.ts

@@ -11,6 +11,7 @@ export * from "./utilities/accessControlUtility";
 export * from "./utilities/entityUtility";
 export * from "./utilities/jwtUtility";
 export * from "./utilities/timeUtility";
+export * from "./helpers/licenseHelper";
 export * from "./deno-std/http/cookie";
 export { mapDbRowToEntity } from "./dataAccess/entityMapper";
 export * as bootstrapApplicationConfig from "./bootstrapApplicationConfig";

package/dist/index.js

@@ -2815,18 +2815,30 @@ async function findEntities(server, dataAccessor, options) {
                     continue;
                 }
                 if (isManyRelation) {
-                    const relationLinks = await findManyRelationLinksViaLinkTable({
+                    const selectRelationOptions = relationOptions[relationProperty.code];
+                    const { relationLinks, targetEntities } = await findManyRelationLinksViaLinkTable({
                         server,
                         routeContext,
                         mainModel: relationModel,
                         relationProperty,
                         mainEntityIds: entityIds,
-                        selectRelationOptions: relationOptions[relationProperty.code],
+                        selectRelationOptions,
                     });
+                    // 如果查询关联实体时指定了orderBy，则按照targetEntities的顺序，否则按照relationLinks的顺序。
+                    const selectRelationOrderByOptionsSpecified = selectRelationOptions && lodash.isObject(selectRelationOptions) && selectRelationOptions.orderBy;
                     lodash.forEach(rows, (row) => {
-                        row[relationProperty.code] = lodash.filter(relationLinks, (link) => {
-                            return link[relationProperty.selfIdColumnName] == row["id"];
-                        }).map((link) => mapDbRowToEntity(server, relationModel, link.targetEntity, options.keepNonPropertyFields));
+                        if (selectRelationOrderByOptionsSpecified) {
+                            row[relationProperty.code] = lodash.filter(targetEntities, (targetEntity) => {
+                                return lodash.find(relationLinks, (link) => {
+                                    return link[relationProperty.selfIdColumnName] == row["id"] && link[relationProperty.targetIdColumnName] == targetEntity["id"];
+                                });
+                            }).map((targetEntity) => mapDbRowToEntity(server, relationModel, targetEntity, options.keepNonPropertyFields));
+                        }
+                        else {
+                            row[relationProperty.code] = lodash.filter(relationLinks, (link) => {
+                                return link[relationProperty.selfIdColumnName] == row["id"];
+                            }).map((link) => mapDbRowToEntity(server, relationModel, link.targetEntity, options.keepNonPropertyFields));
+                        }
                     });
                 }
             }
@@ -3139,8 +3151,8 @@ async function findManyRelationLinksViaLinkTable(options) {
     ORDER BY id
   `;
     const params = [mainEntityIds];
-    const links = await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
-    const targetEntityIds = links.map((link) => link[relationProperty.targetIdColumnName]);
+    const relationLinks = await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
+    const targetEntityIds = relationLinks.map((link) => link[relationProperty.targetIdColumnName]);
     const dataAccessor = server.getDataAccessor({
         namespace: relationModel.namespace,
         singularCode: relationModel.singularCode,
@@ -3178,10 +3190,10 @@ async function findManyRelationLinksViaLinkTable(options) {
         }
     }
     const targetEntities = await findEntities(server, dataAccessor, findEntityOptions);
-    lodash.forEach(links, (link) => {
+    lodash.forEach(relationLinks, (link) => {
         link.targetEntity = lodash.find(targetEntities, (e) => e["id"] == link[relationProperty.targetIdColumnName]);
     });
-    return links;
+    return { relationLinks, targetEntities };
 }
 async function findManyRelatedEntitiesViaIdPropertyCode(options) {
     const { server, relationProperty, mainEntityIds, selectRelationOptions } = options;
@@ -4843,6 +4855,30 @@ async function generateJwtSecretKey() {
     return encode(exportedKey);
 }
 
+function validateLicense(server) {
+    const licenseService = server.getService("licenseService");
+    const license = licenseService.getLicense();
+    if (!license) {
+        const errorMessage = `无法获取系统授权信息。`;
+        throw new Error(errorMessage);
+    }
+    if (licenseService.isExpired()) {
+        const expireDate = lodash.get(license.authority, "expireDate");
+        const errorMessage = `您的系统授权已于${expireDate}过期。`;
+        throw new Error(errorMessage);
+    }
+}
+function tryValidateLicense(logger, server) {
+    try {
+        validateLicense(server);
+        return true;
+    }
+    catch (err) {
+        logger.error("授权验证失败：%s", err.message || "");
+    }
+    return false;
+}
+
 const values = new Map();
 async function set(key, value, options) {
     let expireAt = -1;
@@ -6652,20 +6688,6 @@ var changePassword$1 = /*#__PURE__*/Object.freeze({
   handler: handler$e
 });
 
-function validateLicense(server) {
-    const licenseService = server.getService("licenseService");
-    const license = licenseService.getLicense();
-    if (!license) {
-        const errorMessage = `无法获取系统授权信息。`;
-        throw new Error(errorMessage);
-    }
-    if (licenseService.isExpired()) {
-        const expireDate = lodash.get(license.authority, "expireDate");
-        const errorMessage = `您的系统授权已于${expireDate}过期。`;
-        throw new Error(errorMessage);
-    }
-}
-
 const code$d = "createSession";
 async function handler$d(plugin, ctx, options) {
     const { server, input, routerContext: routeContext, logger } = ctx;
@@ -8955,4 +8977,6 @@ exports.getSetCookies = getSetCookies;
 exports.isAccessAllowed = isAccessAllowed;
 exports.mapDbRowToEntity = mapDbRowToEntity;
 exports.setCookie = setCookie;
+exports.tryValidateLicense = tryValidateLicense;
+exports.validateLicense = validateLicense;
 exports.verifyJwt = verifyJwt;

package/package.json

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

package/src/dataAccess/entityManager.ts

@@ -270,19 +270,30 @@ async function findEntities(server: IRpdServer, dataAccessor: IRpdDataAccessor,
         }
 
         if (isManyRelation) {
-          const relationLinks = await findManyRelationLinksViaLinkTable({
+          const selectRelationOptions: FindEntityFindManyRelationEntitiesOptions | undefined = relationOptions[relationProperty.code];
+          const { relationLinks, targetEntities } = await findManyRelationLinksViaLinkTable({
             server,
             routeContext,
             mainModel: relationModel,
             relationProperty,
             mainEntityIds: entityIds,
-            selectRelationOptions: relationOptions[relationProperty.code],
+            selectRelationOptions,
           });
 
+          // 如果查询关联实体时指定了orderBy，则按照targetEntities的顺序，否则按照relationLinks的顺序。
+          const selectRelationOrderByOptionsSpecified = selectRelationOptions && isObject(selectRelationOptions) && selectRelationOptions.orderBy;
           forEach(rows, (row: any) => {
-            row[relationProperty.code] = filter(relationLinks, (link: any) => {
-              return link[relationProperty.selfIdColumnName!] == row["id"];
-            }).map((link) => mapDbRowToEntity(server, relationModel, link.targetEntity, options.keepNonPropertyFields));
+            if (selectRelationOrderByOptionsSpecified) {
+              row[relationProperty.code] = filter(targetEntities, (targetEntity: any) => {
+                return find(relationLinks, (link: any) => {
+                  return link[relationProperty.selfIdColumnName!] == row["id"] && link[relationProperty.targetIdColumnName!] == targetEntity["id"];
+                });
+              }).map((targetEntity) => mapDbRowToEntity(server, relationModel, targetEntity, options.keepNonPropertyFields));
+            } else {
+              row[relationProperty.code] = filter(relationLinks, (link: any) => {
+                return link[relationProperty.selfIdColumnName!] == row["id"];
+              }).map((link) => mapDbRowToEntity(server, relationModel, link.targetEntity, options.keepNonPropertyFields));
+            }
           });
         }
       } else {
@@ -628,8 +639,8 @@ async function findManyRelationLinksViaLinkTable(options: FindManyRelationEntiti
     ORDER BY id
   `;
   const params = [mainEntityIds];
-  const links = await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
-  const targetEntityIds = links.map((link) => link[relationProperty.targetIdColumnName!]);
+  const relationLinks = await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
+  const targetEntityIds = relationLinks.map((link) => link[relationProperty.targetIdColumnName!]);
 
   const dataAccessor = server.getDataAccessor({
     namespace: relationModel.namespace,
@@ -672,11 +683,11 @@ async function findManyRelationLinksViaLinkTable(options: FindManyRelationEntiti
 
   const targetEntities = await findEntities(server, dataAccessor, findEntityOptions);
 
-  forEach(links, (link: any) => {
+  forEach(relationLinks, (link: any) => {
     link.targetEntity = find(targetEntities, (e: any) => e["id"] == link[relationProperty.targetIdColumnName!]);
   });
 
-  return links;
+  return { relationLinks, targetEntities };
 }
 
 async function findManyRelatedEntitiesViaIdPropertyCode(options: FindManyRelationEntitiesOptions) {

package/src/index.ts

@@ -17,6 +17,8 @@ export * from "./utilities/entityUtility";
 export * from "./utilities/jwtUtility";
 export * from "./utilities/timeUtility";
 
+export * from "./helpers/licenseHelper";
+
 export * from "./deno-std/http/cookie";
 
 export { mapDbRowToEntity } from "./dataAccess/entityMapper";