@better-giving/endowment 4.0.12 → 4.0.14

package/dist/db.d.mts

@@ -37,6 +37,7 @@ export declare class NpoDb extends Db {
         gsi1PK: string;
         gsi1SK: string;
     };
+    npos_get<T extends TNpoDbKeys[]>(ids: number[], fields?: T): Promise<TNpoDbProjectedTo<T>[]>;
     npo_count_inc(): Promise<number>;
     npo_media(npo: number, opts: IMediaSearchObj): Promise<IMediaPage>;
     npo_referred_by(id: string): Promise<INpoReferredBy[]>;
@@ -110,6 +111,7 @@ export declare class NpoDb extends Db {
         SK: string;
     };
     prog_milestone_record(prog: string, data: IMilestoneNew): {
+        id: `${string}-${string}-${string}-${string}-${string}`;
         date: string;
         title: string;
         description: string;

package/dist/db.mjs

@@ -1,4 +1,4 @@
-import { DeleteCommand, GetCommand, PutCommand, QueryCommand, TransactWriteCommand, UpdateCommand, } from "@aws-sdk/lib-dynamodb";
+import { BatchGetCommand, DeleteCommand, GetCommand, PutCommand, QueryCommand, TransactWriteCommand, UpdateCommand, } from "@aws-sdk/lib-dynamodb";
 import { Db, Txs, UpdateBuilder } from "@better-giving/db";
 import KSUID from "ksuid";
 import { med_key_filter, med_sk, to_imedia } from "./media.mjs";
@@ -55,6 +55,20 @@ export class NpoDb extends Db {
             gsi1SK: med_sk(id, type, featured),
         };
     }
+    async npos_get(ids, fields) {
+        const { names, expression } = projection(fields);
+        const batch_get = new BatchGetCommand({
+            RequestItems: {
+                [NpoDb.name]: {
+                    Keys: ids.map((id) => this.key_npo(id)),
+                    ProjectionExpression: expression,
+                    ExpressionAttributeNames: names,
+                },
+            },
+        });
+        const { Responses } = await this.client.send(batch_get);
+        return (Responses?.[NpoDb.name] ?? []);
+    }
     async npo_count_inc() {
         const cmd = new UpdateCommand({
             TableName: NpoDb.name,
@@ -152,6 +166,7 @@ export class NpoDb extends Db {
         return {
             ...this.key_prog_milestone(mid, prog),
             ...data,
+            id: mid,
         };
     }
     npo_med_record(npo_id, { featured /** not saved as attribute  */, ...d }) {
@@ -291,13 +306,12 @@ export class NpoDb extends Db {
         return this.client.send(cmd);
     }
     async prog_milestone_put(pid, content) {
-        const mid = crypto.randomUUID();
         const item = this.prog_milestone_record(pid, content);
         const cmd = new PutCommand({
             TableName: NpoDb.name,
             Item: item,
         });
-        return this.client.send(cmd).then(() => mid);
+        return this.client.send(cmd).then(() => item.id);
     }
     async prog_milestone_update(pid, mid, update) {
         const upd8 = new UpdateBuilder();

package/dist/db2.d.mts

@@ -0,0 +1 @@
+export {};

package/dist/db2.mjs

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@better-giving/endowment",
-  "version": "4.0.12",
+  "version": "4.0.14",
   "dependencies": {
     "ksuid": "3.0.0"
   },
   "peerDependencies": {
     "@better-giving/schemas": "2.0.0",
     "@better-giving/types": "1.1.8",
-    "@better-giving/db": "2.0.0",
+    "@better-giving/db": "2.0.1",
     "@aws-sdk/lib-dynamodb": "3.485.0",
     "valibot": "0.42.0"
   },

package/src/db.mts

@@ -1,4 +1,5 @@
 import {
+  BatchGetCommand,
   DeleteCommand,
   GetCommand,
   PutCommand,
@@ -94,6 +95,24 @@ export class NpoDb extends Db {
     };
   }
 
+  async npos_get<T extends TNpoDbKeys[]>(
+    ids: number[],
+    fields?: T
+  ): Promise<TNpoDbProjectedTo<T>[]> {
+    const { names, expression } = projection(fields);
+    const batch_get = new BatchGetCommand({
+      RequestItems: {
+        [NpoDb.name]: {
+          Keys: ids.map((id) => this.key_npo(id)),
+          ProjectionExpression: expression,
+          ExpressionAttributeNames: names,
+        },
+      },
+    });
+    const { Responses } = await this.client.send(batch_get);
+    return (Responses?.[NpoDb.name] ?? []) as any;
+  }
+
   async npo_count_inc(): Promise<number> {
     const cmd = new UpdateCommand({
       TableName: NpoDb.name,
@@ -206,7 +225,8 @@ export class NpoDb extends Db {
     return {
       ...this.key_prog_milestone(mid, prog),
       ...data,
-    };
+      id: mid,
+    } satisfies IMilestone;
   }
 
   npo_med_record(
@@ -376,13 +396,12 @@ export class NpoDb extends Db {
     pid: string,
     content: IMilestoneNew
   ): Promise<string> {
-    const mid = crypto.randomUUID();
     const item = this.prog_milestone_record(pid, content);
     const cmd = new PutCommand({
       TableName: NpoDb.name,
       Item: item,
     });
-    return this.client.send(cmd).then(() => mid);
+    return this.client.send(cmd).then(() => item.id);
   }
 
   async prog_milestone_update(