Rewrite the escalation service to use group contracts

components/candle/challengeHelpers.ts

@@ -24,7 +24,6 @@ import {
     MissionManifest,
     RegistryChallenge,
 } from "../types/types"
-import assert from "assert"
 import { SavedChallengeGroup } from "../types/challenges"
 import { controller } from "../controller"
 import { gameDifficulty } from "../utils"
@@ -103,6 +102,7 @@ export function inclusionDataCheck(
     contract: MissionManifest,
 ): boolean {
     if (!incData) return true
+    if (!contract) return false
 
     return (
         incData.ContractIds?.includes(contract.Metadata.Id) ||
@@ -142,8 +142,11 @@ function isChallengeInContract(
     challenge: RegistryChallenge,
     forCareer = false,
 ): boolean {
-    assert.ok(contractId)
-    assert.ok(locationId)
+    // Currently don't have all the escalation groups
+    if (!contractId || !locationId) {
+        return false
+    }
+
     if (!challenge) {
         return false
     }
@@ -161,6 +164,7 @@ function isChallengeInContract(
         return true
     }
 
+    const contract = controller.resolveContract(contractId, true)
     if (challenge.Type === "global") {
         return inclusionDataCheck(
             // Global challenges should not be shown for "tutorial" missions unless for the career page,
@@ -174,13 +178,13 @@ function isChallengeInContract(
                               (type) => type !== "tutorial",
                           ),
                   },
-            controller.resolveContract(contractId),
+            contract,
         )
     }
 
-    // Is this for the current contract?
+    // Is this for the current contract or group contract?
     const isForContract = (challenge.InclusionData?.ContractIds || []).includes(
-        contractId,
+        contract.Metadata.Id,
     )
 
     // Is this a location-wide challenge?

components/candle/challengeService.ts

@@ -518,7 +518,7 @@ export class ChallengeService extends ChallengeRegistry {
         gameVersion: GameVersion,
         difficulty = 4,
     ): GroupIndexedChallengeLists {
-        const contract = this.controller.resolveContract(contractId)
+        const contract = this.controller.resolveContract(contractId, true)
 
         assert.ok(contract)
 
@@ -555,7 +555,9 @@ export class ChallengeService extends ChallengeRegistry {
 
         let contracts = isSniperLocation(child)
             ? this.controller.missionsInLocations.sniper[child]
-            : this.controller.missionsInLocations[child]
+            : (this.controller.missionsInLocations[child] ?? []).concat(
+                  this.controller.missionsInLocations.escalations[child],
+              )
         if (!contracts) {
             contracts = []
         }
@@ -580,14 +582,14 @@ export class ChallengeService extends ChallengeRegistry {
         // brand new.
         const { gameVersion, contractId, challengeContexts } = session
 
+        const contractJson = this.controller.resolveContract(contractId, true)
+
         const challengeGroups = this.getChallengesForContract(
-            contractId,
+            contractJson.Metadata.Id,
             gameVersion,
             session.difficulty,
         )
 
-        const contractJson = this.controller.resolveContract(contractId)
-
         if (contractJson.Metadata.Type === "evergreen") {
             session.evergreen = {
                 payout: 0,
@@ -769,7 +771,7 @@ export class ChallengeService extends ChallengeRegistry {
         userId: string,
         difficulty = 4,
     ): CompiledChallengeTreeCategory[] {
-        const contractData = this.controller.resolveContract(contractId)
+        const contractData = this.controller.resolveContract(contractId, true)
 
         if (!contractData) {
             return []
@@ -789,7 +791,7 @@ export class ChallengeService extends ChallengeRegistry {
         }
 
         const forContract = this.getChallengesForContract(
-            contractId,
+            contractData.Metadata.Id,
             gameVersion,
             difficulty,
         )

components/contracts/contractRouting.ts

@@ -92,12 +92,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),

components/contracts/dataGen.ts

@@ -209,28 +209,25 @@ export function generateUserCentric(
     }
 
     if (contractData.Metadata.Type === "escalation") {
-        const eGroupId = contractData.Metadata.InGroup
+        const eGroupId =
+            contractData.Metadata.InGroup ?? contractData.Metadata.Id
 
-        if (eGroupId) {
-            const p = getUserEscalationProgress(userData, eGroupId)
+        const p = getUserEscalationProgress(userData, eGroupId)
 
-            log(
-                LogLevel.DEBUG,
-                `Get EscalationUCProps - group: ${eGroupId} prog: ${p}`,
-            )
+        log(
+            LogLevel.DEBUG,
+            `Get EscalationUCProps - group: ${eGroupId} prog: ${p}`,
+        )
 
-            // I have absolutely no idea why,
-            // but this is incorrect on the destinations
-            // screen unless we do proper count - 1
-            // ANOTHER NOTE - Anthony:
-            // this currently doesn't mark it as completed when it is,
-            // unknown to why
-            uc.Data.EscalationCompletedLevels = p - 1
-            uc.Data.EscalationTotalLevels = getLevelCount(
-                controller.escalationMappings[eGroupId],
-            )
-            uc.Data.InGroup = eGroupId
-        }
+        // Probably not needed, just in case though.
+        delete uc.Data.Completed
+
+        uc.Data.EscalationCompletedLevels = p - 1
+        uc.Data.EscalationTotalLevels = getLevelCount(
+            controller.resolveContract(eGroupId),
+        )
+        uc.Data.EscalationCompleted = p === uc.Data.EscalationTotalLevels
+        if (contractData.Metadata.InGroup) uc.Data.InGroup = eGroupId
     }
 
     return uc