Better handling of engagements, but we have to modify the DB to have locks / consumed values tied now to either challenges or engagements.

Author: jmgasper

.env.example

@@ -4,6 +4,11 @@ DATABASE_URL="postgresql://postgres:postgres@localhost:5432/topcoder-services?sc
 # Example: postgresql://postgres:postgres@localhost:5432/topcoder-services?schema=members
 MEMBER_DB_URL=""
 
+# Optional lookup stores used to resolve billing-account line-item names.
+# If unset, line items are still returned with externalName omitted.
+CHALLENGE_DB_URL="postgresql://postgres:postgres@localhost:5432/topcoder-services?schema=challenges"
+ENGAGEMENTS_DB_URL="postgresql://postgres:postgres@localhost:5432/engagements"
+
 # Auth (tc-core-library-js)
 AUTH_SECRET=""                  
 AUTH0_URL=""                    # e.g. https://topcoder-dev.auth0.com/ (optional)

README.md

@@ -7,11 +7,11 @@
 - Endpoints:
   - `GET /billing-accounts` 
   - `POST /billing-accounts` 
-  - `GET /billing-accounts/:billingAccountId` (includes locked/consumed arrays + budget totals)
+  - `GET /billing-accounts/:billingAccountId` (includes locked/consumed arrays + budget totals; line items expose `amount`, `date`, `externalId`, `externalType`, `externalName`, and `challengeId` only for challenge compatibility)
   - `GET /billing-accounts/users/:userId` (list billing accounts accessible by the given Topcoder user ID — resolved via Salesforce resource object)
   - `PATCH /billing-accounts/:billingAccountId`
-  - `PATCH /billing-accounts/:billingAccountId/lock-amount` (0 amount = unlock)
-  - `PATCH /billing-accounts/:billingAccountId/consume-amount` (deletes locks for challenge, then upserts consumed)
+  - `PATCH /billing-accounts/:billingAccountId/lock-amount` (challenge-only typed reference; non-negative amount; 0 amount = unlock; rejects insufficient remaining funds)
+  - `PATCH /billing-accounts/:billingAccountId/consume-amount` (positive amount; challenge typed references delete the matching lock and overwrite consumed; engagement typed references append a consumed row; rejects insufficient remaining funds)
   - `GET /billing-accounts/:billingAccountId/users` (list users with access)
   - `POST /billing-accounts/:billingAccountId/users` (grant access; accepts `{ param: { userId } }` or `{ userId }`)
   - `DELETE /billing-accounts/:billingAccountId/users/:userId` (revoke access)

packages/ba-prisma-client/edge.js

@@ -158,7 +158,8 @@ exports.Prisma.BillingAccountScalarFieldEnum = {
 exports.Prisma.LockedAmountScalarFieldEnum = {
   id: 'id',
   billingAccountId: 'billingAccountId',
-  challengeId: 'challengeId',
+  externalId: 'externalId',
+  externalType: 'externalType',
   amount: 'amount',
   createdAt: 'createdAt',
   updatedAt: 'updatedAt'
@@ -167,7 +168,8 @@ exports.Prisma.LockedAmountScalarFieldEnum = {
 exports.Prisma.ConsumedAmountScalarFieldEnum = {
   id: 'id',
   billingAccountId: 'billingAccountId',
-  challengeId: 'challengeId',
+  externalId: 'externalId',
+  externalType: 'externalType',
   amount: 'amount',
   createdAt: 'createdAt',
   updatedAt: 'updatedAt'
@@ -204,6 +206,11 @@ exports.BAStatus = exports.$Enums.BAStatus = {
   INACTIVE: 'INACTIVE'
 };
 
+exports.BudgetEntryExternalType = exports.$Enums.BudgetEntryExternalType = {
+  CHALLENGE: 'CHALLENGE',
+  ENGAGEMENT: 'ENGAGEMENT'
+};
+
 exports.Prisma.ModelName = {
   Client: 'Client',
   BillingAccount: 'BillingAccount',