@ruiapp/rapid-core 0.11.4 → 0.11.6

package/dist/index.js

@@ -3174,7 +3174,7 @@ const UNDELETED_ENTITY_FILTER_OPTIONS = {
     field: "deletedAt",
 };
 function tryAddUndeletedEntityFilter(model, baseModel, filters) {
-    let isEntitySoftDeleteEnabled = baseModel ? baseModel.softDelete : model.softDelete;
+    let isEntitySoftDeleteEnabled = baseModel ? (baseModel.softDelete || model.softDelete) : model.softDelete;
     if (!isEntitySoftDeleteEnabled) {
         return filters;
     }
@@ -4279,6 +4279,12 @@ async function deleteEntityById(server, dataAccessor, options, plugin) {
         };
     }
     const model = dataAccessor.getModel();
+    let baseModel;
+    if (model.base) {
+        baseModel = server.getModel({
+            singularCode: model.base,
+        });
+    }
     if (model.derivedTypePropertyCode) {
         // TODO: should be allowed.
         throw newEntityOperationError("Delete base entity directly is not allowed.");
@@ -4292,7 +4298,8 @@ async function deleteEntityById(server, dataAccessor, options, plugin) {
     if (!entity) {
         return;
     }
-    if (model.softDelete) {
+    const isEntitySoftDeleteEnabled = model.base ? (baseModel.softDelete || model.softDelete) : model.softDelete;
+    if (isEntitySoftDeleteEnabled) {
         if (entity.deletedAt) {
             return;
         }
@@ -4307,12 +4314,18 @@ async function deleteEntityById(server, dataAccessor, options, plugin) {
         sender: plugin,
         routeContext,
     });
-    if (model.softDelete) {
+    if (isEntitySoftDeleteEnabled) {
         const currentUserId = routeContext?.state?.userId;
-        await dataAccessor.updateById(id, {
+        const updateFields = {
             deleted_at: getNowStringWithTimezone(),
             deleter_id: currentUserId,
-        }, routeContext?.getDbTransactionClient());
+        };
+        const softDeleteDataAccessor = model.base
+            ? server.getDataAccessor({
+                singularCode: model.base,
+            })
+            : dataAccessor;
+        await softDeleteDataAccessor.updateById(id, updateFields, routeContext?.getDbTransactionClient());
     }
     else {
         const relationPropertiesWithDeletingReaction = getEntityPropertiesIncludingBase(server, model, (property) => {
@@ -4986,7 +4999,7 @@ class RapidServer {
         if (!response.status && !response.body) {
             response.json({
                 error: {
-                    message: "No route handler was found to handle this request.",
+                    message: `No route handler was found to handle this request. ${rapidRequest.method} ${rapidRequest.url}`,
                 },
             }, 404);
         }

package/package.json

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

package/src/dataAccess/entityManager.ts

@@ -401,7 +401,7 @@ const UNDELETED_ENTITY_FILTER_OPTIONS: EntityFilterOptions = {
 };
 
 function tryAddUndeletedEntityFilter(model: RpdDataModel, baseModel: RpdDataModel, filters: EntityFilterOptions[] | undefined) {
-  let isEntitySoftDeleteEnabled = baseModel ? baseModel.softDelete : model.softDelete;
+  let isEntitySoftDeleteEnabled = baseModel ? (baseModel.softDelete || model.softDelete) : model.softDelete;
   if (!isEntitySoftDeleteEnabled) {
     return filters;
   }
@@ -1639,6 +1639,12 @@ async function deleteEntityById(
   }
 
   const model = dataAccessor.getModel();
+  let baseModel: RpdDataModel | undefined;
+  if (model.base) {
+    baseModel = server.getModel({
+      singularCode: model.base,
+    });
+  }
   if (model.derivedTypePropertyCode) {
     // TODO: should be allowed.
     throw newEntityOperationError("Delete base entity directly is not allowed.");
@@ -1656,7 +1662,8 @@ async function deleteEntityById(
     return;
   }
 
-  if (model.softDelete) {
+  const isEntitySoftDeleteEnabled = model.base ? (baseModel.softDelete || model.softDelete) : model.softDelete;
+  if (isEntitySoftDeleteEnabled) {
     if (entity.deletedAt) {
       return;
     }
@@ -1673,16 +1680,19 @@ async function deleteEntityById(
     routeContext,
   });
 
-  if (model.softDelete) {
+  if (isEntitySoftDeleteEnabled) {
     const currentUserId = routeContext?.state?.userId;
-    await dataAccessor.updateById(
-      id,
-      {
-        deleted_at: getNowStringWithTimezone(),
-        deleter_id: currentUserId,
-      },
-      routeContext?.getDbTransactionClient(),
-    );
+    const updateFields = {
+      deleted_at: getNowStringWithTimezone(),
+      deleter_id: currentUserId,
+    };
+
+    const softDeleteDataAccessor = model.base
+      ? server.getDataAccessor({
+          singularCode: model.base,
+        })
+      : dataAccessor;
+    await softDeleteDataAccessor.updateById(id, updateFields, routeContext?.getDbTransactionClient());
   } else {
     const relationPropertiesWithDeletingReaction = getEntityPropertiesIncludingBase(server, model, (property) => {
       return isRelationProperty(property) && property.entityDeletingReaction && property.entityDeletingReaction !== "doNothing";

package/src/server.ts

@@ -472,7 +472,7 @@ export class RapidServer implements IRpdServer {
       response.json(
         {
           error: {
-            message: "No route handler was found to handle this request.",
+            message: `No route handler was found to handle this request. ${rapidRequest.method} ${rapidRequest.url}`,
           },
         },
         404,