npm - @ruiapp/rapid-core - Versions diffs - 0.1.81 → 0.1.82 - Mend

@ruiapp/rapid-core 0.1.81 → 0.1.82

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/index.js +55 -22
package/package.json +1 -1
package/src/dataAccess/entityManager.ts +60 -21

package/dist/index.js CHANGED Viewed

@@ -3181,12 +3181,41 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
         if (!lodash.isArray(relatedEntitiesToBeSaved)) {
             throw new Error(`Value of field '${property.code}' should be an array.`);
         }
+        const targetIdsToKeep = [];
+        for (const relatedEntityToBeSaved of relatedEntitiesToBeSaved) {
+            let relatedEntityId;
+            if (lodash.isObject(relatedEntityToBeSaved)) {
+                relatedEntityId = relatedEntityToBeSaved["id"];
+            }
+            else {
+                relatedEntityId = relatedEntityToBeSaved;
+            }
+            if (relatedEntityId) {
+                targetIdsToKeep.push(relatedEntityId);
+            }
+        }
+        let currentTargetIds = [];
         if (property.linkTableName) {
-            // TODO: should support removing relation
+            const targetLinks = await server.queryDatabaseObject(`SELECT ${server.queryBuilder.quoteObject(property.targetIdColumnName)} FROM ${server.queryBuilder.quoteTable({
+                schema: property.linkSchema,
+                tableName: property.linkTableName,
+            })} WHERE ${server.queryBuilder.quoteObject(property.selfIdColumnName)} = $1`, [id]);
+            currentTargetIds = targetLinks.map((item) => item[property.targetIdColumnName]);
             await server.queryDatabaseObject(`DELETE FROM ${server.queryBuilder.quoteTable({
                 schema: property.linkSchema,
                 tableName: property.linkTableName,
+            })} WHERE ${server.queryBuilder.quoteObject(property.selfIdColumnName)} = $1
+              AND ${server.queryBuilder.quoteObject(property.targetIdColumnName)} <> ALL($2::int[])`, [id, targetIdsToKeep]);
+        }
+        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]);
+            currentTargetIds = targetRows.map((item) => item.id);
         }
         for (const relatedEntityToBeSaved of relatedEntitiesToBeSaved) {
             let relatedEntityId;
@@ -3218,6 +3247,31 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
                     if (!targetEntity) {
                         throw new Error(`Entity with id '${relatedEntityId}' in field '${property.code}' is not exists.`);
                     }
+                    if (!currentTargetIds.includes(relatedEntityId)) {
+                        if (property.linkTableName) {
+                            const command = `INSERT INTO ${server.queryBuilder.quoteTable({
+                                schema: property.linkSchema,
+                                tableName: property.linkTableName,
+                            })} (${server.queryBuilder.quoteObject(property.selfIdColumnName)}, ${property.targetIdColumnName}) VALUES ($1, $2) ON CONFLICT DO NOTHING;`;
+                            const params = [id, relatedEntityId];
+                            await server.queryDatabaseObject(command, params);
+                        }
+                        else {
+                            await targetDataAccessor.updateById(targetEntity.id, { [property.selfIdColumnName]: id });
+                            targetEntity[property.selfIdColumnName] = id;
+                        }
+                    }
+                    relatedEntities.push(targetEntity);
+                }
+            }
+            else {
+                // fieldValue is id
+                relatedEntityId = relatedEntityToBeSaved;
+                const targetEntity = await targetDataAccessor.findById(relatedEntityId);
+                if (!targetEntity) {
+                    throw new Error(`Entity with id '${relatedEntityId}' in field '${property.code}' is not exists.`);
+                }
+                if (!currentTargetIds.includes(relatedEntityId)) {
                     if (property.linkTableName) {
                         const command = `INSERT INTO ${server.queryBuilder.quoteTable({
                             schema: property.linkSchema,
@@ -3230,27 +3284,6 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
                         await targetDataAccessor.updateById(targetEntity.id, { [property.selfIdColumnName]: id });
                         targetEntity[property.selfIdColumnName] = id;
                     }
-                    relatedEntities.push(targetEntity);
-                }
-            }
-            else {
-                // fieldValue is id
-                relatedEntityId = relatedEntityToBeSaved;
-                const targetEntity = await targetDataAccessor.findById(relatedEntityId);
-                if (!targetEntity) {
-                    throw new Error(`Entity with id '${relatedEntityId}' in field '${property.code}' is not exists.`);
-                }
-                if (property.linkTableName) {
-                    const command = `INSERT INTO ${server.queryBuilder.quoteTable({
-                        schema: property.linkSchema,
-                        tableName: property.linkTableName,
-                    })} (${server.queryBuilder.quoteObject(property.selfIdColumnName)}, ${property.targetIdColumnName}) VALUES ($1, $2) ON CONFLICT DO NOTHING;`;
-                    const params = [id, relatedEntityId];
-                    await server.queryDatabaseObject(command, params);
-                }
-                else {
-                    await targetDataAccessor.updateById(targetEntity.id, { [property.selfIdColumnName]: id });
-                    targetEntity[property.selfIdColumnName] = id;
                 }
                 relatedEntities.push(targetEntity);
             }

package/package.json CHANGED Viewed

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

package/src/dataAccess/entityManager.ts CHANGED Viewed

@@ -1085,15 +1085,50 @@ async function updateEntityById(server: IRpdServer, dataAccessor: IRpdDataAccess
       throw new Error(`Value of field '${property.code}' should be an array.`);
     }
+    const targetIdsToKeep = [];
+    for (const relatedEntityToBeSaved of relatedEntitiesToBeSaved) {
+      let relatedEntityId: any;
+      if (isObject(relatedEntityToBeSaved)) {
+        relatedEntityId = relatedEntityToBeSaved["id"];
+      } else {
+        relatedEntityId = relatedEntityToBeSaved;
+      }
+      if (relatedEntityId) {
+        targetIdsToKeep.push(relatedEntityId);
+      }
+    }
+    let currentTargetIds: any[] = [];
     if (property.linkTableName) {
-      // TODO: should support removing relation
+      const targetLinks = await server.queryDatabaseObject(
+        `SELECT ${server.queryBuilder.quoteObject(property.targetIdColumnName)} FROM ${server.queryBuilder.quoteTable({
+          schema: property.linkSchema,
+          tableName: property.linkTableName,
+        })} WHERE ${server.queryBuilder.quoteObject(property.selfIdColumnName!)} = $1`,
+        [id],
+      );
+      currentTargetIds = targetLinks.map((item) => item[property.targetIdColumnName]);
       await server.queryDatabaseObject(
         `DELETE FROM ${server.queryBuilder.quoteTable({
           schema: property.linkSchema,
           tableName: property.linkTableName,
+        })} WHERE ${server.queryBuilder.quoteObject(property.selfIdColumnName!)} = $1
+              AND ${server.queryBuilder.quoteObject(property.targetIdColumnName!)} <> ALL($2::int[])`,
+        [id, targetIdsToKeep],
+      );
+    } 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],
       );
+      currentTargetIds = targetRows.map((item) => item.id);
     }
     for (const relatedEntityToBeSaved of relatedEntitiesToBeSaved) {
@@ -1128,16 +1163,18 @@ async function updateEntityById(server: IRpdServer, dataAccessor: IRpdDataAccess
             throw new Error(`Entity with id '${relatedEntityId}' in field '${property.code}' is not exists.`);
           }
-          if (property.linkTableName) {
-            const command = `INSERT INTO ${server.queryBuilder.quoteTable({
-              schema: property.linkSchema,
-              tableName: property.linkTableName,
-            })} (${server.queryBuilder.quoteObject(property.selfIdColumnName!)}, ${property.targetIdColumnName}) VALUES ($1, $2) ON CONFLICT DO NOTHING;`;
-            const params = [id, relatedEntityId];
-            await server.queryDatabaseObject(command, params);
-          } else {
-            await targetDataAccessor.updateById(targetEntity.id, { [property.selfIdColumnName!]: id });
-            targetEntity[property.selfIdColumnName!] = id;
+          if (!currentTargetIds.includes(relatedEntityId)) {
+            if (property.linkTableName) {
+              const command = `INSERT INTO ${server.queryBuilder.quoteTable({
+                schema: property.linkSchema,
+                tableName: property.linkTableName,
+              })} (${server.queryBuilder.quoteObject(property.selfIdColumnName!)}, ${property.targetIdColumnName}) VALUES ($1, $2) ON CONFLICT DO NOTHING;`;
+              const params = [id, relatedEntityId];
+              await server.queryDatabaseObject(command, params);
+            } else {
+              await targetDataAccessor.updateById(targetEntity.id, { [property.selfIdColumnName!]: id });
+              targetEntity[property.selfIdColumnName!] = id;
+            }
           }
           relatedEntities.push(targetEntity);
         }
@@ -1149,16 +1186,18 @@ async function updateEntityById(server: IRpdServer, dataAccessor: IRpdDataAccess
           throw new Error(`Entity with id '${relatedEntityId}' in field '${property.code}' is not exists.`);
         }
-        if (property.linkTableName) {
-          const command = `INSERT INTO ${server.queryBuilder.quoteTable({
-            schema: property.linkSchema,
-            tableName: property.linkTableName,
-          })} (${server.queryBuilder.quoteObject(property.selfIdColumnName!)}, ${property.targetIdColumnName}) VALUES ($1, $2) ON CONFLICT DO NOTHING;`;
-          const params = [id, relatedEntityId];
-          await server.queryDatabaseObject(command, params);
-        } else {
-          await targetDataAccessor.updateById(targetEntity.id, { [property.selfIdColumnName!]: id });
-          targetEntity[property.selfIdColumnName!] = id;
+        if (!currentTargetIds.includes(relatedEntityId)) {
+          if (property.linkTableName) {
+            const command = `INSERT INTO ${server.queryBuilder.quoteTable({
+              schema: property.linkSchema,
+              tableName: property.linkTableName,
+            })} (${server.queryBuilder.quoteObject(property.selfIdColumnName!)}, ${property.targetIdColumnName}) VALUES ($1, $2) ON CONFLICT DO NOTHING;`;
+            const params = [id, relatedEntityId];
+            await server.queryDatabaseObject(command, params);
+          } else {
+            await targetDataAccessor.updateById(targetEntity.id, { [property.selfIdColumnName!]: id });
+            targetEntity[property.selfIdColumnName!] = id;
+          }
         }
         relatedEntities.push(targetEntity);