Rewrite the escalation service to use group contracts (#28)

thepeacockproject · Feb 1, 2023 · 2b00390 · 2b00390
1 parent 1d1e359
commit 2b00390
Show file tree

Hide file tree

Showing 31 changed files with 392 additions and 2,264 deletions.
diff --git a/components/contracts/contractRouting.ts b/components/contracts/contractRouting.ts
@@ -56,7 +56,7 @@ const contractRoutingRouter = Router()
 contractRoutingRouter.post(
     "/GetForPlay2",
     jsonMiddleware(),
-    async (req: RequestWithJwt<never, GetForPlay2Body>, res) => {
+    (req: RequestWithJwt<never, GetForPlay2Body>, res) => {
         if (!req.body.id || !uuidRegex.test(req.body.id)) {
             res.status(400).end()
             return // user sent some nasty info
@@ -82,12 +82,13 @@ contractRoutingRouter.post(
         // Add escalation data to Contract data HERE
         contractData.Metadata = {
             ...contractData.Metadata,
-            ...(await getPlayEscalationInfo(
-                contractData.Metadata.Type === "escalation",
-                req.jwt.unique_name,
-                contractIdToEscalationGroupId(req.body.id),
-                req.gameVersion,
-            )),
+            ...(contractData.Metadata.Type === "escalation"
+                ? getPlayEscalationInfo(
+                      req.jwt.unique_name,
+                      contractIdToEscalationGroupId(req.body.id),
+                      req.gameVersion,
+                  )
+                : {}),
             ...loadoutData,
             ...{
                 OpportunityData: getContractOpportunityData(req, contractData),

diff --git a/components/contracts/dataGen.ts b/components/contracts/dataGen.ts
@@ -215,7 +215,7 @@ export function generateUserCentric(
             // unknown to why
             uc.Data.EscalationCompletedLevels = p - 1
             uc.Data.EscalationTotalLevels = getLevelCount(
-                controller.escalationMappings[eGroupId],
+                controller.resolveContract(eGroupId),
             )
             uc.Data.InGroup = eGroupId
         }