@better-giving/fundraiser 3.0.13 → 3.0.15

package/dist/db.mjs

@@ -1,5 +1,5 @@
-import { BatchGetCommand, QueryCommand, UpdateCommand, } from "@aws-sdk/lib-dynamodb";
-import { Db, UpdateBuilder } from "@better-giving/db";
+import { BatchGetCommand, GetCommand, QueryCommand, UpdateCommand, } from "@aws-sdk/lib-dynamodb";
+import { Db, UpdateBuilder, } from "@better-giving/db";
 import { UUID_REGEX } from "valibot";
 export class FundDb extends Db {
     static table = "funds";
@@ -24,24 +24,30 @@ export class FundDb extends Db {
     }
     /**@param id - slug or uuid */
     async fund(id) {
-        const q = {
-            TableName: FundDb.table,
-            Limit: 1,
-        };
+        let item;
         if (UUID_REGEX.test(id)) {
-            q.KeyConditionExpression = "PK = :PK AND SK = :SK";
-            q.ExpressionAttributeValues = this.key_fund(id);
+            const cmd = new GetCommand({
+                TableName: FundDb.table,
+                Key: this.key_fund(id),
+            });
+            const res = await this.client.send(cmd);
+            item = res.Item;
         }
         else {
-            q.IndexName = FundDb.slug_env_gsi;
-            q.KeyConditionExpression = "slug = :slug AND env = :env";
-            q.ExpressionAttributeValues = {
-                ":slug": id,
-                ":env": this.env,
-            };
+            const cmd = new QueryCommand({
+                TableName: FundDb.table,
+                Limit: 1,
+                IndexName: FundDb.slug_env_gsi,
+                KeyConditionExpression: "slug = :slug AND env = :env",
+                ExpressionAttributeValues: {
+                    ":slug": id,
+                    ":env": this.env,
+                },
+            });
+            const { Items: i = [] } = await this.client.send(cmd);
+            item = i[0];
         }
-        const { Items: i = [] } = await this.client.send(new QueryCommand(q));
-        return i[0] && this.sans_keys(i[0]);
+        return item && this.sans_keys(item);
     }
     async funds_get(ids) {
         const cmd = new BatchGetCommand({

package/dist/index.d.mts

@@ -1,5 +1,9 @@
+import type { IPageNumbered } from "@better-giving/types/api";
+import type { CloudsearchFund } from "./cloudsearch.mjs";
 export type { CloudsearchFund as FundItem } from "./cloudsearch.mjs";
 export type { IFundNew, IFundUpdate, IFundsNpoMemberOfSearchObj, IFundsSearchObj, DonateMethodId, Environment, } from "./schema.mjs";
 export { MAX_EXPIRATION } from "./schema.mjs";
 export type * from "./interfaces.mjs";
 export { FundDb } from "./db.mjs";
+export interface IFundsPage extends IPageNumbered<CloudsearchFund> {
+}

package/dist/interfaces.d.mts

@@ -1,6 +1,4 @@
 import type { DonateMethodId, Environment } from "@better-giving/schemas";
-import type { IPageNumbered } from "@better-giving/types/api";
-import type { CloudsearchFund } from "./cloudsearch.mjs";
 import type { IFundNew } from "./schema.mjs";
 export interface IFundSettings {
     hide_bg_tip: boolean;
@@ -24,5 +22,3 @@ export interface IFundInternal extends IFundCreator {
 }
 export interface IFund extends IFundNew, IFundInternal {
 }
-export interface IFundsPage extends IPageNumbered<CloudsearchFund> {
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-giving/fundraiser",
-  "version": "3.0.13",
+  "version": "3.0.15",
   "peerDependencies": {
     "valibot": "0.42.0",
     "@better-giving/schemas": "2.0.0",

package/src/db.mts

@@ -1,10 +1,15 @@
 import {
   BatchGetCommand,
+  GetCommand,
   QueryCommand,
-  type QueryCommandInput,
   UpdateCommand,
 } from "@aws-sdk/lib-dynamodb";
-import { Db, type TxType, UpdateBuilder } from "@better-giving/db";
+import {
+  Db,
+  type TRecord,
+  type TxType,
+  UpdateBuilder,
+} from "@better-giving/db";
 import { UUID_REGEX } from "valibot";
 import type { IFund } from "./interfaces.mjs";
 import type { IFundUpdate } from "./schema.mjs";
@@ -32,24 +37,29 @@ export class FundDb extends Db {
   }
   /**@param id - slug or uuid */
   async fund(id: string): Promise<IFund | undefined> {
-    const q: QueryCommandInput = {
-      TableName: FundDb.table,
-      Limit: 1,
-    };
+    let item: TRecord | undefined;
     if (UUID_REGEX.test(id)) {
-      q.KeyConditionExpression = "PK = :PK AND SK = :SK";
-      q.ExpressionAttributeValues = this.key_fund(id);
+      const cmd = new GetCommand({
+        TableName: FundDb.table,
+        Key: this.key_fund(id),
+      });
+      const res = await this.client.send(cmd);
+      item = res.Item;
     } else {
-      q.IndexName = FundDb.slug_env_gsi;
-      q.KeyConditionExpression = "slug = :slug AND env = :env";
-      q.ExpressionAttributeValues = {
-        ":slug": id,
-        ":env": this.env,
-      };
+      const cmd = new QueryCommand({
+        TableName: FundDb.table,
+        Limit: 1,
+        IndexName: FundDb.slug_env_gsi,
+        KeyConditionExpression: "slug = :slug AND env = :env",
+        ExpressionAttributeValues: {
+          ":slug": id,
+          ":env": this.env,
+        },
+      });
+      const { Items: i = [] } = await this.client.send(cmd);
+      item = i[0];
     }
-
-    const { Items: i = [] } = await this.client.send(new QueryCommand(q));
-    return i[0] && this.sans_keys(i[0]);
+    return item && this.sans_keys(item);
   }
 
   async funds_get(ids: string[]): Promise<IFund[]> {

package/src/index.mts

@@ -1,3 +1,6 @@
+import type { IPageNumbered } from "@better-giving/types/api";
+import type { CloudsearchFund } from "./cloudsearch.mjs";
+
 export type { CloudsearchFund as FundItem } from "./cloudsearch.mjs";
 export type {
   IFundNew,
@@ -10,3 +13,5 @@ export type {
 export { MAX_EXPIRATION } from "./schema.mjs";
 export type * from "./interfaces.mjs";
 export { FundDb } from "./db.mjs";
+
+export interface IFundsPage extends IPageNumbered<CloudsearchFund> {}

package/src/interfaces.mts

@@ -1,6 +1,4 @@
 import type { DonateMethodId, Environment } from "@better-giving/schemas";
-import type { IPageNumbered } from "@better-giving/types/api";
-import type { CloudsearchFund } from "./cloudsearch.mjs";
 import type { IFundNew } from "./schema.mjs";
 
 export interface IFundSettings {
@@ -27,5 +25,3 @@ export interface IFundInternal extends IFundCreator {
 }
 
 export interface IFund extends IFundNew, IFundInternal {}
-
-export interface IFundsPage extends IPageNumbered<CloudsearchFund> {}