chore: remove db query spec handler

undb-io · Jan 10, 2025 · fbf55c5 · fbf55c5
1 parent f54b0c4
commit fbf55c5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 34 deletions.
diff --git a/packages/persistence/src/table/table-db.query-spec-handler.ts b/packages/persistence/src/table/table-db.query-spec-handler.ts
diff --git a/packages/persistence/src/table/table.filter-visitor.ts b/packages/persistence/src/table/table.filter-visitor.ts
@@ -1,7 +1,9 @@
+import type { Option } from "@undb/domain"
 import type {
   DuplicatedTableSpecification,
   ITableSpecVisitor,
   TableBaseIdSpecification,
+  TableComositeSpecification,
   TableDo,
   TableFormsSpecification,
   TableIdSpecification,
@@ -53,6 +55,13 @@ export class TableFilterVisitor extends AbstractQBVisitor<TableDo> implements IT
       this.addCond(this.eb.eb("undb_table.space_id", "=", spaceId))
     }
   }
+  $where(spec: Option<TableComositeSpecification>) {
+    if (spec.isSome()) {
+      spec.unwrap().accept(this)
+    }
+
+    return this.cond
+  }
   withSpaceId(id: TableSpaceIdSpecification): void {
     this.addCond(this.eb.eb("undb_table.space_id", "=", id.spaceId))
   }

diff --git a/packages/persistence/src/table/table.query-repository.ts b/packages/persistence/src/table/table.query-repository.ts
@@ -10,7 +10,7 @@ import {
 } from "@undb/table"
 import { injectQueryBuilder } from "../qb.provider"
 import type { IQueryBuilder } from "../qb.type"
-import { TableDbQuerySpecHandler } from "./table-db.query-spec-handler"
+import { TableFilterVisitor } from "./table.filter-visitor"
 import { TableMapper } from "./table.mapper"
 import { TableReferenceVisitor } from "./table.reference-visitor"
 
@@ -32,7 +32,7 @@ export class TableQueryRepository implements ITableQueryRepository {
       .selectFrom("undb_table")
       .selectAll()
       .$if(spec.isSome(), (qb) => new TableReferenceVisitor(qb).call(spec.unwrap()))
-      .where((eb) => new TableDbQuerySpecHandler(this.qb, eb, this.context.mustGetCurrentSpaceId()).handle(spec))
+      .where((eb) => new TableFilterVisitor(this.qb, eb, this.context.mustGetCurrentSpaceId()).$where(spec))
       .execute()
 
     return tbs.map((r) => this.mapper.toDTO(r))
@@ -43,7 +43,7 @@ export class TableQueryRepository implements ITableQueryRepository {
       .selectFrom("undb_table")
       .selectAll()
       .$call((qb) => new TableReferenceVisitor(qb).call(spec))
-      .where((eb) => new TableDbQuerySpecHandler(this.qb, eb, this.context.mustGetCurrentSpaceId()).handle(Some(spec)))
+      .where((eb) => new TableFilterVisitor(this.qb, eb, this.context.mustGetCurrentSpaceId()).$where(Some(spec)))
       .executeTakeFirst()
 
     return tb ? Some(this.mapper.toDTO(tb)) : None
@@ -55,7 +55,7 @@ export class TableQueryRepository implements ITableQueryRepository {
       .selectFrom("undb_table")
       .selectAll()
       .$call((qb) => new TableReferenceVisitor(qb).call(spec.unwrap()))
-      .where((eb) => new TableDbQuerySpecHandler(this.qb, eb, this.context.mustGetCurrentSpaceId()).handle(spec))
+      .where((eb) => new TableFilterVisitor(this.qb, eb, this.context.mustGetCurrentSpaceId()).$where(spec))
       .executeTakeFirst()
 
     return tb ? Some(this.mapper.toDTO(tb)) : None

diff --git a/packages/persistence/src/table/table.repository.ts b/packages/persistence/src/table/table.repository.ts
@@ -18,7 +18,7 @@ import { injectQueryBuilder } from "../qb.provider"
 import type { IQueryBuilder } from "../qb.type"
 import { json } from "../qb.util"
 import { UnderlyingTableService } from "../underlying/underlying-table.service"
-import { TableDbQuerySpecHandler } from "./table-db.query-spec-handler"
+import { TableFilterVisitor } from "./table.filter-visitor"
 import { TableMapper } from "./table.mapper"
 import { TableMutationVisitor } from "./table.mutation-visitor"
 import { TableReferenceVisitor } from "./table.reference-visitor"
@@ -179,9 +179,7 @@ export class TableRepository implements ITableRepository {
       .selectFrom("undb_table")
       .selectAll("undb_table")
       .$if(spec.isSome(), (qb) => new TableReferenceVisitor(qb).call(spec.unwrap()))
-      .where((eb) =>
-        new TableDbQuerySpecHandler(tx, eb, this.context.mustGetCurrentSpaceId(), ignoreSpace).handle(spec),
-      )
+      .where((eb) => new TableFilterVisitor(tx, eb, this.context.mustGetCurrentSpaceId(), ignoreSpace).$where(spec))
     const tbs = await query.execute()
 
     return tbs.map((t) => this.mapper.toDo(t))
@@ -193,7 +191,7 @@ export class TableRepository implements ITableRepository {
       .selectFrom("undb_table")
       .selectAll("undb_table")
       .$if(spec.isSome(), (qb) => new TableReferenceVisitor(qb).call(spec.unwrap()))
-      .where((eb) => new TableDbQuerySpecHandler(tx, eb, this.context.mustGetCurrentSpaceId()).handle(spec))
+      .where((eb) => new TableFilterVisitor(tx, eb, this.context.mustGetCurrentSpaceId()).$where(spec))
       .executeTakeFirst()
 
     if (!tb) {
@@ -210,7 +208,7 @@ export class TableRepository implements ITableRepository {
       .selectFrom("undb_table")
       .selectAll("undb_table")
       .$call((qb) => new TableReferenceVisitor(qb).call(spec.unwrap()))
-      .where((eb) => new TableDbQuerySpecHandler(tx, eb, this.context.mustGetCurrentSpaceId()).handle(spec))
+      .where((eb) => new TableFilterVisitor(tx, eb, this.context.mustGetCurrentSpaceId()).$where(spec))
       .executeTakeFirst()
 
     return tb ? Some(this.mapper.toDo(tb)) : None
@@ -223,7 +221,7 @@ export class TableRepository implements ITableRepository {
       .selectFrom("undb_table")
       .selectAll("undb_table")
       .$call((qb) => new TableReferenceVisitor(qb).call(spec.unwrap()))
-      .where((eb) => new TableDbQuerySpecHandler(tx, eb, this.context.mustGetCurrentSpaceId()).handle(spec))
+      .where((eb) => new TableFilterVisitor(tx, eb, this.context.mustGetCurrentSpaceId()).$where(spec))
       .execute()
 
     return tbs.map((t) => this.mapper.toDo(t))