update for ba-service update

Author: liuliquan

src/api/BillingAccount.ts

@@ -9,9 +9,7 @@ import { ChallengeStatuses, TGBillingAccounts } from "../common/Constants";
 const { V3_BA_API_URL } = process.env;
 
 async function lockAmount(billingAccountId: number, dto: LockAmountDTO) {
-  if (_.includes(TGBillingAccounts, billingAccountId)) {
-    return;
-  }
+  console.log("BA validation lock amount:", billingAccountId, dto);
 
   try {
     const m2mToken = await m2m.getM2MToken();
@@ -37,10 +35,7 @@ async function lockAmount(billingAccountId: number, dto: LockAmountDTO) {
 }
 
 async function consumeAmount(billingAccountId: number, dto: ConsumeAmountDTO) {
-  // prettier-ignore
-  if (_.includes(TGBillingAccounts, billingAccountId)) {
-    return;
-  }
+  console.log("BA validation consume amount:", billingAccountId, dto);
 
   try {
     const m2mToken = await m2m.getM2MToken();
@@ -71,16 +66,22 @@ interface LockAmountDTO {
 }
 interface ConsumeAmountDTO {
   challengeId: string;
-  actualSpent: number;
+  consumeAmount: number;
   markup?: number;
 }
 
 // prettier-ignore
 export async function lockConsumeAmount(baValidation: BAValidation, rollback: boolean = false): Promise<void> {
-  console.log("Update BA validation:", baValidation);
   if (!_.isNumber(baValidation.billingAccountId)) {
+    console.warn("Challenge doesn't have billing account id:", baValidation);
     return;
   }
+  if (_.includes(TGBillingAccounts, baValidation.billingAccountId)) {
+    console.info("Ignore BA validation for Topgear account:", baValidation.billingAccountId);
+    return;
+  }
+
+  console.log("BA validation:", baValidation);
 
   if (
     baValidation.status === ChallengeStatuses.New ||
@@ -106,7 +107,7 @@ export async function lockConsumeAmount(baValidation: BAValidation, rollback: bo
     if (currAmount !== prevAmount) {
       await consumeAmount(baValidation.billingAccountId, {
         challengeId: baValidation.challengeId!,
-        actualSpent: rollback ? prevAmount : currAmount,
+        consumeAmount: rollback ? prevAmount : currAmount,
         markup: baValidation.markup,
       });
     }

src/domain/Challenge.ts

@@ -144,10 +144,12 @@ class ChallengeDomain extends CoreOperations<Challenge, CreateChallengeInput> {
 
     const totalPrizesInCents = this.calculateTotalPrizesInCents(input.prizeSets ?? []);
     const now = new Date().getTime();
+    const challengeId = IdGenerator.generateUUID();
 
     // Lock amount
     const baValidation: BAValidation = {
       billingAccountId: input.billing?.billingAccountId,
+      challengeId,
       markup: input.billing?.markup,
       status: input.status,
       totalPrizesInCents,
@@ -164,7 +166,7 @@ class ChallengeDomain extends CoreOperations<Challenge, CreateChallengeInput> {
       // End Anti-Corruption Layer
 
       const challenge: Challenge = {
-        id: IdGenerator.generateUUID(),
+        id: challengeId,
         created: now,
         createdBy: handle,
         updated: now,
@@ -226,7 +228,7 @@ class ChallengeDomain extends CoreOperations<Challenge, CreateChallengeInput> {
     metadata: Metadata
   ): Promise<ChallengeList> {
     const { items } = await this.scan(scanCriteria, undefined);
-    let challenge = items[0] as Challenge;
+    const challenge = items[0] as Challenge;
     let updatedChallenge;
 
     // prettier-ignore