@better-giving/donation 3.0.30 → 3.0.32

package/dist/donations-db.d.mts

@@ -1,7 +1,7 @@
 import { type QueryCommandInput } from "@aws-sdk/lib-dynamodb";
 import { Db, type TxType } from "@better-giving/db";
 import type { IPageKeyed } from "@better-giving/types/api";
-import type { IDonationFinal, IDonationFinalAttr } from "./interfaces.mjs";
+import type { IDonationFinal, IDonationFinalAttr, IDonationFinalUpdate } from "./interfaces.mjs";
 import type { IDonationsSearch, IPageOpts } from "./schema.mjs";
 export declare class DonationsDb extends Db {
     static readonly gsi_referrer$settled_date = "Referrer-FinalizedDate_Index";
@@ -13,8 +13,8 @@ export declare class DonationsDb extends Db {
     };
     item(id: string): Promise<IDonationFinal | undefined>;
     put_txi(data: IDonationFinalAttr): TxType["Put"];
-    update(id: string, data: Partial<Omit<IDonationFinalAttr, "transactionId">>): Promise<IDonationFinal>;
-    update_txi(id: string, data: Partial<Omit<IDonationFinalAttr, "transactionId">>): TxType["Update"];
+    update(id: string, data: IDonationFinalUpdate): Promise<IDonationFinal>;
+    update_txi(id: string, data: IDonationFinalUpdate): TxType["Update"];
     referred_by_q(referrer: string, opts?: IPageOpts): QueryCommandInput;
     referred_by(referrer: string, opts?: IPageOpts): Promise<IPageKeyed<IDonationFinal>>;
     list_to_npo(npo: number, opts?: IDonationsSearch & {

package/dist/donations-db.mjs

@@ -32,6 +32,8 @@ export class DonationsDb extends Db {
         const cmd = new UpdateCommand({
             TableName: this.table,
             Key: this.key(id),
+            ReturnValues: "ALL_NEW",
+            ConditionExpression: `attribute_exists(${"transactionId"})`,
             ...upd8.collect(),
         });
         return this.client.send(cmd).then((r) => r.Attributes);
@@ -44,6 +46,7 @@ export class DonationsDb extends Db {
         return {
             TableName: this.table,
             Key: this.key(id),
+            ConditionExpression: `attribute_exists(${"transactionId"})`,
             ...upd8.collect(),
         };
     }

package/dist/index.d.mts

@@ -1,7 +1,5 @@
 export type { IAllocation, TDonationSource, TDonorTitle, TFrequency, IDonationsSearch, IPageOpts, } from "./schema.mjs";
-export type * from "./paypal.mjs";
 export type * from "./interfaces.mjs";
 export { DonationsDb } from "./donations-db.mjs";
 export { OnHoldDonationsDb } from "./onhold-db.mjs";
-export { SubsDb } from "./subscriptions-db.mjs";
 export { DonationDonorsDb } from "./donation-msgs-db.mjs";

package/dist/index.mjs

@@ -1,4 +1,3 @@
 export { DonationsDb } from "./donations-db.mjs";
 export { OnHoldDonationsDb } from "./onhold-db.mjs";
-export { SubsDb } from "./subscriptions-db.mjs";
 export { DonationDonorsDb } from "./donation-msgs-db.mjs";

package/dist/interfaces.d.mts

@@ -99,6 +99,8 @@ export interface IDonationOnHoldAttr {
     inHonorOf?: string;
     tributeNotif?: ITributeNotif;
 }
+export interface IDonationOnholdUpdate extends Partial<Omit<IDonationOnHoldAttr, "transactionId">> {
+}
 export interface IDonationOnHold extends IDonationOnHoldAttr, IDonationOnHoldAttrLegacy {
 }
 export interface IDonationFinalAttrLegacy {
@@ -266,6 +268,8 @@ export interface IDonationFinalAttr {
     referrer?: string;
     taxReceiptId?: string;
 }
+export interface IDonationFinalUpdate extends Partial<Omit<IDonationFinalAttr, "transactionId">> {
+}
 export interface IDonationFinal extends IDonationFinalAttr, IDonationFinalAttrLegacy {
 }
 export interface IPublicDonor {

package/dist/onhold-db.d.mts

@@ -1,6 +1,6 @@
 import { Db, type TxType } from "@better-giving/db";
 import type { IPageKeyed } from "@better-giving/types/api";
-import type { IDonationOnHold, IDonationOnHoldAttr } from "./interfaces.mjs";
+import type { IDonationOnHold, IDonationOnHoldAttr, IDonationOnholdUpdate } from "./interfaces.mjs";
 import type { IDonationsSearch } from "./schema.mjs";
 export declare class OnHoldDonationsDb extends Db {
     static readonly gsi_email$tx_date = "email-tx_date-gsi";
@@ -9,8 +9,8 @@ export declare class OnHoldDonationsDb extends Db {
         transactionId: string;
     };
     put(data: IDonationOnHoldAttr): Promise<import("@aws-sdk/lib-dynamodb").PutCommandOutput>;
-    update(id: string, data: Partial<Omit<IDonationOnHoldAttr, "transactionId">>): Promise<IDonationOnHold>;
-    update_txi(id: string, data: Partial<Omit<IDonationOnHoldAttr, "transactionId">>): TxType["Update"];
+    update(id: string, data: IDonationOnholdUpdate): Promise<IDonationOnHold>;
+    update_txi(id: string, data: IDonationOnholdUpdate): TxType["Update"];
     item(id: string): Promise<IDonationOnHold | undefined>;
     put_txi(data: IDonationOnHoldAttr): Promise<import("@aws-sdk/lib-dynamodb").PutCommandOutput>;
     del_txi(id: string): TxType["Delete"];

package/dist/onhold-db.mjs

@@ -26,6 +26,8 @@ export class OnHoldDonationsDb extends Db {
         const cmd = new UpdateCommand({
             TableName: this.table,
             Key: this.key(id),
+            ReturnValues: "ALL_NEW",
+            ConditionExpression: `attribute_exists(${"transactionId"})`,
             ...upd8.collect(),
         });
         return this.client.send(cmd).then((r) => r.Attributes);
@@ -38,6 +40,7 @@ export class OnHoldDonationsDb extends Db {
         return {
             TableName: this.table,
             Key: this.key(id),
+            ConditionExpression: `attribute_exists(${"transactionId"})`,
             ...upd8.collect(),
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-giving/donation",
-  "version": "3.0.30",
+  "version": "3.0.32",
   "devDependencies": {
     "@better-giving/config": "1.1.2"
   },

package/src/donations-db.mts

@@ -6,7 +6,11 @@ import {
 } from "@aws-sdk/lib-dynamodb";
 import { Db, type TxType, UpdateBuilder } from "@better-giving/db";
 import type { IPageKeyed } from "@better-giving/types/api";
-import type { IDonationFinal, IDonationFinalAttr } from "./interfaces.mjs";
+import type {
+  IDonationFinal,
+  IDonationFinalAttr,
+  IDonationFinalUpdate,
+} from "./interfaces.mjs";
 import type { IDonationsSearch, IPageOpts } from "./schema.mjs";
 
 type K = keyof IDonationFinalAttr;
@@ -45,7 +49,7 @@ export class DonationsDb extends Db {
 
   async update(
     id: string,
-    data: Partial<Omit<IDonationFinalAttr, "transactionId">>
+    data: IDonationFinalUpdate
   ): Promise<IDonationFinal> {
     const upd8 = new UpdateBuilder();
     for (const k in data) {
@@ -54,15 +58,14 @@ export class DonationsDb extends Db {
     const cmd = new UpdateCommand({
       TableName: this.table,
       Key: this.key(id),
+      ReturnValues: "ALL_NEW",
+      ConditionExpression: `attribute_exists(${"transactionId" satisfies K})`,
       ...upd8.collect(),
     });
     return this.client.send(cmd).then((r) => r.Attributes as any);
   }
 
-  update_txi(
-    id: string,
-    data: Partial<Omit<IDonationFinalAttr, "transactionId">>
-  ): TxType["Update"] {
+  update_txi(id: string, data: IDonationFinalUpdate): TxType["Update"] {
     const upd8 = new UpdateBuilder();
     for (const k in data) {
       upd8.set(k as K, (data as any)[k]);
@@ -70,6 +73,7 @@ export class DonationsDb extends Db {
     return {
       TableName: this.table,
       Key: this.key(id),
+      ConditionExpression: `attribute_exists(${"transactionId" satisfies K})`,
       ...upd8.collect(),
     };
   }

package/src/index.mts

@@ -7,10 +7,8 @@ export type {
   IPageOpts,
 } from "./schema.mjs";
 
-export type * from "./paypal.mjs";
 export type * from "./interfaces.mjs";
 
 export { DonationsDb } from "./donations-db.mjs";
 export { OnHoldDonationsDb } from "./onhold-db.mjs";
-export { SubsDb } from "./subscriptions-db.mjs";
 export { DonationDonorsDb } from "./donation-msgs-db.mjs";

package/src/interfaces.mts

@@ -115,6 +115,9 @@ export interface IDonationOnHoldAttr {
   tributeNotif?: ITributeNotif;
 }
 
+export interface IDonationOnholdUpdate
+  extends Partial<Omit<IDonationOnHoldAttr, "transactionId">> {}
+
 export interface IDonationOnHold
   extends IDonationOnHoldAttr,
     IDonationOnHoldAttrLegacy {}
@@ -300,6 +303,9 @@ export interface IDonationFinalAttr {
   taxReceiptId?: string;
 }
 
+export interface IDonationFinalUpdate
+  extends Partial<Omit<IDonationFinalAttr, "transactionId">> {}
+
 export interface IDonationFinal
   extends IDonationFinalAttr,
     IDonationFinalAttrLegacy {}

package/src/onhold-db.mts

@@ -7,7 +7,11 @@ import {
 } from "@aws-sdk/lib-dynamodb";
 import { Db, type TxType, UpdateBuilder } from "@better-giving/db";
 import type { IPageKeyed } from "@better-giving/types/api";
-import type { IDonationOnHold, IDonationOnHoldAttr } from "./interfaces.mjs";
+import type {
+  IDonationOnHold,
+  IDonationOnHoldAttr,
+  IDonationOnholdUpdate,
+} from "./interfaces.mjs";
 import type { IDonationsSearch } from "./schema.mjs";
 
 type K = keyof IDonationOnHoldAttr;
@@ -39,7 +43,7 @@ export class OnHoldDonationsDb extends Db {
 
   async update(
     id: string,
-    data: Partial<Omit<IDonationOnHoldAttr, "transactionId">>
+    data: IDonationOnholdUpdate
   ): Promise<IDonationOnHold> {
     const upd8 = new UpdateBuilder();
     for (const k in data) {
@@ -48,15 +52,14 @@ export class OnHoldDonationsDb extends Db {
     const cmd = new UpdateCommand({
       TableName: this.table,
       Key: this.key(id),
+      ReturnValues: "ALL_NEW",
+      ConditionExpression: `attribute_exists(${"transactionId" satisfies K})`,
       ...upd8.collect(),
     });
     return this.client.send(cmd).then((r) => r.Attributes as any);
   }
 
-  update_txi(
-    id: string,
-    data: Partial<Omit<IDonationOnHoldAttr, "transactionId">>
-  ): TxType["Update"] {
+  update_txi(id: string, data: IDonationOnholdUpdate): TxType["Update"] {
     const upd8 = new UpdateBuilder();
     for (const k in data) {
       upd8.set(k as K, (data as any)[k]);
@@ -64,6 +67,7 @@ export class OnHoldDonationsDb extends Db {
     return {
       TableName: this.table,
       Key: this.key(id),
+      ConditionExpression: `attribute_exists(${"transactionId" satisfies K})`,
       ...upd8.collect(),
     };
   }

package/src/paypal.mts

@@ -1,85 +0,0 @@
-export declare namespace FiatDonations {
-  type Currency = {
-    /** lowercase ISO 4217 code */
-    currency_code: string;
-    minimum_amount: number;
-    rate: number;
-    timestamp: string;
-  };
-}
-
-export declare namespace PayPalDonation {
-  type CreateOrder = {
-    purchase_units: PurchaseUnit[];
-    intent: Intent;
-    payment_source?: PaymentSource;
-  };
-
-  // see Response object description in official docs
-  // https://developer.paypal.com/docs/api/orders/v2/#orders_create
-  type Order = {
-    id: string;
-    status: Status;
-    intent: Intent;
-    payment_source: PaymentSource;
-    purchase_units: PurchaseUnit[];
-    payer: Payer;
-    create_time: Date;
-    links: Link[];
-  };
-
-  type Link = {
-    href: string;
-    rel: string;
-    method: string;
-  };
-
-  type Payer = {
-    name: Name;
-    email_address: string;
-    payer_id: string;
-  };
-
-  type PaymentSource = {
-    paypal: {
-      name: Name;
-      email_address: string;
-      account_id: string;
-    };
-  };
-
-  type Name = {
-    given_name: string;
-    surname: string;
-  };
-
-  type PurchaseUnit = {
-    // don't need 'reference_id'
-    amount: {
-      /** Three-character ISO-4217 code. */
-      currency_code: string;
-      value: string;
-    };
-    /** @link https://developer.paypal.com/docs/api/orders/v2/#orders_get */
-    payments?: {
-      captures: CapturedPayment[];
-    };
-  };
-
-  type CapturedPayment = {
-    seller_receivable_breakdown: {
-      gross_amount: { value: number };
-      paypal_fee: { value: number };
-      net_amount: { value: number };
-    };
-  };
-
-  type Intent = "CAPTURE" | "AUTHORIZE";
-  type Status =
-    | "CREATED"
-    | "SAVED"
-    | "APPROVED"
-    | "VOIDED"
-    | "COMPLETED"
-    | "PAYER_ACTION_REQUIRED";
-}

package/src/subscriptions-db.mts

@@ -1,50 +0,0 @@
-import {
-  DeleteCommand,
-  PutCommand,
-  UpdateCommand,
-} from "@aws-sdk/lib-dynamodb";
-import { Db, UpdateBuilder } from "@better-giving/db";
-import type { ISubscription } from "./interfaces.mjs";
-
-type K = keyof ISubscription;
-export class SubsDb extends Db {
-  static readonly table = "subscriptions";
-
-  key(id: string) {
-    return { subscription_id: id } satisfies Pick<
-      ISubscription,
-      "subscription_id"
-    >;
-  }
-  async put(data: ISubscription) {
-    const cmd = new PutCommand({
-      TableName: SubsDb.table,
-      Item: data,
-      ConditionExpression: `attribute_not_exists(${"subscription_id" satisfies K})`,
-    });
-    return this.client.send(cmd);
-  }
-  async update(
-    id: string,
-    data: Partial<Omit<ISubscription, "subscription_id">>
-  ): Promise<ISubscription> {
-    const upd8 = new UpdateBuilder();
-    for (const k in data) {
-      upd8.set(k as K, (data as any)[k]);
-    }
-    const cmd = new UpdateCommand({
-      TableName: SubsDb.table,
-      Key: this.key(id),
-      ...upd8.collect(),
-    });
-    return this.client.send(cmd).then((r) => r.Attributes as any);
-  }
-
-  async del(id: string) {
-    const cmd = new DeleteCommand({
-      TableName: SubsDb.table,
-      Key: this.key(id),
-    });
-    return this.client.send(cmd);
-  }
-}