@better-giving/endowment 4.0.34 → 4.0.36

package/dist/db.d.mts

@@ -1,4 +1,4 @@
-import { Db, type TxType, type UpdateComps } from "@better-giving/db";
+import { Db, type TxItems, type TxType, type UpdateComps } from "@better-giving/db";
 import type { IMedia, IMediaPage, INpoReferredBy, INpoWithRegNum, INpoWithRid, TBinFlag, TNpoDbKeys, TNpoDbProjectedTo } from "./interfaces.mjs";
 import type { IMediaSearchObj, IMediaUpdate, IMilestone, IMilestoneNew, IMilestoneUpdate, INpo, INpoUpdate, IProgram, IProgramDb, IProgramNew, IProgramUpdate, TMediaType } from "./schema.mjs";
 export declare class NpoDb extends Db {
@@ -144,6 +144,8 @@ export declare class NpoDb extends Db {
     npo_program(id: string, npo_id: number): Promise<IProgram | undefined>;
     npo_programs(id: number): Promise<IProgramDb[]>;
     npo_program_put(npo: number, content: IProgramNew): Promise<string>;
+    npo_prog_del_txis(npo: number, prog: string): Promise<TxItems>;
+    npo_prog_contrib_update_txi(npo: number, prog: string, amount: number): TxType["Update"];
     npo_prog_del(npo: number, prog: string): Promise<import("@aws-sdk/lib-dynamodb").TransactWriteCommandOutput>;
     npo_prog_update(npo: number, prog: string, update: IProgramUpdate): Promise<Record<string, any> | undefined>;
 }

package/dist/db.mjs

@@ -387,7 +387,7 @@ export class NpoDb extends Db {
         await this.client.send(cmd);
         return pid;
     }
-    async npo_prog_del(npo, prog) {
+    async npo_prog_del_txis(npo, prog) {
         const milestones = await this.prog_milestones(prog);
         const txs = new Txs();
         txs.del({
@@ -400,8 +400,26 @@ export class NpoDb extends Db {
                 Key: this.key_prog_milestone(m.id, prog),
             });
         }
+        return txs.all;
+    }
+    npo_prog_contrib_update_txi(npo, prog, amount) {
+        return {
+            TableName: NpoDb.table,
+            Key: this.key_npo_program(prog, npo),
+            UpdateExpression: "SET #x = if_not_exists(#x, :zero) + :amt",
+            ExpressionAttributeValues: {
+                ":amt": amount,
+                ":zero": 0,
+            },
+            ExpressionAttributeNames: {
+                "#x": "totalDonations",
+            },
+        };
+    }
+    async npo_prog_del(npo, prog) {
+        const txs = await this.npo_prog_del_txis(npo, prog);
         const cmd = new TransactWriteCommand({
-            TransactItems: txs.all,
+            TransactItems: txs,
         });
         return this.client.send(cmd);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-giving/endowment",
-  "version": "4.0.34",
+  "version": "4.0.36",
   "dependencies": {
     "ksuid": "3.0.0"
   },

package/src/db.mts

@@ -10,6 +10,7 @@ import {
 } from "@aws-sdk/lib-dynamodb";
 import {
   Db,
+  type TxItems,
   type TxType,
   Txs,
   UpdateBuilder,
@@ -496,7 +497,7 @@ export class NpoDb extends Db {
     return pid;
   }
 
-  async npo_prog_del(npo: number, prog: string) {
+  async npo_prog_del_txis(npo: number, prog: string): Promise<TxItems> {
     const milestones = await this.prog_milestones(prog);
     const txs = new Txs();
     txs.del({
@@ -510,9 +511,32 @@ export class NpoDb extends Db {
         Key: this.key_prog_milestone(m.id, prog),
       });
     }
+    return txs.all;
+  }
+
+  npo_prog_contrib_update_txi(
+    npo: number,
+    prog: string,
+    amount: number
+  ): TxType["Update"] {
+    return {
+      TableName: NpoDb.table,
+      Key: this.key_npo_program(prog, npo),
+      UpdateExpression: "SET #x = if_not_exists(#x, :zero) + :amt",
+      ExpressionAttributeValues: {
+        ":amt": amount,
+        ":zero": 0,
+      },
+      ExpressionAttributeNames: {
+        "#x": "totalDonations" satisfies keyof IProgram,
+      },
+    };
+  }
 
+  async npo_prog_del(npo: number, prog: string) {
+    const txs = await this.npo_prog_del_txis(npo, prog);
     const cmd = new TransactWriteCommand({
-      TransactItems: txs.all,
+      TransactItems: txs,
     });
     return this.client.send(cmd);
   }

package/dist/cloudsearch.d.mts

@@ -1,55 +0,0 @@
-import type { ToDoc, ToHitFields, ToUpdate } from "@better-giving/types/cloudsearch";
-import type { Environment } from "@better-giving/types/list";
-import { type InferInput, type InferOutput } from "valibot";
-export declare const cloudsearchEndowFields: import("valibot").ObjectSchema<{
-    readonly contributions_total: import("valibot").NumberSchema<undefined>;
-    readonly contributions_count: import("valibot").NumberSchema<undefined>;
-}, undefined>;
-export declare const cloudsearchEndow: import("valibot").ObjectSchema<{
-    readonly contributions_total: import("valibot").NumberSchema<undefined>;
-    readonly contributions_count: import("valibot").NumberSchema<undefined>;
-    readonly tagline: import("valibot").OptionalSchema<import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<"required">, import("valibot").TrimAction]>, import("valibot").MaxLengthAction<string, 140, undefined>]>, never>;
-    readonly card_img: import("valibot").OptionalSchema<import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<"required">, import("valibot").TrimAction]>, import("valibot").UrlAction<string, undefined>]>, never>;
-    readonly active_in_countries: import("valibot").SchemaWithPipe<[import("valibot").ArraySchema<import("valibot").SchemaWithPipe<[import("valibot").StringSchema<"required">, import("valibot").TrimAction]>, undefined>, import("valibot").NonEmptyAction<string[], "required">]>;
-    readonly sdgs: import("valibot").SchemaWithPipe<[import("valibot").ArraySchema<import("valibot").PicklistSchema<readonly [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17], undefined>, undefined>, import("valibot").MinLengthAction<(2 | 1 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17)[], 1, undefined>]>;
-    readonly published: import("valibot").OptionalSchema<import("valibot").BooleanSchema<undefined>, never>;
-    readonly fund_opt_in: import("valibot").OptionalSchema<import("valibot").BooleanSchema<undefined>, never>;
-    readonly target: import("valibot").OptionalSchema<import("valibot").UnionSchema<[import("valibot").LiteralSchema<"smart", undefined>, import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").TransformAction<string, number>, import("valibot").NumberSchema<undefined>, import("valibot").MinValueAction<number, 0, undefined>, import("valibot").TransformAction<number, string>]>], undefined>, never>;
-    readonly id: import("valibot").SchemaWithPipe<[import("valibot").NumberSchema<undefined>, import("valibot").IntegerAction<number, undefined>, import("valibot").MinValueAction<number, 1, undefined>]>;
-    readonly env: import("valibot").PicklistSchema<readonly ["staging", "production"], undefined>;
-    readonly registration_number: import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<"required">, import("valibot").TrimAction]>, import("valibot").NonEmptyAction<string, "required">, import("valibot").RegexAction<string, "must only contain letters and numbers">]>;
-    readonly name: import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<"required">, import("valibot").TrimAction]>, import("valibot").NonEmptyAction<string, "required">]>;
-    readonly endow_designation: import("valibot").PicklistSchema<readonly ["Charity", "Religious Organization", "University", "Hospital", "Other"], "required">;
-    readonly hq_country: import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<"required">, import("valibot").TrimAction]>, import("valibot").NonEmptyAction<string, "required">]>;
-    readonly claimed: import("valibot").BooleanSchema<undefined>;
-    readonly kyc_donors_only: import("valibot").BooleanSchema<undefined>;
-}, undefined>;
-export declare const cloudSearchEndowFields: import("valibot").PicklistSchema<["tagline", "card_img", "active_in_countries", "sdgs", "published", "fund_opt_in", "target", "id", "env", "registration_number", "name", "endow_designation", "hq_country", "claimed", "kyc_donors_only", "contributions_total", "contributions_count"], undefined>;
-export declare const endowsQueryParams: import("valibot").ObjectSchema<{
-    readonly query: import("valibot").OptionalSchema<import("valibot").SchemaWithPipe<[import("valibot").StringSchema<"required">, import("valibot").TrimAction]>, never>;
-    readonly page: import("valibot").OptionalSchema<import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<"required">, import("valibot").TrimAction]>, import("valibot").TransformAction<string, number>, import("valibot").SchemaWithPipe<[import("valibot").NumberSchema<undefined>, import("valibot").IntegerAction<number, undefined>, import("valibot").MinValueAction<number, 1, undefined>]>]>, never>;
-    readonly endow_designation: import("valibot").OptionalSchema<import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").LazySchema<import("valibot").SchemaWithPipe<[import("valibot").StringSchema<"required">, import("valibot").TrimAction]> | import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<"required">, import("valibot").TrimAction]>, import("valibot").RegexAction<string, "invalid csv">]>>, import("valibot").TransformAction<string, string[]>, import("valibot").FilterItemsAction<string[]>]>, import("valibot").ArraySchema<import("valibot").PicklistSchema<readonly ["Charity", "Religious Organization", "University", "Hospital", "Other"], "required">, undefined>]>, never>;
-    readonly sdgs: import("valibot").OptionalSchema<import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").LazySchema<import("valibot").SchemaWithPipe<[import("valibot").StringSchema<"required">, import("valibot").TrimAction]> | import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<"required">, import("valibot").TrimAction]>, import("valibot").RegexAction<string, "invalid csv">]>>, import("valibot").TransformAction<string, string[]>, import("valibot").FilterItemsAction<string[]>]>, import("valibot").MapItemsAction<string[], number>, import("valibot").ArraySchema<import("valibot").PicklistSchema<readonly [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17], undefined>, undefined>]>, never>;
-    readonly kyc_only: import("valibot").OptionalSchema<import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").LazySchema<import("valibot").SchemaWithPipe<[import("valibot").StringSchema<"required">, import("valibot").TrimAction]> | import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<"required">, import("valibot").TrimAction]>, import("valibot").RegexAction<string, "invalid csv">]>>, import("valibot").TransformAction<string, string[]>, import("valibot").FilterItemsAction<string[]>]>, import("valibot").MapItemsAction<string[], boolean>, import("valibot").ArraySchema<import("valibot").BooleanSchema<undefined>, undefined>]>, never>;
-    readonly fund_opt_in: import("valibot").OptionalSchema<import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").LazySchema<import("valibot").SchemaWithPipe<[import("valibot").StringSchema<"required">, import("valibot").TrimAction]> | import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<"required">, import("valibot").TrimAction]>, import("valibot").RegexAction<string, "invalid csv">]>>, import("valibot").TransformAction<string, string[]>, import("valibot").FilterItemsAction<string[]>]>, import("valibot").MapItemsAction<string[], boolean>, import("valibot").ArraySchema<import("valibot").BooleanSchema<undefined>, undefined>]>, never>;
-    readonly claimed: import("valibot").OptionalSchema<import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").LazySchema<import("valibot").SchemaWithPipe<[import("valibot").StringSchema<"required">, import("valibot").TrimAction]> | import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<"required">, import("valibot").TrimAction]>, import("valibot").RegexAction<string, "invalid csv">]>>, import("valibot").TransformAction<string, string[]>, import("valibot").FilterItemsAction<string[]>]>, import("valibot").MapItemsAction<string[], boolean>, import("valibot").ArraySchema<import("valibot").BooleanSchema<undefined>, undefined>]>, never>;
-    readonly countries: import("valibot").OptionalSchema<import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").LazySchema<import("valibot").SchemaWithPipe<[import("valibot").StringSchema<"required">, import("valibot").TrimAction]> | import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<"required">, import("valibot").TrimAction]>, import("valibot").RegexAction<string, "invalid csv">]>>, import("valibot").TransformAction<string, string[]>, import("valibot").FilterItemsAction<string[]>]>, import("valibot").ArraySchema<import("valibot").SchemaWithPipe<[import("valibot").StringSchema<"required">, import("valibot").TrimAction]>, undefined>]>, never>;
-    readonly fields: import("valibot").OptionalSchema<import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").LazySchema<import("valibot").SchemaWithPipe<[import("valibot").StringSchema<"required">, import("valibot").TrimAction]> | import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<"required">, import("valibot").TrimAction]>, import("valibot").RegexAction<string, "invalid csv">]>>, import("valibot").TransformAction<string, string[]>, import("valibot").FilterItemsAction<string[]>]>, import("valibot").ArraySchema<import("valibot").PicklistSchema<["tagline", "card_img", "active_in_countries", "sdgs", "published", "fund_opt_in", "target", "id", "env", "registration_number", "name", "endow_designation", "hq_country", "claimed", "kyc_donors_only", "contributions_total", "contributions_count"], undefined>, undefined>]>, never>;
-}, undefined>;
-export interface CloudsearchEndowsQueryParamsObj extends InferInput<typeof endowsQueryParams> {
-}
-export interface CloudsearchEndowsQueryParams extends InferInput<typeof endowsQueryParams> {
-}
-export interface CloudsearchEndowsQueryParamsParsed extends InferOutput<typeof endowsQueryParams> {
-}
-export interface CloudsearchEndow extends InferOutput<typeof cloudsearchEndow> {
-}
-export type DocId = `${Environment}-${number}`;
-interface Doc extends ToDoc<CloudsearchEndow> {
-    documentId: DocId;
-    _score: number;
-}
-export interface HitFields extends ToHitFields<Omit<Doc, "documentId" | "_score">> {
-}
-export type Update = ToUpdate<DocId, CloudsearchEndow>;
-export {};

package/dist/cloudsearch.mjs

@@ -1,41 +0,0 @@
-import { $int_gte1, org_designation, unsdg_num } from "@better-giving/schemas";
-import { array, boolean, keyof, mapItems, number, object, optional, pick, pipe, } from "valibot";
-import { $, csv_strs, npo } from "./schema.mjs";
-const boolCsv = pipe(csv_strs, mapItems((x) => x === "true"), array(boolean()));
-export const cloudsearchEndowFields = object({
-    contributions_total: number(),
-    contributions_count: number(),
-});
-export const cloudsearchEndow = object({
-    ...pick(npo, [
-        "card_img",
-        "name",
-        "tagline",
-        "hq_country",
-        "sdgs",
-        "active_in_countries",
-        "endow_designation",
-        "registration_number",
-        "kyc_donors_only",
-        "claimed",
-        //filters
-        "env",
-        "id",
-        "published",
-        "fund_opt_in",
-        "target",
-    ]).entries,
-    ...cloudsearchEndowFields.entries,
-});
-export const cloudSearchEndowFields = keyof(cloudsearchEndow);
-export const endowsQueryParams = object({
-    query: optional($),
-    page: optional($int_gte1),
-    endow_designation: optional(pipe(csv_strs, array(org_designation))),
-    sdgs: optional(pipe(csv_strs, mapItems((x) => +x), array(unsdg_num))),
-    kyc_only: optional(boolCsv),
-    fund_opt_in: optional(boolCsv),
-    claimed: optional(boolCsv),
-    countries: optional(pipe(csv_strs, array($))),
-    fields: optional(pipe(csv_strs, array(cloudSearchEndowFields))),
-});

package/dist/db2.d.mts

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

package/dist/db2.mjs

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