@open-mercato/core 0.6.6-develop.6296.1.5e8bdfee17 → 0.6.6-develop.6299.1.29224e2d86

package/src/modules/configs/migrations/.snapshot-openmercato.json

@@ -43,6 +43,24 @@
           "nullable": true,
           "mappedType": "json"
         },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "uuid"
+        },
+        "tenant_id": {
+          "name": "tenant_id",
+          "type": "uuid",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "mappedType": "uuid"
+        },
         "created_at": {
           "name": "created_at",
           "type": "timestamptz",
@@ -68,15 +86,34 @@
       "schema": "public",
       "indexes": [
         {
-          "keyName": "module_configs_module_name_unique",
+          "keyName": "module_configs_global_unique",
+          "columnNames": [],
+          "composite": false,
+          "constraint": false,
+          "primary": false,
+          "unique": false,
+          "expression": "create unique index \"module_configs_global_unique\" on \"module_configs\" (\"module_id\", \"name\") where \"tenant_id\" is null"
+        },
+        {
+          "keyName": "module_configs_scoped_unique",
+          "columnNames": [],
+          "composite": false,
+          "constraint": false,
+          "primary": false,
+          "unique": false,
+          "expression": "create unique index \"module_configs_scoped_unique\" on \"module_configs\" (\"module_id\", \"name\", \"tenant_id\") where \"tenant_id\" is not null"
+        },
+        {
+          "keyName": "module_configs_module_name_tenant_idx",
           "columnNames": [
             "module_id",
-            "name"
+            "name",
+            "tenant_id"
           ],
           "composite": true,
-          "constraint": true,
+          "constraint": false,
           "primary": false,
-          "unique": true
+          "unique": false
         },
         {
           "keyName": "module_configs_pkey",

package/src/modules/configs/migrations/Migration20260617150000.ts

@@ -0,0 +1,21 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260617150000 extends Migration {
+
+  override async up(): Promise<void> {
+    this.addSql(`alter table "module_configs" add column "organization_id" uuid null, add column "tenant_id" uuid null;`);
+    this.addSql(`alter table "module_configs" drop constraint "module_configs_module_name_unique";`);
+    this.addSql(`create unique index "module_configs_global_unique" on "module_configs" ("module_id", "name") where "tenant_id" is null;`);
+    this.addSql(`create unique index "module_configs_scoped_unique" on "module_configs" ("module_id", "name", "tenant_id") where "tenant_id" is not null;`);
+    this.addSql(`create index "module_configs_module_name_tenant_idx" on "module_configs" ("module_id", "name", "tenant_id");`);
+  }
+
+  override async down(): Promise<void> {
+    this.addSql(`drop index if exists "module_configs_module_name_tenant_idx";`);
+    this.addSql(`drop index if exists "module_configs_scoped_unique";`);
+    this.addSql(`drop index if exists "module_configs_global_unique";`);
+    this.addSql(`alter table "module_configs" add constraint "module_configs_module_name_unique" unique ("module_id", "name");`);
+    this.addSql(`alter table "module_configs" drop column "organization_id", drop column "tenant_id";`);
+  }
+
+}

package/src/modules/customers/api/activities/route.ts

@@ -74,6 +74,12 @@ const ADAPTER_HEADERS = {
 // canonical bridge) read path. Keeps memory bounded on tenants with large
 // activity history; deep-pagination beyond this window is not supported here —
 // use /api/customers/interactions instead.
+//
+// Audited for the #3386 rollout (P2): this merged path sorts only on
+// non-encrypted system timestamps (createdAt/occurredAt, see
+// resolveActivitySortValue), so the #3278 two-phase *encrypted*-sort migration
+// is intentionally not applied here. Merge-order correctness across the page
+// boundary is covered by __tests__/merged-pagination.test.ts.
 const MERGED_ACTIVITY_FETCH_CAP = 2000
 
 type ActivityItem = {