Merge branch 'main' into DLAPI-500-add-filters-to-delete-entry

Author: stepanenkoxx

api/controllers.ts

@@ -24,3 +24,4 @@ export {
     resolveTenantController,
     requestSchema as resolveTenantRequestSchema,
 } from '../src/controllers/tenants/resolve-tenant';
+export {operation as operationModel} from '../src/controllers/response-models/operation';

src/components/zod/custom-types/limited-object.ts

@@ -10,5 +10,6 @@ export const limitedObject = ({limit}: {limit: number}) =>
         },
         {
             message: `Object can't contain more than ${limit} characters`,
+            params: {code: 'OBJECT_SIZE_LIMIT_EXCEEDED'},
         },
     );

src/const/common.ts

@@ -153,6 +153,7 @@ export const ENCODED_ID_LENGTH = 13;
 export const MAX_META_OBJECT_SYMBOLS = 2000;
 export const MAX_UNVERSIONED_DATA_OBJECT_SYMBOLS = 5000;
 export const MAX_BRANDING_OBJECT_SYMBOLS = 15000;
+export const MAX_STATE_DATA_OBJECT_SYMBOLS = 50000;
 
 export const AJV_PATTERN_KEYS_NOT_OBJECT = {
     '.*': {

src/controllers/states/create-state.ts

@@ -2,7 +2,7 @@ import {AppRouteHandler} from '@gravity-ui/expresskit';
 
 import {ApiTag} from '../../components/api-docs';
 import {makeReqParser, z, zc} from '../../components/zod';
-import {CONTENT_TYPE_JSON} from '../../const';
+import {CONTENT_TYPE_JSON, MAX_STATE_DATA_OBJECT_SYMBOLS} from '../../const';
 import {createState} from '../../services/new/state';
 
 import {stateHashModel} from './response-models';
@@ -12,7 +12,9 @@ const requestSchema = {
         entryId: zc.encodedId(),
     }),
     body: z.object({
-        data: z.record(z.string(), z.unknown()),
+        data: zc.limitedObject({
+            limit: MAX_STATE_DATA_OBJECT_SYMBOLS,
+        }),
     }),
 };
 

src/db/migrations/20250909150341_add_tenant_id_to_user_settings.ts

@@ -0,0 +1,15 @@
+import type {Knex} from 'knex';
+
+export async function up(knex: Knex): Promise<void> {
+    await knex.raw(`
+        ALTER TABLE user_settings 
+            ADD COLUMN tenant_id TEXT NOT NULL DEFAULT 'common' 
+            REFERENCES tenants (tenant_id) ON UPDATE CASCADE ON DELETE CASCADE;
+    `);
+}
+
+export async function down(knex: Knex): Promise<void> {
+    await knex.raw(`
+        ALTER TABLE user_settings DROP COLUMN tenant_id;
+    `);
+}

src/db/migrations/20250910073942_add_user_settings_tenant_id_user_id_idx.ts

@@ -0,0 +1,17 @@
+import type {Knex} from 'knex';
+
+export async function up(knex: Knex): Promise<void> {
+    await knex.raw(
+        `CREATE UNIQUE INDEX CONCURRENTLY user_settings_user_id_tenant_id_idx ON user_settings (user_id, tenant_id);`,
+    );
+}
+
+export async function down(knex: Knex): Promise<void> {
+    await knex.raw(`
+        DROP INDEX CONCURRENTLY user_settings_user_id_tenant_id_idx;
+    `);
+}
+
+export const config = {
+    transaction: false,
+};

src/db/migrations/20250910091518_change_user_settings_pkey_idx.ts

@@ -0,0 +1,18 @@
+import type {Knex} from 'knex';
+
+export async function up(knex: Knex): Promise<void> {
+    await knex.raw(`
+        ALTER TABLE user_settings DROP CONSTRAINT user_settings_pkey, 
+            ADD CONSTRAINT user_settings_сomposite_pkey 
+            PRIMARY KEY USING INDEX user_settings_user_id_tenant_id_idx;
+    `);
+}
+
+export async function down(knex: Knex): Promise<void> {
+    await knex.raw(`
+        ALTER TABLE user_settings DROP CONSTRAINT user_settings_сomposite_pkey, 
+            ADD CONSTRAINT user_settings_pkey PRIMARY KEY (user_id);
+            
+        CREATE UNIQUE INDEX user_settings_user_id_tenant_id_idx ON user_settings (user_id, tenant_id);
+    `);
+}

src/db/models/new/user-settings/index.ts

@@ -10,6 +10,7 @@ export class UserSettings extends Model {
     }
 
     userId!: string;
+    tenantId!: string;
     settings!: Record<string, unknown>;
     updatedAt!: string;
 }