fix: record history functionality in SQLite database (#873)

* fix: record history functionality in SQLite database * fix: the error issue when dragging Kanban cards to an empty stack * chore: remove transcation
teableio · Sep 1, 2024 · b39c912 · b39c912
1 parent fbec49a
commit b39c912
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 25 deletions.
diff --git a/apps/nestjs-backend/src/event-emitter/listeners/record-history.listener.ts b/apps/nestjs-backend/src/event-emitter/listeners/record-history.listener.ts
@@ -1,30 +1,33 @@
+/* eslint-disable @typescript-eslint/naming-convention */
 import { Injectable } from '@nestjs/common';
 import { OnEvent } from '@nestjs/event-emitter';
 import type { ISelectFieldOptions } from '@teable/core';
-import { FieldType } from '@teable/core';
-import type { Prisma, Field } from '@teable/db-main-prisma';
+import { FieldType, generateRecordHistoryId } from '@teable/core';
 import { PrismaService } from '@teable/db-main-prisma';
+import type { Field } from '@teable/db-main-prisma';
+import { Knex } from 'knex';
 import { isString } from 'lodash';
+import { InjectModel } from 'nest-knexjs';
 import { Events, RecordUpdateEvent } from '../events';
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 const SELECT_FIELD_TYPE_SET = new Set([FieldType.SingleSelect, FieldType.MultipleSelect]);
 
 @Injectable()
 export class RecordHistoryListener {
-  constructor(private readonly prismaService: PrismaService) {}
+  constructor(
+    private readonly prismaService: PrismaService,
+    @InjectModel('CUSTOM_KNEX') private readonly knex: Knex
+  ) {}
 
   @OnEvent(Events.TABLE_RECORD_UPDATE, { async: true })
   async recordUpdateListener(event: RecordUpdateEvent) {
     const { payload, context } = event;
     const { user } = context;
     const { tableId, oldField: _oldField } = payload;
-    let records = payload.record;
     const userId = user?.id;
-
-    if (!Array.isArray(records)) {
-      records = [records];
-    }
+    const payloadRecord = payload.record;
+    const records = !Array.isArray(payloadRecord) ? [payloadRecord] : payloadRecord;
 
     const fieldIdSet = new Set<string>();
 
@@ -63,7 +66,15 @@ export class RecordHistoryListener {
 
     for (let i = 0; i < totalCount; i += batchSize) {
       const batch = records.slice(i, i + batchSize);
-      const recordHistoryList: Prisma.RecordHistoryCreateManyInput[] = [];
+      const recordHistoryList: {
+        id: string;
+        table_id: string;
+        record_id: string;
+        field_id: string;
+        before: string;
+        after: string;
+        created_by: string;
+      }[] = [];
 
       batch.forEach((record) => {
         const { id: recordId, fields } = record;
@@ -82,9 +93,10 @@ export class RecordHistoryListener {
           }
 
           recordHistoryList.push({
-            tableId,
-            recordId,
-            fieldId,
+            id: generateRecordHistoryId(),
+            table_id: tableId,
+            record_id: recordId,
+            field_id: fieldId,
             before: JSON.stringify({
               meta: {
                 type: oldField.type,
@@ -103,14 +115,14 @@ export class RecordHistoryListener {
               },
               data: newValue,
             }),
-            createdBy: userId as string,
+            created_by: userId as string,
           });
         });
       });
 
-      await this.prismaService.recordHistory.createMany({
-        data: recordHistoryList,
-      });
+      const query = this.knex.insert(recordHistoryList).into('record_history').toQuery();
+
+      await this.prismaService.$executeRawUnsafe(query);
     }
   }
 

diff --git a/apps/nestjs-backend/test/record.e2e-spec.ts b/apps/nestjs-backend/test/record.e2e-spec.ts
@@ -296,7 +296,7 @@ describe('OpenAPI RecordController (e2e)', () => {
     });
   });
 
-  describe.skipIf(globalThis.testConfig.driver === DriverClient.Sqlite)('record history', () => {
+  describe('record history', () => {
     let mainTable: ITableFullVo;
     let foreignTable: ITableFullVo;
 

diff --git a/apps/nextjs-app/src/features/app/blocks/view/kanban/components/KanbanContainer.tsx b/apps/nextjs-app/src/features/app/blocks/view/kanban/components/KanbanContainer.tsx
@@ -121,14 +121,16 @@ export const KanbanContainer = () => {
       };
 
       // Drag a card to the end of another stack
-      if (targetCardId == null && targetIndex !== 0) {
-        const lastTargetCardId = targetCards?.[targetIndex - 1]?.id;
-        if (lastTargetCardId != null) {
-          recordRo.order = {
-            viewId,
-            anchorId: lastTargetCardId,
-            position: 'after',
-          };
+      if (targetCardId == null) {
+        if (targetIndex !== 0) {
+          const lastTargetCardId = targetCards?.[targetIndex - 1]?.id;
+          if (lastTargetCardId != null) {
+            recordRo.order = {
+              viewId,
+              anchorId: lastTargetCardId,
+              position: 'after',
+            };
+          }
         }
       } else {
         recordRo.order = {

diff --git a/packages/core/src/utils/id-generator.ts b/packages/core/src/utils/id-generator.ts
@@ -35,6 +35,8 @@ export enum IdPrefix {
   OAuthClient = 'clt',
 
   Window = 'win',
+
+  RecordHistory = 'rhi',
 }
 
 const chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
@@ -146,3 +148,7 @@ export function generateLicenseId() {
 export function generateClientId() {
   return IdPrefix.OAuthClient + getRandomString(16).toLocaleLowerCase();
 }
+
+export function generateRecordHistoryId() {
+  return IdPrefix.RecordHistory + getRandomString(24);
+}