fix: cosmos select with join

effect-ts-app · Dec 11, 2023 · e0a9587 · e0a9587
1 parent 194f39b
commit e0a9587
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 31 deletions.
diff --git a/.changeset/pink-pumas-accept.md b/.changeset/pink-pumas-accept.md
@@ -0,0 +1,5 @@
+---
+"@effect-app/infra": patch
+---
+
+fix: cosmos select query when using join
diff --git a/packages/infra/_src/services/Repository.ts b/packages/infra/_src/services/Repository.ts
@@ -97,7 +97,7 @@ export function projectEffect<
     E,
     {
       filter?: QueryBuilder<PM>
-      select: readonly U[]
+      select: NonEmptyReadonlyArray<U>
       limit?: number
       skip?: number
     }
@@ -119,7 +119,7 @@ export function projectEffect<
     E,
     {
       filter?: Filter<PM>
-      select?: readonly U[]
+      select?: NonEmptyReadonlyArray<U>
       collect?: (t: Pick<PM, U>) => Option<S>
       limit?: number
       skip?: number
@@ -164,7 +164,7 @@ export function project<
   self: RepositoryBaseC<T, PM, Evt, ItemType>,
   map: {
     filter?: QueryBuilder<PM>
-    select: readonly U[]
+    select: NonEmptyReadonlyArray<U>
     limit?: number
     skip?: number
   }
@@ -180,7 +180,7 @@ export function project<
   self: RepositoryBaseC<T, PM, Evt, ItemType>,
   map: {
     filter?: Filter<PM>
-    select?: readonly U[]
+    select?: NonEmptyReadonlyArray<U>
     collect?: (t: Pick<PM, U>) => Option<S>
     limit?: number
     skip?: number

diff --git a/packages/infra/_src/services/Store/Cosmos.ts b/packages/infra/_src/services/Store/Cosmos.ts
@@ -279,28 +279,41 @@ export function makeCosmosStore({ prefix }: StorageConfig) {
                       )
                   )
                   .map((_) => _.flatMap((_) => _))
-                : Effect(
-                  filter.type === "new-kid"
-                    ? buildWhereCosmosQuery3(
-                      filter.build(),
-                      name,
-                      importedMarkerId,
-                      f.select as string[] | undefined,
-                      skip,
-                      limit
-                    )
-                    : buildCosmosQuery(filter, name, importedMarkerId, skip, limit)
-                )
-                  .tap((q) => logQuery(q))
-                  .flatMap((q) =>
-                    Effect.promise(() =>
-                      container
-                        .items
-                        .query<M>(q)
-                        .fetchAll()
-                        .then(({ resources }) => resources)
-                    )
+                : (filter.type === "new-kid"
+                  ? Effect(buildWhereCosmosQuery3(
+                    filter.build(),
+                    name,
+                    importedMarkerId,
+                    f.select as NonEmptyReadonlyArray<string> | undefined,
+                    skip,
+                    limit
                   ))
+                    .flatMap((q) =>
+                      Effect.promise(() =>
+                        f.select
+                          ? container
+                            .items
+                            .query<M>(q)
+                            .fetchAll()
+                            .then(({ resources }) => resources)
+                          : container
+                            .items
+                            .query<{ f: M }>(q)
+                            .fetchAll()
+                            .then(({ resources }) => resources.map((_) => _.f))
+                      )
+                    )
+                  : Effect(buildCosmosQuery(filter, name, importedMarkerId, skip, limit))
+                    .tap((q) => logQuery(q))
+                    .flatMap((q) =>
+                      Effect.promise(() =>
+                        container
+                          .items
+                          .query<{ f: M }>(q)
+                          .fetchAll()
+                          .then(({ resources }) => resources.map((_) => _.f))
+                      )
+                    )))
                 .withSpan("Cosmos.filter [effect-app/infra/Store]", {
                   attributes: { "repository.container_id": containerId, "repository.model_name": name }
                 })

diff --git a/packages/infra/_src/services/Store/Cosmos/query.ts b/packages/infra/_src/services/Store/Cosmos/query.ts
@@ -82,7 +82,7 @@ export function buildLegacyCosmosQuery<PM>(
   const lm = skip !== undefined || limit !== undefined ? `OFFSET ${skip ?? 0} LIMIT ${limit ?? 999999}` : ""
   return {
     query: `
-    SELECT *
+    SELECT f
     FROM ${name} f
     WHERE f.id != @id AND f.${
       String(
@@ -114,7 +114,7 @@ export function buildWhereCosmosQuery(
   const lm = skip !== undefined || limit !== undefined ? `OFFSET ${skip ?? 0} LIMIT ${limit ?? 999999}` : ""
   return {
     query: `
-    SELECT *
+    SELECT f
     FROM ${name} f
     ${
       filter
@@ -227,7 +227,7 @@ export function buildWhereCosmosQuery3(
   filter: readonly FilterResult[],
   name: string,
   importedMarkerId: string,
-  select?: readonly string[],
+  select?: NonEmptyReadonlyArray<string>,
   skip?: number,
   limit?: number
 ) {
@@ -362,8 +362,8 @@ export function buildWhereCosmosQuery3(
     query: `
     SELECT ${
       select
-        ? `VALUE {\n${select.map((_) => `${_}: f.${_}`).join(",\n")}\n}`
-        : "*"
+        ? `${select.map((_) => `f.${_}`).join(", ")}\n}`
+        : "f"
     }
     FROM ${name} f
 

diff --git a/packages/infra/_src/services/Store/service.ts b/packages/infra/_src/services/Store/service.ts
@@ -67,7 +67,7 @@ export type FilterJoinSelect = {
 
 export interface FilterArgs<PM extends PersistenceModelType<string>, U extends keyof PM = never> {
   filter?: Filter<PM>
-  select?: readonly U[]
+  select?: NonEmptyReadonlyArray<U>
   limit?: number
   skip?: number
 }