@ruiapp/rapid-core 0.5.3 → 0.5.5

package/dist/index.js

@@ -3470,9 +3470,12 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
             }
         }
     }
-    // save many-relation properties
+    // save many-relation properties (only 'overwrite' mode was supported right now)
     for (const property of manyRelationPropertiesToUpdate) {
         const relatedEntities = [];
+        const targetModel = server.getModel({
+            singularCode: property.targetSingularCode,
+        });
         const targetDataAccessor = server.getDataAccessor({
             singularCode: property.targetSingularCode,
         });
@@ -3507,15 +3510,46 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
               AND ${server.queryBuilder.quoteObject(property.targetIdColumnName)} <> ALL($2::int[])`, [id, targetIdsToKeep], routeContext?.getDbTransactionClient());
         }
         else {
-            const targetModel = server.getModel({
-                singularCode: property.targetSingularCode,
-            });
             const targetRows = await server.queryDatabaseObject(`SELECT id FROM ${server.queryBuilder.quoteTable({
                 schema: targetModel.schema,
                 tableName: targetModel.tableName,
             })} WHERE ${server.queryBuilder.quoteObject(property.selfIdColumnName)} = $1`, [id], routeContext?.getDbTransactionClient());
             currentTargetIds = targetRows.map((item) => item.id);
         }
+        const targetIdsToRemove = currentTargetIds.filter((currentId) => !targetIdsToKeep.includes(currentId));
+        if (targetIdsToRemove.length) {
+            if (property.linkTableName) ;
+            else {
+                const updateRelationPropertiesOptions = lodash.get(options.relationPropertiesToUpdate, property.code);
+                let relationRemoveMode = "unlink";
+                if (updateRelationPropertiesOptions === true) {
+                    relationRemoveMode = "delete";
+                }
+                else {
+                    relationRemoveMode = updateRelationPropertiesOptions.relationRemoveMode;
+                }
+                const relationModel = server.getModel({
+                    singularCode: property.targetSingularCode,
+                });
+                if (relationRemoveMode === "unlink") {
+                    await server.queryDatabaseObject(`UPDATE ${server.queryBuilder.quoteTable({
+                        schema: relationModel.schema,
+                        tableName: relationModel.tableName,
+                    })}
+            SET ${server.queryBuilder.quoteObject(property.selfIdColumnName)} = null
+            WHERE id = ANY($1::int[])`, [targetIdsToRemove], routeContext?.getDbTransactionClient());
+                }
+                else {
+                    // relationRemoveMode === "delete"
+                    for (const targetIdToRemove of targetIdsToRemove) {
+                        await deleteEntityById(server, targetDataAccessor, {
+                            id: targetIdToRemove,
+                            routeContext,
+                        }, plugin);
+                    }
+                }
+            }
+        }
         for (const relatedEntityToBeSaved of relatedEntitiesToBeSaved) {
             let relatedEntityId;
             if (lodash.isObject(relatedEntityToBeSaved)) {
@@ -4806,6 +4840,7 @@ async function syncDatabaseSchema(server, applicationConfig) {
                             autoIncrement: false,
                             notNull: property.required,
                         });
+                        await server.tryQueryDatabaseObject(columnDDL);
                     }
                     if (!columnInDb || columnInDb.description != property.name) {
                         await server.queryDatabaseObject(`COMMENT ON COLUMN ${queryBuilder.quoteTable(model)}.${queryBuilder.quoteObject(property.targetIdColumnName)} IS ${queryBuilder.formatValueToSqlLiteral(property.name)};`, []);
@@ -4830,6 +4865,7 @@ async function syncDatabaseSchema(server, applicationConfig) {
                             schema: property.linkSchema,
                             tableName: property.linkTableName,
                         })} ADD CONSTRAINT ${queryBuilder.quoteObject(contraintName)} PRIMARY KEY (id);`;
+                        await server.tryQueryDatabaseObject(columnDDL);
                     }
                     else {
                         const targetModel = applicationConfig.models.find((item) => item.singularCode === property.targetSingularCode);
@@ -4851,15 +4887,13 @@ async function syncDatabaseSchema(server, applicationConfig) {
                                 autoIncrement: false,
                                 notNull: property.required,
                             });
+                            await server.tryQueryDatabaseObject(columnDDL);
                         }
                     }
                 }
                 else {
                     continue;
                 }
-                if (columnDDL) {
-                    await server.tryQueryDatabaseObject(columnDDL);
-                }
             }
             else {
                 const columnName = property.columnName || property.code;

package/dist/types.d.ts

@@ -514,11 +514,15 @@ export interface UpdateEntityByIdOptions {
     /**
      * 指定需要更新关联对象的哪些属性。更新实体时，会创建关联对象，但是默认不更新关联对象的属性。
      */
-    relationPropertiesToUpdate?: Record<string, UpdateRelationPropertiesOptions>;
+    relationPropertiesToUpdate?: Record<string, UpdateRelationPropertyOptions>;
 }
-export type UpdateRelationPropertiesOptions = true | {
+export type UpdateRelationPropertyOptions = true | {
+    /**
+     * 当需移除关系时是删除关联实体，还是取消关联。默认为`delete`。此配置仅对没有配置`linkTableName`的属性有效。
+     */
+    relationRemoveMode?: "unlink" | "delete";
     propertiesToUpdate?: string[];
-    relationPropertiesToUpdate?: Record<string, UpdateRelationPropertiesOptions>;
+    relationPropertiesToUpdate?: Record<string, UpdateRelationPropertyOptions>;
 };
 export interface DeleteEntityOptions {
     routeContext?: RouteContext;

package/package.json

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

package/src/dataAccess/entityManager.ts

@@ -1271,9 +1271,12 @@ async function updateEntityById(server: IRpdServer, dataAccessor: IRpdDataAccess
     }
   }
 
-  // save many-relation properties
+  // save many-relation properties (only 'overwrite' mode was supported right now)
   for (const property of manyRelationPropertiesToUpdate) {
     const relatedEntities: any[] = [];
+    const targetModel = server.getModel({
+      singularCode: property.targetSingularCode,
+    });
     const targetDataAccessor = server.getDataAccessor({
       singularCode: property.targetSingularCode!,
     });
@@ -1318,9 +1321,6 @@ async function updateEntityById(server: IRpdServer, dataAccessor: IRpdDataAccess
         routeContext?.getDbTransactionClient(),
       );
     } else {
-      const targetModel = server.getModel({
-        singularCode: property.targetSingularCode,
-      });
       const targetRows = await server.queryDatabaseObject(
         `SELECT id FROM ${server.queryBuilder.quoteTable({
           schema: targetModel.schema,
@@ -1332,6 +1332,49 @@ async function updateEntityById(server: IRpdServer, dataAccessor: IRpdDataAccess
       currentTargetIds = targetRows.map((item) => item.id);
     }
 
+    const targetIdsToRemove = currentTargetIds.filter((currentId) => !targetIdsToKeep.includes(currentId));
+    if (targetIdsToRemove.length) {
+      if (property.linkTableName) {
+        // do nothing. we've remove the link rows before.
+      } else {
+        const updateRelationPropertiesOptions = get(options.relationPropertiesToUpdate, property.code);
+        let relationRemoveMode: "unlink" | "delete" = "unlink";
+        if (updateRelationPropertiesOptions === true) {
+          relationRemoveMode = "delete";
+        } else {
+          relationRemoveMode = updateRelationPropertiesOptions.relationRemoveMode;
+        }
+        const relationModel = server.getModel({
+          singularCode: property.targetSingularCode,
+        });
+        if (relationRemoveMode === "unlink") {
+          await server.queryDatabaseObject(
+            `UPDATE ${server.queryBuilder.quoteTable({
+              schema: relationModel.schema,
+              tableName: relationModel.tableName,
+            })}
+            SET ${server.queryBuilder.quoteObject(property.selfIdColumnName!)} = null
+            WHERE id = ANY($1::int[])`,
+            [targetIdsToRemove],
+            routeContext?.getDbTransactionClient(),
+          );
+        } else {
+          // relationRemoveMode === "delete"
+          for (const targetIdToRemove of targetIdsToRemove) {
+            await deleteEntityById(
+              server,
+              targetDataAccessor,
+              {
+                id: targetIdToRemove,
+                routeContext,
+              },
+              plugin,
+            );
+          }
+        }
+      }
+    }
+
     for (const relatedEntityToBeSaved of relatedEntitiesToBeSaved) {
       let relatedEntityId: any;
       if (isObject(relatedEntityToBeSaved)) {

package/src/plugins/metaManage/MetaManagePlugin.ts

@@ -260,6 +260,7 @@ async function syncDatabaseSchema(server: IRpdServer, applicationConfig: RpdAppl
               autoIncrement: false,
               notNull: property.required,
             });
+            await server.tryQueryDatabaseObject(columnDDL);
           }
 
           if (!columnInDb || columnInDb.description != property.name) {
@@ -290,6 +291,7 @@ async function syncDatabaseSchema(server: IRpdServer, applicationConfig: RpdAppl
               schema: property.linkSchema,
               tableName: property.linkTableName,
             })} ADD CONSTRAINT ${queryBuilder.quoteObject(contraintName)} PRIMARY KEY (id);`;
+            await server.tryQueryDatabaseObject(columnDDL);
           } else {
             const targetModel = applicationConfig.models.find((item) => item.singularCode === property.targetSingularCode);
             if (!targetModel) {
@@ -312,15 +314,12 @@ async function syncDatabaseSchema(server: IRpdServer, applicationConfig: RpdAppl
                 autoIncrement: false,
                 notNull: property.required,
               });
+              await server.tryQueryDatabaseObject(columnDDL);
             }
           }
         } else {
           continue;
         }
-
-        if (columnDDL) {
-          await server.tryQueryDatabaseObject(columnDDL);
-        }
       } else {
         const columnName = property.columnName || property.code;
         const columnInDb: ColumnInformation | undefined = find(columnsInDb, {

package/src/types.ts

@@ -659,14 +659,21 @@ export interface UpdateEntityByIdOptions {
   /**
    * 指定需要更新关联对象的哪些属性。更新实体时，会创建关联对象，但是默认不更新关联对象的属性。
    */
-  relationPropertiesToUpdate?: Record<string, UpdateRelationPropertiesOptions>;
+  relationPropertiesToUpdate?: Record<string, UpdateRelationPropertyOptions>;
 }
 
-export type UpdateRelationPropertiesOptions =
+export type UpdateRelationPropertyOptions =
   | true
   | {
+      // TODO: impl savingMode 'patch'
+      // savingMode?: "overwrite" | "patch";
+
+      /**
+       * 当需移除关系时是删除关联实体，还是取消关联。默认为`delete`。此配置仅对没有配置`linkTableName`的属性有效。
+       */
+      relationRemoveMode?: "unlink" | "delete";
       propertiesToUpdate?: string[];
-      relationPropertiesToUpdate?: Record<string, UpdateRelationPropertiesOptions>;
+      relationPropertiesToUpdate?: Record<string, UpdateRelationPropertyOptions>;
     };
 
 export interface DeleteEntityOptions {