updates and fixes

* seo friendly urls * custom client serve-static module * database fixes * fix recent pages * other fixes
2024-05-18 03:19:42 +01:00
parent eefe63d1cd
commit 9c7c2f1163
102 changed files with 921 additions and 536 deletions
@@ -0,0 +1,79 @@
+import { Injectable } from '@nestjs/common';
+import { InjectKysely } from 'nestjs-kysely';
+import { KyselyDB, KyselyTransaction } from '../../types/kysely.types';
+import { dbOrTx } from '../../utils';
+import {
+  InsertablePageHistory,
+  Page,
+  PageHistory,
+} from '@docmost/db/types/entity.types';
+import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
+import { executeWithPagination } from '@docmost/db/pagination/pagination';
+import { jsonObjectFrom } from 'kysely/helpers/postgres';
+import { ExpressionBuilder } from 'kysely';
+import { DB } from '@docmost/db/types/db';
+
+@Injectable()
+export class PageHistoryRepo {
+  constructor(@InjectKysely() private readonly db: KyselyDB) {}
+
+  async findById(pageHistoryId: string): Promise<PageHistory> {
+    return await this.db
+      .selectFrom('pageHistory')
+      .selectAll()
+      .select((eb) => this.withLastUpdatedBy(eb))
+      .where('id', '=', pageHistoryId)
+      .executeTakeFirst();
+  }
+
+  async insertPageHistory(
+    insertablePageHistory: InsertablePageHistory,
+    trx?: KyselyTransaction,
+  ): Promise<PageHistory> {
+    const db = dbOrTx(this.db, trx);
+    return db
+      .insertInto('pageHistory')
+      .values(insertablePageHistory)
+      .returningAll()
+      .executeTakeFirst();
+  }
+
+  async saveHistory(page: Page): Promise<void> {
+    await this.insertPageHistory({
+      pageId: page.id,
+      slugId: page.slugId,
+      title: page.title,
+      content: page.content,
+      icon: page.icon,
+      coverPhoto: page.coverPhoto,
+      lastUpdatedById: page.lastUpdatedById ?? page.creatorId,
+      spaceId: page.spaceId,
+      workspaceId: page.workspaceId,
+    });
+  }
+
+  async findPageHistoryByPageId(pageId: string, pagination: PaginationOptions) {
+    const query = this.db
+      .selectFrom('pageHistory')
+      .selectAll()
+      .select((eb) => this.withLastUpdatedBy(eb))
+      .where('pageId', '=', pageId)
+      .orderBy('createdAt', 'desc');
+
+    const result = executeWithPagination(query, {
+      page: pagination.page,
+      perPage: pagination.limit,
+    });
+
+    return result;
+  }
+
+  withLastUpdatedBy(eb: ExpressionBuilder<DB, 'pageHistory'>) {
+    return jsonObjectFrom(
+      eb
+        .selectFrom('users')
+        .select(['users.id', 'users.name', 'users.avatarUrl'])
+        .whereRef('users.id', '=', 'pageHistory.lastUpdatedById'),
+    ).as('lastUpdatedBy');
+  }
+}