space slug

apps/server/src/core/space/services/space.service.ts

@@ -1,4 +1,8 @@
-import { Injectable, NotFoundException } from '@nestjs/common';
+import {
+  BadRequestException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
 import { CreateSpaceDto } from '../dto/create-space.dto';
 import { PaginationOptions } from '../../../helpers/pagination/pagination-options';
 import { PaginationMetaDto } from '../../../helpers/pagination/pagination-meta-dto';
@@ -6,7 +10,6 @@ import { PaginatedResult } from '../../../helpers/pagination/paginated-result';
 import slugify from 'slugify';
 import { SpaceRepo } from '@docmost/db/repos/space/space.repo';
 import { KyselyTransaction } from '@docmost/db/types/kysely.types';
-import { getRandomInt } from '../../../helpers/utils';
 import { Space } from '@docmost/db/types/entity.types';
 
 @Injectable()
@@ -19,11 +22,15 @@ export class SpaceService {
     createSpaceDto: CreateSpaceDto,
     trx?: KyselyTransaction,
   ): Promise<Space> {
-    // until we allow slug in dto
-    let slug = slugify(createSpaceDto.name.toLowerCase());
-    const slugExists = await this.spaceRepo.slugExists(slug, workspaceId);
+    const slug = slugify(
+      createSpaceDto?.slug?.toLowerCase() ?? createSpaceDto.name.toLowerCase(),
+    );
+
+    const slugExists = await this.spaceRepo.slugExists(slug, workspaceId, trx);
     if (slugExists) {
-      slug = `${slug}-${getRandomInt()}`;
+      throw new BadRequestException(
+        'Slug exist. Please use a unique space slug',
+      );
     }
 
     return await this.spaceRepo.insertSpace(

apps/server/src/kysely/repos/space/space.repo.ts

@@ -32,16 +32,25 @@ export class SpaceRepo {
       .executeTakeFirst();
   }
 
-  async slugExists(slug: string, workspaceId: string): Promise<boolean> {
-    let { count } = await this.db
-      .selectFrom('spaces')
-      .select((eb) => eb.fn.count('id').as('count'))
-      .where(sql`LOWER(slug)`, '=', sql`LOWER(${slug})`)
-      .where('workspaceId', '=', workspaceId)
-      .executeTakeFirst();
-    count = count as number;
-
-    return !!count;
+  async slugExists(
+    slug: string,
+    workspaceId: string,
+    trx?: KyselyTransaction,
+  ): Promise<boolean> {
+    return executeTx(
+      this.db,
+      async (trx) => {
+        let { count } = await trx
+          .selectFrom('spaces')
+          .select((eb) => eb.fn.count('id').as('count'))
+          .where(sql`LOWER(slug)`, '=', sql`LOWER(${slug})`)
+          .where('workspaceId', '=', workspaceId)
+          .executeTakeFirst();
+        count = count as number;
+        return count == 0 ? false : true;
+      },
+      trx,
+    );
   }
 
   async updateSpace(