fix entity/mongo edge case update failures

antoniopresto · Dec 5, 2024 · 91b7788 · 91b7788
1 parent 32c80f6
commit 91b7788
Show file tree

Hide file tree

Showing 22 changed files with 450 additions and 283 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "powership",
-  "version": "5.7.12",
+  "version": "5.7.14",
   "private": true,
   "scripts": {
     "patch": "run-s patch:*",

diff --git a/packages/accounts/package.json b/packages/accounts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@powership/accounts",
-  "version": "5.7.12",
+  "version": "5.7.14",
   "description": "Powership accounts",
   "type": "module",
   "main": "./out/index.cjs",

diff --git a/packages/babel-plugins/package.json b/packages/babel-plugins/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@powership/babel-plugins",
-  "version": "5.7.12",
+  "version": "5.7.14",
   "main": "./out/index.js",
   "sideEffects": false,
   "typings": "./out/index.d.ts",

diff --git a/packages/boilerplate/package.json b/packages/boilerplate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@powership/boilerplate",
-  "version": "5.7.12",
+  "version": "5.7.14",
   "author": "antoniopresto <[email protected]>",
   "sideEffects": false,
   "type": "module",

diff --git a/packages/entity/package.json b/packages/entity/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@powership/entity",
-  "version": "5.7.12",
+  "version": "5.7.14",
   "type": "module",
   "main": "./out/index.cjs",
   "module": "./out/index.mjs",

diff --git a/packages/entity/src/Entity.ts b/packages/entity/src/Entity.ts
@@ -853,12 +853,49 @@ function _registerPKSKHook(input: {
     }
 
     if (ctx.isUpdate) {
+      ctx.options.update.$set = await _onUpdate({
+        ...ctx.options.update.$set,
+      });
+
       if (ctx.isUpsert) {
-        ctx.options.update.$setOnInsert = await _onCreate({
+        const processedDoc = await _onCreate({
           ...ctx.options.update.$setIfNull,
           ...ctx.options.update.$setOnInsert,
           ...ctx.options.update.$set,
         });
+
+        const originalSetFields = new Set(
+          Object.keys(ctx.options.update.$set || {}).map(
+            (el) => el.split('.')[0]
+          )
+        );
+
+        const setFields = {};
+        const setOnInsertFields = {};
+
+        for (const [key, value] of Object.entries(processedDoc)) {
+          if (originalSetFields.has(key)) {
+            setFields[key] = value;
+          } else {
+            setOnInsertFields[key] = value;
+          }
+        }
+
+        ctx.options.update.$set = setFields;
+        ctx.options.update.$setOnInsert = setOnInsertFields;
+        delete ctx.options.update.$setIfNull;
+
+        const conflictingFields = Object.keys(setFields).filter(
+          (key) => key in setOnInsertFields
+        );
+
+        if (conflictingFields.length > 0) {
+          throw new Error(
+            `Found conflicting fields in update operators: ${conflictingFields.join(
+              ', '
+            )}`
+          );
+        }
       } else {
         if (ctx.options.update.$setIfNull) {
           ctx.options.update.$setIfNull = preparseFilterGraphTypeFields(
@@ -876,10 +913,6 @@ function _registerPKSKHook(input: {
           );
         }
       }
-
-      ctx.options.update.$set = await _onUpdate({
-        ...ctx.options.update.$set,
-      });
       //  ======= close update handling ====
     }
 

diff --git a/packages/entity/src/indexRelations/__tests__/Entity.indexRelations.spec.ts b/packages/entity/src/indexRelations/__tests__/Entity.indexRelations.spec.ts
@@ -1,4 +1,4 @@
-import { createType, resetTypesCache } from '@powership/schema';
+import { createType, Infer, resetTypesCache } from '@powership/schema';
 import { ulid } from '@powership/utils';
 import { assert, IsExact } from 'conditional-type-checks';
 
@@ -102,6 +102,8 @@ describe('Entity.indexRelations', () => {
       context: {},
     });
 
+    expect(created.error).toBeUndefined();
+
     expect(created.item).toEqual(
       expect.objectContaining({
         _idPK: 'payment⋮_id⋮+5511900000000⋮',

diff --git a/packages/logstorm/package.json b/packages/logstorm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "logstorm",
-  "version": "5.7.12",
+  "version": "5.7.14",
   "typings": "out",
   "author": "antoniopresto <[email protected]>",
   "type": "module",
@@ -60,7 +60,7 @@
     "eslint-plugin-sort-keys-fix": "1.1.2",
     "eslint-plugin-typescript-sort-keys": "3.2.0",
     "jest": "29.7.0",
-    "nodemon": "2.0.20",
+    "nodemon": "3.1.7",
     "npm-run-all": "4.1.5",
     "prettier-plugin-multiline-arrays": "3.0.4",
     "rimraf": "6.0.1",

diff --git a/packages/mongo/package.json b/packages/mongo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@powership/mongo",
-  "version": "5.7.12",
+  "version": "5.7.14",
   "type": "module",
   "main": "./out/index.cjs",
   "module": "./out/index.mjs",

diff --git a/packages/mongo/src/__tests__/parseMongoUpdateExpression.spec.ts b/packages/mongo/src/__tests__/parseMongoUpdateExpression.spec.ts
@@ -279,6 +279,92 @@ describe('parseMongoUpdateExpression', () => {
     ).toHaveProperty('list', ['a', 'b', 'a', 2]);
   });
 
+  test('TTLCache scenario with $addToSet and $setOnInsert', async () => {
+    const ONE_HOUR_MS = 3600000;
+    const key = 'testKey';
+    const key2 = 'testKey2';
+    const attempt = 'testAttempt';
+
+    const result = await mockApp.transporter.updateOne({
+      filter: { key, key2 },
+      upsert: true,
+      update: {
+        $addToSet: {
+          value: attempt,
+        },
+        $setOnInsert: {
+          key,
+          key2,
+        },
+        $set: {
+          createdAt: new Date(),
+          ttl: ONE_HOUR_MS,
+        },
+      },
+      indexConfig: {
+        entity: 'cache',
+        indexes: [{ name: 'key_key2', PK: ['.key', '.key2'] }],
+      },
+      context: {},
+    });
+
+    expect(result.error).toBeUndefined();
+    expect(result.item).toMatchObject({
+      key,
+      key2,
+      value: [attempt],
+      ttl: ONE_HOUR_MS,
+    });
+  });
+
+  test('TTLCache scenario with $set and $setOnInsert', async () => {
+    const ONE_HOUR_MS = 3600000;
+    const key = 'testKey';
+    const key2 = 'testKey2';
+    const attempt = 'attempt1';
+
+    await mockApp.transporter.createOne({
+      item: {
+        key,
+        key2,
+        value: [attempt],
+      },
+      indexConfig: {
+        entity: 'cache',
+        indexes: [{ name: 'key_key2', PK: ['.key', '.key2'] }],
+      },
+      context: {},
+    });
+
+    const attempt2 = 'attempt2';
+    const result = await mockApp.transporter.updateOne({
+      filter: { key, key2 },
+      upsert: true,
+      update: {
+        $addToSet: {
+          value: attempt2,
+        },
+        $set: {
+          createdAt: new Date(),
+          ttl: ONE_HOUR_MS,
+        },
+      },
+      indexConfig: {
+        entity: 'cache',
+        indexes: [{ name: 'key_key2', PK: ['.key', '.key2'] }],
+      },
+      context: {},
+    });
+
+    expect(result.error).toBeUndefined();
+    expect(result.item).toMatchObject({
+      key,
+      key2,
+      ttl: ONE_HOUR_MS,
+      value: [attempt, attempt2],
+    });
+  });
+
   describe('deepObjects', () => {
     test('$set', async () => {
       await create();

diff --git a/packages/mongo/src/parseMongoUpdateExpression.ts b/packages/mongo/src/parseMongoUpdateExpression.ts
@@ -1,3 +1 @@
-import { parseAggioUpdateExpression } from '@powership/transporter';
-
-export const parseMongoUpdateExpression = parseAggioUpdateExpression;
+export { parseMongoUpdateExpression } from '@powership/transporter';
diff --git a/packages/plugin-engine/package.json b/packages/plugin-engine/package.json
@@ -1,6 +1,6 @@
 {
   "name": "plugin-engine",
-  "version": "5.7.12",
+  "version": "5.7.14",
   "type": "module",
   "main": "./out/index.cjs",
   "module": "./out/index.mjs",

diff --git a/packages/powership/package.json b/packages/powership/package.json
@@ -1,6 +1,6 @@
 {
   "name": "powership",
-  "version": "5.7.12",
+  "version": "5.7.14",
   "author": "antoniopresto <[email protected]>",
   "type": "module",
   "main": "./out/index.cjs",

diff --git a/packages/runmate/package.json b/packages/runmate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "runmate",
-  "version": "5.7.12",
+  "version": "5.7.14",
   "typings": "out",
   "author": "antoniopresto <[email protected]>",
   "license": "MIT",
@@ -74,7 +74,7 @@
     "eslint-plugin-sort-keys-fix": "1.1.2",
     "eslint-plugin-typescript-sort-keys": "3.2.0",
     "jest": "29.7.0",
-    "nodemon": "2.0.20",
+    "nodemon": "3.1.7",
     "npm-run-all": "4.1.5",
     "prettier": "2.8.8",
     "prettier-plugin-multiline-arrays": "3.0.4",

diff --git a/packages/schema/package.json b/packages/schema/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@powership/schema",
-  "version": "5.7.12",
+  "version": "5.7.14",
   "type": "module",
   "main": "./out/index.cjs",
   "module": "./out/index.mjs",
@@ -90,7 +90,7 @@
     "graphql": "16.9.0",
     "jest": "29.7.0",
     "madge": "8.0.0",
-    "nodemon": "2.0.20",
+    "nodemon": "3.1.7",
     "npm-run-all": "4.1.5",
     "prettier": "2.8.8",
     "prettier-plugin-multiline-arrays": "3.0.4",

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@powership/server",
-  "version": "5.7.12",
+  "version": "5.7.14",
   "type": "module",
   "main": "./out/index.cjs",
   "module": "./out/index.mjs",

diff --git a/packages/transporter/package.json b/packages/transporter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@powership/transporter",
-  "version": "5.7.12",
+  "version": "5.7.14",
   "type": "module",
   "main": "./out/index.cjs",
   "module": "./out/index.mjs",
@@ -24,6 +24,7 @@
     "build": "run-p declarations build:*",
     "clear": "rimraf out",
     "fix": "run-s fix:* ",
+    "watch": "nodemon --watch 'src/**/*' -e ts,tsx --exec 'pnpm run build'",
     "fix:prettier": "prettier \"src/**/*.ts\" --write",
     "fix:lint": "eslint src --ext .ts --fix",
     "prepublishOnly": "run-s build fix && run-p test",
@@ -56,12 +57,12 @@
     "sift": "17.0.1"
   },
   "devDependencies": {
-    "@powership/boilerplate": "workspace:*",
     "@babel/cli": "7.24.8",
     "@babel/plugin-transform-typescript": "7.24.8",
     "@babel/preset-env": "7.24.8",
     "@babel/preset-typescript": "7.24.7",
     "@powership/babel-plugins": "workspace:*",
+    "@powership/boilerplate": "workspace:*",
     "@types/jest": "29.5.12",
     "@types/node": "20.11.25",
     "@typescript-eslint/eslint-plugin": "7.17.0",
@@ -79,6 +80,7 @@
     "mongodb": "6.4.0",
     "mongodb-memory-server": "10.1.2",
     "mongodb-memory-server-core": "10.1.2",
+    "nodemon": "3.1.7",
     "npm-run-all": "4.1.5",
     "prettier": "2.8.8",
     "prettier-plugin-multiline-arrays": "3.0.4",
@@ -97,6 +99,5 @@
     "readmeFile": "./README.md",
     "displayName": "Transporter - Base to connect any Database to Powership.",
     "tsconfig": "./tsconfig.module.json"
-  },
-  "peerDependencies": {}
+  }
 }
diff --git a/packages/transporter/src/index.ts b/packages/transporter/src/index.ts
@@ -13,4 +13,4 @@ export * from './createDocumentIndexBasedFilters';
 export * from './encodeIndexValue';
 export * from './parseEntityIndexFields';
 export * from './parseAggioAttributeFilters';
-export * from './parseAggioUpdateExpression';
+export * from './parseMongoUpdateExpression';