fix: save markup in legacy database

bin/nosql-client.js

@@ -5,15 +5,12 @@ const { execSync } = require("child_process");
 
 const PROTO_DIR = path.join(
   __dirname,
-  "../node_modules/topcoder-interface/data-access-layer/nosql"
+  "../node_modules/topcoder-proto-registry/data-access-layer/nosql"
 );
 const MODEL_DIR = path.join(__dirname, "../src/dal/models/nosql/");
 
 const PROTOC_PATH = "protoc";
-const PLUGIN_PATH = path.join(
-  __dirname,
-  "../node_modules/.bin/protoc-gen-ts_proto"
-);
+const PLUGIN_PATH = path.join(__dirname, "../node_modules/.bin/protoc-gen-ts_proto");
 
 rimraf.sync(`${MODEL_DIR}/*`, {
   glob: { ignore: `${MODEL_DIR}/tsconfig.json` },

bin/server.js

@@ -3,16 +3,13 @@ const rimraf = require("rimraf");
 
 const { execSync } = require("child_process");
 
-const PROTO_DIR = path.join(__dirname, "../node_modules/topcoder-interface");
+const PROTO_DIR = path.join(__dirname, "../node_modules/topcoder-proto-registry");
 const PROTO_REFLECTIONS = path.join(__dirname, "../reflections/reflection.bin");
 
 const MODEL_DIR = path.join(__dirname, "../src/models/");
 
 const PROTOC_PATH = "protoc";
-const PLUGIN_PATH = path.join(
-  __dirname,
-  "../node_modules/.bin/protoc-gen-ts_proto"
-);
+const PLUGIN_PATH = path.join(__dirname, "../node_modules/.bin/protoc-gen-ts_proto");
 
 rimraf.sync(`${MODEL_DIR}/*`, {
   glob: { ignore: `${MODEL_DIR}/tsconfig.json` },

package.json

@@ -23,9 +23,9 @@
     "@aws-sdk/util-utf8-node": "^3.259.0",
     "@grpc/grpc-js": "^1.7.1",
     "@opensearch-project/opensearch": "^2.2.0",
-    "@topcoder-framework/domain-acl": "^0.23.1-PLAT-3614.0",
-    "@topcoder-framework/lib-common": "^0.23.1-PLAT-3614.0",
-    "topcoder-interface": "0.1.0-PLAT-3614.1",
+    "@topcoder-framework/domain-acl": "0.24",
+    "@topcoder-framework/lib-common": "0.24",
+    "topcoder-proto-registry": "0.1.0",
     "@types/uuid": "^9.0.1",
     "aws-sdk": "^2.1339.0",
     "axios": "^1.2.2",
@@ -35,6 +35,7 @@
     "grpc-server-reflection": "^0.1.5",
     "http-aws-es": "^6.0.0",
     "lodash": "^4.17.21",
+    "long": "^5.2.3",
     "moment": "^2.29.4",
     "source-map-support": "^0.5.21",
     "tc-core-library-js": "appirio-tech/tc-core-library-js.git#v2.6.4",
@@ -44,15 +45,15 @@
   },
   "volta": {
     "node": "18.14.1",
-    "typescript": "4.9.4",
+    "typescript": "5.2.2",
     "yarn": "1.22.19"
   },
   "devDependencies": {
     "@types/elasticsearch": "^5.0.40",
     "@types/lodash": "^4.14.191",
-    "@types/node": "^18.11.17",
+    "@types/node": "^20.8.0",
     "ts-node-dev": "^2.0.0",
-    "ts-proto": "^1.126.1",
-    "typescript": "^4.9.4"
+    "ts-proto": "^1.159.1",
+    "typescript": "^5.2.2"
   }
-}
+}

release.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Ensure we have the required environment variables
+if [ -z "$GH_TOKEN" ]; then
+    echo "ERROR: GH_TOKEN environment variable is not set."
+    exit 1
+fi
+
+if [ -z "$NPM_TOKEN" ]; then
+    echo "WARNING: NPM_TOKEN environment variable is not set. Will not publish to npm."
+fi
+
+# Detect current branch
+CURRENT_BRANCH=$(git symbolic-ref --short HEAD)
+
+if [ "$CURRENT_BRANCH" = "main" ]; then
+    # On main branch: Do a standard release
+    npx semantic-release
+else
+    # On feature branches: Dry run to see next version and changes (won't actually publish)
+    npx semantic-release --dry-run
+fi

src/api/BillingAccount.ts

@@ -0,0 +1,150 @@
+import _ from "lodash";
+import axios from "axios";
+import { StatusBuilder } from "@grpc/grpc-js";
+import { Status } from "@grpc/grpc-js/build/src/constants";
+
+import m2m from "../helpers/MachineToMachineToken";
+import { ChallengeStatuses, TGBillingAccounts } from "../common/Constants";
+
+const { V3_BA_API_URL = "https://api.topcoder-dev.com/v3/billing-accounts" } = process.env;
+
+async function lockAmount(billingAccountId: number, dto: LockAmountDTO) {
+  console.log("BA validation lock amount:", billingAccountId, dto);
+
+  try {
+    const m2mToken = await m2m.getM2MToken();
+
+    await axios.patch(
+      `${V3_BA_API_URL}/${billingAccountId}/lock-amount`,
+      {
+        param: dto,
+      },
+      {
+        headers: {
+          Authorization: `Bearer ${m2mToken}`,
+          "Content-Type": "application/json",
+        },
+      }
+    );
+  } catch (err: any) {
+    console.error(err.response?.data?.result?.content ?? "Failed to lock challenge amount");
+    throw new StatusBuilder()
+      .withCode(Status.INTERNAL)
+      .withDetails(
+        `Budget Error: Requested amount $${dto.lockAmount} exceeds available budget for Billing Account #${billingAccountId}. Please contact the Topcoder Project Manager for further assistance.`
+      )
+      .build();
+  }
+}
+
+async function consumeAmount(billingAccountId: number, dto: ConsumeAmountDTO) {
+  console.log("BA validation consume amount:", billingAccountId, dto);
+
+  try {
+    const m2mToken = await m2m.getM2MToken();
+
+    await axios.patch(
+      `${V3_BA_API_URL}/${billingAccountId}/consume-amount`,
+      {
+        param: dto,
+      },
+      {
+        headers: {
+          Authorization: `Bearer ${m2mToken}`,
+          "Content-Type": "application/json",
+        },
+      }
+    );
+  } catch (err: any) {
+    throw new StatusBuilder()
+      .withCode(Status.INTERNAL)
+      .withDetails(err.response?.data?.result?.content ?? "Failed to consume challenge amount")
+      .build();
+  }
+}
+
+interface LockAmountDTO {
+  challengeId: string;
+  lockAmount: number;
+}
+interface ConsumeAmountDTO {
+  challengeId: string;
+  consumeAmount: number;
+  markup?: number;
+}
+
+// prettier-ignore
+export async function lockConsumeAmount(baValidation: BAValidation, rollback: boolean = false): Promise<void> {
+  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 ||
+    baValidation.status === ChallengeStatuses.Draft ||
+    baValidation.status === ChallengeStatuses.Active ||
+    baValidation.status === ChallengeStatuses.Approved
+  ) {
+    // Update lock amount
+    const currAmount = baValidation.totalPrizesInCents / 100;
+    const prevAmount = baValidation.prevTotalPrizesInCents / 100;
+
+    if (currAmount !== prevAmount) {
+      await lockAmount(baValidation.billingAccountId, {
+        challengeId: baValidation.challengeId!,
+        lockAmount: (rollback ? prevAmount : currAmount) * (1 + baValidation.markup!),
+      });
+    }
+  } else if (baValidation.status === ChallengeStatuses.Completed) {
+    // Note an already completed challenge could still be updated with prizes
+    const currAmount = baValidation.totalPrizesInCents / 100;
+    const prevAmount = baValidation.prevStatus === ChallengeStatuses.Completed ? baValidation.prevTotalPrizesInCents / 100 : 0;
+
+    if (currAmount !== prevAmount) {
+      await consumeAmount(baValidation.billingAccountId, {
+        challengeId: baValidation.challengeId!,
+        consumeAmount: (rollback ? prevAmount : currAmount) * (1 + baValidation.markup!),
+        markup: baValidation.markup,
+      });
+    }
+  } else if (
+    baValidation.status === ChallengeStatuses.Deleted ||
+    baValidation.status === ChallengeStatuses.Canceled ||
+    baValidation.status === ChallengeStatuses.CancelledFailedReview ||
+    baValidation.status === ChallengeStatuses.CancelledFailedScreening ||
+    baValidation.status === ChallengeStatuses.CancelledZeroSubmissions ||
+    baValidation.status === ChallengeStatuses.CancelledWinnerUnresponsive ||
+    baValidation.status === ChallengeStatuses.CancelledClientRequest ||
+    baValidation.status === ChallengeStatuses.CancelledRequirementsInfeasible ||
+    baValidation.status === ChallengeStatuses.CancelledZeroRegistrations ||
+    baValidation.status === ChallengeStatuses.CancelledPaymentFailed
+  ) {
+    // Challenge canceled, unlock previous locked amount
+    const currAmount = 0;
+    const prevAmount = baValidation.prevTotalPrizesInCents / 100;
+
+    if (currAmount !== prevAmount) {
+      await lockAmount(baValidation.billingAccountId, {
+        challengeId: baValidation.challengeId!,
+        lockAmount: rollback ? prevAmount : 0,
+      });
+    }
+  }
+}
+
+export interface BAValidation {
+  challengeId?: string;
+  billingAccountId?: number;
+  markup?: number;
+  prevStatus?: string;
+  status?: string;
+  prevTotalPrizesInCents: number;
+  totalPrizesInCents: number;
+}