refactor: filter recordIds method (#661)

apps/nestjs-backend/src/features/record/open-api/record-open-api.service.ts

@@ -1,4 +1,4 @@
-import { BadRequestException, Injectable } from '@nestjs/common';
+import { Injectable, NotFoundException } from '@nestjs/common';
 import { FieldKeyType } from '@teable/core';
 import { PrismaService } from '@teable/db-main-prisma';
 import type {
@@ -129,7 +129,11 @@ export class RecordOpenApiService {
  });
 
  if (usedFields.length !== usedFieldIdsOrNames.length) {
- throw new BadRequestException('some fields not found');
+ const usedSet = new Set(map(usedFields, fieldKeyType));
+ const missedFields = usedFieldIdsOrNames.filter(
+ (fieldIdOrName) => !usedSet.has(fieldIdOrName)
+ );
+ throw new NotFoundException(`Field ${fieldKeyType}: ${missedFields.join()} not found`);
  }
  return map(usedFields, createFieldInstanceByRaw);
  }

apps/nestjs-backend/src/features/record/record.service.ts

@@ -1007,7 +1007,11 @@ export class RecordService {
  return this.prismaService.txClient().$queryRawUnsafe<{ id: string; title: string }[]>(querySql);
  }
 
- async getDiffIdsByIdAndFilter(tableId: string, recordIds: string[], filter?: IFilter | null) {
+ async filterRecordIdsByFilter(
+ tableId: string,
+ recordIds: string[],
+ filter?: IFilter | null
+ ): Promise<string[]> {
  const { queryBuilder, dbTableName } = await this.buildFilterSortQuery(tableId, {
  filter,
  });
@@ -1017,7 +1021,11 @@ export class RecordService {
  const result = await this.prismaService
  .txClient()
  .$queryRawUnsafe<{ __id: string }[]>(queryBuilder.toQuery());
- const ids = result.map((r) => r.__id);
+ return result.map((r) => r.__id);
+ }
+
+ async getDiffIdsByIdAndFilter(tableId: string, recordIds: string[], filter?: IFilter | null) {
+ const ids = await this.filterRecordIdsByFilter(tableId, recordIds, filter);
  return difference(recordIds, ids);
  }
 }