fix(registry server): change upsert constaint from route,namespace to orderPos,namespace

Author: stas-nc

registry/server/appRoutes/routes/RoutesService.ts

@@ -55,7 +55,7 @@ export class RoutesService {
         await this.db.versioning(user, { type: EntityTypes.routes, trxProvider }, async (trx) => {
             const result = await this.db(Tables.Routes)
                 .insert(prepareAppRouteToSave(appRoute), 'id')
-                .onConflict(this.db.raw('(route, namespace) WHERE namespace IS NOT NULL'))
+                .onConflict(this.db.raw('("orderPos", namespace) WHERE namespace IS NOT NULL'))
                 .merge()
                 .transacting(trx);
             const savedAppRouteId = extractInsertedId(result as { id: number }[]);

registry/server/migrations/20250313162453_unique_route_v2.ts

@@ -0,0 +1,23 @@
+import type { Knex } from 'knex';
+import { isMySQL } from '../util/db';
+
+export async function up(knex: Knex): Promise<void> {
+    await knex.schema.alterTable('routes', (table) => {
+        table.dropIndex(['route', 'namespace'], 'route_unique');
+    });
+    if (!isMySQL(knex)) {
+        // TODO remove condition WHERE namespace IS NOT NULL when everything migrated
+        await knex.raw('CREATE UNIQUE INDEX route_unique ON routes("orderPos", namespace) WHERE namespace IS NOT NULL');
+    }
+}
+
+export async function down(knex: Knex): Promise<void> {
+    await knex.schema.alterTable('routes', (table) => {
+        table.dropIndex(['orderPos', 'namespace'], 'route_unique');
+    });
+    // MySQL does not support partial index
+    if (!isMySQL(knex)) {
+        // TODO remove condition WHERE namespace IS NOT NULL when everything migrated
+        await knex.raw('CREATE UNIQUE INDEX route_unique ON routes(route, namespace) WHERE namespace IS NOT NULL');
+    }
+}

…/tests/services/RoutesRepository.spec.ts …try/tests/services/RoutesService.spec.tsregistry/tests/services/RoutesRepository.spec.ts renamed to registry/tests/services/RoutesService.spec.ts registry/tests/services/RoutesRepository.spec.ts renamed to registry/tests/services/RoutesService.spec.ts

@@ -76,13 +76,13 @@ describe('RoutesService', () => {
             });
             const service = new RoutesService(db);
             const trxProvider = db.transactionProvider();
-            await service.upsert({ ...appRoute, route: '/upsert2', namespace: 'ns1', orderPos: 22 }, user, trxProvider);
+            await service.upsert({ ...appRoute, route: '/upsert22', namespace: 'ns1', orderPos: 2 }, user, trxProvider);
             const trx = await trxProvider();
             await trx.commit();
-            const route = await db(Tables.Routes).first().where({ route: '/upsert2' });
+            const route = await db(Tables.Routes).first().where({ orderPos: 2 });
             expect(route).to.deep.include({
-                orderPos: 22,
-                route: '/upsert2',
+                orderPos: 2,
+                route: '/upsert22',
                 next: 0,
                 meta: '{"a":1}',
                 domainId: null,
@@ -126,9 +126,9 @@ describe('RoutesService', () => {
             await service.upsert(
                 {
                     ...appRoute,
-                    route: '/upsert3',
+                    route: '/upsert33',
                     namespace: 'ns1',
-                    orderPos: 33,
+                    orderPos: 3,
                     slots: {
                         upsert3: {
                             appName: '@portal/upsert',