Compare commits
194
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
be4de61bb7 | ||
|
|
6c582ba3cf | ||
|
|
9064340584 | ||
|
|
cc358697d4 | ||
|
|
f6686bbf17 | ||
|
|
0d7617e2d2 | ||
|
|
20e1e6ec04 | ||
|
|
664af15255 | ||
|
|
7e0cd7cb19 | ||
|
|
38a89b5374 | ||
|
|
da7b502936 | ||
|
|
f649490cd2 | ||
|
|
f2eec479d9 | ||
|
|
ef141a13d0 | ||
|
|
f622ee5b1f | ||
|
|
4b8ccf0077 | ||
|
|
0c4c4239ec | ||
|
|
9117c9c0a4 | ||
|
|
5bc748dc4d | ||
|
|
de84ad5309 | ||
|
|
f223157542 | ||
|
|
cd1525c87a | ||
|
|
337970a12b | ||
|
|
58e24ccd75 | ||
|
|
827fc5b6b4 | ||
|
|
384d460ad6 | ||
|
|
71085d0ac4 | ||
|
|
904f1fc4a4 | ||
|
|
f526257d9c | ||
|
|
34a47c053e | ||
|
|
e3f39fd8b8 | ||
|
|
4385ba7b8b | ||
|
|
9cd5850d43 | ||
|
|
79534cf43c | ||
|
|
03be85d07b | ||
|
|
d269bdd92b | ||
|
|
2bac89d3dc | ||
|
|
760da1cbea | ||
|
|
ca786fd80a | ||
|
|
ac0d2b53f0 | ||
|
|
a4215f86fb | ||
|
|
a24726d7da | ||
|
|
bb68be14fa | ||
|
|
9e2f2c61e7 | ||
|
|
fd1fa2366c | ||
|
|
96fede9fe5 | ||
|
|
80fef25af3 | ||
|
|
1f75c6318a | ||
|
|
8ec9edc35f | ||
|
|
61f1db0e6a | ||
|
|
c9140b8622 | ||
|
|
4e10998794 | ||
|
|
b115072005 | ||
|
|
03e88a03bc | ||
|
|
43c25c05cd | ||
|
|
dc77b37494 | ||
|
|
bb32c26694 | ||
|
|
81b951889f | ||
|
|
96bae0ce28 | ||
|
|
a88562b208 | ||
|
|
3bd3120eb1 | ||
|
|
3c60081ece | ||
|
|
aa675199af | ||
|
|
9f698a8fec | ||
|
|
075fb52848 | ||
|
|
738d274095 | ||
|
|
ef47de7e4f | ||
|
|
489d040d8f | ||
|
|
6b1c450752 | ||
|
|
bbcb2f43dc | ||
|
|
a307780752 | ||
|
|
c2f89f9cb2 | ||
|
|
640e593676 | ||
|
|
ee96f8d48b | ||
|
|
683d602d63 | ||
|
|
7ea2002975 | ||
|
|
ec92494211 | ||
|
|
6bddb666fc | ||
|
|
7db97c540b | ||
|
|
6aa2cb9009 | ||
|
|
575cd911cb | ||
|
|
78a2c7cf0d | ||
|
|
0c2c7b59fc | ||
|
|
5049220e03 | ||
|
|
ab9c48b1e6 | ||
|
|
2958106e42 | ||
|
|
ce07bfa0c8 | ||
|
|
4d6fa2625e | ||
|
|
ee4c3eeb27 | ||
|
|
55e5b8df70 | ||
|
|
f3286e7fd1 | ||
|
|
e6e434d13f | ||
|
|
28e9ac1529 | ||
|
|
874d785381 | ||
|
|
0c31a78df0 | ||
|
|
3b274b4ec2 | ||
|
|
59b9ef79e5 | ||
|
|
5d4fe443d0 | ||
|
|
39112ff7ff | ||
|
|
2135af7107 | ||
|
|
05a83db886 | ||
|
|
f4ba3d524f | ||
|
|
3a76fd8c88 | ||
|
|
3357d4c9c8 | ||
|
|
2d1c33f1e9 | ||
|
|
03358cab4f | ||
|
|
e188828423 | ||
|
|
2ee8c3807b | ||
|
|
88de2148ae | ||
|
|
871a5fe78a | ||
|
|
60a006008a | ||
|
|
df7dcd3a9c | ||
|
|
292e37aaac | ||
|
|
4906f665fd | ||
|
|
68afaf0cb8 | ||
|
|
38c2d1f1b4 | ||
|
|
4ab5722759 | ||
|
|
51ea9c42d3 | ||
|
|
d6e0bbf0e8 | ||
|
|
e80313e459 | ||
|
|
9decc6866f | ||
|
|
e12f182e7f | ||
|
|
b9aaf55193 | ||
|
|
8567948084 | ||
|
|
37f1f4225d | ||
|
|
6dbc643c44 | ||
|
|
d2fc126fed | ||
|
|
ab721873f3 | ||
|
|
2984bd1604 | ||
|
|
e50a683336 | ||
|
|
9c69e35cfa | ||
|
|
55b80e62cd | ||
|
|
09d304d782 | ||
|
|
46c8007e94 | ||
|
|
b367328df0 | ||
|
|
c6f5a7077f | ||
|
|
7c372f0392 | ||
|
|
e8bb20d988 | ||
|
|
737702d78c | ||
|
|
98c2323ff2 | ||
|
|
d2fe4604dd | ||
|
|
b0dc857463 | ||
|
|
bac29ac933 | ||
|
|
65bc214fb2 | ||
|
|
0434a5db66 | ||
|
|
747adfcb11 | ||
|
|
7b5604873e | ||
|
|
c6da2013bd | ||
|
|
b9881fcb6f | ||
|
|
303886ed53 | ||
|
|
1272c81fa9 | ||
|
|
ade5735dc2 | ||
|
|
7399968fe8 | ||
|
|
658592973e | ||
|
|
24983aeb09 | ||
|
|
8aff1be225 | ||
|
|
c155f26272 | ||
|
|
bb336391ff | ||
|
|
3f4ddead72 | ||
|
|
168e0eca66 | ||
|
|
e7eaa4f67d | ||
|
|
ad9bf93b52 | ||
|
|
774707de65 | ||
|
|
e28a2646bf | ||
|
|
2916333d71 | ||
|
|
d3d5f2b348 | ||
|
|
4657cd453c | ||
|
|
577ce45b64 | ||
|
|
ee3e5935d6 | ||
|
|
5ba68ea134 | ||
|
|
12869a7e9e | ||
|
|
d10e2ab011 | ||
|
|
170e42098a | ||
|
|
fe7a482969 | ||
|
|
aa07ec0304 | ||
|
|
cd5a82aa93 | ||
|
|
7a62e52d60 | ||
|
|
6fc58fec1d | ||
|
|
f586542dc3 | ||
|
|
6697cd8ea1 | ||
|
|
c435e8a6a5 | ||
|
|
15ae680ec7 | ||
|
|
bdea0287a5 | ||
|
|
b56728f843 | ||
|
|
7f2b34fd4b | ||
|
|
146349beb8 | ||
|
|
326e0c66b6 | ||
|
|
edfb960e97 | ||
|
|
b2d438785b | ||
|
|
b6dad78d02 | ||
|
|
42d4854f9c | ||
|
|
e9081d77c9 | ||
|
|
181beb85e5 | ||
|
|
ebca348723 |
No files matched your search
@@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
"version": "0.0.1",
|
||||||
|
"configurations": [
|
||||||
|
{
|
||||||
|
"name": "web-staging",
|
||||||
|
"runtimeExecutable": "pnpm",
|
||||||
|
"runtimeArgs": ["--filter", "web", "start:staging"],
|
||||||
|
"port": 5173
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
[mcp_servers.playwright_macos]
|
||||||
|
url = "http://100.96.0.26:8931/mcp"
|
||||||
|
tool_timeout_sec = 120
|
||||||
|
startup_timeout_sec = 30
|
||||||
+6
-5
@@ -19,15 +19,16 @@ website/LICENSE
|
|||||||
|
|
||||||
*.log
|
*.log
|
||||||
|
|
||||||
!.claude/settings.json
|
|
||||||
|
|
||||||
*.temp.MD
|
*.temp.MD
|
||||||
|
|
||||||
*.md
|
*.md
|
||||||
!README.md
|
!README.md
|
||||||
!AGENTS.md
|
!design-qa.md
|
||||||
!agents/**/*.md
|
!docs/specs/home-banner-production.md
|
||||||
!skills/**/*.md
|
!docs/specs/match-status-and-result-presentation.md
|
||||||
|
!docs/specs/information-visible-ui.md
|
||||||
|
!docs/ux-audit-2026-11-10/06-ui-improvement-review.md
|
||||||
|
!docs/ux-audit-2026-11-10/07-visual-design-review.md
|
||||||
/tmp/
|
/tmp/
|
||||||
/user-game-history/
|
/user-game-history/
|
||||||
/*.txt
|
/*.txt
|
||||||
|
|||||||
@@ -1,189 +0,0 @@
|
|||||||
# AGENTS.md
|
|
||||||
|
|
||||||
This file provides guidance to AI coding agents (Claude Code, Cursor, Copilot, Antigravity, etc.) when working with code in this repository.
|
|
||||||
|
|
||||||
## Repository Overview
|
|
||||||
|
|
||||||
A collection of skills for Claude.ai and Claude Code for senior software engineers. Skills are packaged instructions and scripts that extend Claude and your coding agents capabilities.
|
|
||||||
|
|
||||||
## OpenCode Integration
|
|
||||||
|
|
||||||
OpenCode uses a **skill-driven execution model** powered by the `skill` tool and this repository's `/skills` directory.
|
|
||||||
|
|
||||||
### Core Rules
|
|
||||||
|
|
||||||
- If a task matches a skill, you MUST invoke it
|
|
||||||
- Skills are located in `skills/<skill-name>/SKILL.md`
|
|
||||||
- Never implement directly if a skill applies
|
|
||||||
- Always follow the skill instructions exactly (do not partially apply them)
|
|
||||||
|
|
||||||
### Intent → Skill Mapping
|
|
||||||
|
|
||||||
The agent should automatically map user intent to skills:
|
|
||||||
|
|
||||||
- Feature / new functionality → `spec-driven-development`, then `incremental-implementation`, `test-driven-development`
|
|
||||||
- Planning / breakdown → `planning-and-task-breakdown`
|
|
||||||
- Bug / failure / unexpected behavior → `debugging-and-error-recovery`
|
|
||||||
- Code review → `code-review-and-quality`
|
|
||||||
- Refactoring / simplification → `code-simplification`
|
|
||||||
- API or interface design → `api-and-interface-design`
|
|
||||||
- UI work → `frontend-ui-engineering`
|
|
||||||
|
|
||||||
### Lifecycle Mapping (Implicit Commands)
|
|
||||||
|
|
||||||
OpenCode does not support slash commands like `/spec` or `/plan`.
|
|
||||||
|
|
||||||
Instead, the agent must internally follow this lifecycle:
|
|
||||||
|
|
||||||
- DEFINE → `spec-driven-development`
|
|
||||||
- PLAN → `planning-and-task-breakdown`
|
|
||||||
- BUILD → `incremental-implementation` + `test-driven-development`
|
|
||||||
- VERIFY → `debugging-and-error-recovery`
|
|
||||||
- REVIEW → `code-review-and-quality`
|
|
||||||
- SHIP → `shipping-and-launch`
|
|
||||||
|
|
||||||
### Execution Model
|
|
||||||
|
|
||||||
For every request:
|
|
||||||
|
|
||||||
1. Determine if any skill applies (even 1% chance)
|
|
||||||
2. Invoke the appropriate skill using the `skill` tool
|
|
||||||
3. Follow the skill workflow strictly
|
|
||||||
4. Only proceed to implementation after required steps (spec, plan, etc.) are complete
|
|
||||||
|
|
||||||
### Anti-Rationalization
|
|
||||||
|
|
||||||
The following thoughts are incorrect and must be ignored:
|
|
||||||
|
|
||||||
- "This is too small for a skill"
|
|
||||||
- "I can just quickly implement this"
|
|
||||||
- "I’ll gather context first"
|
|
||||||
|
|
||||||
Correct behavior:
|
|
||||||
|
|
||||||
- Always check for and use skills first
|
|
||||||
|
|
||||||
This ensures OpenCode behaves similarly to Claude Code with full workflow enforcement.
|
|
||||||
|
|
||||||
## Orchestration: Personas, Skills, and Commands
|
|
||||||
|
|
||||||
This repo has three composable layers. They have different jobs and should not be confused:
|
|
||||||
|
|
||||||
- **Skills** (`skills/<name>/SKILL.md`) — workflows with steps and exit criteria. The *how*. Mandatory hops when an intent matches.
|
|
||||||
- **Personas** (`agents/<role>.md`) — roles with a perspective and an output format. The *who*.
|
|
||||||
- **Slash commands** (`.claude/commands/*.md`) — user-facing entry points. The *when*. The orchestration layer.
|
|
||||||
|
|
||||||
Composition rule: **the user (or a slash command) is the orchestrator. Personas do not invoke other personas.** A persona may invoke skills.
|
|
||||||
|
|
||||||
The only multi-persona orchestration pattern this repo endorses is **parallel fan-out with a merge step** — used by `/ship` to run `code-reviewer`, `security-auditor`, and `test-engineer` concurrently and synthesize their reports. Do not build a "router" persona that decides which other persona to call; that's the job of slash commands and intent mapping.
|
|
||||||
|
|
||||||
See [agents/README.md](agents/README.md) for the decision matrix and [references/orchestration-patterns.md](references/orchestration-patterns.md) for the full pattern catalog.
|
|
||||||
|
|
||||||
**Claude Code interop:** the personas in `agents/` work as Claude Code subagents (auto-discovered from this plugin's `agents/` directory) and as Agent Teams teammates (referenced by name when spawning). Two platform constraints align with our rules: subagents cannot spawn other subagents, and teams cannot nest. Plugin agents silently ignore the `hooks`, `mcpServers`, and `permissionMode` frontmatter fields.
|
|
||||||
|
|
||||||
## Creating a New Skill
|
|
||||||
|
|
||||||
### Directory Structure
|
|
||||||
|
|
||||||
```
|
|
||||||
skills/
|
|
||||||
{skill-name}/ # kebab-case directory name
|
|
||||||
SKILL.md # Required: skill definition
|
|
||||||
scripts/ # Required: executable scripts
|
|
||||||
{script-name}.sh # Bash scripts (preferred)
|
|
||||||
{skill-name}.zip # Required: packaged for distribution
|
|
||||||
```
|
|
||||||
|
|
||||||
### Naming Conventions
|
|
||||||
|
|
||||||
- **Skill directory**: `kebab-case` (e.g. `web-quality`)
|
|
||||||
- **SKILL.md**: Always uppercase, always this exact filename
|
|
||||||
- **Scripts**: `kebab-case.sh` (e.g., `deploy.sh`, `fetch-logs.sh`)
|
|
||||||
- **Zip file**: Must match directory name exactly: `{skill-name}.zip`
|
|
||||||
|
|
||||||
### SKILL.md Format
|
|
||||||
|
|
||||||
```markdown
|
|
||||||
---
|
|
||||||
name: {skill-name}
|
|
||||||
description: {One sentence describing what the skill does, followed by one or more "Use when" trigger conditions. Include trigger phrases like "Deploy my app" or "Check logs" when helpful.}
|
|
||||||
---
|
|
||||||
|
|
||||||
# {Skill Title}
|
|
||||||
|
|
||||||
{Brief overview of what the skill does and why it matters.}
|
|
||||||
|
|
||||||
## How It Works
|
|
||||||
|
|
||||||
{Numbered list explaining the skill's workflow}
|
|
||||||
|
|
||||||
Equivalent headings like `Workflow`, `Core Process`, or `When to Use` are fine when they communicate the same structure clearly.
|
|
||||||
|
|
||||||
## Usage (Optional)
|
|
||||||
|
|
||||||
Include this section only if the skill ships runnable helpers under `scripts/`. Markdown-only skills can omit both the section and the directory entirely.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
bash /mnt/skills/user/{skill-name}/scripts/{script}.sh [args]
|
|
||||||
```
|
|
||||||
|
|
||||||
**Arguments:**
|
|
||||||
- `arg1` - Description (defaults to X)
|
|
||||||
|
|
||||||
**Examples:**
|
|
||||||
{Show 2-3 common usage patterns}
|
|
||||||
|
|
||||||
## Output
|
|
||||||
|
|
||||||
{Show example output users will see}
|
|
||||||
|
|
||||||
## Present Results to User
|
|
||||||
|
|
||||||
{Template for how Claude should format results when presenting to users}
|
|
||||||
|
|
||||||
## Troubleshooting
|
|
||||||
|
|
||||||
{Common issues and solutions, especially network/permissions errors}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Best Practices for Context Efficiency
|
|
||||||
|
|
||||||
Skills are loaded on-demand — only the skill name and description are loaded at startup. The full `SKILL.md` loads into context only when the agent decides the skill is relevant. To minimize context usage:
|
|
||||||
|
|
||||||
- **Keep SKILL.md under 500 lines** — put detailed reference material in separate files
|
|
||||||
- **Write specific descriptions** — helps the agent know exactly when to activate the skill
|
|
||||||
- **Use progressive disclosure** — reference supporting files that get read only when needed
|
|
||||||
- **Prefer scripts over inline code** — script execution doesn't consume context (only output does)
|
|
||||||
- **File references work one level deep** — link directly from SKILL.md to supporting files
|
|
||||||
|
|
||||||
### Script Requirements
|
|
||||||
|
|
||||||
- Use `#!/bin/bash` shebang
|
|
||||||
- Use `set -e` for fail-fast behavior
|
|
||||||
- Write status messages to stderr: `echo "Message" >&2`
|
|
||||||
- Write machine-readable output (JSON) to stdout
|
|
||||||
- Include a cleanup trap for temp files
|
|
||||||
- Reference the script path as `/mnt/skills/user/{skill-name}/scripts/{script}.sh`
|
|
||||||
|
|
||||||
### Creating the Zip Package
|
|
||||||
|
|
||||||
After creating or updating a skill:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cd skills
|
|
||||||
zip -r {skill-name}.zip {skill-name}/
|
|
||||||
```
|
|
||||||
|
|
||||||
### End-User Installation
|
|
||||||
|
|
||||||
Document these two installation methods for users:
|
|
||||||
|
|
||||||
**Claude Code:**
|
|
||||||
```bash
|
|
||||||
cp -r skills/{skill-name} ~/.claude/skills/
|
|
||||||
```
|
|
||||||
|
|
||||||
**claude.ai:**
|
|
||||||
Add the skill to project knowledge or paste SKILL.md contents into the conversation.
|
|
||||||
|
|
||||||
If the skill requires network access, instruct users to add required domains at `claude.ai/settings/capabilities`.
|
|
||||||
+1
-1
@@ -1 +1 @@
|
|||||||
68
|
83
|
||||||
+18
-6
@@ -1,11 +1,11 @@
|
|||||||
# syntax=docker/dockerfile:1.7
|
# syntax=docker/dockerfile:1.7
|
||||||
|
|
||||||
FROM node:24-bookworm-slim AS pnpm-base
|
FROM node:26-bookworm-slim AS pnpm-base
|
||||||
|
|
||||||
ENV PNPM_HOME=/pnpm
|
ENV PNPM_HOME=/pnpm
|
||||||
ENV PATH="${PNPM_HOME}:${PATH}"
|
ENV PATH="${PNPM_HOME}:${PATH}"
|
||||||
|
|
||||||
RUN corepack enable
|
RUN npm install --global pnpm@10.4.1
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
@@ -14,24 +14,27 @@ FROM pnpm-base AS deps
|
|||||||
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
|
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
|
||||||
COPY apps/api/package.json apps/api/package.json
|
COPY apps/api/package.json apps/api/package.json
|
||||||
COPY apps/web/package.json apps/web/package.json
|
COPY apps/web/package.json apps/web/package.json
|
||||||
|
COPY packages/contracts/package.json packages/contracts/package.json
|
||||||
|
|
||||||
RUN pnpm install --frozen-lockfile --filter api... --filter lolympus-tournament-support
|
RUN pnpm install --frozen-lockfile --filter api... --filter lolympus-tournament-support
|
||||||
|
|
||||||
FROM deps AS build
|
FROM deps AS build
|
||||||
|
|
||||||
|
COPY packages/contracts packages/contracts
|
||||||
COPY apps/api apps/api
|
COPY apps/api apps/api
|
||||||
|
|
||||||
RUN pnpm --filter api build
|
RUN pnpm --filter api... build
|
||||||
|
|
||||||
FROM pnpm-base AS prod-deps
|
FROM pnpm-base AS prod-deps
|
||||||
|
|
||||||
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
|
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
|
||||||
COPY apps/api/package.json apps/api/package.json
|
COPY apps/api/package.json apps/api/package.json
|
||||||
COPY apps/web/package.json apps/web/package.json
|
COPY apps/web/package.json apps/web/package.json
|
||||||
|
COPY packages/contracts/package.json packages/contracts/package.json
|
||||||
|
|
||||||
RUN pnpm install --prod --frozen-lockfile --filter api... --filter lolympus-tournament-support
|
RUN pnpm install --prod --frozen-lockfile --filter api... --filter lolympus-tournament-support
|
||||||
|
|
||||||
FROM gcr.io/distroless/nodejs24-debian13:nonroot AS runtime
|
FROM gcr.io/distroless/nodejs26-debian13:nonroot AS runtime
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
@@ -41,9 +44,18 @@ COPY --from=prod-deps --chown=nonroot:nonroot /app/package.json ./package.json
|
|||||||
COPY --from=prod-deps --chown=nonroot:nonroot /app/node_modules ./node_modules
|
COPY --from=prod-deps --chown=nonroot:nonroot /app/node_modules ./node_modules
|
||||||
COPY --from=prod-deps --chown=nonroot:nonroot /app/apps/api/package.json ./apps/api/package.json
|
COPY --from=prod-deps --chown=nonroot:nonroot /app/apps/api/package.json ./apps/api/package.json
|
||||||
COPY --from=prod-deps --chown=nonroot:nonroot /app/apps/api/node_modules ./apps/api/node_modules
|
COPY --from=prod-deps --chown=nonroot:nonroot /app/apps/api/node_modules ./apps/api/node_modules
|
||||||
|
COPY --from=build --chown=nonroot:nonroot /app/packages/contracts/package.json ./packages/contracts/package.json
|
||||||
|
COPY --from=build --chown=nonroot:nonroot /app/packages/contracts/dist ./packages/contracts/dist
|
||||||
|
COPY --chown=nonroot:nonroot apps/api/newrelic.cjs ./apps/api/newrelic.cjs
|
||||||
COPY --from=build --chown=nonroot:nonroot /app/apps/api/dist ./apps/api/dist
|
COPY --from=build --chown=nonroot:nonroot /app/apps/api/dist ./apps/api/dist
|
||||||
COPY --chown=nonroot:nonroot apps/project.env ./project.env
|
COPY --chown=nonroot:nonroot apps/project.env ./project.env
|
||||||
|
|
||||||
EXPOSE 10712
|
EXPOSE 3000
|
||||||
|
|
||||||
CMD ["apps/api/dist/main.js"]
|
ENV NEW_RELIC_HOME=/app/apps/api \
|
||||||
|
NEW_RELIC_APP_NAME=lolympus \
|
||||||
|
NEW_RELIC_AI_MONITORING_ENABLED=true \
|
||||||
|
NEW_RELIC_CUSTOM_INSIGHTS_EVENTS_MAX_SAMPLES_STORED=100000 \
|
||||||
|
NEW_RELIC_SPAN_EVENTS_MAX_SAMPLES_STORED=10000
|
||||||
|
|
||||||
|
CMD ["--import", "/app/apps/api/node_modules/newrelic/esm-loader.mjs", "-r", "/app/apps/api/node_modules/newrelic", "apps/api/dist/main.js"]
|
||||||
@@ -0,0 +1,480 @@
|
|||||||
|
GNU LIBRARY GENERAL PUBLIC LICENSE
|
||||||
|
Version 2, June 1991
|
||||||
|
|
||||||
|
Copyright (C) 1991 Free Software Foundation, Inc.
|
||||||
|
<https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
[This is the first released version of the library GPL. It is
|
||||||
|
numbered 2 because it goes with version 2 of the ordinary GPL.]
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The licenses for most software are designed to take away your
|
||||||
|
freedom to share and change it. By contrast, the GNU General Public
|
||||||
|
Licenses are intended to guarantee your freedom to share and change
|
||||||
|
free software--to make sure the software is free for all its users.
|
||||||
|
|
||||||
|
This license, the Library General Public License, applies to some
|
||||||
|
specially designated Free Software Foundation software, and to any
|
||||||
|
other libraries whose authors decide to use it. You can use it for
|
||||||
|
your libraries, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
this service if you wish), that you receive source code or can get it
|
||||||
|
if you want it, that you can change the software or use pieces of it
|
||||||
|
in new free programs; and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to make restrictions that forbid
|
||||||
|
anyone to deny you these rights or to ask you to surrender the rights.
|
||||||
|
These restrictions translate to certain responsibilities for you if
|
||||||
|
you distribute copies of the library, or if you modify it.
|
||||||
|
|
||||||
|
For example, if you distribute copies of the library, whether gratis
|
||||||
|
or for a fee, you must give the recipients all the rights that we gave
|
||||||
|
you. You must make sure that they, too, receive or can get the source
|
||||||
|
code. If you link a program with the library, you must provide
|
||||||
|
complete object files to the recipients so that they can relink them
|
||||||
|
with the library, after making changes to the library and recompiling
|
||||||
|
it. And you must show them these terms so they know their rights.
|
||||||
|
|
||||||
|
Our method of protecting your rights has two steps: (1) copyright
|
||||||
|
the library, and (2) offer you this license which gives you legal
|
||||||
|
permission to copy, distribute and/or modify the library.
|
||||||
|
|
||||||
|
Also, for each distributor's protection, we want to make certain
|
||||||
|
that everyone understands that there is no warranty for this free
|
||||||
|
library. If the library is modified by someone else and passed on, we
|
||||||
|
want its recipients to know that what they have is not the original
|
||||||
|
version, so that any problems introduced by others will not reflect on
|
||||||
|
the original authors' reputations.
|
||||||
|
|
||||||
|
Finally, any free program is threatened constantly by software
|
||||||
|
patents. We wish to avoid the danger that companies distributing free
|
||||||
|
software will individually obtain patent licenses, thus in effect
|
||||||
|
transforming the program into proprietary software. To prevent this,
|
||||||
|
we have made it clear that any patent must be licensed for everyone's
|
||||||
|
free use or not licensed at all.
|
||||||
|
|
||||||
|
Most GNU software, including some libraries, is covered by the ordinary
|
||||||
|
GNU General Public License, which was designed for utility programs. This
|
||||||
|
license, the GNU Library General Public License, applies to certain
|
||||||
|
designated libraries. This license is quite different from the ordinary
|
||||||
|
one; be sure to read it in full, and don't assume that anything in it is
|
||||||
|
the same as in the ordinary license.
|
||||||
|
|
||||||
|
The reason we have a separate public license for some libraries is that
|
||||||
|
they blur the distinction we usually make between modifying or adding to a
|
||||||
|
program and simply using it. Linking a program with a library, without
|
||||||
|
changing the library, is in some sense simply using the library, and is
|
||||||
|
analogous to running a utility program or application program. However, in
|
||||||
|
a textual and legal sense, the linked executable is a combined work, a
|
||||||
|
derivative of the original library, and the ordinary General Public License
|
||||||
|
treats it as such.
|
||||||
|
|
||||||
|
Because of this blurred distinction, using the ordinary General
|
||||||
|
Public License for libraries did not effectively promote software
|
||||||
|
sharing, because most developers did not use the libraries. We
|
||||||
|
concluded that weaker conditions might promote sharing better.
|
||||||
|
|
||||||
|
However, unrestricted linking of non-free programs would deprive the
|
||||||
|
users of those programs of all benefit from the free status of the
|
||||||
|
libraries themselves. This Library General Public License is intended to
|
||||||
|
permit developers of non-free programs to use free libraries, while
|
||||||
|
preserving your freedom as a user of such programs to change the free
|
||||||
|
libraries that are incorporated in them. (We have not seen how to achieve
|
||||||
|
this as regards changes in header files, but we have achieved it as regards
|
||||||
|
changes in the actual functions of the Library.) The hope is that this
|
||||||
|
will lead to faster development of free libraries.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow. Pay close attention to the difference between a
|
||||||
|
"work based on the library" and a "work that uses the library". The
|
||||||
|
former contains code derived from the library, while the latter only
|
||||||
|
works together with the library.
|
||||||
|
|
||||||
|
Note that it is possible for a library to be covered by the ordinary
|
||||||
|
General Public License rather than by this special one.
|
||||||
|
|
||||||
|
GNU LIBRARY GENERAL PUBLIC LICENSE
|
||||||
|
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||||
|
|
||||||
|
0. This License Agreement applies to any software library which
|
||||||
|
contains a notice placed by the copyright holder or other authorized
|
||||||
|
party saying it may be distributed under the terms of this Library
|
||||||
|
General Public License (also called "this License"). Each licensee is
|
||||||
|
addressed as "you".
|
||||||
|
|
||||||
|
A "library" means a collection of software functions and/or data
|
||||||
|
prepared so as to be conveniently linked with application programs
|
||||||
|
(which use some of those functions and data) to form executables.
|
||||||
|
|
||||||
|
The "Library", below, refers to any such software library or work
|
||||||
|
which has been distributed under these terms. A "work based on the
|
||||||
|
Library" means either the Library or any derivative work under
|
||||||
|
copyright law: that is to say, a work containing the Library or a
|
||||||
|
portion of it, either verbatim or with modifications and/or translated
|
||||||
|
straightforwardly into another language. (Hereinafter, translation is
|
||||||
|
included without limitation in the term "modification".)
|
||||||
|
|
||||||
|
"Source code" for a work means the preferred form of the work for
|
||||||
|
making modifications to it. For a library, complete source code means
|
||||||
|
all the source code for all modules it contains, plus any associated
|
||||||
|
interface definition files, plus the scripts used to control compilation
|
||||||
|
and installation of the library.
|
||||||
|
|
||||||
|
Activities other than copying, distribution and modification are not
|
||||||
|
covered by this License; they are outside its scope. The act of
|
||||||
|
running a program using the Library is not restricted, and output from
|
||||||
|
such a program is covered only if its contents constitute a work based
|
||||||
|
on the Library (independent of the use of the Library in a tool for
|
||||||
|
writing it). Whether that is true depends on what the Library does
|
||||||
|
and what the program that uses the Library does.
|
||||||
|
|
||||||
|
1. You may copy and distribute verbatim copies of the Library's
|
||||||
|
complete source code as you receive it, in any medium, provided that
|
||||||
|
you conspicuously and appropriately publish on each copy an
|
||||||
|
appropriate copyright notice and disclaimer of warranty; keep intact
|
||||||
|
all the notices that refer to this License and to the absence of any
|
||||||
|
warranty; and distribute a copy of this License along with the
|
||||||
|
Library.
|
||||||
|
|
||||||
|
You may charge a fee for the physical act of transferring a copy,
|
||||||
|
and you may at your option offer warranty protection in exchange for a
|
||||||
|
fee.
|
||||||
|
|
||||||
|
2. You may modify your copy or copies of the Library or any portion
|
||||||
|
of it, thus forming a work based on the Library, and copy and
|
||||||
|
distribute such modifications or work under the terms of Section 1
|
||||||
|
above, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The modified work must itself be a software library.
|
||||||
|
|
||||||
|
b) You must cause the files modified to carry prominent notices
|
||||||
|
stating that you changed the files and the date of any change.
|
||||||
|
|
||||||
|
c) You must cause the whole of the work to be licensed at no
|
||||||
|
charge to all third parties under the terms of this License.
|
||||||
|
|
||||||
|
d) If a facility in the modified Library refers to a function or a
|
||||||
|
table of data to be supplied by an application program that uses
|
||||||
|
the facility, other than as an argument passed when the facility
|
||||||
|
is invoked, then you must make a good faith effort to ensure that,
|
||||||
|
in the event an application does not supply such function or
|
||||||
|
table, the facility still operates, and performs whatever part of
|
||||||
|
its purpose remains meaningful.
|
||||||
|
|
||||||
|
(For example, a function in a library to compute square roots has
|
||||||
|
a purpose that is entirely well-defined independent of the
|
||||||
|
application. Therefore, Subsection 2d requires that any
|
||||||
|
application-supplied function or table used by this function must
|
||||||
|
be optional: if the application does not supply it, the square
|
||||||
|
root function must still compute square roots.)
|
||||||
|
|
||||||
|
These requirements apply to the modified work as a whole. If
|
||||||
|
identifiable sections of that work are not derived from the Library,
|
||||||
|
and can be reasonably considered independent and separate works in
|
||||||
|
themselves, then this License, and its terms, do not apply to those
|
||||||
|
sections when you distribute them as separate works. But when you
|
||||||
|
distribute the same sections as part of a whole which is a work based
|
||||||
|
on the Library, the distribution of the whole must be on the terms of
|
||||||
|
this License, whose permissions for other licensees extend to the
|
||||||
|
entire whole, and thus to each and every part regardless of who wrote
|
||||||
|
it.
|
||||||
|
|
||||||
|
Thus, it is not the intent of this section to claim rights or contest
|
||||||
|
your rights to work written entirely by you; rather, the intent is to
|
||||||
|
exercise the right to control the distribution of derivative or
|
||||||
|
collective works based on the Library.
|
||||||
|
|
||||||
|
In addition, mere aggregation of another work not based on the Library
|
||||||
|
with the Library (or with a work based on the Library) on a volume of
|
||||||
|
a storage or distribution medium does not bring the other work under
|
||||||
|
the scope of this License.
|
||||||
|
|
||||||
|
3. You may opt to apply the terms of the ordinary GNU General Public
|
||||||
|
License instead of this License to a given copy of the Library. To do
|
||||||
|
this, you must alter all the notices that refer to this License, so
|
||||||
|
that they refer to the ordinary GNU General Public License, version 2,
|
||||||
|
instead of to this License. (If a newer version than version 2 of the
|
||||||
|
ordinary GNU General Public License has appeared, then you can specify
|
||||||
|
that version instead if you wish.) Do not make any other change in
|
||||||
|
these notices.
|
||||||
|
|
||||||
|
Once this change is made in a given copy, it is irreversible for
|
||||||
|
that copy, so the ordinary GNU General Public License applies to all
|
||||||
|
subsequent copies and derivative works made from that copy.
|
||||||
|
|
||||||
|
This option is useful when you wish to copy part of the code of
|
||||||
|
the Library into a program that is not a library.
|
||||||
|
|
||||||
|
4. You may copy and distribute the Library (or a portion or
|
||||||
|
derivative of it, under Section 2) in object code or executable form
|
||||||
|
under the terms of Sections 1 and 2 above provided that you accompany
|
||||||
|
it with the complete corresponding machine-readable source code, which
|
||||||
|
must be distributed under the terms of Sections 1 and 2 above on a
|
||||||
|
medium customarily used for software interchange.
|
||||||
|
|
||||||
|
If distribution of object code is made by offering access to copy
|
||||||
|
from a designated place, then offering equivalent access to copy the
|
||||||
|
source code from the same place satisfies the requirement to
|
||||||
|
distribute the source code, even though third parties are not
|
||||||
|
compelled to copy the source along with the object code.
|
||||||
|
|
||||||
|
5. A program that contains no derivative of any portion of the
|
||||||
|
Library, but is designed to work with the Library by being compiled or
|
||||||
|
linked with it, is called a "work that uses the Library". Such a
|
||||||
|
work, in isolation, is not a derivative work of the Library, and
|
||||||
|
therefore falls outside the scope of this License.
|
||||||
|
|
||||||
|
However, linking a "work that uses the Library" with the Library
|
||||||
|
creates an executable that is a derivative of the Library (because it
|
||||||
|
contains portions of the Library), rather than a "work that uses the
|
||||||
|
library". The executable is therefore covered by this License.
|
||||||
|
Section 6 states terms for distribution of such executables.
|
||||||
|
|
||||||
|
When a "work that uses the Library" uses material from a header file
|
||||||
|
that is part of the Library, the object code for the work may be a
|
||||||
|
derivative work of the Library even though the source code is not.
|
||||||
|
Whether this is true is especially significant if the work can be
|
||||||
|
linked without the Library, or if the work is itself a library. The
|
||||||
|
threshold for this to be true is not precisely defined by law.
|
||||||
|
|
||||||
|
If such an object file uses only numerical parameters, data
|
||||||
|
structure layouts and accessors, and small macros and small inline
|
||||||
|
functions (ten lines or less in length), then the use of the object
|
||||||
|
file is unrestricted, regardless of whether it is legally a derivative
|
||||||
|
work. (Executables containing this object code plus portions of the
|
||||||
|
Library will still fall under Section 6.)
|
||||||
|
|
||||||
|
Otherwise, if the work is a derivative of the Library, you may
|
||||||
|
distribute the object code for the work under the terms of Section 6.
|
||||||
|
Any executables containing that work also fall under Section 6,
|
||||||
|
whether or not they are linked directly with the Library itself.
|
||||||
|
|
||||||
|
6. As an exception to the Sections above, you may also compile or
|
||||||
|
link a "work that uses the Library" with the Library to produce a
|
||||||
|
work containing portions of the Library, and distribute that work
|
||||||
|
under terms of your choice, provided that the terms permit
|
||||||
|
modification of the work for the customer's own use and reverse
|
||||||
|
engineering for debugging such modifications.
|
||||||
|
|
||||||
|
You must give prominent notice with each copy of the work that the
|
||||||
|
Library is used in it and that the Library and its use are covered by
|
||||||
|
this License. You must supply a copy of this License. If the work
|
||||||
|
during execution displays copyright notices, you must include the
|
||||||
|
copyright notice for the Library among them, as well as a reference
|
||||||
|
directing the user to the copy of this License. Also, you must do one
|
||||||
|
of these things:
|
||||||
|
|
||||||
|
a) Accompany the work with the complete corresponding
|
||||||
|
machine-readable source code for the Library including whatever
|
||||||
|
changes were used in the work (which must be distributed under
|
||||||
|
Sections 1 and 2 above); and, if the work is an executable linked
|
||||||
|
with the Library, with the complete machine-readable "work that
|
||||||
|
uses the Library", as object code and/or source code, so that the
|
||||||
|
user can modify the Library and then relink to produce a modified
|
||||||
|
executable containing the modified Library. (It is understood
|
||||||
|
that the user who changes the contents of definitions files in the
|
||||||
|
Library will not necessarily be able to recompile the application
|
||||||
|
to use the modified definitions.)
|
||||||
|
|
||||||
|
b) Accompany the work with a written offer, valid for at
|
||||||
|
least three years, to give the same user the materials
|
||||||
|
specified in Subsection 6a, above, for a charge no more
|
||||||
|
than the cost of performing this distribution.
|
||||||
|
|
||||||
|
c) If distribution of the work is made by offering access to copy
|
||||||
|
from a designated place, offer equivalent access to copy the above
|
||||||
|
specified materials from the same place.
|
||||||
|
|
||||||
|
d) Verify that the user has already received a copy of these
|
||||||
|
materials or that you have already sent this user a copy.
|
||||||
|
|
||||||
|
For an executable, the required form of the "work that uses the
|
||||||
|
Library" must include any data and utility programs needed for
|
||||||
|
reproducing the executable from it. However, as a special exception,
|
||||||
|
the source code distributed need not include anything that is normally
|
||||||
|
distributed (in either source or binary form) with the major
|
||||||
|
components (compiler, kernel, and so on) of the operating system on
|
||||||
|
which the executable runs, unless that component itself accompanies
|
||||||
|
the executable.
|
||||||
|
|
||||||
|
It may happen that this requirement contradicts the license
|
||||||
|
restrictions of other proprietary libraries that do not normally
|
||||||
|
accompany the operating system. Such a contradiction means you cannot
|
||||||
|
use both them and the Library together in an executable that you
|
||||||
|
distribute.
|
||||||
|
|
||||||
|
7. You may place library facilities that are a work based on the
|
||||||
|
Library side-by-side in a single library together with other library
|
||||||
|
facilities not covered by this License, and distribute such a combined
|
||||||
|
library, provided that the separate distribution of the work based on
|
||||||
|
the Library and of the other library facilities is otherwise
|
||||||
|
permitted, and provided that you do these two things:
|
||||||
|
|
||||||
|
a) Accompany the combined library with a copy of the same work
|
||||||
|
based on the Library, uncombined with any other library
|
||||||
|
facilities. This must be distributed under the terms of the
|
||||||
|
Sections above.
|
||||||
|
|
||||||
|
b) Give prominent notice with the combined library of the fact
|
||||||
|
that part of it is a work based on the Library, and explaining
|
||||||
|
where to find the accompanying uncombined form of the same work.
|
||||||
|
|
||||||
|
8. You may not copy, modify, sublicense, link with, or distribute
|
||||||
|
the Library except as expressly provided under this License. Any
|
||||||
|
attempt otherwise to copy, modify, sublicense, link with, or
|
||||||
|
distribute the Library is void, and will automatically terminate your
|
||||||
|
rights under this License. However, parties who have received copies,
|
||||||
|
or rights, from you under this License will not have their licenses
|
||||||
|
terminated so long as such parties remain in full compliance.
|
||||||
|
|
||||||
|
9. You are not required to accept this License, since you have not
|
||||||
|
signed it. However, nothing else grants you permission to modify or
|
||||||
|
distribute the Library or its derivative works. These actions are
|
||||||
|
prohibited by law if you do not accept this License. Therefore, by
|
||||||
|
modifying or distributing the Library (or any work based on the
|
||||||
|
Library), you indicate your acceptance of this License to do so, and
|
||||||
|
all its terms and conditions for copying, distributing or modifying
|
||||||
|
the Library or works based on it.
|
||||||
|
|
||||||
|
10. Each time you redistribute the Library (or any work based on the
|
||||||
|
Library), the recipient automatically receives a license from the
|
||||||
|
original licensor to copy, distribute, link with or modify the Library
|
||||||
|
subject to these terms and conditions. You may not impose any further
|
||||||
|
restrictions on the recipients' exercise of the rights granted herein.
|
||||||
|
You are not responsible for enforcing compliance by third parties to
|
||||||
|
this License.
|
||||||
|
|
||||||
|
11. If, as a consequence of a court judgment or allegation of patent
|
||||||
|
infringement or for any other reason (not limited to patent issues),
|
||||||
|
conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot
|
||||||
|
distribute so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you
|
||||||
|
may not distribute the Library at all. For example, if a patent
|
||||||
|
license would not permit royalty-free redistribution of the Library by
|
||||||
|
all those who receive copies directly or indirectly through you, then
|
||||||
|
the only way you could satisfy both it and this License would be to
|
||||||
|
refrain entirely from distribution of the Library.
|
||||||
|
|
||||||
|
If any portion of this section is held invalid or unenforceable under any
|
||||||
|
particular circumstance, the balance of the section is intended to apply,
|
||||||
|
and the section as a whole is intended to apply in other circumstances.
|
||||||
|
|
||||||
|
It is not the purpose of this section to induce you to infringe any
|
||||||
|
patents or other property right claims or to contest validity of any
|
||||||
|
such claims; this section has the sole purpose of protecting the
|
||||||
|
integrity of the free software distribution system which is
|
||||||
|
implemented by public license practices. Many people have made
|
||||||
|
generous contributions to the wide range of software distributed
|
||||||
|
through that system in reliance on consistent application of that
|
||||||
|
system; it is up to the author/donor to decide if he or she is willing
|
||||||
|
to distribute software through any other system and a licensee cannot
|
||||||
|
impose that choice.
|
||||||
|
|
||||||
|
This section is intended to make thoroughly clear what is believed to
|
||||||
|
be a consequence of the rest of this License.
|
||||||
|
|
||||||
|
12. If the distribution and/or use of the Library is restricted in
|
||||||
|
certain countries either by patents or by copyrighted interfaces, the
|
||||||
|
original copyright holder who places the Library under this License may add
|
||||||
|
an explicit geographical distribution limitation excluding those countries,
|
||||||
|
so that distribution is permitted only in or among countries not thus
|
||||||
|
excluded. In such case, this License incorporates the limitation as if
|
||||||
|
written in the body of this License.
|
||||||
|
|
||||||
|
13. The Free Software Foundation may publish revised and/or new
|
||||||
|
versions of the Library General Public License from time to time.
|
||||||
|
Such new versions will be similar in spirit to the present version,
|
||||||
|
but may differ in detail to address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the Library
|
||||||
|
specifies a version number of this License which applies to it and
|
||||||
|
"any later version", you have the option of following the terms and
|
||||||
|
conditions either of that version or of any later version published by
|
||||||
|
the Free Software Foundation. If the Library does not specify a
|
||||||
|
license version number, you may choose any version ever published by
|
||||||
|
the Free Software Foundation.
|
||||||
|
|
||||||
|
14. If you wish to incorporate parts of the Library into other free
|
||||||
|
programs whose distribution conditions are incompatible with these,
|
||||||
|
write to the author to ask for permission. For software which is
|
||||||
|
copyrighted by the Free Software Foundation, write to the Free
|
||||||
|
Software Foundation; we sometimes make exceptions for this. Our
|
||||||
|
decision will be guided by the two goals of preserving the free status
|
||||||
|
of all derivatives of our free software and of promoting the sharing
|
||||||
|
and reuse of software generally.
|
||||||
|
|
||||||
|
NO WARRANTY
|
||||||
|
|
||||||
|
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
|
||||||
|
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
|
||||||
|
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
|
||||||
|
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
|
||||||
|
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
|
||||||
|
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
|
||||||
|
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
|
||||||
|
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
|
||||||
|
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
|
||||||
|
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
|
||||||
|
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
|
||||||
|
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
|
||||||
|
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
|
||||||
|
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
|
||||||
|
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
||||||
|
DAMAGES.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Libraries
|
||||||
|
|
||||||
|
If you develop a new library, and you want it to be of the greatest
|
||||||
|
possible use to the public, we recommend making it free software that
|
||||||
|
everyone can redistribute and change. You can do so by permitting
|
||||||
|
redistribution under these terms (or, alternatively, under the terms of the
|
||||||
|
ordinary General Public License).
|
||||||
|
|
||||||
|
To apply these terms, attach the following notices to the library. It is
|
||||||
|
safest to attach them to the start of each source file to most effectively
|
||||||
|
convey the exclusion of warranty; and each file should have at least the
|
||||||
|
"copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the library's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This library is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU Library General Public
|
||||||
|
License as published by the Free Software Foundation; either
|
||||||
|
version 2 of the License, or (at your option) any later version.
|
||||||
|
|
||||||
|
This library is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
Library General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Library General Public
|
||||||
|
License along with this library; if not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or your
|
||||||
|
school, if any, to sign a "copyright disclaimer" for the library, if
|
||||||
|
necessary. Here is a sample; alter the names:
|
||||||
|
|
||||||
|
Yoyodyne, Inc., hereby disclaims all copyright interest in the
|
||||||
|
library `Frob' (a library for tweaking knobs) written by James Random Hacker.
|
||||||
|
|
||||||
|
<signature of Moe Ghoul>, 1 April 1990
|
||||||
|
Moe Ghoul, President of Vice
|
||||||
|
|
||||||
|
That's all there is to it!
|
||||||
@@ -1,114 +1,195 @@
|
|||||||
# LOLYMPUS
|
# LOLYMPUS
|
||||||
|
|
||||||

|
LOLYMPUS는 리그 오브 레전드 커뮤니티의 여러 이벤트 중 내전(사용자 설정 게임)을 운영할 때 필요한 일정 관리, 참여자 모집, 팀 빌딩, 토너먼트 코드 배정, 경기 진행, 실시간 라이브 방송(추후 지원 예정), 결과 수집, 전적 확인을 한곳에서 처리하기 위한 웹 애플리케이션입니다.
|
||||||
|
|
||||||
## Overview
|
<p align="center">
|
||||||
|
<video
|
||||||
|
src="https://git.dahyeon.us/dahyeon/lolympus-tournament-support/raw/branch/release/84/docs/screenshots/lolympus-demo.mp4"
|
||||||
|
poster="docs/screenshots/lolympus-auction.png"
|
||||||
|
width="960"
|
||||||
|
autoplay="autoplay"
|
||||||
|
muted="muted"
|
||||||
|
loop="loop"
|
||||||
|
playsinline="playsinline"
|
||||||
|
controls
|
||||||
|
>
|
||||||
|
<a href="https://git.dahyeon.us/dahyeon/lolympus-tournament-support/raw/branch/release/84/docs/screenshots/lolympus-demo.mp4">3초 간격 데모 영상 보기</a>
|
||||||
|
</video>
|
||||||
|
</p>
|
||||||
|
|
||||||
LOLYMPUS는 리그 오브 레전드 내전을 운영할 때 필요한 것들을 한곳에 모아둔 웹 애플리케이션입니다.
|
<p align="center">
|
||||||
|
<a href="https://git.dahyeon.us/dahyeon/lolympus-tournament-support/raw/branch/release/84/docs/screenshots/lolympus-demo.mp4">3초 간격 데모 영상 보기</a>
|
||||||
|
</p>
|
||||||
|
|
||||||
참가자 모집, 팀 편성, 경매, 토너먼트 코드 배정, 경기 결과 수집, 전적 확인처럼 운영자가 매번 손으로 챙기던 일을 줄이는 데 초점을 맞췄습니다. 처음부터 큰 서비스로 만들었다기보다는, 실제 커뮤니티 내전을 굴리면서 불편했던 부분을 하나씩 붙여가며 만든 프로젝트입니다.
|
## 배포 주소
|
||||||
|
|
||||||
## Purpose
|
| Environment | Version | URL |
|
||||||
|
| ----------- | ------- | -------------------------------------- |
|
||||||
|
| Production | v84 | <https://lolympus.dahyeon.us/> |
|
||||||
|
| Staging | v84 | <https://release-84.lolympus.pages.dev/> |
|
||||||
|
|
||||||
내전은 사람만 모이면 끝나는 일이 아니었습니다. 참가자 티어를 확인하고, 포지션을 맞추고, 팀장을 정하고, 경기마다 토너먼트 코드를 나눠주고, 끝난 뒤 결과까지 정리해야 했습니다.
|
## 개요
|
||||||
|
|
||||||
이 프로젝트는 그 흐름을 최대한 덜 번거롭게 만들기 위해 시작했습니다. 운영자는 전체 진행 상황을 보고, 참가자는 본인이 속한 팀과 다음 경기를 빠르게 확인할 수 있도록 구성했습니다.
|
내전 운영은 사람을 모으는 것에서 끝나지 않습니다. 참가자의 티어와 포지션을 확인하고, 팀장을 정하고, 팀을 나누고, 경기마다 토너먼트 코드를 전달하고, 끝난 뒤 결과와 전적까지 정리해야 합니다.
|
||||||
|
|
||||||
## Screens
|
LOLYMPUS는 이 반복 작업을 줄이는 데 초점을 맞췄습니다. 운영자는 전체 진행 상황을 한눈에 보고, 참가자는 카카오톡 연동을 통해 쉽게 일정 확인/참가 신청하고 본인이 속한 팀과 다음 경기 정보를 빠르게 확인할 수 있습니다.
|
||||||
|
|
||||||
### Match detail
|
## 워크플로우
|
||||||
|
|
||||||

|
1. **내전 개설과 모집**
|
||||||
|
내전 일정, 진행 방식, 정원, 공지사항을 등록하고 참가 신청 현황을 확인합니다.
|
||||||
|
|
||||||
### Team progress
|
2. **참가자 정보 확인**
|
||||||
|
Riot 계정 기반으로 소환사명, 태그, 프로필 아이콘, 솔로랭크/자유랭크 티어, 선호 포지션을 보여줍니다.
|
||||||
|
|
||||||

|
3. **팀 빌딩과 경매**
|
||||||
|
팀장을 기준으로 팀을 구성하거나, 경매 방식으로 참가자를 배정합니다. 현재 입찰가, 팀별 포인트, 낙찰 기록을 함께 관리합니다.
|
||||||
|
|
||||||
## Functionalities
|
4. **팀별 진행 페이지**
|
||||||
|
각 팀은 예정 경기, 상대 팀, 라인업, 토너먼트 코드를 한 화면에서 확인하고 복사할 수 있습니다.
|
||||||
|
|
||||||
**1. 내전 관리**
|
5. **더블 엘리미네이션 운영**
|
||||||
내전 생성, 수정, 모집 상태 변경, 참가자 목록 확인을 할 수 있습니다.
|
4팀/8팀 더블 엘리미네이션 대진표를 생성하고, 시드 교체, 부전승, 제한적 결과 취소, 그랜드 파이널 리셋을 관리합니다.
|
||||||
|
|
||||||
**2. 참가자 정보 관리**
|
6. **결과 수집과 통계**
|
||||||
Riot 계정 정보를 기반으로 소환사명, 태그, 프로필 아이콘, 솔로랭크/자유랭크 티어, 선호 포지션을 보여줍니다.
|
Riot Match-V5 데이터를 이용해 경기 결과를 수집하고, 소환사별 전적과 커뮤니티 리더보드를 제공합니다.
|
||||||
|
|
||||||
**3. 팀 빌딩**
|
## 스크린샷
|
||||||
팀장을 정하고 포지션을 맞춰 팀을 구성합니다. 여러 팀이 참여하는 내전도 처리할 수 있습니다.
|
|
||||||
|
|
||||||
**4. 경매 진행**
|
상단의 경매 화면은 LOLYMPUS가 단순 참가자 목록을 넘어서 실제 팀빌딩 운영까지 다루는 대표 화면입니다. 3초 간격 데모 영상은 README 렌더러가 video 태그를 지원하면 자동/반복 재생되고, 세부 화면은 아래 PNG 원본을 기준으로 볼 수 있습니다.
|
||||||
팀장 경매 방식으로 참가자를 뽑을 수 있고, 현재 입찰가와 낙찰 기록을 관리합니다.
|
|
||||||
|
|
||||||
**5. 토너먼트 코드 관리**
|
| 경매 팀빌딩 |
|
||||||
업로드한 토너먼트 코드를 경기별로 배정하고, 팀별 진행 페이지에서 바로 복사할 수 있게 했습니다.
|
| ----------------------------------------------------------------------------------------------------------------------------------------- |
|
||||||
|
| <a href="docs/screenshots/lolympus-demo.mp4"><img src="docs/screenshots/lolympus-auction.png" alt="LOLYMPUS 경매 팀빌딩" width="840"></a> |
|
||||||
|
|
||||||
**6. 팀별 진행 페이지**
|
| 내전 목록 | 모집 상세 |
|
||||||
각 팀이 자기 경기 일정, 상대 팀, 토너먼트 코드, 종료된 경기 결과를 한 화면에서 확인할 수 있습니다.
|
| ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------- |
|
||||||
|
| <img src="docs/screenshots/lolympus-match-list.png" alt="LOLYMPUS 내전 목록" width="420"> | <img src="docs/screenshots/lolympus-match-recruiting.png" alt="LOLYMPUS 모집 상세" width="420"> |
|
||||||
|
|
||||||
**7. 전적 수집과 통계**
|
| 단판 경기 결과 | 개인 전적 |
|
||||||
Riot Match-V5 데이터를 이용해 내전 결과를 수집하고, 개인 전적과 커뮤니티 리더보드를 보여줍니다.
|
| ------------------------------------------------------------------------------------------------------ | --------------------------------------------------------------------------------------------- |
|
||||||
|
| <img src="docs/screenshots/lolympus-match-result(pair).png" alt="LOLYMPUS 단판 경기 결과" width="420"> | <img src="docs/screenshots/lolympus-player-stats.png" alt="LOLYMPUS 소환사 전적" width="420"> |
|
||||||
|
|
||||||
**8. 커뮤니티 명령 연동**
|
| 경기 상세 |
|
||||||
Dakao/NATS 기반 명령을 받아 참가 신청이나 운영 흐름과 연결할 수 있도록 구성했습니다.
|
| ------------------------------------------------------------------------------------------- |
|
||||||
|
| <img src="docs/screenshots/lolympus-match-detail.png" alt="LOLYMPUS 경기 상세" width="840"> |
|
||||||
|
|
||||||
## Used technologies
|
## 기능
|
||||||
|
|
||||||
|
- 내전 생성, 수정, 모집 상태 변경, 참가자 목록 확인
|
||||||
|
- 카카오톡 명령어를 통한 일정 조회, 내전 참가, 취소, 계정 등록 등 기능 제공
|
||||||
|
- Riot 계정 기반 참가자 프로필, 티어, 포지션 확인
|
||||||
|
- 팀장 지정, 포지션 기반 팀 구성, 다팀 내전 지원
|
||||||
|
- 팀장 경매 방식의 참가자 낙찰과 입찰 기록 관리
|
||||||
|
- 4팀/8팀 더블 엘리미네이션 대진표, 시드 관리, 부전승, 제한적 취소, 그랜드 파이널 리셋 지원
|
||||||
|
- 경기별 토너먼트 코드 배정과 팀별 복사 UI
|
||||||
|
- 팀별 경기 일정, 상대 팀, 라인업, 결과 확인
|
||||||
|
- Riot Match-V5 기반 결과 수집, 개인 전적, 리더보드 제공
|
||||||
|
- Dakao/NATS 기반 커뮤니티 명령 연동
|
||||||
|
|
||||||
|
## 기술 스택
|
||||||
|
|
||||||
- React
|
- React
|
||||||
- Vite
|
- Vite
|
||||||
- TypeScript
|
- TypeScript
|
||||||
- TanStack Query
|
- TanStack Query
|
||||||
- NestJS
|
- NestJS
|
||||||
- MongoDB
|
- MongoDB 8.3
|
||||||
- Redis/Garnet
|
- Redis 8.10 (일반 캐시/스트림과 경매 실시간 상태 공유)
|
||||||
- NATS
|
- NATS
|
||||||
- Riot API
|
- Riot API
|
||||||
- pnpm workspace
|
- pnpm workspace
|
||||||
|
- Kubernetes
|
||||||
|
- ArgoCD
|
||||||
|
|
||||||
## Project structure
|
## 디렉터리 구조
|
||||||
|
|
||||||
```text
|
```text
|
||||||
apps/
|
apps/
|
||||||
api/ NestJS API server
|
api/ NestJS API server
|
||||||
web/ React + Vite client
|
web/ React + Vite client
|
||||||
|
docs/
|
||||||
|
screenshots/ README and project screenshots
|
||||||
scripts/ deployment and maintenance scripts
|
scripts/ deployment and maintenance scripts
|
||||||
```
|
```
|
||||||
|
|
||||||
## How to run
|
## 사전 요구사항
|
||||||
|
|
||||||
|
- Node.js 24 이상
|
||||||
|
- pnpm 10.4.1 (`packageManager` 기준, `corepack enable`로 활성화 권장)
|
||||||
|
- MongoDB 8.3, Redis 8.10, NATS 실행 환경
|
||||||
|
|
||||||
|
일반 캐시/스트림, 경매 실시간 상태, WebSocket Pub/Sub는 `GARNET_ENDPOINT`로 지정한 하나의 Redis 인스턴스를 공유합니다. 값은 `host:port`, `redis://...`, `rediss://...` 형식을 지원합니다. 인증이 필요하면 기존 `GARNET_USERID`(또는 `GARNET_USERNAME`)와 `GARNET_PASSWORD`를 설정합니다. `REDIS_*`, `AUCTION_REDIS_*`, `GARNET_URL` 연결 설정은 사용하지 않습니다. 경매 점검 스크립트도 같은 설정을 사용합니다.
|
||||||
|
|
||||||
|
## 실행 방법
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
pnpm install
|
pnpm install
|
||||||
pnpm start:api:dev
|
pnpm start:api:dev
|
||||||
pnpm dev:web
|
pnpm start:web:dev
|
||||||
```
|
```
|
||||||
|
|
||||||
웹 앱은 기본적으로 `apps/web/.env.development` 값을 사용합니다. API 환경값은 `apps/project.env`와 실행 환경의 시크릿 설정을 같이 확인합니다.
|
웹 앱은 기본적으로 `apps/web/.env.development` 값을 사용합니다. API 환경값은 `apps/project.env`와 실행 환경의 시크릿 설정을 함께 확인합니다.
|
||||||
|
|
||||||
## Checks
|
### Redis 변경 검증
|
||||||
|
|
||||||
|
Redis 8.10.x의 `XREADGROUP CLAIM`, `XACKDEL ACKED`, `DELEX`, `SET IFEQ`, `INCREX`, `HSETEX`를 사용합니다. 스트림의 대기 읽기는 별도 연결에서 실행하며, 처리되지 않은 작업은 길이 제한을 초과해도 보존합니다.
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
pnpm --filter api test
|
pnpm --filter api test -- --runInBand
|
||||||
pnpm --filter web build:staging
|
pnpm --filter api typecheck
|
||||||
|
pnpm --filter api test:redis
|
||||||
|
pnpm --filter api build
|
||||||
```
|
```
|
||||||
|
|
||||||
현재 정리된 기준으로 API 테스트와 웹 테스트 빌드를 통과합니다.
|
`test:redis`는 PATH의 `redis-server` 또는 `REDIS_TEST_SERVER`에 지정한 실행 파일로 Redis 8.10.x를 직접 실행합니다. 임의의 로컬 포트와 일회용 암호를 사용하고, 저장을 비활성화하며, 종료 후 프로세스와 임시 디렉터리를 정리합니다. 애플리케이션 Redis 연결 설정은 사용하지 않습니다. Windows에서는 PowerShell에서 `$env:REDIS_TEST_SERVER = 'C:\tools\redis\redis-server.exe'`처럼 지정할 수 있습니다.
|
||||||
|
|
||||||
## Deployment branches
|
커뮤니티 통계 캐시는 `riot:communitystats:v2:{communityId}:scope` Hash를 사용합니다. 항목별 TTL은 일반 5분, 완성된 상세 24시간, 미완성 상세 60초입니다. 이전 String 캐시는 기존 TTL로 만료되며 새 캐시는 첫 조회에 생성됩니다. 구버전과 신버전은 무효화 대상이 다르므로 배포와 롤백 모두 API 인스턴스를 같은 버전으로 함께 전환해야 합니다.
|
||||||
|
|
||||||
`main`은 항상 배포 가능한 trunk로 유지하고 dev 배포 기준으로 사용합니다.
|
스트림이 계속 커지면 소비자 그룹별 미처리 항목을 확인합니다. 사용이 중단된 그룹도 미처리 항목을 계속 보존할 수 있습니다.
|
||||||
빌드 번호는 `BUILD_NUMBER` 파일에서 1씩 증가시키며, 현재 시작 번호는 `66`입니다.
|
|
||||||
staging 검증이 필요할 때는 `release/66` 같은 임시 브랜치를 만들고,
|
### API New Relic APM
|
||||||
검증이 끝나면 삭제합니다.
|
|
||||||
|
API 서버는 `newrelic` Node.js agent를 앱 코드보다 먼저 preload합니다. Docker 런타임과 `pnpm start:api:*` 스크립트 모두 `NEW_RELIC_HOME`을 API 패키지로 지정해 `apps/api/newrelic.cjs` 설정을 읽습니다.
|
||||||
|
|
||||||
|
Kubernetes에서는 Infisical이 `NEW_RELIC_LICENSE_KEY`를 프로세스 시작 전에 환경변수로 주입해야 합니다. 저장소에는 라이선스 키를 두지 않습니다.
|
||||||
|
|
||||||
|
비밀이 아닌 기본값은 Dockerfile과 `apps/api/newrelic.cjs`에 정의되어 있으며 필요하면 런타임 환경변수로 덮어쓸 수 있습니다.
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
git push origin main:release/66
|
NEW_RELIC_APP_NAME=lolympus
|
||||||
pnpm deploy:web:staging
|
NEW_RELIC_AI_MONITORING_ENABLED=true
|
||||||
|
NEW_RELIC_CUSTOM_INSIGHTS_EVENTS_MAX_SAMPLES_STORED=100000
|
||||||
|
NEW_RELIC_SPAN_EVENTS_MAX_SAMPLES_STORED=10000
|
||||||
```
|
```
|
||||||
|
|
||||||
staging/prod Pages 배포 스크립트는 명시 릴리즈 브랜치 환경변수가 있으면 그
|
New Relic Node agent의 정수 환경변수는 `100k` 같은 축약형 대신 `100000`처럼 숫자 문자열을 사용합니다.
|
||||||
값을 사용하고, 없으면 최신 `release/*` 브랜치를 자동으로 선택합니다. 최신
|
|
||||||
기준은 브랜치가 가리키는 커밋 시각이며, 동률이면 브랜치명 내림차순입니다.
|
|
||||||
staging은 선택된 릴리즈 브랜치로 preview 배포를 만들고, prod는 Cloudflare
|
|
||||||
Pages production branch로 업로드해 production 배포를 만듭니다.
|
|
||||||
|
|
||||||
명시 릴리즈 브랜치는 staging은 `CF_PAGES_STAGING_BRANCH`, prod는
|
### API 성능 리포트 운영
|
||||||
`CF_PAGES_RELEASE_BRANCH`로 지정합니다. Cloudflare Pages production branch가
|
|
||||||
`main`이 아니면 `CF_PAGES_PRODUCTION_BRANCH`로 지정합니다.
|
API 성능 계측은 기본 비활성화이며 필요할 때 `API_PERF_OBSERVABILITY_ENABLED=true`로 켭니다. 전체 API route 목록은 `pnpm --filter api perf:routes`, 성능 리포트는 `pnpm --filter api perf:report`로 생성합니다. New Relic Transaction 실측 duration, New Relic custom event, local NDJSON 파일을 데이터 소스로 사용할 수 있습니다.
|
||||||
|
|
||||||
|
운영 절차와 해석 기준은 `docs/operations/api-performance-runbook.md`를 참고합니다.
|
||||||
|
|
||||||
|
카카오톡 기반 명령어 기능은 Dakao(커스텀 카카오톡 게이트웨이) 연동이 필요합니다. Dakao가 실행 중이 아니거나 NATS를 통해 API 서버와 연결되어 있지 않으면 일정 조회, 내전 참가, 참가 취소, 계정 등록 같은 카카오톡 명령어는 사용할 수 없습니다.
|
||||||
|
|
||||||
|
카카오톡 방을 옮긴 뒤에는 새 방에서 `!내전 데이터이관 예전 닉네임`을 실행합니다. 같은 커뮤니티에서 Riot 계정이 등록된 기존 사용자의 카카오톡 ID만 바뀝니다. 기존 사용자 ID, 권한, 참가 기록은 유지됩니다. 닉네임이 중복되거나 새 ID가 이미 다른 사용자에 연결돼 있으면 운영자가 확인합니다. 계정 소유권 확인은 운영 절차에서 담당합니다.
|
||||||
|
|
||||||
|
## 커맨드
|
||||||
|
|
||||||
|
| Command | Description |
|
||||||
|
| --------------------------------- | -------------------------------- |
|
||||||
|
| `pnpm start:web:dev` | 웹 앱 개발 서버 실행 |
|
||||||
|
| `pnpm start:api:dev` | API 서버 dev 환경 실행 |
|
||||||
|
| `pnpm --filter api test` | API 테스트 실행 |
|
||||||
|
| `pnpm --filter api typecheck` | 테스트를 포함한 API 타입 검사 |
|
||||||
|
| `pnpm --filter api test:redis` | 격리된 Redis 8.10 통합 테스트 실행 |
|
||||||
|
| `pnpm --filter api perf:routes` | API 성능 리포트 대상 route 출력 |
|
||||||
|
| `pnpm --filter api perf:report` | API 성능 리포트 생성 |
|
||||||
|
| `pnpm --filter web build:staging` | 웹 staging 빌드 검증 |
|
||||||
|
| `pnpm deploy:web:staging` | Cloudflare Pages staging 배포 |
|
||||||
|
| `pnpm deploy:web:prod` | Cloudflare Pages production 배포 |
|
||||||
|
|
||||||
|
## 라이선스
|
||||||
|
|
||||||
|
This project is licensed under the GNU Library General Public License v2.0. See [LICENSE](LICENSE) for details.
|
||||||
@@ -1,120 +0,0 @@
|
|||||||
# Agent Personas
|
|
||||||
|
|
||||||
Specialist personas that play a single role with a single perspective. Each persona is a Markdown file consumed as a system prompt by your harness (Claude Code, Cursor, Copilot, etc.).
|
|
||||||
|
|
||||||
| Persona | Role | Best for |
|
|
||||||
|---------|------|----------|
|
|
||||||
| [code-reviewer](code-reviewer.md) | Senior Staff Engineer | Five-axis review before merge |
|
|
||||||
| [security-auditor](security-auditor.md) | Security Engineer | Vulnerability detection, OWASP-style audit |
|
|
||||||
| [test-engineer](test-engineer.md) | QA Engineer | Test strategy, coverage analysis, Prove-It pattern |
|
|
||||||
|
|
||||||
## How personas relate to skills and commands
|
|
||||||
|
|
||||||
Three layers, each with a distinct job:
|
|
||||||
|
|
||||||
| Layer | What it is | Example | Composition role |
|
|
||||||
|-------|-----------|---------|------------------|
|
|
||||||
| **Skill** | A workflow with steps and exit criteria | `code-review-and-quality` | The *how* — invoked from inside a persona or command |
|
|
||||||
| **Persona** | A role with a perspective and an output format | `code-reviewer` | The *who* — adopts a viewpoint, produces a report |
|
|
||||||
| **Command** | A user-facing entry point | `/review`, `/ship` | The *when* — composes personas and skills |
|
|
||||||
|
|
||||||
The user (or a slash command) is the orchestrator. **Personas do not call other personas.** Skills are mandatory hops inside a persona's workflow.
|
|
||||||
|
|
||||||
## When to use each
|
|
||||||
|
|
||||||
### Direct persona invocation
|
|
||||||
Pick this when you want one perspective on the current change and the user is in the loop.
|
|
||||||
|
|
||||||
- "Review this PR" → invoke `code-reviewer` directly
|
|
||||||
- "Are there security issues in `auth.ts`?" → invoke `security-auditor` directly
|
|
||||||
- "What tests are missing for the checkout flow?" → invoke `test-engineer` directly
|
|
||||||
|
|
||||||
### Slash command (single persona behind it)
|
|
||||||
Pick this when there's a repeatable workflow you'd otherwise re-explain every time.
|
|
||||||
|
|
||||||
- `/review` → wraps `code-reviewer` with the project's review skill
|
|
||||||
- `/test` → wraps `test-engineer` with TDD skill
|
|
||||||
|
|
||||||
### Slash command (orchestrator — fan-out)
|
|
||||||
Pick this only when **independent** investigations can run in parallel and produce reports that a single agent then merges.
|
|
||||||
|
|
||||||
- `/ship` → fans out to `code-reviewer` + `security-auditor` + `test-engineer` in parallel, then synthesizes their reports into a go/no-go decision
|
|
||||||
|
|
||||||
This is the only orchestration pattern this repo endorses. See [references/orchestration-patterns.md](../references/orchestration-patterns.md) for the full pattern catalog and anti-patterns.
|
|
||||||
|
|
||||||
## Decision matrix
|
|
||||||
|
|
||||||
```
|
|
||||||
Is the work a single perspective on a single artifact?
|
|
||||||
├── Yes → Direct persona invocation
|
|
||||||
└── No → Are the sub-tasks independent (no shared mutable state, no ordering)?
|
|
||||||
├── Yes → Slash command with parallel fan-out (e.g. /ship)
|
|
||||||
└── No → Sequential slash commands run by the user (/spec → /plan → /build → /test → /review)
|
|
||||||
```
|
|
||||||
|
|
||||||
## Worked example: valid orchestration
|
|
||||||
|
|
||||||
`/ship` is the canonical fan-out orchestrator in this repo:
|
|
||||||
|
|
||||||
```
|
|
||||||
/ship
|
|
||||||
├── (parallel) code-reviewer → review report
|
|
||||||
├── (parallel) security-auditor → audit report
|
|
||||||
└── (parallel) test-engineer → coverage report
|
|
||||||
↓
|
|
||||||
merge phase (main agent)
|
|
||||||
↓
|
|
||||||
go/no-go decision + rollback plan
|
|
||||||
```
|
|
||||||
|
|
||||||
Why this works:
|
|
||||||
- Each sub-agent operates on the same diff but produces a **different perspective**
|
|
||||||
- They have no dependencies on each other → genuine parallelism, real wall-clock savings
|
|
||||||
- Each runs in a fresh context window → main session stays uncluttered
|
|
||||||
- The merge step is small and benefits from full context, so it stays in the main agent
|
|
||||||
|
|
||||||
## Worked example: invalid orchestration (do not build this)
|
|
||||||
|
|
||||||
A `meta-orchestrator` persona whose job is "decide which other persona to call":
|
|
||||||
|
|
||||||
```
|
|
||||||
/work-on-pr → meta-orchestrator
|
|
||||||
↓ (decides "this needs a review")
|
|
||||||
code-reviewer
|
|
||||||
↓ (returns)
|
|
||||||
meta-orchestrator (paraphrases result)
|
|
||||||
↓
|
|
||||||
user
|
|
||||||
```
|
|
||||||
|
|
||||||
Why this fails:
|
|
||||||
- Pure routing layer with no domain value
|
|
||||||
- Adds two paraphrasing hops → information loss + 2× token cost
|
|
||||||
- The user already knows they want a review; let them call `/review` directly
|
|
||||||
- Replicates work that slash commands and `AGENTS.md` intent-mapping already do
|
|
||||||
|
|
||||||
## Rules for personas
|
|
||||||
|
|
||||||
1. A persona is a single role with a single output format. If you find yourself adding a second role, create a second persona.
|
|
||||||
2. **Personas do not invoke other personas.** Composition is the job of slash commands or the user. On Claude Code this is also a hard platform constraint — *"subagents cannot spawn other subagents"* — so the rule is enforced for you.
|
|
||||||
3. A persona may invoke skills (the *how*).
|
|
||||||
4. Every persona file ends with a "Composition" block stating where it fits.
|
|
||||||
|
|
||||||
## Claude Code interop
|
|
||||||
|
|
||||||
The personas in this repo are designed to work as Claude Code subagents and as Agent Teams teammates without modification:
|
|
||||||
|
|
||||||
- **As subagents:** auto-discovered when this plugin is enabled (no path config needed). Use the Agent tool with `subagent_type: code-reviewer` (or `security-auditor`, `test-engineer`). `/ship` is the canonical example.
|
|
||||||
- **As Agent Teams teammates** (experimental, requires `CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS=1`): reference the same persona name when spawning a teammate. The persona's body is **appended to** the teammate's system prompt as additional instructions (not a replacement), so your persona text sits on top of the team-coordination instructions the lead installs (SendMessage, task-list tools, etc.).
|
|
||||||
|
|
||||||
Subagents only report results back to the main agent. Agent Teams let teammates message each other directly. Use subagents when reports are enough; use Agent Teams when sub-agents need to challenge each other's findings (e.g. competing-hypothesis debugging). See [references/orchestration-patterns.md](../references/orchestration-patterns.md) for the full mapping.
|
|
||||||
|
|
||||||
Plugin agents do not support `hooks`, `mcpServers`, or `permissionMode` frontmatter — those fields are silently ignored. Avoid relying on them when authoring new personas here.
|
|
||||||
|
|
||||||
## Adding a new persona
|
|
||||||
|
|
||||||
1. Create `agents/<role>.md` with the same frontmatter format used by existing personas.
|
|
||||||
2. Define the role, scope, output format, and rules.
|
|
||||||
3. Add a **Composition** block at the bottom (Invoke directly when / Invoke via / Do not invoke from another persona).
|
|
||||||
4. Add the persona to the table at the top of this file.
|
|
||||||
5. If the persona enables a new orchestration pattern, document it in `references/orchestration-patterns.md` rather than inventing the pattern in the persona file itself.
|
|
||||||
@@ -1,97 +0,0 @@
|
|||||||
---
|
|
||||||
name: code-reviewer
|
|
||||||
description: Senior code reviewer that evaluates changes across five dimensions — correctness, readability, architecture, security, and performance. Use for thorough code review before merge.
|
|
||||||
---
|
|
||||||
|
|
||||||
# Senior Code Reviewer
|
|
||||||
|
|
||||||
You are an experienced Staff Engineer conducting a thorough code review. Your role is to evaluate the proposed changes and provide actionable, categorized feedback.
|
|
||||||
|
|
||||||
## Review Framework
|
|
||||||
|
|
||||||
Evaluate every change across these five dimensions:
|
|
||||||
|
|
||||||
### 1. Correctness
|
|
||||||
- Does the code do what the spec/task says it should?
|
|
||||||
- Are edge cases handled (null, empty, boundary values, error paths)?
|
|
||||||
- Do the tests actually verify the behavior? Are they testing the right things?
|
|
||||||
- Are there race conditions, off-by-one errors, or state inconsistencies?
|
|
||||||
|
|
||||||
### 2. Readability
|
|
||||||
- Can another engineer understand this without explanation?
|
|
||||||
- Are names descriptive and consistent with project conventions?
|
|
||||||
- Is the control flow straightforward (no deeply nested logic)?
|
|
||||||
- Is the code well-organized (related code grouped, clear boundaries)?
|
|
||||||
|
|
||||||
### 3. Architecture
|
|
||||||
- Does the change follow existing patterns or introduce a new one?
|
|
||||||
- If a new pattern, is it justified and documented?
|
|
||||||
- Are module boundaries maintained? Any circular dependencies?
|
|
||||||
- Is the abstraction level appropriate (not over-engineered, not too coupled)?
|
|
||||||
- Are dependencies flowing in the right direction?
|
|
||||||
|
|
||||||
### 4. Security
|
|
||||||
- Is user input validated and sanitized at system boundaries?
|
|
||||||
- Are secrets kept out of code, logs, and version control?
|
|
||||||
- Is authentication/authorization checked where needed?
|
|
||||||
- Are queries parameterized? Is output encoded?
|
|
||||||
- Any new dependencies with known vulnerabilities?
|
|
||||||
|
|
||||||
### 5. Performance
|
|
||||||
- Any N+1 query patterns?
|
|
||||||
- Any unbounded loops or unconstrained data fetching?
|
|
||||||
- Any synchronous operations that should be async?
|
|
||||||
- Any unnecessary re-renders (in UI components)?
|
|
||||||
- Any missing pagination on list endpoints?
|
|
||||||
|
|
||||||
## Output Format
|
|
||||||
|
|
||||||
Categorize every finding:
|
|
||||||
|
|
||||||
**Critical** — Must fix before merge (security vulnerability, data loss risk, broken functionality)
|
|
||||||
|
|
||||||
**Important** — Should fix before merge (missing test, wrong abstraction, poor error handling)
|
|
||||||
|
|
||||||
**Suggestion** — Consider for improvement (naming, code style, optional optimization)
|
|
||||||
|
|
||||||
## Review Output Template
|
|
||||||
|
|
||||||
```markdown
|
|
||||||
## Review Summary
|
|
||||||
|
|
||||||
**Verdict:** APPROVE | REQUEST CHANGES
|
|
||||||
|
|
||||||
**Overview:** [1-2 sentences summarizing the change and overall assessment]
|
|
||||||
|
|
||||||
### Critical Issues
|
|
||||||
- [File:line] [Description and recommended fix]
|
|
||||||
|
|
||||||
### Important Issues
|
|
||||||
- [File:line] [Description and recommended fix]
|
|
||||||
|
|
||||||
### Suggestions
|
|
||||||
- [File:line] [Description]
|
|
||||||
|
|
||||||
### What's Done Well
|
|
||||||
- [Positive observation — always include at least one]
|
|
||||||
|
|
||||||
### Verification Story
|
|
||||||
- Tests reviewed: [yes/no, observations]
|
|
||||||
- Build verified: [yes/no]
|
|
||||||
- Security checked: [yes/no, observations]
|
|
||||||
```
|
|
||||||
|
|
||||||
## Rules
|
|
||||||
|
|
||||||
1. Review the tests first — they reveal intent and coverage
|
|
||||||
2. Read the spec or task description before reviewing code
|
|
||||||
3. Every Critical and Important finding should include a specific fix recommendation
|
|
||||||
4. Don't approve code with Critical issues
|
|
||||||
5. Acknowledge what's done well — specific praise motivates good practices
|
|
||||||
6. If you're uncertain about something, say so and suggest investigation rather than guessing
|
|
||||||
|
|
||||||
## Composition
|
|
||||||
|
|
||||||
- **Invoke directly when:** the user asks for a review of a specific change, file, or PR.
|
|
||||||
- **Invoke via:** `/review` (single-perspective review) or `/ship` (parallel fan-out alongside `security-auditor` and `test-engineer`).
|
|
||||||
- **Do not invoke from another persona.** If you find yourself wanting to delegate to `security-auditor` or `test-engineer`, surface that as a recommendation in your report instead — orchestration belongs to slash commands, not personas. See [agents/README.md](README.md).
|
|
||||||
@@ -1,101 +0,0 @@
|
|||||||
---
|
|
||||||
name: security-auditor
|
|
||||||
description: Security engineer focused on vulnerability detection, threat modeling, and secure coding practices. Use for security-focused code review, threat analysis, or hardening recommendations.
|
|
||||||
---
|
|
||||||
|
|
||||||
# Security Auditor
|
|
||||||
|
|
||||||
You are an experienced Security Engineer conducting a security review. Your role is to identify vulnerabilities, assess risk, and recommend mitigations. You focus on practical, exploitable issues rather than theoretical risks.
|
|
||||||
|
|
||||||
## Review Scope
|
|
||||||
|
|
||||||
### 1. Input Handling
|
|
||||||
- Is all user input validated at system boundaries?
|
|
||||||
- Are there injection vectors (SQL, NoSQL, OS command, LDAP)?
|
|
||||||
- Is HTML output encoded to prevent XSS?
|
|
||||||
- Are file uploads restricted by type, size, and content?
|
|
||||||
- Are URL redirects validated against an allowlist?
|
|
||||||
|
|
||||||
### 2. Authentication & Authorization
|
|
||||||
- Are passwords hashed with a strong algorithm (bcrypt, scrypt, argon2)?
|
|
||||||
- Are sessions managed securely (httpOnly, secure, sameSite cookies)?
|
|
||||||
- Is authorization checked on every protected endpoint?
|
|
||||||
- Can users access resources belonging to other users (IDOR)?
|
|
||||||
- Are password reset tokens time-limited and single-use?
|
|
||||||
- Is rate limiting applied to authentication endpoints?
|
|
||||||
|
|
||||||
### 3. Data Protection
|
|
||||||
- Are secrets in environment variables (not code)?
|
|
||||||
- Are sensitive fields excluded from API responses and logs?
|
|
||||||
- Is data encrypted in transit (HTTPS) and at rest (if required)?
|
|
||||||
- Is PII handled according to applicable regulations?
|
|
||||||
- Are database backups encrypted?
|
|
||||||
|
|
||||||
### 4. Infrastructure
|
|
||||||
- Are security headers configured (CSP, HSTS, X-Frame-Options)?
|
|
||||||
- Is CORS restricted to specific origins?
|
|
||||||
- Are dependencies audited for known vulnerabilities?
|
|
||||||
- Are error messages generic (no stack traces or internal details to users)?
|
|
||||||
- Is the principle of least privilege applied to service accounts?
|
|
||||||
|
|
||||||
### 5. Third-Party Integrations
|
|
||||||
- Are API keys and tokens stored securely?
|
|
||||||
- Are webhook payloads verified (signature validation)?
|
|
||||||
- Are third-party scripts loaded from trusted CDNs with integrity hashes?
|
|
||||||
- Are OAuth flows using PKCE and state parameters?
|
|
||||||
|
|
||||||
## Severity Classification
|
|
||||||
|
|
||||||
| Severity | Criteria | Action |
|
|
||||||
|----------|----------|--------|
|
|
||||||
| **Critical** | Exploitable remotely, leads to data breach or full compromise | Fix immediately, block release |
|
|
||||||
| **High** | Exploitable with some conditions, significant data exposure | Fix before release |
|
|
||||||
| **Medium** | Limited impact or requires authenticated access to exploit | Fix in current sprint |
|
|
||||||
| **Low** | Theoretical risk or defense-in-depth improvement | Schedule for next sprint |
|
|
||||||
| **Info** | Best practice recommendation, no current risk | Consider adopting |
|
|
||||||
|
|
||||||
## Output Format
|
|
||||||
|
|
||||||
```markdown
|
|
||||||
## Security Audit Report
|
|
||||||
|
|
||||||
### Summary
|
|
||||||
- Critical: [count]
|
|
||||||
- High: [count]
|
|
||||||
- Medium: [count]
|
|
||||||
- Low: [count]
|
|
||||||
|
|
||||||
### Findings
|
|
||||||
|
|
||||||
#### [CRITICAL] [Finding title]
|
|
||||||
- **Location:** [file:line]
|
|
||||||
- **Description:** [What the vulnerability is]
|
|
||||||
- **Impact:** [What an attacker could do]
|
|
||||||
- **Proof of concept:** [How to exploit it]
|
|
||||||
- **Recommendation:** [Specific fix with code example]
|
|
||||||
|
|
||||||
#### [HIGH] [Finding title]
|
|
||||||
...
|
|
||||||
|
|
||||||
### Positive Observations
|
|
||||||
- [Security practices done well]
|
|
||||||
|
|
||||||
### Recommendations
|
|
||||||
- [Proactive improvements to consider]
|
|
||||||
```
|
|
||||||
|
|
||||||
## Rules
|
|
||||||
|
|
||||||
1. Focus on exploitable vulnerabilities, not theoretical risks
|
|
||||||
2. Every finding must include a specific, actionable recommendation
|
|
||||||
3. Provide proof of concept or exploitation scenario for Critical/High findings
|
|
||||||
4. Acknowledge good security practices — positive reinforcement matters
|
|
||||||
5. Check the OWASP Top 10 as a minimum baseline
|
|
||||||
6. Review dependencies for known CVEs
|
|
||||||
7. Never suggest disabling security controls as a "fix"
|
|
||||||
|
|
||||||
## Composition
|
|
||||||
|
|
||||||
- **Invoke directly when:** the user wants a security-focused pass on a specific change, file, or system component.
|
|
||||||
- **Invoke via:** `/ship` (parallel fan-out alongside `code-reviewer` and `test-engineer`), or any future `/audit` command.
|
|
||||||
- **Do not invoke from another persona.** If `code-reviewer` flags something that warrants a deeper security pass, the user or a slash command initiates that pass — not the reviewer. See [agents/README.md](README.md).
|
|
||||||
@@ -1,95 +0,0 @@
|
|||||||
---
|
|
||||||
name: test-engineer
|
|
||||||
description: QA engineer specialized in test strategy, test writing, and coverage analysis. Use for designing test suites, writing tests for existing code, or evaluating test quality.
|
|
||||||
---
|
|
||||||
|
|
||||||
# Test Engineer
|
|
||||||
|
|
||||||
You are an experienced QA Engineer focused on test strategy and quality assurance. Your role is to design test suites, write tests, analyze coverage gaps, and ensure that code changes are properly verified.
|
|
||||||
|
|
||||||
## Approach
|
|
||||||
|
|
||||||
### 1. Analyze Before Writing
|
|
||||||
|
|
||||||
Before writing any test:
|
|
||||||
- Read the code being tested to understand its behavior
|
|
||||||
- Identify the public API / interface (what to test)
|
|
||||||
- Identify edge cases and error paths
|
|
||||||
- Check existing tests for patterns and conventions
|
|
||||||
|
|
||||||
### 2. Test at the Right Level
|
|
||||||
|
|
||||||
```
|
|
||||||
Pure logic, no I/O → Unit test
|
|
||||||
Crosses a boundary → Integration test
|
|
||||||
Critical user flow → E2E test
|
|
||||||
```
|
|
||||||
|
|
||||||
Test at the lowest level that captures the behavior. Don't write E2E tests for things unit tests can cover.
|
|
||||||
|
|
||||||
### 3. Follow the Prove-It Pattern for Bugs
|
|
||||||
|
|
||||||
When asked to write a test for a bug:
|
|
||||||
1. Write a test that demonstrates the bug (must FAIL with current code)
|
|
||||||
2. Confirm the test fails
|
|
||||||
3. Report the test is ready for the fix implementation
|
|
||||||
|
|
||||||
### 4. Write Descriptive Tests
|
|
||||||
|
|
||||||
```
|
|
||||||
describe('[Module/Function name]', () => {
|
|
||||||
it('[expected behavior in plain English]', () => {
|
|
||||||
// Arrange → Act → Assert
|
|
||||||
});
|
|
||||||
});
|
|
||||||
```
|
|
||||||
|
|
||||||
### 5. Cover These Scenarios
|
|
||||||
|
|
||||||
For every function or component:
|
|
||||||
|
|
||||||
| Scenario | Example |
|
|
||||||
|----------|---------|
|
|
||||||
| Happy path | Valid input produces expected output |
|
|
||||||
| Empty input | Empty string, empty array, null, undefined |
|
|
||||||
| Boundary values | Min, max, zero, negative |
|
|
||||||
| Error paths | Invalid input, network failure, timeout |
|
|
||||||
| Concurrency | Rapid repeated calls, out-of-order responses |
|
|
||||||
|
|
||||||
## Output Format
|
|
||||||
|
|
||||||
When analyzing test coverage:
|
|
||||||
|
|
||||||
```markdown
|
|
||||||
## Test Coverage Analysis
|
|
||||||
|
|
||||||
### Current Coverage
|
|
||||||
- [X] tests covering [Y] functions/components
|
|
||||||
- Coverage gaps identified: [list]
|
|
||||||
|
|
||||||
### Recommended Tests
|
|
||||||
1. **[Test name]** — [What it verifies, why it matters]
|
|
||||||
2. **[Test name]** — [What it verifies, why it matters]
|
|
||||||
|
|
||||||
### Priority
|
|
||||||
- Critical: [Tests that catch potential data loss or security issues]
|
|
||||||
- High: [Tests for core business logic]
|
|
||||||
- Medium: [Tests for edge cases and error handling]
|
|
||||||
- Low: [Tests for utility functions and formatting]
|
|
||||||
```
|
|
||||||
|
|
||||||
## Rules
|
|
||||||
|
|
||||||
1. Test behavior, not implementation details
|
|
||||||
2. Each test should verify one concept
|
|
||||||
3. Tests should be independent — no shared mutable state between tests
|
|
||||||
4. Avoid snapshot tests unless reviewing every change to the snapshot
|
|
||||||
5. Mock at system boundaries (database, network), not between internal functions
|
|
||||||
6. Every test name should read like a specification
|
|
||||||
7. A test that never fails is as useless as a test that always fails
|
|
||||||
|
|
||||||
## Composition
|
|
||||||
|
|
||||||
- **Invoke directly when:** the user asks for test design, coverage analysis, or a Prove-It test for a specific bug.
|
|
||||||
- **Invoke via:** `/test` (TDD workflow) or `/ship` (parallel fan-out for coverage gap analysis alongside `code-reviewer` and `security-auditor`).
|
|
||||||
- **Do not invoke from another persona.** Recommendations to add tests belong in your report; the user or a slash command decides when to act on them. See [agents/README.md](README.md).
|
|
||||||
@@ -62,6 +62,105 @@ $ pnpm run test:e2e
|
|||||||
|
|
||||||
# test coverage
|
# test coverage
|
||||||
$ pnpm run test:cov
|
$ pnpm run test:cov
|
||||||
|
|
||||||
|
# auction cancellation/undo transactions against a real local MongoDB replica set
|
||||||
|
$ pnpm run test:mongodb
|
||||||
|
```
|
||||||
|
|
||||||
|
`test:mongodb` requires `mongod` on PATH, or `MONGODB_TEST_SERVER` set to its
|
||||||
|
executable path. The runner starts an isolated replica set on a random loopback
|
||||||
|
port, uses a temporary database directory, and removes it after the tests. It
|
||||||
|
does not use the application's database connection settings.
|
||||||
|
|
||||||
|
## Temporary auction role selection
|
||||||
|
|
||||||
|
Until captain accounts are issued, bids use the team selected in the auction UI.
|
||||||
|
By default, both WebSocket and HTTP bids accept guests and signed-in users without
|
||||||
|
checking whether the user is that team's captain. Team existence, bid amounts,
|
||||||
|
remaining points, roster limits, deadlines and round consistency are still checked.
|
||||||
|
Bid history continues to identify the selected team's captain, so it is not proof
|
||||||
|
of the account that submitted a bid in this temporary mode.
|
||||||
|
|
||||||
|
After issuing accounts, set `AUCTION_REQUIRE_CAPTAIN_AUTH=true` in the API
|
||||||
|
environment (or `project.env`) and restart the API to require a signed-in captain
|
||||||
|
for the selected team on all bid paths. Unset or `false` keeps temporary mode.
|
||||||
|
|
||||||
|
## Auction durability
|
||||||
|
|
||||||
|
Accepted Redis bids now enter `auction:bidArchivePayloads` and
|
||||||
|
`auction:bidArchiveQueue` atomically with the bid. The durability scheduler saves
|
||||||
|
them to `auctionBidRecords` using deterministic IDs before removing queue entries.
|
||||||
|
Recent state snapshots remain capped at 1000 bids; the archive is not capped and
|
||||||
|
retains accepted bids across undo/cancellation for audit. These records begin with
|
||||||
|
this deployment; bids already discarded by an older version cannot be recovered.
|
||||||
|
`GET /communities/:communityId/matches/:matchId/auction/bids/history` pages through
|
||||||
|
the current lifecycle's persisted archive using `afterRevision` and `limit` (1–200).
|
||||||
|
Persistence is asynchronous, so an empty last page may gain entries afterward.
|
||||||
|
|
||||||
|
Invalid archive entries are moved atomically to `auction:bidArchiveDeadLetterQueue`
|
||||||
|
and `auction:bidArchiveDeadLetterPayloads`. The payload stores the original text
|
||||||
|
(or `null` for a missing payload), error, ID, and quarantine time. Monitor these
|
||||||
|
keys and review quarantined data before repairing/requeuing it; it is not retried
|
||||||
|
automatically or expired. Other bids continue to persist. Mongo write failures
|
||||||
|
leave valid entries in the pending queue for idempotent retries.
|
||||||
|
|
||||||
|
Older in-flight rounds can produce `bidRoundId: ''`; the archive treats this as
|
||||||
|
an absent optional round ID. Empty player IDs and other invalid field types
|
||||||
|
remain validation errors.
|
||||||
|
|
||||||
|
Cancellation commits its completion marker and pending cleanup fields in Match.
|
||||||
|
The scheduler retries cleanup after restarts, with a delay capped at 60 seconds.
|
||||||
|
Reset notifications include the lifecycle to protect a newly started auction.
|
||||||
|
Dead-letter status notifications use `auction:deadLetterStatusQueue`; failures to
|
||||||
|
persist or mirror the terminal status are retried without rerunning the side effect.
|
||||||
|
Older side-effect dead letters are also reconciled automatically.
|
||||||
|
|
||||||
|
Before deploying the cleanup worker, create its partial Match index using the
|
||||||
|
additive, repeatable migration below. Schema declarations alone do not create
|
||||||
|
indexes when `MONGODB_AUTO_INDEX` is disabled (the default). Choose the target
|
||||||
|
environment explicitly; dry-run does not create indexes or modify documents.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
pnpm --filter api auction:indexes -- --env staging --dry-run
|
||||||
|
pnpm --filter api auction:indexes -- --env staging --apply
|
||||||
|
# Use --env prod for production.
|
||||||
|
```
|
||||||
|
|
||||||
|
The index is `{ auctionCancellationCleanupRetryAt: 1 }`, restricted to
|
||||||
|
`{ auctionCancellationCleanupPending: true }`. The worker only reads due pending
|
||||||
|
entries; it no longer scans legacy cancellation markers without a pending flag.
|
||||||
|
|
||||||
|
## Riot archive recovery
|
||||||
|
|
||||||
|
Newly saved or repaired Riot match data refreshes affected internal match
|
||||||
|
statistics at the same Competition revision. Existing archives and duplicate
|
||||||
|
imports do not trigger recovery. Recovery failures are logged and do not block
|
||||||
|
result collection or match refresh. Only communities with recovered statistics
|
||||||
|
have their caches invalidated, once per recovery batch; one failed rebuild does
|
||||||
|
not prevent other successful rebuilds from being reflected. Detail
|
||||||
|
requests also check for newly archived data when a cached game is missing raw
|
||||||
|
data. An absent archive does not trigger a rebuild or a Riot match fetch. If a
|
||||||
|
detail rebuild makes no progress, the process waits 60 seconds before retrying
|
||||||
|
that source revision and does not invalidate the community cache.
|
||||||
|
|
||||||
|
Recovery cache invalidations first try Redis with a one-second command timeout.
|
||||||
|
On failure they return immediately and schedule up to three in-process retries,
|
||||||
|
waiting 1, 5, then 30 seconds between attempts. A community has one retry budget;
|
||||||
|
additional immediate failures do not reset it, and a successful current request
|
||||||
|
cancels the pending retry. Timers are unreferenced and cleared on shutdown.
|
||||||
|
Retries are not persisted or resumed after a restart. Detail requests detect
|
||||||
|
newly archived raw data even behind a stale cache, and other response caches
|
||||||
|
expire after five minutes. A detail response whose immediate invalidation fails
|
||||||
|
is returned without being cached. No Mongo invalidation collection or periodic
|
||||||
|
queue scan is used.
|
||||||
|
|
||||||
|
Before deploying this recovery path, add its Riot ID lookup index. The migration
|
||||||
|
defaults to dry-run and leaves other indexes and game records unchanged.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
pnpm --filter api stats:indexes -- --env staging --dry-run
|
||||||
|
pnpm --filter api stats:indexes -- --env staging --apply
|
||||||
|
# Use --env prod for production.
|
||||||
```
|
```
|
||||||
|
|
||||||
## Deployment
|
## Deployment
|
||||||
|
|||||||
@@ -29,7 +29,28 @@ export default tseslint.config(
|
|||||||
'@typescript-eslint/no-explicit-any': 'off',
|
'@typescript-eslint/no-explicit-any': 'off',
|
||||||
'@typescript-eslint/no-floating-promises': 'warn',
|
'@typescript-eslint/no-floating-promises': 'warn',
|
||||||
'@typescript-eslint/no-unsafe-argument': 'warn',
|
'@typescript-eslint/no-unsafe-argument': 'warn',
|
||||||
"prettier/prettier": ["error", { endOfLine: "auto" }],
|
'prettier/prettier': ['error', { endOfLine: 'auto' }],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
files: ['**/*.spec.ts', 'test/**/*.ts'],
|
||||||
|
rules: {
|
||||||
|
'@typescript-eslint/no-unsafe-assignment': 'off',
|
||||||
|
'@typescript-eslint/no-unsafe-call': 'off',
|
||||||
|
'@typescript-eslint/no-unsafe-member-access': 'off',
|
||||||
|
'@typescript-eslint/no-unsafe-return': 'off',
|
||||||
|
'@typescript-eslint/no-this-alias': 'off',
|
||||||
|
'@typescript-eslint/require-await': 'off',
|
||||||
|
'@typescript-eslint/unbound-method': 'off',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
files: ['src/modules/global/database/migrations/**/*.ts'],
|
||||||
|
rules: {
|
||||||
|
'@typescript-eslint/no-unsafe-assignment': 'off',
|
||||||
|
'@typescript-eslint/no-unsafe-call': 'off',
|
||||||
|
'@typescript-eslint/no-unsafe-member-access': 'off',
|
||||||
|
'@typescript-eslint/no-unsafe-return': 'off',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
'use strict';
|
||||||
|
|
||||||
|
function readBoolean(name, defaultValue) {
|
||||||
|
const value = process.env[name];
|
||||||
|
if (value == null || value === '') return defaultValue;
|
||||||
|
|
||||||
|
return !['0', 'false', 'f', 'no', 'n', 'disabled'].includes(
|
||||||
|
value.toLowerCase(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function readInteger(name, defaultValue) {
|
||||||
|
const rawValue = process.env[name]?.trim();
|
||||||
|
if (!rawValue) return defaultValue;
|
||||||
|
|
||||||
|
if (/^\d+$/.test(rawValue)) {
|
||||||
|
return Number.parseInt(rawValue, 10);
|
||||||
|
}
|
||||||
|
|
||||||
|
process.env[name] = String(defaultValue);
|
||||||
|
return defaultValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
const hasLicenseKey = Boolean(process.env.NEW_RELIC_LICENSE_KEY);
|
||||||
|
|
||||||
|
exports.config = {
|
||||||
|
app_name: [process.env.NEW_RELIC_APP_NAME || 'lolympus'],
|
||||||
|
license_key: process.env.NEW_RELIC_LICENSE_KEY || '',
|
||||||
|
agent_enabled: readBoolean('NEW_RELIC_ENABLED', hasLicenseKey),
|
||||||
|
distributed_tracing: {
|
||||||
|
enabled: true,
|
||||||
|
},
|
||||||
|
ai_monitoring: {
|
||||||
|
enabled: readBoolean('NEW_RELIC_AI_MONITORING_ENABLED', true),
|
||||||
|
},
|
||||||
|
custom_insights_events: {
|
||||||
|
max_samples_stored: readInteger(
|
||||||
|
'NEW_RELIC_CUSTOM_INSIGHTS_EVENTS_MAX_SAMPLES_STORED',
|
||||||
|
100000,
|
||||||
|
),
|
||||||
|
},
|
||||||
|
span_events: {
|
||||||
|
max_samples_stored: readInteger(
|
||||||
|
'NEW_RELIC_SPAN_EVENTS_MAX_SAMPLES_STORED',
|
||||||
|
10000,
|
||||||
|
),
|
||||||
|
},
|
||||||
|
logging: {
|
||||||
|
level: process.env.NEW_RELIC_LOG_LEVEL || 'info',
|
||||||
|
},
|
||||||
|
instrumentation: {
|
||||||
|
timers: {
|
||||||
|
enabled: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
allow_all_headers: false,
|
||||||
|
attributes: {
|
||||||
|
exclude: [
|
||||||
|
'request.headers.cookie',
|
||||||
|
'request.headers.authorization',
|
||||||
|
'request.headers.proxyAuthorization',
|
||||||
|
'request.headers.setCookie*',
|
||||||
|
'response.headers.cookie',
|
||||||
|
'response.headers.authorization',
|
||||||
|
'response.headers.proxyAuthorization',
|
||||||
|
'response.headers.setCookie*',
|
||||||
|
],
|
||||||
|
},
|
||||||
|
};
|
||||||
+23
-11
@@ -8,35 +8,47 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "nest build",
|
"build": "nest build",
|
||||||
"format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
|
"format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
|
||||||
|
"competition:migrate": "ts-node src/modules/global/database/migrations/run-competition-domain.ts",
|
||||||
|
"competition:repair-grand-final": "ts-node src/modules/global/database/migrations/repair-grand-final-bo3.ts",
|
||||||
|
"auction:indexes": "ts-node src/modules/global/database/migrations/run-auction-cancellation-index.ts",
|
||||||
|
"stats:indexes": "ts-node src/modules/global/database/migrations/run-match-stats-raw-index.ts",
|
||||||
"seed:dev": "ts-node src/seed.ts",
|
"seed:dev": "ts-node src/seed.ts",
|
||||||
"seed:dakao-participant": "ts-node src/seed-dakao-participant.ts",
|
"seed:dakao-participant": "ts-node src/seed-dakao-participant.ts",
|
||||||
"start:dev": "node -e \"process.env.NODE_ENV='dev'; require('./dist/main.js')\"",
|
"start:dev": "NODE_ENV=dev NEW_RELIC_HOME=. node --import newrelic/esm-loader.mjs -r newrelic dist/main.js",
|
||||||
"start:staging": "node -e \"process.env.NODE_ENV='staging'; require('./dist/main.js')\"",
|
"start:staging": "NODE_ENV=staging NEW_RELIC_HOME=. node --import newrelic/esm-loader.mjs -r newrelic dist/main.js",
|
||||||
"start:prod": "node -e \"process.env.NODE_ENV='prod'; require('./dist/main.js')\"",
|
"start:prod": "NODE_ENV=prod NEW_RELIC_HOME=. node --import newrelic/esm-loader.mjs -r newrelic dist/main.js",
|
||||||
"pm2:dev": "pm2 start npm --name lolympus-tournament-support --update-env -- run start:dev",
|
"pm2:dev": "pm2 start npm --name lolympus-tournament-support --update-env -- run start:dev",
|
||||||
"pm2:staging": "pm2 start npm --name lolympus-tournament-support --update-env -- run start:staging",
|
"pm2:staging": "pm2 start npm --name lolympus-tournament-support --update-env -- run start:staging",
|
||||||
"pm2:prod": "pm2 start npm --name lolympus-tournament-support --update-env -- run start:prod",
|
"pm2:prod": "pm2 start npm --name lolympus-tournament-support --update-env -- run start:prod",
|
||||||
|
"perf:report": "ts-node src/scripts/api-performance-report.ts",
|
||||||
|
"perf:routes": "ts-node src/scripts/api-performance-report.ts --routes-only",
|
||||||
"start:debug": "nest start --debug --watch",
|
"start:debug": "nest start --debug --watch",
|
||||||
"lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
|
"lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
|
||||||
"test": "jest",
|
"test": "jest",
|
||||||
|
"typecheck": "tsc --noEmit --incremental false",
|
||||||
|
"test:redis": "node test/run-redis-tests.mjs",
|
||||||
|
"test:mongodb": "node test/run-mongo-tests.mjs",
|
||||||
"test:watch": "jest --watch",
|
"test:watch": "jest --watch",
|
||||||
"test:cov": "jest --coverage",
|
"test:cov": "jest --coverage",
|
||||||
"test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
|
"test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
|
||||||
"test:e2e": "jest --config ./test/jest-e2e.json"
|
"test:e2e": "jest --config ./test/jest-e2e.json"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@nestjs/common": "^11.0.1",
|
"@lolympus/contracts": "workspace:*",
|
||||||
|
"@nestjs/common": "^11.1.28",
|
||||||
"@nestjs/config": "^4.0.4",
|
"@nestjs/config": "^4.0.4",
|
||||||
"@nestjs/core": "^11.0.1",
|
"@nestjs/core": "^11.1.28",
|
||||||
"@nestjs/platform-express": "^11.0.1",
|
"@nestjs/platform-express": "^11.1.28",
|
||||||
"@nestjs/platform-socket.io": "^11.1.19",
|
"@nestjs/platform-socket.io": "^11.1.28",
|
||||||
"@nestjs/swagger": "^11.2.7",
|
"@nestjs/swagger": "^11.4.6",
|
||||||
"@nestjs/websockets": "^11.1.19",
|
"@nestjs/websockets": "^11.1.28",
|
||||||
|
"@socket.io/redis-adapter": "^8.3.0",
|
||||||
"class-transformer": "^0.5.1",
|
"class-transformer": "^0.5.1",
|
||||||
"class-validator": "^0.15.1",
|
"class-validator": "^0.15.1",
|
||||||
"jose": "^6.2.2",
|
"jose": "^6.2.2",
|
||||||
"mongoose": "^9.4.1",
|
"mongoose": "9.4.1",
|
||||||
"nats": "^2.29.3",
|
"nats": "^2.29.3",
|
||||||
|
"newrelic": "^14.3.3",
|
||||||
"redis": "^5.12.1",
|
"redis": "^5.12.1",
|
||||||
"reflect-metadata": "^0.2.2",
|
"reflect-metadata": "^0.2.2",
|
||||||
"rxjs": "^7.8.1",
|
"rxjs": "^7.8.1",
|
||||||
@@ -51,7 +63,7 @@
|
|||||||
"@nestjs/testing": "^11.0.1",
|
"@nestjs/testing": "^11.0.1",
|
||||||
"@types/express": "^5.0.0",
|
"@types/express": "^5.0.0",
|
||||||
"@types/jest": "^30.0.0",
|
"@types/jest": "^30.0.0",
|
||||||
"@types/node": "^24.0.0",
|
"@types/node": "^26.1.1",
|
||||||
"@types/supertest": "^7.0.0",
|
"@types/supertest": "^7.0.0",
|
||||||
"eslint": "^9.18.0",
|
"eslint": "^9.18.0",
|
||||||
"eslint-config-prettier": "^10.0.1",
|
"eslint-config-prettier": "^10.0.1",
|
||||||
|
|||||||
@@ -1,11 +1,14 @@
|
|||||||
import { Module } from '@nestjs/common';
|
import { Module } from '@nestjs/common';
|
||||||
import { ConfigModule } from '@nestjs/config';
|
import { ConfigModule } from '@nestjs/config';
|
||||||
|
import { APP_INTERCEPTOR } from '@nestjs/core';
|
||||||
import { AppController } from './app.controller';
|
import { AppController } from './app.controller';
|
||||||
import { AppService } from './app.service';
|
import { AppService } from './app.service';
|
||||||
|
import { ApiPerformanceInterceptor } from './modules/global/observability/api-performance.interceptor';
|
||||||
import { AuctionModule } from './modules/auction/auction.module';
|
import { AuctionModule } from './modules/auction/auction.module';
|
||||||
import { AuthModule } from './modules/auth/auth.module';
|
import { AuthModule } from './modules/auth/auth.module';
|
||||||
import { CommunityModule } from './modules/community/community.module';
|
import { CommunityModule } from './modules/community/community.module';
|
||||||
import { CommunityStatsModule } from './modules/community-stats/community-stats.module';
|
import { CommunityStatsModule } from './modules/community-stats/community-stats.module';
|
||||||
|
import { CompetitionModule } from './modules/competition/competition.module';
|
||||||
import { DakaoModule } from './modules/dakao/dakao.module';
|
import { DakaoModule } from './modules/dakao/dakao.module';
|
||||||
import { GlobalModule } from './modules/global/global.module';
|
import { GlobalModule } from './modules/global/global.module';
|
||||||
import { LegacyImportModule } from './modules/legacy-import/legacy-import.module';
|
import { LegacyImportModule } from './modules/legacy-import/legacy-import.module';
|
||||||
@@ -29,6 +32,7 @@ import { UserModule } from './modules/user/user.module';
|
|||||||
BackgroundRefreshModule,
|
BackgroundRefreshModule,
|
||||||
CommunityModule,
|
CommunityModule,
|
||||||
CommunityStatsModule,
|
CommunityStatsModule,
|
||||||
|
CompetitionModule,
|
||||||
MatchModule,
|
MatchModule,
|
||||||
MatchHistoryModule,
|
MatchHistoryModule,
|
||||||
LegacyImportModule,
|
LegacyImportModule,
|
||||||
@@ -39,6 +43,12 @@ import { UserModule } from './modules/user/user.module';
|
|||||||
DakaoModule,
|
DakaoModule,
|
||||||
],
|
],
|
||||||
controllers: [AppController],
|
controllers: [AppController],
|
||||||
providers: [AppService],
|
providers: [
|
||||||
|
AppService,
|
||||||
|
{
|
||||||
|
provide: APP_INTERCEPTOR,
|
||||||
|
useClass: ApiPerformanceInterceptor,
|
||||||
|
},
|
||||||
|
],
|
||||||
})
|
})
|
||||||
export class AppModule {}
|
export class AppModule {}
|
||||||
+12
-1
@@ -2,6 +2,7 @@ import { ValidationPipe } from '@nestjs/common';
|
|||||||
import { NestFactory } from '@nestjs/core';
|
import { NestFactory } from '@nestjs/core';
|
||||||
import { AppModule } from './app.module';
|
import { AppModule } from './app.module';
|
||||||
import { createCorsOrigin } from './cors-origin';
|
import { createCorsOrigin } from './cors-origin';
|
||||||
|
import { RedisIoAdapter } from './redis-io.adapter';
|
||||||
|
|
||||||
async function bootstrap() {
|
async function bootstrap() {
|
||||||
const app = await NestFactory.create(AppModule, {
|
const app = await NestFactory.create(AppModule, {
|
||||||
@@ -10,11 +11,21 @@ async function bootstrap() {
|
|||||||
|
|
||||||
const nodeEnv = process.env.NODE_ENV;
|
const nodeEnv = process.env.NODE_ENV;
|
||||||
const isDev = nodeEnv === 'dev';
|
const isDev = nodeEnv === 'dev';
|
||||||
|
const redisIoAdapter = new RedisIoAdapter(app);
|
||||||
|
await redisIoAdapter.connectToRedis();
|
||||||
|
app.useWebSocketAdapter(redisIoAdapter);
|
||||||
|
|
||||||
app.enableCors({
|
app.enableCors({
|
||||||
origin: createCorsOrigin(nodeEnv),
|
origin: createCorsOrigin(nodeEnv),
|
||||||
credentials: true,
|
credentials: true,
|
||||||
allowedHeaders: ['Authorization', 'Content-Type', 'X-Auth-User-Id'],
|
allowedHeaders: [
|
||||||
|
'Authorization',
|
||||||
|
'Content-Type',
|
||||||
|
'X-Auth-User-Id',
|
||||||
|
'If-Match',
|
||||||
|
'Idempotency-Key',
|
||||||
|
],
|
||||||
|
exposedHeaders: ['ETag'],
|
||||||
});
|
});
|
||||||
app.useGlobalPipes(
|
app.useGlobalPipes(
|
||||||
new ValidationPipe({
|
new ValidationPipe({
|
||||||
|
|||||||
@@ -0,0 +1,82 @@
|
|||||||
|
import mongoose from 'mongoose';
|
||||||
|
import { AuctionBidArchiveService } from './auction-bid-archive.service';
|
||||||
|
|
||||||
|
const matchId = new mongoose.Types.ObjectId().toString();
|
||||||
|
|
||||||
|
function bid(overrides: Record<string, unknown> = {}) {
|
||||||
|
return {
|
||||||
|
_id: `${matchId}:life:${String(1).padStart(16, '0')}`,
|
||||||
|
matchId,
|
||||||
|
auctionLifecycleId: 'life',
|
||||||
|
revision: 1,
|
||||||
|
bidRequestId: 'bid-1',
|
||||||
|
bidderUserId: new mongoose.Types.ObjectId().toString(),
|
||||||
|
playerUserId: new mongoose.Types.ObjectId().toString(),
|
||||||
|
bidderTeamIndex: 1,
|
||||||
|
bidPointAmount: 10,
|
||||||
|
bidPlacedAtTimestampMS: 1_700_000_000_000,
|
||||||
|
...overrides,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function fixture(payload: Record<string, unknown>) {
|
||||||
|
const raw = JSON.stringify(payload);
|
||||||
|
const commands: string[][] = [];
|
||||||
|
const sendCommand = jest.fn(async (command: string[]) => {
|
||||||
|
commands.push(command);
|
||||||
|
if (command[0] === 'ZRANGE') return [payload._id];
|
||||||
|
if (command[0] === 'HMGET') return [raw];
|
||||||
|
return 1;
|
||||||
|
});
|
||||||
|
const bulkWrite = jest.fn(async (operations: unknown[]) => ({
|
||||||
|
matchedCount: 0,
|
||||||
|
upsertedCount: operations.length,
|
||||||
|
}));
|
||||||
|
const service = new AuctionBidArchiveService(
|
||||||
|
{ getModel: async () => ({ bulkWrite }) } as never,
|
||||||
|
{ raw: () => ({ sendCommand }) } as never,
|
||||||
|
);
|
||||||
|
return { service, bulkWrite, commands };
|
||||||
|
}
|
||||||
|
|
||||||
|
function savedEvent(bulkWrite: jest.Mock) {
|
||||||
|
const [[operations]] = bulkWrite.mock.calls as unknown as [
|
||||||
|
[
|
||||||
|
Array<{
|
||||||
|
updateOne: { update: { $setOnInsert: Record<string, unknown> } };
|
||||||
|
}>,
|
||||||
|
],
|
||||||
|
];
|
||||||
|
return operations[0].updateOne.update.$setOnInsert;
|
||||||
|
}
|
||||||
|
|
||||||
|
function quarantined(commands: string[][]) {
|
||||||
|
return commands.some(
|
||||||
|
(command) =>
|
||||||
|
command[0] === 'EVAL' &&
|
||||||
|
command[1].includes("redis.call('ZADD', KEYS[4]"),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
it('archives a pre-upgrade bid with an empty round ID without the field', async () => {
|
||||||
|
const f = fixture(bid({ bidRoundId: '' }));
|
||||||
|
await expect(f.service.persistPendingBids()).resolves.toBe(1);
|
||||||
|
expect(quarantined(f.commands)).toBe(false);
|
||||||
|
expect(savedEvent(f.bulkWrite)).not.toHaveProperty('bidRoundId');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps a non-empty round ID on the archived bid', async () => {
|
||||||
|
const f = fixture(bid({ bidRoundId: 'round-1' }));
|
||||||
|
await expect(f.service.persistPendingBids()).resolves.toBe(1);
|
||||||
|
expect(savedEvent(f.bulkWrite)).toMatchObject({ bidRoundId: 'round-1' });
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each([' ', null, 1])(
|
||||||
|
'still quarantines an invalid round ID %j',
|
||||||
|
async (bidRoundId) => {
|
||||||
|
const f = fixture(bid({ bidRoundId }));
|
||||||
|
await expect(f.service.persistPendingBids()).resolves.toBe(0);
|
||||||
|
expect(f.bulkWrite).not.toHaveBeenCalled();
|
||||||
|
expect(quarantined(f.commands)).toBe(true);
|
||||||
|
},
|
||||||
|
);
|
||||||
@@ -0,0 +1,242 @@
|
|||||||
|
import {
|
||||||
|
BadRequestException,
|
||||||
|
Injectable,
|
||||||
|
Logger,
|
||||||
|
NotFoundException,
|
||||||
|
} from '@nestjs/common';
|
||||||
|
import mongoose from 'mongoose';
|
||||||
|
import type { AuctionBidRecord } from '../global/database/schema';
|
||||||
|
import { ConnectionService } from '../global/database/connection.service';
|
||||||
|
import { AuctionRedisService } from './redis/auction-redis.service';
|
||||||
|
import {
|
||||||
|
AUCTION_BID_ARCHIVE_PAYLOADS_KEY,
|
||||||
|
AUCTION_BID_ARCHIVE_QUEUE_KEY,
|
||||||
|
AUCTION_BID_ARCHIVE_DEAD_LETTER_QUEUE_KEY,
|
||||||
|
AUCTION_BID_ARCHIVE_DEAD_LETTER_PAYLOADS_KEY,
|
||||||
|
} from './redis/auction-redis.keys';
|
||||||
|
|
||||||
|
// Compare the payload as well as the ID: a concurrent repair must not be moved
|
||||||
|
// or acknowledged by a worker that read an older value.
|
||||||
|
const QUARANTINE_BID_ARCHIVE_SCRIPT = `
|
||||||
|
local moved = 0
|
||||||
|
for i = 2, #ARGV, 4 do
|
||||||
|
local current = redis.call('HGET', KEYS[1], ARGV[i])
|
||||||
|
local matches = (ARGV[i+1] == '0' and current == false) or (ARGV[i+1] == '1' and current == ARGV[i+2])
|
||||||
|
if matches and redis.call('ZSCORE', KEYS[2], ARGV[i]) then
|
||||||
|
redis.call('HSET', KEYS[3], ARGV[i], ARGV[i+3])
|
||||||
|
redis.call('ZADD', KEYS[4], ARGV[1], ARGV[i])
|
||||||
|
redis.call('HDEL', KEYS[1], ARGV[i])
|
||||||
|
redis.call('ZREM', KEYS[2], ARGV[i])
|
||||||
|
moved = moved + 1
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return moved
|
||||||
|
`;
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class AuctionBidArchiveService {
|
||||||
|
private readonly logger = new Logger(AuctionBidArchiveService.name);
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private readonly database: ConnectionService,
|
||||||
|
private readonly redis: AuctionRedisService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
public async persistPendingBids(limit = 200): Promise<number> {
|
||||||
|
const client = this.redis.raw();
|
||||||
|
const reply = await client.sendCommand([
|
||||||
|
'ZRANGE',
|
||||||
|
AUCTION_BID_ARCHIVE_QUEUE_KEY,
|
||||||
|
'0',
|
||||||
|
String(limit - 1),
|
||||||
|
]);
|
||||||
|
const ids = Array.isArray(reply) ? reply.map(String) : [];
|
||||||
|
if (!ids.length) return 0;
|
||||||
|
const values = await client.sendCommand<Array<string | null>>([
|
||||||
|
'HMGET',
|
||||||
|
AUCTION_BID_ARCHIVE_PAYLOADS_KEY,
|
||||||
|
...ids,
|
||||||
|
]);
|
||||||
|
const valid: Array<{ event: AuctionBidRecord; raw: string }> = [];
|
||||||
|
const invalid: Array<{ id: string; raw: string | null; error: string }> =
|
||||||
|
[];
|
||||||
|
for (let index = 0; index < ids.length; index++) {
|
||||||
|
const raw = values[index] ?? null;
|
||||||
|
try {
|
||||||
|
valid.push({ event: parseBidArchiveEvent(ids[index], raw), raw: raw! });
|
||||||
|
} catch (error) {
|
||||||
|
invalid.push({
|
||||||
|
id: ids[index],
|
||||||
|
raw,
|
||||||
|
error: String(error).slice(0, 2000),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (invalid.length) {
|
||||||
|
const now = Date.now();
|
||||||
|
const moved = await client.sendCommand<number>([
|
||||||
|
'EVAL',
|
||||||
|
QUARANTINE_BID_ARCHIVE_SCRIPT,
|
||||||
|
'4',
|
||||||
|
AUCTION_BID_ARCHIVE_PAYLOADS_KEY,
|
||||||
|
AUCTION_BID_ARCHIVE_QUEUE_KEY,
|
||||||
|
AUCTION_BID_ARCHIVE_DEAD_LETTER_PAYLOADS_KEY,
|
||||||
|
AUCTION_BID_ARCHIVE_DEAD_LETTER_QUEUE_KEY,
|
||||||
|
String(now),
|
||||||
|
...invalid.flatMap(({ id, raw, error }) => [
|
||||||
|
id,
|
||||||
|
raw === null ? '0' : '1',
|
||||||
|
raw ?? '',
|
||||||
|
JSON.stringify({
|
||||||
|
id,
|
||||||
|
rawPayload: raw,
|
||||||
|
error,
|
||||||
|
quarantinedAtTimestampMS: now,
|
||||||
|
}),
|
||||||
|
]),
|
||||||
|
]);
|
||||||
|
if (moved > 0)
|
||||||
|
this.logger.warn(`Quarantined ${moved} invalid bid archive events.`);
|
||||||
|
}
|
||||||
|
if (valid.length) {
|
||||||
|
const model = await this.database.getModel('auctionBidRecord');
|
||||||
|
// The deterministic _id is the dedupe key, including after a crash between
|
||||||
|
// Mongo acknowledgement and Redis cleanup. Never trim unpersisted events.
|
||||||
|
const result = await model.bulkWrite(
|
||||||
|
valid.map(({ event }) => ({
|
||||||
|
updateOne: {
|
||||||
|
filter: { _id: event._id },
|
||||||
|
update: { $setOnInsert: event },
|
||||||
|
upsert: true,
|
||||||
|
},
|
||||||
|
})),
|
||||||
|
{ ordered: false, throwOnValidationError: true },
|
||||||
|
);
|
||||||
|
// A partial/ambiguous write leaves valid entries queued. Replaying the
|
||||||
|
// upserts is safe; assuming that a resolved bulkWrite saved all is not.
|
||||||
|
if (result.matchedCount + result.upsertedCount !== valid.length) {
|
||||||
|
throw new Error(
|
||||||
|
'Bid archive batch was not fully acknowledged by MongoDB.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
await client.sendCommand([
|
||||||
|
'EVAL',
|
||||||
|
"for i = 1, #ARGV, 2 do if redis.call('HGET', KEYS[1], ARGV[i]) == ARGV[i+1] then redis.call('HDEL', KEYS[1], ARGV[i]); redis.call('ZREM', KEYS[2], ARGV[i]) end end return 1",
|
||||||
|
'2',
|
||||||
|
AUCTION_BID_ARCHIVE_PAYLOADS_KEY,
|
||||||
|
AUCTION_BID_ARCHIVE_QUEUE_KEY,
|
||||||
|
...valid.flatMap(({ event, raw }) => [event._id, raw]),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
return valid.length;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async list(
|
||||||
|
matchId: mongoose.Types.ObjectId,
|
||||||
|
afterRevision = -1,
|
||||||
|
limit = 100,
|
||||||
|
) {
|
||||||
|
if (
|
||||||
|
!Number.isSafeInteger(afterRevision) ||
|
||||||
|
afterRevision < -1 ||
|
||||||
|
!Number.isSafeInteger(limit) ||
|
||||||
|
limit < 1 ||
|
||||||
|
limit > 200
|
||||||
|
) {
|
||||||
|
throw new BadRequestException('Invalid bid history cursor or limit.');
|
||||||
|
}
|
||||||
|
const AuctionModel = await this.database.getModel('auction');
|
||||||
|
const auction = await AuctionModel.findOne({ matchId })
|
||||||
|
.select({ auctionLifecycleId: 1 })
|
||||||
|
.lean()
|
||||||
|
.exec();
|
||||||
|
if (!auction) throw new NotFoundException('Auction not found.');
|
||||||
|
const prefix = `${matchId.toString()}:${auction.auctionLifecycleId}:`;
|
||||||
|
const model = await this.database.getModel('auctionBidRecord');
|
||||||
|
// The built-in _id index supports ordered pagination without an additional
|
||||||
|
// production index or an unbounded array inside an Auction document.
|
||||||
|
const items = await model
|
||||||
|
.find({
|
||||||
|
_id: {
|
||||||
|
$gt:
|
||||||
|
afterRevision < 0
|
||||||
|
? prefix
|
||||||
|
: prefix + String(afterRevision).padStart(16, '0'),
|
||||||
|
$lt: prefix + '\uffff',
|
||||||
|
},
|
||||||
|
})
|
||||||
|
.sort({ _id: 1 })
|
||||||
|
.limit(limit + 1)
|
||||||
|
.lean()
|
||||||
|
.exec();
|
||||||
|
const hasMore = items.length > limit;
|
||||||
|
if (hasMore) items.pop();
|
||||||
|
return {
|
||||||
|
items,
|
||||||
|
hasMore,
|
||||||
|
nextRevision: items.at(-1)?.revision ?? afterRevision,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseBidArchiveEvent(
|
||||||
|
id: string,
|
||||||
|
raw: string | null,
|
||||||
|
): AuctionBidRecord {
|
||||||
|
if (raw === null) throw new Error('Missing bid archive payload.');
|
||||||
|
const value: unknown = JSON.parse(raw);
|
||||||
|
if (!value || typeof value !== 'object' || Array.isArray(value)) {
|
||||||
|
throw new Error('Bid archive payload must be an object.');
|
||||||
|
}
|
||||||
|
const event = value as Record<string, unknown>;
|
||||||
|
const string = (field: string): string => {
|
||||||
|
const value = event[field];
|
||||||
|
if (typeof value !== 'string' || !value.trim()) {
|
||||||
|
throw new Error(`Invalid bid archive ${field}.`);
|
||||||
|
}
|
||||||
|
return value;
|
||||||
|
};
|
||||||
|
const integer = (field: string, minimum = 0): number => {
|
||||||
|
const value = event[field];
|
||||||
|
if (
|
||||||
|
typeof value !== 'number' ||
|
||||||
|
!Number.isSafeInteger(value) ||
|
||||||
|
value < minimum
|
||||||
|
) {
|
||||||
|
throw new Error(`Invalid bid archive ${field}.`);
|
||||||
|
}
|
||||||
|
return value;
|
||||||
|
};
|
||||||
|
const objectId = (field: string): mongoose.Types.ObjectId => {
|
||||||
|
const value = string(field);
|
||||||
|
if (!mongoose.isObjectIdOrHexString(value)) {
|
||||||
|
throw new Error(`Invalid bid archive ${field}.`);
|
||||||
|
}
|
||||||
|
return new mongoose.Types.ObjectId(value);
|
||||||
|
};
|
||||||
|
const matchId = objectId('matchId');
|
||||||
|
const auctionLifecycleId = string('auctionLifecycleId');
|
||||||
|
const revision = integer('revision');
|
||||||
|
const expectedId = `${matchId.toString()}:${auctionLifecycleId}:${String(revision).padStart(16, '0')}`;
|
||||||
|
if (event._id !== id || id !== expectedId) {
|
||||||
|
throw new Error('Bid archive identity does not match its payload.');
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
_id: id,
|
||||||
|
matchId,
|
||||||
|
auctionLifecycleId,
|
||||||
|
revision,
|
||||||
|
bidRequestId: string('bidRequestId'),
|
||||||
|
bidderUserId: objectId('bidderUserId'),
|
||||||
|
bidderTeamIndex: integer('bidderTeamIndex', 1),
|
||||||
|
bidPointAmount: integer('bidPointAmount'),
|
||||||
|
bidPlacedAtTimestampMS: integer('bidPlacedAtTimestampMS'),
|
||||||
|
...(event.playerUserId !== undefined
|
||||||
|
? { playerUserId: objectId('playerUserId') }
|
||||||
|
: {}),
|
||||||
|
// Pre-upgrade rounds have no Redis round ID; the bid Lua records ''.
|
||||||
|
...(event.bidRoundId !== undefined && event.bidRoundId !== ''
|
||||||
|
? { bidRoundId: string('bidRoundId') }
|
||||||
|
: {}),
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
/**
|
||||||
|
* 계정 지급 전에는 화면에서 선택한 팀으로 입찰하는 임시 운영 모드가 기본이다.
|
||||||
|
* 계정 지급 후 AUCTION_REQUIRE_CAPTAIN_AUTH=true로 로그인·팀장 검증을 복구한다.
|
||||||
|
*/
|
||||||
|
export function isAuctionCaptainAuthRequired(): boolean {
|
||||||
|
return (
|
||||||
|
process.env.AUCTION_REQUIRE_CAPTAIN_AUTH?.trim().toLowerCase() === 'true'
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,154 @@
|
|||||||
|
import { NotFoundException } from '@nestjs/common';
|
||||||
|
import mongoose from 'mongoose';
|
||||||
|
import { AuctionService } from './auction.service';
|
||||||
|
|
||||||
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
|
|
||||||
|
function sessionQuery<T>(value: T) {
|
||||||
|
return { session: async () => value };
|
||||||
|
}
|
||||||
|
|
||||||
|
function fixture(options: {
|
||||||
|
auction: Record<string, unknown> | null;
|
||||||
|
match: Record<string, unknown>;
|
||||||
|
failRedisCleanup?: boolean;
|
||||||
|
}) {
|
||||||
|
const session = {
|
||||||
|
startTransaction: jest.fn(),
|
||||||
|
commitTransaction: jest.fn().mockResolvedValue(undefined),
|
||||||
|
abortTransaction: jest.fn().mockResolvedValue(undefined),
|
||||||
|
endSession: jest.fn().mockResolvedValue(undefined),
|
||||||
|
};
|
||||||
|
const deleteMany = jest.fn(() => sessionQuery(undefined));
|
||||||
|
const models: Record<string, unknown> = {
|
||||||
|
auction: { findOne: () => sessionQuery(options.auction) },
|
||||||
|
auctionHistory: { deleteMany },
|
||||||
|
auctionSideEffectApplication: { deleteMany },
|
||||||
|
match: { findById: () => sessionQuery(options.match) },
|
||||||
|
};
|
||||||
|
const redisCommands: string[][] = [];
|
||||||
|
const sendCommand = jest.fn(async (command: string[]) => {
|
||||||
|
redisCommands.push(command);
|
||||||
|
if (command[0] === 'EVAL' && options.failRedisCleanup)
|
||||||
|
throw new Error('redis unavailable');
|
||||||
|
return command[0] === 'SCAN' ? ['0', []] : 1;
|
||||||
|
});
|
||||||
|
const service = new AuctionService(
|
||||||
|
{
|
||||||
|
getModel: async (name: string) => models[name],
|
||||||
|
createSession: async () => session,
|
||||||
|
} as never,
|
||||||
|
{} as never,
|
||||||
|
{ releaseFromMatch: jest.fn().mockResolvedValue(undefined) } as never,
|
||||||
|
{ cancelPolling: jest.fn().mockResolvedValue(undefined) } as never,
|
||||||
|
{
|
||||||
|
acquireTokenLock: async () => true,
|
||||||
|
releaseTokenLock: async () => true,
|
||||||
|
raw: () => ({ sendCommand }),
|
||||||
|
} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
);
|
||||||
|
return { service, session, redisCommands };
|
||||||
|
}
|
||||||
|
|
||||||
|
function liveMatch(): Record<string, unknown> {
|
||||||
|
return {
|
||||||
|
communityId,
|
||||||
|
status: 'team-built',
|
||||||
|
teams: [],
|
||||||
|
tournamentCodeIds: [],
|
||||||
|
gameSchedule: [],
|
||||||
|
participants: [],
|
||||||
|
save: jest.fn().mockResolvedValue(undefined),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function redisAuction() {
|
||||||
|
return {
|
||||||
|
_id: new mongoose.Types.ObjectId(),
|
||||||
|
auctionEngineVersion: 'redis-v1',
|
||||||
|
auctionLifecycleId: 'life',
|
||||||
|
deleteOne: jest.fn().mockResolvedValue(undefined),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
it('records the cancelled lifecycle and still succeeds when Redis cleanup fails', async () => {
|
||||||
|
const match = liveMatch();
|
||||||
|
const f = fixture({
|
||||||
|
auction: redisAuction(),
|
||||||
|
match,
|
||||||
|
failRedisCleanup: true,
|
||||||
|
});
|
||||||
|
await expect(
|
||||||
|
f.service.reset({
|
||||||
|
matchId,
|
||||||
|
communityId,
|
||||||
|
clientObservedAuctionLifecycleId: 'life',
|
||||||
|
}),
|
||||||
|
).resolves.toBeUndefined();
|
||||||
|
expect(f.session.commitTransaction).toHaveBeenCalledTimes(1);
|
||||||
|
expect(match.lastCancelledAuctionLifecycleId).toBe('life');
|
||||||
|
expect(match.status).toBe('recruiting');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('answers a retransmitted cancellation and durably schedules Redis cleanup', async () => {
|
||||||
|
const match = { ...liveMatch(), lastCancelledAuctionLifecycleId: 'life' };
|
||||||
|
const f = fixture({ auction: null, match });
|
||||||
|
await expect(
|
||||||
|
f.service.reset({
|
||||||
|
matchId,
|
||||||
|
communityId,
|
||||||
|
clientObservedAuctionLifecycleId: 'life',
|
||||||
|
}),
|
||||||
|
).resolves.toBeUndefined();
|
||||||
|
expect(match).toMatchObject({
|
||||||
|
auctionCancellationCleanupPending: true,
|
||||||
|
auctionCancellationCleanupRetryAt: expect.any(Date),
|
||||||
|
});
|
||||||
|
expect(f.redisCommands).toEqual([]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('preserves a committed cancellation even if its lock renewal fails before returning', async () => {
|
||||||
|
jest.useFakeTimers();
|
||||||
|
try {
|
||||||
|
const match = liveMatch();
|
||||||
|
const f = fixture({ auction: redisAuction(), match });
|
||||||
|
f.session.commitTransaction.mockImplementation(async () => {
|
||||||
|
await jest.advanceTimersByTimeAsync(10000);
|
||||||
|
});
|
||||||
|
await expect(
|
||||||
|
f.service.reset({
|
||||||
|
matchId,
|
||||||
|
communityId,
|
||||||
|
clientObservedAuctionLifecycleId: 'life',
|
||||||
|
}),
|
||||||
|
).resolves.toBeUndefined();
|
||||||
|
expect(match.auctionCancellationCleanupPending).toBe(true);
|
||||||
|
expect(f.session.commitTransaction).toHaveBeenCalledTimes(1);
|
||||||
|
} finally {
|
||||||
|
jest.useRealTimers();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps 404 for a missing auction that was not cancelled with this lifecycle', async () => {
|
||||||
|
for (const [observed, recorded] of [
|
||||||
|
['other', 'life'],
|
||||||
|
[undefined, 'life'],
|
||||||
|
['life', undefined],
|
||||||
|
] as const) {
|
||||||
|
const f = fixture({
|
||||||
|
auction: null,
|
||||||
|
match: { ...liveMatch(), lastCancelledAuctionLifecycleId: recorded },
|
||||||
|
});
|
||||||
|
await expect(
|
||||||
|
f.service.reset({
|
||||||
|
matchId,
|
||||||
|
communityId,
|
||||||
|
clientObservedAuctionLifecycleId: observed,
|
||||||
|
}),
|
||||||
|
).rejects.toBeInstanceOf(NotFoundException);
|
||||||
|
expect(f.session.abortTransaction).toHaveBeenCalled();
|
||||||
|
}
|
||||||
|
});
|
||||||
@@ -0,0 +1,156 @@
|
|||||||
|
import mongoose from 'mongoose';
|
||||||
|
import { BadRequestException } from '@nestjs/common';
|
||||||
|
jest.mock('../auth/jwt.service', () => ({ JwtService: class JwtService {} }));
|
||||||
|
import { AuctionGateway } from './auction.gateway';
|
||||||
|
|
||||||
|
function setup() {
|
||||||
|
const appendChatMessage = jest.fn();
|
||||||
|
const gateway = new AuctionGateway(
|
||||||
|
{ appendChatMessage } as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
);
|
||||||
|
const broadcast = jest.fn();
|
||||||
|
const to = jest.fn().mockReturnValue({ emit: broadcast });
|
||||||
|
(gateway as unknown as { server: unknown }).server = {
|
||||||
|
to,
|
||||||
|
};
|
||||||
|
const socket = {
|
||||||
|
data: {
|
||||||
|
matchId: new mongoose.Types.ObjectId().toString(),
|
||||||
|
user: {
|
||||||
|
_id: new mongoose.Types.ObjectId(),
|
||||||
|
role: 'admin',
|
||||||
|
riotAccounts: [],
|
||||||
|
kakaoTalkNickname: '운영자',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
emit: jest.fn(),
|
||||||
|
};
|
||||||
|
return { gateway, appendChatMessage, broadcast, socket, to };
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('Auction chat delivery', () => {
|
||||||
|
const payload = {
|
||||||
|
message: '준비해 주세요',
|
||||||
|
clientMessageId: '0589e8a4-bccd-4ccd-a3ae-28f117401e79',
|
||||||
|
};
|
||||||
|
it('acknowledges only after saving and assigns the operator role from the socket user', async () => {
|
||||||
|
const { gateway, appendChatMessage, broadcast, socket } = setup();
|
||||||
|
const message = { id: 'saved', ...payload, sentAt: new Date() };
|
||||||
|
let finish!: (result: unknown) => void;
|
||||||
|
appendChatMessage.mockReturnValue(
|
||||||
|
new Promise((resolve) => {
|
||||||
|
finish = resolve;
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
const ack = jest.fn();
|
||||||
|
const pending = gateway.handleChatMessage(socket as never, payload, ack);
|
||||||
|
expect(ack).not.toHaveBeenCalled();
|
||||||
|
expect(broadcast).not.toHaveBeenCalled();
|
||||||
|
finish({ message, created: true });
|
||||||
|
await pending;
|
||||||
|
expect(appendChatMessage).toHaveBeenCalledWith(
|
||||||
|
expect.objectContaining({
|
||||||
|
clientMessageId: payload.clientMessageId,
|
||||||
|
senderRole: 'operator',
|
||||||
|
displayName: '운영자',
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
expect(ack).toHaveBeenCalledWith({
|
||||||
|
ok: true,
|
||||||
|
message: expect.objectContaining({ id: 'saved' }),
|
||||||
|
});
|
||||||
|
expect(broadcast).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('acknowledges a retry without broadcasting a duplicate', async () => {
|
||||||
|
const { gateway, appendChatMessage, broadcast, socket } = setup();
|
||||||
|
appendChatMessage.mockResolvedValue({
|
||||||
|
message: { id: 'saved' },
|
||||||
|
created: false,
|
||||||
|
});
|
||||||
|
const ack = jest.fn();
|
||||||
|
await gateway.handleChatMessage(socket as never, payload, ack);
|
||||||
|
expect(ack).toHaveBeenCalledWith({ ok: true, message: { id: 'saved' } });
|
||||||
|
expect(broadcast).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns rejection to the requesting composer without reporting success', async () => {
|
||||||
|
const { gateway, appendChatMessage, broadcast, socket } = setup();
|
||||||
|
appendChatMessage.mockRejectedValue(
|
||||||
|
new BadRequestException('Chat message is required.'),
|
||||||
|
);
|
||||||
|
const ack = jest.fn();
|
||||||
|
await gateway.handleChatMessage(socket as never, payload, ack);
|
||||||
|
expect(ack).toHaveBeenCalledWith(
|
||||||
|
expect.objectContaining({
|
||||||
|
ok: false,
|
||||||
|
message: 'Chat message is required.',
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
expect(broadcast).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Auction live reactions', () => {
|
||||||
|
it('broadcasts to the joined room with the server-resolved name, without saving a chat message', () => {
|
||||||
|
const { gateway, appendChatMessage, broadcast, socket, to } = setup();
|
||||||
|
const ack = jest.fn();
|
||||||
|
gateway.handleChatReaction(socket as never, { kind: 'clap' }, ack);
|
||||||
|
expect(to).toHaveBeenCalledWith(socket.data.matchId);
|
||||||
|
expect(broadcast).toHaveBeenCalledWith(
|
||||||
|
'chat-reaction',
|
||||||
|
expect.objectContaining({
|
||||||
|
id: expect.any(String),
|
||||||
|
kind: 'clap',
|
||||||
|
displayName: '운영자',
|
||||||
|
userId: socket.data.user._id.toString(),
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
expect(ack).toHaveBeenCalledWith({
|
||||||
|
ok: true,
|
||||||
|
reaction: broadcast.mock.calls[0][1],
|
||||||
|
});
|
||||||
|
expect(appendChatMessage).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects unjoined clients and arbitrary reaction values', () => {
|
||||||
|
const { gateway, broadcast, socket } = setup();
|
||||||
|
const ack = jest.fn();
|
||||||
|
gateway.handleChatReaction({ data: {} } as never, { kind: 'heart' }, ack);
|
||||||
|
expect(ack).toHaveBeenLastCalledWith({ ok: false, code: 'NOT_JOINED' });
|
||||||
|
for (const kind of ['__proto__', 'not-supported', 1, null]) {
|
||||||
|
gateway.handleChatReaction(socket as never, { kind }, ack);
|
||||||
|
expect(ack).toHaveBeenLastCalledWith({
|
||||||
|
ok: false,
|
||||||
|
code: 'INVALID_REACTION',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
expect(broadcast).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('throttles bursts, then accepts the next reaction after the interval', () => {
|
||||||
|
const { gateway, broadcast, socket } = setup();
|
||||||
|
const clock = jest.spyOn(Date, 'now').mockReturnValue(1000);
|
||||||
|
const ack = jest.fn();
|
||||||
|
try {
|
||||||
|
gateway.handleChatReaction(socket as never, { kind: 'heart' }, ack);
|
||||||
|
gateway.handleChatReaction(socket as never, { kind: 'heart' }, ack);
|
||||||
|
expect(ack).toHaveBeenLastCalledWith({
|
||||||
|
ok: false,
|
||||||
|
code: 'REACTION_RATE_LIMITED',
|
||||||
|
});
|
||||||
|
expect(broadcast).toHaveBeenCalledTimes(1);
|
||||||
|
clock.mockReturnValue(1400);
|
||||||
|
gateway.handleChatReaction(socket as never, { kind: 'celebrate' }, ack);
|
||||||
|
expect(broadcast).toHaveBeenCalledTimes(2);
|
||||||
|
} finally {
|
||||||
|
clock.mockRestore();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,607 @@
|
|||||||
|
import mongoose from 'mongoose';
|
||||||
|
import { AuctionService } from './auction.service';
|
||||||
|
import {
|
||||||
|
AuctionDurabilityScheduler,
|
||||||
|
buildAuctionProjectionGuardedUpdate,
|
||||||
|
type AuctionDurabilityPayload,
|
||||||
|
} from './auction-durability.scheduler';
|
||||||
|
import { AuctionDeadlineScheduler } from './auction-deadline.scheduler';
|
||||||
|
import { AuctionLifecycleLock } from './auction-lifecycle-lock';
|
||||||
|
|
||||||
|
const query = <T>(value: T) => ({
|
||||||
|
select() {
|
||||||
|
return this;
|
||||||
|
},
|
||||||
|
session() {
|
||||||
|
return this;
|
||||||
|
},
|
||||||
|
lean() {
|
||||||
|
return this;
|
||||||
|
},
|
||||||
|
exec: async () => value,
|
||||||
|
});
|
||||||
|
const session = () => ({
|
||||||
|
startTransaction: jest.fn(),
|
||||||
|
commitTransaction: jest.fn(),
|
||||||
|
abortTransaction: jest.fn(),
|
||||||
|
endSession: jest.fn(),
|
||||||
|
});
|
||||||
|
const state = {
|
||||||
|
auctionLifecycleId: 'life',
|
||||||
|
revision: 12,
|
||||||
|
phase: 'presenting',
|
||||||
|
currentAuctionHistorySequence: 7,
|
||||||
|
currentAuctionPlayerOrderIndex: 0,
|
||||||
|
currentAuctionRound: 1,
|
||||||
|
auctionTeams: [],
|
||||||
|
auctionPlayerOrder: [],
|
||||||
|
passedAuctionPlayerQueue: [],
|
||||||
|
currentHighestBidPointAmount: 0,
|
||||||
|
currentHighestBidderTeamIndex: -1,
|
||||||
|
auctionCompletedAtTimestampMS: 0,
|
||||||
|
currentBidRoundDeadlineTimestampMS: 0,
|
||||||
|
};
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
jest
|
||||||
|
.spyOn(AuctionLifecycleLock.prototype, 'run')
|
||||||
|
.mockImplementation(async (_id, work) => work());
|
||||||
|
});
|
||||||
|
afterEach(() => jest.restoreAllMocks());
|
||||||
|
|
||||||
|
function matches(
|
||||||
|
document: Record<string, unknown>,
|
||||||
|
filter: Record<string, unknown>,
|
||||||
|
): boolean {
|
||||||
|
return Object.entries(filter).every(([key, value]) => {
|
||||||
|
if (key === '$or')
|
||||||
|
return (value as Record<string, unknown>[]).some((alternative) =>
|
||||||
|
matches(document, alternative),
|
||||||
|
);
|
||||||
|
if (value && typeof value === 'object') {
|
||||||
|
return Object.entries(value).every(([operator, limit]) => {
|
||||||
|
if (operator === '$exists')
|
||||||
|
return (document[key] !== undefined) === limit;
|
||||||
|
if (operator === '$lt') return Number(document[key]) < Number(limit);
|
||||||
|
if (operator === '$lte') return Number(document[key]) <= Number(limit);
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return document[key] === value;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
function update(
|
||||||
|
document: Record<string, unknown>,
|
||||||
|
mutation: Record<string, Record<string, unknown>>,
|
||||||
|
) {
|
||||||
|
Object.assign(document, mutation.$set);
|
||||||
|
for (const [key, amount] of Object.entries(mutation.$inc ?? {}))
|
||||||
|
document[key] = Number(document[key] ?? 0) + Number(amount);
|
||||||
|
for (const key of Object.keys(mutation.$unset ?? {})) delete document[key];
|
||||||
|
}
|
||||||
|
|
||||||
|
function sideEffectFixture(withReader = false) {
|
||||||
|
const projection: Record<string, unknown> = {
|
||||||
|
_id: 'auction',
|
||||||
|
auctionLifecycleId: 'life',
|
||||||
|
revision: 9,
|
||||||
|
matchSideEffectRevision: 0,
|
||||||
|
};
|
||||||
|
const application: Record<string, unknown> = {};
|
||||||
|
const payload: AuctionDurabilityPayload = {
|
||||||
|
auctionId: 'auction',
|
||||||
|
matchId: 'match',
|
||||||
|
auctionLifecycleId: 'life',
|
||||||
|
auctionStateTransitionId: 'complete',
|
||||||
|
auctionActionType: 'complete',
|
||||||
|
auctionHistorySequence: 10,
|
||||||
|
revision: 10,
|
||||||
|
snapshotBefore: {},
|
||||||
|
historyMutation: { type: 'append' },
|
||||||
|
matchSideEffectMutation: { type: 'syncMatchTeamsAfterComplete' },
|
||||||
|
afterAuctionMongoProjection: {
|
||||||
|
auctionLifecycleId: 'life',
|
||||||
|
revision: 10,
|
||||||
|
phase: 'complete',
|
||||||
|
matchSideEffectRevision: 1,
|
||||||
|
matchSideEffectStatus: 'pending',
|
||||||
|
matchSideEffectTransitionId: 'complete',
|
||||||
|
auctionTeams: [{ teamIndex: 1, captainUserId: 'captain', members: [] }],
|
||||||
|
},
|
||||||
|
};
|
||||||
|
const AuctionModel = {
|
||||||
|
findById: () => query({ ...projection }),
|
||||||
|
updateOne: (
|
||||||
|
filter: Record<string, unknown>,
|
||||||
|
mutation: Record<string, Record<string, unknown>>,
|
||||||
|
) => {
|
||||||
|
const matchedCount = Number(matches(projection, filter));
|
||||||
|
if (matchedCount) update(projection, mutation);
|
||||||
|
return query({ matchedCount });
|
||||||
|
},
|
||||||
|
findOneAndUpdate: (
|
||||||
|
filter: Record<string, unknown>,
|
||||||
|
mutation: Record<string, Record<string, unknown>>,
|
||||||
|
) => {
|
||||||
|
if (!matches(projection, filter)) return query(null);
|
||||||
|
update(projection, mutation);
|
||||||
|
return query({ ...projection });
|
||||||
|
},
|
||||||
|
};
|
||||||
|
const ApplicationModel = {
|
||||||
|
findOne: () => query({ ...application }),
|
||||||
|
updateOne: (
|
||||||
|
filter: Record<string, unknown>,
|
||||||
|
mutation: Record<string, Record<string, unknown>>,
|
||||||
|
) => {
|
||||||
|
if (mutation.$setOnInsert) {
|
||||||
|
if (!application.state)
|
||||||
|
Object.assign(application, mutation.$setOnInsert);
|
||||||
|
return query({ matchedCount: 1 });
|
||||||
|
}
|
||||||
|
const matchedCount = Number(matches(application, filter));
|
||||||
|
if (matchedCount) update(application, mutation);
|
||||||
|
return query({ matchedCount });
|
||||||
|
},
|
||||||
|
};
|
||||||
|
const match = {
|
||||||
|
participants: [],
|
||||||
|
teams: [],
|
||||||
|
save: jest.fn().mockResolvedValue(undefined),
|
||||||
|
};
|
||||||
|
const historyFindOne = jest.fn().mockReturnValue(query(null));
|
||||||
|
const historyUpdateOne = jest
|
||||||
|
.fn()
|
||||||
|
.mockReturnValue(query({ matchedCount: 1 }));
|
||||||
|
const models: Record<string, unknown> = {
|
||||||
|
auction: AuctionModel,
|
||||||
|
auctionHistory: {
|
||||||
|
findOne: historyFindOne,
|
||||||
|
updateOne: historyUpdateOne,
|
||||||
|
},
|
||||||
|
auctionSideEffectApplication: ApplicationModel,
|
||||||
|
match: {
|
||||||
|
findById: () => ({ ...query(match), session: async () => match }),
|
||||||
|
},
|
||||||
|
};
|
||||||
|
const reserveForMatch = jest
|
||||||
|
.fn()
|
||||||
|
.mockRejectedValueOnce(new Error('temporary reservation error'))
|
||||||
|
.mockResolvedValue(match);
|
||||||
|
const scheduleInitialPoll = jest.fn().mockResolvedValue(undefined);
|
||||||
|
const releaseFromMatch = jest.fn().mockResolvedValue(undefined);
|
||||||
|
const cancelPolling = jest.fn().mockResolvedValue(undefined);
|
||||||
|
let queued = true;
|
||||||
|
const sendCommand = jest.fn(async (command: string[]) => {
|
||||||
|
if (command[0] === 'ZRANGEBYSCORE') return queued ? ['payload'] : [];
|
||||||
|
if (command[0] === 'HGETALL')
|
||||||
|
return { payloadJson: JSON.stringify(payload) };
|
||||||
|
if (command[0] === 'DEL') queued = false;
|
||||||
|
if (command[0] === 'HINCRBY') return 1;
|
||||||
|
return 1;
|
||||||
|
});
|
||||||
|
const scheduler = new AuctionDurabilityScheduler(
|
||||||
|
{
|
||||||
|
getModel: async (name: string) => models[name],
|
||||||
|
createSession: async () => session(),
|
||||||
|
} as never,
|
||||||
|
{
|
||||||
|
getCurrentRedisTimestampMS: async () => 10000,
|
||||||
|
raw: () => ({ sendCommand }),
|
||||||
|
} as never,
|
||||||
|
{ reserveForMatch, releaseFromMatch } as never,
|
||||||
|
{ scheduleInitialPoll, cancelPolling } as never,
|
||||||
|
undefined,
|
||||||
|
undefined,
|
||||||
|
withReader
|
||||||
|
? ({
|
||||||
|
readAuctionStateView: async () => ({
|
||||||
|
auctionLifecycleId: 'life',
|
||||||
|
phase: payload.afterAuctionMongoProjection.phase,
|
||||||
|
matchSideEffectTransitionId: 'complete',
|
||||||
|
}),
|
||||||
|
} as never)
|
||||||
|
: undefined,
|
||||||
|
);
|
||||||
|
return {
|
||||||
|
scheduler,
|
||||||
|
payload,
|
||||||
|
projection,
|
||||||
|
application,
|
||||||
|
reserveForMatch,
|
||||||
|
scheduleInitialPoll,
|
||||||
|
sendCommand,
|
||||||
|
match,
|
||||||
|
historyFindOne,
|
||||||
|
historyUpdateOne,
|
||||||
|
releaseFromMatch,
|
||||||
|
cancelPolling,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
it('retries failed completion work with the current generation and only then deletes the payload', async () => {
|
||||||
|
const f = sideEffectFixture();
|
||||||
|
expect(await f.scheduler.processDueDurabilityPayloads(20)).toMatchObject({
|
||||||
|
failed: 1,
|
||||||
|
});
|
||||||
|
expect(f.projection.matchSideEffectStatus).toBe('failed');
|
||||||
|
expect(await f.scheduler.processDueDurabilityPayloads(20)).toMatchObject({
|
||||||
|
applied: 1,
|
||||||
|
});
|
||||||
|
expect(f.reserveForMatch).toHaveBeenCalledTimes(2);
|
||||||
|
expect(f.scheduleInitialPoll).toHaveBeenCalledTimes(1);
|
||||||
|
expect(f.application.state).toBe('completed');
|
||||||
|
expect(f.projection.matchSideEffectStatus).toBe('completed');
|
||||||
|
expect(f.projection.matchSideEffectRevision).toBe(5);
|
||||||
|
expect(f.sendCommand).toHaveBeenCalledWith(['DEL', 'payload']);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps an outbox payload while another worker owns its side-effect lease', async () => {
|
||||||
|
const f = sideEffectFixture();
|
||||||
|
Object.assign(f.application, {
|
||||||
|
auctionId: 'auction',
|
||||||
|
auctionStateTransitionId: 'complete',
|
||||||
|
sideEffectType: 'syncMatchTeamsAfterComplete',
|
||||||
|
state: 'processing',
|
||||||
|
processingOwnerToken: 'other',
|
||||||
|
processingLeaseExpiresAtTimestampMS: 50000,
|
||||||
|
});
|
||||||
|
expect(await f.scheduler.processDueDurabilityPayloads(20)).toEqual({
|
||||||
|
applied: 0,
|
||||||
|
failed: 0,
|
||||||
|
skipped: 1,
|
||||||
|
});
|
||||||
|
expect(f.sendCommand).not.toHaveBeenCalledWith(['DEL', 'payload']);
|
||||||
|
expect(
|
||||||
|
f.sendCommand.mock.calls.some(([command]) => command[0] === 'HINCRBY'),
|
||||||
|
).toBe(false);
|
||||||
|
expect(f.reserveForMatch).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('recovers side effects when a later ordinary projection was persisted first', async () => {
|
||||||
|
const f = sideEffectFixture(true);
|
||||||
|
f.reserveForMatch.mockReset().mockResolvedValue(undefined);
|
||||||
|
Object.assign(f.projection, { revision: 12 });
|
||||||
|
await f.scheduler.applyDurabilityPayload(f.payload);
|
||||||
|
expect(f.reserveForMatch).toHaveBeenCalledTimes(1);
|
||||||
|
expect(f.projection.revision).toBe(12);
|
||||||
|
expect(f.projection.matchSideEffectTransitionId).toBe('complete');
|
||||||
|
expect(f.projection.matchSideEffectStatus).toBe('completed');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('still cleans up completed Match state when a second undo invalidates the first undo history', async () => {
|
||||||
|
const f = sideEffectFixture(true);
|
||||||
|
Object.assign(f.projection, { revision: 12 });
|
||||||
|
Object.assign(f.payload, {
|
||||||
|
matchSideEffectMutation: { type: 'undoCompletedAuctionSideEffects' },
|
||||||
|
});
|
||||||
|
f.payload.afterAuctionMongoProjection.phase = 'presenting';
|
||||||
|
Object.assign(f.match, {
|
||||||
|
teams: [{ teamIndex: 1 }],
|
||||||
|
teamBuiltAt: new Date(),
|
||||||
|
tournamentCodeIds: ['code'],
|
||||||
|
gameSchedule: [{}],
|
||||||
|
});
|
||||||
|
f.historyFindOne.mockReturnValue(
|
||||||
|
query({
|
||||||
|
sequence: 12,
|
||||||
|
historyMutation: {
|
||||||
|
type: 'deleteAfterSequenceAndAppendUndo',
|
||||||
|
targetHistorySequence: 2,
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
await f.scheduler.applyDurabilityPayload(f.payload);
|
||||||
|
expect(f.historyUpdateOne).not.toHaveBeenCalled();
|
||||||
|
expect(f.releaseFromMatch).toHaveBeenCalledTimes(1);
|
||||||
|
expect(f.cancelPolling).toHaveBeenCalledTimes(1);
|
||||||
|
expect(f.match).toMatchObject({
|
||||||
|
teams: [],
|
||||||
|
teamBuiltAt: undefined,
|
||||||
|
tournamentCodeIds: [],
|
||||||
|
gameSchedule: [],
|
||||||
|
});
|
||||||
|
expect(f.projection.matchSideEffectStatus).toBe('completed');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not let a superseded side effect overwrite the newer generation', async () => {
|
||||||
|
const f = sideEffectFixture();
|
||||||
|
Object.assign(f.projection, {
|
||||||
|
revision: 12,
|
||||||
|
matchSideEffectTransitionId: 'undo',
|
||||||
|
matchSideEffectRevision: 6,
|
||||||
|
});
|
||||||
|
await f.scheduler.applyDurabilityPayload(f.payload);
|
||||||
|
expect(f.reserveForMatch).not.toHaveBeenCalled();
|
||||||
|
expect(f.projection.matchSideEffectTransitionId).toBe('undo');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('removes obsolete projection fields both from Mongo updates and subsequent undo snapshots', () => {
|
||||||
|
const service = new AuctionService(
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
);
|
||||||
|
const internal = service as unknown as {
|
||||||
|
buildAuctionMongoProjectionFromState(
|
||||||
|
auction: unknown,
|
||||||
|
state: Record<string, unknown>,
|
||||||
|
): Record<string, unknown>;
|
||||||
|
buildAuctionSnapshotFromRedisState(
|
||||||
|
auction: unknown,
|
||||||
|
state: Record<string, unknown>,
|
||||||
|
): Record<string, unknown>;
|
||||||
|
};
|
||||||
|
const old = {
|
||||||
|
_id: new mongoose.Types.ObjectId(),
|
||||||
|
matchId: new mongoose.Types.ObjectId(),
|
||||||
|
completedAt: new Date(),
|
||||||
|
auctionCompletedAtTimestampMS: 100,
|
||||||
|
currentHighestBidderTeamIndex: 2,
|
||||||
|
currentBidderTeamIndex: 2,
|
||||||
|
};
|
||||||
|
const projection = internal.buildAuctionMongoProjectionFromState(old, state);
|
||||||
|
const mutation = buildAuctionProjectionGuardedUpdate({
|
||||||
|
auctionId: old._id,
|
||||||
|
auctionLifecycleId: 'life',
|
||||||
|
revision: 12,
|
||||||
|
afterAuctionMongoProjection: projection,
|
||||||
|
} as AuctionDurabilityPayload).update;
|
||||||
|
const stored = { ...old } as Record<string, unknown>;
|
||||||
|
update(stored, mutation);
|
||||||
|
const snapshot = internal.buildAuctionSnapshotFromRedisState(old, state);
|
||||||
|
for (const record of [stored, snapshot]) {
|
||||||
|
expect(record).not.toHaveProperty('completedAt');
|
||||||
|
expect(record).not.toHaveProperty('currentHighestBidderTeamIndex');
|
||||||
|
expect(record.phase).toBe('presenting');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('applies delayed undo history cleanup without deleting newer branch entries or rolling back projection', async () => {
|
||||||
|
const deleteMany = jest.fn().mockReturnValue(query({}));
|
||||||
|
const updateOne = jest.fn().mockReturnValue(query({}));
|
||||||
|
const projectionUpdate = jest.fn();
|
||||||
|
const models: Record<string, unknown> = {
|
||||||
|
auction: {
|
||||||
|
findById: () => query({ auctionLifecycleId: 'life', revision: 12 }),
|
||||||
|
updateOne: projectionUpdate,
|
||||||
|
},
|
||||||
|
auctionHistory: { findOne: () => query(null), deleteMany, updateOne },
|
||||||
|
auctionSideEffectApplication: {},
|
||||||
|
};
|
||||||
|
const scheduler = new AuctionDurabilityScheduler(
|
||||||
|
{
|
||||||
|
getModel: async (name: string) => models[name],
|
||||||
|
createSession: async () => null,
|
||||||
|
} as never,
|
||||||
|
{} as never,
|
||||||
|
);
|
||||||
|
await scheduler.applyDurabilityPayload({
|
||||||
|
auctionId: 'auction',
|
||||||
|
matchId: 'match',
|
||||||
|
auctionStateTransitionId: 'undo',
|
||||||
|
auctionLifecycleId: 'life',
|
||||||
|
revision: 11,
|
||||||
|
auctionHistorySequence: 9,
|
||||||
|
auctionActionType: 'undo',
|
||||||
|
historyMutation: {
|
||||||
|
type: 'deleteAfterSequenceAndAppendUndo',
|
||||||
|
targetHistorySequence: 3,
|
||||||
|
},
|
||||||
|
matchSideEffectMutation: { type: 'none' },
|
||||||
|
afterAuctionMongoProjection: {},
|
||||||
|
snapshotBefore: {},
|
||||||
|
} as AuctionDurabilityPayload);
|
||||||
|
expect(deleteMany).toHaveBeenCalledWith(
|
||||||
|
{ auctionId: 'auction', sequence: { $gt: 3, $lt: 9 } },
|
||||||
|
{ session: null },
|
||||||
|
);
|
||||||
|
expect(updateOne).toHaveBeenCalledTimes(1);
|
||||||
|
expect(projectionUpdate).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects a cancellation from a prior lifecycle before deleting anything', async () => {
|
||||||
|
const matchId = new mongoose.Types.ObjectId(),
|
||||||
|
communityId = new mongoose.Types.ObjectId();
|
||||||
|
const deleteOne = jest.fn();
|
||||||
|
const service = new AuctionService(
|
||||||
|
{
|
||||||
|
createSession: async () => session(),
|
||||||
|
getModel: async () => ({
|
||||||
|
findOne: () => ({
|
||||||
|
session: async () => ({
|
||||||
|
auctionEngineVersion: 'redis-v1',
|
||||||
|
auctionLifecycleId: 'new-life',
|
||||||
|
deleteOne,
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
);
|
||||||
|
await expect(
|
||||||
|
service.reset({
|
||||||
|
matchId,
|
||||||
|
communityId,
|
||||||
|
clientObservedAuctionLifecycleId: 'old-life',
|
||||||
|
}),
|
||||||
|
).rejects.toThrow('lifecycle has changed');
|
||||||
|
expect(deleteOne).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('resumes startup after Mongo creation instead of returning an unfinished auction', async () => {
|
||||||
|
const matchId = new mongoose.Types.ObjectId(),
|
||||||
|
communityId = new mongoose.Types.ObjectId();
|
||||||
|
const captain = new mongoose.Types.ObjectId(),
|
||||||
|
player = new mongoose.Types.ObjectId(),
|
||||||
|
lateJoiner = new mongoose.Types.ObjectId();
|
||||||
|
const auction = {
|
||||||
|
_id: new mongoose.Types.ObjectId(),
|
||||||
|
matchId,
|
||||||
|
auctionLifecycleId: 'life',
|
||||||
|
revision: 1,
|
||||||
|
phase: 'presenting',
|
||||||
|
startupCompleted: false,
|
||||||
|
startAuctionRequestId: 'same-request',
|
||||||
|
teams: [{ captainUserId: captain, members: [], teamIndex: 1 }],
|
||||||
|
order: [{ userId: player }],
|
||||||
|
};
|
||||||
|
const match = {
|
||||||
|
communityId,
|
||||||
|
status: 'recruiting',
|
||||||
|
participants: [captain, player, lateJoiner].map((userId) => ({
|
||||||
|
userId,
|
||||||
|
excluded: false,
|
||||||
|
})),
|
||||||
|
save: jest.fn(),
|
||||||
|
};
|
||||||
|
const updateOne = jest.fn();
|
||||||
|
const historyUpdate = jest.fn();
|
||||||
|
const models: Record<string, unknown> = {
|
||||||
|
auction: { findOne: async () => auction, updateOne },
|
||||||
|
match: { findById: async () => match },
|
||||||
|
auctionHistory: { updateOne: historyUpdate },
|
||||||
|
};
|
||||||
|
const hydrateState = jest.fn().mockResolvedValue({ hydrated: true });
|
||||||
|
const service = new AuctionService(
|
||||||
|
{ getModel: async (name: string) => models[name] } as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{ hydrateState } as never,
|
||||||
|
{} as never,
|
||||||
|
);
|
||||||
|
await service.start({
|
||||||
|
matchId,
|
||||||
|
communityId,
|
||||||
|
startAuctionRequestId: 'same-request',
|
||||||
|
} as never);
|
||||||
|
expect(hydrateState).toHaveBeenCalledTimes(1);
|
||||||
|
expect(historyUpdate).toHaveBeenCalledTimes(1);
|
||||||
|
expect(match.save).toHaveBeenCalledTimes(1);
|
||||||
|
expect(match.status).toBe('team-built');
|
||||||
|
expect(auction.startupCompleted).toBe(true);
|
||||||
|
expect(match.participants.map((entry) => entry.excluded)).toEqual([
|
||||||
|
false,
|
||||||
|
false,
|
||||||
|
true,
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not open bidding until interrupted startup has been completed', async () => {
|
||||||
|
const service = new AuctionService(
|
||||||
|
{
|
||||||
|
getModel: async () => ({
|
||||||
|
findOne: async () => ({
|
||||||
|
auctionEngineVersion: 'redis-v1',
|
||||||
|
startupCompleted: false,
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
);
|
||||||
|
await expect(
|
||||||
|
service.openBidding(new mongoose.Types.ObjectId()),
|
||||||
|
).rejects.toThrow('startup is not complete');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('uses Redis completion state to schedule cleanup despite a delayed Mongo projection', async () => {
|
||||||
|
const matchId = new mongoose.Types.ObjectId(),
|
||||||
|
communityId = new mongoose.Types.ObjectId();
|
||||||
|
const auction = {
|
||||||
|
_id: new mongoose.Types.ObjectId(),
|
||||||
|
matchId,
|
||||||
|
auctionEngineVersion: 'redis-v1',
|
||||||
|
auctionLifecycleId: 'life',
|
||||||
|
phase: 'sold',
|
||||||
|
revision: 9,
|
||||||
|
};
|
||||||
|
const snapshot = { ...state, phase: 'bidding', revision: 5 };
|
||||||
|
const models: Record<string, unknown> = {
|
||||||
|
auction: { findOne: () => ({ session: async () => auction }) },
|
||||||
|
match: { findById: () => ({ session: async () => ({ communityId }) }) },
|
||||||
|
auctionHistory: { findOne: () => query({ snapshotBefore: snapshot }) },
|
||||||
|
};
|
||||||
|
const applyTransition = jest.fn().mockResolvedValue({ ok: true });
|
||||||
|
const commands = {
|
||||||
|
reserveActionRequest: async () => ({
|
||||||
|
reserved: true,
|
||||||
|
actionRequestScopeKey: 'scope',
|
||||||
|
auctionStateTransitionId: 'undo',
|
||||||
|
observedProcessingLeaseVersion: 1,
|
||||||
|
}),
|
||||||
|
applyTransition,
|
||||||
|
};
|
||||||
|
const service = new AuctionService(
|
||||||
|
{
|
||||||
|
getModel: async (name: string) => models[name],
|
||||||
|
createSession: async () => session(),
|
||||||
|
} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
commands as never,
|
||||||
|
{
|
||||||
|
readAuctionStateView: async () => ({
|
||||||
|
...state,
|
||||||
|
phase: 'complete',
|
||||||
|
revision: 10,
|
||||||
|
}),
|
||||||
|
} as never,
|
||||||
|
);
|
||||||
|
await service.undoTo({ matchId, communityId, sequence: 2 });
|
||||||
|
const input = applyTransition.mock.calls[0][1] as {
|
||||||
|
durabilityPayloadJson: string;
|
||||||
|
};
|
||||||
|
expect(JSON.parse(input.durabilityPayloadJson)).toMatchObject({
|
||||||
|
matchSideEffectMutation: { type: 'undoCompletedAuctionSideEffects' },
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each(['deadline', 'durability'])(
|
||||||
|
'continues %s ticks when lock release fails',
|
||||||
|
async (kind) => {
|
||||||
|
const redis = {
|
||||||
|
acquireTokenLock: jest.fn().mockResolvedValue(true),
|
||||||
|
releaseTokenLock: jest
|
||||||
|
.fn()
|
||||||
|
.mockRejectedValue(new Error('redis disconnected')),
|
||||||
|
};
|
||||||
|
const scheduler =
|
||||||
|
kind === 'deadline'
|
||||||
|
? new AuctionDeadlineScheduler(
|
||||||
|
redis as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
)
|
||||||
|
: new AuctionDurabilityScheduler({} as never, redis as never);
|
||||||
|
const work = jest.fn().mockResolvedValue({});
|
||||||
|
Object.assign(
|
||||||
|
scheduler,
|
||||||
|
kind === 'deadline'
|
||||||
|
? { processDueBidRoundDeadlines: work }
|
||||||
|
: { processDueDurabilityPayloads: work },
|
||||||
|
);
|
||||||
|
const internal = scheduler as unknown as { safeTick(): Promise<void> };
|
||||||
|
await internal.safeTick();
|
||||||
|
await internal.safeTick();
|
||||||
|
expect(work).toHaveBeenCalledTimes(2);
|
||||||
|
},
|
||||||
|
);
|
||||||
@@ -0,0 +1,223 @@
|
|||||||
|
import { AuctionRedisService } from './redis/auction-redis.service';
|
||||||
|
import { AuctionDeadlineScheduler } from './auction-deadline.scheduler';
|
||||||
|
import { AuctionRedisCommandService } from './redis/auction-redis-command.service';
|
||||||
|
import { AuctionService } from './auction.service';
|
||||||
|
import { AuctionEventBusService } from './auction-event-bus.service';
|
||||||
|
|
||||||
|
function makeScheduler(params: {
|
||||||
|
dueReply?: unknown;
|
||||||
|
leaderLockAcquired?: boolean;
|
||||||
|
expireReply?: unknown;
|
||||||
|
completedState?: unknown;
|
||||||
|
currentRedisTimestampMS?: number;
|
||||||
|
}) {
|
||||||
|
const sendCommand = jest.fn().mockResolvedValue(params.dueReply ?? []);
|
||||||
|
const redis = {
|
||||||
|
acquireTokenLock: jest
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValue(params.leaderLockAcquired ?? true),
|
||||||
|
getCurrentRedisTimestampMS: jest
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValue(params.currentRedisTimestampMS ?? 1000),
|
||||||
|
releaseTokenLock: jest.fn().mockResolvedValue(true),
|
||||||
|
raw: jest.fn().mockReturnValue({ sendCommand }),
|
||||||
|
} as unknown as jest.Mocked<AuctionRedisService>;
|
||||||
|
const redisCommand = {
|
||||||
|
expirePrepare: jest.fn().mockResolvedValue(
|
||||||
|
params.expireReply ?? {
|
||||||
|
auctionStateTransitionId: 'expire-1',
|
||||||
|
bidRoundExpiryDecision: 'passed',
|
||||||
|
currentServerTimestampMS: 1000,
|
||||||
|
ok: true,
|
||||||
|
revision: 2,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
} as unknown as jest.Mocked<AuctionRedisCommandService>;
|
||||||
|
const auctionService = {
|
||||||
|
completePreparedExpiry: jest
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValue(params.completedState ?? { phase: 'passed' }),
|
||||||
|
} as unknown as jest.Mocked<AuctionService>;
|
||||||
|
const eventBus = {
|
||||||
|
broadcastState: jest.fn(),
|
||||||
|
} as unknown as jest.Mocked<AuctionEventBusService>;
|
||||||
|
return {
|
||||||
|
auctionService,
|
||||||
|
eventBus,
|
||||||
|
redis,
|
||||||
|
redisCommand,
|
||||||
|
scheduler: new AuctionDeadlineScheduler(
|
||||||
|
redis,
|
||||||
|
redisCommand,
|
||||||
|
auctionService,
|
||||||
|
eventBus,
|
||||||
|
),
|
||||||
|
sendCommand,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('AuctionDeadlineScheduler', () => {
|
||||||
|
afterEach(() => {
|
||||||
|
jest.restoreAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('starts and clears the deadline tick timer', () => {
|
||||||
|
const setIntervalSpy = jest.spyOn(global, 'setInterval');
|
||||||
|
const clearIntervalSpy = jest.spyOn(global, 'clearInterval');
|
||||||
|
const { scheduler } = makeScheduler({});
|
||||||
|
|
||||||
|
scheduler.onModuleInit();
|
||||||
|
scheduler.onModuleDestroy();
|
||||||
|
|
||||||
|
expect(setIntervalSpy).toHaveBeenCalledWith(expect.any(Function), 1000);
|
||||||
|
expect(clearIntervalSpy).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('processes a deadline tick only while holding the Redis leader lock', async () => {
|
||||||
|
const { redis, scheduler } = makeScheduler({});
|
||||||
|
const processDueBidRoundDeadlinesSpy = jest
|
||||||
|
.spyOn(scheduler, 'processDueBidRoundDeadlines')
|
||||||
|
.mockResolvedValue({ completed: 0, prepared: 0, skipped: 0 });
|
||||||
|
|
||||||
|
await (
|
||||||
|
scheduler as unknown as { safeTick: () => Promise<void> }
|
||||||
|
).safeTick();
|
||||||
|
|
||||||
|
const leaderLockToken = redis.acquireTokenLock.mock.calls[0]?.[1];
|
||||||
|
expect(redis.acquireTokenLock).toHaveBeenCalledWith(
|
||||||
|
'auction:bidRoundDeadlineScheduler:leader',
|
||||||
|
expect.any(String),
|
||||||
|
2500,
|
||||||
|
);
|
||||||
|
expect(processDueBidRoundDeadlinesSpy).toHaveBeenCalledWith(20);
|
||||||
|
expect(redis.releaseTokenLock).toHaveBeenCalledWith(
|
||||||
|
'auction:bidRoundDeadlineScheduler:leader',
|
||||||
|
leaderLockToken,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('skips deadline tick work when another instance holds the leader lock', async () => {
|
||||||
|
const { redis, scheduler } = makeScheduler({ leaderLockAcquired: false });
|
||||||
|
const processDueBidRoundDeadlinesSpy = jest
|
||||||
|
.spyOn(scheduler, 'processDueBidRoundDeadlines')
|
||||||
|
.mockResolvedValue({ completed: 0, prepared: 0, skipped: 0 });
|
||||||
|
|
||||||
|
await (
|
||||||
|
scheduler as unknown as { safeTick: () => Promise<void> }
|
||||||
|
).safeTick();
|
||||||
|
|
||||||
|
expect(processDueBidRoundDeadlinesSpy).not.toHaveBeenCalled();
|
||||||
|
expect(redis.releaseTokenLock).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('reads due match ids from the Redis deadline queue with a batch limit', async () => {
|
||||||
|
const { redis, scheduler } = makeScheduler({
|
||||||
|
dueReply: ['match-1', 'match-2'],
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(scheduler.readDueMatchIds(1_000, 2)).resolves.toEqual([
|
||||||
|
'match-1',
|
||||||
|
'match-2',
|
||||||
|
]);
|
||||||
|
expect(redis.raw().sendCommand).toHaveBeenCalledWith([
|
||||||
|
'ZRANGEBYSCORE',
|
||||||
|
'auction:bidRoundDeadlineQueue',
|
||||||
|
'-inf',
|
||||||
|
'1000',
|
||||||
|
'LIMIT',
|
||||||
|
'0',
|
||||||
|
'2',
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('prepares and completes due auction deadlines', async () => {
|
||||||
|
const matchId = '665f2f01f1f1f1f1f1f1f1f1';
|
||||||
|
const completedState = { phase: 'passed', revision: 3 };
|
||||||
|
const { auctionService, eventBus, redisCommand, scheduler } = makeScheduler(
|
||||||
|
{
|
||||||
|
dueReply: [matchId],
|
||||||
|
completedState,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
await expect(scheduler.processDueBidRoundDeadlines(10)).resolves.toEqual({
|
||||||
|
completed: 1,
|
||||||
|
prepared: 1,
|
||||||
|
skipped: 0,
|
||||||
|
});
|
||||||
|
expect(redisCommand.expirePrepare).toHaveBeenCalledWith(
|
||||||
|
matchId,
|
||||||
|
expect.objectContaining({
|
||||||
|
bidRoundExpiryRetryDelayMS: 3000,
|
||||||
|
matchId,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
expect(auctionService.completePreparedExpiry).toHaveBeenCalledTimes(1);
|
||||||
|
// 만료 확정 결과는 즉시 1차 broadcast돼야 한다(클라가 입찰 라운드에 멈춰
|
||||||
|
// 후속 액션에서 CONFLICT가 반복되는 것을 막는 핵심 동작).
|
||||||
|
expect(eventBus.broadcastState).toHaveBeenCalledWith(
|
||||||
|
matchId,
|
||||||
|
completedState,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('skips noop expiry preparations', async () => {
|
||||||
|
const { auctionService, eventBus, scheduler } = makeScheduler({
|
||||||
|
dueReply: ['665f2f01f1f1f1f1f1f1f1f1'],
|
||||||
|
expireReply: {
|
||||||
|
code: 'NOT_DUE',
|
||||||
|
currentServerTimestampMS: 1000,
|
||||||
|
noop: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(scheduler.processDueBidRoundDeadlines(10)).resolves.toEqual({
|
||||||
|
completed: 0,
|
||||||
|
prepared: 0,
|
||||||
|
skipped: 1,
|
||||||
|
});
|
||||||
|
expect(auctionService.completePreparedExpiry).not.toHaveBeenCalled();
|
||||||
|
expect(eventBus.broadcastState).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('removes invalid deadline queue members', async () => {
|
||||||
|
const { scheduler, sendCommand } = makeScheduler({
|
||||||
|
dueReply: ['not-a-match-id'],
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(scheduler.processDueBidRoundDeadlines(10)).resolves.toEqual({
|
||||||
|
completed: 0,
|
||||||
|
prepared: 0,
|
||||||
|
skipped: 1,
|
||||||
|
});
|
||||||
|
expect(sendCommand).toHaveBeenLastCalledWith([
|
||||||
|
'ZREM',
|
||||||
|
'auction:bidRoundDeadlineQueue',
|
||||||
|
'not-a-match-id',
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('continues processing later deadline items after one item fails', async () => {
|
||||||
|
const matchIds = ['665f2f01f1f1f1f1f1f1f1f1', '665f2f02f1f1f1f1f1f1f1f1'];
|
||||||
|
const { auctionService, redisCommand, scheduler } = makeScheduler({
|
||||||
|
dueReply: matchIds,
|
||||||
|
});
|
||||||
|
redisCommand.expirePrepare
|
||||||
|
.mockRejectedValueOnce(new Error('temporary redis error'))
|
||||||
|
.mockResolvedValueOnce({
|
||||||
|
auctionStateTransitionId: 'expire-2',
|
||||||
|
bidRoundExpiryDecision: 'passed',
|
||||||
|
currentServerTimestampMS: 1000,
|
||||||
|
ok: true,
|
||||||
|
revision: 3,
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(scheduler.processDueBidRoundDeadlines(10)).resolves.toEqual({
|
||||||
|
completed: 1,
|
||||||
|
prepared: 1,
|
||||||
|
skipped: 1,
|
||||||
|
});
|
||||||
|
expect(redisCommand.expirePrepare).toHaveBeenCalledTimes(2);
|
||||||
|
expect(auctionService.completePreparedExpiry).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,192 @@
|
|||||||
|
import {
|
||||||
|
Injectable,
|
||||||
|
Logger,
|
||||||
|
OnModuleDestroy,
|
||||||
|
OnModuleInit,
|
||||||
|
} from '@nestjs/common';
|
||||||
|
import { randomUUID } from 'crypto';
|
||||||
|
import mongoose from 'mongoose';
|
||||||
|
import { AuctionService } from './auction.service';
|
||||||
|
import { AuctionEventBusService } from './auction-event-bus.service';
|
||||||
|
import { AuctionRedisCommandService } from './redis/auction-redis-command.service';
|
||||||
|
import { AuctionRedisService } from './redis/auction-redis.service';
|
||||||
|
|
||||||
|
const BID_ROUND_DEADLINE_QUEUE_KEY = 'auction:bidRoundDeadlineQueue';
|
||||||
|
const BID_ROUND_EXPIRY_RETRY_DELAY_MS = 3000;
|
||||||
|
const BID_ROUND_DEADLINE_TICK_INTERVAL_MS = 1000;
|
||||||
|
const BID_ROUND_DEADLINE_BATCH_LIMIT = 20;
|
||||||
|
const BID_ROUND_DEADLINE_LEADER_LOCK_KEY =
|
||||||
|
'auction:bidRoundDeadlineScheduler:leader';
|
||||||
|
const BID_ROUND_DEADLINE_LEADER_LOCK_TTL_MS = 2500;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 입찰 라운드 마감(deadline)을 감시해 자동으로 만료시키는 단일 리더 스위퍼.
|
||||||
|
*
|
||||||
|
* 만료는 2단계로 처리한다(정확히-1회 + 노드 크래시 복구를 위해):
|
||||||
|
* 1) EXPIRE_PREPARE Lua: `bidding → expiring`으로 flip하고 만료 결정/컨텍스트를
|
||||||
|
* `liveAuctionState`에 고정 + deadline ZSET에 재시도 점수 재등록.
|
||||||
|
* 2) `completePreparedExpiry`: 고정된 컨텍스트로 APPLY_TRANSITION을 돌려
|
||||||
|
* `sold`/`passed`로 확정하고 Mongo durability outbox를 enqueue.
|
||||||
|
*
|
||||||
|
* 중요(브로드캐스트 책임):
|
||||||
|
* - 관리자 수동 전환(sold/next 등)은 게이트웨이가 응답 직후 동기로 `state`를
|
||||||
|
* broadcast하지만, 자동 만료는 게이트웨이를 거치지 않는다.
|
||||||
|
* - 따라서 만료 확정 결과를 클라이언트에 즉시 알리는 1차 전달 책임은 이 스위퍼에
|
||||||
|
* 있다. 여기서 broadcast하지 않으면 클라는 입찰 라운드 revision에 멈춰 있다가
|
||||||
|
* "다음" 등 후속 액션에서 stale 관측값으로 CONFLICT를 반복하게 된다.
|
||||||
|
* - `AuctionDurabilityScheduler`의 broadcast는 Mongo 영속화 성공에 묶인 ~1초 주기의
|
||||||
|
* "노드 크래시 복구용 백업"이지 1차 전달 경로가 아니다(중복 emit돼도 클라
|
||||||
|
* revision 가드로 무해).
|
||||||
|
*
|
||||||
|
* 멀티 인스턴스: 리더 락을 잡은 한 인스턴스만 만료를 처리/방송하고, socket.io Redis
|
||||||
|
* adapter가 전 인스턴스 소켓으로 fanout한다.
|
||||||
|
*/
|
||||||
|
@Injectable()
|
||||||
|
export class AuctionDeadlineScheduler implements OnModuleInit, OnModuleDestroy {
|
||||||
|
private readonly logger = new Logger(AuctionDeadlineScheduler.name);
|
||||||
|
private tickTimer?: NodeJS.Timeout;
|
||||||
|
private tickInProgress = false;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private readonly auctionRedisService: AuctionRedisService,
|
||||||
|
private readonly auctionRedisCommandService: AuctionRedisCommandService,
|
||||||
|
private readonly auctionService: AuctionService,
|
||||||
|
// 만료 확정 결과를 클라이언트에 즉시 알리기 위한 1차 broadcast 채널.
|
||||||
|
private readonly auctionEventBusService: AuctionEventBusService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
public onModuleInit(): void {
|
||||||
|
this.tickTimer = setInterval(
|
||||||
|
() => void this.safeTick(),
|
||||||
|
BID_ROUND_DEADLINE_TICK_INTERVAL_MS,
|
||||||
|
);
|
||||||
|
this.tickTimer.unref?.();
|
||||||
|
}
|
||||||
|
|
||||||
|
public onModuleDestroy(): void {
|
||||||
|
if (this.tickTimer) clearInterval(this.tickTimer);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async safeTick(): Promise<void> {
|
||||||
|
if (this.tickInProgress) return;
|
||||||
|
this.tickInProgress = true;
|
||||||
|
const leaderLockToken = randomUUID();
|
||||||
|
let leaderLockAcquired = false;
|
||||||
|
try {
|
||||||
|
leaderLockAcquired = await this.auctionRedisService.acquireTokenLock(
|
||||||
|
BID_ROUND_DEADLINE_LEADER_LOCK_KEY,
|
||||||
|
leaderLockToken,
|
||||||
|
BID_ROUND_DEADLINE_LEADER_LOCK_TTL_MS,
|
||||||
|
);
|
||||||
|
if (!leaderLockAcquired) return;
|
||||||
|
await this.processDueBidRoundDeadlines(BID_ROUND_DEADLINE_BATCH_LIMIT);
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.warn(
|
||||||
|
`Auction deadline tick failed: ${
|
||||||
|
error instanceof Error ? error.message : error
|
||||||
|
}`,
|
||||||
|
);
|
||||||
|
} finally {
|
||||||
|
if (leaderLockAcquired) {
|
||||||
|
await this.auctionRedisService
|
||||||
|
.releaseTokenLock(BID_ROUND_DEADLINE_LEADER_LOCK_KEY, leaderLockToken)
|
||||||
|
.catch((error: unknown) => {
|
||||||
|
this.logger.warn(
|
||||||
|
`Auction deadline lock release failed: ${String(error)}`,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
this.tickInProgress = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async readDueMatchIds(
|
||||||
|
currentRedisTimestampMS: number,
|
||||||
|
batchLimit: number,
|
||||||
|
): Promise<string[]> {
|
||||||
|
const reply = await this.auctionRedisService
|
||||||
|
.raw()
|
||||||
|
.sendCommand([
|
||||||
|
'ZRANGEBYSCORE',
|
||||||
|
BID_ROUND_DEADLINE_QUEUE_KEY,
|
||||||
|
'-inf',
|
||||||
|
String(currentRedisTimestampMS),
|
||||||
|
'LIMIT',
|
||||||
|
'0',
|
||||||
|
String(batchLimit),
|
||||||
|
]);
|
||||||
|
return Array.isArray(reply) ? reply.map(String) : [];
|
||||||
|
}
|
||||||
|
|
||||||
|
public async processDueBidRoundDeadlines(batchLimit: number): Promise<{
|
||||||
|
completed: number;
|
||||||
|
prepared: number;
|
||||||
|
skipped: number;
|
||||||
|
}> {
|
||||||
|
const currentRedisTimestampMS =
|
||||||
|
await this.auctionRedisService.getCurrentRedisTimestampMS();
|
||||||
|
const matchIds = await this.readDueMatchIds(
|
||||||
|
currentRedisTimestampMS,
|
||||||
|
batchLimit,
|
||||||
|
);
|
||||||
|
let prepared = 0;
|
||||||
|
let completed = 0;
|
||||||
|
let skipped = 0;
|
||||||
|
|
||||||
|
for (const matchId of matchIds) {
|
||||||
|
if (!mongoose.isValidObjectId(matchId)) {
|
||||||
|
skipped += 1;
|
||||||
|
await this.removeBidRoundDeadlineQueueEntry(matchId);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
// 1단계: 만료 결정/컨텍스트 고정(bidding → expiring). 아직 마감 전이거나
|
||||||
|
// 이미 다른 phase면 noop으로 빠진다(stale ZSET 엔트리는 Lua가 정리).
|
||||||
|
const result = await this.auctionRedisCommandService.expirePrepare(
|
||||||
|
matchId,
|
||||||
|
{
|
||||||
|
auctionStateTransitionId: `expire:${matchId}:${randomUUID()}`,
|
||||||
|
bidRoundExpiryRetryDelayMS: BID_ROUND_EXPIRY_RETRY_DELAY_MS,
|
||||||
|
matchId,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
if ('noop' in result) {
|
||||||
|
skipped += 1;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
prepared += 1;
|
||||||
|
// 2단계: 고정된 컨텍스트로 sold/passed 확정. 재진입(다른 인스턴스/다음 틱)해도
|
||||||
|
// appliedAuctionStateTransitionIds dedupe로 정확히-1회만 반영된다.
|
||||||
|
const completedState = await this.auctionService.completePreparedExpiry(
|
||||||
|
new mongoose.Types.ObjectId(matchId),
|
||||||
|
);
|
||||||
|
if (completedState) {
|
||||||
|
completed += 1;
|
||||||
|
// 1차 전달: 만료 확정 즉시 최신 state를 방송한다. 이게 없으면 클라가
|
||||||
|
// 입찰 라운드에 멈춰 후속 액션에서 CONFLICT가 반복된다(durability
|
||||||
|
// worker 백업 방송은 Mongo 성공 + ~1초 tick에 묶여 1차 전달로 부적합).
|
||||||
|
// 이미 처리된 전환은 completePreparedExpiry가 null을 반환하므로 중복
|
||||||
|
// 방송되지 않고, 혹시 겹쳐도 클라 revision 가드로 무해하다.
|
||||||
|
this.auctionEventBusService.broadcastState(matchId, completedState);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
skipped += 1;
|
||||||
|
this.logger.warn(
|
||||||
|
`Auction deadline item failed for ${matchId}: ${
|
||||||
|
error instanceof Error ? error.message : error
|
||||||
|
}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return { completed, prepared, skipped };
|
||||||
|
}
|
||||||
|
|
||||||
|
private async removeBidRoundDeadlineQueueEntry(
|
||||||
|
matchId: string,
|
||||||
|
): Promise<void> {
|
||||||
|
await this.auctionRedisService
|
||||||
|
.raw()
|
||||||
|
.sendCommand(['ZREM', BID_ROUND_DEADLINE_QUEUE_KEY, matchId]);
|
||||||
|
}
|
||||||
|
}
|
||||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,33 @@
|
|||||||
|
import { Injectable } from '@nestjs/common';
|
||||||
|
import type { Namespace } from 'socket.io';
|
||||||
|
import type { AuctionStateResponse } from './auction.service';
|
||||||
|
import type { MatchSideEffectDelta } from './auction-side-effect.service';
|
||||||
|
import { serializeRealtimeAuction } from './auction-realtime-serializer';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class AuctionEventBusService {
|
||||||
|
private auctionNamespace?: Namespace;
|
||||||
|
|
||||||
|
public attachAuctionNamespace(namespace: Namespace): void {
|
||||||
|
this.auctionNamespace = namespace;
|
||||||
|
}
|
||||||
|
|
||||||
|
public broadcastMatchSideEffect(
|
||||||
|
matchId: string,
|
||||||
|
delta: MatchSideEffectDelta,
|
||||||
|
): void {
|
||||||
|
this.auctionNamespace?.to(matchId).emit('match-side-effect', delta);
|
||||||
|
}
|
||||||
|
|
||||||
|
public broadcastState(matchId: string, state: AuctionStateResponse): void {
|
||||||
|
this.auctionNamespace
|
||||||
|
?.to(matchId)
|
||||||
|
.emit('state', serializeRealtimeAuction(state));
|
||||||
|
}
|
||||||
|
|
||||||
|
public broadcastReset(matchId: string, auctionLifecycleId: string): void {
|
||||||
|
this.auctionNamespace
|
||||||
|
?.to(matchId)
|
||||||
|
.emit('reset', { matchId, auctionLifecycleId });
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
import { AuctionLifecycleLock } from './auction-lifecycle-lock';
|
||||||
|
|
||||||
|
afterEach(() => jest.useRealTimers());
|
||||||
|
|
||||||
|
it('renews ownership and handles renewal/release failures without unhandled rejection', async () => {
|
||||||
|
jest.useFakeTimers();
|
||||||
|
const sendCommand = jest
|
||||||
|
.fn()
|
||||||
|
.mockRejectedValue(new Error('redis disconnected'));
|
||||||
|
const releaseTokenLock = jest
|
||||||
|
.fn()
|
||||||
|
.mockRejectedValue(new Error('release failed'));
|
||||||
|
const lock = new AuctionLifecycleLock({
|
||||||
|
acquireTokenLock: jest.fn().mockResolvedValue(true),
|
||||||
|
releaseTokenLock,
|
||||||
|
raw: () => ({ sendCommand }),
|
||||||
|
} as never);
|
||||||
|
const result = lock.run('match', async () => {
|
||||||
|
await jest.advanceTimersByTimeAsync(10000);
|
||||||
|
});
|
||||||
|
await expect(result).rejects.toThrow('redis disconnected');
|
||||||
|
expect(releaseTokenLock).toHaveBeenCalledTimes(1);
|
||||||
|
expect(jest.getTimerCount()).toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('preserves an operation result if only lock release fails', async () => {
|
||||||
|
const lock = new AuctionLifecycleLock({
|
||||||
|
acquireTokenLock: jest.fn().mockResolvedValue(true),
|
||||||
|
releaseTokenLock: jest.fn().mockRejectedValue(new Error('release failed')),
|
||||||
|
} as never);
|
||||||
|
await expect(lock.run('match', async () => 42)).resolves.toBe(42);
|
||||||
|
});
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
import { ConflictException, Logger } from '@nestjs/common';
|
||||||
|
import { randomUUID } from 'crypto';
|
||||||
|
import { AuctionRedisService } from './redis/auction-redis.service';
|
||||||
|
|
||||||
|
export class AuctionLifecycleBusyError extends ConflictException {
|
||||||
|
constructor() {
|
||||||
|
super({
|
||||||
|
code: 'AUCTION_LIFECYCLE_BUSY',
|
||||||
|
message: '다른 경매 작업을 처리 중입니다. 잠시 후 다시 시도해 주세요.',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Serializes startup, cancellation, undo and Match side effects across nodes. */
|
||||||
|
export class AuctionLifecycleLock {
|
||||||
|
private readonly logger = new Logger(AuctionLifecycleLock.name);
|
||||||
|
|
||||||
|
constructor(private readonly redis: AuctionRedisService) {}
|
||||||
|
|
||||||
|
async run<T>(matchId: string, operation: () => Promise<T>): Promise<T> {
|
||||||
|
// Kept outside runtime cleanup: cancelling an auction must not release a
|
||||||
|
// lock still held by its cancellation/recovery operation.
|
||||||
|
const key = `auction:${matchId}:lifecycleMutationLock`;
|
||||||
|
const token = randomUUID();
|
||||||
|
if (!(await this.redis.acquireTokenLock(key, token, 30_000))) {
|
||||||
|
throw new AuctionLifecycleBusyError();
|
||||||
|
}
|
||||||
|
let renewal: Promise<void> | undefined;
|
||||||
|
let ownershipError: Error | undefined;
|
||||||
|
const timer = setInterval(() => {
|
||||||
|
if (renewal) return;
|
||||||
|
renewal = this.redis
|
||||||
|
.raw()
|
||||||
|
.sendCommand<string | null>([
|
||||||
|
'SET',
|
||||||
|
key,
|
||||||
|
token,
|
||||||
|
'IFEQ',
|
||||||
|
token,
|
||||||
|
'PX',
|
||||||
|
'30000',
|
||||||
|
])
|
||||||
|
.then((result) => {
|
||||||
|
if (result !== 'OK')
|
||||||
|
throw new Error('Auction lifecycle lock ownership was lost.');
|
||||||
|
})
|
||||||
|
.catch((error: unknown) => {
|
||||||
|
ownershipError =
|
||||||
|
error instanceof Error ? error : new Error(String(error));
|
||||||
|
})
|
||||||
|
.finally(() => {
|
||||||
|
renewal = undefined;
|
||||||
|
});
|
||||||
|
}, 10_000);
|
||||||
|
timer.unref?.();
|
||||||
|
try {
|
||||||
|
const result = await operation();
|
||||||
|
clearInterval(timer);
|
||||||
|
await renewal;
|
||||||
|
if (ownershipError) throw ownershipError;
|
||||||
|
return result;
|
||||||
|
} finally {
|
||||||
|
clearInterval(timer);
|
||||||
|
await renewal;
|
||||||
|
await this.redis.releaseTokenLock(key, token).catch((error: unknown) => {
|
||||||
|
this.logger.warn(
|
||||||
|
`Auction lifecycle lock release failed: ${String(error)}`,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
/** Missing optional fields in a complete projection mean deletion, not retention. */
|
||||||
|
export const AUCTION_OPTIONAL_PROJECTION_FIELDS = [
|
||||||
|
'completedAt',
|
||||||
|
'auctionCompletedAtTimestampMS',
|
||||||
|
'currentBidderTeamIndex',
|
||||||
|
'currentHighestBidderTeamIndex',
|
||||||
|
'currentDeadline',
|
||||||
|
'currentBidRoundDeadlineTimestampMS',
|
||||||
|
'currentBidRoundId',
|
||||||
|
] as const;
|
||||||
|
|
||||||
|
export function buildAuctionProjectionUnset(
|
||||||
|
projection: Record<string, unknown>,
|
||||||
|
) {
|
||||||
|
return Object.fromEntries(
|
||||||
|
AUCTION_OPTIONAL_PROJECTION_FIELDS.filter(
|
||||||
|
(field) => projection[field] === undefined,
|
||||||
|
).map((field) => [field, '']),
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,101 @@
|
|||||||
|
import type { AuctionStateResponse } from './auction.service';
|
||||||
|
|
||||||
|
export function serializeRealtimeAuction(auction: AuctionStateResponse) {
|
||||||
|
const serialized = JSON.parse(JSON.stringify(auction)) as Record<
|
||||||
|
string,
|
||||||
|
unknown
|
||||||
|
>;
|
||||||
|
const auctionPlayerOrder = getRecordArray(
|
||||||
|
serialized.auctionPlayerOrder ?? serialized.order,
|
||||||
|
);
|
||||||
|
const currentAuctionPlayerOrderIndex = Number(
|
||||||
|
serialized.currentAuctionPlayerOrderIndex ?? serialized.currentIndex ?? 0,
|
||||||
|
);
|
||||||
|
const currentBidRoundPlayerUserId =
|
||||||
|
typeof serialized.currentBidRoundPlayerUserId === 'string'
|
||||||
|
? serialized.currentBidRoundPlayerUserId
|
||||||
|
: getStringField(
|
||||||
|
auctionPlayerOrder[currentAuctionPlayerOrderIndex],
|
||||||
|
'userId',
|
||||||
|
);
|
||||||
|
|
||||||
|
if (Array.isArray(serialized.auctionPlayerOrder)) {
|
||||||
|
serialized.auctionPlayerOrder = auctionPlayerOrder.map((player) =>
|
||||||
|
serializeRealtimeAuctionPlayer(player, currentBidRoundPlayerUserId),
|
||||||
|
);
|
||||||
|
} else if (Array.isArray(serialized.order)) {
|
||||||
|
serialized.order = auctionPlayerOrder.map((player) =>
|
||||||
|
serializeRealtimeAuctionPlayer(player, currentBidRoundPlayerUserId),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const passedAuctionPlayerQueue = getRecordArray(
|
||||||
|
serialized.passedAuctionPlayerQueue ?? serialized.passedQueue,
|
||||||
|
);
|
||||||
|
if (Array.isArray(serialized.passedAuctionPlayerQueue)) {
|
||||||
|
serialized.passedAuctionPlayerQueue = passedAuctionPlayerQueue.map(
|
||||||
|
(player) =>
|
||||||
|
serializeRealtimeAuctionPlayer(player, currentBidRoundPlayerUserId),
|
||||||
|
);
|
||||||
|
} else if (Array.isArray(serialized.passedQueue)) {
|
||||||
|
serialized.passedQueue = passedAuctionPlayerQueue.map((player) =>
|
||||||
|
serializeRealtimeAuctionPlayer(player, currentBidRoundPlayerUserId),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ('auctionPlayerOrder' in serialized) delete serialized.order;
|
||||||
|
if ('auctionTeams' in serialized) delete serialized.teams;
|
||||||
|
if ('passedAuctionPlayerQueue' in serialized) delete serialized.passedQueue;
|
||||||
|
if ('auctionBidHistory' in serialized) delete serialized.bids;
|
||||||
|
if ('maximumBidRoundDurationSeconds' in serialized) {
|
||||||
|
delete serialized.maxTimerSeconds;
|
||||||
|
}
|
||||||
|
if ('bidRoundExtensionSeconds' in serialized) {
|
||||||
|
delete serialized.bidExtensionSeconds;
|
||||||
|
}
|
||||||
|
if ('initialTeamBidPointAmount' in serialized) {
|
||||||
|
delete serialized.initialPoints;
|
||||||
|
}
|
||||||
|
if ('topTierAuctionPriorityThreshold' in serialized) {
|
||||||
|
delete serialized.topTierThreshold;
|
||||||
|
}
|
||||||
|
if ('manualTopTierAuctionPriorityUserIds' in serialized) {
|
||||||
|
delete serialized.manualTopTierUserIds;
|
||||||
|
}
|
||||||
|
|
||||||
|
return serialized;
|
||||||
|
}
|
||||||
|
|
||||||
|
function serializeRealtimeAuctionPlayer(
|
||||||
|
player: Record<string, unknown>,
|
||||||
|
currentBidRoundPlayerUserId?: string,
|
||||||
|
) {
|
||||||
|
if (getStringField(player, 'userId') === currentBidRoundPlayerUserId) {
|
||||||
|
return player;
|
||||||
|
}
|
||||||
|
|
||||||
|
const lightweightPlayer = { ...player };
|
||||||
|
delete lightweightPlayer.masteries;
|
||||||
|
delete lightweightPlayer.puuid;
|
||||||
|
delete lightweightPlayer.recentStatsSummary;
|
||||||
|
delete lightweightPlayer.tierHistory;
|
||||||
|
|
||||||
|
return lightweightPlayer;
|
||||||
|
}
|
||||||
|
|
||||||
|
function getRecordArray(value: unknown): Array<Record<string, unknown>> {
|
||||||
|
return Array.isArray(value)
|
||||||
|
? value.filter(
|
||||||
|
(item): item is Record<string, unknown> =>
|
||||||
|
typeof item === 'object' && item !== null,
|
||||||
|
)
|
||||||
|
: [];
|
||||||
|
}
|
||||||
|
|
||||||
|
function getStringField(
|
||||||
|
value: Record<string, unknown> | undefined,
|
||||||
|
fieldName: string,
|
||||||
|
): string | undefined {
|
||||||
|
const fieldValue = value?.[fieldName];
|
||||||
|
return typeof fieldValue === 'string' ? fieldValue : undefined;
|
||||||
|
}
|
||||||
@@ -0,0 +1,99 @@
|
|||||||
|
import {
|
||||||
|
AUCTION_REJECTION_REASON,
|
||||||
|
isAuctionResyncRecommended,
|
||||||
|
resolveAuctionRejectionReason,
|
||||||
|
} from './auction-rejection';
|
||||||
|
|
||||||
|
describe('resolveAuctionRejectionReason', () => {
|
||||||
|
it('distinguishes an outdated client from a stale round and does not suggest a state-only resync', () => {
|
||||||
|
const reason = resolveAuctionRejectionReason('BID_CLIENT_UPDATE_REQUIRED');
|
||||||
|
expect(reason).toBe('BID_REJECTED_BECAUSE_CLIENT_UPDATE_REQUIRED');
|
||||||
|
expect(isAuctionResyncRecommended(reason)).toBe(false);
|
||||||
|
});
|
||||||
|
it('reports roster validation failures without recommending a retry', () => {
|
||||||
|
const reason = resolveAuctionRejectionReason(
|
||||||
|
'AUCTION_ROSTER_INVALID',
|
||||||
|
'Auction roster validation failed.',
|
||||||
|
);
|
||||||
|
expect(reason).toBe('AUCTION_TRANSITION_REJECTED_BECAUSE_ROSTER_INVALID');
|
||||||
|
expect(isAuctionResyncRecommended(reason)).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('maps the internal CONFLICT code to the descriptive transition reason', () => {
|
||||||
|
expect(resolveAuctionRejectionReason('CONFLICT')).toBe(
|
||||||
|
AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_LIVE_STATE_CHANGED_BEFORE_APPLY,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('maps internal bid codes to descriptive bid reasons', () => {
|
||||||
|
expect(resolveAuctionRejectionReason('EXPIRED')).toBe(
|
||||||
|
AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_BID_ROUND_DEADLINE_PASSED,
|
||||||
|
);
|
||||||
|
expect(resolveAuctionRejectionReason('TOO_LOW')).toBe(
|
||||||
|
AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_AMOUNT_NOT_HIGHER_THAN_CURRENT_HIGHEST,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('maps known BadRequest messages without a structured code', () => {
|
||||||
|
expect(
|
||||||
|
resolveAuctionRejectionReason(
|
||||||
|
undefined,
|
||||||
|
'Cannot advance from current phase.',
|
||||||
|
),
|
||||||
|
).toBe(
|
||||||
|
AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_PHASE_DOES_NOT_ALLOW_ADVANCE,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('falls back via the message when the code carries the full sentence', () => {
|
||||||
|
// 구조 전환 경로는 code 자리에 message 문장이 들어올 수 있다.
|
||||||
|
expect(
|
||||||
|
resolveAuctionRejectionReason('Auction is not in bidding phase.'),
|
||||||
|
).toBe(
|
||||||
|
AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_AUCTION_NOT_IN_BIDDING_PHASE,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('treats internal coordination codes as retryable', () => {
|
||||||
|
expect(resolveAuctionRejectionReason('ACTION_REQUEST_LEASE_EXPIRED')).toBe(
|
||||||
|
AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_REQUEST_COORDINATION_RETRYABLE,
|
||||||
|
);
|
||||||
|
expect(resolveAuctionRejectionReason('INVALID_DEADLINE_MODE')).toBe(
|
||||||
|
AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_REQUEST_COORDINATION_RETRYABLE,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('falls back to the unrecognized reason for unknown input', () => {
|
||||||
|
expect(resolveAuctionRejectionReason('SOMETHING_NEW', 'weird')).toBe(
|
||||||
|
AUCTION_REJECTION_REASON.AUCTION_REQUEST_REJECTED_FOR_UNRECOGNIZED_REASON,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('isAuctionResyncRecommended', () => {
|
||||||
|
it('recommends resync for stale-view rejections', () => {
|
||||||
|
expect(
|
||||||
|
isAuctionResyncRecommended(
|
||||||
|
AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_LIVE_STATE_CHANGED_BEFORE_APPLY,
|
||||||
|
),
|
||||||
|
).toBe(true);
|
||||||
|
expect(
|
||||||
|
isAuctionResyncRecommended(
|
||||||
|
AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_BID_ROUND_DEADLINE_PASSED,
|
||||||
|
),
|
||||||
|
).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not recommend resync for genuine constraint rejections', () => {
|
||||||
|
expect(
|
||||||
|
isAuctionResyncRecommended(
|
||||||
|
AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_TEAM_ROSTER_FULL,
|
||||||
|
),
|
||||||
|
).toBe(false);
|
||||||
|
expect(
|
||||||
|
isAuctionResyncRecommended(
|
||||||
|
AUCTION_REJECTION_REASON.AUCTION_REQUEST_REJECTED_FOR_UNRECOGNIZED_REASON,
|
||||||
|
),
|
||||||
|
).toBe(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,179 @@
|
|||||||
|
/**
|
||||||
|
* 경매 거부(rejection)를 클라이언트에 알릴 때 쓰는 "설명적 거부코드" 체계.
|
||||||
|
*
|
||||||
|
* 배경:
|
||||||
|
* - 내부 Lua/서비스는 `CONFLICT`, `EXPIRED`, `TOO_LOW` 같은 짧은 코드를 쓴다.
|
||||||
|
* 이 코드들은 구현 디테일이고, 그대로 클라/운영자에게 노출하면 "무엇이 왜
|
||||||
|
* 거부됐는지"를 알기 어렵다(특히 `CONFLICT`는 원인이 광범위하다).
|
||||||
|
* - 그래서 ack의 `code`/`message`는 그대로 두되(진단/하위호환), 별도로
|
||||||
|
* `auctionRejectionReason`이라는 **맥락을 코드 이름에 담은 안정적 식별자**를
|
||||||
|
* 함께 내려준다. 클라는 이 reason을 사람이 읽는 문구로 매핑한다(프론트 사전).
|
||||||
|
*
|
||||||
|
* 명명 규칙:
|
||||||
|
* - 다소 길어지더라도 "무엇이(BID/AUCTION_TRANSITION) + 왜(BECAUSE_...)"를
|
||||||
|
* 이름만으로 알 수 있게 풀어쓴다.
|
||||||
|
*
|
||||||
|
* resync 권장 여부:
|
||||||
|
* - `AUCTION_RESYNC_RECOMMENDED_REASONS`에 속한 reason은 "클라가 본 상태가 이미
|
||||||
|
* 바뀌었다(낙관적 동시성 충돌/만료/단계 전이)"는 신호다. 이 경우 클라는 최신
|
||||||
|
* state로 rebaseline한다. 구조 액션 재시도는 원래 대상과 단계가 같을 때만 허용한다.
|
||||||
|
* - 반대로 정원 초과/포인트 부족처럼 "상태를 새로고침해도 결과가 같은" 거부는
|
||||||
|
* resync 권장 대상이 아니다(재시도해도 또 거부됨).
|
||||||
|
*/
|
||||||
|
|
||||||
|
export const AUCTION_REJECTION_REASON = {
|
||||||
|
// === 구조 전환(낙찰/유찰/다음/입찰오픈) ===
|
||||||
|
/** 내가 본 revision/phase/선수가 commit 직전 이미 바뀜(낙관적 동시성 충돌, 내부 `CONFLICT`). */
|
||||||
|
AUCTION_TRANSITION_REJECTED_BECAUSE_LIVE_STATE_CHANGED_BEFORE_APPLY:
|
||||||
|
'AUCTION_TRANSITION_REJECTED_BECAUSE_LIVE_STATE_CHANGED_BEFORE_APPLY',
|
||||||
|
/** 입찰 단계가 아닌데 입찰 단계 전환을 시도함(이미 sold/passed/presenting 등). */
|
||||||
|
AUCTION_TRANSITION_REJECTED_BECAUSE_AUCTION_NOT_IN_BIDDING_PHASE:
|
||||||
|
'AUCTION_TRANSITION_REJECTED_BECAUSE_AUCTION_NOT_IN_BIDDING_PHASE',
|
||||||
|
/** 낙찰 또는 유찰이 확정되지 않아 다음 선수로 진행할 수 없음. */
|
||||||
|
AUCTION_TRANSITION_REJECTED_BECAUSE_PHASE_DOES_NOT_ALLOW_ADVANCE:
|
||||||
|
'AUCTION_TRANSITION_REJECTED_BECAUSE_PHASE_DOES_NOT_ALLOW_ADVANCE',
|
||||||
|
/** 원 참가자 명단과 실제 팀 배정이 일치하지 않아 완료할 수 없음. */
|
||||||
|
AUCTION_TRANSITION_REJECTED_BECAUSE_ROSTER_INVALID:
|
||||||
|
'AUCTION_TRANSITION_REJECTED_BECAUSE_ROSTER_INVALID',
|
||||||
|
/** 낙찰 처리할 유효한 최고 입찰이 없음(만료 처리로 이미 정리됐을 수 있음). */
|
||||||
|
AUCTION_TRANSITION_REJECTED_BECAUSE_NO_WINNING_BID_TO_MARK_SOLD:
|
||||||
|
'AUCTION_TRANSITION_REJECTED_BECAUSE_NO_WINNING_BID_TO_MARK_SOLD',
|
||||||
|
/** 진행 중인 입찰이 있는 선수를 유찰 처리하려 함. */
|
||||||
|
AUCTION_TRANSITION_REJECTED_BECAUSE_ACTIVE_BID_PRESENT:
|
||||||
|
'AUCTION_TRANSITION_REJECTED_BECAUSE_ACTIVE_BID_PRESENT',
|
||||||
|
/** 전환 요청 조정(예약/리스/멱등) 단계의 일시적 거부 — 최신 상태로 재시도하면 보통 해소됨. */
|
||||||
|
AUCTION_TRANSITION_REJECTED_BECAUSE_REQUEST_COORDINATION_RETRYABLE:
|
||||||
|
'AUCTION_TRANSITION_REJECTED_BECAUSE_REQUEST_COORDINATION_RETRYABLE',
|
||||||
|
|
||||||
|
// === 입찰(bid) ===
|
||||||
|
BID_REJECTED_BECAUSE_CLIENT_UPDATE_REQUIRED:
|
||||||
|
'BID_REJECTED_BECAUSE_CLIENT_UPDATE_REQUIRED',
|
||||||
|
/** 입찰 라운드가 이미 다음 선수/다음 라운드로 넘어감(내부 `STALE_BID_ROUND`). */
|
||||||
|
BID_REJECTED_BECAUSE_BID_ROUND_ALREADY_ADVANCED:
|
||||||
|
'BID_REJECTED_BECAUSE_BID_ROUND_ALREADY_ADVANCED',
|
||||||
|
/** 입찰 라운드 마감 시각이 이미 지남(내부 `EXPIRED`). */
|
||||||
|
BID_REJECTED_BECAUSE_BID_ROUND_DEADLINE_PASSED:
|
||||||
|
'BID_REJECTED_BECAUSE_BID_ROUND_DEADLINE_PASSED',
|
||||||
|
/** 경매가 입찰 단계가 아님(내부 `PHASE`). */
|
||||||
|
BID_REJECTED_BECAUSE_AUCTION_NOT_IN_BIDDING_PHASE:
|
||||||
|
'BID_REJECTED_BECAUSE_AUCTION_NOT_IN_BIDDING_PHASE',
|
||||||
|
/** 입찰 금액이 현재 최고가보다 높지 않음(내부 `TOO_LOW`). */
|
||||||
|
BID_REJECTED_BECAUSE_AMOUNT_NOT_HIGHER_THAN_CURRENT_HIGHEST:
|
||||||
|
'BID_REJECTED_BECAUSE_AMOUNT_NOT_HIGHER_THAN_CURRENT_HIGHEST',
|
||||||
|
/** 팀 정원이 이미 가득 참(내부 `FULL`). */
|
||||||
|
BID_REJECTED_BECAUSE_TEAM_ROSTER_FULL:
|
||||||
|
'BID_REJECTED_BECAUSE_TEAM_ROSTER_FULL',
|
||||||
|
/** 남은 슬롯 최소 확보분을 고려하면 포인트가 부족함(내부 `INSUFFICIENT`). */
|
||||||
|
BID_REJECTED_BECAUSE_INSUFFICIENT_REMAINING_POINTS_FOR_SLOTS:
|
||||||
|
'BID_REJECTED_BECAUSE_INSUFFICIENT_REMAINING_POINTS_FOR_SLOTS',
|
||||||
|
/** 알 수 없는 팀 인덱스(내부 `UNKNOWN_TEAM`). */
|
||||||
|
BID_REJECTED_BECAUSE_UNKNOWN_TEAM: 'BID_REJECTED_BECAUSE_UNKNOWN_TEAM',
|
||||||
|
/** 같은 요청 id에 다른 내용이 온 멱등성 충돌(내부 `DUPLICATE_REQUEST_CONFLICT`). */
|
||||||
|
BID_REJECTED_BECAUSE_DUPLICATE_REQUEST_PAYLOAD_CONFLICT:
|
||||||
|
'BID_REJECTED_BECAUSE_DUPLICATE_REQUEST_PAYLOAD_CONFLICT',
|
||||||
|
/** 짧은 시간에 너무 많은 입찰 요청(게이트웨이 rate limit). */
|
||||||
|
BID_REJECTED_BECAUSE_RATE_LIMITED: 'BID_REJECTED_BECAUSE_RATE_LIMITED',
|
||||||
|
|
||||||
|
// === 공통/그 외 ===
|
||||||
|
/** 실시간 상태를 아직 사용할 수 없음(재접속/재조회 필요). */
|
||||||
|
AUCTION_REQUEST_REJECTED_BECAUSE_REALTIME_STATE_UNAVAILABLE:
|
||||||
|
'AUCTION_REQUEST_REJECTED_BECAUSE_REALTIME_STATE_UNAVAILABLE',
|
||||||
|
/** 위 어디에도 해당하지 않는 미분류 거부(원문 message로 안내). */
|
||||||
|
AUCTION_REQUEST_REJECTED_FOR_UNRECOGNIZED_REASON:
|
||||||
|
'AUCTION_REQUEST_REJECTED_FOR_UNRECOGNIZED_REASON',
|
||||||
|
} as const;
|
||||||
|
|
||||||
|
export type AuctionRejectionReason =
|
||||||
|
(typeof AUCTION_REJECTION_REASON)[keyof typeof AUCTION_REJECTION_REASON];
|
||||||
|
|
||||||
|
/** 내부 짧은 코드 → 설명적 reason. */
|
||||||
|
const INTERNAL_CODE_TO_REASON: Record<string, AuctionRejectionReason> = {
|
||||||
|
BID_CLIENT_UPDATE_REQUIRED:
|
||||||
|
AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_CLIENT_UPDATE_REQUIRED,
|
||||||
|
AUCTION_ROSTER_INVALID:
|
||||||
|
AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_ROSTER_INVALID,
|
||||||
|
CONFLICT:
|
||||||
|
AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_LIVE_STATE_CHANGED_BEFORE_APPLY,
|
||||||
|
STALE_BID_ROUND:
|
||||||
|
AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_BID_ROUND_ALREADY_ADVANCED,
|
||||||
|
EXPIRED:
|
||||||
|
AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_BID_ROUND_DEADLINE_PASSED,
|
||||||
|
PHASE:
|
||||||
|
AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_AUCTION_NOT_IN_BIDDING_PHASE,
|
||||||
|
TOO_LOW:
|
||||||
|
AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_AMOUNT_NOT_HIGHER_THAN_CURRENT_HIGHEST,
|
||||||
|
FULL: AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_TEAM_ROSTER_FULL,
|
||||||
|
INSUFFICIENT:
|
||||||
|
AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_INSUFFICIENT_REMAINING_POINTS_FOR_SLOTS,
|
||||||
|
UNKNOWN_TEAM: AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_UNKNOWN_TEAM,
|
||||||
|
DUPLICATE_REQUEST_CONFLICT:
|
||||||
|
AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_DUPLICATE_REQUEST_PAYLOAD_CONFLICT,
|
||||||
|
BID_RATE_LIMITED: AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_RATE_LIMITED,
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 구조화된 code 없이 message만 던지는 BadRequest(구조 전환 검증 등) → 설명적 reason. */
|
||||||
|
const MESSAGE_TO_REASON: Record<string, AuctionRejectionReason> = {
|
||||||
|
'Auction is not in bidding phase.':
|
||||||
|
AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_AUCTION_NOT_IN_BIDDING_PHASE,
|
||||||
|
'Cannot advance from current phase.':
|
||||||
|
AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_PHASE_DOES_NOT_ALLOW_ADVANCE,
|
||||||
|
'No bid to mark sold.':
|
||||||
|
AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_NO_WINNING_BID_TO_MARK_SOLD,
|
||||||
|
'Cannot pass a player with an active bid.':
|
||||||
|
AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_ACTIVE_BID_PRESENT,
|
||||||
|
'Auction realtime state is not available.':
|
||||||
|
AUCTION_REJECTION_REASON.AUCTION_REQUEST_REJECTED_BECAUSE_REALTIME_STATE_UNAVAILABLE,
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* resync(최신 state로 rebaseline 후 재시도)가 권장되는 reason 집합.
|
||||||
|
* "내가 본 상태가 낡았을 뿐, 다시 보면 가능할 수 있는" 거부들이다.
|
||||||
|
*/
|
||||||
|
export const AUCTION_RESYNC_RECOMMENDED_REASONS: ReadonlySet<AuctionRejectionReason> =
|
||||||
|
new Set<AuctionRejectionReason>([
|
||||||
|
AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_LIVE_STATE_CHANGED_BEFORE_APPLY,
|
||||||
|
AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_AUCTION_NOT_IN_BIDDING_PHASE,
|
||||||
|
AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_PHASE_DOES_NOT_ALLOW_ADVANCE,
|
||||||
|
AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_NO_WINNING_BID_TO_MARK_SOLD,
|
||||||
|
AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_ACTIVE_BID_PRESENT,
|
||||||
|
AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_REQUEST_COORDINATION_RETRYABLE,
|
||||||
|
AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_BID_ROUND_ALREADY_ADVANCED,
|
||||||
|
AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_BID_ROUND_DEADLINE_PASSED,
|
||||||
|
AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_AUCTION_NOT_IN_BIDDING_PHASE,
|
||||||
|
AUCTION_REJECTION_REASON.BID_REJECTED_BECAUSE_AMOUNT_NOT_HIGHER_THAN_CURRENT_HIGHEST,
|
||||||
|
AUCTION_REJECTION_REASON.AUCTION_REQUEST_REJECTED_BECAUSE_REALTIME_STATE_UNAVAILABLE,
|
||||||
|
]);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 내부 거부 code(짧은 코드) 또는 BadRequest message로부터 설명적 reason을 해석한다.
|
||||||
|
* 둘 다 모르면 미분류 reason으로 떨어뜨린다(원문 message는 ack에 그대로 남는다).
|
||||||
|
*/
|
||||||
|
export function resolveAuctionRejectionReason(
|
||||||
|
internalCode?: string,
|
||||||
|
message?: string,
|
||||||
|
): AuctionRejectionReason {
|
||||||
|
if (internalCode && INTERNAL_CODE_TO_REASON[internalCode]) {
|
||||||
|
return INTERNAL_CODE_TO_REASON[internalCode];
|
||||||
|
}
|
||||||
|
if (message && MESSAGE_TO_REASON[message]) {
|
||||||
|
return MESSAGE_TO_REASON[message];
|
||||||
|
}
|
||||||
|
// 구조 전환 경로는 code 자리에 message 문장이 들어올 수 있어 한 번 더 확인한다.
|
||||||
|
if (internalCode && MESSAGE_TO_REASON[internalCode]) {
|
||||||
|
return MESSAGE_TO_REASON[internalCode];
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
internalCode &&
|
||||||
|
(internalCode.startsWith('ACTION_REQUEST_') ||
|
||||||
|
internalCode.startsWith('INVALID_'))
|
||||||
|
) {
|
||||||
|
return AUCTION_REJECTION_REASON.AUCTION_TRANSITION_REJECTED_BECAUSE_REQUEST_COORDINATION_RETRYABLE;
|
||||||
|
}
|
||||||
|
return AUCTION_REJECTION_REASON.AUCTION_REQUEST_REJECTED_FOR_UNRECOGNIZED_REASON;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function isAuctionResyncRecommended(
|
||||||
|
reason: AuctionRejectionReason,
|
||||||
|
): boolean {
|
||||||
|
return AUCTION_RESYNC_RECOMMENDED_REASONS.has(reason);
|
||||||
|
}
|
||||||
@@ -0,0 +1,102 @@
|
|||||||
|
import {
|
||||||
|
AuctionSideEffectService,
|
||||||
|
buildMatchSideEffectDelta,
|
||||||
|
buildSideEffectApplicationIdentity,
|
||||||
|
buildSideEffectLeaseAcquireUpdate,
|
||||||
|
canAcquireSideEffectLease,
|
||||||
|
} from './auction-side-effect.service';
|
||||||
|
|
||||||
|
describe('auction side effect helpers', () => {
|
||||||
|
it('builds idempotency identity from transition and side effect type', () => {
|
||||||
|
expect(
|
||||||
|
buildSideEffectApplicationIdentity({
|
||||||
|
auctionId: 'auction-1',
|
||||||
|
auctionStateTransitionId: 'transition-1',
|
||||||
|
sideEffectType: 'syncMatchTeams',
|
||||||
|
}),
|
||||||
|
).toEqual({
|
||||||
|
auctionId: 'auction-1',
|
||||||
|
auctionStateTransitionId: 'transition-1',
|
||||||
|
sideEffectType: 'syncMatchTeams',
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('allows lease acquisition for pending, failed, or stale processing items only', () => {
|
||||||
|
expect(canAcquireSideEffectLease({ state: 'pending' }, 1000)).toBe(true);
|
||||||
|
expect(canAcquireSideEffectLease({ state: 'failed' }, 1000)).toBe(true);
|
||||||
|
expect(
|
||||||
|
canAcquireSideEffectLease(
|
||||||
|
{ processingLeaseExpiresAtTimestampMS: 999, state: 'processing' },
|
||||||
|
1000,
|
||||||
|
),
|
||||||
|
).toBe(true);
|
||||||
|
expect(
|
||||||
|
canAcquireSideEffectLease(
|
||||||
|
{ processingLeaseExpiresAtTimestampMS: 1001, state: 'processing' },
|
||||||
|
1000,
|
||||||
|
),
|
||||||
|
).toBe(false);
|
||||||
|
expect(canAcquireSideEffectLease({ state: 'completed' }, 1000)).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('builds lease acquire update with Redis TIME timestamps', () => {
|
||||||
|
expect(
|
||||||
|
buildSideEffectLeaseAcquireUpdate({
|
||||||
|
currentRedisTimestampMS: 1000,
|
||||||
|
leaseDurationMS: 5000,
|
||||||
|
ownerToken: 'worker-1',
|
||||||
|
}),
|
||||||
|
).toEqual({
|
||||||
|
$inc: { attempts: 1 },
|
||||||
|
$set: {
|
||||||
|
processingLeaseExpiresAtTimestampMS: 6000,
|
||||||
|
processingOwnerToken: 'worker-1',
|
||||||
|
processingStartedAtTimestampMS: 1000,
|
||||||
|
state: 'processing',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('builds side-effect socket delta independently from auction revision', () => {
|
||||||
|
expect(
|
||||||
|
buildMatchSideEffectDelta({
|
||||||
|
auctionLifecycleId: 'life-1',
|
||||||
|
currentServerTimestampMS: 1000,
|
||||||
|
matchSideEffectRevision: 3,
|
||||||
|
matchSideEffectStatus: 'completed',
|
||||||
|
}),
|
||||||
|
).toEqual({
|
||||||
|
auctionLifecycleId: 'life-1',
|
||||||
|
currentServerTimestampMS: 1000,
|
||||||
|
matchSideEffectRevision: 3,
|
||||||
|
matchSideEffectStatus: 'completed',
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('mirrors side-effect status into Redis live state with lifecycle and revision guard', async () => {
|
||||||
|
const sendCommand = jest.fn().mockResolvedValue(1);
|
||||||
|
const service = new AuctionSideEffectService({
|
||||||
|
raw: jest.fn().mockReturnValue({ sendCommand }),
|
||||||
|
} as never);
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.mirrorMatchSideEffectStatus({
|
||||||
|
auctionLifecycleId: 'life-1',
|
||||||
|
matchId: 'match-1',
|
||||||
|
matchSideEffectRevision: 2,
|
||||||
|
matchSideEffectStatus: 'completed',
|
||||||
|
}),
|
||||||
|
).resolves.toBe(true);
|
||||||
|
|
||||||
|
expect(sendCommand).toHaveBeenCalledWith([
|
||||||
|
'EVAL',
|
||||||
|
expect.stringContaining('auctionLifecycleId'),
|
||||||
|
'1',
|
||||||
|
'auction:match-1:liveAuctionState',
|
||||||
|
'life-1',
|
||||||
|
'2',
|
||||||
|
'completed',
|
||||||
|
'',
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,119 @@
|
|||||||
|
import { Injectable } from '@nestjs/common';
|
||||||
|
import type {
|
||||||
|
AuctionMatchSideEffectStatus,
|
||||||
|
AuctionSideEffectApplicationState,
|
||||||
|
} from '../global/database/schema';
|
||||||
|
import { buildAuctionRedisKeys } from './redis/auction-redis.keys';
|
||||||
|
import { AuctionRedisService } from './redis/auction-redis.service';
|
||||||
|
|
||||||
|
export interface SideEffectApplicationIdentity {
|
||||||
|
auctionId: unknown;
|
||||||
|
auctionStateTransitionId: string;
|
||||||
|
sideEffectType: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface SideEffectLeaseState {
|
||||||
|
processingLeaseExpiresAtTimestampMS?: number;
|
||||||
|
state: AuctionSideEffectApplicationState;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface BuildSideEffectLeaseAcquireUpdateParams {
|
||||||
|
currentRedisTimestampMS: number;
|
||||||
|
leaseDurationMS: number;
|
||||||
|
ownerToken: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface MatchSideEffectDelta {
|
||||||
|
auctionLifecycleId: string;
|
||||||
|
auctionStateTransitionId?: string;
|
||||||
|
currentServerTimestampMS: number;
|
||||||
|
matchSideEffectRevision: number;
|
||||||
|
matchSideEffectStatus: AuctionMatchSideEffectStatus;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class AuctionSideEffectService {
|
||||||
|
constructor(private readonly auctionRedisService: AuctionRedisService) {}
|
||||||
|
|
||||||
|
public async mirrorMatchSideEffectStatus(params: {
|
||||||
|
auctionLifecycleId: string;
|
||||||
|
auctionStateTransitionId?: string;
|
||||||
|
matchId: string;
|
||||||
|
matchSideEffectRevision: number;
|
||||||
|
matchSideEffectStatus: AuctionMatchSideEffectStatus;
|
||||||
|
}): Promise<boolean> {
|
||||||
|
const keys = buildAuctionRedisKeys(params.matchId);
|
||||||
|
const result = await this.auctionRedisService
|
||||||
|
.raw()
|
||||||
|
.sendCommand([
|
||||||
|
'EVAL',
|
||||||
|
[
|
||||||
|
"if redis.call('HGET', KEYS[1], 'auctionLifecycleId') ~= ARGV[1] then return 0 end",
|
||||||
|
"local generation = redis.call('HGET', KEYS[1], 'matchSideEffectTransitionId')",
|
||||||
|
"if ARGV[4] ~= '' and generation and generation ~= ARGV[4] then return 0 end",
|
||||||
|
"local currentRevision = tonumber(redis.call('HGET', KEYS[1], 'matchSideEffectRevision') or '-1')",
|
||||||
|
'local nextRevision = tonumber(ARGV[2])',
|
||||||
|
'if currentRevision >= nextRevision then return 0 end',
|
||||||
|
"redis.call('HSET', KEYS[1], 'matchSideEffectRevision', ARGV[2], 'matchSideEffectStatus', ARGV[3])",
|
||||||
|
'return 1',
|
||||||
|
].join('\n'),
|
||||||
|
'1',
|
||||||
|
keys.liveStateKey,
|
||||||
|
params.auctionLifecycleId,
|
||||||
|
String(params.matchSideEffectRevision),
|
||||||
|
params.matchSideEffectStatus,
|
||||||
|
params.auctionStateTransitionId ?? '',
|
||||||
|
]);
|
||||||
|
return Number(result) === 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function buildSideEffectApplicationIdentity(
|
||||||
|
params: SideEffectApplicationIdentity,
|
||||||
|
): SideEffectApplicationIdentity {
|
||||||
|
return {
|
||||||
|
auctionId: params.auctionId,
|
||||||
|
auctionStateTransitionId: params.auctionStateTransitionId,
|
||||||
|
sideEffectType: params.sideEffectType,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function canAcquireSideEffectLease(
|
||||||
|
state: SideEffectLeaseState,
|
||||||
|
currentRedisTimestampMS: number,
|
||||||
|
): boolean {
|
||||||
|
if (state.state === 'pending' || state.state === 'failed') return true;
|
||||||
|
if (state.state !== 'processing') return false;
|
||||||
|
return (
|
||||||
|
(state.processingLeaseExpiresAtTimestampMS ?? 0) <= currentRedisTimestampMS
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function buildSideEffectLeaseAcquireUpdate(
|
||||||
|
params: BuildSideEffectLeaseAcquireUpdateParams,
|
||||||
|
) {
|
||||||
|
return {
|
||||||
|
$inc: { attempts: 1 },
|
||||||
|
$set: {
|
||||||
|
processingLeaseExpiresAtTimestampMS:
|
||||||
|
params.currentRedisTimestampMS + params.leaseDurationMS,
|
||||||
|
processingOwnerToken: params.ownerToken,
|
||||||
|
processingStartedAtTimestampMS: params.currentRedisTimestampMS,
|
||||||
|
state: 'processing',
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function buildMatchSideEffectDelta(
|
||||||
|
params: MatchSideEffectDelta,
|
||||||
|
): MatchSideEffectDelta {
|
||||||
|
return {
|
||||||
|
auctionLifecycleId: params.auctionLifecycleId,
|
||||||
|
...(params.auctionStateTransitionId
|
||||||
|
? { auctionStateTransitionId: params.auctionStateTransitionId }
|
||||||
|
: {}),
|
||||||
|
currentServerTimestampMS: params.currentServerTimestampMS,
|
||||||
|
matchSideEffectRevision: params.matchSideEffectRevision,
|
||||||
|
matchSideEffectStatus: params.matchSideEffectStatus,
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,101 @@
|
|||||||
|
import 'reflect-metadata';
|
||||||
|
import mongoose from 'mongoose';
|
||||||
|
import { GUARDS_METADATA } from '@nestjs/common/constants';
|
||||||
|
import { METADATA_KEY_IS_PUBLIC_ACCESS_ALLOWED } from '../auth/allow-public-access.decorator';
|
||||||
|
import type { UserDocument } from '../global/database/schema';
|
||||||
|
|
||||||
|
jest.mock('../auth/jwt.service', () => ({
|
||||||
|
JwtService: class JwtService {},
|
||||||
|
}));
|
||||||
|
|
||||||
|
import { AuctionController } from './auction.controller';
|
||||||
|
|
||||||
|
describe('AuctionController bid authentication', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
jest.replaceProperty(process, 'env', { ...process.env });
|
||||||
|
delete process.env.AUCTION_REQUIRE_CAPTAIN_AUTH;
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => jest.restoreAllMocks());
|
||||||
|
|
||||||
|
it('allows HTTP guests to reach the configurable bid checks', () => {
|
||||||
|
const handler = AuctionController.prototype.placeBid;
|
||||||
|
expect(
|
||||||
|
Reflect.getMetadata(METADATA_KEY_IS_PUBLIC_ACCESS_ALLOWED, handler),
|
||||||
|
).toBe(true);
|
||||||
|
expect(Reflect.getMetadata(GUARDS_METADATA, handler)).toBeUndefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each([undefined, 'false', 'true'])(
|
||||||
|
'handles HTTP guests with captain auth=%s',
|
||||||
|
async (auth) => {
|
||||||
|
if (auth !== undefined) process.env.AUCTION_REQUIRE_CAPTAIN_AUTH = auth;
|
||||||
|
const placeBid = jest.fn().mockResolvedValue({ revision: 2 });
|
||||||
|
const controller = new AuctionController(
|
||||||
|
{ placeBid } as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
);
|
||||||
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
|
const result = controller.placeBid(
|
||||||
|
undefined,
|
||||||
|
new mongoose.Types.ObjectId(),
|
||||||
|
matchId,
|
||||||
|
{
|
||||||
|
bidderTeamIndex: 2,
|
||||||
|
bidPointAmount: 20,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
if (auth === 'true') {
|
||||||
|
await expect(result).rejects.toThrow(
|
||||||
|
'팀장 계정으로 로그인해야 입찰할 수 있습니다.',
|
||||||
|
);
|
||||||
|
expect(placeBid).not.toHaveBeenCalled();
|
||||||
|
} else {
|
||||||
|
await expect(result).resolves.toEqual({ revision: 2 });
|
||||||
|
expect(placeBid).toHaveBeenCalledWith(
|
||||||
|
expect.objectContaining({
|
||||||
|
matchId,
|
||||||
|
teamIndex: 2,
|
||||||
|
amount: 20,
|
||||||
|
bidderUserId: undefined,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
it('passes the signed-in user to service checks and restores community validation in strict mode', async () => {
|
||||||
|
const placeBid = jest.fn().mockResolvedValue({ revision: 2 });
|
||||||
|
const controller = new AuctionController(
|
||||||
|
{ placeBid } as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
);
|
||||||
|
const user = {
|
||||||
|
_id: new mongoose.Types.ObjectId(),
|
||||||
|
communityId: new mongoose.Types.ObjectId(),
|
||||||
|
} as UserDocument;
|
||||||
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
|
const body = { bidderTeamIndex: 2, bidPointAmount: 20 };
|
||||||
|
await controller.placeBid(
|
||||||
|
user,
|
||||||
|
new mongoose.Types.ObjectId(),
|
||||||
|
matchId,
|
||||||
|
body,
|
||||||
|
);
|
||||||
|
expect(placeBid).toHaveBeenLastCalledWith(
|
||||||
|
expect.objectContaining({ bidderUserId: user._id }),
|
||||||
|
);
|
||||||
|
|
||||||
|
process.env.AUCTION_REQUIRE_CAPTAIN_AUTH = 'true';
|
||||||
|
await expect(
|
||||||
|
controller.placeBid(user, new mongoose.Types.ObjectId(), matchId, body),
|
||||||
|
).rejects.toThrow('Different community.');
|
||||||
|
expect(placeBid).toHaveBeenCalledTimes(1);
|
||||||
|
await expect(
|
||||||
|
controller.placeBid(user, user.communityId, matchId, body),
|
||||||
|
).resolves.toEqual({ revision: 2 });
|
||||||
|
expect(placeBid).toHaveBeenCalledTimes(2);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -3,12 +3,14 @@ import {
|
|||||||
Body,
|
Body,
|
||||||
Controller,
|
Controller,
|
||||||
Delete,
|
Delete,
|
||||||
|
ForbiddenException,
|
||||||
Get,
|
Get,
|
||||||
HttpCode,
|
HttpCode,
|
||||||
HttpStatus,
|
HttpStatus,
|
||||||
Param,
|
Param,
|
||||||
Post,
|
Post,
|
||||||
UseGuards,
|
UseGuards,
|
||||||
|
Query,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import mongoose from 'mongoose';
|
import mongoose from 'mongoose';
|
||||||
import { AllowPublicAccess } from '../auth/allow-public-access.decorator';
|
import { AllowPublicAccess } from '../auth/allow-public-access.decorator';
|
||||||
@@ -18,9 +20,15 @@ import { RolesGuard } from '../auth/roles.guard';
|
|||||||
import { ParseObjectIdPipe } from '../common/parse-object-id.pipe';
|
import { ParseObjectIdPipe } from '../common/parse-object-id.pipe';
|
||||||
import type { UserDocument } from '../global/database/schema';
|
import type { UserDocument } from '../global/database/schema';
|
||||||
import { AuctionService } from './auction.service';
|
import { AuctionService } from './auction.service';
|
||||||
|
import { isAuctionCaptainAuthRequired } from './auction-bid-auth';
|
||||||
import { AuctionGateway } from './auction.gateway';
|
import { AuctionGateway } from './auction.gateway';
|
||||||
|
import { AuctionBidArchiveService } from './auction-bid-archive.service';
|
||||||
import {
|
import {
|
||||||
|
NextAuctionDto,
|
||||||
|
OpenBiddingDto,
|
||||||
|
PassedAuctionDto,
|
||||||
PlaceBidDto,
|
PlaceBidDto,
|
||||||
|
ResetAuctionDto,
|
||||||
SoldDto,
|
SoldDto,
|
||||||
StartAuctionDto,
|
StartAuctionDto,
|
||||||
UndoAuctionDto,
|
UndoAuctionDto,
|
||||||
@@ -31,6 +39,7 @@ export class AuctionController {
|
|||||||
constructor(
|
constructor(
|
||||||
private readonly auctionService: AuctionService,
|
private readonly auctionService: AuctionService,
|
||||||
private readonly auctionGateway: AuctionGateway,
|
private readonly auctionGateway: AuctionGateway,
|
||||||
|
private readonly auctionBidArchiveService: AuctionBidArchiveService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
@Post()
|
@Post()
|
||||||
@@ -47,18 +56,21 @@ export class AuctionController {
|
|||||||
return this.auctionService.start({
|
return this.auctionService.start({
|
||||||
matchId,
|
matchId,
|
||||||
communityId,
|
communityId,
|
||||||
|
startAuctionRequestId: body.startAuctionRequestId,
|
||||||
|
actorUserId: currentUser._id,
|
||||||
captains: body.captains.map((c) => ({
|
captains: body.captains.map((c) => ({
|
||||||
teamIndex: c.teamIndex,
|
teamIndex: c.teamIndex,
|
||||||
userId: new mongoose.Types.ObjectId(c.userId),
|
userId: new mongoose.Types.ObjectId(c.userId),
|
||||||
initialPoints: c.initialPoints,
|
initialTeamBidPointAmount: c.initialTeamBidPointAmount,
|
||||||
})),
|
})),
|
||||||
initialPoints: body.initialPoints ?? 1000,
|
initialTeamBidPointAmount: body.initialTeamBidPointAmount ?? 1000,
|
||||||
maxTimerSeconds: body.maxTimerSeconds ?? 30,
|
maximumBidRoundDurationSeconds: body.maximumBidRoundDurationSeconds ?? 30,
|
||||||
bidExtensionSeconds: body.bidExtensionSeconds ?? 5,
|
bidRoundExtensionSeconds: body.bidRoundExtensionSeconds ?? 5,
|
||||||
topTierThreshold: body.topTierThreshold ?? 'NONE',
|
topTierAuctionPriorityThreshold:
|
||||||
manualTopTierUserIds: (body.manualTopTierUserIds ?? []).map(
|
body.topTierAuctionPriorityThreshold ?? 'NONE',
|
||||||
(userId) => new mongoose.Types.ObjectId(userId),
|
manualTopTierAuctionPriorityUserIds: (
|
||||||
),
|
body.manualTopTierAuctionPriorityUserIds ?? []
|
||||||
|
).map((userId) => new mongoose.Types.ObjectId(userId)),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -67,17 +79,32 @@ export class AuctionController {
|
|||||||
public async getAuction(
|
public async getAuction(
|
||||||
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
||||||
) {
|
) {
|
||||||
return this.auctionService.getByMatchId(matchId);
|
return this.auctionService.getStateByMatchId(matchId);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 공개 입찰 기록 조회.
|
||||||
|
@Get('bids/history')
|
||||||
|
@AllowPublicAccess()
|
||||||
|
public async getBidHistory(
|
||||||
|
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
||||||
|
@Query('afterRevision') afterRevision?: string,
|
||||||
|
@Query('limit') limit?: string,
|
||||||
|
) {
|
||||||
|
return this.auctionBidArchiveService.list(
|
||||||
|
matchId,
|
||||||
|
afterRevision === undefined ? -1 : Number(afterRevision),
|
||||||
|
limit === undefined ? 100 : Number(limit),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 공개 — 팀장 2명만 쓸 엔드포인트(트러스트 기반, 10명 동시 관전).
|
|
||||||
@Post('open-bidding')
|
@Post('open-bidding')
|
||||||
@AllowPublicAccess()
|
@AllowPublicAccess()
|
||||||
@HttpCode(HttpStatus.OK)
|
@HttpCode(HttpStatus.OK)
|
||||||
public async openBidding(
|
public async openBidding(
|
||||||
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
||||||
|
@Body() body: OpenBiddingDto = {},
|
||||||
) {
|
) {
|
||||||
return this.auctionService.openBidding(matchId);
|
return this.auctionService.openBidding(matchId, body);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Post('bids')
|
@Post('bids')
|
||||||
@@ -85,14 +112,29 @@ export class AuctionController {
|
|||||||
@HttpCode(HttpStatus.OK)
|
@HttpCode(HttpStatus.OK)
|
||||||
public async placeBid(
|
public async placeBid(
|
||||||
@CurrentUser() currentUser: UserDocument | undefined,
|
@CurrentUser() currentUser: UserDocument | undefined,
|
||||||
|
@Param('communityId', ParseObjectIdPipe)
|
||||||
|
communityId: mongoose.Types.ObjectId,
|
||||||
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
||||||
@Body() body: PlaceBidDto,
|
@Body() body: PlaceBidDto,
|
||||||
) {
|
) {
|
||||||
|
if (isAuctionCaptainAuthRequired()) {
|
||||||
|
if (!currentUser) {
|
||||||
|
throw new ForbiddenException(
|
||||||
|
'팀장 계정으로 로그인해야 입찰할 수 있습니다.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
this.assertSameCommunity(currentUser, communityId);
|
||||||
|
}
|
||||||
return this.auctionService.placeBid({
|
return this.auctionService.placeBid({
|
||||||
matchId,
|
matchId,
|
||||||
teamIndex: body.teamIndex,
|
bidderUserId: currentUser?._id,
|
||||||
amount: body.amount,
|
teamIndex: body.bidderTeamIndex,
|
||||||
bidderUserId: this.resolveBidder(currentUser, body.bidderUserId),
|
amount: body.bidPointAmount,
|
||||||
|
bidRequestId: body.bidRequestId,
|
||||||
|
clientObservedBidRoundId: body.clientObservedBidRoundId,
|
||||||
|
clientObservedAuctionLifecycleId: body.clientObservedAuctionLifecycleId,
|
||||||
|
clientObservedCurrentBidRoundPlayerUserId:
|
||||||
|
body.clientObservedCurrentBidRoundPlayerUserId,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -106,16 +148,35 @@ export class AuctionController {
|
|||||||
return this.auctionService.markSold({
|
return this.auctionService.markSold({
|
||||||
matchId,
|
matchId,
|
||||||
assignedPosition: body.assignedPosition,
|
assignedPosition: body.assignedPosition,
|
||||||
|
auctionActionRequestId: body.auctionActionRequestId,
|
||||||
|
clientObservedAuctionLifecycleId: body.clientObservedAuctionLifecycleId,
|
||||||
|
clientObservedCurrentAuctionPlayerOrderIndex:
|
||||||
|
body.clientObservedCurrentAuctionPlayerOrderIndex,
|
||||||
|
clientObservedCurrentBidRoundPlayerUserId:
|
||||||
|
body.clientObservedCurrentBidRoundPlayerUserId,
|
||||||
|
clientObservedPhase: body.clientObservedPhase,
|
||||||
|
clientObservedRevision: body.clientObservedRevision,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Post('passed')
|
||||||
|
@AllowPublicAccess()
|
||||||
|
@HttpCode(HttpStatus.OK)
|
||||||
|
public async markPassed(
|
||||||
|
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
||||||
|
@Body() body: PassedAuctionDto = {},
|
||||||
|
) {
|
||||||
|
return this.auctionService.markPassed(matchId, body);
|
||||||
|
}
|
||||||
|
|
||||||
@Post('next')
|
@Post('next')
|
||||||
@AllowPublicAccess()
|
@AllowPublicAccess()
|
||||||
@HttpCode(HttpStatus.OK)
|
@HttpCode(HttpStatus.OK)
|
||||||
public async next(
|
public async next(
|
||||||
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
||||||
|
@Body() body: NextAuctionDto = {},
|
||||||
) {
|
) {
|
||||||
return this.auctionService.next(matchId);
|
return this.auctionService.next(matchId, body);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get('history')
|
@Get('history')
|
||||||
@@ -147,6 +208,14 @@ export class AuctionController {
|
|||||||
matchId,
|
matchId,
|
||||||
communityId,
|
communityId,
|
||||||
sequence: body.sequence,
|
sequence: body.sequence,
|
||||||
|
auctionActionRequestId: body.auctionActionRequestId,
|
||||||
|
clientObservedAuctionLifecycleId: body.clientObservedAuctionLifecycleId,
|
||||||
|
clientObservedCurrentAuctionPlayerOrderIndex:
|
||||||
|
body.clientObservedCurrentAuctionPlayerOrderIndex,
|
||||||
|
clientObservedCurrentBidRoundPlayerUserId:
|
||||||
|
body.clientObservedCurrentBidRoundPlayerUserId,
|
||||||
|
clientObservedPhase: body.clientObservedPhase,
|
||||||
|
clientObservedRevision: body.clientObservedRevision,
|
||||||
});
|
});
|
||||||
this.auctionGateway.broadcastState(matchId.toString(), auction);
|
this.auctionGateway.broadcastState(matchId.toString(), auction);
|
||||||
return auction;
|
return auction;
|
||||||
@@ -161,22 +230,25 @@ export class AuctionController {
|
|||||||
@Param('communityId', ParseObjectIdPipe)
|
@Param('communityId', ParseObjectIdPipe)
|
||||||
communityId: mongoose.Types.ObjectId,
|
communityId: mongoose.Types.ObjectId,
|
||||||
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
||||||
|
@Body() body: ResetAuctionDto = {},
|
||||||
) {
|
) {
|
||||||
this.assertSameCommunity(currentUser, communityId);
|
this.assertSameCommunity(currentUser, communityId);
|
||||||
await this.auctionService.reset({ matchId, communityId });
|
await this.auctionService.reset({
|
||||||
this.auctionGateway.broadcastReset(matchId.toString());
|
matchId,
|
||||||
}
|
communityId,
|
||||||
|
auctionActionRequestId: body.auctionActionRequestId,
|
||||||
private resolveBidder(
|
clientObservedAuctionLifecycleId: body.clientObservedAuctionLifecycleId,
|
||||||
currentUser: UserDocument | undefined,
|
clientObservedCurrentAuctionPlayerOrderIndex:
|
||||||
bodyBidder?: string,
|
body.clientObservedCurrentAuctionPlayerOrderIndex,
|
||||||
): mongoose.Types.ObjectId | undefined {
|
clientObservedCurrentBidRoundPlayerUserId:
|
||||||
if (currentUser) return currentUser._id;
|
body.clientObservedCurrentBidRoundPlayerUserId,
|
||||||
if (!bodyBidder) return undefined;
|
clientObservedPhase: body.clientObservedPhase,
|
||||||
if (!mongoose.isValidObjectId(bodyBidder)) {
|
clientObservedRevision: body.clientObservedRevision,
|
||||||
throw new BadRequestException('Invalid bidderUserId.');
|
});
|
||||||
}
|
this.auctionGateway.broadcastReset(
|
||||||
return new mongoose.Types.ObjectId(bodyBidder);
|
matchId.toString(),
|
||||||
|
body.clientObservedAuctionLifecycleId,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private assertSameCommunity(
|
private assertSameCommunity(
|
||||||
|
|||||||
@@ -0,0 +1,478 @@
|
|||||||
|
import mongoose from 'mongoose';
|
||||||
|
import { ServiceUnavailableException } from '@nestjs/common';
|
||||||
|
|
||||||
|
jest.mock('../auth/jwt.service', () => ({
|
||||||
|
JwtService: class JwtService {},
|
||||||
|
}));
|
||||||
|
|
||||||
|
import { AuctionGateway } from './auction.gateway';
|
||||||
|
|
||||||
|
describe('AuctionGateway', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
jest.replaceProperty(process, 'env', { ...process.env });
|
||||||
|
delete process.env.AUCTION_REQUIRE_CAPTAIN_AUTH;
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
jest.restoreAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('signals pending initial state so the client can retry privately after recovery', async () => {
|
||||||
|
const matchId = new mongoose.Types.ObjectId().toString();
|
||||||
|
const gateway = new AuctionGateway(
|
||||||
|
{
|
||||||
|
getByMatchId: async () => ({}),
|
||||||
|
getStateByMatchId: async () => {
|
||||||
|
throw new ServiceUnavailableException({
|
||||||
|
code: 'AUCTION_STATE_RECOVERING',
|
||||||
|
message: 'recovering',
|
||||||
|
});
|
||||||
|
},
|
||||||
|
} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
);
|
||||||
|
const socket = { data: { matchId }, join: jest.fn(), emit: jest.fn() };
|
||||||
|
await gateway.handleJoin(socket as never, { matchId });
|
||||||
|
expect(socket.emit).toHaveBeenCalledTimes(1);
|
||||||
|
expect(socket.emit).toHaveBeenCalledWith('state-pending', {
|
||||||
|
retryAfterMS: 500,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
it('sends join and resync snapshots only to the requesting socket and coalesces in-flight resyncs', async () => {
|
||||||
|
const matchId = new mongoose.Types.ObjectId().toString();
|
||||||
|
const getStateByMatchId = jest.fn().mockResolvedValue({ revision: 3 });
|
||||||
|
const gateway = new AuctionGateway(
|
||||||
|
{
|
||||||
|
getByMatchId: async () => ({ chatMessages: [] }),
|
||||||
|
getStateByMatchId,
|
||||||
|
} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
);
|
||||||
|
const broadcast = jest.fn();
|
||||||
|
(gateway as unknown as { server: unknown }).server = {
|
||||||
|
to: () => ({ emit: broadcast }),
|
||||||
|
};
|
||||||
|
const socket = { data: { matchId }, join: jest.fn(), emit: jest.fn() };
|
||||||
|
await gateway.handleJoin(socket as never, { matchId });
|
||||||
|
expect(socket.emit).toHaveBeenCalledWith('state', { revision: 3 });
|
||||||
|
expect(broadcast).not.toHaveBeenCalled();
|
||||||
|
let finish!: (value: unknown) => void;
|
||||||
|
getStateByMatchId.mockImplementationOnce(
|
||||||
|
() =>
|
||||||
|
new Promise((resolve) => {
|
||||||
|
finish = resolve;
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
const ack = jest.fn(),
|
||||||
|
busyAck = jest.fn();
|
||||||
|
const pending = gateway.handleResync(socket as never, {}, ack);
|
||||||
|
await gateway.handleResync(socket as never, {}, busyAck);
|
||||||
|
expect(busyAck).toHaveBeenCalledWith(
|
||||||
|
expect.objectContaining({ code: 'RESYNC_BUSY' }),
|
||||||
|
);
|
||||||
|
finish({ revision: 4 });
|
||||||
|
await pending;
|
||||||
|
expect(ack).toHaveBeenCalledWith({ ok: true, state: { revision: 4 } });
|
||||||
|
expect(getStateByMatchId).toHaveBeenCalledTimes(2);
|
||||||
|
expect(broadcast).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
const bidderUserId = new mongoose.Types.ObjectId();
|
||||||
|
|
||||||
|
function createGateway(params?: {
|
||||||
|
getCurrentRedisTimestampMS?: jest.Mock;
|
||||||
|
placeBidDelta?: jest.Mock;
|
||||||
|
}) {
|
||||||
|
const auctionService = {
|
||||||
|
placeBidDelta: params?.placeBidDelta ?? jest.fn(),
|
||||||
|
};
|
||||||
|
const auctionRedisService = {
|
||||||
|
getCurrentRedisTimestampMS:
|
||||||
|
params?.getCurrentRedisTimestampMS ??
|
||||||
|
jest.fn().mockResolvedValue(1780000000000),
|
||||||
|
};
|
||||||
|
const gateway = new AuctionGateway(
|
||||||
|
auctionService as never,
|
||||||
|
{ resolveDevUserById: jest.fn() } as never,
|
||||||
|
{ verify: jest.fn() } as never,
|
||||||
|
{ findOrCreateByOid: jest.fn() } as never,
|
||||||
|
{ getModel: jest.fn() } as never,
|
||||||
|
{ attachAuctionNamespace: jest.fn() } as never,
|
||||||
|
auctionRedisService as never,
|
||||||
|
);
|
||||||
|
const emit = jest.fn();
|
||||||
|
const to = jest.fn().mockReturnValue({ emit });
|
||||||
|
(gateway as unknown as { server: { to: jest.Mock } }).server = { to };
|
||||||
|
|
||||||
|
return {
|
||||||
|
auctionService,
|
||||||
|
emit,
|
||||||
|
gateway,
|
||||||
|
auctionRedisService,
|
||||||
|
to,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
it('requires an authenticated user when captain authentication is enabled', async () => {
|
||||||
|
process.env.AUCTION_REQUIRE_CAPTAIN_AUTH = 'true';
|
||||||
|
const matchId = new mongoose.Types.ObjectId().toString();
|
||||||
|
const { gateway, auctionService } = createGateway();
|
||||||
|
const ack = jest.fn();
|
||||||
|
|
||||||
|
await gateway.handleBid(
|
||||||
|
{ data: { matchId }, emit: jest.fn() } as never,
|
||||||
|
{ bidderTeamIndex: 1, bidPointAmount: 100 },
|
||||||
|
ack,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(auctionService.placeBidDelta).not.toHaveBeenCalled();
|
||||||
|
expect(ack).toHaveBeenCalledWith(
|
||||||
|
expect.objectContaining({ rejected: true }),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each([undefined, bidderUserId])(
|
||||||
|
'accepts the selected team in temporary mode for user %s',
|
||||||
|
async (userId) => {
|
||||||
|
const matchId = new mongoose.Types.ObjectId().toString();
|
||||||
|
const placeBidDelta = jest.fn().mockResolvedValue({
|
||||||
|
auctionBidHistoryEntry: {
|
||||||
|
bidderTeamIndex: 2,
|
||||||
|
bidderUserId: new mongoose.Types.ObjectId().toString(),
|
||||||
|
bidPointAmount: 120,
|
||||||
|
bidPlacedAtTimestampMS: 1780000000000,
|
||||||
|
},
|
||||||
|
currentHighestBidderTeamIndex: 2,
|
||||||
|
currentHighestBidPointAmount: 120,
|
||||||
|
currentServerTimestampMS: 1780000000000,
|
||||||
|
revision: 9,
|
||||||
|
});
|
||||||
|
const { gateway, emit } = createGateway({ placeBidDelta });
|
||||||
|
const ack = jest.fn();
|
||||||
|
|
||||||
|
await gateway.handleBid(
|
||||||
|
{
|
||||||
|
data: { matchId, user: userId ? { _id: userId } : undefined },
|
||||||
|
emit: jest.fn(),
|
||||||
|
} as never,
|
||||||
|
{ bidderTeamIndex: 2, bidPointAmount: 120 },
|
||||||
|
ack,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(placeBidDelta).toHaveBeenCalledWith(
|
||||||
|
expect.objectContaining({
|
||||||
|
teamIndex: 2,
|
||||||
|
amount: 120,
|
||||||
|
bidderUserId: userId,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
expect(ack).toHaveBeenCalledWith(expect.objectContaining({ ok: true }));
|
||||||
|
expect(emit).toHaveBeenCalledWith(
|
||||||
|
'bid',
|
||||||
|
expect.objectContaining({ currentHighestBidderTeamIndex: 2 }),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
it('broadcasts a bid delta and acknowledges the matching bid request', async () => {
|
||||||
|
const matchId = new mongoose.Types.ObjectId().toString();
|
||||||
|
const auctionBidHistoryEntry = {
|
||||||
|
bidderTeamIndex: 2,
|
||||||
|
bidderUserId: 'captain-2',
|
||||||
|
bidPlacedAtTimestampMS: 1780000000000,
|
||||||
|
bidPointAmount: 120,
|
||||||
|
};
|
||||||
|
const placeBidDelta = jest.fn().mockResolvedValue({
|
||||||
|
auctionBidHistoryEntry,
|
||||||
|
auctionLifecycleId: 'life-1',
|
||||||
|
currentBidRoundDeadlineTimestampMS: 1780000030000,
|
||||||
|
currentHighestBidderTeamIndex: 2,
|
||||||
|
currentHighestBidPointAmount: 120,
|
||||||
|
currentServerTimestampMS: 1780000000000,
|
||||||
|
revision: 9,
|
||||||
|
});
|
||||||
|
const { emit, gateway, to } = createGateway({ placeBidDelta });
|
||||||
|
const ack = jest.fn();
|
||||||
|
|
||||||
|
await gateway.handleBid(
|
||||||
|
{
|
||||||
|
data: { matchId, user: { _id: bidderUserId } },
|
||||||
|
emit: jest.fn(),
|
||||||
|
} as never,
|
||||||
|
{
|
||||||
|
bidPointAmount: 120,
|
||||||
|
bidderTeamIndex: 2,
|
||||||
|
bidRequestId: 'bid-1',
|
||||||
|
clientObservedAuctionLifecycleId: 'life-1',
|
||||||
|
clientObservedCurrentBidRoundPlayerUserId: 'player-1',
|
||||||
|
},
|
||||||
|
ack,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(placeBidDelta).toHaveBeenCalledWith({
|
||||||
|
amount: 120,
|
||||||
|
bidRequestId: 'bid-1',
|
||||||
|
bidderUserId,
|
||||||
|
clientObservedAuctionLifecycleId: 'life-1',
|
||||||
|
clientObservedCurrentBidRoundPlayerUserId: 'player-1',
|
||||||
|
matchId: new mongoose.Types.ObjectId(matchId),
|
||||||
|
teamIndex: 2,
|
||||||
|
});
|
||||||
|
expect(to).toHaveBeenCalledWith(matchId);
|
||||||
|
expect(emit).toHaveBeenCalledWith('bid', {
|
||||||
|
auctionBidHistoryEntry,
|
||||||
|
auctionLifecycleId: 'life-1',
|
||||||
|
bidRequestId: 'bid-1',
|
||||||
|
currentBidRoundDeadlineTimestampMS: 1780000030000,
|
||||||
|
currentHighestBidderTeamIndex: 2,
|
||||||
|
currentHighestBidPointAmount: 120,
|
||||||
|
currentServerTimestampMS: 1780000000000,
|
||||||
|
revision: 9,
|
||||||
|
});
|
||||||
|
expect(ack).toHaveBeenCalledWith(
|
||||||
|
expect.objectContaining({
|
||||||
|
bidDelta: {
|
||||||
|
auctionBidHistoryEntry,
|
||||||
|
auctionLifecycleId: 'life-1',
|
||||||
|
bidRequestId: 'bid-1',
|
||||||
|
currentBidRoundDeadlineTimestampMS: 1780000030000,
|
||||||
|
currentHighestBidderTeamIndex: 2,
|
||||||
|
currentHighestBidPointAmount: 120,
|
||||||
|
currentServerTimestampMS: 1780000000000,
|
||||||
|
revision: 9,
|
||||||
|
},
|
||||||
|
bidRequestId: 'bid-1',
|
||||||
|
bidServerTiming: expect.objectContaining({
|
||||||
|
gatewayTotalDurationMS: expect.any(Number),
|
||||||
|
}),
|
||||||
|
ok: true,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('generates one bid request id when the client omits it', async () => {
|
||||||
|
const matchId = new mongoose.Types.ObjectId().toString();
|
||||||
|
const placeBidDelta = jest.fn().mockResolvedValue({
|
||||||
|
auctionBidHistoryEntry: {
|
||||||
|
bidderTeamIndex: 1,
|
||||||
|
bidPointAmount: 50,
|
||||||
|
},
|
||||||
|
auctionLifecycleId: 'life-1',
|
||||||
|
currentHighestBidderTeamIndex: 1,
|
||||||
|
currentHighestBidPointAmount: 50,
|
||||||
|
revision: 3,
|
||||||
|
});
|
||||||
|
const { emit, gateway } = createGateway({ placeBidDelta });
|
||||||
|
const ack = jest.fn();
|
||||||
|
|
||||||
|
await gateway.handleBid(
|
||||||
|
{
|
||||||
|
data: { matchId, user: { _id: bidderUserId } },
|
||||||
|
emit: jest.fn(),
|
||||||
|
} as never,
|
||||||
|
{
|
||||||
|
bidPointAmount: 50,
|
||||||
|
bidderTeamIndex: 1,
|
||||||
|
},
|
||||||
|
ack,
|
||||||
|
);
|
||||||
|
|
||||||
|
const generatedBidRequestId = placeBidDelta.mock.calls[0][0].bidRequestId;
|
||||||
|
expect(generatedBidRequestId).toEqual(expect.any(String));
|
||||||
|
expect(generatedBidRequestId).not.toHaveLength(0);
|
||||||
|
expect(emit).toHaveBeenCalledWith(
|
||||||
|
'bid',
|
||||||
|
expect.objectContaining({
|
||||||
|
bidRequestId: generatedBidRequestId,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
expect(ack).toHaveBeenCalledWith(
|
||||||
|
expect.objectContaining({
|
||||||
|
bidRequestId: generatedBidRequestId,
|
||||||
|
ok: true,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('acknowledges bid failures with the request id used for the attempt', async () => {
|
||||||
|
const matchId = new mongoose.Types.ObjectId().toString();
|
||||||
|
const placeBidDelta = jest.fn().mockRejectedValue({
|
||||||
|
getResponse: () => ({
|
||||||
|
bidDiagnostics: {
|
||||||
|
currentBidRoundDeadlineTimestampMS: 1780000002500,
|
||||||
|
currentServerTimestampMS: 1780000003000,
|
||||||
|
},
|
||||||
|
bidServerTiming: {
|
||||||
|
redisBidCommandDurationMS: 2,
|
||||||
|
redisBidContextReadDurationMS: 1,
|
||||||
|
serviceTotalDurationMS: 4,
|
||||||
|
},
|
||||||
|
code: 'EXPIRED',
|
||||||
|
message: 'Bid deadline has already expired.',
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
const socketEmit = jest.fn();
|
||||||
|
const { gateway } = createGateway({ placeBidDelta });
|
||||||
|
const ack = jest.fn();
|
||||||
|
|
||||||
|
await gateway.handleBid(
|
||||||
|
{
|
||||||
|
data: { matchId, user: { _id: bidderUserId } },
|
||||||
|
emit: socketEmit,
|
||||||
|
} as never,
|
||||||
|
{
|
||||||
|
bidPointAmount: 50,
|
||||||
|
bidderTeamIndex: 1,
|
||||||
|
bidRequestId: 'bid-1',
|
||||||
|
},
|
||||||
|
ack,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(socketEmit).toHaveBeenCalledWith('error', {
|
||||||
|
message: 'Bid deadline has already expired.',
|
||||||
|
});
|
||||||
|
expect(ack).toHaveBeenCalledWith(
|
||||||
|
expect.objectContaining({
|
||||||
|
bidDiagnostics: {
|
||||||
|
currentBidRoundDeadlineTimestampMS: 1780000002500,
|
||||||
|
currentServerTimestampMS: 1780000003000,
|
||||||
|
},
|
||||||
|
bidRequestId: 'bid-1',
|
||||||
|
bidServerTiming: expect.objectContaining({
|
||||||
|
gatewayTotalDurationMS: expect.any(Number),
|
||||||
|
redisBidCommandDurationMS: 2,
|
||||||
|
redisBidContextReadDurationMS: 1,
|
||||||
|
serviceTotalDurationMS: 4,
|
||||||
|
}),
|
||||||
|
code: 'EXPIRED',
|
||||||
|
message: 'Bid deadline has already expired.',
|
||||||
|
rejected: true,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('acknowledges time sync with Redis server time', async () => {
|
||||||
|
const getCurrentRedisTimestampMS = jest
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValue(1780000001234);
|
||||||
|
const { gateway } = createGateway({ getCurrentRedisTimestampMS });
|
||||||
|
const ack = jest.fn();
|
||||||
|
|
||||||
|
await gateway.handleTimeSync(
|
||||||
|
{
|
||||||
|
clientSentAtTimestampMS: 1780000000000,
|
||||||
|
sequence: 7,
|
||||||
|
},
|
||||||
|
ack,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(getCurrentRedisTimestampMS).toHaveBeenCalledTimes(1);
|
||||||
|
expect(ack).toHaveBeenCalledWith(
|
||||||
|
expect.objectContaining({
|
||||||
|
clientSentAtTimestampMS: 1780000000000,
|
||||||
|
currentServerTimestampMS: 1780000001234,
|
||||||
|
ok: true,
|
||||||
|
sequence: 7,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rate limits excessive bid requests from the same socket', async () => {
|
||||||
|
jest.spyOn(Date, 'now').mockReturnValue(1780000000000);
|
||||||
|
const matchId = new mongoose.Types.ObjectId().toString();
|
||||||
|
const placeBidDelta = jest.fn().mockResolvedValue({
|
||||||
|
auctionBidHistoryEntry: {
|
||||||
|
bidderTeamIndex: 1,
|
||||||
|
bidPointAmount: 50,
|
||||||
|
},
|
||||||
|
currentHighestBidderTeamIndex: 1,
|
||||||
|
currentHighestBidPointAmount: 50,
|
||||||
|
revision: 3,
|
||||||
|
});
|
||||||
|
const socketEmit = jest.fn();
|
||||||
|
const socket = {
|
||||||
|
data: { matchId, user: { _id: bidderUserId } },
|
||||||
|
emit: socketEmit,
|
||||||
|
};
|
||||||
|
const { gateway } = createGateway({ placeBidDelta });
|
||||||
|
const acknowledgements: Array<Record<string, unknown>> = [];
|
||||||
|
|
||||||
|
for (let index = 0; index < 9; index += 1) {
|
||||||
|
await gateway.handleBid(
|
||||||
|
socket as never,
|
||||||
|
{
|
||||||
|
bidPointAmount: 50,
|
||||||
|
bidderTeamIndex: 1,
|
||||||
|
bidRequestId: `bid-${index}`,
|
||||||
|
},
|
||||||
|
(response) => acknowledgements.push(response),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(placeBidDelta).toHaveBeenCalledTimes(8);
|
||||||
|
expect(socketEmit).toHaveBeenCalledWith('error', {
|
||||||
|
message: '입찰 요청이 너무 많습니다. 잠시 후 다시 시도해주세요.',
|
||||||
|
});
|
||||||
|
expect(acknowledgements[8]).toEqual({
|
||||||
|
bidRequestId: 'bid-8',
|
||||||
|
code: 'BID_RATE_LIMITED',
|
||||||
|
message: '입찰 요청이 너무 많습니다. 잠시 후 다시 시도해주세요.',
|
||||||
|
rejected: true,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('allows bid requests again after the rate limit window resets', async () => {
|
||||||
|
const nowSpy = jest.spyOn(Date, 'now');
|
||||||
|
nowSpy.mockReturnValue(1780000000000);
|
||||||
|
const matchId = new mongoose.Types.ObjectId().toString();
|
||||||
|
const placeBidDelta = jest.fn().mockResolvedValue({
|
||||||
|
auctionBidHistoryEntry: {
|
||||||
|
bidderTeamIndex: 1,
|
||||||
|
bidPointAmount: 50,
|
||||||
|
},
|
||||||
|
currentHighestBidderTeamIndex: 1,
|
||||||
|
currentHighestBidPointAmount: 50,
|
||||||
|
revision: 3,
|
||||||
|
});
|
||||||
|
const socket = {
|
||||||
|
data: { matchId, user: { _id: bidderUserId } },
|
||||||
|
emit: jest.fn(),
|
||||||
|
};
|
||||||
|
const { gateway } = createGateway({ placeBidDelta });
|
||||||
|
|
||||||
|
for (let index = 0; index < 8; index += 1) {
|
||||||
|
await gateway.handleBid(
|
||||||
|
socket as never,
|
||||||
|
{
|
||||||
|
bidPointAmount: 50,
|
||||||
|
bidderTeamIndex: 1,
|
||||||
|
bidRequestId: `bid-${index}`,
|
||||||
|
},
|
||||||
|
jest.fn(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
nowSpy.mockReturnValue(1780000001000);
|
||||||
|
await gateway.handleBid(
|
||||||
|
socket as never,
|
||||||
|
{
|
||||||
|
bidPointAmount: 50,
|
||||||
|
bidderTeamIndex: 1,
|
||||||
|
bidRequestId: 'bid-reset',
|
||||||
|
},
|
||||||
|
jest.fn(),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(placeBidDelta).toHaveBeenCalledTimes(9);
|
||||||
|
});
|
||||||
|
});
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -4,12 +4,31 @@ import { TournamentCodeModule } from '../tournament-code/tournament-code.module'
|
|||||||
import { TournamentResultModule } from '../tournament-result/tournament-result.module';
|
import { TournamentResultModule } from '../tournament-result/tournament-result.module';
|
||||||
import { AuctionGateway } from './auction.gateway';
|
import { AuctionGateway } from './auction.gateway';
|
||||||
import { AuctionController } from './auction.controller';
|
import { AuctionController } from './auction.controller';
|
||||||
|
import { AuctionDeadlineScheduler } from './auction-deadline.scheduler';
|
||||||
|
import { AuctionDurabilityScheduler } from './auction-durability.scheduler';
|
||||||
|
import { AuctionEventBusService } from './auction-event-bus.service';
|
||||||
|
import { AuctionRedisModule } from './redis/auction-redis.module';
|
||||||
|
import { AuctionSideEffectService } from './auction-side-effect.service';
|
||||||
import { AuctionService } from './auction.service';
|
import { AuctionService } from './auction.service';
|
||||||
|
import { AuctionBidArchiveService } from './auction-bid-archive.service';
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [RiotModule, TournamentCodeModule, TournamentResultModule],
|
imports: [
|
||||||
|
RiotModule,
|
||||||
|
TournamentCodeModule,
|
||||||
|
TournamentResultModule,
|
||||||
|
AuctionRedisModule,
|
||||||
|
],
|
||||||
controllers: [AuctionController],
|
controllers: [AuctionController],
|
||||||
providers: [AuctionService, AuctionGateway],
|
providers: [
|
||||||
|
AuctionService,
|
||||||
|
AuctionBidArchiveService,
|
||||||
|
AuctionGateway,
|
||||||
|
AuctionEventBusService,
|
||||||
|
AuctionDeadlineScheduler,
|
||||||
|
AuctionDurabilityScheduler,
|
||||||
|
AuctionSideEffectService,
|
||||||
|
],
|
||||||
exports: [AuctionService],
|
exports: [AuctionService],
|
||||||
})
|
})
|
||||||
export class AuctionModule {}
|
export class AuctionModule {}
|
||||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -7,6 +7,8 @@ import {
|
|||||||
IsInt,
|
IsInt,
|
||||||
IsMongoId,
|
IsMongoId,
|
||||||
IsOptional,
|
IsOptional,
|
||||||
|
IsString,
|
||||||
|
IsUUID,
|
||||||
Max,
|
Max,
|
||||||
Min,
|
Min,
|
||||||
ValidateNested,
|
ValidateNested,
|
||||||
@@ -28,10 +30,13 @@ class CaptainAssignmentDto {
|
|||||||
@IsInt()
|
@IsInt()
|
||||||
@Min(100)
|
@Min(100)
|
||||||
@Max(100000)
|
@Max(100000)
|
||||||
initialPoints?: number;
|
initialTeamBidPointAmount?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class StartAuctionDto {
|
export class StartAuctionDto {
|
||||||
|
@IsUUID()
|
||||||
|
startAuctionRequestId!: string;
|
||||||
|
|
||||||
@IsArray()
|
@IsArray()
|
||||||
@ArrayMinSize(2)
|
@ArrayMinSize(2)
|
||||||
@ArrayMaxSize(16)
|
@ArrayMaxSize(16)
|
||||||
@@ -43,50 +48,96 @@ export class StartAuctionDto {
|
|||||||
@IsInt()
|
@IsInt()
|
||||||
@Min(100)
|
@Min(100)
|
||||||
@Max(100000)
|
@Max(100000)
|
||||||
initialPoints?: number;
|
initialTeamBidPointAmount?: number;
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsEnum(AUCTION_TOP_TIER_THRESHOLDS)
|
@IsEnum(AUCTION_TOP_TIER_THRESHOLDS)
|
||||||
topTierThreshold?: AuctionTopTierThreshold;
|
topTierAuctionPriorityThreshold?: AuctionTopTierThreshold;
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsArray()
|
@IsArray()
|
||||||
@ArrayMaxSize(100)
|
@ArrayMaxSize(100)
|
||||||
@IsMongoId({ each: true })
|
@IsMongoId({ each: true })
|
||||||
manualTopTierUserIds?: string[];
|
manualTopTierAuctionPriorityUserIds?: string[];
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsInt()
|
@IsInt()
|
||||||
@Min(5)
|
@Min(5)
|
||||||
maxTimerSeconds?: number;
|
maximumBidRoundDurationSeconds?: number;
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsInt()
|
@IsInt()
|
||||||
@Min(0)
|
@Min(0)
|
||||||
bidExtensionSeconds?: number;
|
bidRoundExtensionSeconds?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class PlaceBidDto {
|
export class PlaceBidDto {
|
||||||
@IsInt()
|
@IsOptional()
|
||||||
@Min(1)
|
@IsString()
|
||||||
teamIndex!: number;
|
clientObservedBidRoundId?: string;
|
||||||
|
|
||||||
@IsInt()
|
|
||||||
@Min(1)
|
|
||||||
amount!: number;
|
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsMongoId()
|
@IsUUID()
|
||||||
bidderUserId?: string;
|
bidRequestId?: string;
|
||||||
|
|
||||||
|
@IsInt()
|
||||||
|
@Min(1)
|
||||||
|
bidderTeamIndex!: number;
|
||||||
|
|
||||||
|
@IsInt()
|
||||||
|
@Min(1)
|
||||||
|
bidPointAmount!: number;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
clientObservedAuctionLifecycleId?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
clientObservedCurrentBidRoundPlayerUserId?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class SoldDto {
|
export class AuctionActionRequestDto {
|
||||||
|
@IsOptional()
|
||||||
|
@IsUUID()
|
||||||
|
auctionActionRequestId?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
clientObservedAuctionLifecycleId?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsInt()
|
||||||
|
@Min(0)
|
||||||
|
clientObservedRevision?: number;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
clientObservedPhase?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
clientObservedCurrentBidRoundPlayerUserId?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsInt()
|
||||||
|
@Min(0)
|
||||||
|
clientObservedCurrentAuctionPlayerOrderIndex?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class SoldDto extends AuctionActionRequestDto {
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsEnum(['TOP', 'JGL', 'MID', 'ADC', 'SUP'])
|
@IsEnum(['TOP', 'JGL', 'MID', 'ADC', 'SUP'])
|
||||||
assignedPosition?: 'TOP' | 'JGL' | 'MID' | 'ADC' | 'SUP';
|
assignedPosition?: 'TOP' | 'JGL' | 'MID' | 'ADC' | 'SUP';
|
||||||
}
|
}
|
||||||
|
|
||||||
export class UndoAuctionDto {
|
export class OpenBiddingDto extends AuctionActionRequestDto {}
|
||||||
|
|
||||||
|
export class NextAuctionDto extends AuctionActionRequestDto {}
|
||||||
|
|
||||||
|
export class PassedAuctionDto extends AuctionActionRequestDto {}
|
||||||
|
|
||||||
|
export class ResetAuctionDto extends AuctionActionRequestDto {}
|
||||||
|
|
||||||
|
export class UndoAuctionDto extends AuctionActionRequestDto {
|
||||||
@IsInt()
|
@IsInt()
|
||||||
@Min(1)
|
@Min(1)
|
||||||
sequence!: number;
|
sequence!: number;
|
||||||
|
|||||||
@@ -0,0 +1,395 @@
|
|||||||
|
import { AuctionRedisService } from './auction-redis.service';
|
||||||
|
import { AuctionRedisCommandService } from './auction-redis-command.service';
|
||||||
|
import { AUCTION_APPLY_TRANSITION_SCRIPT } from './auction-redis.apply-transition';
|
||||||
|
import { AUCTION_BID_SCRIPT } from './auction-redis.bid';
|
||||||
|
import { AUCTION_EXPIRE_PREPARE_SCRIPT } from './auction-redis.expire-prepare';
|
||||||
|
import { AUCTION_RESERVE_ACTION_REQUEST_SCRIPT } from './auction-redis.reserve-action';
|
||||||
|
import { AUCTION_HYDRATE_STATE_SCRIPT } from './auction-redis.state';
|
||||||
|
|
||||||
|
function makeService(reply: unknown) {
|
||||||
|
const auctionRedisService = {
|
||||||
|
evalScript: jest.fn().mockResolvedValue(reply),
|
||||||
|
} as unknown as jest.Mocked<AuctionRedisService>;
|
||||||
|
return {
|
||||||
|
auctionRedisService,
|
||||||
|
service: new AuctionRedisCommandService(auctionRedisService),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('AuctionRedisCommandService', () => {
|
||||||
|
it('executes BID script and parses successful reply', async () => {
|
||||||
|
const { service, auctionRedisService } = makeService([
|
||||||
|
'OK',
|
||||||
|
'bid-1',
|
||||||
|
'9',
|
||||||
|
'1000',
|
||||||
|
'120',
|
||||||
|
'2',
|
||||||
|
'31000',
|
||||||
|
'{"bidPointAmount":120}',
|
||||||
|
]);
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.placeBid('match-1', {
|
||||||
|
bidderTeamIndex: 2,
|
||||||
|
bidPointAmount: 120,
|
||||||
|
bidRequestId: 'bid-1',
|
||||||
|
bidderUserId: 'captain-2',
|
||||||
|
clientObservedAuctionLifecycleId: 'life-1',
|
||||||
|
clientObservedCurrentBidRoundPlayerUserId: 'player-1',
|
||||||
|
maximumAuctionTeamMemberCount: 5,
|
||||||
|
maximumStoredAuctionBidHistoryCount: 200,
|
||||||
|
maximumStoredBidRequestResultCount: 100,
|
||||||
|
matchId: 'match-1',
|
||||||
|
minimumBidPointReservePerRemainingAuctionTeamMemberSlot: 10,
|
||||||
|
minimumBidRequestResultReplayWindowMS: 60_000,
|
||||||
|
}),
|
||||||
|
).resolves.toEqual({
|
||||||
|
auctionBidHistoryEntry: { bidPointAmount: 120 },
|
||||||
|
bidRequestId: 'bid-1',
|
||||||
|
currentHighestBidderTeamIndex: 2,
|
||||||
|
currentHighestBidPointAmount: 120,
|
||||||
|
currentBidRoundDeadlineTimestampMS: 31_000,
|
||||||
|
currentServerTimestampMS: 1_000,
|
||||||
|
ok: true,
|
||||||
|
revision: 9,
|
||||||
|
});
|
||||||
|
expect(auctionRedisService.evalScript).toHaveBeenCalledWith(
|
||||||
|
AUCTION_BID_SCRIPT,
|
||||||
|
expect.arrayContaining(['auction:match-1:liveAuctionState']),
|
||||||
|
expect.arrayContaining(['match-1', '2', '120']),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('parses BID rejected reply', async () => {
|
||||||
|
const { service } = makeService([
|
||||||
|
'REJECTED',
|
||||||
|
'TOO_LOW',
|
||||||
|
'bid-1',
|
||||||
|
'1000',
|
||||||
|
'31000',
|
||||||
|
]);
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.placeBid('match-1', {
|
||||||
|
bidderTeamIndex: 2,
|
||||||
|
bidPointAmount: 120,
|
||||||
|
bidRequestId: 'bid-1',
|
||||||
|
bidderUserId: 'captain-2',
|
||||||
|
clientObservedAuctionLifecycleId: 'life-1',
|
||||||
|
clientObservedCurrentBidRoundPlayerUserId: 'player-1',
|
||||||
|
maximumAuctionTeamMemberCount: 5,
|
||||||
|
maximumStoredAuctionBidHistoryCount: 200,
|
||||||
|
maximumStoredBidRequestResultCount: 100,
|
||||||
|
matchId: 'match-1',
|
||||||
|
minimumBidPointReservePerRemainingAuctionTeamMemberSlot: 10,
|
||||||
|
minimumBidRequestResultReplayWindowMS: 60_000,
|
||||||
|
}),
|
||||||
|
).resolves.toEqual({
|
||||||
|
bidRequestId: 'bid-1',
|
||||||
|
code: 'TOO_LOW',
|
||||||
|
currentBidRoundDeadlineTimestampMS: 31_000,
|
||||||
|
currentServerTimestampMS: 1000,
|
||||||
|
rejected: true,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('executes reserve action request and parses lease metadata', async () => {
|
||||||
|
const { service, auctionRedisService } = makeService([
|
||||||
|
'RESERVED',
|
||||||
|
'life-1:request-1',
|
||||||
|
'transition-1',
|
||||||
|
'',
|
||||||
|
'2',
|
||||||
|
'1',
|
||||||
|
'1000',
|
||||||
|
]);
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.reserveActionRequest('match-1', {
|
||||||
|
auctionActionRequestId: 'request-1',
|
||||||
|
auctionActionType: 'sold',
|
||||||
|
auctionStateTransitionId: 'transition-1',
|
||||||
|
clientObservedAuctionLifecycleId: 'life-1',
|
||||||
|
clientObservedPhase: 'bidding',
|
||||||
|
clientObservedRevision: 8,
|
||||||
|
leaseDurationMS: 10_000,
|
||||||
|
maximumStoredAuctionActionRequestResultCount: 100,
|
||||||
|
minimumAuctionActionRequestResultReplayWindowMS: 60_000,
|
||||||
|
processingOwnerToken: 'owner-1',
|
||||||
|
}),
|
||||||
|
).resolves.toEqual({
|
||||||
|
actionRequestScopeKey: 'life-1:request-1',
|
||||||
|
auctionStateTransitionId: 'transition-1',
|
||||||
|
currentServerTimestampMS: 1000,
|
||||||
|
newAuctionLifecycleId: '',
|
||||||
|
observedProcessingLeaseVersion: 2,
|
||||||
|
reserved: true,
|
||||||
|
wasLeaseExpired: true,
|
||||||
|
});
|
||||||
|
expect(auctionRedisService.evalScript).toHaveBeenCalledWith(
|
||||||
|
AUCTION_RESERVE_ACTION_REQUEST_SCRIPT,
|
||||||
|
expect.arrayContaining(['auction:match-1:auctionActionRequestResults']),
|
||||||
|
expect.arrayContaining(['life-1', 'request-1', 'sold']),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('parses reserve action request replay refetch metadata', async () => {
|
||||||
|
const { service } = makeService([
|
||||||
|
'REPLAY',
|
||||||
|
'applied',
|
||||||
|
'life-1:request-1',
|
||||||
|
'11',
|
||||||
|
'',
|
||||||
|
'transition-1',
|
||||||
|
'',
|
||||||
|
'2',
|
||||||
|
'3000',
|
||||||
|
'',
|
||||||
|
'1',
|
||||||
|
]);
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.reserveActionRequest('match-1', {
|
||||||
|
auctionActionRequestId: 'request-1',
|
||||||
|
auctionActionType: 'sold',
|
||||||
|
auctionStateTransitionId: 'transition-1',
|
||||||
|
clientObservedAuctionLifecycleId: 'life-1',
|
||||||
|
clientObservedPhase: 'bidding',
|
||||||
|
clientObservedRevision: 8,
|
||||||
|
leaseDurationMS: 10_000,
|
||||||
|
maximumStoredAuctionActionRequestResultCount: 100,
|
||||||
|
minimumAuctionActionRequestResultReplayWindowMS: 60_000,
|
||||||
|
processingOwnerToken: 'owner-1',
|
||||||
|
}),
|
||||||
|
).resolves.toEqual({
|
||||||
|
actionRequestScopeKey: 'life-1:request-1',
|
||||||
|
currentServerTimestampMS: 3000,
|
||||||
|
isReplay: true,
|
||||||
|
requiresRefetch: true,
|
||||||
|
replayStatus: 'applied',
|
||||||
|
revision: 11,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('executes apply transition and parses successful reply', async () => {
|
||||||
|
const { service, auctionRedisService } = makeService([
|
||||||
|
'OK',
|
||||||
|
'transition-1',
|
||||||
|
'11',
|
||||||
|
'2000',
|
||||||
|
]);
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.applyTransition('match-1', {
|
||||||
|
afterAuctionStructureStateJson: '{"auctionTeams":[]}',
|
||||||
|
auctionHistorySequence: 5,
|
||||||
|
auctionLifecycleId: 'life-1',
|
||||||
|
auctionStateTransitionId: 'transition-1',
|
||||||
|
broadcastStateRevision: 11,
|
||||||
|
deadline: { mode: 'remove' },
|
||||||
|
durabilityPayloadJson: '{"auctionStateTransitionId":"transition-1"}',
|
||||||
|
expectedPhase: 'bidding',
|
||||||
|
expectedRevision: 10,
|
||||||
|
liveStatePatch: { phase: 'sold' },
|
||||||
|
matchId: 'match-1',
|
||||||
|
shouldBroadcastState: true,
|
||||||
|
}),
|
||||||
|
).resolves.toEqual({
|
||||||
|
auctionStateTransitionId: 'transition-1',
|
||||||
|
currentServerTimestampMS: 2000,
|
||||||
|
ok: true,
|
||||||
|
revision: 11,
|
||||||
|
});
|
||||||
|
expect(auctionRedisService.evalScript).toHaveBeenCalledWith(
|
||||||
|
AUCTION_APPLY_TRANSITION_SCRIPT,
|
||||||
|
expect.arrayContaining(['auction:match-1:liveAuctionState']),
|
||||||
|
expect.arrayContaining(['match-1', 'life-1', 'transition-1']),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('parses apply transition replay and rejected replies', async () => {
|
||||||
|
await expect(
|
||||||
|
makeService([
|
||||||
|
'REPLAY',
|
||||||
|
'APPLIED',
|
||||||
|
'transition-1',
|
||||||
|
'2100',
|
||||||
|
]).service.applyTransition('match-1', {
|
||||||
|
afterAuctionStructureStateJson: '{}',
|
||||||
|
auctionHistorySequence: 5,
|
||||||
|
auctionLifecycleId: 'life-1',
|
||||||
|
auctionStateTransitionId: 'transition-1',
|
||||||
|
broadcastStateRevision: 11,
|
||||||
|
deadline: { mode: 'none' },
|
||||||
|
durabilityPayloadJson: '{}',
|
||||||
|
expectedPhase: 'sold',
|
||||||
|
expectedRevision: 10,
|
||||||
|
liveStatePatch: {},
|
||||||
|
matchId: 'match-1',
|
||||||
|
shouldBroadcastState: false,
|
||||||
|
}),
|
||||||
|
).resolves.toEqual({
|
||||||
|
auctionStateTransitionId: 'transition-1',
|
||||||
|
currentServerTimestampMS: 2100,
|
||||||
|
isReplay: true,
|
||||||
|
replayStatus: 'APPLIED',
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
makeService([
|
||||||
|
'REJECTED',
|
||||||
|
'CONFLICT',
|
||||||
|
'transition-1',
|
||||||
|
'2200',
|
||||||
|
]).service.applyTransition('match-1', {
|
||||||
|
afterAuctionStructureStateJson: '{}',
|
||||||
|
auctionHistorySequence: 5,
|
||||||
|
auctionLifecycleId: 'life-1',
|
||||||
|
auctionStateTransitionId: 'transition-1',
|
||||||
|
broadcastStateRevision: 11,
|
||||||
|
deadline: { mode: 'none' },
|
||||||
|
durabilityPayloadJson: '{}',
|
||||||
|
expectedPhase: 'sold',
|
||||||
|
expectedRevision: 10,
|
||||||
|
liveStatePatch: {},
|
||||||
|
matchId: 'match-1',
|
||||||
|
shouldBroadcastState: false,
|
||||||
|
}),
|
||||||
|
).resolves.toEqual({
|
||||||
|
auctionStateTransitionId: 'transition-1',
|
||||||
|
code: 'CONFLICT',
|
||||||
|
currentServerTimestampMS: 2200,
|
||||||
|
rejected: true,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('executes expire prepare and parses expiry decisions', async () => {
|
||||||
|
const { service, auctionRedisService } = makeService([
|
||||||
|
'OK',
|
||||||
|
'sold',
|
||||||
|
'expire-1',
|
||||||
|
'12',
|
||||||
|
'3000',
|
||||||
|
]);
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.expirePrepare('match-1', {
|
||||||
|
auctionStateTransitionId: 'expire-1',
|
||||||
|
bidRoundExpiryRetryDelayMS: 3000,
|
||||||
|
matchId: 'match-1',
|
||||||
|
}),
|
||||||
|
).resolves.toEqual({
|
||||||
|
auctionStateTransitionId: 'expire-1',
|
||||||
|
bidRoundExpiryDecision: 'sold',
|
||||||
|
currentServerTimestampMS: 3000,
|
||||||
|
isReplay: undefined,
|
||||||
|
ok: true,
|
||||||
|
revision: 12,
|
||||||
|
});
|
||||||
|
expect(auctionRedisService.evalScript).toHaveBeenCalledWith(
|
||||||
|
AUCTION_EXPIRE_PREPARE_SCRIPT,
|
||||||
|
expect.arrayContaining(['auction:match-1:liveAuctionState']),
|
||||||
|
expect.arrayContaining(['match-1', 'expire-1']),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('parses expire prepare replay and noop replies', async () => {
|
||||||
|
await expect(
|
||||||
|
makeService([
|
||||||
|
'REPLAY',
|
||||||
|
'passed',
|
||||||
|
'expire-1',
|
||||||
|
'12',
|
||||||
|
'3100',
|
||||||
|
]).service.expirePrepare('match-1', {
|
||||||
|
auctionStateTransitionId: 'expire-1',
|
||||||
|
bidRoundExpiryRetryDelayMS: 3000,
|
||||||
|
matchId: 'match-1',
|
||||||
|
}),
|
||||||
|
).resolves.toMatchObject({
|
||||||
|
auctionStateTransitionId: 'expire-1',
|
||||||
|
bidRoundExpiryDecision: 'passed',
|
||||||
|
currentServerTimestampMS: 3100,
|
||||||
|
isReplay: true,
|
||||||
|
ok: true,
|
||||||
|
revision: 12,
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
makeService(['NOOP', 'NOT_DUE', '3200']).service.expirePrepare(
|
||||||
|
'match-1',
|
||||||
|
{
|
||||||
|
auctionStateTransitionId: 'expire-1',
|
||||||
|
bidRoundExpiryRetryDelayMS: 3000,
|
||||||
|
matchId: 'match-1',
|
||||||
|
},
|
||||||
|
),
|
||||||
|
).resolves.toEqual({
|
||||||
|
code: 'NOT_DUE',
|
||||||
|
currentServerTimestampMS: 3200,
|
||||||
|
noop: true,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('executes hydrate state and parses hydrate/noop replies', async () => {
|
||||||
|
const { service, auctionRedisService } = makeService(['OK', '7', '4000']);
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.hydrateState('match-1', {
|
||||||
|
auctionHistorySequence: 3,
|
||||||
|
auctionLifecycleId: 'life-1',
|
||||||
|
maximumBidRoundDurationSeconds: 30,
|
||||||
|
matchId: 'match-1',
|
||||||
|
phase: 'presenting',
|
||||||
|
revision: 6,
|
||||||
|
structureStateJson: '{"auctionTeams":[]}',
|
||||||
|
}),
|
||||||
|
).resolves.toEqual({
|
||||||
|
currentServerTimestampMS: 4000,
|
||||||
|
hydrated: true,
|
||||||
|
revision: 7,
|
||||||
|
});
|
||||||
|
expect(auctionRedisService.evalScript).toHaveBeenCalledWith(
|
||||||
|
AUCTION_HYDRATE_STATE_SCRIPT,
|
||||||
|
expect.arrayContaining(['auction:match-1:liveAuctionState']),
|
||||||
|
expect.arrayContaining(['match-1', 'life-1', '6']),
|
||||||
|
);
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
makeService(['NOOP', '8', '4100']).service.hydrateState('match-1', {
|
||||||
|
auctionHistorySequence: 3,
|
||||||
|
auctionLifecycleId: 'life-1',
|
||||||
|
maximumBidRoundDurationSeconds: 30,
|
||||||
|
matchId: 'match-1',
|
||||||
|
phase: 'presenting',
|
||||||
|
revision: 6,
|
||||||
|
structureStateJson: '{}',
|
||||||
|
}),
|
||||||
|
).resolves.toEqual({
|
||||||
|
currentServerTimestampMS: 4100,
|
||||||
|
noop: true,
|
||||||
|
revision: 8,
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
makeService([
|
||||||
|
'REJECTED',
|
||||||
|
'INVALID_PATCH_ARITY',
|
||||||
|
'4200',
|
||||||
|
]).service.hydrateState('match-1', {
|
||||||
|
auctionHistorySequence: 3,
|
||||||
|
auctionLifecycleId: 'life-1',
|
||||||
|
maximumBidRoundDurationSeconds: 30,
|
||||||
|
matchId: 'match-1',
|
||||||
|
phase: 'presenting',
|
||||||
|
revision: 6,
|
||||||
|
structureStateJson: '{}',
|
||||||
|
}),
|
||||||
|
).resolves.toEqual({
|
||||||
|
code: 'INVALID_PATCH_ARITY',
|
||||||
|
currentServerTimestampMS: 4200,
|
||||||
|
rejected: true,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,384 @@
|
|||||||
|
import { Injectable } from '@nestjs/common';
|
||||||
|
import {
|
||||||
|
type AuctionApplyTransitionScriptInput,
|
||||||
|
buildAuctionApplyTransitionScriptInvocation,
|
||||||
|
} from './auction-redis.apply-transition';
|
||||||
|
import {
|
||||||
|
type AuctionBidScriptInput,
|
||||||
|
buildAuctionBidScriptInvocation,
|
||||||
|
} from './auction-redis.bid';
|
||||||
|
import {
|
||||||
|
type AuctionExpirePrepareScriptInput,
|
||||||
|
buildAuctionExpirePrepareScriptInvocation,
|
||||||
|
} from './auction-redis.expire-prepare';
|
||||||
|
import { buildAuctionRedisKeys } from './auction-redis.keys';
|
||||||
|
import { AuctionRedisService } from './auction-redis.service';
|
||||||
|
import {
|
||||||
|
type AuctionReserveActionRequestScriptInput,
|
||||||
|
buildAuctionReserveActionRequestScriptInvocation,
|
||||||
|
} from './auction-redis.reserve-action';
|
||||||
|
import {
|
||||||
|
type HydrateAuctionStateScriptInput,
|
||||||
|
buildHydrateAuctionStateScriptInvocation,
|
||||||
|
} from './auction-redis.state';
|
||||||
|
|
||||||
|
export type AuctionBidCommandResult =
|
||||||
|
| {
|
||||||
|
auctionBidHistoryEntry: Record<string, unknown>;
|
||||||
|
bidRequestId: string;
|
||||||
|
currentBidRoundDeadlineTimestampMS: number;
|
||||||
|
currentHighestBidderTeamIndex: number;
|
||||||
|
currentHighestBidPointAmount: number;
|
||||||
|
currentServerTimestampMS: number;
|
||||||
|
isReplay?: boolean;
|
||||||
|
ok: true;
|
||||||
|
revision: number;
|
||||||
|
}
|
||||||
|
| {
|
||||||
|
bidRequestId: string;
|
||||||
|
code: string;
|
||||||
|
currentBidRoundDeadlineTimestampMS?: number;
|
||||||
|
currentServerTimestampMS: number;
|
||||||
|
isReplay?: boolean;
|
||||||
|
rejected: true;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type AuctionReserveActionRequestCommandResult =
|
||||||
|
| {
|
||||||
|
actionRequestScopeKey: string;
|
||||||
|
auctionStateTransitionId: string;
|
||||||
|
currentServerTimestampMS: number;
|
||||||
|
newAuctionLifecycleId: string;
|
||||||
|
observedProcessingLeaseVersion: number;
|
||||||
|
reserved: true;
|
||||||
|
wasLeaseExpired: boolean;
|
||||||
|
}
|
||||||
|
| {
|
||||||
|
actionRequestScopeKey: string;
|
||||||
|
code: string;
|
||||||
|
currentServerTimestampMS: number;
|
||||||
|
rejected: true;
|
||||||
|
}
|
||||||
|
| {
|
||||||
|
actionRequestScopeKey: string;
|
||||||
|
currentServerTimestampMS: number;
|
||||||
|
isReplay: true;
|
||||||
|
requiresRefetch?: boolean;
|
||||||
|
replayStatus: string;
|
||||||
|
responseJson?: string;
|
||||||
|
revision?: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type AuctionApplyTransitionCommandResult =
|
||||||
|
| {
|
||||||
|
auctionStateTransitionId: string;
|
||||||
|
currentServerTimestampMS: number;
|
||||||
|
ok: true;
|
||||||
|
revision: number;
|
||||||
|
}
|
||||||
|
| {
|
||||||
|
auctionStateTransitionId: string;
|
||||||
|
currentServerTimestampMS: number;
|
||||||
|
isReplay: true;
|
||||||
|
replayStatus: string;
|
||||||
|
}
|
||||||
|
| {
|
||||||
|
auctionStateTransitionId: string;
|
||||||
|
code: string;
|
||||||
|
currentServerTimestampMS: number;
|
||||||
|
rejected: true;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type AuctionExpirePrepareCommandResult =
|
||||||
|
| {
|
||||||
|
auctionStateTransitionId: string;
|
||||||
|
bidRoundExpiryDecision: 'passed' | 'sold';
|
||||||
|
currentServerTimestampMS: number;
|
||||||
|
isReplay?: boolean;
|
||||||
|
ok: true;
|
||||||
|
revision: number;
|
||||||
|
}
|
||||||
|
| {
|
||||||
|
code: string;
|
||||||
|
currentServerTimestampMS: number;
|
||||||
|
noop: true;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type AuctionHydrateStateCommandResult =
|
||||||
|
| {
|
||||||
|
currentServerTimestampMS: number;
|
||||||
|
hydrated: true;
|
||||||
|
revision: number;
|
||||||
|
}
|
||||||
|
| {
|
||||||
|
currentServerTimestampMS: number;
|
||||||
|
noop: true;
|
||||||
|
revision: number;
|
||||||
|
}
|
||||||
|
| {
|
||||||
|
code: string;
|
||||||
|
currentServerTimestampMS: number;
|
||||||
|
rejected: true;
|
||||||
|
};
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class AuctionRedisCommandService {
|
||||||
|
constructor(private readonly auctionRedisService: AuctionRedisService) {}
|
||||||
|
|
||||||
|
public async placeBid(
|
||||||
|
matchId: string,
|
||||||
|
input: AuctionBidScriptInput,
|
||||||
|
): Promise<AuctionBidCommandResult> {
|
||||||
|
const invocation = buildAuctionBidScriptInvocation(
|
||||||
|
buildAuctionRedisKeys(matchId),
|
||||||
|
input,
|
||||||
|
);
|
||||||
|
const reply = await this.auctionRedisService.evalScript<unknown[]>(
|
||||||
|
invocation.script,
|
||||||
|
invocation.keys,
|
||||||
|
invocation.values,
|
||||||
|
);
|
||||||
|
return parseBidCommandReply(reply);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async reserveActionRequest(
|
||||||
|
matchId: string,
|
||||||
|
input: AuctionReserveActionRequestScriptInput,
|
||||||
|
): Promise<AuctionReserveActionRequestCommandResult> {
|
||||||
|
const invocation = buildAuctionReserveActionRequestScriptInvocation(
|
||||||
|
buildAuctionRedisKeys(matchId),
|
||||||
|
input,
|
||||||
|
);
|
||||||
|
const reply = await this.auctionRedisService.evalScript<unknown[]>(
|
||||||
|
invocation.script,
|
||||||
|
invocation.keys,
|
||||||
|
invocation.values,
|
||||||
|
);
|
||||||
|
return parseReserveActionRequestReply(reply);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async applyTransition(
|
||||||
|
matchId: string,
|
||||||
|
input: AuctionApplyTransitionScriptInput,
|
||||||
|
): Promise<AuctionApplyTransitionCommandResult> {
|
||||||
|
const invocation = buildAuctionApplyTransitionScriptInvocation(
|
||||||
|
buildAuctionRedisKeys(matchId),
|
||||||
|
input,
|
||||||
|
);
|
||||||
|
const reply = await this.auctionRedisService.evalScript<unknown[]>(
|
||||||
|
invocation.script,
|
||||||
|
invocation.keys,
|
||||||
|
invocation.values,
|
||||||
|
);
|
||||||
|
return parseApplyTransitionReply(reply);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async expirePrepare(
|
||||||
|
matchId: string,
|
||||||
|
input: AuctionExpirePrepareScriptInput,
|
||||||
|
): Promise<AuctionExpirePrepareCommandResult> {
|
||||||
|
const invocation = buildAuctionExpirePrepareScriptInvocation(
|
||||||
|
buildAuctionRedisKeys(matchId),
|
||||||
|
input,
|
||||||
|
);
|
||||||
|
const reply = await this.auctionRedisService.evalScript<unknown[]>(
|
||||||
|
invocation.script,
|
||||||
|
invocation.keys,
|
||||||
|
invocation.values,
|
||||||
|
);
|
||||||
|
return parseExpirePrepareReply(reply);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async hydrateState(
|
||||||
|
matchId: string,
|
||||||
|
input: HydrateAuctionStateScriptInput,
|
||||||
|
): Promise<AuctionHydrateStateCommandResult> {
|
||||||
|
const invocation = buildHydrateAuctionStateScriptInvocation(
|
||||||
|
buildAuctionRedisKeys(matchId),
|
||||||
|
input,
|
||||||
|
);
|
||||||
|
const reply = await this.auctionRedisService.evalScript<unknown[]>(
|
||||||
|
invocation.script,
|
||||||
|
invocation.keys,
|
||||||
|
invocation.values,
|
||||||
|
);
|
||||||
|
return parseHydrateStateReply(reply);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseBidCommandReply(reply: unknown[]): AuctionBidCommandResult {
|
||||||
|
const values = reply.map(String);
|
||||||
|
const kind = values[0];
|
||||||
|
if (kind === 'OK') {
|
||||||
|
return {
|
||||||
|
auctionBidHistoryEntry: JSON.parse(values[7] || '{}') as Record<
|
||||||
|
string,
|
||||||
|
unknown
|
||||||
|
>,
|
||||||
|
bidRequestId: values[1],
|
||||||
|
currentBidRoundDeadlineTimestampMS: numberValue(values[6]),
|
||||||
|
currentHighestBidderTeamIndex: numberValue(values[5]),
|
||||||
|
currentHighestBidPointAmount: numberValue(values[4]),
|
||||||
|
currentServerTimestampMS: numberValue(values[3]),
|
||||||
|
ok: true,
|
||||||
|
revision: numberValue(values[2]),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (kind === 'REPLAY') {
|
||||||
|
const status = values[1];
|
||||||
|
if (status === 'ok') {
|
||||||
|
return {
|
||||||
|
auctionBidHistoryEntry: JSON.parse(values[8] || '{}') as Record<
|
||||||
|
string,
|
||||||
|
unknown
|
||||||
|
>,
|
||||||
|
bidRequestId: values[2],
|
||||||
|
currentBidRoundDeadlineTimestampMS: numberValue(values[7]),
|
||||||
|
currentHighestBidderTeamIndex: numberValue(values[6]),
|
||||||
|
currentHighestBidPointAmount: numberValue(values[5]),
|
||||||
|
currentServerTimestampMS: numberValue(values[9]),
|
||||||
|
isReplay: true,
|
||||||
|
ok: true,
|
||||||
|
revision: numberValue(values[3]),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
bidRequestId: values[2],
|
||||||
|
code: values[4] || status,
|
||||||
|
currentBidRoundDeadlineTimestampMS: optionalNumberValue(values[7]),
|
||||||
|
currentServerTimestampMS: numberValue(values[9]),
|
||||||
|
isReplay: true,
|
||||||
|
rejected: true,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
bidRequestId: values[2] ?? '',
|
||||||
|
code: values[1] ?? 'UNKNOWN',
|
||||||
|
currentBidRoundDeadlineTimestampMS: optionalNumberValue(values[4]),
|
||||||
|
currentServerTimestampMS: numberValue(values[3]),
|
||||||
|
rejected: true,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseReserveActionRequestReply(
|
||||||
|
reply: unknown[],
|
||||||
|
): AuctionReserveActionRequestCommandResult {
|
||||||
|
const values = reply.map(String);
|
||||||
|
const kind = values[0];
|
||||||
|
if (kind === 'RESERVED') {
|
||||||
|
return {
|
||||||
|
actionRequestScopeKey: values[1],
|
||||||
|
auctionStateTransitionId: values[2],
|
||||||
|
currentServerTimestampMS: numberValue(values[6]),
|
||||||
|
newAuctionLifecycleId: values[3],
|
||||||
|
observedProcessingLeaseVersion: numberValue(values[4]),
|
||||||
|
reserved: true,
|
||||||
|
wasLeaseExpired: values[5] === '1',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (kind === 'REPLAY') {
|
||||||
|
return {
|
||||||
|
actionRequestScopeKey: values[2],
|
||||||
|
currentServerTimestampMS: numberValue(values[8]),
|
||||||
|
isReplay: true,
|
||||||
|
requiresRefetch: values[10] === '1' || undefined,
|
||||||
|
replayStatus: values[1],
|
||||||
|
responseJson: values[9] || undefined,
|
||||||
|
revision: values[3] ? numberValue(values[3]) : undefined,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
actionRequestScopeKey: values[2] ?? '',
|
||||||
|
code: values[1] ?? 'UNKNOWN',
|
||||||
|
currentServerTimestampMS: numberValue(values[3]),
|
||||||
|
rejected: true,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseApplyTransitionReply(
|
||||||
|
reply: unknown[],
|
||||||
|
): AuctionApplyTransitionCommandResult {
|
||||||
|
const values = reply.map(String);
|
||||||
|
const kind = values[0];
|
||||||
|
if (kind === 'OK') {
|
||||||
|
return {
|
||||||
|
auctionStateTransitionId: values[1],
|
||||||
|
currentServerTimestampMS: numberValue(values[3]),
|
||||||
|
ok: true,
|
||||||
|
revision: numberValue(values[2]),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (kind === 'REPLAY') {
|
||||||
|
return {
|
||||||
|
auctionStateTransitionId: values[2],
|
||||||
|
currentServerTimestampMS: numberValue(values[3]),
|
||||||
|
isReplay: true,
|
||||||
|
replayStatus: values[1],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
auctionStateTransitionId: values[2] ?? '',
|
||||||
|
code: values[1] ?? 'UNKNOWN',
|
||||||
|
currentServerTimestampMS: numberValue(values[3]),
|
||||||
|
rejected: true,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseExpirePrepareReply(
|
||||||
|
reply: unknown[],
|
||||||
|
): AuctionExpirePrepareCommandResult {
|
||||||
|
const values = reply.map(String);
|
||||||
|
const kind = values[0];
|
||||||
|
if (kind === 'OK' || kind === 'REPLAY') {
|
||||||
|
return {
|
||||||
|
auctionStateTransitionId: values[2],
|
||||||
|
bidRoundExpiryDecision:
|
||||||
|
values[1] === 'sold' || values[1] === 'passed' ? values[1] : 'passed',
|
||||||
|
currentServerTimestampMS: numberValue(values[4]),
|
||||||
|
isReplay: kind === 'REPLAY' || undefined,
|
||||||
|
ok: true,
|
||||||
|
revision: numberValue(values[3]),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
code: values[1] ?? 'UNKNOWN',
|
||||||
|
currentServerTimestampMS: numberValue(values[2]),
|
||||||
|
noop: true,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseHydrateStateReply(
|
||||||
|
reply: unknown[],
|
||||||
|
): AuctionHydrateStateCommandResult {
|
||||||
|
const values = reply.map(String);
|
||||||
|
if (values[0] === 'OK') {
|
||||||
|
return {
|
||||||
|
currentServerTimestampMS: numberValue(values[2]),
|
||||||
|
hydrated: true,
|
||||||
|
revision: numberValue(values[1]),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (values[0] === 'REJECTED') {
|
||||||
|
return {
|
||||||
|
code: values[1] ?? 'UNKNOWN',
|
||||||
|
currentServerTimestampMS: numberValue(values[2]),
|
||||||
|
rejected: true,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
currentServerTimestampMS: numberValue(values[2]),
|
||||||
|
noop: true,
|
||||||
|
revision: numberValue(values[1]),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function numberValue(value: string | undefined): number {
|
||||||
|
const parsed = Number(value);
|
||||||
|
return Number.isFinite(parsed) ? parsed : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
function optionalNumberValue(value: string | undefined): number | undefined {
|
||||||
|
if (value === undefined || value === '') return undefined;
|
||||||
|
const parsed = Number(value);
|
||||||
|
return Number.isFinite(parsed) ? parsed : undefined;
|
||||||
|
}
|
||||||
@@ -0,0 +1,153 @@
|
|||||||
|
import mongoose from 'mongoose';
|
||||||
|
import {
|
||||||
|
buildAuctionRedisLiveStatePatchFromStructure,
|
||||||
|
buildAuctionRedisStructureState,
|
||||||
|
convertLegacyAuctionTeamsToRedisTeams,
|
||||||
|
} from './auction-redis-projection';
|
||||||
|
|
||||||
|
describe('auction redis projection helpers', () => {
|
||||||
|
it('converts legacy auction team fields to redis-v1 names', () => {
|
||||||
|
const captainUserId = new mongoose.Types.ObjectId();
|
||||||
|
const memberUserId = new mongoose.Types.ObjectId();
|
||||||
|
|
||||||
|
expect(
|
||||||
|
convertLegacyAuctionTeamsToRedisTeams([
|
||||||
|
{
|
||||||
|
teamIndex: 1,
|
||||||
|
captainUserId,
|
||||||
|
points: 970,
|
||||||
|
members: [
|
||||||
|
{
|
||||||
|
userId: memberUserId,
|
||||||
|
assignedPosition: 'ADC',
|
||||||
|
cost: 30,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
]),
|
||||||
|
).toEqual([
|
||||||
|
{
|
||||||
|
teamIndex: 1,
|
||||||
|
captainUserId,
|
||||||
|
remainingBidPointAmount: 970,
|
||||||
|
members: [
|
||||||
|
{
|
||||||
|
userId: memberUserId,
|
||||||
|
assignedPosition: 'ADC',
|
||||||
|
memberAcquisitionBidPointAmount: 30,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('builds the redis structure state with only structure/config fields', () => {
|
||||||
|
const captainUserId = new mongoose.Types.ObjectId();
|
||||||
|
const playerUserId = new mongoose.Types.ObjectId();
|
||||||
|
|
||||||
|
expect(
|
||||||
|
buildAuctionRedisStructureState({
|
||||||
|
auctionPlayerOrder: [
|
||||||
|
{
|
||||||
|
userId: playerUserId,
|
||||||
|
puuid: 'puuid',
|
||||||
|
gameName: 'Player',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
profileIconId: 1,
|
||||||
|
preferredPositions: [{ position: 'MID', priority: 1 }],
|
||||||
|
tiers: [],
|
||||||
|
tierHistory: [],
|
||||||
|
masteries: [],
|
||||||
|
passCount: 0,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
auctionTeams: [
|
||||||
|
{
|
||||||
|
teamIndex: 1,
|
||||||
|
captainUserId,
|
||||||
|
remainingBidPointAmount: 1000,
|
||||||
|
members: [],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
bidRoundExtensionSeconds: 5,
|
||||||
|
currentAuctionPlayerOrderIndex: 0,
|
||||||
|
currentAuctionRound: 1,
|
||||||
|
initialTeamBidPointAmount: 1000,
|
||||||
|
manualTopTierAuctionPriorityUserIds: [],
|
||||||
|
maximumBidRoundDurationSeconds: 30,
|
||||||
|
passedAuctionPlayerQueue: [],
|
||||||
|
topTierAuctionPriorityThreshold: 'NONE',
|
||||||
|
}),
|
||||||
|
).toMatchObject({
|
||||||
|
auctionPlayerOrder: [expect.objectContaining({ userId: playerUserId })],
|
||||||
|
auctionTeams: [
|
||||||
|
expect.objectContaining({
|
||||||
|
captainUserId,
|
||||||
|
remainingBidPointAmount: 1000,
|
||||||
|
teamIndex: 1,
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
bidRoundExtensionSeconds: 5,
|
||||||
|
currentAuctionPlayerOrderIndex: 0,
|
||||||
|
currentAuctionRound: 1,
|
||||||
|
initialTeamBidPointAmount: 1000,
|
||||||
|
maximumBidRoundDurationSeconds: 30,
|
||||||
|
passedAuctionPlayerQueue: [],
|
||||||
|
topTierAuctionPriorityThreshold: 'NONE',
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('builds live state patch required by BID Lua', () => {
|
||||||
|
const captainUserId = new mongoose.Types.ObjectId();
|
||||||
|
const playerUserId = new mongoose.Types.ObjectId();
|
||||||
|
|
||||||
|
expect(
|
||||||
|
buildAuctionRedisLiveStatePatchFromStructure({
|
||||||
|
auctionPlayerOrder: [
|
||||||
|
{
|
||||||
|
userId: playerUserId,
|
||||||
|
puuid: 'puuid',
|
||||||
|
gameName: 'Player',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
profileIconId: 1,
|
||||||
|
preferredPositions: [{ position: 'MID', priority: 1 }],
|
||||||
|
tiers: [],
|
||||||
|
tierHistory: [],
|
||||||
|
masteries: [],
|
||||||
|
passCount: 0,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
auctionTeams: [
|
||||||
|
{
|
||||||
|
teamIndex: 2,
|
||||||
|
captainUserId,
|
||||||
|
remainingBidPointAmount: 970,
|
||||||
|
members: [
|
||||||
|
{
|
||||||
|
userId: new mongoose.Types.ObjectId(),
|
||||||
|
assignedPosition: 'ADC',
|
||||||
|
memberAcquisitionBidPointAmount: 30,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
bidRoundExtensionSeconds: 5,
|
||||||
|
currentAuctionPlayerOrderIndex: 0,
|
||||||
|
currentAuctionRound: 1,
|
||||||
|
initialTeamBidPointAmount: 1000,
|
||||||
|
manualTopTierAuctionPriorityUserIds: [],
|
||||||
|
maximumBidRoundDurationSeconds: 30,
|
||||||
|
passedAuctionPlayerQueue: [],
|
||||||
|
topTierAuctionPriorityThreshold: 'NONE',
|
||||||
|
}),
|
||||||
|
).toEqual({
|
||||||
|
bidRoundExtensionSeconds: 5,
|
||||||
|
currentAuctionPlayerOrderIndex: 0,
|
||||||
|
currentBidRoundPlayerUserId: playerUserId.toString(),
|
||||||
|
maximumBidRoundDurationSeconds: 30,
|
||||||
|
'team:2:assignedAuctionTeamMemberCount': 2,
|
||||||
|
'team:2:captainUserId': captainUserId.toString(),
|
||||||
|
'team:2:remainingBidPointAmount': 970,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,96 @@
|
|||||||
|
import type {
|
||||||
|
AuctionPlayerSnapshot,
|
||||||
|
AuctionTeam,
|
||||||
|
AuctionTopTierThreshold,
|
||||||
|
RedisAuctionTeam,
|
||||||
|
} from '../../global/database/schema';
|
||||||
|
import type mongoose from 'mongoose';
|
||||||
|
|
||||||
|
export interface AuctionRedisStructureStateInput {
|
||||||
|
auctionPlayerOrder: AuctionPlayerSnapshot[];
|
||||||
|
auctionTeams: RedisAuctionTeam[];
|
||||||
|
bidRoundExtensionSeconds: number;
|
||||||
|
currentAuctionPlayerOrderIndex: number;
|
||||||
|
currentAuctionRound: number;
|
||||||
|
initialTeamBidPointAmount: number;
|
||||||
|
manualTopTierAuctionPriorityUserIds: mongoose.Types.ObjectId[];
|
||||||
|
maximumBidRoundDurationSeconds: number;
|
||||||
|
passedAuctionPlayerQueue: AuctionPlayerSnapshot[];
|
||||||
|
topTierAuctionPriorityThreshold: AuctionTopTierThreshold;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function convertLegacyAuctionTeamsToRedisTeams(
|
||||||
|
teams: AuctionTeam[],
|
||||||
|
): RedisAuctionTeam[] {
|
||||||
|
return teams.map((team) => ({
|
||||||
|
teamIndex: team.teamIndex,
|
||||||
|
captainUserId: team.captainUserId,
|
||||||
|
remainingBidPointAmount: team.points,
|
||||||
|
members: team.members.map((member) => ({
|
||||||
|
userId: member.userId,
|
||||||
|
assignedPosition: member.assignedPosition,
|
||||||
|
memberAcquisitionBidPointAmount: member.cost,
|
||||||
|
})),
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
export function buildAuctionRedisStructureState(
|
||||||
|
input: AuctionRedisStructureStateInput,
|
||||||
|
): Record<string, unknown> {
|
||||||
|
return {
|
||||||
|
auctionPlayerOrder: input.auctionPlayerOrder,
|
||||||
|
auctionTeams: input.auctionTeams,
|
||||||
|
bidRoundExtensionSeconds: input.bidRoundExtensionSeconds,
|
||||||
|
currentAuctionPlayerOrderIndex: input.currentAuctionPlayerOrderIndex,
|
||||||
|
currentAuctionRound: input.currentAuctionRound,
|
||||||
|
initialTeamBidPointAmount: input.initialTeamBidPointAmount,
|
||||||
|
manualTopTierAuctionPriorityUserIds:
|
||||||
|
input.manualTopTierAuctionPriorityUserIds,
|
||||||
|
maximumBidRoundDurationSeconds: input.maximumBidRoundDurationSeconds,
|
||||||
|
passedAuctionPlayerQueue: input.passedAuctionPlayerQueue,
|
||||||
|
topTierAuctionPriorityThreshold: input.topTierAuctionPriorityThreshold,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function buildAuctionRedisLiveStatePatchFromStructure(
|
||||||
|
input: AuctionRedisStructureStateInput,
|
||||||
|
): Record<string, string | number> {
|
||||||
|
const patch: Record<string, string | number> = {
|
||||||
|
bidRoundExtensionSeconds: input.bidRoundExtensionSeconds,
|
||||||
|
currentAuctionPlayerOrderIndex: input.currentAuctionPlayerOrderIndex,
|
||||||
|
maximumBidRoundDurationSeconds: input.maximumBidRoundDurationSeconds,
|
||||||
|
};
|
||||||
|
|
||||||
|
const currentPlayer =
|
||||||
|
input.auctionPlayerOrder[input.currentAuctionPlayerOrderIndex];
|
||||||
|
if (currentPlayer) {
|
||||||
|
patch.currentBidRoundPlayerUserId = currentPlayer.userId.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const team of input.auctionTeams) {
|
||||||
|
patch[`team:${team.teamIndex}:captainUserId`] =
|
||||||
|
team.captainUserId.toString();
|
||||||
|
patch[`team:${team.teamIndex}:remainingBidPointAmount`] =
|
||||||
|
team.remainingBidPointAmount;
|
||||||
|
patch[`team:${team.teamIndex}:assignedAuctionTeamMemberCount`] =
|
||||||
|
countAuctionTeamMembersIncludingCaptain(team);
|
||||||
|
}
|
||||||
|
|
||||||
|
return patch;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function stringifyAuctionRedisStructureState(
|
||||||
|
input: AuctionRedisStructureStateInput,
|
||||||
|
): string {
|
||||||
|
return JSON.stringify(buildAuctionRedisStructureState(input));
|
||||||
|
}
|
||||||
|
|
||||||
|
function countAuctionTeamMembersIncludingCaptain(
|
||||||
|
team: RedisAuctionTeam,
|
||||||
|
): number {
|
||||||
|
const userIds = new Set<string>([team.captainUserId.toString()]);
|
||||||
|
for (const member of team.members) {
|
||||||
|
userIds.add(member.userId.toString());
|
||||||
|
}
|
||||||
|
return userIds.size;
|
||||||
|
}
|
||||||
@@ -0,0 +1,205 @@
|
|||||||
|
import { AuctionRedisService } from './auction-redis.service';
|
||||||
|
import { AuctionRedisStateReaderService } from './auction-redis-state-reader.service';
|
||||||
|
|
||||||
|
function makeService(
|
||||||
|
commandReplies: unknown[],
|
||||||
|
currentServerTimestampMS = 1000,
|
||||||
|
) {
|
||||||
|
const sendCommand = jest
|
||||||
|
.fn()
|
||||||
|
.mockImplementation((command: string[]) =>
|
||||||
|
Promise.resolve(
|
||||||
|
command[0] === 'EVAL'
|
||||||
|
? [currentServerTimestampMS, ...commandReplies.splice(0, 3)]
|
||||||
|
: commandReplies.shift(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
const auctionRedisService = {
|
||||||
|
getCurrentRedisTimestampMS: jest
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValue(currentServerTimestampMS),
|
||||||
|
raw: jest.fn().mockReturnValue({ sendCommand }),
|
||||||
|
} as unknown as jest.Mocked<AuctionRedisService>;
|
||||||
|
|
||||||
|
return {
|
||||||
|
auctionRedisService,
|
||||||
|
sendCommand,
|
||||||
|
service: new AuctionRedisStateReaderService(auctionRedisService),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('AuctionRedisStateReaderService', () => {
|
||||||
|
it('reads live state identity', async () => {
|
||||||
|
const { service, sendCommand } = makeService([['life-1', '7']]);
|
||||||
|
|
||||||
|
await expect(service.readLiveStateIdentity('match-1')).resolves.toEqual({
|
||||||
|
auctionLifecycleId: 'life-1',
|
||||||
|
revision: 7,
|
||||||
|
});
|
||||||
|
expect(sendCommand).toHaveBeenCalledWith([
|
||||||
|
'HMGET',
|
||||||
|
'auction:match-1:liveAuctionState',
|
||||||
|
'auctionLifecycleId',
|
||||||
|
'revision',
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns null when live state identity is missing', async () => {
|
||||||
|
const { service } = makeService([[null, null]]);
|
||||||
|
|
||||||
|
await expect(service.readLiveStateIdentity('match-1')).resolves.toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('reads bid context from the live state hot path fields', async () => {
|
||||||
|
const { service, sendCommand } = makeService([
|
||||||
|
['bidding', 'life-1', 'player-1', 'captain-2'],
|
||||||
|
]);
|
||||||
|
|
||||||
|
await expect(service.readBidContext('match-1', 2)).resolves.toEqual({
|
||||||
|
auctionLifecycleId: 'life-1',
|
||||||
|
bidderTeamCaptainUserId: 'captain-2',
|
||||||
|
currentBidRoundPlayerUserId: 'player-1',
|
||||||
|
phase: 'bidding',
|
||||||
|
});
|
||||||
|
expect(sendCommand).toHaveBeenCalledTimes(1);
|
||||||
|
expect(sendCommand).toHaveBeenCalledWith([
|
||||||
|
'HMGET',
|
||||||
|
'auction:match-1:liveAuctionState',
|
||||||
|
'phase',
|
||||||
|
'auctionLifecycleId',
|
||||||
|
'currentBidRoundPlayerUserId',
|
||||||
|
'team:2:captainUserId',
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('falls back to structure state when bid context has no live captain field', async () => {
|
||||||
|
const { service, sendCommand } = makeService([
|
||||||
|
['bidding', 'life-1', 'player-1', null],
|
||||||
|
'{"auctionTeams":[{"teamIndex":2,"captainUserId":"captain-2"}]}',
|
||||||
|
]);
|
||||||
|
|
||||||
|
await expect(service.readBidContext('match-1', 2)).resolves.toEqual({
|
||||||
|
auctionLifecycleId: 'life-1',
|
||||||
|
bidderTeamCaptainUserId: 'captain-2',
|
||||||
|
currentBidRoundPlayerUserId: 'player-1',
|
||||||
|
phase: 'bidding',
|
||||||
|
});
|
||||||
|
expect(sendCommand).toHaveBeenNthCalledWith(2, [
|
||||||
|
'GET',
|
||||||
|
'auction:match-1:auctionStructureState',
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('assembles a public auction view from Redis state', async () => {
|
||||||
|
const { service, sendCommand } = makeService([
|
||||||
|
[
|
||||||
|
'auctionLifecycleId',
|
||||||
|
'life-1',
|
||||||
|
'phase',
|
||||||
|
'expiring',
|
||||||
|
'revision',
|
||||||
|
'8',
|
||||||
|
'currentHighestBidPointAmount',
|
||||||
|
'100',
|
||||||
|
'currentHighestBidderTeamIndex',
|
||||||
|
'2',
|
||||||
|
'team:2:remainingBidPointAmount',
|
||||||
|
'900',
|
||||||
|
'bidRoundExpiryDecision',
|
||||||
|
'sold',
|
||||||
|
],
|
||||||
|
'{"auctionTeams":[{"teamIndex":1}]}',
|
||||||
|
['{"bidPointAmount":100,"bidderTeamIndex":2}'],
|
||||||
|
]);
|
||||||
|
|
||||||
|
const view = await service.readAuctionStateView('match-1', {
|
||||||
|
shouldForceAuctionStateResync: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(view).toMatchObject({
|
||||||
|
auctionBidHistory: [{ bidPointAmount: 100, bidderTeamIndex: 2 }],
|
||||||
|
auctionLifecycleId: 'life-1',
|
||||||
|
auctionTeams: [{ teamIndex: 1 }],
|
||||||
|
canPlaceBidInCurrentBidRound: false,
|
||||||
|
currentHighestBidderTeamIndex: 2,
|
||||||
|
currentHighestBidPointAmount: 100,
|
||||||
|
currentServerTimestampMS: 1000,
|
||||||
|
isAuctionStateTransitionInProgress: true,
|
||||||
|
phase: 'bidding',
|
||||||
|
revision: 8,
|
||||||
|
shouldForceAuctionStateResync: true,
|
||||||
|
});
|
||||||
|
expect(view).not.toHaveProperty('team:2:remainingBidPointAmount');
|
||||||
|
expect(view).not.toHaveProperty('bidRoundExpiryDecision');
|
||||||
|
expect(sendCommand).toHaveBeenCalledTimes(1);
|
||||||
|
expect(sendCommand).toHaveBeenCalledWith([
|
||||||
|
'EVAL',
|
||||||
|
expect.stringContaining("redis.call('TIME')"),
|
||||||
|
'3',
|
||||||
|
'auction:match-1:liveAuctionState',
|
||||||
|
'auction:match-1:auctionStructureState',
|
||||||
|
'auction:match-1:auctionBidHistory',
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('assembles state when HGETALL returns an object', async () => {
|
||||||
|
const { service } = makeService([
|
||||||
|
{
|
||||||
|
auctionLifecycleId: 'life-1',
|
||||||
|
phase: 'presenting',
|
||||||
|
revision: '3',
|
||||||
|
},
|
||||||
|
'{"auctionTeams":[]}',
|
||||||
|
[],
|
||||||
|
]);
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.readAuctionStateView('match-1'),
|
||||||
|
).resolves.toMatchObject({
|
||||||
|
auctionLifecycleId: 'life-1',
|
||||||
|
auctionTeams: [],
|
||||||
|
phase: 'presenting',
|
||||||
|
revision: 3,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('can expose internal live fields for server-side expiry completion', async () => {
|
||||||
|
const { service } = makeService([
|
||||||
|
{
|
||||||
|
auctionLifecycleId: 'life-1',
|
||||||
|
bidRoundExpiryDecision: 'sold',
|
||||||
|
phase: 'expiring',
|
||||||
|
revision: '4',
|
||||||
|
'team:1:remainingBidPointAmount': '900',
|
||||||
|
},
|
||||||
|
'{"auctionTeams":[]}',
|
||||||
|
[],
|
||||||
|
]);
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.readAuctionStateView('match-1', {
|
||||||
|
includeInternalLiveStateFields: true,
|
||||||
|
}),
|
||||||
|
).resolves.toMatchObject({
|
||||||
|
bidRoundExpiryDecision: 'sold',
|
||||||
|
redisInternalPhase: 'expiring',
|
||||||
|
'team:1:remainingBidPointAmount': '900',
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns null when live or structure state is absent', async () => {
|
||||||
|
await expect(
|
||||||
|
makeService([[], '{"auctionTeams":[]}', []]).service.readAuctionStateView(
|
||||||
|
'match-1',
|
||||||
|
),
|
||||||
|
).resolves.toBeNull();
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
makeService([
|
||||||
|
{ auctionLifecycleId: 'life-1', phase: 'presenting', revision: '1' },
|
||||||
|
null,
|
||||||
|
[],
|
||||||
|
]).service.readAuctionStateView('match-1'),
|
||||||
|
).resolves.toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,238 @@
|
|||||||
|
import { Injectable } from '@nestjs/common';
|
||||||
|
import { buildAuctionRedisKeys } from './auction-redis.keys';
|
||||||
|
import { AuctionRedisService } from './auction-redis.service';
|
||||||
|
import { assembleAuctionViewFromRedisState } from './auction-redis.state';
|
||||||
|
|
||||||
|
const NUMERIC_LIVE_STATE_FIELDS = new Set([
|
||||||
|
'bidRoundExpiryPlayerOrderIndex',
|
||||||
|
'bidRoundExpiryRevision',
|
||||||
|
'bidRoundExpiryWinningBidPointAmount',
|
||||||
|
'bidRoundExpiryWinningBidderTeamIndex',
|
||||||
|
'currentAuctionHistorySequence',
|
||||||
|
'currentAuctionPlayerOrderIndex',
|
||||||
|
'currentBidRoundDeadlineTimestampMS',
|
||||||
|
'currentHighestBidPointAmount',
|
||||||
|
'currentHighestBidderTeamIndex',
|
||||||
|
'matchSideEffectRevision',
|
||||||
|
'revision',
|
||||||
|
]);
|
||||||
|
|
||||||
|
export interface AuctionRedisLiveStateIdentity {
|
||||||
|
auctionLifecycleId?: string;
|
||||||
|
revision?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AuctionRedisBidContext {
|
||||||
|
auctionLifecycleId: string;
|
||||||
|
bidderTeamCaptainUserId?: string;
|
||||||
|
currentBidRoundPlayerUserId?: string;
|
||||||
|
phase: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AuctionRedisStateViewReadOptions {
|
||||||
|
includeInternalLiveStateFields?: boolean;
|
||||||
|
shouldForceAuctionStateResync?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class AuctionRedisStateReaderService {
|
||||||
|
constructor(private readonly auctionRedisService: AuctionRedisService) {}
|
||||||
|
|
||||||
|
public async readLiveStateIdentity(
|
||||||
|
matchId: string,
|
||||||
|
): Promise<AuctionRedisLiveStateIdentity | null> {
|
||||||
|
const keys = buildAuctionRedisKeys(matchId);
|
||||||
|
const reply = await this.auctionRedisService
|
||||||
|
.raw()
|
||||||
|
.sendCommand([
|
||||||
|
'HMGET',
|
||||||
|
keys.liveStateKey,
|
||||||
|
'auctionLifecycleId',
|
||||||
|
'revision',
|
||||||
|
]);
|
||||||
|
if (!Array.isArray(reply)) return null;
|
||||||
|
const auctionLifecycleId =
|
||||||
|
typeof reply[0] === 'string' && reply[0] ? reply[0] : undefined;
|
||||||
|
const revision =
|
||||||
|
typeof reply[1] === 'string' || typeof reply[1] === 'number'
|
||||||
|
? Number(reply[1])
|
||||||
|
: Number.NaN;
|
||||||
|
if (!auctionLifecycleId && !Number.isFinite(revision)) return null;
|
||||||
|
return {
|
||||||
|
auctionLifecycleId,
|
||||||
|
revision: Number.isFinite(revision) ? revision : undefined,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public async readBidContext(
|
||||||
|
matchId: string,
|
||||||
|
bidderTeamIndex: number,
|
||||||
|
): Promise<AuctionRedisBidContext | null> {
|
||||||
|
const keys = buildAuctionRedisKeys(matchId);
|
||||||
|
const bidderTeamCaptainUserIdField = `team:${bidderTeamIndex}:captainUserId`;
|
||||||
|
const liveReply = await this.auctionRedisService
|
||||||
|
.raw()
|
||||||
|
.sendCommand([
|
||||||
|
'HMGET',
|
||||||
|
keys.liveStateKey,
|
||||||
|
'phase',
|
||||||
|
'auctionLifecycleId',
|
||||||
|
'currentBidRoundPlayerUserId',
|
||||||
|
bidderTeamCaptainUserIdField,
|
||||||
|
]);
|
||||||
|
if (!Array.isArray(liveReply)) return null;
|
||||||
|
|
||||||
|
const phase = stringValue(liveReply[0]);
|
||||||
|
const auctionLifecycleId = stringValue(liveReply[1]);
|
||||||
|
const currentBidRoundPlayerUserId = stringValue(liveReply[2]);
|
||||||
|
const liveCaptainUserId = stringValue(liveReply[3]);
|
||||||
|
if (!phase || !auctionLifecycleId) return null;
|
||||||
|
|
||||||
|
return {
|
||||||
|
auctionLifecycleId,
|
||||||
|
bidderTeamCaptainUserId:
|
||||||
|
liveCaptainUserId ??
|
||||||
|
(await this.readBidderTeamCaptainUserIdFromStructure(
|
||||||
|
keys.structureStateKey,
|
||||||
|
bidderTeamIndex,
|
||||||
|
)),
|
||||||
|
currentBidRoundPlayerUserId,
|
||||||
|
phase,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public async readAuctionStateView(
|
||||||
|
matchId: string,
|
||||||
|
options: AuctionRedisStateViewReadOptions = {},
|
||||||
|
): Promise<Record<string, unknown> | null> {
|
||||||
|
const keys = buildAuctionRedisKeys(matchId);
|
||||||
|
const [
|
||||||
|
currentServerTimestampMS,
|
||||||
|
liveReply,
|
||||||
|
structureStateJson,
|
||||||
|
bidEntries,
|
||||||
|
] = await this.auctionRedisService
|
||||||
|
.raw()
|
||||||
|
.sendCommand<
|
||||||
|
unknown[]
|
||||||
|
>(['EVAL', ["local now = redis.call('TIME')", 'local timestamp = tonumber(now[1]) * 1000 + math.floor(tonumber(now[2]) / 1000)', "return {tostring(timestamp), redis.call('HGETALL', KEYS[1]), redis.call('GET', KEYS[2]), redis.call('LRANGE', KEYS[3], 0, -1)}"].join('\n'), '3', keys.liveStateKey, keys.structureStateKey, keys.bidHistoryKey]);
|
||||||
|
|
||||||
|
const liveState = parseHashReply(liveReply, {
|
||||||
|
includeInternalLiveStateFields:
|
||||||
|
options.includeInternalLiveStateFields ?? false,
|
||||||
|
});
|
||||||
|
if (!liveState) return null;
|
||||||
|
if (
|
||||||
|
typeof liveState.auctionLifecycleId !== 'string' ||
|
||||||
|
typeof liveState.phase !== 'string' ||
|
||||||
|
typeof liveState.revision !== 'number'
|
||||||
|
) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (typeof structureStateJson !== 'string' || !structureStateJson) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const view = assembleAuctionViewFromRedisState({
|
||||||
|
auctionBidHistoryEntries: Array.isArray(bidEntries)
|
||||||
|
? bidEntries.map(String)
|
||||||
|
: [],
|
||||||
|
currentServerTimestampMS: Number(currentServerTimestampMS),
|
||||||
|
liveState: liveState as Record<string, unknown> & {
|
||||||
|
auctionLifecycleId: string;
|
||||||
|
phase: string;
|
||||||
|
revision: number;
|
||||||
|
},
|
||||||
|
shouldForceAuctionStateResync: options.shouldForceAuctionStateResync,
|
||||||
|
structureState: parseJsonRecord(structureStateJson),
|
||||||
|
});
|
||||||
|
view.matchId = matchId;
|
||||||
|
if (options.includeInternalLiveStateFields) {
|
||||||
|
view.redisInternalPhase = liveState.phase;
|
||||||
|
}
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async readBidderTeamCaptainUserIdFromStructure(
|
||||||
|
structureStateKey: string,
|
||||||
|
bidderTeamIndex: number,
|
||||||
|
): Promise<string | undefined> {
|
||||||
|
const structureStateJson = await this.auctionRedisService
|
||||||
|
.raw()
|
||||||
|
.sendCommand(['GET', structureStateKey]);
|
||||||
|
if (typeof structureStateJson !== 'string' || !structureStateJson) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
const structureState = parseJsonRecord(structureStateJson);
|
||||||
|
const auctionTeams: unknown[] = Array.isArray(structureState.auctionTeams)
|
||||||
|
? (structureState.auctionTeams as unknown[])
|
||||||
|
: [];
|
||||||
|
const bidderTeam = auctionTeams.find((entry) => {
|
||||||
|
if (!entry || typeof entry !== 'object') return false;
|
||||||
|
return (
|
||||||
|
Number((entry as Record<string, unknown>).teamIndex) === bidderTeamIndex
|
||||||
|
);
|
||||||
|
});
|
||||||
|
if (!bidderTeam || typeof bidderTeam !== 'object') return undefined;
|
||||||
|
return stringValue((bidderTeam as Record<string, unknown>).captainUserId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function stringValue(value: unknown): string | undefined {
|
||||||
|
return typeof value === 'string' && value ? value : undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseJsonRecord(json: string): Record<string, unknown> {
|
||||||
|
const value: unknown = JSON.parse(json);
|
||||||
|
return typeof value === 'object' && value !== null
|
||||||
|
? (value as Record<string, unknown>)
|
||||||
|
: {};
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseHashReply(
|
||||||
|
reply: unknown,
|
||||||
|
options: { includeInternalLiveStateFields?: boolean } = {},
|
||||||
|
): Record<string, unknown> | null {
|
||||||
|
if (!reply) return null;
|
||||||
|
if (Array.isArray(reply)) {
|
||||||
|
if (reply.length === 0) return null;
|
||||||
|
const entries: [string, unknown][] = [];
|
||||||
|
for (let index = 0; index < reply.length; index += 2) {
|
||||||
|
entries.push([String(reply[index]), reply[index + 1]]);
|
||||||
|
}
|
||||||
|
return parseHashEntries(entries, options);
|
||||||
|
}
|
||||||
|
if (typeof reply === 'object') {
|
||||||
|
const entries = Object.entries(reply as Record<string, unknown>);
|
||||||
|
if (entries.length === 0) return null;
|
||||||
|
return parseHashEntries(entries, options);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseHashEntries(
|
||||||
|
entries: [string, unknown][],
|
||||||
|
options: { includeInternalLiveStateFields?: boolean } = {},
|
||||||
|
): Record<string, unknown> {
|
||||||
|
const result: Record<string, unknown> = {};
|
||||||
|
for (const [field, rawValue] of entries) {
|
||||||
|
if (
|
||||||
|
!options.includeInternalLiveStateFields &&
|
||||||
|
isInternalLiveStateField(field)
|
||||||
|
) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const value = String(rawValue);
|
||||||
|
if (NUMERIC_LIVE_STATE_FIELDS.has(field)) {
|
||||||
|
const parsed = Number(value);
|
||||||
|
result[field] = Number.isFinite(parsed) ? parsed : 0;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
result[field] = value;
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
function isInternalLiveStateField(field: string): boolean {
|
||||||
|
return field.startsWith('team:') || field.startsWith('bidRoundExpiry');
|
||||||
|
}
|
||||||
@@ -0,0 +1,112 @@
|
|||||||
|
import { buildAuctionRedisKeys } from './auction-redis.keys';
|
||||||
|
import {
|
||||||
|
AUCTION_APPLY_TRANSITION_SCRIPT,
|
||||||
|
buildAuctionApplyTransitionScriptInvocation,
|
||||||
|
} from './auction-redis.apply-transition';
|
||||||
|
|
||||||
|
describe('auction apply transition redis script contract', () => {
|
||||||
|
it('builds APPLY_TRANSITION keys and values in a stable order', () => {
|
||||||
|
const keys = buildAuctionRedisKeys('match-1');
|
||||||
|
const invocation = buildAuctionApplyTransitionScriptInvocation(keys, {
|
||||||
|
actionRequest: {
|
||||||
|
observedProcessingLeaseVersion: 3,
|
||||||
|
processingOwnerToken: 'owner-1',
|
||||||
|
scopeKey: 'life-1:request-1',
|
||||||
|
},
|
||||||
|
afterAuctionStructureStateJson: '{"auctionTeams":[]}',
|
||||||
|
auctionHistorySequence: 4,
|
||||||
|
auctionLifecycleId: 'life-1',
|
||||||
|
auctionStateTransitionId: 'transition-1',
|
||||||
|
broadcastStateRevision: 9,
|
||||||
|
deadline: { durationSeconds: 30, mode: 'set-relative' },
|
||||||
|
durabilityPayloadJson: '{"revision":9}',
|
||||||
|
expectedCurrentAuctionPlayerOrderIndex: 2,
|
||||||
|
expectedCurrentBidRoundPlayerUserId: 'player-1',
|
||||||
|
expectedAuctionHistorySequence: 3,
|
||||||
|
expectedPhase: 'bidding',
|
||||||
|
expectedRevision: 8,
|
||||||
|
liveStatePatch: {
|
||||||
|
currentAuctionHistorySequence: 4,
|
||||||
|
phase: 'sold',
|
||||||
|
},
|
||||||
|
matchId: 'match-1',
|
||||||
|
shouldBroadcastState: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(invocation.script).toBe(AUCTION_APPLY_TRANSITION_SCRIPT);
|
||||||
|
expect(invocation.keys).toEqual([
|
||||||
|
'auction:match-1:liveAuctionState',
|
||||||
|
'auction:match-1:auctionStructureState',
|
||||||
|
'auction:match-1:appliedAuctionStateTransitionIds',
|
||||||
|
'auction:match-1:durability:transition-1',
|
||||||
|
'auction:auctionDurabilityRetryQueue',
|
||||||
|
'auction:match-1:auctionActionRequestResults',
|
||||||
|
'auction:match-1:auctionActionRequestResultOrder',
|
||||||
|
'auction:match-1:auctionBidHistory',
|
||||||
|
'auction:match-1:bidRequestResults',
|
||||||
|
'auction:match-1:bidRequestResultOrder',
|
||||||
|
'auction:bidRoundDeadlineQueue',
|
||||||
|
'auction:match-1:rejectedBidRequestResultOrder',
|
||||||
|
]);
|
||||||
|
expect(invocation.values.slice(0, 19)).toEqual([
|
||||||
|
'match-1',
|
||||||
|
'life-1',
|
||||||
|
'transition-1',
|
||||||
|
'8',
|
||||||
|
'3',
|
||||||
|
'bidding',
|
||||||
|
'player-1',
|
||||||
|
'2',
|
||||||
|
'{"auctionTeams":[]}',
|
||||||
|
'4',
|
||||||
|
'{"revision":9}',
|
||||||
|
'1',
|
||||||
|
'9',
|
||||||
|
'set-relative',
|
||||||
|
'30',
|
||||||
|
'0',
|
||||||
|
'life-1:request-1',
|
||||||
|
'owner-1',
|
||||||
|
'3',
|
||||||
|
]);
|
||||||
|
expect(invocation.values.slice(19)).toEqual([
|
||||||
|
'2',
|
||||||
|
'currentAuctionHistorySequence',
|
||||||
|
'4',
|
||||||
|
'phase',
|
||||||
|
'sold',
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps critical atomicity guards in Lua', () => {
|
||||||
|
expect(AUCTION_APPLY_TRANSITION_SCRIPT.lua).toContain("redis.call('TIME')");
|
||||||
|
expect(AUCTION_APPLY_TRANSITION_SCRIPT.lua).toContain(
|
||||||
|
'ACTION_REQUEST_LEASE_VERSION_MISMATCH',
|
||||||
|
);
|
||||||
|
expect(AUCTION_APPLY_TRANSITION_SCRIPT.lua).toContain(
|
||||||
|
'ACTION_REQUEST_TRANSITION_MISMATCH',
|
||||||
|
);
|
||||||
|
expect(AUCTION_APPLY_TRANSITION_SCRIPT.lua).toContain(
|
||||||
|
'INVALID_PATCH_ARITY',
|
||||||
|
);
|
||||||
|
expect(AUCTION_APPLY_TRANSITION_SCRIPT.lua).toContain(
|
||||||
|
'shouldBroadcastState',
|
||||||
|
);
|
||||||
|
expect(AUCTION_APPLY_TRANSITION_SCRIPT.lua).toContain("redis.call('SADD'");
|
||||||
|
expect(AUCTION_APPLY_TRANSITION_SCRIPT.lua).toContain(
|
||||||
|
"redis.call('HINCRBY'",
|
||||||
|
);
|
||||||
|
expect(AUCTION_APPLY_TRANSITION_SCRIPT.lua).toContain(
|
||||||
|
'currentAuctionHistorySequence',
|
||||||
|
);
|
||||||
|
expect(AUCTION_APPLY_TRANSITION_SCRIPT.lua).toContain(
|
||||||
|
'storeValidatedActionRequestRejection',
|
||||||
|
);
|
||||||
|
expect(AUCTION_APPLY_TRANSITION_SCRIPT.lua).toContain(
|
||||||
|
"actionRequestPrefix .. 'status'",
|
||||||
|
);
|
||||||
|
expect(AUCTION_APPLY_TRANSITION_SCRIPT.lua).toContain(
|
||||||
|
"actionRequestPrefix .. 'requiresRefetch'",
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,340 @@
|
|||||||
|
import type { AuctionRedisKeys } from './auction-redis.keys';
|
||||||
|
import { defineAuctionRedisScript } from './auction-redis.scripts';
|
||||||
|
|
||||||
|
export type ApplyTransitionDeadlineInput =
|
||||||
|
| { mode: 'none' }
|
||||||
|
| { mode: 'remove' }
|
||||||
|
| { durationSeconds: number; mode: 'set-relative' };
|
||||||
|
|
||||||
|
export interface ApplyTransitionActionRequestInput {
|
||||||
|
observedProcessingLeaseVersion: number;
|
||||||
|
processingOwnerToken: string;
|
||||||
|
scopeKey: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AuctionApplyTransitionScriptInput {
|
||||||
|
actionRequest?: ApplyTransitionActionRequestInput;
|
||||||
|
afterAuctionStructureStateJson: string;
|
||||||
|
auctionHistorySequence: number;
|
||||||
|
auctionLifecycleId: string;
|
||||||
|
auctionStateTransitionId: string;
|
||||||
|
broadcastStateRevision: number;
|
||||||
|
deadline: ApplyTransitionDeadlineInput;
|
||||||
|
durabilityPayloadJson: string;
|
||||||
|
expectedCurrentAuctionPlayerOrderIndex?: number;
|
||||||
|
expectedCurrentBidRoundPlayerUserId?: string;
|
||||||
|
expectedAuctionHistorySequence?: number;
|
||||||
|
expectedPhase: string;
|
||||||
|
expectedRevision: number;
|
||||||
|
liveStatePatch: Record<string, string | number | boolean | null | undefined>;
|
||||||
|
matchId: string;
|
||||||
|
shouldBroadcastState: boolean;
|
||||||
|
shouldResetBidRuntime?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AuctionApplyTransitionScriptInvocation {
|
||||||
|
keys: string[];
|
||||||
|
script: typeof AUCTION_APPLY_TRANSITION_SCRIPT;
|
||||||
|
values: string[];
|
||||||
|
}
|
||||||
|
|
||||||
|
function stringifyRedisValue(value: string | number | boolean | null): string {
|
||||||
|
if (typeof value === 'boolean') return value ? '1' : '0';
|
||||||
|
if (value === null) return '';
|
||||||
|
return String(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
function flattenLiveStatePatch(
|
||||||
|
liveStatePatch: AuctionApplyTransitionScriptInput['liveStatePatch'],
|
||||||
|
): string[] {
|
||||||
|
return Object.entries(liveStatePatch)
|
||||||
|
.filter(([, value]) => value !== undefined)
|
||||||
|
.sort(([a], [b]) => a.localeCompare(b))
|
||||||
|
.flatMap(([key, value]) => [
|
||||||
|
key,
|
||||||
|
stringifyRedisValue(value as string | number | boolean | null),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function buildAuctionApplyTransitionScriptInvocation(
|
||||||
|
keys: AuctionRedisKeys,
|
||||||
|
input: AuctionApplyTransitionScriptInput,
|
||||||
|
): AuctionApplyTransitionScriptInvocation {
|
||||||
|
const liveStatePatchPairs = flattenLiveStatePatch(input.liveStatePatch);
|
||||||
|
const deadlineDurationSeconds =
|
||||||
|
input.deadline.mode === 'set-relative'
|
||||||
|
? String(input.deadline.durationSeconds)
|
||||||
|
: '0';
|
||||||
|
|
||||||
|
return {
|
||||||
|
keys: [
|
||||||
|
keys.liveStateKey,
|
||||||
|
keys.structureStateKey,
|
||||||
|
keys.appliedTransitionIdsKey,
|
||||||
|
keys.durabilityPayloadKey(input.auctionStateTransitionId),
|
||||||
|
keys.durabilityRetryQueueKey,
|
||||||
|
keys.actionRequestResultsKey,
|
||||||
|
keys.actionRequestResultOrderKey,
|
||||||
|
keys.bidHistoryKey,
|
||||||
|
keys.bidRequestResultsKey,
|
||||||
|
keys.bidRequestResultOrderKey,
|
||||||
|
keys.deadlineQueueKey,
|
||||||
|
keys.rejectedBidRequestResultOrderKey,
|
||||||
|
],
|
||||||
|
script: AUCTION_APPLY_TRANSITION_SCRIPT,
|
||||||
|
values: [
|
||||||
|
input.matchId,
|
||||||
|
input.auctionLifecycleId,
|
||||||
|
input.auctionStateTransitionId,
|
||||||
|
String(input.expectedRevision),
|
||||||
|
String(
|
||||||
|
input.expectedAuctionHistorySequence ??
|
||||||
|
input.auctionHistorySequence - 1,
|
||||||
|
),
|
||||||
|
input.expectedPhase,
|
||||||
|
input.expectedCurrentBidRoundPlayerUserId ?? '',
|
||||||
|
input.expectedCurrentAuctionPlayerOrderIndex === undefined
|
||||||
|
? ''
|
||||||
|
: String(input.expectedCurrentAuctionPlayerOrderIndex),
|
||||||
|
input.afterAuctionStructureStateJson,
|
||||||
|
String(input.auctionHistorySequence),
|
||||||
|
input.durabilityPayloadJson,
|
||||||
|
input.shouldBroadcastState ? '1' : '0',
|
||||||
|
String(input.broadcastStateRevision),
|
||||||
|
input.deadline.mode,
|
||||||
|
deadlineDurationSeconds,
|
||||||
|
input.shouldResetBidRuntime ? '1' : '0',
|
||||||
|
input.actionRequest?.scopeKey ?? '',
|
||||||
|
input.actionRequest?.processingOwnerToken ?? '',
|
||||||
|
input.actionRequest?.observedProcessingLeaseVersion === undefined
|
||||||
|
? ''
|
||||||
|
: String(input.actionRequest.observedProcessingLeaseVersion),
|
||||||
|
String(liveStatePatchPairs.length / 2),
|
||||||
|
...liveStatePatchPairs,
|
||||||
|
],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export const AUCTION_APPLY_TRANSITION_SCRIPT = defineAuctionRedisScript(
|
||||||
|
'auction.applyTransition',
|
||||||
|
`
|
||||||
|
local liveAuctionStateKey = KEYS[1]
|
||||||
|
local auctionStructureStateKey = KEYS[2]
|
||||||
|
local appliedAuctionStateTransitionIdsKey = KEYS[3]
|
||||||
|
local durabilityPayloadKey = KEYS[4]
|
||||||
|
local durabilityRetryQueueKey = KEYS[5]
|
||||||
|
local auctionActionRequestResultsKey = KEYS[6]
|
||||||
|
local auctionActionRequestResultOrderKey = KEYS[7]
|
||||||
|
local auctionBidHistoryKey = KEYS[8]
|
||||||
|
local bidRequestResultsKey = KEYS[9]
|
||||||
|
local bidRequestResultOrderKey = KEYS[10]
|
||||||
|
local bidRoundDeadlineQueueKey = KEYS[11]
|
||||||
|
local rejectedBidRequestResultOrderKey = KEYS[12]
|
||||||
|
|
||||||
|
local matchId = ARGV[1]
|
||||||
|
local auctionLifecycleId = ARGV[2]
|
||||||
|
local auctionStateTransitionId = ARGV[3]
|
||||||
|
local expectedRevision = tonumber(ARGV[4])
|
||||||
|
local expectedAuctionHistorySequence = tonumber(ARGV[5])
|
||||||
|
local expectedPhase = ARGV[6]
|
||||||
|
local expectedCurrentBidRoundPlayerUserId = ARGV[7]
|
||||||
|
local expectedCurrentAuctionPlayerOrderIndex = ARGV[8]
|
||||||
|
local afterAuctionStructureStateJson = ARGV[9]
|
||||||
|
local auctionHistorySequence = tonumber(ARGV[10])
|
||||||
|
local durabilityPayloadJson = ARGV[11]
|
||||||
|
local shouldBroadcastState = ARGV[12]
|
||||||
|
local broadcastStateRevision = tonumber(ARGV[13])
|
||||||
|
local deadlineMode = ARGV[14]
|
||||||
|
local deadlineDurationSeconds = tonumber(ARGV[15])
|
||||||
|
local shouldResetBidRuntime = ARGV[16]
|
||||||
|
local actionRequestScopeKey = ARGV[17]
|
||||||
|
local processingOwnerToken = ARGV[18]
|
||||||
|
local observedProcessingLeaseVersion = ARGV[19]
|
||||||
|
local liveStatePatchPairCount = tonumber(ARGV[20])
|
||||||
|
|
||||||
|
local redisTime = redis.call('TIME')
|
||||||
|
local currentRedisTimestampMS = (tonumber(redisTime[1]) * 1000) + math.floor(tonumber(redisTime[2]) / 1000)
|
||||||
|
local validatedActionRequestScopeKey = ''
|
||||||
|
|
||||||
|
local function storeValidatedActionRequestRejection(code)
|
||||||
|
if validatedActionRequestScopeKey == '' then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
local actionRequestPrefix = validatedActionRequestScopeKey .. ':'
|
||||||
|
redis.call(
|
||||||
|
'HSET',
|
||||||
|
auctionActionRequestResultsKey,
|
||||||
|
actionRequestPrefix .. 'status',
|
||||||
|
'rejected',
|
||||||
|
actionRequestPrefix .. 'rejectCode',
|
||||||
|
code,
|
||||||
|
actionRequestPrefix .. 'requiresRefetch',
|
||||||
|
'1',
|
||||||
|
actionRequestPrefix .. 'responseServerTimestampMS',
|
||||||
|
tostring(currentRedisTimestampMS)
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
local function reject(code)
|
||||||
|
storeValidatedActionRequestRejection(code)
|
||||||
|
return {'REJECTED', code, auctionStateTransitionId, tostring(currentRedisTimestampMS)}
|
||||||
|
end
|
||||||
|
|
||||||
|
if not liveStatePatchPairCount then
|
||||||
|
return reject('INVALID_PATCH_ARITY')
|
||||||
|
end
|
||||||
|
if #ARGV ~= 20 + (liveStatePatchPairCount * 2) then
|
||||||
|
return reject('INVALID_PATCH_ARITY')
|
||||||
|
end
|
||||||
|
if not durabilityPayloadJson or durabilityPayloadJson == '' then
|
||||||
|
return reject('MISSING_DURABILITY_PAYLOAD')
|
||||||
|
end
|
||||||
|
if shouldBroadcastState ~= '0' and shouldBroadcastState ~= '1' then
|
||||||
|
return reject('INVALID_SHOULD_BROADCAST_STATE')
|
||||||
|
end
|
||||||
|
if shouldBroadcastState == '1' and not broadcastStateRevision then
|
||||||
|
return reject('INVALID_BROADCAST_STATE_REVISION')
|
||||||
|
end
|
||||||
|
if deadlineMode ~= 'none' and deadlineMode ~= 'remove' and deadlineMode ~= 'set-relative' then
|
||||||
|
return reject('INVALID_DEADLINE_MODE')
|
||||||
|
end
|
||||||
|
if deadlineMode == 'set-relative' and (not deadlineDurationSeconds or deadlineDurationSeconds <= 0) then
|
||||||
|
return reject('INVALID_DEADLINE_DURATION')
|
||||||
|
end
|
||||||
|
|
||||||
|
if actionRequestScopeKey ~= '' then
|
||||||
|
local actionRequestPrefix = actionRequestScopeKey .. ':'
|
||||||
|
local storedTransitionId = redis.call('HGET', auctionActionRequestResultsKey, actionRequestPrefix .. 'auctionStateTransitionId')
|
||||||
|
if not storedTransitionId then
|
||||||
|
return reject('ACTION_REQUEST_NOT_RESERVED')
|
||||||
|
end
|
||||||
|
if storedTransitionId ~= auctionStateTransitionId then
|
||||||
|
return reject('ACTION_REQUEST_TRANSITION_MISMATCH')
|
||||||
|
end
|
||||||
|
local storedOwnerToken = redis.call('HGET', auctionActionRequestResultsKey, actionRequestPrefix .. 'processingOwnerToken')
|
||||||
|
local leaseExpiresAtTimestampMS = tonumber(redis.call('HGET', auctionActionRequestResultsKey, actionRequestPrefix .. 'processingLeaseExpiresAtTimestampMS') or '0')
|
||||||
|
if leaseExpiresAtTimestampMS <= currentRedisTimestampMS then
|
||||||
|
return reject('ACTION_REQUEST_LEASE_EXPIRED')
|
||||||
|
end
|
||||||
|
if storedOwnerToken ~= processingOwnerToken then
|
||||||
|
return reject('ACTION_REQUEST_IN_PROGRESS')
|
||||||
|
end
|
||||||
|
local storedLeaseVersion = redis.call('HGET', auctionActionRequestResultsKey, actionRequestPrefix .. 'processingLeaseVersion') or ''
|
||||||
|
if storedLeaseVersion ~= observedProcessingLeaseVersion then
|
||||||
|
return reject('ACTION_REQUEST_LEASE_VERSION_MISMATCH')
|
||||||
|
end
|
||||||
|
validatedActionRequestScopeKey = actionRequestScopeKey
|
||||||
|
end
|
||||||
|
|
||||||
|
local currentRevision = tonumber(redis.call('HGET', liveAuctionStateKey, 'revision') or '-1')
|
||||||
|
if currentRevision ~= expectedRevision then
|
||||||
|
return reject('CONFLICT')
|
||||||
|
end
|
||||||
|
local currentAuctionHistorySequence = tonumber(redis.call('HGET', liveAuctionStateKey, 'currentAuctionHistorySequence') or '-1')
|
||||||
|
if currentAuctionHistorySequence ~= expectedAuctionHistorySequence then
|
||||||
|
return reject('CONFLICT')
|
||||||
|
end
|
||||||
|
if redis.call('HGET', liveAuctionStateKey, 'auctionLifecycleId') ~= auctionLifecycleId then
|
||||||
|
return reject('CONFLICT')
|
||||||
|
end
|
||||||
|
if redis.call('HGET', liveAuctionStateKey, 'phase') ~= expectedPhase then
|
||||||
|
return reject('CONFLICT')
|
||||||
|
end
|
||||||
|
if expectedCurrentBidRoundPlayerUserId ~= '' and redis.call('HGET', liveAuctionStateKey, 'currentBidRoundPlayerUserId') ~= expectedCurrentBidRoundPlayerUserId then
|
||||||
|
return reject('CONFLICT')
|
||||||
|
end
|
||||||
|
if expectedCurrentAuctionPlayerOrderIndex ~= '' and redis.call('HGET', liveAuctionStateKey, 'currentAuctionPlayerOrderIndex') ~= expectedCurrentAuctionPlayerOrderIndex then
|
||||||
|
return reject('CONFLICT')
|
||||||
|
end
|
||||||
|
|
||||||
|
local transitionDedupeMember = auctionLifecycleId .. ':' .. auctionStateTransitionId
|
||||||
|
if redis.call('SISMEMBER', appliedAuctionStateTransitionIdsKey, transitionDedupeMember) == 1 then
|
||||||
|
return {'REPLAY', 'APPLIED', auctionStateTransitionId, tostring(currentRedisTimestampMS)}
|
||||||
|
end
|
||||||
|
|
||||||
|
local newRevision = redis.call('HINCRBY', liveAuctionStateKey, 'revision', 1)
|
||||||
|
redis.call('SET', auctionStructureStateKey, afterAuctionStructureStateJson)
|
||||||
|
|
||||||
|
local hsetArgs = {
|
||||||
|
liveAuctionStateKey,
|
||||||
|
'auctionLifecycleId',
|
||||||
|
auctionLifecycleId,
|
||||||
|
'currentAuctionHistorySequence',
|
||||||
|
tostring(auctionHistorySequence),
|
||||||
|
'lastAppliedAuctionStateTransitionId',
|
||||||
|
auctionStateTransitionId
|
||||||
|
}
|
||||||
|
local patchIndex = 21
|
||||||
|
for i = 1, liveStatePatchPairCount do
|
||||||
|
table.insert(hsetArgs, ARGV[patchIndex])
|
||||||
|
table.insert(hsetArgs, ARGV[patchIndex + 1])
|
||||||
|
patchIndex = patchIndex + 2
|
||||||
|
end
|
||||||
|
redis.call('HSET', unpack(hsetArgs))
|
||||||
|
|
||||||
|
local committedBidRoundDeadlineTimestampMS = ''
|
||||||
|
if deadlineMode == 'set-relative' then
|
||||||
|
local currentBidRoundDeadlineTimestampMS = currentRedisTimestampMS + (deadlineDurationSeconds * 1000)
|
||||||
|
committedBidRoundDeadlineTimestampMS = tostring(currentBidRoundDeadlineTimestampMS)
|
||||||
|
redis.call('HSET', liveAuctionStateKey, 'currentBidRoundDeadlineTimestampMS', tostring(currentBidRoundDeadlineTimestampMS))
|
||||||
|
redis.call('HSET', liveAuctionStateKey, 'currentBidRoundId', auctionStateTransitionId)
|
||||||
|
redis.call('ZADD', bidRoundDeadlineQueueKey, currentBidRoundDeadlineTimestampMS, matchId)
|
||||||
|
elseif deadlineMode == 'remove' then
|
||||||
|
redis.call('ZREM', bidRoundDeadlineQueueKey, matchId)
|
||||||
|
redis.call('HDEL', liveAuctionStateKey, 'currentBidRoundDeadlineTimestampMS')
|
||||||
|
end
|
||||||
|
|
||||||
|
-- A resumed auction must not disappear when its former completion TTL elapses.
|
||||||
|
if redis.call('HGET', liveAuctionStateKey, 'phase') ~= 'complete' then
|
||||||
|
for _, index in ipairs({1, 2, 3, 6, 7, 8, 9, 10, 12}) do
|
||||||
|
redis.call('PERSIST', KEYS[index])
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
if shouldResetBidRuntime == '1' then
|
||||||
|
redis.call('DEL', auctionBidHistoryKey, bidRequestResultsKey, bidRequestResultOrderKey, rejectedBidRequestResultOrderKey)
|
||||||
|
end
|
||||||
|
|
||||||
|
redis.call('SADD', appliedAuctionStateTransitionIdsKey, transitionDedupeMember)
|
||||||
|
redis.call(
|
||||||
|
'HSET',
|
||||||
|
durabilityPayloadKey,
|
||||||
|
'payloadJson',
|
||||||
|
durabilityPayloadJson,
|
||||||
|
'committedBidRoundDeadlineTimestampMS',
|
||||||
|
committedBidRoundDeadlineTimestampMS,
|
||||||
|
'preparedAtRedisTimestampMS',
|
||||||
|
tostring(currentRedisTimestampMS),
|
||||||
|
'committedAtRedisTimestampMS',
|
||||||
|
tostring(currentRedisTimestampMS),
|
||||||
|
'auctionLifecycleId',
|
||||||
|
auctionLifecycleId,
|
||||||
|
'revision',
|
||||||
|
tostring(newRevision),
|
||||||
|
'shouldBroadcastState',
|
||||||
|
shouldBroadcastState,
|
||||||
|
'broadcastStateRevision',
|
||||||
|
tostring(broadcastStateRevision)
|
||||||
|
)
|
||||||
|
redis.call('ZADD', durabilityRetryQueueKey, currentRedisTimestampMS, durabilityPayloadKey)
|
||||||
|
|
||||||
|
if actionRequestScopeKey ~= '' then
|
||||||
|
local actionRequestPrefix = actionRequestScopeKey .. ':'
|
||||||
|
redis.call(
|
||||||
|
'HSET',
|
||||||
|
auctionActionRequestResultsKey,
|
||||||
|
actionRequestPrefix .. 'status',
|
||||||
|
'applied',
|
||||||
|
actionRequestPrefix .. 'revision',
|
||||||
|
tostring(newRevision),
|
||||||
|
actionRequestPrefix .. 'requiresRefetch',
|
||||||
|
'1',
|
||||||
|
actionRequestPrefix .. 'responseServerTimestampMS',
|
||||||
|
tostring(currentRedisTimestampMS)
|
||||||
|
)
|
||||||
|
-- The reservation already inserted this request into the order list.
|
||||||
|
end
|
||||||
|
|
||||||
|
return {'OK', auctionStateTransitionId, tostring(newRevision), tostring(currentRedisTimestampMS)}
|
||||||
|
`,
|
||||||
|
);
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
import { buildAuctionRedisKeys } from './auction-redis.keys';
|
||||||
|
import {
|
||||||
|
AUCTION_BID_SCRIPT,
|
||||||
|
buildAuctionBidScriptInvocation,
|
||||||
|
buildBidRequestPayloadFingerprint,
|
||||||
|
} from './auction-redis.bid';
|
||||||
|
|
||||||
|
describe('auction bid redis script contract', () => {
|
||||||
|
it('builds the BID script KEYS and ARGV in the documented order', () => {
|
||||||
|
const keys = buildAuctionRedisKeys('match-1');
|
||||||
|
const invocation = buildAuctionBidScriptInvocation(keys, {
|
||||||
|
bidderTeamIndex: 2,
|
||||||
|
bidPointAmount: 120,
|
||||||
|
bidRequestId: 'bid-1',
|
||||||
|
bidderUserId: 'captain-2',
|
||||||
|
clientObservedAuctionLifecycleId: 'life-1',
|
||||||
|
clientObservedCurrentBidRoundPlayerUserId: 'player-1',
|
||||||
|
maximumAuctionTeamMemberCount: 5,
|
||||||
|
maximumStoredAuctionBidHistoryCount: 200,
|
||||||
|
maximumStoredBidRequestResultCount: 100,
|
||||||
|
matchId: 'match-1',
|
||||||
|
minimumBidPointReservePerRemainingAuctionTeamMemberSlot: 10,
|
||||||
|
minimumBidRequestResultReplayWindowMS: 60_000,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(invocation.script).toBe(AUCTION_BID_SCRIPT);
|
||||||
|
expect(invocation.keys).toEqual([
|
||||||
|
'auction:match-1:liveAuctionState',
|
||||||
|
'auction:match-1:auctionBidHistory',
|
||||||
|
'auction:match-1:bidRequestResults',
|
||||||
|
'auction:match-1:bidRequestResultOrder',
|
||||||
|
'auction:bidRoundDeadlineQueue',
|
||||||
|
'auction:match-1:rejectedBidRequestResultOrder',
|
||||||
|
'auction:bidArchiveQueue',
|
||||||
|
'auction:bidArchivePayloads',
|
||||||
|
]);
|
||||||
|
expect(invocation.values).toEqual([
|
||||||
|
'match-1',
|
||||||
|
'2',
|
||||||
|
'120',
|
||||||
|
'5',
|
||||||
|
'10',
|
||||||
|
'bid-1',
|
||||||
|
'captain-2',
|
||||||
|
'life-1',
|
||||||
|
'player-1',
|
||||||
|
'match-1|life-1|player-1|2|120',
|
||||||
|
'100',
|
||||||
|
'60000',
|
||||||
|
'200',
|
||||||
|
'',
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps bid fingerprints stable and timestamp-free', () => {
|
||||||
|
expect(
|
||||||
|
buildBidRequestPayloadFingerprint({
|
||||||
|
bidderTeamIndex: 2,
|
||||||
|
bidPointAmount: 120,
|
||||||
|
clientObservedAuctionLifecycleId: 'life-1',
|
||||||
|
clientObservedCurrentBidRoundPlayerUserId: 'player-1',
|
||||||
|
matchId: 'match-1',
|
||||||
|
}),
|
||||||
|
).toBe('match-1|life-1|player-1|2|120');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('uses Redis TIME and scalar hash fields rather than JSON parsing', () => {
|
||||||
|
expect(AUCTION_BID_SCRIPT.lua).toContain("redis.call('TIME')");
|
||||||
|
expect(AUCTION_BID_SCRIPT.lua).toContain("redis.call('HINCRBY'");
|
||||||
|
expect(AUCTION_BID_SCRIPT.lua).toContain('BID_REQUEST_RESULT_LIMIT');
|
||||||
|
expect(AUCTION_BID_SCRIPT.lua).toContain('currentHighestBidPointAmount');
|
||||||
|
expect(AUCTION_BID_SCRIPT.lua).not.toContain('cjson.decode');
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,371 @@
|
|||||||
|
import type { AuctionRedisKeys } from './auction-redis.keys';
|
||||||
|
import {
|
||||||
|
AUCTION_BID_ARCHIVE_QUEUE_KEY,
|
||||||
|
AUCTION_BID_ARCHIVE_PAYLOADS_KEY,
|
||||||
|
} from './auction-redis.keys';
|
||||||
|
import { defineAuctionRedisScript } from './auction-redis.scripts';
|
||||||
|
|
||||||
|
export interface AuctionBidScriptInput {
|
||||||
|
bidderTeamIndex: number;
|
||||||
|
bidPointAmount: number;
|
||||||
|
bidRequestId: string;
|
||||||
|
bidderUserId: string;
|
||||||
|
clientObservedAuctionLifecycleId: string;
|
||||||
|
clientObservedCurrentBidRoundPlayerUserId: string;
|
||||||
|
clientObservedBidRoundId?: string;
|
||||||
|
maximumAuctionTeamMemberCount: number;
|
||||||
|
maximumStoredAuctionBidHistoryCount: number;
|
||||||
|
maximumStoredBidRequestResultCount: number;
|
||||||
|
matchId: string;
|
||||||
|
minimumBidPointReservePerRemainingAuctionTeamMemberSlot: number;
|
||||||
|
minimumBidRequestResultReplayWindowMS: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AuctionBidScriptInvocation {
|
||||||
|
keys: string[];
|
||||||
|
script: typeof AUCTION_BID_SCRIPT;
|
||||||
|
values: string[];
|
||||||
|
}
|
||||||
|
|
||||||
|
const BID_RESULT_HASH_SUFFIXES = [
|
||||||
|
'fingerprint',
|
||||||
|
'status',
|
||||||
|
'revision',
|
||||||
|
'rejectCode',
|
||||||
|
'currentHighestBidPointAmount',
|
||||||
|
'currentHighestBidderTeamIndex',
|
||||||
|
'currentBidRoundDeadlineTimestampMS',
|
||||||
|
'auctionBidHistoryEntryJson',
|
||||||
|
'responseServerTimestampMS',
|
||||||
|
'createdAtTimestampMS',
|
||||||
|
] as const;
|
||||||
|
|
||||||
|
export function buildBidRequestPayloadFingerprint(params: {
|
||||||
|
bidderTeamIndex: number;
|
||||||
|
bidPointAmount: number;
|
||||||
|
clientObservedAuctionLifecycleId: string;
|
||||||
|
clientObservedCurrentBidRoundPlayerUserId: string;
|
||||||
|
clientObservedBidRoundId?: string;
|
||||||
|
matchId: string;
|
||||||
|
}): string {
|
||||||
|
const parts = [
|
||||||
|
params.matchId,
|
||||||
|
params.clientObservedAuctionLifecycleId,
|
||||||
|
params.clientObservedCurrentBidRoundPlayerUserId,
|
||||||
|
params.bidderTeamIndex,
|
||||||
|
params.bidPointAmount,
|
||||||
|
];
|
||||||
|
if (params.clientObservedBidRoundId)
|
||||||
|
parts.push(params.clientObservedBidRoundId);
|
||||||
|
return parts.join('|');
|
||||||
|
}
|
||||||
|
|
||||||
|
export function buildAuctionBidScriptInvocation(
|
||||||
|
keys: AuctionRedisKeys,
|
||||||
|
input: AuctionBidScriptInput,
|
||||||
|
): AuctionBidScriptInvocation {
|
||||||
|
return {
|
||||||
|
keys: [
|
||||||
|
keys.liveStateKey,
|
||||||
|
keys.bidHistoryKey,
|
||||||
|
keys.bidRequestResultsKey,
|
||||||
|
keys.bidRequestResultOrderKey,
|
||||||
|
keys.deadlineQueueKey,
|
||||||
|
keys.rejectedBidRequestResultOrderKey,
|
||||||
|
AUCTION_BID_ARCHIVE_QUEUE_KEY,
|
||||||
|
AUCTION_BID_ARCHIVE_PAYLOADS_KEY,
|
||||||
|
],
|
||||||
|
script: AUCTION_BID_SCRIPT,
|
||||||
|
values: [
|
||||||
|
input.matchId,
|
||||||
|
String(input.bidderTeamIndex),
|
||||||
|
String(input.bidPointAmount),
|
||||||
|
String(input.maximumAuctionTeamMemberCount),
|
||||||
|
String(input.minimumBidPointReservePerRemainingAuctionTeamMemberSlot),
|
||||||
|
input.bidRequestId,
|
||||||
|
input.bidderUserId,
|
||||||
|
input.clientObservedAuctionLifecycleId,
|
||||||
|
input.clientObservedCurrentBidRoundPlayerUserId,
|
||||||
|
buildBidRequestPayloadFingerprint(input),
|
||||||
|
String(input.maximumStoredBidRequestResultCount),
|
||||||
|
String(input.minimumBidRequestResultReplayWindowMS),
|
||||||
|
String(input.maximumStoredAuctionBidHistoryCount),
|
||||||
|
input.clientObservedBidRoundId ?? '',
|
||||||
|
],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export const AUCTION_BID_SCRIPT = defineAuctionRedisScript(
|
||||||
|
'auction.bid',
|
||||||
|
`
|
||||||
|
local liveAuctionStateKey = KEYS[1]
|
||||||
|
local auctionBidHistoryKey = KEYS[2]
|
||||||
|
local bidRequestResultsKey = KEYS[3]
|
||||||
|
local bidRequestResultOrderKey = KEYS[4]
|
||||||
|
local bidRoundDeadlineQueueKey = KEYS[5]
|
||||||
|
local rejectedBidRequestResultOrderKey = KEYS[6]
|
||||||
|
local bidArchiveQueueKey = KEYS[7]
|
||||||
|
local bidArchivePayloadsKey = KEYS[8]
|
||||||
|
|
||||||
|
local matchId = ARGV[1]
|
||||||
|
local bidderTeamIndex = ARGV[2]
|
||||||
|
local bidPointAmount = tonumber(ARGV[3])
|
||||||
|
local maximumAuctionTeamMemberCount = tonumber(ARGV[4])
|
||||||
|
local minimumBidPointReservePerRemainingAuctionTeamMemberSlot = tonumber(ARGV[5])
|
||||||
|
local bidRequestId = ARGV[6]
|
||||||
|
local bidderUserId = ARGV[7]
|
||||||
|
local clientObservedAuctionLifecycleId = ARGV[8]
|
||||||
|
local clientObservedCurrentBidRoundPlayerUserId = ARGV[9]
|
||||||
|
local bidRequestPayloadFingerprint = ARGV[10]
|
||||||
|
local maximumStoredBidRequestResultCount = tonumber(ARGV[11])
|
||||||
|
local minimumBidRequestResultReplayWindowMS = tonumber(ARGV[12])
|
||||||
|
local maximumStoredAuctionBidHistoryCount = tonumber(ARGV[13])
|
||||||
|
local clientObservedBidRoundId = ARGV[14] or ''
|
||||||
|
|
||||||
|
local redisTime = redis.call('TIME')
|
||||||
|
local currentRedisTimestampMS = (tonumber(redisTime[1]) * 1000) + math.floor(tonumber(redisTime[2]) / 1000)
|
||||||
|
|
||||||
|
local function requestField(suffix)
|
||||||
|
return bidRequestId .. ':' .. suffix
|
||||||
|
end
|
||||||
|
|
||||||
|
local function hdelBidRequest(requestId)
|
||||||
|
redis.call(
|
||||||
|
'HDEL',
|
||||||
|
bidRequestResultsKey,
|
||||||
|
requestId .. ':fingerprint',
|
||||||
|
requestId .. ':status',
|
||||||
|
requestId .. ':revision',
|
||||||
|
requestId .. ':rejectCode',
|
||||||
|
requestId .. ':currentHighestBidPointAmount',
|
||||||
|
requestId .. ':currentHighestBidderTeamIndex',
|
||||||
|
requestId .. ':currentBidRoundDeadlineTimestampMS',
|
||||||
|
requestId .. ':auctionBidHistoryEntryJson',
|
||||||
|
requestId .. ':responseServerTimestampMS',
|
||||||
|
requestId .. ':createdAtTimestampMS'
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
local function trimOldBidRequestResults()
|
||||||
|
while redis.call('LLEN', bidRequestResultOrderKey) >= maximumStoredBidRequestResultCount do
|
||||||
|
local oldestBidRequestId = redis.call('LINDEX', bidRequestResultOrderKey, 0)
|
||||||
|
if not oldestBidRequestId then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
local createdAtTimestampMS = tonumber(redis.call('HGET', bidRequestResultsKey, oldestBidRequestId .. ':createdAtTimestampMS') or '0')
|
||||||
|
if createdAtTimestampMS > currentRedisTimestampMS - minimumBidRequestResultReplayWindowMS then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
redis.call('LPOP', bidRequestResultOrderKey)
|
||||||
|
hdelBidRequest(oldestBidRequestId)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
local function replayExistingRequest()
|
||||||
|
local status = redis.call('HGET', bidRequestResultsKey, requestField('status')) or ''
|
||||||
|
return {
|
||||||
|
'REPLAY',
|
||||||
|
status,
|
||||||
|
bidRequestId,
|
||||||
|
redis.call('HGET', bidRequestResultsKey, requestField('revision')) or '',
|
||||||
|
redis.call('HGET', bidRequestResultsKey, requestField('rejectCode')) or '',
|
||||||
|
redis.call('HGET', bidRequestResultsKey, requestField('currentHighestBidPointAmount')) or '',
|
||||||
|
redis.call('HGET', bidRequestResultsKey, requestField('currentHighestBidderTeamIndex')) or '',
|
||||||
|
redis.call('HGET', bidRequestResultsKey, requestField('currentBidRoundDeadlineTimestampMS')) or '',
|
||||||
|
redis.call('HGET', bidRequestResultsKey, requestField('auctionBidHistoryEntryJson')) or '',
|
||||||
|
redis.call('HGET', bidRequestResultsKey, requestField('responseServerTimestampMS')) or tostring(currentRedisTimestampMS)
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
local existingFingerprint = redis.call('HGET', bidRequestResultsKey, requestField('fingerprint'))
|
||||||
|
if existingFingerprint then
|
||||||
|
if existingFingerprint ~= bidRequestPayloadFingerprint then
|
||||||
|
return {'REJECTED', 'DUPLICATE_REQUEST_CONFLICT', bidRequestId, tostring(currentRedisTimestampMS)}
|
||||||
|
end
|
||||||
|
return replayExistingRequest()
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Upgrade the old shared queue once, preserving every accepted replay record.
|
||||||
|
if redis.call('HSETNX', bidRequestResultsKey, '_acceptedOnlyOrderV1', '1') == 1 then
|
||||||
|
for _, oldRequestId in ipairs(redis.call('LRANGE', bidRequestResultOrderKey, 0, -1)) do
|
||||||
|
if redis.call('HGET', bidRequestResultsKey, oldRequestId .. ':status') == 'rejected' then
|
||||||
|
redis.call('LREM', bidRequestResultOrderKey, 0, oldRequestId)
|
||||||
|
hdelBidRequest(oldRequestId)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
local function storeRejectedRequest(rejectCode)
|
||||||
|
-- Rejections have their own bounded retention. They must never consume the
|
||||||
|
-- protected replay capacity of accepted bids.
|
||||||
|
while redis.call('LLEN', rejectedBidRequestResultOrderKey) >= maximumStoredBidRequestResultCount do
|
||||||
|
local oldest = redis.call('LPOP', rejectedBidRequestResultOrderKey)
|
||||||
|
if oldest then hdelBidRequest(oldest) end
|
||||||
|
end
|
||||||
|
local rejectedCurrentBidRoundDeadlineTimestampMS = redis.call('HGET', liveAuctionStateKey, 'currentBidRoundDeadlineTimestampMS') or ''
|
||||||
|
redis.call(
|
||||||
|
'HSET',
|
||||||
|
bidRequestResultsKey,
|
||||||
|
requestField('fingerprint'),
|
||||||
|
bidRequestPayloadFingerprint,
|
||||||
|
requestField('status'),
|
||||||
|
'rejected',
|
||||||
|
requestField('rejectCode'),
|
||||||
|
rejectCode,
|
||||||
|
requestField('currentBidRoundDeadlineTimestampMS'),
|
||||||
|
rejectedCurrentBidRoundDeadlineTimestampMS,
|
||||||
|
requestField('responseServerTimestampMS'),
|
||||||
|
tostring(currentRedisTimestampMS),
|
||||||
|
requestField('createdAtTimestampMS'),
|
||||||
|
tostring(currentRedisTimestampMS)
|
||||||
|
)
|
||||||
|
redis.call('RPUSH', rejectedBidRequestResultOrderKey, bidRequestId)
|
||||||
|
return {'REJECTED', rejectCode, bidRequestId, tostring(currentRedisTimestampMS), rejectedCurrentBidRoundDeadlineTimestampMS}
|
||||||
|
end
|
||||||
|
|
||||||
|
local phase = redis.call('HGET', liveAuctionStateKey, 'phase')
|
||||||
|
if phase ~= 'bidding' then
|
||||||
|
return storeRejectedRequest('PHASE')
|
||||||
|
end
|
||||||
|
|
||||||
|
local auctionLifecycleId = redis.call('HGET', liveAuctionStateKey, 'auctionLifecycleId')
|
||||||
|
local currentBidRoundPlayerUserId = redis.call('HGET', liveAuctionStateKey, 'currentBidRoundPlayerUserId')
|
||||||
|
local currentBidRoundId = redis.call('HGET', liveAuctionStateKey, 'currentBidRoundId') or ''
|
||||||
|
if currentBidRoundId ~= '' and clientObservedBidRoundId == '' then
|
||||||
|
return storeRejectedRequest('BID_CLIENT_UPDATE_REQUIRED')
|
||||||
|
end
|
||||||
|
if auctionLifecycleId ~= clientObservedAuctionLifecycleId or currentBidRoundPlayerUserId ~= clientObservedCurrentBidRoundPlayerUserId then
|
||||||
|
return storeRejectedRequest('STALE_BID_ROUND')
|
||||||
|
end
|
||||||
|
if currentBidRoundId ~= clientObservedBidRoundId then
|
||||||
|
return storeRejectedRequest('STALE_BID_ROUND')
|
||||||
|
end
|
||||||
|
|
||||||
|
local currentBidRoundDeadlineTimestampMS = tonumber(redis.call('HGET', liveAuctionStateKey, 'currentBidRoundDeadlineTimestampMS') or '0')
|
||||||
|
if currentBidRoundDeadlineTimestampMS <= currentRedisTimestampMS then
|
||||||
|
return storeRejectedRequest('EXPIRED')
|
||||||
|
end
|
||||||
|
|
||||||
|
local currentHighestBidPointAmount = tonumber(redis.call('HGET', liveAuctionStateKey, 'currentHighestBidPointAmount') or '0')
|
||||||
|
if bidPointAmount <= currentHighestBidPointAmount then
|
||||||
|
return storeRejectedRequest('TOO_LOW')
|
||||||
|
end
|
||||||
|
|
||||||
|
local remainingBidPointAmountField = 'team:' .. bidderTeamIndex .. ':remainingBidPointAmount'
|
||||||
|
local assignedAuctionTeamMemberCountField = 'team:' .. bidderTeamIndex .. ':assignedAuctionTeamMemberCount'
|
||||||
|
local remainingBidPointAmountRaw = redis.call('HGET', liveAuctionStateKey, remainingBidPointAmountField)
|
||||||
|
if not remainingBidPointAmountRaw then
|
||||||
|
return storeRejectedRequest('UNKNOWN_TEAM')
|
||||||
|
end
|
||||||
|
|
||||||
|
local assignedAuctionTeamMemberCount = tonumber(redis.call('HGET', liveAuctionStateKey, assignedAuctionTeamMemberCountField) or '0')
|
||||||
|
if assignedAuctionTeamMemberCount >= maximumAuctionTeamMemberCount then
|
||||||
|
return storeRejectedRequest('FULL')
|
||||||
|
end
|
||||||
|
|
||||||
|
local remainingBidPointAmount = tonumber(remainingBidPointAmountRaw)
|
||||||
|
local remainingSlotsAfterBid = maximumAuctionTeamMemberCount - assignedAuctionTeamMemberCount - 1
|
||||||
|
local requiredReserveAfterBid = remainingSlotsAfterBid * minimumBidPointReservePerRemainingAuctionTeamMemberSlot
|
||||||
|
if bidPointAmount + requiredReserveAfterBid > remainingBidPointAmount then
|
||||||
|
return storeRejectedRequest('INSUFFICIENT')
|
||||||
|
end
|
||||||
|
|
||||||
|
trimOldBidRequestResults()
|
||||||
|
if redis.call('LLEN', bidRequestResultOrderKey) >= maximumStoredBidRequestResultCount then
|
||||||
|
return {'REJECTED', 'BID_REQUEST_RESULT_LIMIT', bidRequestId, tostring(currentRedisTimestampMS)}
|
||||||
|
end
|
||||||
|
|
||||||
|
local maximumBidRoundDurationSeconds = tonumber(redis.call('HGET', liveAuctionStateKey, 'maximumBidRoundDurationSeconds') or '0')
|
||||||
|
local bidRoundExtensionSeconds = tonumber(redis.call('HGET', liveAuctionStateKey, 'bidRoundExtensionSeconds') or '0')
|
||||||
|
local remainingBidRoundTimeMS = currentBidRoundDeadlineTimestampMS - currentRedisTimestampMS
|
||||||
|
local nextRemainingBidRoundTimeMS = remainingBidRoundTimeMS
|
||||||
|
local bidRoundExtensionMS = bidRoundExtensionSeconds * 1000
|
||||||
|
local maximumBidRoundDurationMS = maximumBidRoundDurationSeconds * 1000
|
||||||
|
if nextRemainingBidRoundTimeMS < bidRoundExtensionMS then
|
||||||
|
nextRemainingBidRoundTimeMS = bidRoundExtensionMS
|
||||||
|
end
|
||||||
|
if nextRemainingBidRoundTimeMS > maximumBidRoundDurationMS then
|
||||||
|
nextRemainingBidRoundTimeMS = maximumBidRoundDurationMS
|
||||||
|
end
|
||||||
|
local nextBidRoundDeadlineTimestampMS = currentRedisTimestampMS + nextRemainingBidRoundTimeMS
|
||||||
|
|
||||||
|
local revision = redis.call('HINCRBY', liveAuctionStateKey, 'revision', 1)
|
||||||
|
local auctionBidHistoryEntryJson = cjson.encode({
|
||||||
|
bidRequestId = bidRequestId,
|
||||||
|
revision = revision,
|
||||||
|
bidderTeamIndex = tonumber(bidderTeamIndex),
|
||||||
|
bidPointAmount = bidPointAmount,
|
||||||
|
bidderUserId = bidderUserId,
|
||||||
|
playerUserId = currentBidRoundPlayerUserId,
|
||||||
|
bidRoundId = currentBidRoundId,
|
||||||
|
bidPlacedAtTimestampMS = currentRedisTimestampMS
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Accepted replay returns above this point. Persist every accepted event before
|
||||||
|
-- trimming the recent view; the durable archive worker removes only saved events.
|
||||||
|
local archiveId = matchId .. ':' .. auctionLifecycleId .. ':' .. string.format('%016d', revision)
|
||||||
|
redis.call('HSET', bidArchivePayloadsKey, archiveId, cjson.encode({
|
||||||
|
_id = archiveId,
|
||||||
|
matchId = matchId,
|
||||||
|
auctionLifecycleId = auctionLifecycleId,
|
||||||
|
revision = revision,
|
||||||
|
bidRequestId = bidRequestId,
|
||||||
|
bidderTeamIndex = tonumber(bidderTeamIndex),
|
||||||
|
bidPointAmount = bidPointAmount,
|
||||||
|
bidderUserId = bidderUserId,
|
||||||
|
playerUserId = currentBidRoundPlayerUserId,
|
||||||
|
bidRoundId = currentBidRoundId,
|
||||||
|
bidPlacedAtTimestampMS = currentRedisTimestampMS
|
||||||
|
}))
|
||||||
|
redis.call('ZADD', bidArchiveQueueKey, currentRedisTimestampMS, archiveId)
|
||||||
|
redis.call('RPUSH', auctionBidHistoryKey, auctionBidHistoryEntryJson)
|
||||||
|
redis.call('LTRIM', auctionBidHistoryKey, -maximumStoredAuctionBidHistoryCount, -1)
|
||||||
|
redis.call(
|
||||||
|
'HSET',
|
||||||
|
liveAuctionStateKey,
|
||||||
|
'currentHighestBidPointAmount',
|
||||||
|
tostring(bidPointAmount),
|
||||||
|
'currentHighestBidderTeamIndex',
|
||||||
|
bidderTeamIndex,
|
||||||
|
'currentBidRoundDeadlineTimestampMS',
|
||||||
|
tostring(nextBidRoundDeadlineTimestampMS)
|
||||||
|
)
|
||||||
|
redis.call('ZADD', bidRoundDeadlineQueueKey, nextBidRoundDeadlineTimestampMS, matchId)
|
||||||
|
redis.call(
|
||||||
|
'HSET',
|
||||||
|
bidRequestResultsKey,
|
||||||
|
requestField('fingerprint'),
|
||||||
|
bidRequestPayloadFingerprint,
|
||||||
|
requestField('status'),
|
||||||
|
'ok',
|
||||||
|
requestField('revision'),
|
||||||
|
tostring(revision),
|
||||||
|
requestField('currentHighestBidPointAmount'),
|
||||||
|
tostring(bidPointAmount),
|
||||||
|
requestField('currentHighestBidderTeamIndex'),
|
||||||
|
bidderTeamIndex,
|
||||||
|
requestField('currentBidRoundDeadlineTimestampMS'),
|
||||||
|
tostring(nextBidRoundDeadlineTimestampMS),
|
||||||
|
requestField('auctionBidHistoryEntryJson'),
|
||||||
|
auctionBidHistoryEntryJson,
|
||||||
|
requestField('responseServerTimestampMS'),
|
||||||
|
tostring(currentRedisTimestampMS),
|
||||||
|
requestField('createdAtTimestampMS'),
|
||||||
|
tostring(currentRedisTimestampMS)
|
||||||
|
)
|
||||||
|
redis.call('RPUSH', bidRequestResultOrderKey, bidRequestId)
|
||||||
|
|
||||||
|
return {
|
||||||
|
'OK',
|
||||||
|
bidRequestId,
|
||||||
|
tostring(revision),
|
||||||
|
tostring(currentRedisTimestampMS),
|
||||||
|
tostring(bidPointAmount),
|
||||||
|
bidderTeamIndex,
|
||||||
|
tostring(nextBidRoundDeadlineTimestampMS),
|
||||||
|
auctionBidHistoryEntryJson
|
||||||
|
}
|
||||||
|
`,
|
||||||
|
);
|
||||||
|
|
||||||
|
export const BID_RESULT_HASH_FIELD_SUFFIXES = BID_RESULT_HASH_SUFFIXES;
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
import { defineAuctionRedisScript } from './auction-redis.scripts';
|
||||||
|
|
||||||
|
// Compare the lifecycle and remove the payload and its indexes atomically.
|
||||||
|
export const AUCTION_CLEANUP_DURABILITY_SCRIPT = defineAuctionRedisScript(
|
||||||
|
'auction.cleanupDurability',
|
||||||
|
`
|
||||||
|
local deleted = 0
|
||||||
|
for i = 3, #KEYS do
|
||||||
|
local key = KEYS[i]
|
||||||
|
local keyType = redis.call('TYPE', key).ok
|
||||||
|
local matches = ARGV[1] == ''
|
||||||
|
if not matches and keyType == 'hash' then
|
||||||
|
matches = redis.call('HGET', key, 'auctionLifecycleId') == ARGV[1]
|
||||||
|
elseif not matches and keyType == 'string' then
|
||||||
|
-- Retain compatibility with payloads written before the Hash format.
|
||||||
|
local ok, payload = pcall(cjson.decode, redis.call('GET', key))
|
||||||
|
matches = ok and type(payload) == 'table' and payload.auctionLifecycleId == ARGV[1]
|
||||||
|
end
|
||||||
|
if matches then
|
||||||
|
redis.call('ZREM', KEYS[1], key)
|
||||||
|
redis.call('ZREM', KEYS[2], key)
|
||||||
|
deleted = deleted + redis.call('UNLINK', key)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return deleted
|
||||||
|
`,
|
||||||
|
);
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
export const AUCTION_REDIS_CLIENT = Symbol('AUCTION_REDIS_CLIENT');
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
import { buildAuctionRedisKeys } from './auction-redis.keys';
|
||||||
|
import {
|
||||||
|
AUCTION_EXPIRE_PREPARE_SCRIPT,
|
||||||
|
buildAuctionExpirePrepareScriptInvocation,
|
||||||
|
} from './auction-redis.expire-prepare';
|
||||||
|
|
||||||
|
describe('auction expire prepare redis script contract', () => {
|
||||||
|
it('builds EXPIRE_PREPARE keys and values', () => {
|
||||||
|
const invocation = buildAuctionExpirePrepareScriptInvocation(
|
||||||
|
buildAuctionRedisKeys('match-1'),
|
||||||
|
{
|
||||||
|
auctionStateTransitionId: 'expire-1',
|
||||||
|
bidRoundExpiryRetryDelayMS: 3_000,
|
||||||
|
matchId: 'match-1',
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(invocation.script).toBe(AUCTION_EXPIRE_PREPARE_SCRIPT);
|
||||||
|
expect(invocation.keys).toEqual([
|
||||||
|
'auction:match-1:liveAuctionState',
|
||||||
|
'auction:bidRoundDeadlineQueue',
|
||||||
|
]);
|
||||||
|
expect(invocation.values).toEqual(['match-1', 'expire-1', '3000']);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('freezes expiry context with Redis TIME and expiring phase', () => {
|
||||||
|
expect(AUCTION_EXPIRE_PREPARE_SCRIPT.lua).toContain("redis.call('TIME')");
|
||||||
|
expect(AUCTION_EXPIRE_PREPARE_SCRIPT.lua).toContain("'phase'");
|
||||||
|
expect(AUCTION_EXPIRE_PREPARE_SCRIPT.lua).toContain("'expiring'");
|
||||||
|
expect(AUCTION_EXPIRE_PREPARE_SCRIPT.lua).toContain(
|
||||||
|
'bidRoundExpiryRevision',
|
||||||
|
);
|
||||||
|
expect(AUCTION_EXPIRE_PREPARE_SCRIPT.lua).toContain(
|
||||||
|
'bidRoundExpiryWinningBidderTeamIndex',
|
||||||
|
);
|
||||||
|
expect(AUCTION_EXPIRE_PREPARE_SCRIPT.lua).toContain("'ZADD'");
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,107 @@
|
|||||||
|
import type { AuctionRedisKeys } from './auction-redis.keys';
|
||||||
|
import { defineAuctionRedisScript } from './auction-redis.scripts';
|
||||||
|
|
||||||
|
export interface AuctionExpirePrepareScriptInput {
|
||||||
|
auctionStateTransitionId: string;
|
||||||
|
bidRoundExpiryRetryDelayMS: number;
|
||||||
|
matchId: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AuctionExpirePrepareScriptInvocation {
|
||||||
|
keys: string[];
|
||||||
|
script: typeof AUCTION_EXPIRE_PREPARE_SCRIPT;
|
||||||
|
values: string[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export function buildAuctionExpirePrepareScriptInvocation(
|
||||||
|
keys: AuctionRedisKeys,
|
||||||
|
input: AuctionExpirePrepareScriptInput,
|
||||||
|
): AuctionExpirePrepareScriptInvocation {
|
||||||
|
return {
|
||||||
|
keys: [keys.liveStateKey, keys.deadlineQueueKey],
|
||||||
|
script: AUCTION_EXPIRE_PREPARE_SCRIPT,
|
||||||
|
values: [
|
||||||
|
input.matchId,
|
||||||
|
input.auctionStateTransitionId,
|
||||||
|
String(input.bidRoundExpiryRetryDelayMS),
|
||||||
|
],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export const AUCTION_EXPIRE_PREPARE_SCRIPT = defineAuctionRedisScript(
|
||||||
|
'auction.expirePrepare',
|
||||||
|
`
|
||||||
|
local liveAuctionStateKey = KEYS[1]
|
||||||
|
local bidRoundDeadlineQueueKey = KEYS[2]
|
||||||
|
|
||||||
|
local matchId = ARGV[1]
|
||||||
|
local auctionStateTransitionId = ARGV[2]
|
||||||
|
local bidRoundExpiryRetryDelayMS = tonumber(ARGV[3])
|
||||||
|
|
||||||
|
local redisTime = redis.call('TIME')
|
||||||
|
local currentRedisTimestampMS = (tonumber(redisTime[1]) * 1000) + math.floor(tonumber(redisTime[2]) / 1000)
|
||||||
|
|
||||||
|
local phase = redis.call('HGET', liveAuctionStateKey, 'phase')
|
||||||
|
if phase == 'expiring' then
|
||||||
|
return {
|
||||||
|
'REPLAY',
|
||||||
|
redis.call('HGET', liveAuctionStateKey, 'bidRoundExpiryDecision') or '',
|
||||||
|
redis.call('HGET', liveAuctionStateKey, 'bidRoundExpiryAuctionStateTransitionId') or '',
|
||||||
|
redis.call('HGET', liveAuctionStateKey, 'bidRoundExpiryRevision') or '',
|
||||||
|
tostring(currentRedisTimestampMS)
|
||||||
|
}
|
||||||
|
end
|
||||||
|
if phase ~= 'bidding' then
|
||||||
|
redis.call('ZREM', bidRoundDeadlineQueueKey, matchId)
|
||||||
|
return {'NOOP', 'PHASE', tostring(currentRedisTimestampMS)}
|
||||||
|
end
|
||||||
|
|
||||||
|
local currentBidRoundDeadlineTimestampMS = tonumber(redis.call('HGET', liveAuctionStateKey, 'currentBidRoundDeadlineTimestampMS') or '0')
|
||||||
|
if currentBidRoundDeadlineTimestampMS > currentRedisTimestampMS then
|
||||||
|
return {'NOOP', 'NOT_DUE', tostring(currentRedisTimestampMS)}
|
||||||
|
end
|
||||||
|
|
||||||
|
local currentHighestBidPointAmount = tonumber(redis.call('HGET', liveAuctionStateKey, 'currentHighestBidPointAmount') or '0')
|
||||||
|
local currentHighestBidderTeamIndex = redis.call('HGET', liveAuctionStateKey, 'currentHighestBidderTeamIndex') or '-1'
|
||||||
|
local bidRoundExpiryDecision = 'passed'
|
||||||
|
if currentHighestBidPointAmount > 0 then
|
||||||
|
bidRoundExpiryDecision = 'sold'
|
||||||
|
end
|
||||||
|
|
||||||
|
local revision = redis.call('HINCRBY', liveAuctionStateKey, 'revision', 1)
|
||||||
|
redis.call(
|
||||||
|
'HSET',
|
||||||
|
liveAuctionStateKey,
|
||||||
|
'phase',
|
||||||
|
'expiring',
|
||||||
|
'bidRoundExpiryDecision',
|
||||||
|
bidRoundExpiryDecision,
|
||||||
|
'bidRoundExpiryAuctionStateTransitionId',
|
||||||
|
auctionStateTransitionId,
|
||||||
|
'bidRoundExpiryPlayerUserId',
|
||||||
|
redis.call('HGET', liveAuctionStateKey, 'currentBidRoundPlayerUserId') or '',
|
||||||
|
'bidRoundExpiryPlayerOrderIndex',
|
||||||
|
redis.call('HGET', liveAuctionStateKey, 'currentAuctionPlayerOrderIndex') or '',
|
||||||
|
'bidRoundExpiryWinningBidPointAmount',
|
||||||
|
tostring(currentHighestBidPointAmount),
|
||||||
|
'bidRoundExpiryWinningBidderTeamIndex',
|
||||||
|
currentHighestBidderTeamIndex,
|
||||||
|
'bidRoundExpiryRevision',
|
||||||
|
tostring(revision)
|
||||||
|
)
|
||||||
|
redis.call(
|
||||||
|
'ZADD',
|
||||||
|
bidRoundDeadlineQueueKey,
|
||||||
|
currentRedisTimestampMS + bidRoundExpiryRetryDelayMS,
|
||||||
|
matchId
|
||||||
|
)
|
||||||
|
|
||||||
|
return {
|
||||||
|
'OK',
|
||||||
|
bidRoundExpiryDecision,
|
||||||
|
auctionStateTransitionId,
|
||||||
|
tostring(revision),
|
||||||
|
tostring(currentRedisTimestampMS)
|
||||||
|
}
|
||||||
|
`,
|
||||||
|
);
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
import { buildAuctionRedisKeys } from './auction-redis.keys';
|
||||||
|
|
||||||
|
describe('auction redis keys', () => {
|
||||||
|
it('builds lifecycle-safe key names from match id', () => {
|
||||||
|
expect(buildAuctionRedisKeys('match-1')).toMatchObject({
|
||||||
|
actionRequestResultOrderKey:
|
||||||
|
'auction:match-1:auctionActionRequestResultOrder',
|
||||||
|
actionRequestResultsKey: 'auction:match-1:auctionActionRequestResults',
|
||||||
|
appliedTransitionIdsKey:
|
||||||
|
'auction:match-1:appliedAuctionStateTransitionIds',
|
||||||
|
bidHistoryKey: 'auction:match-1:auctionBidHistory',
|
||||||
|
bidRequestResultOrderKey: 'auction:match-1:bidRequestResultOrder',
|
||||||
|
bidRequestResultsKey: 'auction:match-1:bidRequestResults',
|
||||||
|
deadlineQueueKey: 'auction:bidRoundDeadlineQueue',
|
||||||
|
durabilityDeadLetterQueueKey: 'auction:auctionDurabilityDeadLetterQueue',
|
||||||
|
durabilityPayloadKeyPrefix: 'auction:match-1:durability:',
|
||||||
|
durabilityRetryQueueKey: 'auction:auctionDurabilityRetryQueue',
|
||||||
|
liveStateKey: 'auction:match-1:liveAuctionState',
|
||||||
|
rehydrateLockKey: 'auction:match-1:rehydrateLock',
|
||||||
|
stateTransitionLockKey: 'auction:match-1:auctionStateTransitionLock',
|
||||||
|
structureStateKey: 'auction:match-1:auctionStructureState',
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('builds transition durability payload keys', () => {
|
||||||
|
const keys = buildAuctionRedisKeys('match-1');
|
||||||
|
expect(keys.durabilityPayloadKey('transition-1')).toBe(
|
||||||
|
'auction:match-1:durability:transition-1',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
export const AUCTION_BID_ROUND_DEADLINE_QUEUE_KEY =
|
||||||
|
'auction:bidRoundDeadlineQueue';
|
||||||
|
export const AUCTION_DURABILITY_RETRY_QUEUE_KEY =
|
||||||
|
'auction:auctionDurabilityRetryQueue';
|
||||||
|
export const AUCTION_DURABILITY_DEAD_LETTER_QUEUE_KEY =
|
||||||
|
'auction:auctionDurabilityDeadLetterQueue';
|
||||||
|
export const AUCTION_DEAD_LETTER_STATUS_QUEUE_KEY =
|
||||||
|
'auction:deadLetterStatusQueue';
|
||||||
|
export const AUCTION_BID_ARCHIVE_QUEUE_KEY = 'auction:bidArchiveQueue';
|
||||||
|
export const AUCTION_BID_ARCHIVE_PAYLOADS_KEY = 'auction:bidArchivePayloads';
|
||||||
|
export const AUCTION_BID_ARCHIVE_DEAD_LETTER_QUEUE_KEY =
|
||||||
|
'auction:bidArchiveDeadLetterQueue';
|
||||||
|
export const AUCTION_BID_ARCHIVE_DEAD_LETTER_PAYLOADS_KEY =
|
||||||
|
'auction:bidArchiveDeadLetterPayloads';
|
||||||
|
|
||||||
|
export interface AuctionRedisKeys {
|
||||||
|
actionRequestResultOrderKey: string;
|
||||||
|
actionRequestResultsKey: string;
|
||||||
|
appliedTransitionIdsKey: string;
|
||||||
|
bidHistoryKey: string;
|
||||||
|
bidRequestResultOrderKey: string;
|
||||||
|
bidRequestResultsKey: string;
|
||||||
|
rejectedBidRequestResultOrderKey: string;
|
||||||
|
deadlineQueueKey: string;
|
||||||
|
durabilityDeadLetterQueueKey: string;
|
||||||
|
durabilityPayloadKey: (auctionStateTransitionId: string) => string;
|
||||||
|
durabilityPayloadKeyPrefix: string;
|
||||||
|
durabilityRetryQueueKey: string;
|
||||||
|
liveStateKey: string;
|
||||||
|
rehydrateLockKey: string;
|
||||||
|
stateTransitionLockKey: string;
|
||||||
|
structureStateKey: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function buildAuctionRedisKeys(matchId: string): AuctionRedisKeys {
|
||||||
|
const prefix = `auction:${matchId}`;
|
||||||
|
const durabilityPayloadKeyPrefix = `${prefix}:durability:`;
|
||||||
|
return {
|
||||||
|
actionRequestResultOrderKey: `${prefix}:auctionActionRequestResultOrder`,
|
||||||
|
actionRequestResultsKey: `${prefix}:auctionActionRequestResults`,
|
||||||
|
appliedTransitionIdsKey: `${prefix}:appliedAuctionStateTransitionIds`,
|
||||||
|
bidHistoryKey: `${prefix}:auctionBidHistory`,
|
||||||
|
bidRequestResultOrderKey: `${prefix}:bidRequestResultOrder`,
|
||||||
|
bidRequestResultsKey: `${prefix}:bidRequestResults`,
|
||||||
|
rejectedBidRequestResultOrderKey: `${prefix}:rejectedBidRequestResultOrder`,
|
||||||
|
deadlineQueueKey: AUCTION_BID_ROUND_DEADLINE_QUEUE_KEY,
|
||||||
|
durabilityDeadLetterQueueKey: AUCTION_DURABILITY_DEAD_LETTER_QUEUE_KEY,
|
||||||
|
durabilityPayloadKey: (auctionStateTransitionId: string) =>
|
||||||
|
`${durabilityPayloadKeyPrefix}${auctionStateTransitionId}`,
|
||||||
|
durabilityPayloadKeyPrefix,
|
||||||
|
durabilityRetryQueueKey: AUCTION_DURABILITY_RETRY_QUEUE_KEY,
|
||||||
|
liveStateKey: `${prefix}:liveAuctionState`,
|
||||||
|
rehydrateLockKey: `${prefix}:rehydrateLock`,
|
||||||
|
stateTransitionLockKey: `${prefix}:auctionStateTransitionLock`,
|
||||||
|
structureStateKey: `${prefix}:auctionStructureState`,
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
import { Logger, Module } from '@nestjs/common';
|
||||||
|
import { createClient } from 'redis';
|
||||||
|
import { SecretModule } from '../../global/secret/secret.module';
|
||||||
|
import { SecretService } from '../../global/secret/secret.service';
|
||||||
|
import { loadRedisClientOptions } from '../../global/redis/redis.config';
|
||||||
|
import { AUCTION_REDIS_CLIENT } from './auction-redis.constants';
|
||||||
|
import {
|
||||||
|
AuctionRedisService,
|
||||||
|
type AuctionRedisClient,
|
||||||
|
} from './auction-redis.service';
|
||||||
|
import { AuctionRedisCommandService } from './auction-redis-command.service';
|
||||||
|
import { AuctionRedisStateReaderService } from './auction-redis-state-reader.service';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [SecretModule],
|
||||||
|
providers: [
|
||||||
|
{
|
||||||
|
provide: AUCTION_REDIS_CLIENT,
|
||||||
|
inject: [SecretService],
|
||||||
|
useFactory: async (
|
||||||
|
secretService: SecretService,
|
||||||
|
): Promise<AuctionRedisClient> => {
|
||||||
|
const logger = new Logger('AuctionRedisClient');
|
||||||
|
const client = createClient(
|
||||||
|
await loadRedisClientOptions(secretService),
|
||||||
|
);
|
||||||
|
client.on('error', (error: unknown) => {
|
||||||
|
logger.error(
|
||||||
|
`Auction Redis client error: ${
|
||||||
|
error instanceof Error ? error.message : String(error)
|
||||||
|
}`,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
await client.connect();
|
||||||
|
logger.log('Auction Redis connected');
|
||||||
|
|
||||||
|
return client;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
AuctionRedisService,
|
||||||
|
AuctionRedisCommandService,
|
||||||
|
AuctionRedisStateReaderService,
|
||||||
|
],
|
||||||
|
exports: [
|
||||||
|
AuctionRedisService,
|
||||||
|
AuctionRedisCommandService,
|
||||||
|
AuctionRedisStateReaderService,
|
||||||
|
AUCTION_REDIS_CLIENT,
|
||||||
|
],
|
||||||
|
})
|
||||||
|
export class AuctionRedisModule {}
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
import { buildAuctionRedisKeys } from './auction-redis.keys';
|
||||||
|
import {
|
||||||
|
AUCTION_RESERVE_ACTION_REQUEST_SCRIPT,
|
||||||
|
buildActionRequestPayloadFingerprint,
|
||||||
|
buildAuctionReserveActionRequestScriptInvocation,
|
||||||
|
} from './auction-redis.reserve-action';
|
||||||
|
|
||||||
|
describe('auction reserve action request redis script contract', () => {
|
||||||
|
it('builds RESERVE_AUCTION_ACTION_REQUEST keys and values', () => {
|
||||||
|
const invocation = buildAuctionReserveActionRequestScriptInvocation(
|
||||||
|
buildAuctionRedisKeys('match-1'),
|
||||||
|
{
|
||||||
|
auctionActionRequestId: 'request-1',
|
||||||
|
auctionActionType: 'sold',
|
||||||
|
auctionStateTransitionId: 'transition-1',
|
||||||
|
clientObservedAuctionLifecycleId: 'life-1',
|
||||||
|
clientObservedPhase: 'bidding',
|
||||||
|
clientObservedRevision: 8,
|
||||||
|
leaseDurationMS: 10_000,
|
||||||
|
maximumStoredAuctionActionRequestResultCount: 100,
|
||||||
|
minimumAuctionActionRequestResultReplayWindowMS: 60_000,
|
||||||
|
newAuctionLifecycleId: undefined,
|
||||||
|
processingOwnerToken: 'owner-1',
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(invocation.script).toBe(AUCTION_RESERVE_ACTION_REQUEST_SCRIPT);
|
||||||
|
expect(invocation.keys).toEqual([
|
||||||
|
'auction:match-1:auctionActionRequestResults',
|
||||||
|
'auction:match-1:auctionActionRequestResultOrder',
|
||||||
|
]);
|
||||||
|
expect(invocation.values).toEqual([
|
||||||
|
'life-1',
|
||||||
|
'request-1',
|
||||||
|
'sold',
|
||||||
|
'transition-1',
|
||||||
|
'',
|
||||||
|
'owner-1',
|
||||||
|
'10000',
|
||||||
|
'100',
|
||||||
|
'60000',
|
||||||
|
'life-1|request-1|sold|8|bidding||',
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('builds stable action request fingerprints', () => {
|
||||||
|
expect(
|
||||||
|
buildActionRequestPayloadFingerprint({
|
||||||
|
auctionActionRequestId: 'request-1',
|
||||||
|
auctionActionType: 'next',
|
||||||
|
clientObservedAuctionLifecycleId: 'life-1',
|
||||||
|
clientObservedCurrentAuctionPlayerOrderIndex: 3,
|
||||||
|
clientObservedCurrentBidRoundPlayerUserId: 'player-1',
|
||||||
|
clientObservedPhase: 'sold',
|
||||||
|
clientObservedRevision: 9,
|
||||||
|
}),
|
||||||
|
).toBe('life-1|request-1|next|9|sold|player-1|3');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps lease version and replay guards in Lua', () => {
|
||||||
|
expect(AUCTION_RESERVE_ACTION_REQUEST_SCRIPT.lua).toContain(
|
||||||
|
"redis.call('TIME')",
|
||||||
|
);
|
||||||
|
expect(AUCTION_RESERVE_ACTION_REQUEST_SCRIPT.lua).toContain(
|
||||||
|
'processingLeaseVersion',
|
||||||
|
);
|
||||||
|
expect(AUCTION_RESERVE_ACTION_REQUEST_SCRIPT.lua).toContain(
|
||||||
|
'ACTION_REQUEST_IN_PROGRESS',
|
||||||
|
);
|
||||||
|
expect(AUCTION_RESERVE_ACTION_REQUEST_SCRIPT.lua).toContain(
|
||||||
|
'ACTION_REQUEST_RESULT_LIMIT',
|
||||||
|
);
|
||||||
|
expect(AUCTION_RESERVE_ACTION_REQUEST_SCRIPT.lua).toContain(
|
||||||
|
'DUPLICATE_ACTION_REQUEST_CONFLICT',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,233 @@
|
|||||||
|
import type { AuctionRedisKeys } from './auction-redis.keys';
|
||||||
|
import { defineAuctionRedisScript } from './auction-redis.scripts';
|
||||||
|
|
||||||
|
export interface AuctionReserveActionRequestScriptInput {
|
||||||
|
auctionActionRequestId: string;
|
||||||
|
auctionActionType: string;
|
||||||
|
auctionStateTransitionId: string;
|
||||||
|
clientObservedAuctionLifecycleId: string;
|
||||||
|
clientObservedCurrentAuctionPlayerOrderIndex?: number;
|
||||||
|
clientObservedCurrentBidRoundPlayerUserId?: string;
|
||||||
|
clientObservedPhase: string;
|
||||||
|
clientObservedRevision: number;
|
||||||
|
leaseDurationMS: number;
|
||||||
|
maximumStoredAuctionActionRequestResultCount: number;
|
||||||
|
minimumAuctionActionRequestResultReplayWindowMS: number;
|
||||||
|
newAuctionLifecycleId?: string;
|
||||||
|
processingOwnerToken: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AuctionReserveActionRequestScriptInvocation {
|
||||||
|
keys: string[];
|
||||||
|
script: typeof AUCTION_RESERVE_ACTION_REQUEST_SCRIPT;
|
||||||
|
values: string[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export function buildActionRequestPayloadFingerprint(params: {
|
||||||
|
auctionActionRequestId: string;
|
||||||
|
auctionActionType: string;
|
||||||
|
clientObservedAuctionLifecycleId: string;
|
||||||
|
clientObservedCurrentAuctionPlayerOrderIndex?: number;
|
||||||
|
clientObservedCurrentBidRoundPlayerUserId?: string;
|
||||||
|
clientObservedPhase: string;
|
||||||
|
clientObservedRevision: number;
|
||||||
|
}): string {
|
||||||
|
return [
|
||||||
|
params.clientObservedAuctionLifecycleId,
|
||||||
|
params.auctionActionRequestId,
|
||||||
|
params.auctionActionType,
|
||||||
|
params.clientObservedRevision,
|
||||||
|
params.clientObservedPhase,
|
||||||
|
params.clientObservedCurrentBidRoundPlayerUserId ?? '',
|
||||||
|
params.clientObservedCurrentAuctionPlayerOrderIndex ?? '',
|
||||||
|
].join('|');
|
||||||
|
}
|
||||||
|
|
||||||
|
export function buildAuctionReserveActionRequestScriptInvocation(
|
||||||
|
keys: AuctionRedisKeys,
|
||||||
|
input: AuctionReserveActionRequestScriptInput,
|
||||||
|
): AuctionReserveActionRequestScriptInvocation {
|
||||||
|
return {
|
||||||
|
keys: [keys.actionRequestResultsKey, keys.actionRequestResultOrderKey],
|
||||||
|
script: AUCTION_RESERVE_ACTION_REQUEST_SCRIPT,
|
||||||
|
values: [
|
||||||
|
input.clientObservedAuctionLifecycleId,
|
||||||
|
input.auctionActionRequestId,
|
||||||
|
input.auctionActionType,
|
||||||
|
input.auctionStateTransitionId,
|
||||||
|
input.newAuctionLifecycleId ?? '',
|
||||||
|
input.processingOwnerToken,
|
||||||
|
String(input.leaseDurationMS),
|
||||||
|
String(input.maximumStoredAuctionActionRequestResultCount),
|
||||||
|
String(input.minimumAuctionActionRequestResultReplayWindowMS),
|
||||||
|
buildActionRequestPayloadFingerprint(input),
|
||||||
|
],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export const AUCTION_RESERVE_ACTION_REQUEST_SCRIPT = defineAuctionRedisScript(
|
||||||
|
'auction.reserveActionRequest',
|
||||||
|
`
|
||||||
|
local auctionActionRequestResultsKey = KEYS[1]
|
||||||
|
local auctionActionRequestResultOrderKey = KEYS[2]
|
||||||
|
|
||||||
|
local clientObservedAuctionLifecycleId = ARGV[1]
|
||||||
|
local auctionActionRequestId = ARGV[2]
|
||||||
|
local auctionActionType = ARGV[3]
|
||||||
|
local auctionStateTransitionId = ARGV[4]
|
||||||
|
local newAuctionLifecycleId = ARGV[5]
|
||||||
|
local processingOwnerToken = ARGV[6]
|
||||||
|
local leaseDurationMS = tonumber(ARGV[7])
|
||||||
|
local maximumStoredAuctionActionRequestResultCount = tonumber(ARGV[8])
|
||||||
|
local minimumAuctionActionRequestResultReplayWindowMS = tonumber(ARGV[9])
|
||||||
|
local actionRequestPayloadFingerprint = ARGV[10]
|
||||||
|
|
||||||
|
local redisTime = redis.call('TIME')
|
||||||
|
local currentRedisTimestampMS = (tonumber(redisTime[1]) * 1000) + math.floor(tonumber(redisTime[2]) / 1000)
|
||||||
|
local actionRequestScopeKey = clientObservedAuctionLifecycleId .. ':' .. auctionActionRequestId
|
||||||
|
|
||||||
|
local function requestField(suffix)
|
||||||
|
return actionRequestScopeKey .. ':' .. suffix
|
||||||
|
end
|
||||||
|
|
||||||
|
local function hdelActionRequest(scopeKey)
|
||||||
|
redis.call(
|
||||||
|
'HDEL',
|
||||||
|
auctionActionRequestResultsKey,
|
||||||
|
scopeKey .. ':fingerprint',
|
||||||
|
scopeKey .. ':status',
|
||||||
|
scopeKey .. ':revision',
|
||||||
|
scopeKey .. ':rejectCode',
|
||||||
|
scopeKey .. ':auctionActionType',
|
||||||
|
scopeKey .. ':auctionStateTransitionId',
|
||||||
|
scopeKey .. ':newAuctionLifecycleId',
|
||||||
|
scopeKey .. ':processingOwnerToken',
|
||||||
|
scopeKey .. ':processingLeaseExpiresAtTimestampMS',
|
||||||
|
scopeKey .. ':processingLeaseVersion',
|
||||||
|
scopeKey .. ':responseServerTimestampMS',
|
||||||
|
scopeKey .. ':responseJson',
|
||||||
|
scopeKey .. ':requiresRefetch',
|
||||||
|
scopeKey .. ':createdAtTimestampMS'
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
local function trimOldActionRequestResults()
|
||||||
|
while redis.call('LLEN', auctionActionRequestResultOrderKey) >= maximumStoredAuctionActionRequestResultCount do
|
||||||
|
local oldestActionRequestScopeKey = redis.call('LINDEX', auctionActionRequestResultOrderKey, 0)
|
||||||
|
if not oldestActionRequestScopeKey then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
local createdAtTimestampMS = tonumber(redis.call('HGET', auctionActionRequestResultsKey, oldestActionRequestScopeKey .. ':createdAtTimestampMS') or '0')
|
||||||
|
if createdAtTimestampMS > currentRedisTimestampMS - minimumAuctionActionRequestResultReplayWindowMS then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
redis.call('LPOP', auctionActionRequestResultOrderKey)
|
||||||
|
hdelActionRequest(oldestActionRequestScopeKey)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
local existingFingerprint = redis.call('HGET', auctionActionRequestResultsKey, requestField('fingerprint'))
|
||||||
|
if existingFingerprint then
|
||||||
|
if existingFingerprint ~= actionRequestPayloadFingerprint then
|
||||||
|
return {'REJECTED', 'DUPLICATE_ACTION_REQUEST_CONFLICT', actionRequestScopeKey, tostring(currentRedisTimestampMS)}
|
||||||
|
end
|
||||||
|
|
||||||
|
local status = redis.call('HGET', auctionActionRequestResultsKey, requestField('status')) or ''
|
||||||
|
if status == 'applied' or status == 'rejected' then
|
||||||
|
return {
|
||||||
|
'REPLAY',
|
||||||
|
status,
|
||||||
|
actionRequestScopeKey,
|
||||||
|
redis.call('HGET', auctionActionRequestResultsKey, requestField('revision')) or '',
|
||||||
|
redis.call('HGET', auctionActionRequestResultsKey, requestField('rejectCode')) or '',
|
||||||
|
redis.call('HGET', auctionActionRequestResultsKey, requestField('auctionStateTransitionId')) or '',
|
||||||
|
redis.call('HGET', auctionActionRequestResultsKey, requestField('newAuctionLifecycleId')) or '',
|
||||||
|
redis.call('HGET', auctionActionRequestResultsKey, requestField('processingLeaseVersion')) or '',
|
||||||
|
redis.call('HGET', auctionActionRequestResultsKey, requestField('responseServerTimestampMS')) or tostring(currentRedisTimestampMS),
|
||||||
|
redis.call('HGET', auctionActionRequestResultsKey, requestField('responseJson')) or '',
|
||||||
|
redis.call('HGET', auctionActionRequestResultsKey, requestField('requiresRefetch')) or ''
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
local leaseExpiresAtTimestampMS = tonumber(redis.call('HGET', auctionActionRequestResultsKey, requestField('processingLeaseExpiresAtTimestampMS')) or '0')
|
||||||
|
local storedOwnerToken = redis.call('HGET', auctionActionRequestResultsKey, requestField('processingOwnerToken')) or ''
|
||||||
|
local storedLeaseVersion = tonumber(redis.call('HGET', auctionActionRequestResultsKey, requestField('processingLeaseVersion')) or '1')
|
||||||
|
if leaseExpiresAtTimestampMS > currentRedisTimestampMS and storedOwnerToken ~= processingOwnerToken then
|
||||||
|
return {'REJECTED', 'ACTION_REQUEST_IN_PROGRESS', actionRequestScopeKey, tostring(currentRedisTimestampMS)}
|
||||||
|
end
|
||||||
|
|
||||||
|
local nextLeaseVersion = storedLeaseVersion
|
||||||
|
local wasLeaseExpired = '0'
|
||||||
|
if leaseExpiresAtTimestampMS <= currentRedisTimestampMS then
|
||||||
|
nextLeaseVersion = storedLeaseVersion + 1
|
||||||
|
wasLeaseExpired = '1'
|
||||||
|
end
|
||||||
|
|
||||||
|
redis.call(
|
||||||
|
'HSET',
|
||||||
|
auctionActionRequestResultsKey,
|
||||||
|
requestField('status'),
|
||||||
|
'processing',
|
||||||
|
requestField('processingOwnerToken'),
|
||||||
|
processingOwnerToken,
|
||||||
|
requestField('processingLeaseExpiresAtTimestampMS'),
|
||||||
|
tostring(currentRedisTimestampMS + leaseDurationMS),
|
||||||
|
requestField('processingLeaseVersion'),
|
||||||
|
tostring(nextLeaseVersion),
|
||||||
|
requestField('responseServerTimestampMS'),
|
||||||
|
tostring(currentRedisTimestampMS)
|
||||||
|
)
|
||||||
|
|
||||||
|
return {
|
||||||
|
'RESERVED',
|
||||||
|
actionRequestScopeKey,
|
||||||
|
redis.call('HGET', auctionActionRequestResultsKey, requestField('auctionStateTransitionId')) or auctionStateTransitionId,
|
||||||
|
redis.call('HGET', auctionActionRequestResultsKey, requestField('newAuctionLifecycleId')) or '',
|
||||||
|
tostring(nextLeaseVersion),
|
||||||
|
wasLeaseExpired,
|
||||||
|
tostring(currentRedisTimestampMS)
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
trimOldActionRequestResults()
|
||||||
|
if redis.call('LLEN', auctionActionRequestResultOrderKey) >= maximumStoredAuctionActionRequestResultCount then
|
||||||
|
return {'REJECTED', 'ACTION_REQUEST_RESULT_LIMIT', actionRequestScopeKey, tostring(currentRedisTimestampMS)}
|
||||||
|
end
|
||||||
|
|
||||||
|
redis.call(
|
||||||
|
'HSET',
|
||||||
|
auctionActionRequestResultsKey,
|
||||||
|
requestField('fingerprint'),
|
||||||
|
actionRequestPayloadFingerprint,
|
||||||
|
requestField('status'),
|
||||||
|
'processing',
|
||||||
|
requestField('auctionActionType'),
|
||||||
|
auctionActionType,
|
||||||
|
requestField('auctionStateTransitionId'),
|
||||||
|
auctionStateTransitionId,
|
||||||
|
requestField('newAuctionLifecycleId'),
|
||||||
|
newAuctionLifecycleId,
|
||||||
|
requestField('processingOwnerToken'),
|
||||||
|
processingOwnerToken,
|
||||||
|
requestField('processingLeaseExpiresAtTimestampMS'),
|
||||||
|
tostring(currentRedisTimestampMS + leaseDurationMS),
|
||||||
|
requestField('processingLeaseVersion'),
|
||||||
|
'1',
|
||||||
|
requestField('responseServerTimestampMS'),
|
||||||
|
tostring(currentRedisTimestampMS),
|
||||||
|
requestField('createdAtTimestampMS'),
|
||||||
|
tostring(currentRedisTimestampMS)
|
||||||
|
)
|
||||||
|
redis.call('RPUSH', auctionActionRequestResultOrderKey, actionRequestScopeKey)
|
||||||
|
|
||||||
|
return {
|
||||||
|
'RESERVED',
|
||||||
|
actionRequestScopeKey,
|
||||||
|
auctionStateTransitionId,
|
||||||
|
newAuctionLifecycleId,
|
||||||
|
'1',
|
||||||
|
'0',
|
||||||
|
tostring(currentRedisTimestampMS)
|
||||||
|
}
|
||||||
|
`,
|
||||||
|
);
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
import { createHash } from 'crypto';
|
||||||
|
import { defineAuctionRedisScript } from './auction-redis.scripts';
|
||||||
|
|
||||||
|
describe('auction redis scripts', () => {
|
||||||
|
it('stores normalized Lua and its SHA1', () => {
|
||||||
|
const script = defineAuctionRedisScript('test', 'return 1\n');
|
||||||
|
|
||||||
|
expect(script).toEqual({
|
||||||
|
lua: 'return 1\n',
|
||||||
|
name: 'test',
|
||||||
|
sha: createHash('sha1').update('return 1\n').digest('hex'),
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
import { createHash } from 'crypto';
|
||||||
|
|
||||||
|
export interface AuctionRedisScriptDefinition {
|
||||||
|
lua: string;
|
||||||
|
name: string;
|
||||||
|
sha: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function defineAuctionRedisScript(
|
||||||
|
name: string,
|
||||||
|
lua: string,
|
||||||
|
): AuctionRedisScriptDefinition {
|
||||||
|
return {
|
||||||
|
lua,
|
||||||
|
name,
|
||||||
|
sha: createHash('sha1').update(lua).digest('hex'),
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
import {
|
||||||
|
AuctionRedisNoscriptError,
|
||||||
|
AuctionRedisService,
|
||||||
|
} from './auction-redis.service';
|
||||||
|
|
||||||
|
function makeService(sendCommand: jest.Mock) {
|
||||||
|
const client = {
|
||||||
|
destroy: jest.fn(),
|
||||||
|
quit: jest.fn().mockResolvedValue(undefined),
|
||||||
|
sendCommand,
|
||||||
|
};
|
||||||
|
|
||||||
|
return new AuctionRedisService(client as never);
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('AuctionRedisService', () => {
|
||||||
|
it('uses Redis TIME as the timestamp source', async () => {
|
||||||
|
const service = makeService(
|
||||||
|
jest.fn().mockResolvedValue(['1781700000', '123000']),
|
||||||
|
);
|
||||||
|
|
||||||
|
await expect(service.getCurrentRedisTimestampMS()).resolves.toBe(
|
||||||
|
1_781_700_000_123,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('loads and retries a script once when EVALSHA returns NOSCRIPT', async () => {
|
||||||
|
const sendCommand = jest
|
||||||
|
.fn()
|
||||||
|
.mockRejectedValueOnce(new AuctionRedisNoscriptError())
|
||||||
|
.mockResolvedValueOnce('sha-from-redis')
|
||||||
|
.mockResolvedValueOnce(['ok']);
|
||||||
|
const service = makeService(sendCommand);
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.evalShaWithReload({
|
||||||
|
keys: ['auction:state:1'],
|
||||||
|
script: 'return 1',
|
||||||
|
scriptSha: 'old-sha',
|
||||||
|
values: ['v1'],
|
||||||
|
}),
|
||||||
|
).resolves.toEqual(['ok']);
|
||||||
|
|
||||||
|
expect(sendCommand.mock.calls).toEqual([
|
||||||
|
[['EVALSHA', 'old-sha', '1', 'auction:state:1', 'v1']],
|
||||||
|
[['SCRIPT', 'LOAD', 'return 1']],
|
||||||
|
[['EVALSHA', 'sha-from-redis', '1', 'auction:state:1', 'v1']],
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not reload scripts for non-NOSCRIPT errors', async () => {
|
||||||
|
const error = new Error('OOM command not allowed');
|
||||||
|
const sendCommand = jest.fn().mockRejectedValue(error);
|
||||||
|
const service = makeService(sendCommand);
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.evalShaWithReload({
|
||||||
|
keys: [],
|
||||||
|
script: 'return 1',
|
||||||
|
scriptSha: 'sha',
|
||||||
|
values: [],
|
||||||
|
}),
|
||||||
|
).rejects.toBe(error);
|
||||||
|
expect(sendCommand).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,135 @@
|
|||||||
|
import { Inject, Injectable, OnModuleDestroy } from '@nestjs/common';
|
||||||
|
import type { createClient } from 'redis';
|
||||||
|
import { AUCTION_REDIS_CLIENT } from './auction-redis.constants';
|
||||||
|
import type { AuctionRedisScriptDefinition } from './auction-redis.scripts';
|
||||||
|
|
||||||
|
export type AuctionRedisClient = ReturnType<typeof createClient>;
|
||||||
|
|
||||||
|
export interface EvalShaWithReloadParams {
|
||||||
|
keys: string[];
|
||||||
|
script: string;
|
||||||
|
scriptSha: string;
|
||||||
|
values: string[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export class AuctionRedisNoscriptError extends Error {
|
||||||
|
constructor(message = 'NOSCRIPT No matching script. Please use EVAL.') {
|
||||||
|
super(message);
|
||||||
|
this.name = 'AuctionRedisNoscriptError';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function isNoscriptError(error: unknown): boolean {
|
||||||
|
if (error instanceof AuctionRedisNoscriptError) return true;
|
||||||
|
const message =
|
||||||
|
error instanceof Error
|
||||||
|
? error.message
|
||||||
|
: typeof error === 'string'
|
||||||
|
? error
|
||||||
|
: '';
|
||||||
|
return /\bNOSCRIPT\b/iu.test(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildEvalShaCommand(
|
||||||
|
scriptSha: string,
|
||||||
|
keys: string[],
|
||||||
|
values: string[],
|
||||||
|
): string[] {
|
||||||
|
return ['EVALSHA', scriptSha, String(keys.length), ...keys, ...values];
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseRedisTimeReply(reply: unknown): number {
|
||||||
|
if (Array.isArray(reply) && reply.length >= 2) {
|
||||||
|
const seconds = Number(reply[0]);
|
||||||
|
const microseconds = Number(reply[1]);
|
||||||
|
if (Number.isFinite(seconds) && Number.isFinite(microseconds)) {
|
||||||
|
return seconds * 1000 + Math.floor(microseconds / 1000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new Error(`Unexpected Redis TIME reply: ${JSON.stringify(reply)}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class AuctionRedisService implements OnModuleDestroy {
|
||||||
|
constructor(
|
||||||
|
@Inject(AUCTION_REDIS_CLIENT)
|
||||||
|
private readonly client: AuctionRedisClient,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
async onModuleDestroy() {
|
||||||
|
try {
|
||||||
|
await this.client.quit();
|
||||||
|
} catch {
|
||||||
|
this.client.destroy();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public raw(): AuctionRedisClient {
|
||||||
|
return this.client;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async getCurrentRedisTimestampMS(): Promise<number> {
|
||||||
|
const reply = await this.client.sendCommand(['TIME']);
|
||||||
|
return parseRedisTimeReply(reply);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async evalShaWithReload<T = unknown>(
|
||||||
|
params: EvalShaWithReloadParams,
|
||||||
|
): Promise<T> {
|
||||||
|
try {
|
||||||
|
return (await this.client.sendCommand(
|
||||||
|
buildEvalShaCommand(params.scriptSha, params.keys, params.values),
|
||||||
|
)) as T;
|
||||||
|
} catch (error) {
|
||||||
|
if (!isNoscriptError(error)) throw error;
|
||||||
|
}
|
||||||
|
|
||||||
|
const loadedShaReply = await this.client.sendCommand([
|
||||||
|
'SCRIPT',
|
||||||
|
'LOAD',
|
||||||
|
params.script,
|
||||||
|
]);
|
||||||
|
if (typeof loadedShaReply !== 'string') {
|
||||||
|
throw new Error('Redis SCRIPT LOAD returned a non-string SHA.');
|
||||||
|
}
|
||||||
|
const loadedSha = loadedShaReply;
|
||||||
|
return (await this.client.sendCommand(
|
||||||
|
buildEvalShaCommand(loadedSha, params.keys, params.values),
|
||||||
|
)) as T;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async evalScript<T = unknown>(
|
||||||
|
script: AuctionRedisScriptDefinition,
|
||||||
|
keys: string[],
|
||||||
|
values: string[],
|
||||||
|
): Promise<T> {
|
||||||
|
return this.evalShaWithReload<T>({
|
||||||
|
keys,
|
||||||
|
script: script.lua,
|
||||||
|
scriptSha: script.sha,
|
||||||
|
values,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public async acquireTokenLock(
|
||||||
|
key: string,
|
||||||
|
token: string,
|
||||||
|
ttlMS: number,
|
||||||
|
): Promise<boolean> {
|
||||||
|
const result = await this.client.sendCommand<string | null>([
|
||||||
|
'SET',
|
||||||
|
key,
|
||||||
|
token,
|
||||||
|
'PX',
|
||||||
|
String(ttlMS),
|
||||||
|
'NX',
|
||||||
|
]);
|
||||||
|
return result === 'OK';
|
||||||
|
}
|
||||||
|
|
||||||
|
public async releaseTokenLock(key: string, token: string): Promise<boolean> {
|
||||||
|
const result = await this.client.sendCommand(['DELEX', key, 'IFEQ', token]);
|
||||||
|
return Number(result) === 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,109 @@
|
|||||||
|
import { buildAuctionRedisKeys } from './auction-redis.keys';
|
||||||
|
import {
|
||||||
|
AUCTION_HYDRATE_STATE_SCRIPT,
|
||||||
|
assembleAuctionViewFromRedisState,
|
||||||
|
buildHydrateAuctionStateScriptInvocation,
|
||||||
|
shouldHydrateRedisAuctionState,
|
||||||
|
} from './auction-redis.state';
|
||||||
|
|
||||||
|
describe('auction redis state assembly', () => {
|
||||||
|
it.each([
|
||||||
|
{
|
||||||
|
expected: true,
|
||||||
|
live: null,
|
||||||
|
mongo: { auctionLifecycleId: 'life-1', revision: 1 },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
expected: true,
|
||||||
|
live: { auctionLifecycleId: 'life-1', revision: 1 },
|
||||||
|
mongo: { auctionLifecycleId: 'life-1', revision: 2 },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
expected: true,
|
||||||
|
live: { auctionLifecycleId: 'old-life', revision: 2 },
|
||||||
|
mongo: { auctionLifecycleId: 'new-life', revision: 2 },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
expected: true,
|
||||||
|
live: { auctionLifecycleId: 'redis-life', revision: 3 },
|
||||||
|
mongo: { auctionLifecycleId: 'mongo-life', revision: 2 },
|
||||||
|
},
|
||||||
|
])('decides rehydrate need: %#', ({ live, mongo, expected }) => {
|
||||||
|
expect(shouldHydrateRedisAuctionState({ live, mongo })).toBe(expected);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('assembles public view and maps internal expiring phase to bidding', () => {
|
||||||
|
expect(
|
||||||
|
assembleAuctionViewFromRedisState({
|
||||||
|
auctionBidHistoryEntries: ['{"bidPointAmount":100}'],
|
||||||
|
currentServerTimestampMS: 1_000,
|
||||||
|
liveState: {
|
||||||
|
auctionLifecycleId: 'life-1',
|
||||||
|
currentBidRoundPlayerUserId: 'player-1',
|
||||||
|
phase: 'expiring',
|
||||||
|
revision: 3,
|
||||||
|
},
|
||||||
|
shouldForceAuctionStateResync: true,
|
||||||
|
structureState: {
|
||||||
|
auctionTeams: [],
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
).toMatchObject({
|
||||||
|
auctionBidHistory: [{ bidPointAmount: 100 }],
|
||||||
|
auctionLifecycleId: 'life-1',
|
||||||
|
canPlaceBidInCurrentBidRound: false,
|
||||||
|
currentBidRoundPlayerUserId: 'player-1',
|
||||||
|
currentServerTimestampMS: 1000,
|
||||||
|
isAuctionStateTransitionInProgress: true,
|
||||||
|
phase: 'bidding',
|
||||||
|
revision: 3,
|
||||||
|
shouldForceAuctionStateResync: true,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('builds HYDRATE invocation and keeps CAS conditions in Lua', () => {
|
||||||
|
const invocation = buildHydrateAuctionStateScriptInvocation(
|
||||||
|
buildAuctionRedisKeys('match-1'),
|
||||||
|
{
|
||||||
|
auctionHistorySequence: 4,
|
||||||
|
auctionLifecycleId: 'life-1',
|
||||||
|
liveStatePatch: {
|
||||||
|
'team:1:assignedAuctionTeamMemberCount': 1,
|
||||||
|
'team:1:remainingBidPointAmount': 1000,
|
||||||
|
},
|
||||||
|
maximumBidRoundDurationSeconds: 30,
|
||||||
|
matchId: 'match-1',
|
||||||
|
phase: 'bidding',
|
||||||
|
revision: 7,
|
||||||
|
structureStateJson: '{"auctionTeams":[]}',
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(invocation.script).toBe(AUCTION_HYDRATE_STATE_SCRIPT);
|
||||||
|
expect(invocation.keys).toEqual([
|
||||||
|
'auction:match-1:liveAuctionState',
|
||||||
|
'auction:match-1:auctionStructureState',
|
||||||
|
'auction:bidRoundDeadlineQueue',
|
||||||
|
]);
|
||||||
|
expect(invocation.values).toEqual([
|
||||||
|
'match-1',
|
||||||
|
'life-1',
|
||||||
|
'7',
|
||||||
|
'bidding',
|
||||||
|
'4',
|
||||||
|
'30',
|
||||||
|
'{"auctionTeams":[]}',
|
||||||
|
'2',
|
||||||
|
'team:1:assignedAuctionTeamMemberCount',
|
||||||
|
'1',
|
||||||
|
'team:1:remainingBidPointAmount',
|
||||||
|
'1000',
|
||||||
|
]);
|
||||||
|
expect(AUCTION_HYDRATE_STATE_SCRIPT.lua).toContain("redis.call('TIME')");
|
||||||
|
expect(AUCTION_HYDRATE_STATE_SCRIPT.lua).toContain('INVALID_PATCH_ARITY');
|
||||||
|
expect(AUCTION_HYDRATE_STATE_SCRIPT.lua).toContain(
|
||||||
|
'mongoRevision > redisRevision',
|
||||||
|
);
|
||||||
|
expect(AUCTION_HYDRATE_STATE_SCRIPT.lua).toContain("redis.call('ZADD'");
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,194 @@
|
|||||||
|
import type { AuctionRedisKeys } from './auction-redis.keys';
|
||||||
|
import { defineAuctionRedisScript } from './auction-redis.scripts';
|
||||||
|
|
||||||
|
export interface AuctionRedisRevisionIdentity {
|
||||||
|
auctionLifecycleId?: string;
|
||||||
|
revision?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ShouldHydrateRedisAuctionStateParams {
|
||||||
|
live: AuctionRedisRevisionIdentity | null;
|
||||||
|
mongo: Required<AuctionRedisRevisionIdentity>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AssembleAuctionViewParams {
|
||||||
|
auctionBidHistoryEntries: string[];
|
||||||
|
currentServerTimestampMS: number;
|
||||||
|
liveState: Record<string, unknown> & {
|
||||||
|
auctionLifecycleId: string;
|
||||||
|
phase: string;
|
||||||
|
revision: number;
|
||||||
|
};
|
||||||
|
shouldForceAuctionStateResync?: boolean;
|
||||||
|
structureState: Record<string, unknown>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface HydrateAuctionStateScriptInput {
|
||||||
|
auctionHistorySequence: number;
|
||||||
|
auctionLifecycleId: string;
|
||||||
|
liveStatePatch?: Record<string, string | number | boolean | null | undefined>;
|
||||||
|
maximumBidRoundDurationSeconds: number;
|
||||||
|
matchId: string;
|
||||||
|
phase: string;
|
||||||
|
revision: number;
|
||||||
|
structureStateJson: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface HydrateAuctionStateScriptInvocation {
|
||||||
|
keys: string[];
|
||||||
|
script: typeof AUCTION_HYDRATE_STATE_SCRIPT;
|
||||||
|
values: string[];
|
||||||
|
}
|
||||||
|
|
||||||
|
function stringifyRedisValue(value: string | number | boolean | null): string {
|
||||||
|
if (typeof value === 'boolean') return value ? '1' : '0';
|
||||||
|
if (value === null) return '';
|
||||||
|
return String(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
function flattenLiveStatePatch(
|
||||||
|
liveStatePatch: HydrateAuctionStateScriptInput['liveStatePatch'],
|
||||||
|
): string[] {
|
||||||
|
return Object.entries(liveStatePatch ?? {})
|
||||||
|
.filter(([, value]) => value !== undefined)
|
||||||
|
.sort(([a], [b]) => a.localeCompare(b))
|
||||||
|
.flatMap(([key, value]) => [
|
||||||
|
key,
|
||||||
|
stringifyRedisValue(value as string | number | boolean | null),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function shouldHydrateRedisAuctionState(
|
||||||
|
params: ShouldHydrateRedisAuctionStateParams,
|
||||||
|
): boolean {
|
||||||
|
if (!params.live) return true;
|
||||||
|
if (params.mongo.auctionLifecycleId !== params.live.auctionLifecycleId)
|
||||||
|
return true;
|
||||||
|
const redisRevision = params.live.revision ?? -1;
|
||||||
|
const mongoRevision = params.mongo.revision;
|
||||||
|
return mongoRevision > redisRevision;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function assembleAuctionViewFromRedisState(
|
||||||
|
params: AssembleAuctionViewParams,
|
||||||
|
): Record<string, unknown> {
|
||||||
|
const isExpiring = params.liveState.phase === 'expiring';
|
||||||
|
return {
|
||||||
|
...params.structureState,
|
||||||
|
...params.liveState,
|
||||||
|
auctionBidHistory: params.auctionBidHistoryEntries.map(parseJsonValue),
|
||||||
|
canPlaceBidInCurrentBidRound: !isExpiring,
|
||||||
|
currentServerTimestampMS: params.currentServerTimestampMS,
|
||||||
|
isAuctionStateTransitionInProgress: isExpiring,
|
||||||
|
phase: isExpiring ? 'bidding' : params.liveState.phase,
|
||||||
|
shouldForceAuctionStateResync:
|
||||||
|
params.shouldForceAuctionStateResync || undefined,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseJsonValue(json: string): unknown {
|
||||||
|
const value: unknown = JSON.parse(json);
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function buildHydrateAuctionStateScriptInvocation(
|
||||||
|
keys: AuctionRedisKeys,
|
||||||
|
input: HydrateAuctionStateScriptInput,
|
||||||
|
): HydrateAuctionStateScriptInvocation {
|
||||||
|
const liveStatePatchPairs = flattenLiveStatePatch(input.liveStatePatch);
|
||||||
|
return {
|
||||||
|
keys: [keys.liveStateKey, keys.structureStateKey, keys.deadlineQueueKey],
|
||||||
|
script: AUCTION_HYDRATE_STATE_SCRIPT,
|
||||||
|
values: [
|
||||||
|
input.matchId,
|
||||||
|
input.auctionLifecycleId,
|
||||||
|
String(input.revision),
|
||||||
|
input.phase,
|
||||||
|
String(input.auctionHistorySequence),
|
||||||
|
String(input.maximumBidRoundDurationSeconds),
|
||||||
|
input.structureStateJson,
|
||||||
|
String(liveStatePatchPairs.length / 2),
|
||||||
|
...liveStatePatchPairs,
|
||||||
|
],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export const AUCTION_HYDRATE_STATE_SCRIPT = defineAuctionRedisScript(
|
||||||
|
'auction.hydrateState',
|
||||||
|
`
|
||||||
|
local liveAuctionStateKey = KEYS[1]
|
||||||
|
local auctionStructureStateKey = KEYS[2]
|
||||||
|
local bidRoundDeadlineQueueKey = KEYS[3]
|
||||||
|
|
||||||
|
local matchId = ARGV[1]
|
||||||
|
local mongoAuctionLifecycleId = ARGV[2]
|
||||||
|
local mongoRevision = tonumber(ARGV[3])
|
||||||
|
local phase = ARGV[4]
|
||||||
|
local auctionHistorySequence = ARGV[5]
|
||||||
|
local maximumBidRoundDurationSeconds = tonumber(ARGV[6])
|
||||||
|
local structureStateJson = ARGV[7]
|
||||||
|
local liveStatePatchPairCount = tonumber(ARGV[8])
|
||||||
|
|
||||||
|
local redisTime = redis.call('TIME')
|
||||||
|
local currentRedisTimestampMS = (tonumber(redisTime[1]) * 1000) + math.floor(tonumber(redisTime[2]) / 1000)
|
||||||
|
local redisRevision = tonumber(redis.call('HGET', liveAuctionStateKey, 'revision') or '-1')
|
||||||
|
local redisAuctionLifecycleId = redis.call('HGET', liveAuctionStateKey, 'auctionLifecycleId')
|
||||||
|
|
||||||
|
if not liveStatePatchPairCount or #ARGV ~= 8 + (liveStatePatchPairCount * 2) then
|
||||||
|
return {'REJECTED', 'INVALID_PATCH_ARITY', tostring(currentRedisTimestampMS)}
|
||||||
|
end
|
||||||
|
|
||||||
|
-- A lifecycle replacement requires Mongo authority and an explicit cleanup
|
||||||
|
-- under the lifecycle lock. Revision numbers from different runs are unrelated.
|
||||||
|
if redisAuctionLifecycleId and redisAuctionLifecycleId ~= mongoAuctionLifecycleId then
|
||||||
|
return {'REJECTED', 'LIFECYCLE_CONFLICT', tostring(currentRedisTimestampMS)}
|
||||||
|
end
|
||||||
|
|
||||||
|
local shouldHydrate = false
|
||||||
|
if redisRevision < 0 then
|
||||||
|
shouldHydrate = true
|
||||||
|
elseif mongoRevision > redisRevision then
|
||||||
|
shouldHydrate = true
|
||||||
|
end
|
||||||
|
|
||||||
|
if not shouldHydrate then
|
||||||
|
return {'NOOP', tostring(redisRevision), tostring(currentRedisTimestampMS)}
|
||||||
|
end
|
||||||
|
|
||||||
|
local hydratedRevision = mongoRevision + 1
|
||||||
|
redis.call('SET', auctionStructureStateKey, structureStateJson)
|
||||||
|
local hsetArgs = {
|
||||||
|
liveAuctionStateKey,
|
||||||
|
'auctionLifecycleId',
|
||||||
|
mongoAuctionLifecycleId,
|
||||||
|
'revision',
|
||||||
|
tostring(hydratedRevision),
|
||||||
|
'phase',
|
||||||
|
phase,
|
||||||
|
'currentAuctionHistorySequence',
|
||||||
|
auctionHistorySequence,
|
||||||
|
'currentHighestBidPointAmount',
|
||||||
|
'0',
|
||||||
|
'currentHighestBidderTeamIndex',
|
||||||
|
'-1'
|
||||||
|
}
|
||||||
|
local patchIndex = 9
|
||||||
|
for i = 1, liveStatePatchPairCount do
|
||||||
|
table.insert(hsetArgs, ARGV[patchIndex])
|
||||||
|
table.insert(hsetArgs, ARGV[patchIndex + 1])
|
||||||
|
patchIndex = patchIndex + 2
|
||||||
|
end
|
||||||
|
redis.call('HSET', unpack(hsetArgs))
|
||||||
|
|
||||||
|
if phase == 'bidding' then
|
||||||
|
local currentBidRoundDeadlineTimestampMS = currentRedisTimestampMS + (maximumBidRoundDurationSeconds * 1000)
|
||||||
|
redis.call('HSET', liveAuctionStateKey, 'currentBidRoundDeadlineTimestampMS', tostring(currentBidRoundDeadlineTimestampMS))
|
||||||
|
redis.call('ZADD', bidRoundDeadlineQueueKey, currentBidRoundDeadlineTimestampMS, matchId)
|
||||||
|
else
|
||||||
|
redis.call('ZREM', bidRoundDeadlineQueueKey, matchId)
|
||||||
|
redis.call('HDEL', liveAuctionStateKey, 'currentBidRoundDeadlineTimestampMS')
|
||||||
|
end
|
||||||
|
|
||||||
|
return {'OK', tostring(hydratedRevision), tostring(currentRedisTimestampMS)}
|
||||||
|
`,
|
||||||
|
);
|
||||||
@@ -1,8 +1,5 @@
|
|||||||
import type { JWTHeaderParameters, JWTPayload } from 'jose';
|
import type { JWTHeaderParameters, JWTPayload } from 'jose';
|
||||||
import type {
|
import type { IdentityDocument, UserDocument } from '../global/database/schema';
|
||||||
IdentityDocument,
|
|
||||||
UserDocument,
|
|
||||||
} from '../global/database/schema';
|
|
||||||
import type { IdentityProviderName } from './jwt.service';
|
import type { IdentityProviderName } from './jwt.service';
|
||||||
|
|
||||||
declare module 'express' {
|
declare module 'express' {
|
||||||
|
|||||||
@@ -2,10 +2,7 @@ import { Injectable } from '@nestjs/common';
|
|||||||
import type { Request } from 'express';
|
import type { Request } from 'express';
|
||||||
import mongoose from 'mongoose';
|
import mongoose from 'mongoose';
|
||||||
import { ConnectionService } from '../global/database/connection.service';
|
import { ConnectionService } from '../global/database/connection.service';
|
||||||
import {
|
import { IdentityDocument, UserDocument } from '../global/database/schema';
|
||||||
IdentityDocument,
|
|
||||||
UserDocument,
|
|
||||||
} from '../global/database/schema';
|
|
||||||
import { SecretService } from '../global/secret/secret.service';
|
import { SecretService } from '../global/secret/secret.service';
|
||||||
import './auth-request';
|
import './auth-request';
|
||||||
|
|
||||||
|
|||||||
@@ -26,8 +26,7 @@ export class JwtAuthGuard implements CanActivate {
|
|||||||
METADATA_KEY_IS_PUBLIC_ACCESS_ALLOWED,
|
METADATA_KEY_IS_PUBLIC_ACCESS_ALLOWED,
|
||||||
[context.getHandler(), context.getClass()],
|
[context.getHandler(), context.getClass()],
|
||||||
);
|
);
|
||||||
const authz = request.headers?.authorization;
|
const authzHeader = request.get('authorization');
|
||||||
const authzHeader = Array.isArray(authz) ? authz[0] : authz;
|
|
||||||
|
|
||||||
if (!authzHeader) {
|
if (!authzHeader) {
|
||||||
const fallback =
|
const fallback =
|
||||||
@@ -74,7 +73,7 @@ export class JwtAuthGuard implements CanActivate {
|
|||||||
|
|
||||||
private pickIdPFromToken(token: string): IdentityProviderName {
|
private pickIdPFromToken(token: string): IdentityProviderName {
|
||||||
try {
|
try {
|
||||||
const { iss } = decodeJwt(token) as { iss?: string };
|
const { iss } = decodeJwt(token);
|
||||||
if (!iss) {
|
if (!iss) {
|
||||||
throw new Error('Token has no issuer (iss) claim');
|
throw new Error('Token has no issuer (iss) claim');
|
||||||
}
|
}
|
||||||
@@ -84,7 +83,8 @@ export class JwtAuthGuard implements CanActivate {
|
|||||||
}
|
}
|
||||||
throw new Error(`Unknown issuer: ${iss}`);
|
throw new Error(`Unknown issuer: ${iss}`);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
const message = err instanceof Error ? err.message : 'Unable to decode token';
|
const message =
|
||||||
|
err instanceof Error ? err.message : 'Unable to decode token';
|
||||||
throw new UnauthorizedException(message);
|
throw new UnauthorizedException(message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,11 +35,13 @@ export class JwtService {
|
|||||||
throw new Error('Empty token');
|
throw new Error('Empty token');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (identityProvider !== 'MICROSOFT_ENTRAID') {
|
const provider =
|
||||||
throw new Error(`Identity provider not configured: ${identityProvider}`);
|
identityProvider === 'MICROSOFT_ENTRAID'
|
||||||
|
? await this.getEntraConfig()
|
||||||
|
: undefined;
|
||||||
|
if (!provider) {
|
||||||
|
throw new Error('Identity provider not configured.');
|
||||||
}
|
}
|
||||||
|
|
||||||
const provider = await this.getEntraConfig();
|
|
||||||
const result = await jwtVerify(token, provider.jwks, {
|
const result = await jwtVerify(token, provider.jwks, {
|
||||||
issuer: provider.issuer,
|
issuer: provider.issuer,
|
||||||
audience: provider.audience,
|
audience: provider.audience,
|
||||||
@@ -48,14 +50,22 @@ export class JwtService {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const { payload, protectedHeader } = result;
|
const { payload, protectedHeader } = result;
|
||||||
if (!provider.allowedAlgs.includes(protectedHeader.alg as string)) {
|
if (!provider.allowedAlgs.includes(protectedHeader.alg)) {
|
||||||
throw new Error(`Unexpected alg: ${protectedHeader.alg}`);
|
throw new Error(`Unexpected alg: ${protectedHeader.alg}`);
|
||||||
}
|
}
|
||||||
if (payload.ver && payload.ver !== '2.0') {
|
if (
|
||||||
throw new Error(`Unsupported Entra token version: ${payload.ver}`);
|
payload.ver !== undefined &&
|
||||||
|
(typeof payload.ver !== 'string' || payload.ver !== '2.0')
|
||||||
|
) {
|
||||||
|
throw new Error(
|
||||||
|
`Unsupported Entra token version: ${formatClaimValue(payload.ver)}`,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
if (payload.tid && payload.tid !== provider.tenantId) {
|
if (
|
||||||
throw new Error(`Unexpected tenant: ${payload.tid}`);
|
payload.tid !== undefined &&
|
||||||
|
(typeof payload.tid !== 'string' || payload.tid !== provider.tenantId)
|
||||||
|
) {
|
||||||
|
throw new Error(`Unexpected tenant: ${formatClaimValue(payload.tid)}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
@@ -98,3 +108,16 @@ export class JwtService {
|
|||||||
return this.entraConfig;
|
return this.entraConfig;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function formatClaimValue(value: unknown): string {
|
||||||
|
if (
|
||||||
|
typeof value === 'string' ||
|
||||||
|
typeof value === 'number' ||
|
||||||
|
typeof value === 'boolean' ||
|
||||||
|
typeof value === 'bigint'
|
||||||
|
) {
|
||||||
|
return String(value);
|
||||||
|
}
|
||||||
|
if (value === null) return 'null';
|
||||||
|
return JSON.stringify(value) ?? typeof value;
|
||||||
|
}
|
||||||
@@ -7,7 +7,7 @@ import {
|
|||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { Reflector } from '@nestjs/core';
|
import { Reflector } from '@nestjs/core';
|
||||||
import type { Request } from 'express';
|
import type { Request } from 'express';
|
||||||
import { CommunityRole, UserDocument } from '../global/database/schema';
|
import type { CommunityRole } from '../global/database/schema';
|
||||||
import { ROLES_KEY } from './roles.decorator';
|
import { ROLES_KEY } from './roles.decorator';
|
||||||
import './auth-request';
|
import './auth-request';
|
||||||
|
|
||||||
@@ -23,7 +23,7 @@ export class RolesGuard implements CanActivate {
|
|||||||
if (!requiredRoles || requiredRoles.length === 0) return true;
|
if (!requiredRoles || requiredRoles.length === 0) return true;
|
||||||
|
|
||||||
const req = context.switchToHttp().getRequest<Request>();
|
const req = context.switchToHttp().getRequest<Request>();
|
||||||
const user = req.user as UserDocument | undefined;
|
const user = req.user;
|
||||||
if (!user && req.identity) {
|
if (!user && req.identity) {
|
||||||
throw new ForbiddenException('No membership in this community.');
|
throw new ForbiddenException('No membership in this community.');
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { ConnectionService } from '../global/database/connection.service';
|
|||||||
import { IdentityDocument, UserDocument } from '../global/database/schema';
|
import { IdentityDocument, UserDocument } from '../global/database/schema';
|
||||||
import { UserResolverGuard } from './user-resolver.guard';
|
import { UserResolverGuard } from './user-resolver.guard';
|
||||||
import './auth-request';
|
import './auth-request';
|
||||||
|
import type { Request } from 'express';
|
||||||
|
|
||||||
function createContext(request: Record<string, unknown>): ExecutionContext {
|
function createContext(request: Record<string, unknown>): ExecutionContext {
|
||||||
return {
|
return {
|
||||||
@@ -24,7 +25,7 @@ describe('UserResolverGuard', () => {
|
|||||||
const connectionService = {
|
const connectionService = {
|
||||||
getModel: jest.fn().mockResolvedValue({ findOne }),
|
getModel: jest.fn().mockResolvedValue({ findOne }),
|
||||||
} as unknown as ConnectionService;
|
} as unknown as ConnectionService;
|
||||||
const request = {
|
const request: Pick<Request, 'params' | 'identity' | 'user'> = {
|
||||||
params: { communityId: communityId.toString() },
|
params: { communityId: communityId.toString() },
|
||||||
identity: { _id: identityId } as IdentityDocument,
|
identity: { _id: identityId } as IdentityDocument,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -7,9 +7,10 @@ import {
|
|||||||
import mongoose from 'mongoose';
|
import mongoose from 'mongoose';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class ParseObjectIdPipe
|
export class ParseObjectIdPipe implements PipeTransform<
|
||||||
implements PipeTransform<string, mongoose.Types.ObjectId>
|
string,
|
||||||
{
|
mongoose.Types.ObjectId
|
||||||
|
> {
|
||||||
public transform(
|
public transform(
|
||||||
value: string,
|
value: string,
|
||||||
metadata: ArgumentMetadata,
|
metadata: ArgumentMetadata,
|
||||||
|
|||||||
@@ -0,0 +1,198 @@
|
|||||||
|
import { Logger } from '@nestjs/common';
|
||||||
|
import { CommunityStatsCacheService } from './community-stats-cache.service';
|
||||||
|
|
||||||
|
describe('Community stats cache invalidation retries', () => {
|
||||||
|
let service: CommunityStatsCacheService;
|
||||||
|
let invalidate: jest.SpyInstance<Promise<number>, [string, number?]>;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
jest.useFakeTimers();
|
||||||
|
jest.spyOn(Logger.prototype, 'warn').mockImplementation(() => undefined);
|
||||||
|
service = new CommunityStatsCacheService({} as never);
|
||||||
|
invalidate = jest
|
||||||
|
.spyOn(service, 'invalidateCommunity')
|
||||||
|
.mockRejectedValue(new Error('Redis down'));
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
service.onModuleDestroy();
|
||||||
|
jest.restoreAllMocks();
|
||||||
|
jest.useRealTimers();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns true even when successful invalidation deletes no cache entries', async () => {
|
||||||
|
invalidate.mockResolvedValue(0);
|
||||||
|
expect(await service.invalidateCommunityWithRetry('community')).toBe(true);
|
||||||
|
expect(invalidate).toHaveBeenCalledWith('community', 1_000);
|
||||||
|
expect(jest.getTimerCount()).toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns false immediately, then retries at most three times with increasing delays', async () => {
|
||||||
|
expect(await service.invalidateCommunityWithRetry('community')).toBe(false);
|
||||||
|
expect(invalidate).toHaveBeenCalledTimes(1);
|
||||||
|
for (const [index, delay] of [1_000, 5_000, 30_000].entries()) {
|
||||||
|
await jest.advanceTimersByTimeAsync(delay - 1);
|
||||||
|
expect(invalidate).toHaveBeenCalledTimes(index + 1);
|
||||||
|
await jest.advanceTimersByTimeAsync(1);
|
||||||
|
expect(invalidate).toHaveBeenCalledTimes(index + 2);
|
||||||
|
}
|
||||||
|
expect(jest.getTimerCount()).toBe(0);
|
||||||
|
await jest.advanceTimersByTimeAsync(60_000);
|
||||||
|
expect(invalidate).toHaveBeenCalledTimes(4);
|
||||||
|
expect(Logger.prototype.warn).toHaveBeenCalledWith(
|
||||||
|
expect.stringContaining('retries exhausted for community'),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not reset the scheduled delay or remaining budget after another immediate failure', async () => {
|
||||||
|
await service.invalidateCommunityWithRetry('community');
|
||||||
|
await jest.advanceTimersByTimeAsync(1_000);
|
||||||
|
expect(invalidate).toHaveBeenCalledTimes(2);
|
||||||
|
await jest.advanceTimersByTimeAsync(2_000);
|
||||||
|
expect(await service.invalidateCommunityWithRetry('community')).toBe(false);
|
||||||
|
expect(jest.getTimerCount()).toBe(1);
|
||||||
|
await jest.advanceTimersByTimeAsync(2_999);
|
||||||
|
expect(invalidate).toHaveBeenCalledTimes(3);
|
||||||
|
await jest.advanceTimersByTimeAsync(1);
|
||||||
|
expect(invalidate).toHaveBeenCalledTimes(4);
|
||||||
|
expect(await service.invalidateCommunityWithRetry('community')).toBe(false);
|
||||||
|
await jest.advanceTimersByTimeAsync(30_000);
|
||||||
|
expect(invalidate).toHaveBeenCalledTimes(6);
|
||||||
|
expect(jest.getTimerCount()).toBe(0);
|
||||||
|
await jest.advanceTimersByTimeAsync(60_000);
|
||||||
|
expect(invalidate).toHaveBeenCalledTimes(6);
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each(['immediate', 'background'] as const)(
|
||||||
|
'cancels remaining retries after a successful %s attempt',
|
||||||
|
async (attempt) => {
|
||||||
|
await service.invalidateCommunityWithRetry('community');
|
||||||
|
invalidate.mockResolvedValue(0);
|
||||||
|
if (attempt === 'immediate') {
|
||||||
|
expect(await service.invalidateCommunityWithRetry('community')).toBe(
|
||||||
|
true,
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
await jest.advanceTimersByTimeAsync(1_000);
|
||||||
|
}
|
||||||
|
expect(jest.getTimerCount()).toBe(0);
|
||||||
|
await jest.advanceTimersByTimeAsync(60_000);
|
||||||
|
expect(invalidate).toHaveBeenCalledTimes(2);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
it('unrefs every retry timer so it does not keep the process alive', async () => {
|
||||||
|
const setTimeoutSpy = jest.spyOn(global, 'setTimeout');
|
||||||
|
await service.invalidateCommunityWithRetry('community');
|
||||||
|
for (const delay of [1_000, 5_000, 30_000]) {
|
||||||
|
const timer = setTimeoutSpy.mock.results.at(-1)!.value as NodeJS.Timeout;
|
||||||
|
expect(timer.hasRef()).toBe(false);
|
||||||
|
await jest.advanceTimersByTimeAsync(delay);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps different communities independent when one continues to fail', async () => {
|
||||||
|
await service.invalidateCommunityWithRetry('first');
|
||||||
|
await service.invalidateCommunityWithRetry('second');
|
||||||
|
invalidate.mockImplementation(async (id) => {
|
||||||
|
if (id === 'first') throw new Error('still unavailable');
|
||||||
|
return 1;
|
||||||
|
});
|
||||||
|
await jest.advanceTimersByTimeAsync(36_000);
|
||||||
|
expect(invalidate.mock.calls.filter(([id]) => id === 'first')).toHaveLength(
|
||||||
|
4,
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
invalidate.mock.calls.filter(([id]) => id === 'second'),
|
||||||
|
).toHaveLength(2);
|
||||||
|
expect(jest.getTimerCount()).toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('clears scheduled retries on shutdown', async () => {
|
||||||
|
await service.invalidateCommunityWithRetry('community');
|
||||||
|
service.onModuleDestroy();
|
||||||
|
expect(jest.getTimerCount()).toBe(0);
|
||||||
|
await jest.advanceTimersByTimeAsync(60_000);
|
||||||
|
expect(invalidate).toHaveBeenCalledTimes(1);
|
||||||
|
expect(await service.invalidateCommunityWithRetry('community')).toBe(false);
|
||||||
|
expect(invalidate).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each(['shutdown', 'immediate success'] as const)(
|
||||||
|
'does not reschedule an in-flight retry after %s',
|
||||||
|
async (finish) => {
|
||||||
|
await service.invalidateCommunityWithRetry('community');
|
||||||
|
const pending = deferred();
|
||||||
|
invalidate.mockImplementationOnce(() => pending.promise);
|
||||||
|
await jest.advanceTimersByTimeAsync(1_000);
|
||||||
|
expect(invalidate).toHaveBeenCalledTimes(2);
|
||||||
|
if (finish === 'shutdown') {
|
||||||
|
service.onModuleDestroy();
|
||||||
|
} else {
|
||||||
|
invalidate.mockResolvedValueOnce(1);
|
||||||
|
expect(await service.invalidateCommunityWithRetry('community')).toBe(
|
||||||
|
true,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
pending.reject(new Error('late failure'));
|
||||||
|
await jest.advanceTimersByTimeAsync(60_000);
|
||||||
|
expect(invalidate).toHaveBeenCalledTimes(finish === 'shutdown' ? 2 : 3);
|
||||||
|
expect(jest.getTimerCount()).toBe(0);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
it('does not cancel a newer failed request when an older immediate attempt succeeds late', async () => {
|
||||||
|
const pending = deferred();
|
||||||
|
invalidate.mockImplementationOnce(() => pending.promise);
|
||||||
|
const first = service.invalidateCommunityWithRetry('community');
|
||||||
|
expect(await service.invalidateCommunityWithRetry('community')).toBe(false);
|
||||||
|
pending.resolve(1);
|
||||||
|
expect(await first).toBe(true);
|
||||||
|
expect(jest.getTimerCount()).toBe(1);
|
||||||
|
invalidate.mockResolvedValue(1);
|
||||||
|
await jest.advanceTimersByTimeAsync(1_000);
|
||||||
|
expect(invalidate).toHaveBeenCalledTimes(3);
|
||||||
|
expect(jest.getTimerCount()).toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('preserves the retry budget when an immediate request fails during an in-flight retry', async () => {
|
||||||
|
await service.invalidateCommunityWithRetry('community');
|
||||||
|
const pending = deferred();
|
||||||
|
invalidate.mockImplementationOnce(() => pending.promise);
|
||||||
|
await jest.advanceTimersByTimeAsync(1_000);
|
||||||
|
expect(await service.invalidateCommunityWithRetry('community')).toBe(false);
|
||||||
|
await jest.advanceTimersByTimeAsync(5_000);
|
||||||
|
expect(invalidate).toHaveBeenCalledTimes(3);
|
||||||
|
pending.resolve(1);
|
||||||
|
await jest.advanceTimersByTimeAsync(5_000);
|
||||||
|
expect(invalidate).toHaveBeenCalledTimes(4);
|
||||||
|
await jest.advanceTimersByTimeAsync(30_000);
|
||||||
|
expect(invalidate).toHaveBeenCalledTimes(5);
|
||||||
|
expect(jest.getTimerCount()).toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not restart an exhausted budget when an older immediate request fails late', async () => {
|
||||||
|
await service.invalidateCommunityWithRetry('community');
|
||||||
|
await jest.advanceTimersByTimeAsync(6_000);
|
||||||
|
const pending = deferred();
|
||||||
|
invalidate.mockImplementationOnce(() => pending.promise);
|
||||||
|
const immediate = service.invalidateCommunityWithRetry('community');
|
||||||
|
await jest.advanceTimersByTimeAsync(30_000);
|
||||||
|
expect(invalidate).toHaveBeenCalledTimes(5);
|
||||||
|
pending.reject(new Error('late failure'));
|
||||||
|
expect(await immediate).toBe(false);
|
||||||
|
expect(jest.getTimerCount()).toBe(0);
|
||||||
|
await jest.advanceTimersByTimeAsync(60_000);
|
||||||
|
expect(invalidate).toHaveBeenCalledTimes(5);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
function deferred() {
|
||||||
|
let resolve!: (value: number) => void;
|
||||||
|
let reject!: (reason: Error) => void;
|
||||||
|
const promise = new Promise<number>((done, fail) => {
|
||||||
|
resolve = done;
|
||||||
|
reject = fail;
|
||||||
|
});
|
||||||
|
return { promise, resolve, reject };
|
||||||
|
}
|
||||||
@@ -1,57 +1,246 @@
|
|||||||
import { Injectable, Logger } from '@nestjs/common';
|
import { Injectable, Logger, OnModuleDestroy } from '@nestjs/common';
|
||||||
import { GarnetService } from '../global/garnet/garnet.service';
|
import { randomUUID } from 'crypto';
|
||||||
|
import { RedisService } from '../global/redis/redis.service';
|
||||||
|
|
||||||
const COMMUNITY_STATS_TTL_SECONDS = 5 * 60;
|
const COMMUNITY_STATS_TTL_SECONDS = 5 * 60;
|
||||||
const COMMUNITY_STATS_DETAIL_TTL_SECONDS = 24 * 60 * 60;
|
const COMMUNITY_STATS_DETAIL_TTL_SECONDS = 24 * 60 * 60;
|
||||||
|
const INVALIDATION_RETRY_DELAYS_MS = [1_000, 5_000, 30_000] as const;
|
||||||
|
interface InvalidationRetry {
|
||||||
|
attempts: number;
|
||||||
|
requestVersion: number;
|
||||||
|
timer?: NodeJS.Timeout;
|
||||||
|
}
|
||||||
|
const CACHE_SCOPES = [
|
||||||
|
'matches',
|
||||||
|
'leaderboard',
|
||||||
|
'teamInsights',
|
||||||
|
'matchDetail',
|
||||||
|
'userInternal',
|
||||||
|
] as const;
|
||||||
|
type CacheScope = (typeof CACHE_SCOPES)[number];
|
||||||
|
|
||||||
@Injectable()
|
function communityPrefix(communityId: string): string {
|
||||||
export class CommunityStatsCacheService {
|
return `riot:communitystats:v2:{${communityId}}`;
|
||||||
private readonly logger = new Logger(CommunityStatsCacheService.name);
|
|
||||||
|
|
||||||
constructor(private readonly garnetService: GarnetService) {}
|
|
||||||
|
|
||||||
public get<T>(key: string): Promise<T | null> {
|
|
||||||
return this.garnetService.getJson<T>(key);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public set(
|
export class CommunityStatsCacheKey {
|
||||||
key: string,
|
public readonly generationKey: string;
|
||||||
|
public readonly hashKey: string;
|
||||||
|
public generation?: string;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
communityId: string,
|
||||||
|
scope: CacheScope,
|
||||||
|
public readonly field: string,
|
||||||
|
) {
|
||||||
|
const prefix = communityPrefix(communityId);
|
||||||
|
this.generationKey = `${prefix}:generation`;
|
||||||
|
this.hashKey = `${prefix}:${scope}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
public get identity(): string {
|
||||||
|
return JSON.stringify([this.hashKey, this.generation, this.field]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const READ_CACHE_SCRIPT = `
|
||||||
|
local generation = redis.call('GET', KEYS[1])
|
||||||
|
if not generation then
|
||||||
|
generation = ARGV[1]
|
||||||
|
redis.call('SET', KEYS[1], generation)
|
||||||
|
end
|
||||||
|
return {generation, redis.call('HGET', KEYS[2], ARGV[2])}
|
||||||
|
`;
|
||||||
|
|
||||||
|
const WRITE_CACHE_SCRIPT = `
|
||||||
|
if redis.call('GET', KEYS[1]) ~= ARGV[1] then return 0 end
|
||||||
|
redis.call('HSETEX', KEYS[2], 'EX', ARGV[4], 'FIELDS', 1, ARGV[2], ARGV[3])
|
||||||
|
return 1
|
||||||
|
`;
|
||||||
|
|
||||||
|
const INVALIDATE_CACHE_SCRIPT = `
|
||||||
|
-- A fill started before invalidation cannot publish into the new generation.
|
||||||
|
redis.call('SET', KEYS[1], ARGV[1])
|
||||||
|
local deleted = 0
|
||||||
|
for i = 2, #KEYS do
|
||||||
|
deleted = deleted + redis.call('HLEN', KEYS[i])
|
||||||
|
redis.call('UNLINK', KEYS[i])
|
||||||
|
end
|
||||||
|
return deleted
|
||||||
|
`;
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class CommunityStatsCacheService implements OnModuleDestroy {
|
||||||
|
private readonly logger = new Logger(CommunityStatsCacheService.name);
|
||||||
|
private readonly invalidationRetries = new Map<string, InvalidationRetry>();
|
||||||
|
private destroyed = false;
|
||||||
|
|
||||||
|
constructor(private readonly redisService: RedisService) {}
|
||||||
|
|
||||||
|
public onModuleDestroy(): void {
|
||||||
|
this.destroyed = true;
|
||||||
|
for (const pending of this.invalidationRetries.values()) {
|
||||||
|
if (pending.timer) clearTimeout(pending.timer);
|
||||||
|
}
|
||||||
|
this.invalidationRetries.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only the immediate attempt determines whether the caller may cache its response.
|
||||||
|
public async invalidateCommunityWithRetry(
|
||||||
|
communityId: string,
|
||||||
|
): Promise<boolean> {
|
||||||
|
if (this.destroyed) return false;
|
||||||
|
const pending = this.invalidationRetries.get(communityId) ?? {
|
||||||
|
attempts: 0,
|
||||||
|
requestVersion: 0,
|
||||||
|
};
|
||||||
|
this.invalidationRetries.set(communityId, pending);
|
||||||
|
const version = ++pending.requestVersion;
|
||||||
|
const succeeded = await this.tryInvalidateCommunity(communityId);
|
||||||
|
if (succeeded && pending.requestVersion === version) {
|
||||||
|
this.clearInvalidationRetry(communityId, pending);
|
||||||
|
} else if (!succeeded) {
|
||||||
|
// An existing retry keeps its remaining budget, including while in flight.
|
||||||
|
this.scheduleInvalidationRetry(communityId, pending);
|
||||||
|
}
|
||||||
|
return succeeded;
|
||||||
|
}
|
||||||
|
|
||||||
|
private scheduleInvalidationRetry(
|
||||||
|
communityId: string,
|
||||||
|
pending: InvalidationRetry,
|
||||||
|
): void {
|
||||||
|
if (
|
||||||
|
this.destroyed ||
|
||||||
|
this.invalidationRetries.get(communityId) !== pending ||
|
||||||
|
pending.timer
|
||||||
|
)
|
||||||
|
return;
|
||||||
|
const delay = INVALIDATION_RETRY_DELAYS_MS[pending.attempts];
|
||||||
|
if (delay === undefined) {
|
||||||
|
this.clearInvalidationRetry(communityId, pending);
|
||||||
|
this.logger.warn(
|
||||||
|
`Stats cache invalidation retries exhausted for ${communityId}; detail recovery and cache expiry will refresh stale responses.`,
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
pending.attempts += 1;
|
||||||
|
pending.timer = setTimeout(
|
||||||
|
() => void this.retryInvalidation(communityId, pending),
|
||||||
|
delay,
|
||||||
|
);
|
||||||
|
pending.timer.unref();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async retryInvalidation(
|
||||||
|
communityId: string,
|
||||||
|
pending: InvalidationRetry,
|
||||||
|
): Promise<void> {
|
||||||
|
const version = pending.requestVersion;
|
||||||
|
const succeeded = await this.tryInvalidateCommunity(communityId);
|
||||||
|
if (this.invalidationRetries.get(communityId) !== pending) return;
|
||||||
|
pending.timer = undefined;
|
||||||
|
// An older completion must not cancel a newer request's retry.
|
||||||
|
if (succeeded && pending.requestVersion === version) {
|
||||||
|
this.clearInvalidationRetry(communityId, pending);
|
||||||
|
} else {
|
||||||
|
this.scheduleInvalidationRetry(communityId, pending);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private clearInvalidationRetry(
|
||||||
|
communityId: string,
|
||||||
|
pending: InvalidationRetry,
|
||||||
|
): void {
|
||||||
|
if (this.invalidationRetries.get(communityId) !== pending) return;
|
||||||
|
if (pending.timer) clearTimeout(pending.timer);
|
||||||
|
this.invalidationRetries.delete(communityId);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async tryInvalidateCommunity(communityId: string): Promise<boolean> {
|
||||||
|
try {
|
||||||
|
await this.invalidateCommunity(communityId, 1_000);
|
||||||
|
return true;
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.warn(
|
||||||
|
`Stats cache invalidation failed for ${communityId}: ${String(error)}`,
|
||||||
|
);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async get<T>(key: CommunityStatsCacheKey): Promise<T | null> {
|
||||||
|
const reply = await this.redisService
|
||||||
|
.raw()
|
||||||
|
.sendCommand<
|
||||||
|
[string, string | null]
|
||||||
|
>(['EVAL', READ_CACHE_SCRIPT, '2', key.generationKey, key.hashKey, randomUUID(), key.field]);
|
||||||
|
key.generation = reply[0];
|
||||||
|
if (!reply[1]) return null;
|
||||||
|
try {
|
||||||
|
return JSON.parse(reply[1]) as T;
|
||||||
|
} catch {
|
||||||
|
this.logger.warn(
|
||||||
|
`Failed to parse community stats cache field in ${key.hashKey}.`,
|
||||||
|
);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async set(
|
||||||
|
key: CommunityStatsCacheKey,
|
||||||
value: unknown,
|
value: unknown,
|
||||||
ttlSeconds = COMMUNITY_STATS_TTL_SECONDS,
|
ttlSeconds = COMMUNITY_STATS_TTL_SECONDS,
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
return this.garnetService.setJson(key, value, ttlSeconds);
|
if (!key.generation)
|
||||||
|
throw new Error(
|
||||||
|
'Read the cache generation before starting a cache fill.',
|
||||||
|
);
|
||||||
|
if (!Number.isInteger(ttlSeconds) || ttlSeconds <= 0)
|
||||||
|
throw new Error('Cache TTL must be a positive integer.');
|
||||||
|
await this.redisService
|
||||||
|
.raw()
|
||||||
|
.sendCommand([
|
||||||
|
'EVAL',
|
||||||
|
WRITE_CACHE_SCRIPT,
|
||||||
|
'2',
|
||||||
|
key.generationKey,
|
||||||
|
key.hashKey,
|
||||||
|
key.generation,
|
||||||
|
key.field,
|
||||||
|
JSON.stringify(value),
|
||||||
|
String(ttlSeconds),
|
||||||
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public setDetail(key: string, value: unknown): Promise<void> {
|
public setDetail(key: CommunityStatsCacheKey, value: unknown): Promise<void> {
|
||||||
return this.set(key, value, COMMUNITY_STATS_DETAIL_TTL_SECONDS);
|
return this.set(key, value, COMMUNITY_STATS_DETAIL_TTL_SECONDS);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async invalidateCommunity(communityId: string): Promise<number> {
|
public async invalidateCommunity(
|
||||||
const prefix = `riot:communitystats:`;
|
communityId: string,
|
||||||
const match = `${prefix}*${communityId}*`;
|
timeoutMs?: number,
|
||||||
const client = this.garnetService.raw();
|
): Promise<number> {
|
||||||
let cursor = '0';
|
const prefix = communityPrefix(communityId);
|
||||||
let deleted = 0;
|
const deleted = Number(
|
||||||
|
await this.redisService
|
||||||
do {
|
.raw()
|
||||||
const reply = (await client.sendCommand([
|
.sendCommand(
|
||||||
'SCAN',
|
[
|
||||||
cursor,
|
'EVAL',
|
||||||
'MATCH',
|
INVALIDATE_CACHE_SCRIPT,
|
||||||
match,
|
String(CACHE_SCOPES.length + 1),
|
||||||
'COUNT',
|
`${prefix}:generation`,
|
||||||
'100',
|
...CACHE_SCOPES.map((scope) => `${prefix}:${scope}`),
|
||||||
])) as [string, string[]];
|
randomUUID(),
|
||||||
cursor = reply[0];
|
],
|
||||||
const keys = reply[1] ?? [];
|
timeoutMs === undefined ? undefined : { timeout: timeoutMs },
|
||||||
if (keys.length > 0) {
|
),
|
||||||
deleted += await client.del(keys);
|
);
|
||||||
}
|
|
||||||
} while (cursor !== '0');
|
|
||||||
|
|
||||||
if (deleted > 0) {
|
if (deleted > 0) {
|
||||||
this.logger.debug(
|
this.logger.debug(
|
||||||
`Invalidated ${deleted} community stats cache keys for ${communityId}.`,
|
`Invalidated ${deleted} community stats cache entries for ${communityId}.`,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return deleted;
|
return deleted;
|
||||||
|
|||||||
@@ -0,0 +1,321 @@
|
|||||||
|
import mongoose from 'mongoose';
|
||||||
|
import { CommunityStatsService } from './community-stats.service';
|
||||||
|
import { CommunityStatsCacheKey } from './community-stats-cache.service';
|
||||||
|
import type { InternalMatchDetailResponse } from './community-stats.types';
|
||||||
|
|
||||||
|
describe('Community stats raw archive recovery', () => {
|
||||||
|
it.each([true, false])(
|
||||||
|
'recovers a cached missing game even if invalidation needs retry (%s)',
|
||||||
|
async (invalidationSucceeds) => {
|
||||||
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
|
let archived = false;
|
||||||
|
let enriched = false;
|
||||||
|
let generation = 'before';
|
||||||
|
let cached: InternalMatchDetailResponse | null = null;
|
||||||
|
const exists = jest.fn(() => query(archived ? { _id: 'archive' } : null));
|
||||||
|
const buildAndUpsert = jest.fn(async () => {
|
||||||
|
enriched = true;
|
||||||
|
});
|
||||||
|
const invalidateCommunity = jest.fn(async () => {
|
||||||
|
if (!invalidationSucceeds) return false;
|
||||||
|
cached = null;
|
||||||
|
generation = 'after';
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
const setDetail = jest.fn(
|
||||||
|
async (
|
||||||
|
key: CommunityStatsCacheKey,
|
||||||
|
value: InternalMatchDetailResponse,
|
||||||
|
) => {
|
||||||
|
expect(key.generation).toBe(generation);
|
||||||
|
cached = value;
|
||||||
|
},
|
||||||
|
);
|
||||||
|
const service = new CommunityStatsService(
|
||||||
|
{ getModel: async () => ({ exists }) } as never,
|
||||||
|
{
|
||||||
|
get: async (key: CommunityStatsCacheKey) => {
|
||||||
|
key.generation = generation;
|
||||||
|
return cached;
|
||||||
|
},
|
||||||
|
setDetail,
|
||||||
|
invalidateCommunityWithRetry: invalidateCommunity,
|
||||||
|
} as never,
|
||||||
|
{} as never,
|
||||||
|
{ buildAndUpsert } as never,
|
||||||
|
);
|
||||||
|
const internals = service as unknown as {
|
||||||
|
getDetailRevision: () => Promise<string>;
|
||||||
|
buildBaseDataset: () => Promise<unknown>;
|
||||||
|
matchDetailInFlight: Map<string, unknown>;
|
||||||
|
};
|
||||||
|
jest
|
||||||
|
.spyOn(internals, 'getDetailRevision')
|
||||||
|
.mockResolvedValue('same-revision');
|
||||||
|
jest
|
||||||
|
.spyOn(internals, 'buildBaseDataset')
|
||||||
|
.mockImplementation(async () => ({
|
||||||
|
matches: [{ matchId: matchId.toString() }],
|
||||||
|
detailsByMatchId: new Map([
|
||||||
|
[
|
||||||
|
matchId.toString(),
|
||||||
|
[
|
||||||
|
{
|
||||||
|
gameNumber: 1,
|
||||||
|
riotMatchId: 'KR_1',
|
||||||
|
rawAvailable: enriched,
|
||||||
|
timelineLoaded: enriched,
|
||||||
|
teams: [],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
],
|
||||||
|
]),
|
||||||
|
competition: {
|
||||||
|
projection: {
|
||||||
|
games: [
|
||||||
|
{
|
||||||
|
id: 'official-game',
|
||||||
|
displayNumber: 1,
|
||||||
|
evidence: { type: 'riot', riotMatchId: 'KR_1' },
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}));
|
||||||
|
|
||||||
|
const missing = await service.getMatchDetail({ communityId, matchId });
|
||||||
|
expect(missing.games[0].analysisAvailability).toBe('missing');
|
||||||
|
expect(await service.getMatchDetail({ communityId, matchId })).toBe(
|
||||||
|
missing,
|
||||||
|
);
|
||||||
|
expect(buildAndUpsert).not.toHaveBeenCalled();
|
||||||
|
|
||||||
|
archived = true;
|
||||||
|
const recovered = await service.getMatchDetail({ communityId, matchId });
|
||||||
|
expect(recovered.games[0]).toMatchObject({
|
||||||
|
gameId: 'official-game',
|
||||||
|
analysisAvailability: 'available',
|
||||||
|
riotMatchId: 'KR_1',
|
||||||
|
});
|
||||||
|
expect(buildAndUpsert).toHaveBeenCalledWith(matchId, {
|
||||||
|
includeTimeline: true,
|
||||||
|
});
|
||||||
|
expect(invalidateCommunity).toHaveBeenCalledWith(communityId.toString());
|
||||||
|
expect(internals.matchDetailInFlight.size).toBe(0);
|
||||||
|
expect(setDetail).toHaveBeenCalledTimes(invalidationSucceeds ? 2 : 1);
|
||||||
|
expect(await service.getMatchDetail({ communityId, matchId })).toEqual(
|
||||||
|
recovered,
|
||||||
|
);
|
||||||
|
expect(buildAndUpsert).toHaveBeenCalledTimes(1);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
it('rebuilds only affected missing fragments and invalidates every affected community after the writes', async () => {
|
||||||
|
const first = new mongoose.Types.ObjectId();
|
||||||
|
const second = new mongoose.Types.ObjectId();
|
||||||
|
const fragments = [
|
||||||
|
{
|
||||||
|
matchId: new mongoose.Types.ObjectId(),
|
||||||
|
communityId: first,
|
||||||
|
gameDetails: [{ riotMatchId: 'KR_1', rawAvailable: false }],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
matchId: new mongoose.Types.ObjectId(),
|
||||||
|
communityId: first,
|
||||||
|
gameDetails: [{ riotMatchId: 'KR_1', rawAvailable: true }],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
matchId: new mongoose.Types.ObjectId(),
|
||||||
|
communityId: second,
|
||||||
|
gameDetails: [{ riotMatchId: 'KR_1', rawAvailable: false }],
|
||||||
|
},
|
||||||
|
];
|
||||||
|
const order: string[] = [];
|
||||||
|
const buildAndUpsert = jest.fn(async () => {
|
||||||
|
order.push('build');
|
||||||
|
});
|
||||||
|
const invalidateCommunity = jest.fn(async () => {
|
||||||
|
order.push('invalidate');
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
const findByRiotMatchIds = jest.fn().mockResolvedValue(fragments);
|
||||||
|
const service = new CommunityStatsService(
|
||||||
|
{
|
||||||
|
getModel: async () => ({ find: () => query([{ matchId: 'KR_1' }]) }),
|
||||||
|
} as never,
|
||||||
|
{ invalidateCommunityWithRetry: invalidateCommunity } as never,
|
||||||
|
{
|
||||||
|
findByRiotMatchIds,
|
||||||
|
findByMatch: async () => ({
|
||||||
|
gameDetails: [{ riotMatchId: 'KR_1', rawAvailable: true }],
|
||||||
|
}),
|
||||||
|
} as never,
|
||||||
|
{ buildAndUpsert } as never,
|
||||||
|
);
|
||||||
|
|
||||||
|
await service.refreshForRiotMatches(['KR_1', 'KR_1', 'KR_ABSENT']);
|
||||||
|
|
||||||
|
expect(findByRiotMatchIds).toHaveBeenCalledWith(['KR_1']);
|
||||||
|
expect(buildAndUpsert.mock.calls).toEqual([
|
||||||
|
[fragments[0].matchId],
|
||||||
|
[fragments[2].matchId],
|
||||||
|
]);
|
||||||
|
expect(invalidateCommunity.mock.calls).toEqual([
|
||||||
|
[first.toString()],
|
||||||
|
[second.toString()],
|
||||||
|
]);
|
||||||
|
expect(order).toEqual(['build', 'build', 'invalidate', 'invalidate']);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not invalidate already enriched games or builds that make no progress', async () => {
|
||||||
|
const game = { riotMatchId: 'KR_1', rawAvailable: false };
|
||||||
|
const fragment = {
|
||||||
|
matchId: new mongoose.Types.ObjectId(),
|
||||||
|
communityId: new mongoose.Types.ObjectId(),
|
||||||
|
gameDetails: [game],
|
||||||
|
};
|
||||||
|
const buildAndUpsert = jest.fn().mockResolvedValue(undefined);
|
||||||
|
const invalidateCommunity = jest.fn();
|
||||||
|
const service = new CommunityStatsService(
|
||||||
|
{
|
||||||
|
getModel: async () => ({ find: () => query([{ matchId: 'KR_1' }]) }),
|
||||||
|
} as never,
|
||||||
|
{ invalidateCommunityWithRetry: invalidateCommunity } as never,
|
||||||
|
{
|
||||||
|
findByRiotMatchIds: async () => [fragment],
|
||||||
|
findByMatch: async () => fragment,
|
||||||
|
} as never,
|
||||||
|
{ buildAndUpsert } as never,
|
||||||
|
);
|
||||||
|
await service.refreshForRiotMatches(['KR_1']);
|
||||||
|
game.rawAvailable = true;
|
||||||
|
await service.refreshForRiotMatches(['KR_1']);
|
||||||
|
expect(buildAndUpsert).toHaveBeenCalledTimes(1);
|
||||||
|
expect(invalidateCommunity).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not rebuild when raw is still absent', async () => {
|
||||||
|
const findByRiotMatchIds = jest.fn();
|
||||||
|
const buildAndUpsert = jest.fn();
|
||||||
|
const service = new CommunityStatsService(
|
||||||
|
{ getModel: async () => ({ find: () => query([]) }) } as never,
|
||||||
|
{} as never,
|
||||||
|
{ findByRiotMatchIds } as never,
|
||||||
|
{ buildAndUpsert } as never,
|
||||||
|
);
|
||||||
|
await service.refreshForRiotMatches(['KR_1']);
|
||||||
|
expect(findByRiotMatchIds).not.toHaveBeenCalled();
|
||||||
|
expect(buildAndUpsert).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('invalidates successful communities once even when another game fails mid-batch', async () => {
|
||||||
|
const communities = Array.from(
|
||||||
|
{ length: 4 },
|
||||||
|
() => new mongoose.Types.ObjectId(),
|
||||||
|
);
|
||||||
|
const fragments = [0, 1, 0, 2, 3].map((community, index) => ({
|
||||||
|
matchId: new mongoose.Types.ObjectId(),
|
||||||
|
communityId: communities[community],
|
||||||
|
gameDetails: [{ riotMatchId: 'KR_1', rawAvailable: index === 4 }],
|
||||||
|
}));
|
||||||
|
const buildAndUpsert = jest.fn(async (matchId: mongoose.Types.ObjectId) => {
|
||||||
|
const fragment = fragments.find((item) => item.matchId === matchId)!;
|
||||||
|
if (fragment === fragments[1]) throw new Error('one build fails');
|
||||||
|
fragment.gameDetails[0].rawAvailable = true;
|
||||||
|
});
|
||||||
|
const invalidate = jest.fn().mockResolvedValue(true);
|
||||||
|
const service = new CommunityStatsService(
|
||||||
|
{
|
||||||
|
getModel: async () => ({ find: () => query([{ matchId: 'KR_1' }]) }),
|
||||||
|
} as never,
|
||||||
|
{ invalidateCommunityWithRetry: invalidate } as never,
|
||||||
|
{
|
||||||
|
findByRiotMatchIds: async () => fragments,
|
||||||
|
findByMatch: async (id: mongoose.Types.ObjectId) =>
|
||||||
|
fragments.find((item) => item.matchId === id),
|
||||||
|
} as never,
|
||||||
|
{ buildAndUpsert } as never,
|
||||||
|
);
|
||||||
|
await service.refreshForRiotMatches(['KR_1']);
|
||||||
|
expect(buildAndUpsert).toHaveBeenCalledTimes(4);
|
||||||
|
expect(invalidate.mock.calls).toEqual([
|
||||||
|
[communities[0].toString()],
|
||||||
|
[communities[2].toString()],
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('backs off raw recovery that makes no progress and does not invalidate the community', async () => {
|
||||||
|
let now = 1000;
|
||||||
|
const clock = jest.spyOn(Date, 'now').mockImplementation(() => now);
|
||||||
|
try {
|
||||||
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
|
let cached: InternalMatchDetailResponse | null = null;
|
||||||
|
const buildAndUpsert = jest.fn().mockResolvedValue(undefined);
|
||||||
|
const invalidate = jest.fn();
|
||||||
|
const service = new CommunityStatsService(
|
||||||
|
{
|
||||||
|
getModel: async () => ({ exists: () => query({ _id: 'archive' }) }),
|
||||||
|
} as never,
|
||||||
|
{
|
||||||
|
get: async () => cached,
|
||||||
|
setDetail: async (
|
||||||
|
_key: unknown,
|
||||||
|
value: InternalMatchDetailResponse,
|
||||||
|
) => {
|
||||||
|
cached = value;
|
||||||
|
},
|
||||||
|
invalidateCommunityWithRetry: invalidate,
|
||||||
|
} as never,
|
||||||
|
{} as never,
|
||||||
|
{ buildAndUpsert } as never,
|
||||||
|
);
|
||||||
|
const internals = service as unknown as {
|
||||||
|
getDetailRevision: () => Promise<string>;
|
||||||
|
buildBaseDataset: () => Promise<unknown>;
|
||||||
|
};
|
||||||
|
jest
|
||||||
|
.spyOn(internals, 'getDetailRevision')
|
||||||
|
.mockResolvedValue('same-revision');
|
||||||
|
jest.spyOn(internals, 'buildBaseDataset').mockResolvedValue({
|
||||||
|
matches: [{ matchId: matchId.toString() }],
|
||||||
|
detailsByMatchId: new Map([
|
||||||
|
[
|
||||||
|
matchId.toString(),
|
||||||
|
[
|
||||||
|
{
|
||||||
|
gameNumber: 1,
|
||||||
|
riotMatchId: 'KR_1',
|
||||||
|
rawAvailable: false,
|
||||||
|
timelineLoaded: false,
|
||||||
|
teams: [],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
],
|
||||||
|
]),
|
||||||
|
});
|
||||||
|
await service.getMatchDetail({ communityId, matchId });
|
||||||
|
await service.getMatchDetail({ communityId, matchId });
|
||||||
|
expect(buildAndUpsert).toHaveBeenCalledTimes(1);
|
||||||
|
now += 60_000;
|
||||||
|
await service.getMatchDetail({ communityId, matchId });
|
||||||
|
expect(buildAndUpsert).toHaveBeenCalledTimes(2);
|
||||||
|
expect(invalidate).not.toHaveBeenCalled();
|
||||||
|
} finally {
|
||||||
|
clock.mockRestore();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
function query<T>(value: T) {
|
||||||
|
return {
|
||||||
|
select() {
|
||||||
|
return this;
|
||||||
|
},
|
||||||
|
lean() {
|
||||||
|
return this;
|
||||||
|
},
|
||||||
|
exec: async () => value,
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,4 +1,10 @@
|
|||||||
import { Controller, Get, Param, Query } from '@nestjs/common';
|
import {
|
||||||
|
BadRequestException,
|
||||||
|
Controller,
|
||||||
|
Get,
|
||||||
|
Param,
|
||||||
|
Query,
|
||||||
|
} from '@nestjs/common';
|
||||||
import mongoose from 'mongoose';
|
import mongoose from 'mongoose';
|
||||||
import { AllowPublicAccess } from '../auth/allow-public-access.decorator';
|
import { AllowPublicAccess } from '../auth/allow-public-access.decorator';
|
||||||
import { ParseObjectIdPipe } from '../common/parse-object-id.pipe';
|
import { ParseObjectIdPipe } from '../common/parse-object-id.pipe';
|
||||||
@@ -9,6 +15,15 @@ import type { CommunityStatsFilters } from './community-stats.types';
|
|||||||
export class CommunityStatsController {
|
export class CommunityStatsController {
|
||||||
constructor(private readonly communityStatsService: CommunityStatsService) {}
|
constructor(private readonly communityStatsService: CommunityStatsService) {}
|
||||||
|
|
||||||
|
@Get('internal-stats/seasons')
|
||||||
|
@AllowPublicAccess()
|
||||||
|
public getSeasons(
|
||||||
|
@Param('communityId', ParseObjectIdPipe)
|
||||||
|
communityId: mongoose.Types.ObjectId,
|
||||||
|
) {
|
||||||
|
return this.communityStatsService.getSeasons(communityId);
|
||||||
|
}
|
||||||
|
|
||||||
@Get('internal-stats/matches')
|
@Get('internal-stats/matches')
|
||||||
@AllowPublicAccess()
|
@AllowPublicAccess()
|
||||||
public getMatches(
|
public getMatches(
|
||||||
@@ -20,10 +35,44 @@ export class CommunityStatsController {
|
|||||||
@Query('championId') championId?: string,
|
@Query('championId') championId?: string,
|
||||||
@Query('cursor') cursor?: string,
|
@Query('cursor') cursor?: string,
|
||||||
@Query('limit') limit?: string,
|
@Query('limit') limit?: string,
|
||||||
|
@Query('q') query?: string,
|
||||||
|
@Query('format') format?: string,
|
||||||
|
@Query('playerId') playerId?: string,
|
||||||
|
@Query('cursorMatchId') cursorMatchId?: string,
|
||||||
) {
|
) {
|
||||||
|
if (format !== undefined && format !== 'pair' && format !== 'tournament') {
|
||||||
|
throw new BadRequestException('Invalid format.');
|
||||||
|
}
|
||||||
|
if (playerId !== undefined && !mongoose.isObjectIdOrHexString(playerId)) {
|
||||||
|
throw new BadRequestException('Invalid playerId.');
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
cursorMatchId !== undefined &&
|
||||||
|
(!mongoose.isObjectIdOrHexString(cursorMatchId) ||
|
||||||
|
this.toNumber(cursor) === undefined)
|
||||||
|
) {
|
||||||
|
throw new BadRequestException('Invalid cursor.');
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
cursor !== undefined &&
|
||||||
|
Number.isNaN(new Date(this.toNumber(cursor) ?? NaN).getTime())
|
||||||
|
) {
|
||||||
|
throw new BadRequestException('Invalid cursor.');
|
||||||
|
}
|
||||||
return this.communityStatsService.getMatches({
|
return this.communityStatsService.getMatches({
|
||||||
communityId,
|
communityId,
|
||||||
filters: this.toFilters({ seasonId, from, to, championId, cursor, limit }),
|
filters: this.toFilters({
|
||||||
|
seasonId,
|
||||||
|
from,
|
||||||
|
to,
|
||||||
|
championId,
|
||||||
|
cursor,
|
||||||
|
limit,
|
||||||
|
query,
|
||||||
|
format,
|
||||||
|
playerId,
|
||||||
|
cursorMatchId,
|
||||||
|
}),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -36,10 +85,12 @@ export class CommunityStatsController {
|
|||||||
@Query('from') from?: string,
|
@Query('from') from?: string,
|
||||||
@Query('to') to?: string,
|
@Query('to') to?: string,
|
||||||
@Query('championId') championId?: string,
|
@Query('championId') championId?: string,
|
||||||
|
@Query('q') query?: string,
|
||||||
|
@Query('lane') lane?: string,
|
||||||
) {
|
) {
|
||||||
return this.communityStatsService.getLeaderboard({
|
return this.communityStatsService.getLeaderboard({
|
||||||
communityId,
|
communityId,
|
||||||
filters: this.toFilters({ seasonId, from, to, championId }),
|
filters: this.toFilters({ seasonId, from, to, championId, query, lane }),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -81,11 +132,24 @@ export class CommunityStatsController {
|
|||||||
@Query('championId') championId?: string,
|
@Query('championId') championId?: string,
|
||||||
@Query('cursor') cursor?: string,
|
@Query('cursor') cursor?: string,
|
||||||
@Query('limit') limit?: string,
|
@Query('limit') limit?: string,
|
||||||
|
@Query('lane') lane?: string,
|
||||||
|
@Query('includePositionCounts') includePositionCounts?: string,
|
||||||
) {
|
) {
|
||||||
return this.communityStatsService.getUserInternalHistory({
|
return this.communityStatsService.getUserInternalHistory({
|
||||||
communityId,
|
communityId,
|
||||||
userId,
|
userId,
|
||||||
filters: this.toFilters({ seasonId, from, to, championId, cursor, limit }),
|
filters: {
|
||||||
|
...this.toFilters({
|
||||||
|
seasonId,
|
||||||
|
from,
|
||||||
|
to,
|
||||||
|
championId,
|
||||||
|
cursor,
|
||||||
|
limit,
|
||||||
|
lane,
|
||||||
|
}),
|
||||||
|
includePositionCounts: includePositionCounts === 'true',
|
||||||
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -96,7 +160,24 @@ export class CommunityStatsController {
|
|||||||
championId?: string;
|
championId?: string;
|
||||||
cursor?: string;
|
cursor?: string;
|
||||||
limit?: string;
|
limit?: string;
|
||||||
|
query?: string;
|
||||||
|
format?: CommunityStatsFilters['format'];
|
||||||
|
playerId?: string;
|
||||||
|
cursorMatchId?: string;
|
||||||
|
lane?: string;
|
||||||
}): CommunityStatsFilters {
|
}): CommunityStatsFilters {
|
||||||
|
if (
|
||||||
|
params.lane !== undefined &&
|
||||||
|
!['TOP', 'JUNGLE', 'MIDDLE', 'BOTTOM', 'UTILITY'].includes(params.lane)
|
||||||
|
) {
|
||||||
|
throw new BadRequestException('Invalid lane.');
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
params.query !== undefined &&
|
||||||
|
(typeof params.query !== 'string' || params.query.length > 100)
|
||||||
|
) {
|
||||||
|
throw new BadRequestException('Invalid search query.');
|
||||||
|
}
|
||||||
return {
|
return {
|
||||||
seasonId: params.seasonId,
|
seasonId: params.seasonId,
|
||||||
from: params.from,
|
from: params.from,
|
||||||
@@ -104,6 +185,11 @@ export class CommunityStatsController {
|
|||||||
championId: this.toNumber(params.championId),
|
championId: this.toNumber(params.championId),
|
||||||
cursor: this.toNumber(params.cursor),
|
cursor: this.toNumber(params.cursor),
|
||||||
limit: this.toNumber(params.limit),
|
limit: this.toNumber(params.limit),
|
||||||
|
query: params.query?.trim(),
|
||||||
|
format: params.format,
|
||||||
|
playerId: params.playerId,
|
||||||
|
cursorMatchId: params.cursorMatchId,
|
||||||
|
lane: params.lane as CommunityStatsFilters['lane'],
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { Module } from '@nestjs/common';
|
import { forwardRef, Module } from '@nestjs/common';
|
||||||
|
import { RiotModule } from '../riot/riot.module';
|
||||||
import { CommunityStatsCacheService } from './community-stats-cache.service';
|
import { CommunityStatsCacheService } from './community-stats-cache.service';
|
||||||
import { CommunityStatsController } from './community-stats.controller';
|
import { CommunityStatsController } from './community-stats.controller';
|
||||||
import { CommunityStatsService } from './community-stats.service';
|
import { CommunityStatsService } from './community-stats.service';
|
||||||
@@ -7,6 +8,7 @@ import { MatchStatsRepository } from './match-stats.repository';
|
|||||||
import { MatchStatsService } from './match-stats.service';
|
import { MatchStatsService } from './match-stats.service';
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
|
imports: [forwardRef(() => RiotModule)],
|
||||||
controllers: [CommunityStatsController],
|
controllers: [CommunityStatsController],
|
||||||
providers: [
|
providers: [
|
||||||
CommunityStatsService,
|
CommunityStatsService,
|
||||||
|
|||||||
@@ -0,0 +1,1000 @@
|
|||||||
|
import mongoose from 'mongoose';
|
||||||
|
import { ConnectionService } from '../global/database/connection.service';
|
||||||
|
import {
|
||||||
|
CommunityStatsCacheKey,
|
||||||
|
CommunityStatsCacheService,
|
||||||
|
} from './community-stats-cache.service';
|
||||||
|
import { CommunityStatsService } from './community-stats.service';
|
||||||
|
import type {
|
||||||
|
InternalMatchCardView,
|
||||||
|
InternalMatchDetailResponse,
|
||||||
|
} from './community-stats.types';
|
||||||
|
import { MatchStatsRepository } from './match-stats.repository';
|
||||||
|
import { MatchStatsService } from './match-stats.service';
|
||||||
|
import {
|
||||||
|
MATCH_STATS_BUILDER_VERSION,
|
||||||
|
type InternalGameDetail,
|
||||||
|
type InternalRecord,
|
||||||
|
} from './match-stats.types';
|
||||||
|
|
||||||
|
function objectives() {
|
||||||
|
return {
|
||||||
|
tower: 1,
|
||||||
|
dragon: 0,
|
||||||
|
inhibitor: 0,
|
||||||
|
baron: 0,
|
||||||
|
riftHerald: 0,
|
||||||
|
voidGrub: 0,
|
||||||
|
elderDragon: 0,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function record(matchId: mongoose.Types.ObjectId): InternalRecord {
|
||||||
|
return {
|
||||||
|
matchId: matchId.toString(),
|
||||||
|
title: '내전',
|
||||||
|
scheduledAt: new Date('2026-06-18T12:00:00.000Z'),
|
||||||
|
gameNumber: 1,
|
||||||
|
riotMatchId: 'KR_1',
|
||||||
|
gameCreation: 1_000,
|
||||||
|
gameDuration: 1_800,
|
||||||
|
userId: new mongoose.Types.ObjectId().toString(),
|
||||||
|
summonerName: 'Player',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
profileIconId: 1,
|
||||||
|
teamIndex: 1,
|
||||||
|
side: 'blue',
|
||||||
|
championId: 266,
|
||||||
|
championLevel: 15,
|
||||||
|
teamPosition: 'TOP',
|
||||||
|
kills: 5,
|
||||||
|
deaths: 1,
|
||||||
|
assists: 7,
|
||||||
|
win: true,
|
||||||
|
cs: 200,
|
||||||
|
csPerMin: 6.7,
|
||||||
|
gold: 12_000,
|
||||||
|
gpm: 400,
|
||||||
|
damageDealtToChampions: 18_000,
|
||||||
|
damageTaken: 20_000,
|
||||||
|
damageShare: 30,
|
||||||
|
killParticipation: 60,
|
||||||
|
visionScore: 18,
|
||||||
|
controlWardsBought: 1,
|
||||||
|
wardsPlaced: 8,
|
||||||
|
wardsKilled: 2,
|
||||||
|
firstBloodKill: false,
|
||||||
|
firstBloodAssist: false,
|
||||||
|
items: [1054, 3071, 0, 0, 0, 0],
|
||||||
|
trinket: 3340,
|
||||||
|
summonerSpells: [4, 12],
|
||||||
|
perks: {
|
||||||
|
primaryStyle: 8000,
|
||||||
|
subStyle: 8400,
|
||||||
|
keystone: 8010,
|
||||||
|
selectedPerkIds: [8010, 9111, 9105, 8299, 8444, 8451],
|
||||||
|
styles: [
|
||||||
|
{ styleId: 8000, perkIds: [8010, 9111, 9105, 8299] },
|
||||||
|
{ styleId: 8400, perkIds: [8444, 8451] },
|
||||||
|
],
|
||||||
|
statPerks: { defense: 5001, flex: 5008, offense: 5005 },
|
||||||
|
},
|
||||||
|
itemBuild: [{ timestamp: 10, itemId: 1054, type: 'purchased' }],
|
||||||
|
skillBuild: [{ timestamp: 11, skillSlot: 1, level: 1 }],
|
||||||
|
rating: 8.5,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('CommunityStatsService', () => {
|
||||||
|
it('reads the official result again on a filtered page cache hit and excludes games from stale revisions', async () => {
|
||||||
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
|
const competitionId = new mongoose.Types.ObjectId();
|
||||||
|
const playerId = new mongoose.Types.ObjectId().toString();
|
||||||
|
const scheduledAt = new Date('2026-06-18T12:00:00Z');
|
||||||
|
const matchCard = {
|
||||||
|
matchId: matchId.toString(),
|
||||||
|
scheduledAt: scheduledAt.toISOString(),
|
||||||
|
games: [{ gameNumber: 1, winnerTeamIndex: 1 }],
|
||||||
|
};
|
||||||
|
const findMatchPage = jest.fn().mockResolvedValue([
|
||||||
|
{
|
||||||
|
matchId,
|
||||||
|
scheduledAt,
|
||||||
|
matchCard,
|
||||||
|
gameDetails: [{ gameNumber: 1, gameCreation: 1000 }],
|
||||||
|
sourceCompetitionId: competitionId,
|
||||||
|
sourceRevision: 4,
|
||||||
|
},
|
||||||
|
{ matchId: new mongoose.Types.ObjectId() },
|
||||||
|
]);
|
||||||
|
const source = {
|
||||||
|
_id: competitionId,
|
||||||
|
matchId,
|
||||||
|
communityId,
|
||||||
|
revision: 4,
|
||||||
|
createdAt: scheduledAt,
|
||||||
|
updatedAt: scheduledAt,
|
||||||
|
teams: [],
|
||||||
|
projection: {
|
||||||
|
phase: 'completed',
|
||||||
|
formatType: 'double-elimination',
|
||||||
|
series: [],
|
||||||
|
outcome: { type: 'double-elimination', championTeamId: 'winner' },
|
||||||
|
},
|
||||||
|
};
|
||||||
|
const find = jest.fn().mockReturnValue({
|
||||||
|
select: () => ({ lean: () => ({ exec: async () => [source] }) }),
|
||||||
|
});
|
||||||
|
let cachedPage: unknown = null;
|
||||||
|
const service = new CommunityStatsService(
|
||||||
|
{
|
||||||
|
getModel: async (name: string) =>
|
||||||
|
name === 'community'
|
||||||
|
? { findById: () => ({ exec: async () => ({ _id: communityId }) }) }
|
||||||
|
: { find },
|
||||||
|
} as unknown as ConnectionService,
|
||||||
|
{
|
||||||
|
get: async () => cachedPage,
|
||||||
|
set: async (_key: unknown, page: unknown) => {
|
||||||
|
cachedPage = JSON.parse(JSON.stringify(page));
|
||||||
|
},
|
||||||
|
} as unknown as CommunityStatsCacheService,
|
||||||
|
{ findMatchPage } as unknown as MatchStatsRepository,
|
||||||
|
{} as MatchStatsService,
|
||||||
|
);
|
||||||
|
jest
|
||||||
|
.spyOn(
|
||||||
|
service as unknown as {
|
||||||
|
repairCommunityFragments: () => Promise<number>;
|
||||||
|
},
|
||||||
|
'repairCommunityFragments',
|
||||||
|
)
|
||||||
|
.mockResolvedValue(0);
|
||||||
|
|
||||||
|
const params = {
|
||||||
|
communityId,
|
||||||
|
filters: {
|
||||||
|
seasonId: 'all',
|
||||||
|
query: '결승',
|
||||||
|
format: 'tournament' as const,
|
||||||
|
playerId,
|
||||||
|
limit: 1,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
const initial = await service.getMatches(params);
|
||||||
|
expect(initial.matches[0]).toMatchObject({
|
||||||
|
games: [{ gameNumber: 1 }],
|
||||||
|
resultPresentation: {
|
||||||
|
type: 'official',
|
||||||
|
phase: 'completed',
|
||||||
|
sourceRevision: 4,
|
||||||
|
outcome: { championTeamId: 'winner' },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
Object.assign(source, {
|
||||||
|
revision: 5,
|
||||||
|
projection: {
|
||||||
|
...source.projection,
|
||||||
|
phase: 'running',
|
||||||
|
outcome: undefined,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const result = await service.getMatches(params);
|
||||||
|
|
||||||
|
expect(findMatchPage).toHaveBeenCalledWith(
|
||||||
|
expect.objectContaining({
|
||||||
|
query: '결승',
|
||||||
|
format: 'tournament',
|
||||||
|
playerId,
|
||||||
|
limit: 2,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
expect(find).toHaveBeenCalledWith({
|
||||||
|
communityId,
|
||||||
|
matchId: { $in: [matchId] },
|
||||||
|
});
|
||||||
|
expect(findMatchPage).toHaveBeenCalledTimes(1);
|
||||||
|
expect(find).toHaveBeenCalledTimes(2);
|
||||||
|
expect(result.matches[0]).toMatchObject({
|
||||||
|
games: [],
|
||||||
|
resultPresentation: {
|
||||||
|
type: 'official',
|
||||||
|
competitionId: competitionId.toString(),
|
||||||
|
sourceRevision: 5,
|
||||||
|
phase: 'running',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
expect(result.nextCursor).toBe(scheduledAt.getTime());
|
||||||
|
expect(result.nextCursorMatchId).toBe(matchId.toString());
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each(['legacy', 'riot', 'unlinked'] as const)(
|
||||||
|
'preserves the scoreboard without retrying a missing Riot archive for %s evidence',
|
||||||
|
async (type) => {
|
||||||
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
|
const match = { matchId: matchId.toString() };
|
||||||
|
const participant = record(matchId);
|
||||||
|
const matchKey = type === 'legacy' ? 'legacy-reference' : 'KR_1';
|
||||||
|
const buildAndUpsert = jest.fn().mockResolvedValue(undefined);
|
||||||
|
const set = jest.fn();
|
||||||
|
const setDetail = jest.fn();
|
||||||
|
const service = new CommunityStatsService(
|
||||||
|
{
|
||||||
|
getModel: async () => ({
|
||||||
|
exists: () => ({ exec: async () => null }),
|
||||||
|
}),
|
||||||
|
} as unknown as ConnectionService,
|
||||||
|
{
|
||||||
|
get: async () => null,
|
||||||
|
set,
|
||||||
|
setDetail,
|
||||||
|
} as unknown as CommunityStatsCacheService,
|
||||||
|
{} as MatchStatsRepository,
|
||||||
|
{ buildAndUpsert } as unknown as MatchStatsService,
|
||||||
|
);
|
||||||
|
jest
|
||||||
|
.spyOn(
|
||||||
|
service as unknown as { getDetailRevision: () => Promise<string> },
|
||||||
|
'getDetailRevision',
|
||||||
|
)
|
||||||
|
.mockResolvedValue('revision-1');
|
||||||
|
(service as unknown as { buildBaseDataset: jest.Mock }).buildBaseDataset =
|
||||||
|
jest.fn().mockResolvedValue({
|
||||||
|
matches: [match],
|
||||||
|
detailsByMatchId: new Map([
|
||||||
|
[
|
||||||
|
match.matchId,
|
||||||
|
[
|
||||||
|
{
|
||||||
|
gameNumber: 1,
|
||||||
|
riotMatchId: matchKey,
|
||||||
|
gameCreation: 1000,
|
||||||
|
gameDuration: 1800,
|
||||||
|
rawAvailable: false,
|
||||||
|
timelineLoaded: false,
|
||||||
|
teams: [
|
||||||
|
{
|
||||||
|
teamIndex: 1,
|
||||||
|
side: 'blue',
|
||||||
|
win: true,
|
||||||
|
objectives: objectives(),
|
||||||
|
participants: [participant],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
],
|
||||||
|
]),
|
||||||
|
competition:
|
||||||
|
type === 'unlinked'
|
||||||
|
? undefined
|
||||||
|
: {
|
||||||
|
projection: {
|
||||||
|
games: [
|
||||||
|
{
|
||||||
|
id: 'game-1',
|
||||||
|
seriesId: 'series-1',
|
||||||
|
gameSlotId: 'slot-1',
|
||||||
|
ordinal: 1,
|
||||||
|
displayNumber: 1,
|
||||||
|
evidence:
|
||||||
|
type === 'legacy'
|
||||||
|
? { type, legacyReference: matchKey }
|
||||||
|
: { type, riotMatchId: matchKey },
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const response = await service.getMatchDetail({ communityId, matchId });
|
||||||
|
const afterCacheMiss = await service.getMatchDetail({
|
||||||
|
communityId,
|
||||||
|
matchId,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(response.games).toHaveLength(1);
|
||||||
|
expect(response.games).toMatchObject([
|
||||||
|
{
|
||||||
|
...(type === 'unlinked' ? {} : { gameId: 'game-1' }),
|
||||||
|
analysisAvailability: 'missing',
|
||||||
|
teams: [
|
||||||
|
{
|
||||||
|
win: true,
|
||||||
|
participants: [
|
||||||
|
{
|
||||||
|
kills: participant.kills,
|
||||||
|
deaths: participant.deaths,
|
||||||
|
assists: participant.assists,
|
||||||
|
championId: participant.championId,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
expect(afterCacheMiss).toEqual(response);
|
||||||
|
expect(buildAndUpsert).not.toHaveBeenCalled();
|
||||||
|
expect(set).not.toHaveBeenCalled();
|
||||||
|
expect(setDetail).toHaveBeenCalledTimes(2);
|
||||||
|
expect(setDetail).toHaveBeenCalledWith(
|
||||||
|
expect.objectContaining({ field: expect.stringContaining(':r9:') }),
|
||||||
|
response,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
it('ignores detail caches missing unified events or containing invalid checkpoints', async () => {
|
||||||
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
|
const match: InternalMatchCardView = {
|
||||||
|
matchId: matchId.toString(),
|
||||||
|
title: '내전',
|
||||||
|
scheduledAt: '2026-06-18T12:00:00.000Z',
|
||||||
|
status: 'finished',
|
||||||
|
gameCount: 1,
|
||||||
|
games: [],
|
||||||
|
teams: [],
|
||||||
|
seriesResults: [],
|
||||||
|
};
|
||||||
|
const participant = record(matchId);
|
||||||
|
Object.assign(participant, {
|
||||||
|
participantId: 1,
|
||||||
|
checkpoints: {
|
||||||
|
at10: {
|
||||||
|
timestamp: 590,
|
||||||
|
gold: 5_200,
|
||||||
|
cs: 90,
|
||||||
|
xp: 4_200,
|
||||||
|
kills: 1,
|
||||||
|
deaths: 1,
|
||||||
|
assists: 1,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const gameDetail: InternalGameDetail = {
|
||||||
|
gameNumber: 1,
|
||||||
|
riotMatchId: 'KR_1',
|
||||||
|
gameCreation: 1_000,
|
||||||
|
gameDuration: 1_800,
|
||||||
|
winnerSide: 'blue',
|
||||||
|
timelineLoaded: true,
|
||||||
|
timeline: [
|
||||||
|
{
|
||||||
|
timestamp: 0,
|
||||||
|
blue: { gold: 500, xp: 0 },
|
||||||
|
red: { gold: 500, xp: 0 },
|
||||||
|
goldDiff: 0,
|
||||||
|
xpDiff: 0,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
objectiveEvents: [],
|
||||||
|
teams: [
|
||||||
|
{
|
||||||
|
teamIndex: 1,
|
||||||
|
side: 'blue',
|
||||||
|
win: true,
|
||||||
|
objectives: objectives(),
|
||||||
|
bans: [],
|
||||||
|
participants: [participant],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
Object.assign(gameDetail, {
|
||||||
|
timelineEvents: [
|
||||||
|
{
|
||||||
|
timestamp: 300,
|
||||||
|
side: 'blue',
|
||||||
|
type: 'championKill',
|
||||||
|
killerParticipantId: 1,
|
||||||
|
victimParticipantId: 2,
|
||||||
|
assistingParticipantIds: [],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
const otherwiseCompleteCachedGame = {
|
||||||
|
gameNumber: 1,
|
||||||
|
riotMatchId: 'KR_1',
|
||||||
|
gameCreation: 1_000,
|
||||||
|
gameDuration: 1_800,
|
||||||
|
timeline: [],
|
||||||
|
objectiveEvents: [],
|
||||||
|
teams: [
|
||||||
|
{
|
||||||
|
teamIndex: 1,
|
||||||
|
side: 'blue' as const,
|
||||||
|
win: true,
|
||||||
|
objectives: objectives(),
|
||||||
|
bans: [],
|
||||||
|
participants: [
|
||||||
|
{
|
||||||
|
summonerName: 'Cached Player',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
itemBuild: [],
|
||||||
|
skillBuild: [],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
const missingTimelineEventsCache = {
|
||||||
|
match,
|
||||||
|
games: [otherwiseCompleteCachedGame],
|
||||||
|
} as unknown as InternalMatchDetailResponse;
|
||||||
|
const invalidCheckpointCache = {
|
||||||
|
match,
|
||||||
|
games: [
|
||||||
|
{
|
||||||
|
...otherwiseCompleteCachedGame,
|
||||||
|
timelineEvents: [],
|
||||||
|
teams: otherwiseCompleteCachedGame.teams.map((team) => ({
|
||||||
|
...team,
|
||||||
|
participants: team.participants.map((cachedParticipant) => ({
|
||||||
|
...cachedParticipant,
|
||||||
|
participantId: 1,
|
||||||
|
checkpoints: {
|
||||||
|
at10: {
|
||||||
|
timestamp: '590',
|
||||||
|
gold: 5_200,
|
||||||
|
cs: 90,
|
||||||
|
xp: 4_200,
|
||||||
|
kills: 1,
|
||||||
|
deaths: 1,
|
||||||
|
assists: 1,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})),
|
||||||
|
})),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
} as unknown as InternalMatchDetailResponse;
|
||||||
|
const setDetail = jest.fn().mockResolvedValue(undefined);
|
||||||
|
const cacheService = {
|
||||||
|
get: jest
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValueOnce(missingTimelineEventsCache)
|
||||||
|
.mockResolvedValueOnce(invalidCheckpointCache),
|
||||||
|
setDetail,
|
||||||
|
} as unknown as jest.Mocked<CommunityStatsCacheService>;
|
||||||
|
const matchStatsService = {
|
||||||
|
buildAndUpsert: jest.fn().mockResolvedValue(undefined),
|
||||||
|
} as unknown as jest.Mocked<MatchStatsService>;
|
||||||
|
const service = new CommunityStatsService(
|
||||||
|
{
|
||||||
|
getModel: jest.fn().mockResolvedValue({
|
||||||
|
findOne: () => ({
|
||||||
|
select: () => ({ lean: () => ({ exec: async () => null }) }),
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
} as unknown as ConnectionService,
|
||||||
|
cacheService,
|
||||||
|
{} as MatchStatsRepository,
|
||||||
|
matchStatsService,
|
||||||
|
);
|
||||||
|
(service as unknown as { buildBaseDataset: jest.Mock }).buildBaseDataset =
|
||||||
|
jest.fn().mockResolvedValue({
|
||||||
|
season: {
|
||||||
|
id: 'all',
|
||||||
|
label: '전체',
|
||||||
|
startTime: null,
|
||||||
|
endTime: null,
|
||||||
|
},
|
||||||
|
matches: [match],
|
||||||
|
records: [participant],
|
||||||
|
detailsByMatchId: new Map([[matchId.toString(), [gameDetail]]]),
|
||||||
|
});
|
||||||
|
|
||||||
|
const missingEventsResponse = await service.getMatchDetail({
|
||||||
|
communityId,
|
||||||
|
matchId,
|
||||||
|
});
|
||||||
|
const invalidCheckpointResponse = await service.getMatchDetail({
|
||||||
|
communityId,
|
||||||
|
matchId,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(missingEventsResponse.games[0].timeline).toHaveLength(1);
|
||||||
|
expect(invalidCheckpointResponse.games[0].timeline).toHaveLength(1);
|
||||||
|
expect(invalidCheckpointResponse.games[0]).toMatchObject({
|
||||||
|
timelineEvents: [
|
||||||
|
{
|
||||||
|
timestamp: 300,
|
||||||
|
side: 'blue',
|
||||||
|
type: 'championKill',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
expect(
|
||||||
|
invalidCheckpointResponse.games[0].teams[0].participants[0],
|
||||||
|
).toMatchObject({
|
||||||
|
participantId: 1,
|
||||||
|
checkpoints: {
|
||||||
|
at10: {
|
||||||
|
timestamp: 590,
|
||||||
|
gold: 5_200,
|
||||||
|
cs: 90,
|
||||||
|
xp: 4_200,
|
||||||
|
kills: 1,
|
||||||
|
deaths: 1,
|
||||||
|
assists: 1,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
itemBuild: [{ timestamp: 10, itemId: 1054, type: 'purchased' }],
|
||||||
|
perks: {
|
||||||
|
selectedPerkIds: [8010, 9111, 9105, 8299, 8444, 8451],
|
||||||
|
},
|
||||||
|
});
|
||||||
|
expect(matchStatsService.buildAndUpsert).not.toHaveBeenCalled();
|
||||||
|
expect(setDetail).toHaveBeenCalledTimes(2);
|
||||||
|
expect(setDetail).toHaveBeenNthCalledWith(
|
||||||
|
2,
|
||||||
|
expect.objectContaining({ field: expect.stringContaining(':r9:') }),
|
||||||
|
invalidCheckpointResponse,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('backs off failed timeline hydration and retries after the short cache expires', async () => {
|
||||||
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
|
const match: InternalMatchCardView = {
|
||||||
|
matchId: matchId.toString(),
|
||||||
|
title: '내전',
|
||||||
|
scheduledAt: '2026-06-18T12:00:00.000Z',
|
||||||
|
status: 'finished',
|
||||||
|
gameCount: 1,
|
||||||
|
games: [],
|
||||||
|
teams: [],
|
||||||
|
seriesResults: [],
|
||||||
|
};
|
||||||
|
const participant = record(matchId);
|
||||||
|
const gameDetail: InternalGameDetail = {
|
||||||
|
gameNumber: 1,
|
||||||
|
riotMatchId: 'KR_1',
|
||||||
|
gameCreation: 1_000,
|
||||||
|
gameDuration: 1_800,
|
||||||
|
winnerSide: 'blue',
|
||||||
|
rawAvailable: true,
|
||||||
|
timelineLoaded: false,
|
||||||
|
timeline: [],
|
||||||
|
objectiveEvents: [],
|
||||||
|
timelineEvents: [],
|
||||||
|
teams: [
|
||||||
|
{
|
||||||
|
teamIndex: 1,
|
||||||
|
side: 'blue',
|
||||||
|
win: true,
|
||||||
|
objectives: objectives(),
|
||||||
|
bans: [],
|
||||||
|
participants: [participant],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
const dataset = (timelineLoaded: boolean) => ({
|
||||||
|
season: {
|
||||||
|
id: 'all',
|
||||||
|
label: '전체',
|
||||||
|
startTime: null,
|
||||||
|
endTime: null,
|
||||||
|
},
|
||||||
|
matches: [match],
|
||||||
|
records: [participant],
|
||||||
|
detailsByMatchId: new Map([
|
||||||
|
[matchId.toString(), [{ ...gameDetail, timelineLoaded }]],
|
||||||
|
]),
|
||||||
|
});
|
||||||
|
let cachedResponse: InternalMatchDetailResponse | null = null;
|
||||||
|
const set = jest
|
||||||
|
.fn()
|
||||||
|
.mockImplementation(
|
||||||
|
(_key: CommunityStatsCacheKey, value: InternalMatchDetailResponse) => {
|
||||||
|
cachedResponse = value;
|
||||||
|
return Promise.resolve();
|
||||||
|
},
|
||||||
|
);
|
||||||
|
const setDetail = jest
|
||||||
|
.fn()
|
||||||
|
.mockImplementation(
|
||||||
|
(_key: CommunityStatsCacheKey, value: InternalMatchDetailResponse) => {
|
||||||
|
cachedResponse = value;
|
||||||
|
return Promise.resolve();
|
||||||
|
},
|
||||||
|
);
|
||||||
|
const cacheService = {
|
||||||
|
get: jest.fn().mockImplementation(() => Promise.resolve(cachedResponse)),
|
||||||
|
set,
|
||||||
|
setDetail,
|
||||||
|
} as unknown as jest.Mocked<CommunityStatsCacheService>;
|
||||||
|
const buildAndUpsert = jest.fn().mockResolvedValue(undefined);
|
||||||
|
const service = new CommunityStatsService(
|
||||||
|
{
|
||||||
|
getModel: jest.fn().mockResolvedValue({
|
||||||
|
findOne: () => ({
|
||||||
|
select: () => ({ lean: () => ({ exec: async () => null }) }),
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
} as unknown as ConnectionService,
|
||||||
|
cacheService,
|
||||||
|
{} as MatchStatsRepository,
|
||||||
|
{ buildAndUpsert } as unknown as MatchStatsService,
|
||||||
|
);
|
||||||
|
(service as unknown as { buildBaseDataset: jest.Mock }).buildBaseDataset =
|
||||||
|
jest
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValueOnce(dataset(false))
|
||||||
|
.mockResolvedValueOnce(dataset(false))
|
||||||
|
.mockResolvedValueOnce(dataset(false))
|
||||||
|
.mockResolvedValueOnce(dataset(true));
|
||||||
|
|
||||||
|
const fallback = await service.getMatchDetail({ communityId, matchId });
|
||||||
|
const backedOff = await service.getMatchDetail({ communityId, matchId });
|
||||||
|
|
||||||
|
expect(backedOff).toBe(fallback);
|
||||||
|
expect(fallback.games[0].analysisAvailability).toBe('available');
|
||||||
|
expect(buildAndUpsert).toHaveBeenCalledTimes(1);
|
||||||
|
expect(buildAndUpsert).toHaveBeenCalledWith(matchId, {
|
||||||
|
includeTimeline: true,
|
||||||
|
});
|
||||||
|
expect(set).toHaveBeenCalledWith(
|
||||||
|
expect.objectContaining({ field: expect.stringContaining(':r9:') }),
|
||||||
|
fallback,
|
||||||
|
60,
|
||||||
|
);
|
||||||
|
expect(setDetail).not.toHaveBeenCalled();
|
||||||
|
|
||||||
|
cachedResponse = null;
|
||||||
|
const recovered = await service.getMatchDetail({ communityId, matchId });
|
||||||
|
|
||||||
|
expect(buildAndUpsert).toHaveBeenCalledTimes(2);
|
||||||
|
expect(setDetail).toHaveBeenCalledTimes(1);
|
||||||
|
expect(setDetail).toHaveBeenCalledWith(
|
||||||
|
expect.objectContaining({ field: expect.stringContaining(':r9:') }),
|
||||||
|
recovered,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('coalesces concurrent internal match detail cache misses', async () => {
|
||||||
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
|
const match: InternalMatchCardView = {
|
||||||
|
matchId: matchId.toString(),
|
||||||
|
title: '내전',
|
||||||
|
scheduledAt: '2026-06-18T12:00:00.000Z',
|
||||||
|
status: 'finished',
|
||||||
|
gameCount: 1,
|
||||||
|
games: [],
|
||||||
|
teams: [],
|
||||||
|
seriesResults: [],
|
||||||
|
};
|
||||||
|
const participant = record(matchId);
|
||||||
|
const dataset = {
|
||||||
|
season: {
|
||||||
|
id: 'all',
|
||||||
|
label: '전체',
|
||||||
|
startTime: null,
|
||||||
|
endTime: null,
|
||||||
|
},
|
||||||
|
matches: [match],
|
||||||
|
records: [participant],
|
||||||
|
detailsByMatchId: new Map([
|
||||||
|
[
|
||||||
|
matchId.toString(),
|
||||||
|
[
|
||||||
|
{
|
||||||
|
gameNumber: 1,
|
||||||
|
riotMatchId: 'KR_1',
|
||||||
|
gameCreation: 1_000,
|
||||||
|
gameDuration: 1_800,
|
||||||
|
winnerSide: 'blue' as const,
|
||||||
|
timelineLoaded: true,
|
||||||
|
timeline: [],
|
||||||
|
objectiveEvents: [],
|
||||||
|
timelineEvents: [],
|
||||||
|
teams: [
|
||||||
|
{
|
||||||
|
teamIndex: 1,
|
||||||
|
side: 'blue' as const,
|
||||||
|
win: true,
|
||||||
|
objectives: objectives(),
|
||||||
|
bans: [],
|
||||||
|
participants: [participant],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
],
|
||||||
|
]),
|
||||||
|
};
|
||||||
|
let resolveDataset: ((value: typeof dataset) => void) | undefined;
|
||||||
|
const datasetPromise = new Promise<typeof dataset>((resolve) => {
|
||||||
|
resolveDataset = resolve;
|
||||||
|
});
|
||||||
|
const setDetail = jest.fn().mockResolvedValue(undefined);
|
||||||
|
const cacheService = {
|
||||||
|
get: jest.fn().mockResolvedValue(null),
|
||||||
|
setDetail,
|
||||||
|
} as unknown as jest.Mocked<CommunityStatsCacheService>;
|
||||||
|
const service = new CommunityStatsService(
|
||||||
|
{
|
||||||
|
getModel: jest.fn().mockResolvedValue({
|
||||||
|
findOne: () => ({
|
||||||
|
select: () => ({ lean: () => ({ exec: async () => null }) }),
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
} as unknown as ConnectionService,
|
||||||
|
cacheService,
|
||||||
|
{} as MatchStatsRepository,
|
||||||
|
{} as MatchStatsService,
|
||||||
|
);
|
||||||
|
const buildBaseDataset = jest.fn().mockReturnValue(datasetPromise);
|
||||||
|
(service as unknown as { buildBaseDataset: jest.Mock }).buildBaseDataset =
|
||||||
|
buildBaseDataset;
|
||||||
|
|
||||||
|
const first = service.getMatchDetail({ communityId, matchId });
|
||||||
|
const second = service.getMatchDetail({ communityId, matchId });
|
||||||
|
await Promise.resolve();
|
||||||
|
resolveDataset?.(dataset);
|
||||||
|
const [firstResponse, secondResponse] = await Promise.all([first, second]);
|
||||||
|
|
||||||
|
expect(firstResponse).toBe(secondResponse);
|
||||||
|
expect(buildBaseDataset).toHaveBeenCalledTimes(1);
|
||||||
|
expect(setDetail).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('includes internal match route fields in user internal history matches', async () => {
|
||||||
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
|
const userId = new mongoose.Types.ObjectId();
|
||||||
|
const participant = record(matchId);
|
||||||
|
participant.userId = userId.toString();
|
||||||
|
participant.gameNumber = 2;
|
||||||
|
participant.riotMatchId = 'KR_1234';
|
||||||
|
|
||||||
|
const cacheService = {
|
||||||
|
get: jest.fn().mockResolvedValue(null),
|
||||||
|
set: jest.fn().mockResolvedValue(undefined),
|
||||||
|
} as unknown as jest.Mocked<CommunityStatsCacheService>;
|
||||||
|
const matchStatsRepository = {
|
||||||
|
findUserRecordFragments: jest
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValue([{ matchId, records: [participant] }]),
|
||||||
|
findDetailsByMatches: jest
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValue([{ matchId, gameDetails: [] }]),
|
||||||
|
} as unknown as jest.Mocked<MatchStatsRepository>;
|
||||||
|
const service = new CommunityStatsService(
|
||||||
|
{} as ConnectionService,
|
||||||
|
cacheService,
|
||||||
|
matchStatsRepository,
|
||||||
|
{} as MatchStatsService,
|
||||||
|
);
|
||||||
|
(service as unknown as { resolveContext: jest.Mock }).resolveContext = jest
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValue({
|
||||||
|
community: {},
|
||||||
|
season: {
|
||||||
|
id: 'all',
|
||||||
|
label: '전체',
|
||||||
|
startedAt: null,
|
||||||
|
endedAt: null,
|
||||||
|
},
|
||||||
|
from: null,
|
||||||
|
to: null,
|
||||||
|
});
|
||||||
|
const buildBaseDataset = jest.spyOn(
|
||||||
|
service as unknown as { buildBaseDataset: jest.Mock },
|
||||||
|
'buildBaseDataset',
|
||||||
|
);
|
||||||
|
|
||||||
|
const response = await service.getUserInternalHistory({
|
||||||
|
communityId,
|
||||||
|
userId,
|
||||||
|
filters: { limit: 5 },
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(response.matches[0]).toMatchObject({
|
||||||
|
matchId: 'KR_1234',
|
||||||
|
internalMatchId: matchId.toString(),
|
||||||
|
gameNumber: 2,
|
||||||
|
queueLabel: '내전',
|
||||||
|
});
|
||||||
|
expect(matchStatsRepository.findUserRecordFragments).toHaveBeenCalledWith({
|
||||||
|
communityId,
|
||||||
|
userId,
|
||||||
|
fromGameCreation: undefined,
|
||||||
|
toGameCreation: undefined,
|
||||||
|
limit: 300,
|
||||||
|
});
|
||||||
|
expect(
|
||||||
|
matchStatsRepository.findDetailsByMatches.mock.calls[0][0].matchIds.map(
|
||||||
|
(id) => id.toString(),
|
||||||
|
),
|
||||||
|
).toEqual([matchId.toString()]);
|
||||||
|
expect(buildBaseDataset).not.toHaveBeenCalled();
|
||||||
|
expect(cacheService.set).toHaveBeenCalledWith(
|
||||||
|
expect.objectContaining({
|
||||||
|
field: expect.stringContaining(`userInternal:v3:${userId.toString()}`),
|
||||||
|
}),
|
||||||
|
response,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns independent recent-20 lane windows and counts from records before pagination', async () => {
|
||||||
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
|
const userId = new mongoose.Types.ObjectId();
|
||||||
|
const records = Array.from({ length: 60 }, (_, index) => ({
|
||||||
|
...record(matchId), userId: userId.toString(), gameNumber: index + 1,
|
||||||
|
riotMatchId: `KR_${index}`, gameCreation: index * 1000,
|
||||||
|
teamPosition: index < 25 ? 'MIDDLE' : 'TOP',
|
||||||
|
}));
|
||||||
|
const repository = {
|
||||||
|
findUserRecordFragments: jest.fn().mockResolvedValue([{ matchId, builderVersion: MATCH_STATS_BUILDER_VERSION, records }]),
|
||||||
|
findDetailsByMatches: jest.fn().mockResolvedValue([]),
|
||||||
|
} as unknown as jest.Mocked<MatchStatsRepository>;
|
||||||
|
const cache = { get: jest.fn().mockResolvedValue(null), set: jest.fn().mockResolvedValue(undefined) } as unknown as CommunityStatsCacheService;
|
||||||
|
const service = new CommunityStatsService({} as ConnectionService, cache, repository, {} as MatchStatsService);
|
||||||
|
(service as unknown as { resolveContext: jest.Mock }).resolveContext = jest.fn().mockResolvedValue({
|
||||||
|
community: {}, season: { id: 'all', label: '전체', startedAt: null, endedAt: null }, from: null, to: null,
|
||||||
|
});
|
||||||
|
const mid = await service.getUserInternalHistory({ communityId, userId, filters: { limit: 20, lane: 'MIDDLE', includePositionCounts: true } });
|
||||||
|
expect(mid.matches).toHaveLength(20);
|
||||||
|
expect(mid.matches[0].matchId).toBe('KR_24');
|
||||||
|
expect(mid.matches[19].matchId).toBe('KR_5');
|
||||||
|
expect(mid.matches[0].damageShare).toBe(30);
|
||||||
|
expect(mid.positionCounts).toEqual({ ALL: 20, TOP: 20, JUNGLE: 0, MIDDLE: 20, BOTTOM: 0, UTILITY: 0 });
|
||||||
|
expect(repository.findUserRecordFragments).toHaveBeenCalledWith(expect.objectContaining({ limit: 0 }));
|
||||||
|
const all = await service.getUserInternalHistory({ communityId, userId, filters: { limit: 20, includePositionCounts: true } });
|
||||||
|
expect(all.matches.every(game => game.teamPosition === 'TOP')).toBe(true);
|
||||||
|
expect(all.positionCounts).toEqual(mid.positionCounts);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('coalesces concurrent user internal history cache misses', async () => {
|
||||||
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
|
const userId = new mongoose.Types.ObjectId();
|
||||||
|
const participant = record(matchId);
|
||||||
|
participant.userId = userId.toString();
|
||||||
|
|
||||||
|
let resolveFragments:
|
||||||
|
| ((
|
||||||
|
fragments: Array<{
|
||||||
|
matchId: mongoose.Types.ObjectId;
|
||||||
|
records: InternalRecord[];
|
||||||
|
}>,
|
||||||
|
) => void)
|
||||||
|
| undefined;
|
||||||
|
const fragmentsPromise = new Promise<
|
||||||
|
Array<{ matchId: mongoose.Types.ObjectId; records: InternalRecord[] }>
|
||||||
|
>((resolve) => {
|
||||||
|
resolveFragments = resolve;
|
||||||
|
});
|
||||||
|
const cacheService = {
|
||||||
|
get: jest.fn().mockResolvedValue(null),
|
||||||
|
set: jest.fn().mockResolvedValue(undefined),
|
||||||
|
} as unknown as jest.Mocked<CommunityStatsCacheService>;
|
||||||
|
const matchStatsRepository = {
|
||||||
|
findUserRecordFragments: jest.fn().mockReturnValue(fragmentsPromise),
|
||||||
|
findDetailsByMatches: jest.fn().mockResolvedValue([]),
|
||||||
|
} as unknown as jest.Mocked<MatchStatsRepository>;
|
||||||
|
const service = new CommunityStatsService(
|
||||||
|
{} as ConnectionService,
|
||||||
|
cacheService,
|
||||||
|
matchStatsRepository,
|
||||||
|
{} as MatchStatsService,
|
||||||
|
);
|
||||||
|
(service as unknown as { resolveContext: jest.Mock }).resolveContext = jest
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValue({
|
||||||
|
community: {},
|
||||||
|
season: {
|
||||||
|
id: 'all',
|
||||||
|
label: '전체',
|
||||||
|
startedAt: null,
|
||||||
|
endedAt: null,
|
||||||
|
},
|
||||||
|
from: null,
|
||||||
|
to: null,
|
||||||
|
});
|
||||||
|
|
||||||
|
const first = service.getUserInternalHistory({
|
||||||
|
communityId,
|
||||||
|
userId,
|
||||||
|
filters: { limit: 5 },
|
||||||
|
});
|
||||||
|
const second = service.getUserInternalHistory({
|
||||||
|
communityId,
|
||||||
|
userId,
|
||||||
|
filters: { limit: 5 },
|
||||||
|
});
|
||||||
|
await Promise.resolve();
|
||||||
|
resolveFragments?.([{ matchId, records: [participant] }]);
|
||||||
|
const [firstResponse, secondResponse] = await Promise.all([first, second]);
|
||||||
|
|
||||||
|
expect(firstResponse).toBe(secondResponse);
|
||||||
|
expect(matchStatsRepository.findUserRecordFragments).toHaveBeenCalledTimes(
|
||||||
|
1,
|
||||||
|
);
|
||||||
|
expect(cacheService.set).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('self-heals Competition fragments when their source revision is stale', async () => {
|
||||||
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
|
const competitionId = new mongoose.Types.ObjectId();
|
||||||
|
const matches = [{ _id: matchId, competitionId }];
|
||||||
|
const MatchModel = {
|
||||||
|
find: jest.fn().mockReturnValue({
|
||||||
|
sort: jest.fn().mockReturnValue({
|
||||||
|
limit: jest.fn().mockReturnValue({
|
||||||
|
select: jest.fn().mockReturnValue({
|
||||||
|
exec: jest.fn().mockResolvedValue(matches),
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
};
|
||||||
|
const CompetitionModel = {
|
||||||
|
find: jest.fn().mockReturnValue({
|
||||||
|
select: jest.fn().mockReturnValue({
|
||||||
|
lean: jest.fn().mockReturnValue({
|
||||||
|
exec: jest.fn().mockResolvedValue([
|
||||||
|
{
|
||||||
|
_id: competitionId,
|
||||||
|
revision: 7,
|
||||||
|
projectorVersion: 3,
|
||||||
|
},
|
||||||
|
]),
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
};
|
||||||
|
const connectionService = {
|
||||||
|
getModel: jest.fn().mockImplementation((name: string) => {
|
||||||
|
if (name === 'match') return Promise.resolve(MatchModel);
|
||||||
|
if (name === 'competition') return Promise.resolve(CompetitionModel);
|
||||||
|
throw new Error(`Unexpected model ${name}`);
|
||||||
|
}),
|
||||||
|
} as unknown as ConnectionService;
|
||||||
|
const matchStatsRepository = {
|
||||||
|
findByCommunity: jest.fn().mockResolvedValue([
|
||||||
|
{
|
||||||
|
matchId,
|
||||||
|
builderVersion: MATCH_STATS_BUILDER_VERSION,
|
||||||
|
sourceCompetitionId: competitionId,
|
||||||
|
sourceRevision: 6,
|
||||||
|
projectorVersion: 3,
|
||||||
|
},
|
||||||
|
]),
|
||||||
|
} as unknown as jest.Mocked<MatchStatsRepository>;
|
||||||
|
const matchStatsService = {
|
||||||
|
buildAndUpsert: jest.fn().mockResolvedValue(undefined),
|
||||||
|
} as unknown as jest.Mocked<MatchStatsService>;
|
||||||
|
const service = new CommunityStatsService(
|
||||||
|
connectionService,
|
||||||
|
{} as CommunityStatsCacheService,
|
||||||
|
matchStatsRepository,
|
||||||
|
matchStatsService,
|
||||||
|
);
|
||||||
|
|
||||||
|
const rebuilt = await (
|
||||||
|
service as unknown as {
|
||||||
|
rebuildMissingOrStaleFragments(
|
||||||
|
communityId: mongoose.Types.ObjectId,
|
||||||
|
): Promise<number>;
|
||||||
|
}
|
||||||
|
).rebuildMissingOrStaleFragments(communityId);
|
||||||
|
|
||||||
|
expect(MatchModel.find).toHaveBeenCalledWith({
|
||||||
|
communityId,
|
||||||
|
status: { $in: ['finished', 'in-progress'] },
|
||||||
|
$or: [
|
||||||
|
{ competitionId: { $exists: true } },
|
||||||
|
{ 'result.games.0': { $exists: true } },
|
||||||
|
],
|
||||||
|
});
|
||||||
|
expect(matchStatsService.buildAndUpsert).toHaveBeenCalledWith(matchId);
|
||||||
|
expect(rebuilt).toBe(1);
|
||||||
|
});
|
||||||
|
});
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -1,18 +1,45 @@
|
|||||||
import type { RiotLane, TeamSide } from '../global/database/schema';
|
import type {
|
||||||
import type { RecentMatchView, HistorySeasonDto } from '../match-history/match-history.types';
|
GameAnalysisAvailability,
|
||||||
|
GameId,
|
||||||
|
GameSlotId,
|
||||||
|
InternalMatchCompetition,
|
||||||
|
InternalMatchResultPresentation,
|
||||||
|
SeriesId,
|
||||||
|
SeriesProjection,
|
||||||
|
} from '@lolympus/contracts';
|
||||||
|
import type {
|
||||||
|
MatchStatsParticipantCheckpoints,
|
||||||
|
MatchStatsItemBuildEvent,
|
||||||
|
MatchStatsRunePerks,
|
||||||
|
MatchStatsSkillBuildEvent,
|
||||||
|
MatchStatsTimelineEvent,
|
||||||
|
RiotLane,
|
||||||
|
TeamSide,
|
||||||
|
} from '../global/database/schema';
|
||||||
|
import type {
|
||||||
|
RecentMatchView,
|
||||||
|
HistorySeasonDto,
|
||||||
|
} from '../match-history/match-history.types';
|
||||||
|
|
||||||
export interface CommunityStatsFilters {
|
export interface CommunityStatsFilters {
|
||||||
|
includePositionCounts?: boolean;
|
||||||
seasonId?: string;
|
seasonId?: string;
|
||||||
from?: string;
|
from?: string;
|
||||||
to?: string;
|
to?: string;
|
||||||
championId?: number;
|
championId?: number;
|
||||||
cursor?: number;
|
cursor?: number;
|
||||||
limit?: number;
|
limit?: number;
|
||||||
|
query?: string;
|
||||||
|
format?: 'pair' | 'tournament';
|
||||||
|
playerId?: string;
|
||||||
|
cursorMatchId?: string;
|
||||||
|
lane?: RiotLane;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface InternalMatchListResponse {
|
export interface InternalMatchListResponse {
|
||||||
matches: InternalMatchCardView[];
|
matches: InternalMatchCardView[];
|
||||||
nextCursor: number | null;
|
nextCursor: number | null;
|
||||||
|
nextCursorMatchId?: string;
|
||||||
season: HistorySeasonDto;
|
season: HistorySeasonDto;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -23,6 +50,9 @@ export interface InternalMatchCardView {
|
|||||||
status: 'finished' | 'in-progress';
|
status: 'finished' | 'in-progress';
|
||||||
gameCount: number;
|
gameCount: number;
|
||||||
winnerTeamIndex?: number;
|
winnerTeamIndex?: number;
|
||||||
|
resultPresentation?: InternalMatchResultPresentation;
|
||||||
|
/** Official series only. Historical opponent pairs are not inferred rounds. */
|
||||||
|
series?: SeriesProjection[];
|
||||||
seriesResults: Array<{
|
seriesResults: Array<{
|
||||||
teamAIndex: number;
|
teamAIndex: number;
|
||||||
teamBIndex: number;
|
teamBIndex: number;
|
||||||
@@ -32,6 +62,9 @@ export interface InternalMatchCardView {
|
|||||||
}>;
|
}>;
|
||||||
games: Array<{
|
games: Array<{
|
||||||
gameNumber: number;
|
gameNumber: number;
|
||||||
|
seriesId?: string;
|
||||||
|
ordinal?: number;
|
||||||
|
analysisAvailability?: GameAnalysisAvailability | 'pending';
|
||||||
riotMatchId: string | null;
|
riotMatchId: string | null;
|
||||||
blueTeamIndex: number;
|
blueTeamIndex: number;
|
||||||
redTeamIndex: number;
|
redTeamIndex: number;
|
||||||
@@ -41,6 +74,7 @@ export interface InternalMatchCardView {
|
|||||||
}>;
|
}>;
|
||||||
teams: Array<{
|
teams: Array<{
|
||||||
teamIndex: number;
|
teamIndex: number;
|
||||||
|
teamId?: string;
|
||||||
name: string;
|
name: string;
|
||||||
members: Array<{
|
members: Array<{
|
||||||
userId: string;
|
userId: string;
|
||||||
@@ -52,12 +86,15 @@ export interface InternalMatchCardView {
|
|||||||
|
|
||||||
export interface LeaderboardResponse {
|
export interface LeaderboardResponse {
|
||||||
rows: LeaderboardRow[];
|
rows: LeaderboardRow[];
|
||||||
|
lane?: RiotLane;
|
||||||
season: HistorySeasonDto;
|
season: HistorySeasonDto;
|
||||||
|
matchedUserIds?: string[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface LeaderboardRow {
|
export interface LeaderboardRow {
|
||||||
userId: string;
|
userId: string;
|
||||||
summonerName: string;
|
summonerName: string;
|
||||||
|
tagLine?: string;
|
||||||
profileIconId: number;
|
profileIconId: number;
|
||||||
games: number;
|
games: number;
|
||||||
wins: number;
|
wins: number;
|
||||||
@@ -72,7 +109,9 @@ export interface LeaderboardRow {
|
|||||||
avgCsPerMin: number;
|
avgCsPerMin: number;
|
||||||
avgDamageShare: number;
|
avgDamageShare: number;
|
||||||
avgVisionScore: number;
|
avgVisionScore: number;
|
||||||
byLane: Partial<Record<RiotLane, { games: number; wins: number; kda: number }>>;
|
byLane: Partial<
|
||||||
|
Record<RiotLane, { games: number; wins: number; kda: number }>
|
||||||
|
>;
|
||||||
topChampions: Array<{ championId: number; games: number; winRate: number }>;
|
topChampions: Array<{ championId: number; games: number; winRate: number }>;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -82,16 +121,25 @@ export interface LeaderHighlight {
|
|||||||
summonerName: string;
|
summonerName: string;
|
||||||
championId?: number;
|
championId?: number;
|
||||||
matchId?: string;
|
matchId?: string;
|
||||||
|
internalMatchId?: string;
|
||||||
|
gameNumber?: number;
|
||||||
isSingleGame: boolean;
|
isSingleGame: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface TeamInsightsResponse {
|
export interface TeamInsightsResponse {
|
||||||
season: HistorySeasonDto;
|
season: HistorySeasonDto;
|
||||||
|
totals: {
|
||||||
|
matches: number;
|
||||||
|
games: number;
|
||||||
|
analyzedGames: number;
|
||||||
|
players: number;
|
||||||
|
};
|
||||||
sideWinRate: {
|
sideWinRate: {
|
||||||
blue: number;
|
blue: number;
|
||||||
red: number;
|
red: number;
|
||||||
bluePicks: number;
|
bluePicks: number;
|
||||||
redPicks: number;
|
redPicks: number;
|
||||||
|
confirmed: { sampleSize: number; blue: number; red: number };
|
||||||
};
|
};
|
||||||
topKda: LeaderHighlight | null;
|
topKda: LeaderHighlight | null;
|
||||||
mostKills: LeaderHighlight | null;
|
mostKills: LeaderHighlight | null;
|
||||||
@@ -103,23 +151,57 @@ export interface TeamInsightsResponse {
|
|||||||
|
|
||||||
export interface InternalMatchDetailResponse {
|
export interface InternalMatchDetailResponse {
|
||||||
match: InternalMatchCardView;
|
match: InternalMatchCardView;
|
||||||
|
competition?: InternalMatchCompetition;
|
||||||
games: Array<{
|
games: Array<{
|
||||||
gameNumber: number;
|
gameNumber: number;
|
||||||
|
gameId?: GameId;
|
||||||
|
analysisAvailability?: GameAnalysisAvailability;
|
||||||
|
gameSlotId?: GameSlotId;
|
||||||
|
seriesId?: SeriesId;
|
||||||
|
ordinal?: number;
|
||||||
riotMatchId: string;
|
riotMatchId: string;
|
||||||
gameCreation: number;
|
gameCreation: number;
|
||||||
gameDuration: number;
|
gameDuration: number;
|
||||||
|
gameVersion?: string;
|
||||||
|
timeline: Array<{
|
||||||
|
timestamp: number;
|
||||||
|
blue: { gold: number; xp: number };
|
||||||
|
red: { gold: number; xp: number };
|
||||||
|
goldDiff: number;
|
||||||
|
xpDiff: number;
|
||||||
|
}>;
|
||||||
|
objectiveEvents: Array<{
|
||||||
|
timestamp: number;
|
||||||
|
side: TeamSide;
|
||||||
|
type: 'dragon' | 'elderDragon' | 'baron' | 'riftHerald' | 'voidGrub';
|
||||||
|
monsterSubType?: string;
|
||||||
|
}>;
|
||||||
|
timelineEvents: MatchStatsTimelineEvent[];
|
||||||
teams: Array<{
|
teams: Array<{
|
||||||
teamIndex: number;
|
teamIndex: number;
|
||||||
side: TeamSide;
|
side: TeamSide;
|
||||||
win: boolean;
|
win: boolean;
|
||||||
objectives: { baron: number; dragon: number; tower: number };
|
objectives: {
|
||||||
|
tower: number;
|
||||||
|
dragon: number;
|
||||||
|
inhibitor: number;
|
||||||
|
baron: number;
|
||||||
|
riftHerald: number;
|
||||||
|
voidGrub: number;
|
||||||
|
elderDragon: number;
|
||||||
|
};
|
||||||
|
bans: Array<{ championId: number; pickTurn: number }>;
|
||||||
participants: Array<{
|
participants: Array<{
|
||||||
|
participantId?: number;
|
||||||
|
checkpoints?: MatchStatsParticipantCheckpoints;
|
||||||
userId: string | null;
|
userId: string | null;
|
||||||
summonerName: string;
|
summonerName: string;
|
||||||
|
tagLine: string;
|
||||||
teamIndex: number;
|
teamIndex: number;
|
||||||
side: TeamSide;
|
side: TeamSide;
|
||||||
teamPosition: string;
|
teamPosition: string;
|
||||||
championId: number;
|
championId: number;
|
||||||
|
championLevel: number;
|
||||||
kills: number;
|
kills: number;
|
||||||
deaths: number;
|
deaths: number;
|
||||||
assists: number;
|
assists: number;
|
||||||
@@ -128,13 +210,21 @@ export interface InternalMatchDetailResponse {
|
|||||||
gold: number;
|
gold: number;
|
||||||
gpm: number;
|
gpm: number;
|
||||||
damageDealtToChampions: number;
|
damageDealtToChampions: number;
|
||||||
|
damageTaken: number;
|
||||||
damageShare: number;
|
damageShare: number;
|
||||||
killParticipation: number;
|
killParticipation: number;
|
||||||
visionScore: number;
|
visionScore: number;
|
||||||
|
wardsPlaced: number;
|
||||||
|
wardsKilled: number;
|
||||||
|
controlWardsBought: number;
|
||||||
|
firstBloodKill: boolean;
|
||||||
|
firstBloodAssist: boolean;
|
||||||
items: number[];
|
items: number[];
|
||||||
trinket: number;
|
trinket: number;
|
||||||
summonerSpells: [number, number];
|
summonerSpells: [number, number];
|
||||||
perks: { primaryStyle?: number; subStyle?: number; keystone?: number };
|
perks: MatchStatsRunePerks;
|
||||||
|
itemBuild: MatchStatsItemBuildEvent[];
|
||||||
|
skillBuild: MatchStatsSkillBuildEvent[];
|
||||||
win: boolean;
|
win: boolean;
|
||||||
}>;
|
}>;
|
||||||
}>;
|
}>;
|
||||||
@@ -142,7 +232,9 @@ export interface InternalMatchDetailResponse {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export interface UserInternalHistoryResponse {
|
export interface UserInternalHistoryResponse {
|
||||||
|
positionCounts?: Record<string, number>;
|
||||||
season: HistorySeasonDto;
|
season: HistorySeasonDto;
|
||||||
|
playerStats?: LeaderboardRow | null;
|
||||||
championStats: LeaderboardChampionStats;
|
championStats: LeaderboardChampionStats;
|
||||||
summary: {
|
summary: {
|
||||||
windowSize: number;
|
windowSize: number;
|
||||||
|
|||||||
@@ -0,0 +1,378 @@
|
|||||||
|
import { BadRequestException } from '@nestjs/common';
|
||||||
|
import { Test } from '@nestjs/testing';
|
||||||
|
import request from 'supertest';
|
||||||
|
import type { Server } from 'node:http';
|
||||||
|
import mongoose from 'mongoose';
|
||||||
|
import { CommunityStatsService } from './community-stats.service';
|
||||||
|
import { CommunityStatsController } from './community-stats.controller';
|
||||||
|
import { ConnectionService } from '../global/database/connection.service';
|
||||||
|
import { CommunityStatsCacheService } from './community-stats-cache.service';
|
||||||
|
import { MatchStatsRepository } from './match-stats.repository';
|
||||||
|
import { MatchStatsService } from './match-stats.service';
|
||||||
|
import {
|
||||||
|
MATCH_STATS_BUILDER_VERSION,
|
||||||
|
type InternalRecord,
|
||||||
|
} from './match-stats.types';
|
||||||
|
import { presentStatsCard, statsDate } from './internal-stats-presentation';
|
||||||
|
|
||||||
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
|
const userId = new mongoose.Types.ObjectId();
|
||||||
|
const start = Date.parse('2026-06-18T12:00:00Z');
|
||||||
|
function record(
|
||||||
|
gameNumber: number,
|
||||||
|
values: Partial<InternalRecord> = {},
|
||||||
|
): InternalRecord {
|
||||||
|
return {
|
||||||
|
matchId: matchId.toString(),
|
||||||
|
title: '여름 내전',
|
||||||
|
scheduledAt: new Date(start),
|
||||||
|
gameNumber,
|
||||||
|
riotMatchId: `KR_${gameNumber}`,
|
||||||
|
gameCreation: start + gameNumber * 1800000,
|
||||||
|
gameDuration: 1800,
|
||||||
|
userId: userId.toString(),
|
||||||
|
summonerName: '선수',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
profileIconId: 1,
|
||||||
|
teamIndex: 1,
|
||||||
|
side: 'blue',
|
||||||
|
championId: 1,
|
||||||
|
teamPosition: 'TOP',
|
||||||
|
kills: 8,
|
||||||
|
deaths: 2,
|
||||||
|
assists: 4,
|
||||||
|
win: true,
|
||||||
|
cs: 240,
|
||||||
|
csPerMin: 8,
|
||||||
|
gold: 12000,
|
||||||
|
gpm: 400,
|
||||||
|
killParticipation: 60,
|
||||||
|
damageShare: 30,
|
||||||
|
visionScore: 12,
|
||||||
|
damageDealtToChampions: 18000,
|
||||||
|
...values,
|
||||||
|
} as InternalRecord;
|
||||||
|
}
|
||||||
|
function fixture() {
|
||||||
|
const records = [
|
||||||
|
record(1),
|
||||||
|
record(2, {
|
||||||
|
teamPosition: 'JUNGLE',
|
||||||
|
championId: 2,
|
||||||
|
kills: 2,
|
||||||
|
deaths: 4,
|
||||||
|
assists: 6,
|
||||||
|
win: false,
|
||||||
|
csPerMin: 4,
|
||||||
|
gpm: 300,
|
||||||
|
killParticipation: 40,
|
||||||
|
}),
|
||||||
|
record(3, { kills: 99 }),
|
||||||
|
record(3, { userId: new mongoose.Types.ObjectId().toString() }),
|
||||||
|
];
|
||||||
|
const fragment = {
|
||||||
|
matchId,
|
||||||
|
builderVersion: MATCH_STATS_BUILDER_VERSION,
|
||||||
|
records,
|
||||||
|
gameDetails: [1, 2, 3].map((gameNumber) => ({
|
||||||
|
gameNumber,
|
||||||
|
gameCreation: start + gameNumber * 1800000,
|
||||||
|
winnerSide: gameNumber === 2 ? 'red' : 'blue',
|
||||||
|
rawAvailable: gameNumber !== 3,
|
||||||
|
})),
|
||||||
|
};
|
||||||
|
const cache = new Map<string, unknown>();
|
||||||
|
const repository = {
|
||||||
|
findSeasonStats: jest.fn().mockResolvedValue([fragment]),
|
||||||
|
findUserRecordFragments: jest.fn().mockResolvedValue([fragment]),
|
||||||
|
findDetailsByMatches: jest.fn().mockResolvedValue([]),
|
||||||
|
};
|
||||||
|
const service = new CommunityStatsService(
|
||||||
|
{
|
||||||
|
getModel: async () => ({
|
||||||
|
findById: () => ({
|
||||||
|
exec: async () => ({
|
||||||
|
seasons: [
|
||||||
|
{
|
||||||
|
id: 'june',
|
||||||
|
label: '6월',
|
||||||
|
startedAt: new Date('2026-06-01T00:00:00+09:00'),
|
||||||
|
endedAt: new Date('2026-06-30T23:59:59.999+09:00'),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
} as unknown as ConnectionService,
|
||||||
|
{
|
||||||
|
get: async (key: unknown) => cache.get(JSON.stringify(key)),
|
||||||
|
set: async (key: unknown, value: unknown) => {
|
||||||
|
cache.set(JSON.stringify(key), value);
|
||||||
|
},
|
||||||
|
} as unknown as CommunityStatsCacheService,
|
||||||
|
repository as unknown as MatchStatsRepository,
|
||||||
|
{} as MatchStatsService,
|
||||||
|
);
|
||||||
|
jest
|
||||||
|
.spyOn(
|
||||||
|
service as unknown as { repairCommunityFragments: () => Promise<number> },
|
||||||
|
'repairCommunityFragments',
|
||||||
|
)
|
||||||
|
.mockResolvedValue(0);
|
||||||
|
return { service, repository };
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('internal stats API contract', () => {
|
||||||
|
it('serves the scoped player and leaderboard contracts through the HTTP routes', async () => {
|
||||||
|
const { service } = fixture();
|
||||||
|
const module = await Test.createTestingModule({
|
||||||
|
controllers: [CommunityStatsController],
|
||||||
|
providers: [{ provide: CommunityStatsService, useValue: service }],
|
||||||
|
}).compile();
|
||||||
|
const app = module.createNestApplication();
|
||||||
|
await app.init();
|
||||||
|
const server: Server = app.getHttpServer();
|
||||||
|
try {
|
||||||
|
const base = `/communities/${communityId.toString()}`;
|
||||||
|
const leaderboard = await request(server)
|
||||||
|
.get(`${base}/internal-stats/leaderboard?seasonId=all&lane=TOP`)
|
||||||
|
.expect(200);
|
||||||
|
expect(leaderboard.body).toMatchObject({
|
||||||
|
lane: 'TOP',
|
||||||
|
rows: [{ games: 1, kda: 6 }],
|
||||||
|
});
|
||||||
|
const player = await request(server)
|
||||||
|
.get(
|
||||||
|
`${base}/users/${userId.toString()}/internal-history?seasonId=all&lane=JUNGLE`,
|
||||||
|
)
|
||||||
|
.expect(200);
|
||||||
|
expect(player.body).toMatchObject({
|
||||||
|
playerStats: { games: 1, kda: 2 },
|
||||||
|
matches: [{ gameNumber: 2 }],
|
||||||
|
});
|
||||||
|
await request(server)
|
||||||
|
.get(`${base}/internal-stats/leaderboard?lane=invalid`)
|
||||||
|
.expect(400);
|
||||||
|
await request(server)
|
||||||
|
.get(`${base}/internal-stats/leaderboard?from=2026-02-30`)
|
||||||
|
.expect(400);
|
||||||
|
await request(server)
|
||||||
|
.get('/communities/invalid/internal-stats/leaderboard')
|
||||||
|
.expect(400);
|
||||||
|
} finally {
|
||||||
|
await app.close();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
it('searches escaped text across title, team and player without losing date or cursor constraints', async () => {
|
||||||
|
const chain = {
|
||||||
|
select: jest.fn().mockReturnThis(),
|
||||||
|
sort: jest.fn().mockReturnThis(),
|
||||||
|
limit: jest.fn().mockReturnThis(),
|
||||||
|
lean: jest.fn().mockReturnThis(),
|
||||||
|
exec: jest.fn().mockResolvedValue([]),
|
||||||
|
};
|
||||||
|
const find = jest.fn().mockReturnValue(chain);
|
||||||
|
const repository = new MatchStatsRepository({
|
||||||
|
getModel: async () => ({ find }),
|
||||||
|
} as unknown as ConnectionService);
|
||||||
|
await repository.findMatchPage({
|
||||||
|
communityId,
|
||||||
|
query: '팀.*',
|
||||||
|
from: start,
|
||||||
|
cursor: start + 1000,
|
||||||
|
cursorMatchId: matchId.toString(),
|
||||||
|
limit: 4,
|
||||||
|
});
|
||||||
|
expect(find).toHaveBeenCalledWith(
|
||||||
|
expect.objectContaining({
|
||||||
|
communityId,
|
||||||
|
$and: expect.arrayContaining([
|
||||||
|
{
|
||||||
|
$or: [
|
||||||
|
'matchCard.title',
|
||||||
|
'matchCard.teams.name',
|
||||||
|
'matchCard.teams.members.summonerName',
|
||||||
|
].map((field) => ({
|
||||||
|
[field]: { $regex: '팀\\.\\*', $options: 'i' },
|
||||||
|
})),
|
||||||
|
},
|
||||||
|
]),
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
expect(chain.limit).toHaveBeenCalledWith(4);
|
||||||
|
expect(chain.select).toHaveBeenCalledWith(
|
||||||
|
expect.objectContaining({ 'gameDetails.rawAvailable': 1 }),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
it('recalculates every metric per lane, isolates cached scopes and excludes missing raw data', async () => {
|
||||||
|
const { service } = fixture();
|
||||||
|
const all = await service.getLeaderboard({
|
||||||
|
communityId,
|
||||||
|
filters: { seasonId: 'all' },
|
||||||
|
});
|
||||||
|
const top = await service.getLeaderboard({
|
||||||
|
communityId,
|
||||||
|
filters: { seasonId: 'all', lane: 'TOP' },
|
||||||
|
});
|
||||||
|
const jungle = await service.getLeaderboard({
|
||||||
|
communityId,
|
||||||
|
filters: { seasonId: 'all', lane: 'JUNGLE' },
|
||||||
|
});
|
||||||
|
expect(all.rows).toHaveLength(1);
|
||||||
|
expect(all.rows[0]).toMatchObject({
|
||||||
|
games: 2,
|
||||||
|
totalKills: 10,
|
||||||
|
winRate: 50,
|
||||||
|
avgGoldPerMin: 350,
|
||||||
|
avgCsPerMin: 6,
|
||||||
|
avgKillParticipation: 50,
|
||||||
|
});
|
||||||
|
expect(top).toMatchObject({
|
||||||
|
lane: 'TOP',
|
||||||
|
rows: [
|
||||||
|
{
|
||||||
|
games: 1,
|
||||||
|
kda: 6,
|
||||||
|
winRate: 100,
|
||||||
|
avgGoldPerMin: 400,
|
||||||
|
avgCsPerMin: 8,
|
||||||
|
avgKillParticipation: 60,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
expect(jungle).toMatchObject({
|
||||||
|
lane: 'JUNGLE',
|
||||||
|
rows: [{ games: 1, kda: 2, winRate: 0, avgGoldPerMin: 300 }],
|
||||||
|
});
|
||||||
|
expect(
|
||||||
|
await service.getLeaderboard({
|
||||||
|
communityId,
|
||||||
|
filters: { seasonId: 'all' },
|
||||||
|
}),
|
||||||
|
).toEqual(all);
|
||||||
|
const insight = await service.getTeamInsights({
|
||||||
|
communityId,
|
||||||
|
filters: { seasonId: 'all' },
|
||||||
|
});
|
||||||
|
expect(insight.totals).toEqual({
|
||||||
|
matches: 1,
|
||||||
|
games: 3,
|
||||||
|
analyzedGames: 2,
|
||||||
|
players: 2,
|
||||||
|
});
|
||||||
|
expect(insight.topTeamGpm).toMatchObject({
|
||||||
|
internalMatchId: matchId.toString(),
|
||||||
|
gameNumber: 1,
|
||||||
|
metric: 400,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
it('keeps player summary and matches in the same scope while retaining champion choices', async () => {
|
||||||
|
const { service } = fixture();
|
||||||
|
const history = await service.getUserInternalHistory({
|
||||||
|
communityId,
|
||||||
|
userId,
|
||||||
|
filters: { seasonId: 'all', championId: 1 },
|
||||||
|
});
|
||||||
|
expect(history.playerStats).toMatchObject({ games: 1, kda: 6 });
|
||||||
|
expect(history.matches).toHaveLength(1);
|
||||||
|
expect(history.matches[0]).toMatchObject({
|
||||||
|
internalMatchId: matchId.toString(),
|
||||||
|
internalMatchTitle: '여름 내전',
|
||||||
|
gameNumber: 1,
|
||||||
|
});
|
||||||
|
expect(history.championStats.champions).toHaveLength(2);
|
||||||
|
});
|
||||||
|
it('intersects custom dates with the season and accepts inclusive KST calendar dates', async () => {
|
||||||
|
const { service, repository } = fixture();
|
||||||
|
await service.getLeaderboard({
|
||||||
|
communityId,
|
||||||
|
filters: { seasonId: 'june', from: '2026-05-01', to: '2026-07-31' },
|
||||||
|
});
|
||||||
|
expect(repository.findSeasonStats).toHaveBeenCalledWith({
|
||||||
|
communityId,
|
||||||
|
from: Date.parse('2026-05-31T15:00:00Z'),
|
||||||
|
to: Date.parse('2026-06-30T14:59:59.999Z'),
|
||||||
|
});
|
||||||
|
expect(statsDate('2026-06-18', false)?.toISOString()).toBe(
|
||||||
|
'2026-06-17T15:00:00.000Z',
|
||||||
|
);
|
||||||
|
expect(statsDate('2026-06-18', true)?.toISOString()).toBe(
|
||||||
|
'2026-06-18T14:59:59.999Z',
|
||||||
|
);
|
||||||
|
await expect(
|
||||||
|
service.getLeaderboard({ communityId, filters: { from: '2026-02-30' } }),
|
||||||
|
).rejects.toBeInstanceOf(BadRequestException);
|
||||||
|
await expect(
|
||||||
|
service.getLeaderboard({
|
||||||
|
communityId,
|
||||||
|
filters: { from: '2026-06-20', to: '2026-06-19' },
|
||||||
|
}),
|
||||||
|
).rejects.toBeInstanceOf(BadRequestException);
|
||||||
|
});
|
||||||
|
it('rejects unsupported lanes at the HTTP controller boundary', () => {
|
||||||
|
const controller = new CommunityStatsController(
|
||||||
|
{} as CommunityStatsService,
|
||||||
|
);
|
||||||
|
expect(() =>
|
||||||
|
(
|
||||||
|
controller as unknown as {
|
||||||
|
toFilters: (params: { lane: string }) => unknown;
|
||||||
|
}
|
||||||
|
).toFilters({ lane: 'SUPPORT' }),
|
||||||
|
).toThrow(BadRequestException);
|
||||||
|
});
|
||||||
|
it('uses official evidence to distinguish rematches and does not invent round identities', () => {
|
||||||
|
type Card = Parameters<typeof presentStatsCard>[0];
|
||||||
|
type Competition = NonNullable<Parameters<typeof presentStatsCard>[1]>;
|
||||||
|
const card = {
|
||||||
|
games: [
|
||||||
|
{ gameNumber: 1, riotMatchId: 'KR_1' },
|
||||||
|
{ gameNumber: 2, riotMatchId: 'KR_2' },
|
||||||
|
{ gameNumber: 3, riotMatchId: 'old' },
|
||||||
|
],
|
||||||
|
teams: [{ teamIndex: 1 }],
|
||||||
|
} as Card;
|
||||||
|
const competition = {
|
||||||
|
teams: [{ displayOrder: 1, teamId: 'a' }],
|
||||||
|
projection: {
|
||||||
|
games: [
|
||||||
|
{
|
||||||
|
displayNumber: 1,
|
||||||
|
ordinal: 1,
|
||||||
|
seriesId: 'upper',
|
||||||
|
evidence: { type: 'riot', riotMatchId: 'KR_1' },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
displayNumber: 2,
|
||||||
|
ordinal: 1,
|
||||||
|
seriesId: 'final',
|
||||||
|
evidence: { type: 'riot', riotMatchId: 'KR_2' },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
displayNumber: 3,
|
||||||
|
ordinal: 2,
|
||||||
|
seriesId: 'final',
|
||||||
|
evidence: { type: 'riot', riotMatchId: 'replacement' },
|
||||||
|
},
|
||||||
|
],
|
||||||
|
series: [
|
||||||
|
{ seriesId: 'upper' },
|
||||||
|
{ seriesId: 'final' },
|
||||||
|
{ seriesId: 'other', status: 'scheduled' },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
} as unknown as Competition;
|
||||||
|
const result = presentStatsCard(card, competition);
|
||||||
|
expect(result.games.map((game) => game.seriesId)).toEqual([
|
||||||
|
'upper',
|
||||||
|
'final',
|
||||||
|
undefined,
|
||||||
|
]);
|
||||||
|
expect(result.series?.map((series) => series.seriesId)).toEqual([
|
||||||
|
'upper',
|
||||||
|
'final',
|
||||||
|
]);
|
||||||
|
expect(result.teams[0].teamId).toBe('a');
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
import type { InternalMatchCompetition } from '@lolympus/contracts';
|
||||||
|
import type { InternalMatchCardView } from './community-stats.types';
|
||||||
|
|
||||||
|
/** Attach official identities without merging rematches between the same teams. */
|
||||||
|
export function presentStatsCard(
|
||||||
|
card: InternalMatchCardView,
|
||||||
|
competition?: Pick<InternalMatchCompetition, 'teams' | 'projection'>,
|
||||||
|
): InternalMatchCardView {
|
||||||
|
if (!competition) return card;
|
||||||
|
const officialGames = competition.projection.games ?? [];
|
||||||
|
const games = card.games.map((game) => {
|
||||||
|
const official = officialGames.find(
|
||||||
|
(candidate) =>
|
||||||
|
candidate.displayNumber === game.gameNumber &&
|
||||||
|
(candidate.evidence.type === 'riot'
|
||||||
|
? candidate.evidence.riotMatchId
|
||||||
|
: candidate.evidence.legacyReference) === game.riotMatchId,
|
||||||
|
);
|
||||||
|
return official
|
||||||
|
? { ...game, seriesId: official.seriesId, ordinal: official.ordinal }
|
||||||
|
: game;
|
||||||
|
});
|
||||||
|
const visible = new Set(games.map((game) => game.seriesId));
|
||||||
|
return {
|
||||||
|
...card,
|
||||||
|
games,
|
||||||
|
teams: card.teams?.map((team) => ({
|
||||||
|
...team,
|
||||||
|
teamId: competition.teams.find((t) => t.displayOrder === team.teamIndex)
|
||||||
|
?.teamId,
|
||||||
|
})),
|
||||||
|
series: (competition.projection.series ?? []).filter(
|
||||||
|
(series) =>
|
||||||
|
visible.has(series.seriesId) ||
|
||||||
|
(series.status === 'completed' && series.outcome.type !== 'played'),
|
||||||
|
),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Date-only inputs are inclusive Korean calendar days; ISO timestamps remain supported. */
|
||||||
|
export function statsDate(
|
||||||
|
value: string | undefined,
|
||||||
|
end: boolean,
|
||||||
|
): Date | null {
|
||||||
|
if (!value) return null;
|
||||||
|
if (/^\d{4}-\d{2}-\d{2}$/.test(value)) {
|
||||||
|
const date = new Date(
|
||||||
|
`${value}T${end ? '23:59:59.999' : '00:00:00.000'}+09:00`,
|
||||||
|
);
|
||||||
|
const midnight = new Date(`${value}T00:00:00.000Z`);
|
||||||
|
if (
|
||||||
|
!Number.isFinite(midnight.getTime()) ||
|
||||||
|
midnight.toISOString().slice(0, 10) !== value
|
||||||
|
)
|
||||||
|
return new Date(NaN);
|
||||||
|
return date;
|
||||||
|
}
|
||||||
|
return new Date(value);
|
||||||
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
import mongoose from 'mongoose';
|
import mongoose from 'mongoose';
|
||||||
import type { MatchDocument } from '../global/database/schema';
|
import type { MatchDocument } from '../global/database/schema';
|
||||||
|
import type { RiotMatchDto, RiotMatchTimelineDto } from '../riot/riot.types';
|
||||||
import { MatchStatsFragmentBuilder } from './match-stats-fragment.builder';
|
import { MatchStatsFragmentBuilder } from './match-stats-fragment.builder';
|
||||||
|
|
||||||
function makeMatch(): MatchDocument {
|
function makeMatch(): MatchDocument {
|
||||||
@@ -95,4 +96,726 @@ describe('MatchStatsFragmentBuilder', () => {
|
|||||||
});
|
});
|
||||||
expect(fragment.gameDetails[0].teams[0].participants).toHaveLength(1);
|
expect(fragment.gameDetails[0].teams[0].participants).toHaveLength(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('builds rich set detail from raw Riot match data', () => {
|
||||||
|
const builder = new MatchStatsFragmentBuilder();
|
||||||
|
const match = makeMatch();
|
||||||
|
const redUserId = new mongoose.Types.ObjectId();
|
||||||
|
match.participants.push({
|
||||||
|
userId: redUserId,
|
||||||
|
puuid: 'puuid-2',
|
||||||
|
gameName: 'Opponent',
|
||||||
|
profileIconId: 8,
|
||||||
|
preferredPositions: [],
|
||||||
|
joinedAt: new Date('2026-05-03T00:00:00.000Z'),
|
||||||
|
});
|
||||||
|
match.teams[1].members.push({ userId: redUserId, assignedPosition: 'TOP' });
|
||||||
|
match.result?.games[0].participants.push({
|
||||||
|
userId: redUserId,
|
||||||
|
teamIndex: 2,
|
||||||
|
side: 'red',
|
||||||
|
championId: 24,
|
||||||
|
kills: 1,
|
||||||
|
deaths: 3,
|
||||||
|
assists: 0,
|
||||||
|
win: false,
|
||||||
|
});
|
||||||
|
const raw = {
|
||||||
|
metadata: {
|
||||||
|
dataVersion: '2',
|
||||||
|
matchId: 'KR_1',
|
||||||
|
participants: ['puuid-1'],
|
||||||
|
},
|
||||||
|
info: {
|
||||||
|
gameCreation: 1_000,
|
||||||
|
gameDuration: 1_800,
|
||||||
|
gameId: 1,
|
||||||
|
gameMode: 'CLASSIC',
|
||||||
|
gameName: 'teambuilder-match-1',
|
||||||
|
gameStartTimestamp: 1_000,
|
||||||
|
gameType: 'CUSTOM_GAME',
|
||||||
|
gameVersion: '16.11.1.1234',
|
||||||
|
mapId: 11,
|
||||||
|
participants: [
|
||||||
|
{
|
||||||
|
assists: 7,
|
||||||
|
champExperience: 15_000,
|
||||||
|
champLevel: 15,
|
||||||
|
championId: 266,
|
||||||
|
championName: 'Aatrox',
|
||||||
|
deaths: 1,
|
||||||
|
firstBloodAssist: false,
|
||||||
|
firstBloodKill: true,
|
||||||
|
goldEarned: 12_345,
|
||||||
|
goldSpent: 11_000,
|
||||||
|
individualPosition: 'TOP',
|
||||||
|
item0: 1054,
|
||||||
|
item1: 3071,
|
||||||
|
item2: 0,
|
||||||
|
item3: 0,
|
||||||
|
item4: 0,
|
||||||
|
item5: 0,
|
||||||
|
item6: 3340,
|
||||||
|
kills: 5,
|
||||||
|
neutralMinionsKilled: 8,
|
||||||
|
participantId: 1,
|
||||||
|
perks: {
|
||||||
|
statPerks: { defense: 5001, flex: 5008, offense: 5005 },
|
||||||
|
styles: [
|
||||||
|
{
|
||||||
|
description: 'primaryStyle',
|
||||||
|
style: 8000,
|
||||||
|
selections: [
|
||||||
|
{ perk: 8010, var1: 0, var2: 0, var3: 0 },
|
||||||
|
{ perk: 9111, var1: 0, var2: 0, var3: 0 },
|
||||||
|
{ perk: 9105, var1: 0, var2: 0, var3: 0 },
|
||||||
|
{ perk: 8299, var1: 0, var2: 0, var3: 0 },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
description: 'subStyle',
|
||||||
|
style: 8400,
|
||||||
|
selections: [
|
||||||
|
{ perk: 8444, var1: 0, var2: 0, var3: 0 },
|
||||||
|
{ perk: 8451, var1: 0, var2: 0, var3: 0 },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
puuid: 'puuid-1',
|
||||||
|
riotIdGameName: 'Player',
|
||||||
|
riotIdTagLine: 'KR1',
|
||||||
|
summoner1Id: 4,
|
||||||
|
summoner2Id: 12,
|
||||||
|
summonerId: 'summoner-1',
|
||||||
|
summonerLevel: 100,
|
||||||
|
summonerName: 'Player',
|
||||||
|
teamId: 100,
|
||||||
|
teamPosition: 'TOP',
|
||||||
|
timePlayed: 1_800,
|
||||||
|
totalDamageDealtToChampions: 18_765,
|
||||||
|
totalDamageTaken: 24_321,
|
||||||
|
totalMinionsKilled: 220,
|
||||||
|
visionScore: 18,
|
||||||
|
visionWardsBoughtInGame: 2,
|
||||||
|
wardsKilled: 3,
|
||||||
|
wardsPlaced: 11,
|
||||||
|
win: true,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
platformId: 'KR',
|
||||||
|
queueId: 0,
|
||||||
|
teams: [
|
||||||
|
{
|
||||||
|
bans: [
|
||||||
|
{ championId: 14, pickTurn: 1 },
|
||||||
|
{ championId: 43, pickTurn: 2 },
|
||||||
|
],
|
||||||
|
objectives: {
|
||||||
|
baron: { first: true, kills: 1 },
|
||||||
|
champion: { first: true, kills: 5 },
|
||||||
|
dragon: { first: true, kills: 2 },
|
||||||
|
horde: { first: false, kills: 3 },
|
||||||
|
inhibitor: { first: false, kills: 0 },
|
||||||
|
riftHerald: { first: false, kills: 0 },
|
||||||
|
tower: { first: true, kills: 7 },
|
||||||
|
},
|
||||||
|
teamId: 100,
|
||||||
|
win: true,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
};
|
||||||
|
raw.info.participants.push(
|
||||||
|
{
|
||||||
|
...raw.info.participants[0],
|
||||||
|
assists: 0,
|
||||||
|
championId: 24,
|
||||||
|
championName: 'Jax',
|
||||||
|
deaths: 3,
|
||||||
|
kills: 1,
|
||||||
|
participantId: 2,
|
||||||
|
puuid: 'puuid-2',
|
||||||
|
riotIdGameName: 'Opponent',
|
||||||
|
summonerId: 'summoner-2',
|
||||||
|
summonerName: 'Opponent',
|
||||||
|
teamId: 200,
|
||||||
|
win: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
...raw.info.participants[0],
|
||||||
|
assists: 2,
|
||||||
|
championId: 64,
|
||||||
|
championName: 'LeeSin',
|
||||||
|
deaths: 0,
|
||||||
|
kills: 1,
|
||||||
|
participantId: 3,
|
||||||
|
puuid: 'puuid-3',
|
||||||
|
riotIdGameName: 'Jungler',
|
||||||
|
summonerId: 'summoner-3',
|
||||||
|
summonerName: 'Jungler',
|
||||||
|
teamId: 100,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
raw.info.teams.push({
|
||||||
|
bans: [],
|
||||||
|
objectives: {
|
||||||
|
baron: { first: false, kills: 0 },
|
||||||
|
champion: { first: false, kills: 3 },
|
||||||
|
dragon: { first: false, kills: 0 },
|
||||||
|
horde: { first: false, kills: 0 },
|
||||||
|
inhibitor: { first: false, kills: 0 },
|
||||||
|
riftHerald: { first: false, kills: 0 },
|
||||||
|
tower: { first: false, kills: 0 },
|
||||||
|
},
|
||||||
|
teamId: 200,
|
||||||
|
win: false,
|
||||||
|
});
|
||||||
|
const timeline: RiotMatchTimelineDto = {
|
||||||
|
metadata: {
|
||||||
|
dataVersion: '2',
|
||||||
|
matchId: 'KR_1',
|
||||||
|
participants: ['puuid-1'],
|
||||||
|
},
|
||||||
|
info: {
|
||||||
|
frameInterval: 60_000,
|
||||||
|
frames: [
|
||||||
|
{
|
||||||
|
timestamp: 0,
|
||||||
|
events: [],
|
||||||
|
participantFrames: {
|
||||||
|
'1': {
|
||||||
|
participantId: 1,
|
||||||
|
totalGold: 500,
|
||||||
|
xp: 0,
|
||||||
|
minionsKilled: 0,
|
||||||
|
jungleMinionsKilled: 0,
|
||||||
|
},
|
||||||
|
'2': {
|
||||||
|
participantId: 2,
|
||||||
|
totalGold: 500,
|
||||||
|
xp: 0,
|
||||||
|
minionsKilled: 0,
|
||||||
|
jungleMinionsKilled: 0,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
timestamp: 60_000,
|
||||||
|
events: [
|
||||||
|
{
|
||||||
|
type: 'ITEM_PURCHASED',
|
||||||
|
timestamp: 10_000,
|
||||||
|
participantId: 1,
|
||||||
|
itemId: 1054,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'SKILL_LEVEL_UP',
|
||||||
|
timestamp: 11_000,
|
||||||
|
participantId: 1,
|
||||||
|
skillSlot: 1,
|
||||||
|
levelUpType: 'NORMAL',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'ITEM_DESTROYED',
|
||||||
|
timestamp: 12_000,
|
||||||
|
participantId: 1,
|
||||||
|
itemId: 2003,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'ITEM_UNDO',
|
||||||
|
timestamp: 13_000,
|
||||||
|
participantId: 1,
|
||||||
|
beforeId: 1054,
|
||||||
|
afterId: 3071,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'ELITE_MONSTER_KILL',
|
||||||
|
timestamp: 20_000,
|
||||||
|
killerTeamId: 100,
|
||||||
|
monsterType: 'DRAGON',
|
||||||
|
monsterSubType: 'FIRE_DRAGON',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'ELITE_MONSTER_KILL',
|
||||||
|
timestamp: 30_000,
|
||||||
|
killerTeamId: 100,
|
||||||
|
monsterType: 'DRAGON',
|
||||||
|
monsterSubType: 'ELDER_DRAGON',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'ELITE_MONSTER_KILL',
|
||||||
|
timestamp: 40_000,
|
||||||
|
killerId: 1,
|
||||||
|
monsterType: 'HORDE',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'SKILL_LEVEL_UP',
|
||||||
|
timestamp: 45_000,
|
||||||
|
participantId: 1,
|
||||||
|
skillSlot: 3,
|
||||||
|
levelUpType: 'NORMAL',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'ELITE_MONSTER_KILL',
|
||||||
|
timestamp: 50_000,
|
||||||
|
killerTeamId: 100,
|
||||||
|
monsterType: 'BARON_NASHOR',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'ELITE_MONSTER_KILL',
|
||||||
|
timestamp: 55_000,
|
||||||
|
killerTeamId: 100,
|
||||||
|
monsterType: 'RIFTHERALD',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
participantFrames: {
|
||||||
|
'1': {
|
||||||
|
participantId: 1,
|
||||||
|
totalGold: 1_150,
|
||||||
|
xp: 550,
|
||||||
|
minionsKilled: 5,
|
||||||
|
jungleMinionsKilled: 1,
|
||||||
|
},
|
||||||
|
'2': {
|
||||||
|
participantId: 2,
|
||||||
|
totalGold: 1_050,
|
||||||
|
xp: 500,
|
||||||
|
minionsKilled: 4,
|
||||||
|
jungleMinionsKilled: 0,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
timestamp: 540_000,
|
||||||
|
events: [
|
||||||
|
{
|
||||||
|
type: 'CHAMPION_KILL',
|
||||||
|
timestamp: 300_000,
|
||||||
|
killerId: 1,
|
||||||
|
victimId: 2,
|
||||||
|
assistingParticipantIds: [3],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'CHAMPION_KILL',
|
||||||
|
timestamp: 400_000,
|
||||||
|
killerId: 0,
|
||||||
|
victimId: 1,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'BUILDING_KILL',
|
||||||
|
timestamp: 450_000,
|
||||||
|
killerId: 0,
|
||||||
|
teamId: 200,
|
||||||
|
buildingType: 'TOWER_BUILDING',
|
||||||
|
towerType: 'OUTER_TURRET',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'BUILDING_KILL',
|
||||||
|
timestamp: 450_000,
|
||||||
|
killerId: 1,
|
||||||
|
teamId: 200,
|
||||||
|
buildingType: 'INHIBITOR_BUILDING',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'CHAMPION_KILL',
|
||||||
|
timestamp: 500_000,
|
||||||
|
killerId: 3,
|
||||||
|
victimId: 2,
|
||||||
|
assistingParticipantIds: [1],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
participantFrames: {
|
||||||
|
'1': {
|
||||||
|
participantId: 1,
|
||||||
|
totalGold: 4_900,
|
||||||
|
xp: 3_900,
|
||||||
|
minionsKilled: 72,
|
||||||
|
jungleMinionsKilled: 8,
|
||||||
|
},
|
||||||
|
'2': {
|
||||||
|
participantId: 2,
|
||||||
|
totalGold: 4_300,
|
||||||
|
xp: 3_500,
|
||||||
|
minionsKilled: 68,
|
||||||
|
jungleMinionsKilled: 2,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
timestamp: 590_000,
|
||||||
|
events: [],
|
||||||
|
participantFrames: {
|
||||||
|
'1': {
|
||||||
|
participantId: 1,
|
||||||
|
totalGold: 5_200,
|
||||||
|
xp: 4_200,
|
||||||
|
minionsKilled: 80,
|
||||||
|
jungleMinionsKilled: 10,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
timestamp: 900_000,
|
||||||
|
events: [
|
||||||
|
{
|
||||||
|
type: 'CHAMPION_KILL',
|
||||||
|
timestamp: 900_000,
|
||||||
|
killerId: 1,
|
||||||
|
victimId: 2,
|
||||||
|
assistingParticipantIds: [3],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
participantFrames: {
|
||||||
|
'1': {
|
||||||
|
participantId: 1,
|
||||||
|
totalGold: 8_100,
|
||||||
|
xp: 7_300,
|
||||||
|
minionsKilled: 130,
|
||||||
|
jungleMinionsKilled: 15,
|
||||||
|
},
|
||||||
|
'2': {
|
||||||
|
participantId: 2,
|
||||||
|
totalGold: 6_700,
|
||||||
|
xp: 6_100,
|
||||||
|
minionsKilled: 115,
|
||||||
|
jungleMinionsKilled: 5,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
timestamp: 1_800_000,
|
||||||
|
events: [],
|
||||||
|
participantFrames: {
|
||||||
|
'1': {
|
||||||
|
participantId: 1,
|
||||||
|
totalGold: 12_500,
|
||||||
|
xp: 14_000,
|
||||||
|
minionsKilled: 205,
|
||||||
|
jungleMinionsKilled: 23,
|
||||||
|
},
|
||||||
|
'2': {
|
||||||
|
participantId: 2,
|
||||||
|
totalGold: 10_200,
|
||||||
|
xp: 12_700,
|
||||||
|
minionsKilled: 190,
|
||||||
|
jungleMinionsKilled: 10,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
const fragment = builder.buildFragment({
|
||||||
|
match,
|
||||||
|
rawByRiotMatchId: new Map([['KR_1', raw as RiotMatchDto]]),
|
||||||
|
timelineByRiotMatchId: new Map([['KR_1', timeline]]),
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(fragment.gameDetails[0]).toMatchObject({
|
||||||
|
gameVersion: '16.11.1.1234',
|
||||||
|
objectiveEvents: [
|
||||||
|
{
|
||||||
|
timestamp: 20,
|
||||||
|
side: 'blue',
|
||||||
|
type: 'dragon',
|
||||||
|
monsterSubType: 'FIRE_DRAGON',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
timestamp: 30,
|
||||||
|
side: 'blue',
|
||||||
|
type: 'elderDragon',
|
||||||
|
monsterSubType: 'ELDER_DRAGON',
|
||||||
|
},
|
||||||
|
{ timestamp: 40, side: 'blue', type: 'voidGrub' },
|
||||||
|
{ timestamp: 50, side: 'blue', type: 'baron' },
|
||||||
|
{ timestamp: 55, side: 'blue', type: 'riftHerald' },
|
||||||
|
],
|
||||||
|
timeline: [
|
||||||
|
{
|
||||||
|
timestamp: 0,
|
||||||
|
blue: { gold: 500, xp: 0 },
|
||||||
|
red: { gold: 500, xp: 0 },
|
||||||
|
goldDiff: 0,
|
||||||
|
xpDiff: 0,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
timestamp: 60,
|
||||||
|
blue: { gold: 1_150, xp: 550 },
|
||||||
|
red: { gold: 1_050, xp: 500 },
|
||||||
|
goldDiff: 100,
|
||||||
|
xpDiff: 50,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
timestamp: 540,
|
||||||
|
blue: { gold: 4_900, xp: 3_900 },
|
||||||
|
red: { gold: 4_300, xp: 3_500 },
|
||||||
|
goldDiff: 600,
|
||||||
|
xpDiff: 400,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
timestamp: 590,
|
||||||
|
blue: { gold: 5_200, xp: 4_200 },
|
||||||
|
red: { gold: 0, xp: 0 },
|
||||||
|
goldDiff: 5_200,
|
||||||
|
xpDiff: 4_200,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
timestamp: 900,
|
||||||
|
blue: { gold: 8_100, xp: 7_300 },
|
||||||
|
red: { gold: 6_700, xp: 6_100 },
|
||||||
|
goldDiff: 1_400,
|
||||||
|
xpDiff: 1_200,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
timestamp: 1_800,
|
||||||
|
blue: { gold: 12_500, xp: 14_000 },
|
||||||
|
red: { gold: 10_200, xp: 12_700 },
|
||||||
|
goldDiff: 2_300,
|
||||||
|
xpDiff: 1_300,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
expect(fragment.gameDetails[0].timelineEvents).toEqual([
|
||||||
|
{
|
||||||
|
timestamp: 20,
|
||||||
|
side: 'blue',
|
||||||
|
type: 'dragon',
|
||||||
|
monsterSubType: 'FIRE_DRAGON',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
timestamp: 30,
|
||||||
|
side: 'blue',
|
||||||
|
type: 'elderDragon',
|
||||||
|
monsterSubType: 'ELDER_DRAGON',
|
||||||
|
},
|
||||||
|
{ timestamp: 40, side: 'blue', type: 'voidGrub' },
|
||||||
|
{ timestamp: 50, side: 'blue', type: 'baron' },
|
||||||
|
{ timestamp: 55, side: 'blue', type: 'riftHerald' },
|
||||||
|
{
|
||||||
|
timestamp: 300,
|
||||||
|
side: 'blue',
|
||||||
|
type: 'championKill',
|
||||||
|
killerParticipantId: 1,
|
||||||
|
victimParticipantId: 2,
|
||||||
|
assistingParticipantIds: [3],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
timestamp: 400,
|
||||||
|
type: 'championKill',
|
||||||
|
victimParticipantId: 1,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
timestamp: 450,
|
||||||
|
side: 'blue',
|
||||||
|
type: 'tower',
|
||||||
|
towerType: 'OUTER_TURRET',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
timestamp: 450,
|
||||||
|
side: 'blue',
|
||||||
|
type: 'inhibitor',
|
||||||
|
killerParticipantId: 1,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
timestamp: 500,
|
||||||
|
side: 'blue',
|
||||||
|
type: 'championKill',
|
||||||
|
killerParticipantId: 3,
|
||||||
|
victimParticipantId: 2,
|
||||||
|
assistingParticipantIds: [1],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
timestamp: 900,
|
||||||
|
side: 'blue',
|
||||||
|
type: 'championKill',
|
||||||
|
killerParticipantId: 1,
|
||||||
|
victimParticipantId: 2,
|
||||||
|
assistingParticipantIds: [3],
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
expect(fragment.gameDetails[0].teams[0].bans).toEqual([
|
||||||
|
{ championId: 14, pickTurn: 1 },
|
||||||
|
{ championId: 43, pickTurn: 2 },
|
||||||
|
]);
|
||||||
|
expect(fragment.gameDetails[0].teams[0].objectives).toMatchObject({
|
||||||
|
baron: 1,
|
||||||
|
dragon: 1,
|
||||||
|
elderDragon: 1,
|
||||||
|
inhibitor: 0,
|
||||||
|
riftHerald: 1,
|
||||||
|
tower: 7,
|
||||||
|
voidGrub: 1,
|
||||||
|
});
|
||||||
|
expect(fragment.records[0]).toMatchObject({
|
||||||
|
participantId: 1,
|
||||||
|
checkpoints: {
|
||||||
|
at10: {
|
||||||
|
timestamp: 590,
|
||||||
|
gold: 5_200,
|
||||||
|
cs: 90,
|
||||||
|
xp: 4_200,
|
||||||
|
kills: 1,
|
||||||
|
deaths: 1,
|
||||||
|
assists: 1,
|
||||||
|
},
|
||||||
|
at15: {
|
||||||
|
timestamp: 900,
|
||||||
|
gold: 8_100,
|
||||||
|
cs: 145,
|
||||||
|
xp: 7_300,
|
||||||
|
kills: 2,
|
||||||
|
deaths: 1,
|
||||||
|
assists: 1,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
championLevel: 15,
|
||||||
|
cs: 228,
|
||||||
|
damageDealtToChampions: 18_765,
|
||||||
|
damageTaken: 24_321,
|
||||||
|
firstBloodKill: true,
|
||||||
|
firstBloodAssist: false,
|
||||||
|
controlWardsBought: 2,
|
||||||
|
wardsKilled: 3,
|
||||||
|
wardsPlaced: 11,
|
||||||
|
perks: {
|
||||||
|
primaryStyle: 8000,
|
||||||
|
subStyle: 8400,
|
||||||
|
keystone: 8010,
|
||||||
|
selectedPerkIds: [8010, 9111, 9105, 8299, 8444, 8451],
|
||||||
|
styles: [
|
||||||
|
{ styleId: 8000, perkIds: [8010, 9111, 9105, 8299] },
|
||||||
|
{ styleId: 8400, perkIds: [8444, 8451] },
|
||||||
|
],
|
||||||
|
statPerks: { defense: 5001, flex: 5008, offense: 5005 },
|
||||||
|
},
|
||||||
|
itemBuild: [
|
||||||
|
{ timestamp: 10, itemId: 1054, type: 'purchased' },
|
||||||
|
{ timestamp: 12, itemId: 2003, type: 'destroyed' },
|
||||||
|
{
|
||||||
|
timestamp: 13,
|
||||||
|
itemId: 3071,
|
||||||
|
type: 'undo',
|
||||||
|
beforeId: 1054,
|
||||||
|
afterId: 3071,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
skillBuild: [
|
||||||
|
{ timestamp: 11, skillSlot: 1, level: 1, levelUpType: 'NORMAL' },
|
||||||
|
{ timestamp: 45, skillSlot: 3, level: 2, levelUpType: 'NORMAL' },
|
||||||
|
],
|
||||||
|
});
|
||||||
|
expect(fragment.records[1]).toMatchObject({
|
||||||
|
participantId: 2,
|
||||||
|
checkpoints: {
|
||||||
|
at15: {
|
||||||
|
timestamp: 900,
|
||||||
|
gold: 6_700,
|
||||||
|
cs: 120,
|
||||||
|
xp: 6_100,
|
||||||
|
kills: 0,
|
||||||
|
deaths: 3,
|
||||||
|
assists: 0,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
expect(fragment.records[1].checkpoints).not.toHaveProperty('at10');
|
||||||
|
|
||||||
|
const timelineWithoutEvents = {
|
||||||
|
...timeline,
|
||||||
|
info: {
|
||||||
|
...timeline.info,
|
||||||
|
frames: timeline.info.frames.map((frame) => ({
|
||||||
|
...frame,
|
||||||
|
events: [],
|
||||||
|
})),
|
||||||
|
},
|
||||||
|
} as RiotMatchTimelineDto;
|
||||||
|
const objectiveFallback = builder.buildFragment({
|
||||||
|
match,
|
||||||
|
rawByRiotMatchId: new Map([['KR_1', raw as RiotMatchDto]]),
|
||||||
|
timelineByRiotMatchId: new Map([['KR_1', timelineWithoutEvents]]),
|
||||||
|
});
|
||||||
|
expect(objectiveFallback.gameDetails[0].teams[0].objectives).toMatchObject({
|
||||||
|
baron: 1,
|
||||||
|
dragon: 2,
|
||||||
|
elderDragon: 0,
|
||||||
|
riftHerald: 0,
|
||||||
|
voidGrub: 3,
|
||||||
|
});
|
||||||
|
|
||||||
|
const dragonOnlyTimeline = {
|
||||||
|
...timeline,
|
||||||
|
info: {
|
||||||
|
...timeline.info,
|
||||||
|
frames: timeline.info.frames.map((frame) => ({
|
||||||
|
...frame,
|
||||||
|
events: (frame.events ?? []).filter(
|
||||||
|
(event) =>
|
||||||
|
event.type !== 'ELITE_MONSTER_KILL' ||
|
||||||
|
event.monsterType === 'DRAGON',
|
||||||
|
),
|
||||||
|
})),
|
||||||
|
},
|
||||||
|
} as RiotMatchTimelineDto;
|
||||||
|
const partialObjectiveFallback = builder.buildFragment({
|
||||||
|
match,
|
||||||
|
rawByRiotMatchId: new Map([['KR_1', raw as RiotMatchDto]]),
|
||||||
|
timelineByRiotMatchId: new Map([['KR_1', dragonOnlyTimeline]]),
|
||||||
|
});
|
||||||
|
expect(
|
||||||
|
partialObjectiveFallback.gameDetails[0].teams[0].objectives,
|
||||||
|
).toMatchObject({
|
||||||
|
baron: 1,
|
||||||
|
dragon: 1,
|
||||||
|
elderDragon: 1,
|
||||||
|
riftHerald: 0,
|
||||||
|
voidGrub: 3,
|
||||||
|
});
|
||||||
|
|
||||||
|
const shortMatch = {
|
||||||
|
...match,
|
||||||
|
result: {
|
||||||
|
...match.result!,
|
||||||
|
games: match.result!.games.map((game) => ({
|
||||||
|
...game,
|
||||||
|
gameDuration: 599,
|
||||||
|
})),
|
||||||
|
},
|
||||||
|
} as MatchDocument;
|
||||||
|
const shortFragment = builder.buildFragment({
|
||||||
|
match: shortMatch,
|
||||||
|
rawByRiotMatchId: new Map([
|
||||||
|
[
|
||||||
|
'KR_1',
|
||||||
|
{
|
||||||
|
...raw,
|
||||||
|
info: { ...raw.info, gameDuration: 599 },
|
||||||
|
} as RiotMatchDto,
|
||||||
|
],
|
||||||
|
]),
|
||||||
|
timelineByRiotMatchId: new Map([['KR_1', timeline]]),
|
||||||
|
});
|
||||||
|
expect(
|
||||||
|
shortFragment.records.every((record) => record.checkpoints === undefined),
|
||||||
|
).toBe(true);
|
||||||
|
|
||||||
|
const invalidIntervalTimeline = {
|
||||||
|
...timeline,
|
||||||
|
info: { ...timeline.info, frameInterval: Number.NaN },
|
||||||
|
} as RiotMatchTimelineDto;
|
||||||
|
const invalidIntervalFragment = builder.buildFragment({
|
||||||
|
match,
|
||||||
|
rawByRiotMatchId: new Map([['KR_1', raw as RiotMatchDto]]),
|
||||||
|
timelineByRiotMatchId: new Map([['KR_1', invalidIntervalTimeline]]),
|
||||||
|
});
|
||||||
|
expect(invalidIntervalFragment.gameDetails[0].timelineLoaded).toBe(false);
|
||||||
|
expect(invalidIntervalFragment.gameDetails[0].timeline).toEqual([]);
|
||||||
|
expect(
|
||||||
|
invalidIntervalFragment.records.every(
|
||||||
|
(record) => record.checkpoints === undefined,
|
||||||
|
),
|
||||||
|
).toBe(true);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
@@ -1,11 +1,24 @@
|
|||||||
import { Injectable } from '@nestjs/common';
|
import { Injectable } from '@nestjs/common';
|
||||||
|
import { readMultiKills } from '../riot/riot-multi-kill';
|
||||||
import mongoose from 'mongoose';
|
import mongoose from 'mongoose';
|
||||||
import type {
|
import type {
|
||||||
MatchDocument,
|
MatchDocument,
|
||||||
MatchGameResultParticipant,
|
MatchGameResultParticipant,
|
||||||
|
MatchStatsCheckpoint,
|
||||||
|
MatchStatsItemBuildEvent,
|
||||||
|
MatchStatsObjectiveEvent,
|
||||||
|
MatchStatsObjectiveSummary,
|
||||||
|
MatchStatsParticipantCheckpoints,
|
||||||
|
MatchStatsSkillBuildEvent,
|
||||||
|
MatchStatsTimelineEvent,
|
||||||
|
MatchStatsTimelinePoint,
|
||||||
TeamSide,
|
TeamSide,
|
||||||
} from '../global/database/schema';
|
} from '../global/database/schema';
|
||||||
import type { RiotMatchDto, RiotMatchParticipantDto } from '../riot/riot.types';
|
import type {
|
||||||
|
RiotMatchDto,
|
||||||
|
RiotMatchParticipantDto,
|
||||||
|
RiotMatchTimelineDto,
|
||||||
|
} from '../riot/riot.types';
|
||||||
import type { InternalMatchCardView } from './community-stats.types';
|
import type { InternalMatchCardView } from './community-stats.types';
|
||||||
import type {
|
import type {
|
||||||
InternalGameDetail,
|
InternalGameDetail,
|
||||||
@@ -13,11 +26,22 @@ import type {
|
|||||||
MatchStatsFragment,
|
MatchStatsFragment,
|
||||||
} from './match-stats.types';
|
} from './match-stats.types';
|
||||||
|
|
||||||
|
interface ParticipantBuildEvents {
|
||||||
|
items: MatchStatsItemBuildEvent[];
|
||||||
|
skills: MatchStatsSkillBuildEvent[];
|
||||||
|
}
|
||||||
|
|
||||||
|
interface TimelineProjection {
|
||||||
|
objectiveEvents: MatchStatsObjectiveEvent[];
|
||||||
|
timelineEvents: MatchStatsTimelineEvent[];
|
||||||
|
}
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class MatchStatsFragmentBuilder {
|
export class MatchStatsFragmentBuilder {
|
||||||
public buildFragment(params: {
|
public buildFragment(params: {
|
||||||
match: MatchDocument;
|
match: MatchDocument;
|
||||||
rawByRiotMatchId: Map<string, RiotMatchDto>;
|
rawByRiotMatchId: Map<string, RiotMatchDto>;
|
||||||
|
timelineByRiotMatchId?: Map<string, RiotMatchTimelineDto>;
|
||||||
}): MatchStatsFragment {
|
}): MatchStatsFragment {
|
||||||
const games = [...(params.match.result?.games ?? [])].sort(
|
const games = [...(params.match.result?.games ?? [])].sort(
|
||||||
(left, right) => left.gameNumber - right.gameNumber,
|
(left, right) => left.gameNumber - right.gameNumber,
|
||||||
@@ -25,8 +49,9 @@ export class MatchStatsFragmentBuilder {
|
|||||||
const matchCard = this.toMatchCard(params.match, games);
|
const matchCard = this.toMatchCard(params.match, games);
|
||||||
const gameDetails = games.map((game) => {
|
const gameDetails = games.map((game) => {
|
||||||
const raw = params.rawByRiotMatchId.get(game.riotMatchId);
|
const raw = params.rawByRiotMatchId.get(game.riotMatchId);
|
||||||
|
const timeline = params.timelineByRiotMatchId?.get(game.riotMatchId);
|
||||||
return raw
|
return raw
|
||||||
? this.toGameDetail(params.match, game, raw)
|
? this.toGameDetail(params.match, game, raw, timeline)
|
||||||
: this.toFallbackGameDetail(params.match, game);
|
: this.toFallbackGameDetail(params.match, game);
|
||||||
});
|
});
|
||||||
const records = gameDetails.flatMap((detail) =>
|
const records = gameDetails.flatMap((detail) =>
|
||||||
@@ -106,7 +131,11 @@ export class MatchStatsFragmentBuilder {
|
|||||||
match: MatchDocument,
|
match: MatchDocument,
|
||||||
game: NonNullable<MatchDocument['result']>['games'][number],
|
game: NonNullable<MatchDocument['result']>['games'][number],
|
||||||
raw: RiotMatchDto,
|
raw: RiotMatchDto,
|
||||||
|
timeline?: RiotMatchTimelineDto,
|
||||||
): InternalGameDetail {
|
): InternalGameDetail {
|
||||||
|
const usableTimeline = isUsableTimeline(timeline, raw.info.gameDuration)
|
||||||
|
? timeline
|
||||||
|
: undefined;
|
||||||
const puuidByUserId = new Map(
|
const puuidByUserId = new Map(
|
||||||
match.participants
|
match.participants
|
||||||
.filter((participant) => participant.puuid)
|
.filter((participant) => participant.puuid)
|
||||||
@@ -129,13 +158,35 @@ export class MatchStatsFragmentBuilder {
|
|||||||
rawTeamIdBySide.set(participant.side, rawParticipant.teamId);
|
rawTeamIdBySide.set(participant.side, rawParticipant.teamId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
const sideByParticipantId = this.toSideByParticipantId(
|
||||||
|
raw,
|
||||||
|
rawTeamIdBySide,
|
||||||
|
);
|
||||||
|
const { objectiveEvents, timelineEvents } = this.toTimelineEvents(
|
||||||
|
usableTimeline,
|
||||||
|
rawTeamIdBySide,
|
||||||
|
sideByParticipantId,
|
||||||
|
);
|
||||||
|
const timelineObjectives = this.toTimelineObjectives(objectiveEvents);
|
||||||
|
const buildEventsByParticipantId =
|
||||||
|
this.toBuildEventsByParticipantId(usableTimeline);
|
||||||
|
const checkpointsByParticipantId = this.toCheckpointsByParticipantId(
|
||||||
|
usableTimeline,
|
||||||
|
raw.info.gameDuration,
|
||||||
|
);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
gameNumber: game.gameNumber,
|
gameNumber: game.gameNumber,
|
||||||
riotMatchId: game.riotMatchId,
|
riotMatchId: game.riotMatchId,
|
||||||
gameCreation: game.gameCreation,
|
gameCreation: game.gameCreation,
|
||||||
gameDuration: game.gameDuration,
|
gameDuration: game.gameDuration,
|
||||||
|
gameVersion: raw.info.gameVersion,
|
||||||
winnerSide: game.winnerSide,
|
winnerSide: game.winnerSide,
|
||||||
|
timeline: this.toTimeline(raw, rawTeamIdBySide, usableTimeline),
|
||||||
|
timelineLoaded: Boolean(usableTimeline),
|
||||||
|
rawAvailable: true,
|
||||||
|
objectiveEvents,
|
||||||
|
timelineEvents,
|
||||||
teams: (['blue', 'red'] as TeamSide[]).map((side) => {
|
teams: (['blue', 'red'] as TeamSide[]).map((side) => {
|
||||||
const teamIndex =
|
const teamIndex =
|
||||||
side === 'blue' ? game.blueTeamIndex : game.redTeamIndex;
|
side === 'blue' ? game.blueTeamIndex : game.redTeamIndex;
|
||||||
@@ -158,25 +209,35 @@ export class MatchStatsFragmentBuilder {
|
|||||||
teamIndex,
|
teamIndex,
|
||||||
side,
|
side,
|
||||||
win: game.winnerSide === side,
|
win: game.winnerSide === side,
|
||||||
objectives: {
|
objectives: this.toObjectiveSummary(
|
||||||
baron: rawTeam?.objectives?.baron?.kills ?? 0,
|
rawTeam,
|
||||||
dragon: rawTeam?.objectives?.dragon?.kills ?? 0,
|
timelineObjectives.get(side),
|
||||||
tower: rawTeam?.objectives?.tower?.kills ?? 0,
|
),
|
||||||
},
|
bans: (rawTeam?.bans ?? []).map((ban) => ({
|
||||||
|
championId: ban.championId,
|
||||||
|
pickTurn: ban.pickTurn,
|
||||||
|
})),
|
||||||
participants: game.participants
|
participants: game.participants
|
||||||
.filter((participant) => participant.side === side)
|
.filter((participant) => participant.side === side)
|
||||||
.map((participant) =>
|
.map((participant) => {
|
||||||
this.toRecord({
|
const rawParticipant = rawByPuuid.get(
|
||||||
|
puuidByUserId.get(participant.userId.toString()) ?? '',
|
||||||
|
);
|
||||||
|
return this.toRecord({
|
||||||
match,
|
match,
|
||||||
game,
|
game,
|
||||||
participant,
|
participant,
|
||||||
rawParticipant: rawByPuuid.get(
|
rawParticipant,
|
||||||
puuidByUserId.get(participant.userId.toString()) ?? '',
|
buildEvents: rawParticipant
|
||||||
),
|
? buildEventsByParticipantId.get(rawParticipant.participantId)
|
||||||
|
: undefined,
|
||||||
|
checkpoints: rawParticipant
|
||||||
|
? checkpointsByParticipantId.get(rawParticipant.participantId)
|
||||||
|
: undefined,
|
||||||
teamKills,
|
teamKills,
|
||||||
teamDamage,
|
teamDamage,
|
||||||
|
});
|
||||||
}),
|
}),
|
||||||
),
|
|
||||||
};
|
};
|
||||||
}),
|
}),
|
||||||
};
|
};
|
||||||
@@ -192,11 +253,17 @@ export class MatchStatsFragmentBuilder {
|
|||||||
gameCreation: game.gameCreation,
|
gameCreation: game.gameCreation,
|
||||||
gameDuration: game.gameDuration,
|
gameDuration: game.gameDuration,
|
||||||
winnerSide: game.winnerSide,
|
winnerSide: game.winnerSide,
|
||||||
|
timeline: [],
|
||||||
|
timelineLoaded: false,
|
||||||
|
rawAvailable: false,
|
||||||
|
objectiveEvents: [],
|
||||||
|
timelineEvents: [],
|
||||||
teams: (['blue', 'red'] as TeamSide[]).map((side) => ({
|
teams: (['blue', 'red'] as TeamSide[]).map((side) => ({
|
||||||
teamIndex: side === 'blue' ? game.blueTeamIndex : game.redTeamIndex,
|
teamIndex: side === 'blue' ? game.blueTeamIndex : game.redTeamIndex,
|
||||||
side,
|
side,
|
||||||
win: game.winnerSide === side,
|
win: game.winnerSide === side,
|
||||||
objectives: { baron: 0, dragon: 0, tower: 0 },
|
objectives: emptyObjectives(),
|
||||||
|
bans: [],
|
||||||
participants: game.participants
|
participants: game.participants
|
||||||
.filter((participant) => participant.side === side)
|
.filter((participant) => participant.side === side)
|
||||||
.map((participant) =>
|
.map((participant) =>
|
||||||
@@ -217,11 +284,21 @@ export class MatchStatsFragmentBuilder {
|
|||||||
game: NonNullable<MatchDocument['result']>['games'][number];
|
game: NonNullable<MatchDocument['result']>['games'][number];
|
||||||
participant: MatchGameResultParticipant;
|
participant: MatchGameResultParticipant;
|
||||||
rawParticipant?: RiotMatchParticipantDto;
|
rawParticipant?: RiotMatchParticipantDto;
|
||||||
|
buildEvents?: ParticipantBuildEvents;
|
||||||
|
checkpoints?: MatchStatsParticipantCheckpoints;
|
||||||
teamKills: number;
|
teamKills: number;
|
||||||
teamDamage: number;
|
teamDamage: number;
|
||||||
}): InternalRecord {
|
}): InternalRecord {
|
||||||
const { match, game, participant, rawParticipant, teamKills, teamDamage } =
|
const {
|
||||||
params;
|
match,
|
||||||
|
game,
|
||||||
|
participant,
|
||||||
|
rawParticipant,
|
||||||
|
buildEvents,
|
||||||
|
checkpoints,
|
||||||
|
teamKills,
|
||||||
|
teamDamage,
|
||||||
|
} = params;
|
||||||
const snapshot = match.participants.find((item) =>
|
const snapshot = match.participants.find((item) =>
|
||||||
item.userId.equals(participant.userId),
|
item.userId.equals(participant.userId),
|
||||||
);
|
);
|
||||||
@@ -256,12 +333,15 @@ export class MatchStatsFragmentBuilder {
|
|||||||
riotMatchId: game.riotMatchId,
|
riotMatchId: game.riotMatchId,
|
||||||
gameCreation: game.gameCreation,
|
gameCreation: game.gameCreation,
|
||||||
gameDuration: game.gameDuration,
|
gameDuration: game.gameDuration,
|
||||||
|
participantId: rawParticipant?.participantId,
|
||||||
|
checkpoints,
|
||||||
userId: participant.userId.toString(),
|
userId: participant.userId.toString(),
|
||||||
summonerName:
|
summonerName:
|
||||||
snapshot?.gameName ??
|
snapshot?.gameName ??
|
||||||
rawParticipant?.riotIdGameName ??
|
rawParticipant?.riotIdGameName ??
|
||||||
rawParticipant?.summonerName ??
|
rawParticipant?.summonerName ??
|
||||||
'Unknown',
|
'Unknown',
|
||||||
|
tagLine: snapshot?.tagLine ?? rawParticipant?.riotIdTagLine ?? '',
|
||||||
profileIconId: snapshot?.profileIconId ?? 0,
|
profileIconId: snapshot?.profileIconId ?? 0,
|
||||||
teamIndex: participant.teamIndex,
|
teamIndex: participant.teamIndex,
|
||||||
side: participant.side,
|
side: participant.side,
|
||||||
@@ -272,6 +352,8 @@ export class MatchStatsFragmentBuilder {
|
|||||||
rawParticipant?.individualPosition ||
|
rawParticipant?.individualPosition ||
|
||||||
'',
|
'',
|
||||||
kills: participant.kills,
|
kills: participant.kills,
|
||||||
|
multiKills: readMultiKills(rawParticipant),
|
||||||
|
tier: snapshot?.tier,
|
||||||
deaths: participant.deaths,
|
deaths: participant.deaths,
|
||||||
assists: participant.assists,
|
assists: participant.assists,
|
||||||
win: participant.win,
|
win: participant.win,
|
||||||
@@ -290,6 +372,8 @@ export class MatchStatsFragmentBuilder {
|
|||||||
),
|
),
|
||||||
wardsPlaced: rawParticipant?.wardsPlaced ?? 0,
|
wardsPlaced: rawParticipant?.wardsPlaced ?? 0,
|
||||||
wardsKilled: rawParticipant?.wardsKilled ?? 0,
|
wardsKilled: rawParticipant?.wardsKilled ?? 0,
|
||||||
|
firstBloodKill: booleanField(rawParticipant, 'firstBloodKill'),
|
||||||
|
firstBloodAssist: booleanField(rawParticipant, 'firstBloodAssist'),
|
||||||
items: [
|
items: [
|
||||||
rawParticipant?.item0 ?? 0,
|
rawParticipant?.item0 ?? 0,
|
||||||
rawParticipant?.item1 ?? 0,
|
rawParticipant?.item1 ?? 0,
|
||||||
@@ -304,6 +388,8 @@ export class MatchStatsFragmentBuilder {
|
|||||||
rawParticipant?.summoner2Id ?? 0,
|
rawParticipant?.summoner2Id ?? 0,
|
||||||
],
|
],
|
||||||
perks: rawParticipant ? this.resolvePerks(rawParticipant) : {},
|
perks: rawParticipant ? this.resolvePerks(rawParticipant) : {},
|
||||||
|
itemBuild: buildEvents?.items ?? [],
|
||||||
|
skillBuild: buildEvents?.skills ?? [],
|
||||||
rating,
|
rating,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -319,6 +405,416 @@ export class MatchStatsFragmentBuilder {
|
|||||||
primaryStyle: primary?.style,
|
primaryStyle: primary?.style,
|
||||||
subStyle: sub?.style,
|
subStyle: sub?.style,
|
||||||
keystone: primary?.selections[0]?.perk,
|
keystone: primary?.selections[0]?.perk,
|
||||||
|
selectedPerkIds: participant.perks.styles.flatMap((style) =>
|
||||||
|
style.selections.map((selection) => selection.perk),
|
||||||
|
),
|
||||||
|
styles: participant.perks.styles.map((style) => ({
|
||||||
|
styleId: style.style,
|
||||||
|
perkIds: style.selections.map((selection) => selection.perk),
|
||||||
|
})),
|
||||||
|
statPerks: {
|
||||||
|
offense: participant.perks.statPerks.offense,
|
||||||
|
flex: participant.perks.statPerks.flex,
|
||||||
|
defense: participant.perks.statPerks.defense,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private toBuildEventsByParticipantId(
|
||||||
|
timeline?: RiotMatchTimelineDto,
|
||||||
|
): Map<number, ParticipantBuildEvents> {
|
||||||
|
const buildEventsByParticipantId = new Map<
|
||||||
|
number,
|
||||||
|
ParticipantBuildEvents
|
||||||
|
>();
|
||||||
|
if (!timeline?.info.frames.length) return buildEventsByParticipantId;
|
||||||
|
|
||||||
|
const getEvents = (participantId: number): ParticipantBuildEvents => {
|
||||||
|
const current = buildEventsByParticipantId.get(participantId);
|
||||||
|
if (current) return current;
|
||||||
|
const created: ParticipantBuildEvents = { items: [], skills: [] };
|
||||||
|
buildEventsByParticipantId.set(participantId, created);
|
||||||
|
return created;
|
||||||
|
};
|
||||||
|
|
||||||
|
for (const frame of timeline.info.frames) {
|
||||||
|
for (const event of frame.events ?? []) {
|
||||||
|
const participantId = event.participantId;
|
||||||
|
if (!participantId) continue;
|
||||||
|
const timestamp = Math.max(0, Math.round(event.timestamp / 1000));
|
||||||
|
|
||||||
|
if (event.type === 'SKILL_LEVEL_UP' && isSkillSlot(event.skillSlot)) {
|
||||||
|
const skills = getEvents(participantId).skills;
|
||||||
|
skills.push({
|
||||||
|
timestamp,
|
||||||
|
skillSlot: event.skillSlot,
|
||||||
|
level: skills.length + 1,
|
||||||
|
levelUpType: event.levelUpType,
|
||||||
|
});
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
const itemType = toItemBuildType(event.type);
|
||||||
|
if (!itemType) continue;
|
||||||
|
const itemId = event.itemId ?? event.afterId ?? event.beforeId ?? 0;
|
||||||
|
if (itemId <= 0) continue;
|
||||||
|
getEvents(participantId).items.push({
|
||||||
|
timestamp,
|
||||||
|
itemId,
|
||||||
|
type: itemType,
|
||||||
|
beforeId: event.beforeId,
|
||||||
|
afterId: event.afterId,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const events of buildEventsByParticipantId.values()) {
|
||||||
|
events.items.sort((left, right) => left.timestamp - right.timestamp);
|
||||||
|
events.skills.sort((left, right) => left.timestamp - right.timestamp);
|
||||||
|
}
|
||||||
|
|
||||||
|
return buildEventsByParticipantId;
|
||||||
|
}
|
||||||
|
|
||||||
|
private toCheckpointsByParticipantId(
|
||||||
|
timeline: RiotMatchTimelineDto | undefined,
|
||||||
|
gameDurationSeconds: number,
|
||||||
|
): Map<number, MatchStatsParticipantCheckpoints> {
|
||||||
|
const checkpointsByParticipantId = new Map<
|
||||||
|
number,
|
||||||
|
MatchStatsParticipantCheckpoints
|
||||||
|
>();
|
||||||
|
if (
|
||||||
|
!timeline?.info.frames.length ||
|
||||||
|
!Number.isFinite(timeline.info.frameInterval) ||
|
||||||
|
timeline.info.frameInterval <= 0
|
||||||
|
) {
|
||||||
|
return checkpointsByParticipantId;
|
||||||
|
}
|
||||||
|
|
||||||
|
const participantIds = new Set<number>();
|
||||||
|
const championKillEvents = timeline.info.frames.flatMap((frame) =>
|
||||||
|
(frame.events ?? []).filter((event) => event.type === 'CHAMPION_KILL'),
|
||||||
|
);
|
||||||
|
for (const frame of timeline.info.frames) {
|
||||||
|
for (const participantFrame of Object.values(frame.participantFrames)) {
|
||||||
|
participantIds.add(participantFrame.participantId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const targets = [
|
||||||
|
['at10', 600_000],
|
||||||
|
['at15', 900_000],
|
||||||
|
] as const;
|
||||||
|
for (const participantId of participantIds) {
|
||||||
|
const checkpoints: MatchStatsParticipantCheckpoints = {};
|
||||||
|
for (const [key, targetTimestamp] of targets) {
|
||||||
|
if (gameDurationSeconds * 1_000 < targetTimestamp) continue;
|
||||||
|
|
||||||
|
const selectedFrame = timeline.info.frames.reduce<
|
||||||
|
RiotMatchTimelineDto['info']['frames'][number] | undefined
|
||||||
|
>((latest, frame) => {
|
||||||
|
if (
|
||||||
|
frame.timestamp > targetTimestamp ||
|
||||||
|
!Object.values(frame.participantFrames).some(
|
||||||
|
(participantFrame) =>
|
||||||
|
participantFrame.participantId === participantId,
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
return latest;
|
||||||
|
}
|
||||||
|
return !latest || frame.timestamp > latest.timestamp ? frame : latest;
|
||||||
|
}, undefined);
|
||||||
|
if (
|
||||||
|
!selectedFrame ||
|
||||||
|
targetTimestamp - selectedFrame.timestamp >=
|
||||||
|
timeline.info.frameInterval
|
||||||
|
) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
const participantFrame = Object.values(
|
||||||
|
selectedFrame.participantFrames,
|
||||||
|
).find((frame) => frame.participantId === participantId);
|
||||||
|
if (
|
||||||
|
!participantFrame ||
|
||||||
|
typeof participantFrame.minionsKilled !== 'number' ||
|
||||||
|
!Number.isFinite(participantFrame.minionsKilled) ||
|
||||||
|
typeof participantFrame.jungleMinionsKilled !== 'number' ||
|
||||||
|
!Number.isFinite(participantFrame.jungleMinionsKilled)
|
||||||
|
) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
const checkpoint: MatchStatsCheckpoint = {
|
||||||
|
timestamp: Math.max(0, Math.round(selectedFrame.timestamp / 1_000)),
|
||||||
|
gold: participantFrame.totalGold,
|
||||||
|
cs:
|
||||||
|
participantFrame.minionsKilled +
|
||||||
|
participantFrame.jungleMinionsKilled,
|
||||||
|
xp: participantFrame.xp,
|
||||||
|
kills: 0,
|
||||||
|
deaths: 0,
|
||||||
|
assists: 0,
|
||||||
|
};
|
||||||
|
for (const event of championKillEvents) {
|
||||||
|
if (event.timestamp > selectedFrame.timestamp) continue;
|
||||||
|
if (event.killerId === participantId && event.killerId > 0) {
|
||||||
|
checkpoint.kills += 1;
|
||||||
|
}
|
||||||
|
if (event.victimId === participantId) checkpoint.deaths += 1;
|
||||||
|
if (event.assistingParticipantIds?.includes(participantId)) {
|
||||||
|
checkpoint.assists += 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
checkpoints[key] = checkpoint;
|
||||||
|
}
|
||||||
|
if (checkpoints.at10 || checkpoints.at15) {
|
||||||
|
checkpointsByParticipantId.set(participantId, checkpoints);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return checkpointsByParticipantId;
|
||||||
|
}
|
||||||
|
|
||||||
|
private toTimeline(
|
||||||
|
raw: RiotMatchDto,
|
||||||
|
rawTeamIdBySide: Map<TeamSide, number>,
|
||||||
|
timeline?: RiotMatchTimelineDto,
|
||||||
|
): MatchStatsTimelinePoint[] {
|
||||||
|
if (!timeline?.info.frames.length) return [];
|
||||||
|
|
||||||
|
const sideByParticipantId = this.toSideByParticipantId(
|
||||||
|
raw,
|
||||||
|
rawTeamIdBySide,
|
||||||
|
);
|
||||||
|
|
||||||
|
const points = timeline.info.frames.map((frame) => {
|
||||||
|
const point: MatchStatsTimelinePoint = {
|
||||||
|
timestamp: Math.max(0, Math.round(frame.timestamp / 1000)),
|
||||||
|
blue: { gold: 0, xp: 0 },
|
||||||
|
red: { gold: 0, xp: 0 },
|
||||||
|
goldDiff: 0,
|
||||||
|
xpDiff: 0,
|
||||||
|
};
|
||||||
|
|
||||||
|
for (const participantFrame of Object.values(frame.participantFrames)) {
|
||||||
|
const side = sideByParticipantId.get(participantFrame.participantId);
|
||||||
|
if (!side) continue;
|
||||||
|
point[side].gold += participantFrame.totalGold;
|
||||||
|
point[side].xp += participantFrame.xp;
|
||||||
|
}
|
||||||
|
point.goldDiff = point.blue.gold - point.red.gold;
|
||||||
|
point.xpDiff = point.blue.xp - point.red.xp;
|
||||||
|
return point;
|
||||||
|
});
|
||||||
|
|
||||||
|
return points.filter(
|
||||||
|
(point, index) =>
|
||||||
|
index === 0 || point.timestamp !== points[index - 1].timestamp,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private toSideByParticipantId(
|
||||||
|
raw: RiotMatchDto,
|
||||||
|
rawTeamIdBySide: Map<TeamSide, number>,
|
||||||
|
): Map<number, TeamSide> {
|
||||||
|
const blueTeamId = rawTeamIdBySide.get('blue') ?? 100;
|
||||||
|
const redTeamId = rawTeamIdBySide.get('red') ?? 200;
|
||||||
|
const sideByParticipantId = new Map<number, TeamSide>();
|
||||||
|
for (const participant of raw.info.participants) {
|
||||||
|
if (participant.teamId === blueTeamId) {
|
||||||
|
sideByParticipantId.set(participant.participantId, 'blue');
|
||||||
|
}
|
||||||
|
if (participant.teamId === redTeamId) {
|
||||||
|
sideByParticipantId.set(participant.participantId, 'red');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return sideByParticipantId;
|
||||||
|
}
|
||||||
|
|
||||||
|
private toTimelineEvents(
|
||||||
|
timeline: RiotMatchTimelineDto | undefined,
|
||||||
|
rawTeamIdBySide: Map<TeamSide, number>,
|
||||||
|
sideByParticipantId: Map<number, TeamSide>,
|
||||||
|
): TimelineProjection {
|
||||||
|
if (!timeline?.info.frames.length) {
|
||||||
|
return { objectiveEvents: [], timelineEvents: [] };
|
||||||
|
}
|
||||||
|
|
||||||
|
const sideByTeamId = new Map<number, TeamSide>();
|
||||||
|
for (const [side, teamId] of rawTeamIdBySide.entries()) {
|
||||||
|
sideByTeamId.set(teamId, side);
|
||||||
|
}
|
||||||
|
|
||||||
|
const projected: Array<{
|
||||||
|
sourceSequence: number;
|
||||||
|
event: MatchStatsTimelineEvent;
|
||||||
|
}> = [];
|
||||||
|
let sourceSequence = 0;
|
||||||
|
for (const frame of timeline.info.frames) {
|
||||||
|
for (const event of frame.events ?? []) {
|
||||||
|
const currentSequence = sourceSequence;
|
||||||
|
sourceSequence += 1;
|
||||||
|
const timestamp = Math.max(0, Math.round(event.timestamp / 1000));
|
||||||
|
if (event.type === 'ELITE_MONSTER_KILL') {
|
||||||
|
const side =
|
||||||
|
(typeof event.killerTeamId === 'number'
|
||||||
|
? sideByTeamId.get(event.killerTeamId)
|
||||||
|
: undefined) ??
|
||||||
|
(typeof event.killerId === 'number'
|
||||||
|
? sideByParticipantId.get(event.killerId)
|
||||||
|
: undefined);
|
||||||
|
if (!side) continue;
|
||||||
|
const objectiveEvent = toObjectiveTimelineEvent({
|
||||||
|
timestamp,
|
||||||
|
side,
|
||||||
|
monsterType: event.monsterType,
|
||||||
|
monsterSubType: event.monsterSubType,
|
||||||
|
});
|
||||||
|
if (objectiveEvent) {
|
||||||
|
projected.push({
|
||||||
|
sourceSequence: currentSequence,
|
||||||
|
event: objectiveEvent,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (event.type === 'CHAMPION_KILL') {
|
||||||
|
const side =
|
||||||
|
typeof event.killerId === 'number' && event.killerId > 0
|
||||||
|
? sideByParticipantId.get(event.killerId)
|
||||||
|
: undefined;
|
||||||
|
projected.push({
|
||||||
|
sourceSequence: currentSequence,
|
||||||
|
event: {
|
||||||
|
timestamp,
|
||||||
|
type: 'championKill',
|
||||||
|
...(side ? { side } : {}),
|
||||||
|
...(typeof event.killerId === 'number' && event.killerId > 0
|
||||||
|
? { killerParticipantId: event.killerId }
|
||||||
|
: {}),
|
||||||
|
...(typeof event.victimId === 'number' && event.victimId > 0
|
||||||
|
? { victimParticipantId: event.victimId }
|
||||||
|
: {}),
|
||||||
|
...(event.assistingParticipantIds
|
||||||
|
? { assistingParticipantIds: event.assistingParticipantIds }
|
||||||
|
: {}),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (event.type !== 'BUILDING_KILL') continue;
|
||||||
|
const destroyedSide =
|
||||||
|
typeof event.teamId === 'number'
|
||||||
|
? sideByTeamId.get(event.teamId)
|
||||||
|
: undefined;
|
||||||
|
const side =
|
||||||
|
(typeof event.killerId === 'number' && event.killerId > 0
|
||||||
|
? sideByParticipantId.get(event.killerId)
|
||||||
|
: undefined) ??
|
||||||
|
(destroyedSide ? oppositeSide(destroyedSide) : undefined);
|
||||||
|
const type =
|
||||||
|
event.buildingType === 'TOWER_BUILDING'
|
||||||
|
? 'tower'
|
||||||
|
: event.buildingType === 'INHIBITOR_BUILDING'
|
||||||
|
? 'inhibitor'
|
||||||
|
: undefined;
|
||||||
|
if (!side || !type) continue;
|
||||||
|
projected.push({
|
||||||
|
sourceSequence: currentSequence,
|
||||||
|
event: {
|
||||||
|
timestamp,
|
||||||
|
side,
|
||||||
|
type,
|
||||||
|
...(typeof event.killerId === 'number' && event.killerId > 0
|
||||||
|
? { killerParticipantId: event.killerId }
|
||||||
|
: {}),
|
||||||
|
...(type === 'tower' && event.towerType
|
||||||
|
? { towerType: event.towerType }
|
||||||
|
: {}),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const timelineEvents = projected
|
||||||
|
.sort(
|
||||||
|
(left, right) =>
|
||||||
|
left.event.timestamp - right.event.timestamp ||
|
||||||
|
left.sourceSequence - right.sourceSequence,
|
||||||
|
)
|
||||||
|
.map(({ event }) => event);
|
||||||
|
return {
|
||||||
|
timelineEvents,
|
||||||
|
objectiveEvents: timelineEvents.filter(isObjectiveTimelineEvent),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private toTimelineObjectives(
|
||||||
|
objectiveEvents: MatchStatsObjectiveEvent[],
|
||||||
|
): Map<TeamSide, MatchStatsObjectiveSummary> {
|
||||||
|
const objectives = new Map<TeamSide, MatchStatsObjectiveSummary>([
|
||||||
|
['blue', emptyObjectives()],
|
||||||
|
['red', emptyObjectives()],
|
||||||
|
]);
|
||||||
|
|
||||||
|
for (const event of objectiveEvents) {
|
||||||
|
const current = objectives.get(event.side) ?? emptyObjectives();
|
||||||
|
switch (event.type) {
|
||||||
|
case 'baron':
|
||||||
|
current.baron += 1;
|
||||||
|
break;
|
||||||
|
case 'riftHerald':
|
||||||
|
current.riftHerald += 1;
|
||||||
|
break;
|
||||||
|
case 'voidGrub':
|
||||||
|
current.voidGrub += 1;
|
||||||
|
break;
|
||||||
|
case 'dragon':
|
||||||
|
current.dragon += 1;
|
||||||
|
break;
|
||||||
|
case 'elderDragon':
|
||||||
|
current.elderDragon += 1;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
objectives.set(event.side, current);
|
||||||
|
}
|
||||||
|
|
||||||
|
return objectives;
|
||||||
|
}
|
||||||
|
|
||||||
|
private toObjectiveSummary(
|
||||||
|
rawTeam: RiotMatchDto['info']['teams'][number] | undefined,
|
||||||
|
timelineObjectives: MatchStatsObjectiveSummary | undefined,
|
||||||
|
): MatchStatsObjectiveSummary {
|
||||||
|
const rawObjectives = rawTeam?.objectives;
|
||||||
|
const timelineDragon = timelineObjectives?.dragon ?? 0;
|
||||||
|
const timelineElder = timelineObjectives?.elderDragon ?? 0;
|
||||||
|
const hasProjectedDragon = timelineDragon + timelineElder > 0;
|
||||||
|
return {
|
||||||
|
tower: rawObjectives?.tower?.kills ?? 0,
|
||||||
|
dragon: hasProjectedDragon
|
||||||
|
? timelineDragon
|
||||||
|
: (rawObjectives?.dragon?.kills ?? 0),
|
||||||
|
inhibitor: rawObjectives?.inhibitor?.kills ?? 0,
|
||||||
|
baron:
|
||||||
|
(timelineObjectives?.baron ?? 0) > 0
|
||||||
|
? (timelineObjectives?.baron ?? 0)
|
||||||
|
: (rawObjectives?.baron?.kills ?? 0),
|
||||||
|
riftHerald:
|
||||||
|
(timelineObjectives?.riftHerald ?? 0) > 0
|
||||||
|
? (timelineObjectives?.riftHerald ?? 0)
|
||||||
|
: (rawObjectives?.riftHerald?.kills ?? 0),
|
||||||
|
voidGrub:
|
||||||
|
(timelineObjectives?.voidGrub ?? 0) > 0
|
||||||
|
? (timelineObjectives?.voidGrub ?? 0)
|
||||||
|
: (rawObjectives?.horde?.kills ?? 0),
|
||||||
|
elderDragon: hasProjectedDragon ? timelineElder : 0,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -354,6 +850,100 @@ function average(value: number, total: number): number {
|
|||||||
return total > 0 ? round(value / total) : 0;
|
return total > 0 ? round(value / total) : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function isSkillSlot(value: number | undefined): value is 1 | 2 | 3 | 4 {
|
||||||
|
return value === 1 || value === 2 || value === 3 || value === 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
function toItemBuildType(
|
||||||
|
value: string,
|
||||||
|
): MatchStatsItemBuildEvent['type'] | null {
|
||||||
|
switch (value) {
|
||||||
|
case 'ITEM_PURCHASED':
|
||||||
|
return 'purchased';
|
||||||
|
case 'ITEM_SOLD':
|
||||||
|
return 'sold';
|
||||||
|
case 'ITEM_DESTROYED':
|
||||||
|
return 'destroyed';
|
||||||
|
case 'ITEM_UNDO':
|
||||||
|
return 'undo';
|
||||||
|
default:
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function toObjectiveTimelineEvent(params: {
|
||||||
|
timestamp: number;
|
||||||
|
side: TeamSide;
|
||||||
|
monsterType?: string;
|
||||||
|
monsterSubType?: string;
|
||||||
|
}): MatchStatsObjectiveEvent | null {
|
||||||
|
switch (params.monsterType) {
|
||||||
|
case 'BARON_NASHOR':
|
||||||
|
return { timestamp: params.timestamp, side: params.side, type: 'baron' };
|
||||||
|
case 'RIFTHERALD':
|
||||||
|
return {
|
||||||
|
timestamp: params.timestamp,
|
||||||
|
side: params.side,
|
||||||
|
type: 'riftHerald',
|
||||||
|
};
|
||||||
|
case 'HORDE':
|
||||||
|
return {
|
||||||
|
timestamp: params.timestamp,
|
||||||
|
side: params.side,
|
||||||
|
type: 'voidGrub',
|
||||||
|
};
|
||||||
|
case 'DRAGON':
|
||||||
|
return {
|
||||||
|
timestamp: params.timestamp,
|
||||||
|
side: params.side,
|
||||||
|
type:
|
||||||
|
params.monsterSubType === 'ELDER_DRAGON' ? 'elderDragon' : 'dragon',
|
||||||
|
monsterSubType: params.monsterSubType,
|
||||||
|
};
|
||||||
|
default:
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function isObjectiveTimelineEvent(
|
||||||
|
event: MatchStatsTimelineEvent,
|
||||||
|
): event is MatchStatsObjectiveEvent {
|
||||||
|
return (
|
||||||
|
event.type === 'dragon' ||
|
||||||
|
event.type === 'elderDragon' ||
|
||||||
|
event.type === 'baron' ||
|
||||||
|
event.type === 'riftHerald' ||
|
||||||
|
event.type === 'voidGrub'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function oppositeSide(side: TeamSide): TeamSide {
|
||||||
|
return side === 'blue' ? 'red' : 'blue';
|
||||||
|
}
|
||||||
|
|
||||||
|
function isUsableTimeline(
|
||||||
|
timeline: RiotMatchTimelineDto | undefined,
|
||||||
|
gameDurationSeconds: number,
|
||||||
|
): timeline is RiotMatchTimelineDto {
|
||||||
|
if (
|
||||||
|
!timeline ||
|
||||||
|
!Number.isFinite(timeline.info.frameInterval) ||
|
||||||
|
timeline.info.frameInterval <= 0 ||
|
||||||
|
!Array.isArray(timeline.info.frames) ||
|
||||||
|
timeline.info.frames.length === 0
|
||||||
|
) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
const finalTimestamp = Math.max(
|
||||||
|
...timeline.info.frames.map((frame) => frame.timestamp),
|
||||||
|
);
|
||||||
|
return (
|
||||||
|
Number.isFinite(finalTimestamp) &&
|
||||||
|
Math.abs(gameDurationSeconds * 1_000 - finalTimestamp) <
|
||||||
|
timeline.info.frameInterval
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function round(value: number): number {
|
function round(value: number): number {
|
||||||
return Math.round(value * 10) / 10;
|
return Math.round(value * 10) / 10;
|
||||||
}
|
}
|
||||||
@@ -365,3 +955,22 @@ function numberField(
|
|||||||
const value = participant?.[key];
|
const value = participant?.[key];
|
||||||
return typeof value === 'number' && Number.isFinite(value) ? value : 0;
|
return typeof value === 'number' && Number.isFinite(value) ? value : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function booleanField(
|
||||||
|
participant: RiotMatchParticipantDto | undefined,
|
||||||
|
key: string,
|
||||||
|
): boolean {
|
||||||
|
return participant?.[key] === true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function emptyObjectives(): MatchStatsObjectiveSummary {
|
||||||
|
return {
|
||||||
|
tower: 0,
|
||||||
|
dragon: 0,
|
||||||
|
inhibitor: 0,
|
||||||
|
baron: 0,
|
||||||
|
riftHerald: 0,
|
||||||
|
voidGrub: 0,
|
||||||
|
elderDragon: 0,
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,173 @@
|
|||||||
|
import mongoose from 'mongoose';
|
||||||
|
import { ConnectionService } from '../global/database/connection.service';
|
||||||
|
import { MatchStatsFragmentBuilder } from './match-stats-fragment.builder';
|
||||||
|
import { MatchStatsRepository } from './match-stats.repository';
|
||||||
|
import { MatchStatsService } from './match-stats.service';
|
||||||
|
import { MATCH_STATS_BUILDER_VERSION } from './match-stats.types';
|
||||||
|
|
||||||
|
describe('MatchStatsService outbox idempotency', () => {
|
||||||
|
it('reuses the latest stored revision when an older outbox event is delivered', async () => {
|
||||||
|
const h = createHarness();
|
||||||
|
h.isCurrent.mockResolvedValue(true);
|
||||||
|
|
||||||
|
await h.service.buildAndUpsert(h.matchId, { sourceRevision: 10 });
|
||||||
|
|
||||||
|
expect(h.isCurrent).toHaveBeenCalledWith({
|
||||||
|
matchId: h.matchId,
|
||||||
|
sourceCompetitionId: h.competitionId,
|
||||||
|
sourceRevision: 12,
|
||||||
|
projectorVersion: 3,
|
||||||
|
builderVersion: MATCH_STATS_BUILDER_VERSION,
|
||||||
|
});
|
||||||
|
expect(h.riotFind).not.toHaveBeenCalled();
|
||||||
|
expect(h.builder.buildFragment).not.toHaveBeenCalled();
|
||||||
|
expect(h.upsert).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('builds once across repeated deliveries after the write succeeds', async () => {
|
||||||
|
const h = createHarness();
|
||||||
|
h.upsert.mockImplementation(async () => {
|
||||||
|
h.isCurrent.mockResolvedValue(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
await h.service.buildAndUpsert(h.matchId, { sourceRevision: 12 });
|
||||||
|
await h.service.buildAndUpsert(h.matchId, { sourceRevision: 12 });
|
||||||
|
|
||||||
|
expect(h.riotFind).toHaveBeenCalledTimes(1);
|
||||||
|
expect(h.builder.buildFragment).toHaveBeenCalledTimes(1);
|
||||||
|
expect(h.upsert).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('retries a failed write without treating an attempted build as complete', async () => {
|
||||||
|
const h = createHarness();
|
||||||
|
h.upsert.mockRejectedValueOnce(new Error('database unavailable'));
|
||||||
|
await expect(
|
||||||
|
h.service.buildAndUpsert(h.matchId, { sourceRevision: 12 }),
|
||||||
|
).rejects.toThrow('database unavailable');
|
||||||
|
|
||||||
|
await h.service.buildAndUpsert(h.matchId, { sourceRevision: 12 });
|
||||||
|
|
||||||
|
expect(h.builder.buildFragment).toHaveBeenCalledTimes(2);
|
||||||
|
expect(h.upsert).toHaveBeenCalledTimes(2);
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each([{}, { sourceRevision: 12, includeTimeline: true }])(
|
||||||
|
'still performs explicit rebuilds and timeline hydration (%j)',
|
||||||
|
async (options) => {
|
||||||
|
const h = createHarness();
|
||||||
|
h.isCurrent.mockResolvedValue(true);
|
||||||
|
|
||||||
|
await h.service.buildAndUpsert(h.matchId, options);
|
||||||
|
|
||||||
|
expect(h.isCurrent).not.toHaveBeenCalled();
|
||||||
|
expect(h.builder.buildFragment).toHaveBeenCalledTimes(1);
|
||||||
|
expect(h.upsert).toHaveBeenCalledTimes(1);
|
||||||
|
if ('includeTimeline' in options) {
|
||||||
|
expect(h.getMatchTimeline).toHaveBeenCalledWith('KR_1', {
|
||||||
|
region: 'asia',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
it('deletes reversed zero-game stats even if their versions were current', async () => {
|
||||||
|
const h = createHarness();
|
||||||
|
h.competition.projection.games = [];
|
||||||
|
h.isCurrent.mockResolvedValue(true);
|
||||||
|
|
||||||
|
await h.service.buildAndUpsert(h.matchId, { sourceRevision: 12 });
|
||||||
|
|
||||||
|
expect(h.isCurrent).not.toHaveBeenCalled();
|
||||||
|
expect(h.deleteByMatch).toHaveBeenCalledWith(h.matchId, {
|
||||||
|
sourceCompetitionId: h.competitionId,
|
||||||
|
sourceRevision: 12,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
function createHarness() {
|
||||||
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
|
const competitionId = new mongoose.Types.ObjectId();
|
||||||
|
const teamAId = new mongoose.Types.ObjectId();
|
||||||
|
const teamBId = new mongoose.Types.ObjectId();
|
||||||
|
const match = {
|
||||||
|
_id: matchId,
|
||||||
|
communityId: new mongoose.Types.ObjectId(),
|
||||||
|
status: 'in-progress',
|
||||||
|
scheduledAt: new Date(),
|
||||||
|
teams: [],
|
||||||
|
};
|
||||||
|
const competition = {
|
||||||
|
_id: competitionId,
|
||||||
|
revision: 12,
|
||||||
|
projectorVersion: 3,
|
||||||
|
teams: [
|
||||||
|
{ teamId: teamAId, displayOrder: 1 },
|
||||||
|
{ teamId: teamBId, displayOrder: 2 },
|
||||||
|
],
|
||||||
|
projection: {
|
||||||
|
phase: 'running',
|
||||||
|
games: [
|
||||||
|
{
|
||||||
|
displayNumber: 1,
|
||||||
|
evidence: { type: 'riot', riotMatchId: 'KR_1' },
|
||||||
|
teams: { blue: { teamId: teamAId }, red: { teamId: teamBId } },
|
||||||
|
winnerTeamId: teamAId,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
};
|
||||||
|
const riotFind = jest.fn(() => query([{ matchId: 'KR_1', raw: {} }]));
|
||||||
|
const models = {
|
||||||
|
match: { findById: () => query(match) },
|
||||||
|
competition: { findOne: () => query(competition) },
|
||||||
|
riotMatch: { find: riotFind },
|
||||||
|
community: { findById: () => query({ riotRegion: 'asia' }) },
|
||||||
|
};
|
||||||
|
const connection = {
|
||||||
|
getModel: async (name: keyof typeof models) => models[name],
|
||||||
|
} as unknown as ConnectionService;
|
||||||
|
const isCurrent = jest.fn().mockResolvedValue(false);
|
||||||
|
const upsert = jest.fn().mockResolvedValue(undefined);
|
||||||
|
const deleteByMatch = jest.fn().mockResolvedValue(undefined);
|
||||||
|
const repository = {
|
||||||
|
hasCurrentCompetitionFragment: isCurrent,
|
||||||
|
upsert,
|
||||||
|
deleteByMatch,
|
||||||
|
} as unknown as MatchStatsRepository;
|
||||||
|
const builder = {
|
||||||
|
buildFragment: jest.fn().mockReturnValue({
|
||||||
|
matchCard: {},
|
||||||
|
records: [],
|
||||||
|
gameDetails: [],
|
||||||
|
userIds: [],
|
||||||
|
championIds: [],
|
||||||
|
gameCreationMin: 1,
|
||||||
|
gameCreationMax: 2,
|
||||||
|
}),
|
||||||
|
} as unknown as jest.Mocked<MatchStatsFragmentBuilder>;
|
||||||
|
const getMatchTimeline = jest.fn().mockResolvedValue(undefined);
|
||||||
|
const service = new MatchStatsService(connection, repository, builder, {
|
||||||
|
getMatchTimeline,
|
||||||
|
} as never);
|
||||||
|
return {
|
||||||
|
service,
|
||||||
|
matchId,
|
||||||
|
competitionId,
|
||||||
|
competition,
|
||||||
|
isCurrent,
|
||||||
|
upsert,
|
||||||
|
deleteByMatch,
|
||||||
|
riotFind,
|
||||||
|
builder,
|
||||||
|
getMatchTimeline,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function query<T>(value: T) {
|
||||||
|
return {
|
||||||
|
select: jest.fn().mockReturnThis(),
|
||||||
|
lean: jest.fn().mockReturnThis(),
|
||||||
|
exec: async () => value,
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,245 @@
|
|||||||
|
import { Types } from 'mongoose';
|
||||||
|
import { ConnectionService } from '../global/database/connection.service';
|
||||||
|
import type { MatchStats } from '../global/database/schema';
|
||||||
|
import { MatchStatsRepository } from './match-stats.repository';
|
||||||
|
|
||||||
|
describe('MatchStatsRepository', () => {
|
||||||
|
it.each([null, { _id: new Types.ObjectId() }])(
|
||||||
|
'checks persisted source identity and every build version without loading payloads (%j)',
|
||||||
|
async (stored) => {
|
||||||
|
const exists = jest.fn(() => ({ exec: async () => stored }));
|
||||||
|
const connection = {
|
||||||
|
getModel: jest.fn().mockResolvedValue({ exists }),
|
||||||
|
} as unknown as ConnectionService;
|
||||||
|
const repository = new MatchStatsRepository(connection);
|
||||||
|
const source = {
|
||||||
|
matchId: new Types.ObjectId(),
|
||||||
|
sourceCompetitionId: new Types.ObjectId(),
|
||||||
|
sourceRevision: 12,
|
||||||
|
projectorVersion: 3,
|
||||||
|
builderVersion: 10,
|
||||||
|
};
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
repository.hasCurrentCompetitionFragment(source),
|
||||||
|
).resolves.toBe(Boolean(stored));
|
||||||
|
expect(exists).toHaveBeenCalledWith({
|
||||||
|
matchId: source.matchId,
|
||||||
|
sourceCompetitionId: source.sourceCompetitionId,
|
||||||
|
sourceRevision: { $gte: 12 },
|
||||||
|
projectorVersion: { $gte: 3 },
|
||||||
|
builderVersion: { $gte: 10 },
|
||||||
|
});
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
it('does not let a legacy upsert overwrite a Competition-backed fragment', async () => {
|
||||||
|
const fragment = {
|
||||||
|
...statsFragment(12),
|
||||||
|
sourceCompetitionId: undefined,
|
||||||
|
sourceRevision: undefined,
|
||||||
|
projectorVersion: undefined,
|
||||||
|
};
|
||||||
|
const updateOne = jest
|
||||||
|
.fn()
|
||||||
|
.mockReturnValueOnce({
|
||||||
|
exec: jest.fn().mockResolvedValue({ matchedCount: 0 }),
|
||||||
|
})
|
||||||
|
.mockReturnValueOnce({
|
||||||
|
exec: jest
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValue({ matchedCount: 1, upsertedCount: 0 }),
|
||||||
|
});
|
||||||
|
const connection = {
|
||||||
|
getModel: jest.fn().mockResolvedValue({ updateOne }),
|
||||||
|
} as unknown as ConnectionService;
|
||||||
|
const repository = new MatchStatsRepository(connection);
|
||||||
|
|
||||||
|
await repository.upsert(fragment);
|
||||||
|
|
||||||
|
expect(updateOne).toHaveBeenNthCalledWith(
|
||||||
|
1,
|
||||||
|
{
|
||||||
|
matchId: fragment.matchId,
|
||||||
|
sourceCompetitionId: { $exists: false },
|
||||||
|
},
|
||||||
|
{ $set: fragment },
|
||||||
|
{ upsert: false },
|
||||||
|
);
|
||||||
|
expect(updateOne).toHaveBeenNthCalledWith(
|
||||||
|
2,
|
||||||
|
{ matchId: fragment.matchId },
|
||||||
|
{ $setOnInsert: fragment },
|
||||||
|
{ upsert: true },
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('only updates a Competition projection when its revision is not stale', async () => {
|
||||||
|
const updateOne = jest.fn().mockReturnValue({
|
||||||
|
exec: jest.fn().mockResolvedValue({ matchedCount: 1, upsertedCount: 0 }),
|
||||||
|
});
|
||||||
|
const connection = {
|
||||||
|
getModel: jest.fn().mockResolvedValue({ updateOne }),
|
||||||
|
} as unknown as ConnectionService;
|
||||||
|
const repository = new MatchStatsRepository(connection);
|
||||||
|
const fragment = statsFragment(12);
|
||||||
|
|
||||||
|
await repository.upsert(fragment);
|
||||||
|
|
||||||
|
expect(updateOne).toHaveBeenCalledWith(
|
||||||
|
{
|
||||||
|
matchId: fragment.matchId,
|
||||||
|
$or: [
|
||||||
|
{ sourceCompetitionId: { $exists: false } },
|
||||||
|
{ sourceCompetitionId: fragment.sourceCompetitionId },
|
||||||
|
],
|
||||||
|
$and: [
|
||||||
|
{
|
||||||
|
$or: [
|
||||||
|
{ sourceRevision: { $exists: false } },
|
||||||
|
{ sourceRevision: { $lte: 12 } },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{ $set: fragment },
|
||||||
|
{ upsert: false },
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('converges concurrent initial upserts to the highest Competition revision', async () => {
|
||||||
|
const older = statsFragment(12);
|
||||||
|
const newer = {
|
||||||
|
...statsFragment(13),
|
||||||
|
matchId: older.matchId,
|
||||||
|
sourceCompetitionId: older.sourceCompetitionId,
|
||||||
|
};
|
||||||
|
let stored: ReturnType<typeof statsFragment> | undefined;
|
||||||
|
let initialGuardCount = 0;
|
||||||
|
let releaseInitialGuards!: () => void;
|
||||||
|
const initialGuardsReady = new Promise<void>((resolve) => {
|
||||||
|
releaseInitialGuards = resolve;
|
||||||
|
});
|
||||||
|
let releaseOlderInsert!: () => void;
|
||||||
|
const olderInserted = new Promise<void>((resolve) => {
|
||||||
|
releaseOlderInsert = resolve;
|
||||||
|
});
|
||||||
|
const updateOne = jest.fn(
|
||||||
|
(
|
||||||
|
_filter: Record<string, unknown>,
|
||||||
|
update: {
|
||||||
|
$set?: ReturnType<typeof statsFragment>;
|
||||||
|
$setOnInsert?: ReturnType<typeof statsFragment>;
|
||||||
|
},
|
||||||
|
) => ({
|
||||||
|
exec: async () => {
|
||||||
|
const fragment = update.$set ?? update.$setOnInsert!;
|
||||||
|
if (update.$set && !stored && initialGuardCount < 2) {
|
||||||
|
initialGuardCount += 1;
|
||||||
|
if (initialGuardCount === 2) releaseInitialGuards();
|
||||||
|
await initialGuardsReady;
|
||||||
|
return { matchedCount: 0, upsertedCount: 0 };
|
||||||
|
}
|
||||||
|
|
||||||
|
if (update.$setOnInsert) {
|
||||||
|
if (fragment.sourceRevision === 13) await olderInserted;
|
||||||
|
const existed = stored !== undefined;
|
||||||
|
if (!stored) stored = fragment;
|
||||||
|
if (fragment.sourceRevision === 12) releaseOlderInsert();
|
||||||
|
return {
|
||||||
|
matchedCount: existed ? 1 : 0,
|
||||||
|
upsertedCount: existed ? 0 : 1,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
if (
|
||||||
|
stored &&
|
||||||
|
stored.sourceCompetitionId?.equals(fragment.sourceCompetitionId) &&
|
||||||
|
stored.sourceRevision <= fragment.sourceRevision
|
||||||
|
) {
|
||||||
|
stored = fragment;
|
||||||
|
return { matchedCount: 1, upsertedCount: 0 };
|
||||||
|
}
|
||||||
|
return { matchedCount: 0, upsertedCount: 0 };
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
const connection = {
|
||||||
|
getModel: jest.fn().mockResolvedValue({ updateOne }),
|
||||||
|
} as unknown as ConnectionService;
|
||||||
|
const repository = new MatchStatsRepository(connection);
|
||||||
|
|
||||||
|
await Promise.all([repository.upsert(older), repository.upsert(newer)]);
|
||||||
|
|
||||||
|
expect(stored?.sourceRevision).toBe(13);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('guards a zero-game delete so an observed revision cannot remove newer stats', async () => {
|
||||||
|
const matchId = new Types.ObjectId();
|
||||||
|
const sourceCompetitionId = new Types.ObjectId();
|
||||||
|
const deleteOne = jest.fn().mockReturnValue({
|
||||||
|
exec: jest.fn().mockResolvedValue({ deletedCount: 0 }),
|
||||||
|
});
|
||||||
|
const connection = {
|
||||||
|
getModel: jest.fn().mockResolvedValue({ deleteOne }),
|
||||||
|
} as unknown as ConnectionService;
|
||||||
|
const repository = new MatchStatsRepository(connection);
|
||||||
|
|
||||||
|
await repository.deleteByMatch(matchId, {
|
||||||
|
sourceCompetitionId,
|
||||||
|
sourceRevision: 12,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(deleteOne).toHaveBeenCalledWith({
|
||||||
|
matchId,
|
||||||
|
$or: [
|
||||||
|
{ sourceCompetitionId: { $exists: false } },
|
||||||
|
{
|
||||||
|
sourceCompetitionId,
|
||||||
|
$or: [
|
||||||
|
{ sourceRevision: { $exists: false } },
|
||||||
|
{ sourceRevision: { $lte: 12 } },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('deletes only non-Competition stats during legacy source cleanup', async () => {
|
||||||
|
const matchId = new Types.ObjectId();
|
||||||
|
const deleteOne = jest.fn().mockReturnValue({
|
||||||
|
exec: jest.fn().mockResolvedValue({ deletedCount: 0 }),
|
||||||
|
});
|
||||||
|
const connection = {
|
||||||
|
getModel: jest.fn().mockResolvedValue({ deleteOne }),
|
||||||
|
} as unknown as ConnectionService;
|
||||||
|
const repository = new MatchStatsRepository(connection);
|
||||||
|
|
||||||
|
await repository.deleteLegacyByMatch(matchId);
|
||||||
|
|
||||||
|
expect(deleteOne).toHaveBeenCalledWith({
|
||||||
|
matchId,
|
||||||
|
sourceCompetitionId: { $exists: false },
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
function statsFragment(sourceRevision: number) {
|
||||||
|
return {
|
||||||
|
matchId: new Types.ObjectId(),
|
||||||
|
communityId: new Types.ObjectId(),
|
||||||
|
sourceCompetitionId: new Types.ObjectId(),
|
||||||
|
sourceRevision,
|
||||||
|
projectorVersion: 3,
|
||||||
|
scheduledAt: new Date(),
|
||||||
|
gameCreationMin: 1,
|
||||||
|
gameCreationMax: 2,
|
||||||
|
userIds: [],
|
||||||
|
championIds: [],
|
||||||
|
matchCard: {},
|
||||||
|
records: [],
|
||||||
|
gameDetails: [],
|
||||||
|
builtAt: new Date(),
|
||||||
|
builderVersion: 9,
|
||||||
|
} satisfies Omit<MatchStats, 'createdAt' | 'updatedAt'>;
|
||||||
|
}
|
||||||
@@ -3,24 +3,132 @@ import mongoose from 'mongoose';
|
|||||||
import { ConnectionService } from '../global/database/connection.service';
|
import { ConnectionService } from '../global/database/connection.service';
|
||||||
import type { MatchStats, MatchStatsDocument } from '../global/database/schema';
|
import type { MatchStats, MatchStatsDocument } from '../global/database/schema';
|
||||||
|
|
||||||
|
export type MatchStatsUserRecordFragment = Pick<
|
||||||
|
MatchStats,
|
||||||
|
'matchId' | 'records' | 'builderVersion'
|
||||||
|
> & {
|
||||||
|
gameDetails?: Array<
|
||||||
|
Pick<MatchStats['gameDetails'][number], 'gameNumber' | 'rawAvailable'>
|
||||||
|
>;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type MatchStatsDetailFragment = Pick<
|
||||||
|
MatchStats,
|
||||||
|
'matchId' | 'gameDetails'
|
||||||
|
>;
|
||||||
|
|
||||||
|
export interface MatchStatsDeleteGuard {
|
||||||
|
sourceCompetitionId: mongoose.Types.ObjectId;
|
||||||
|
sourceRevision: number;
|
||||||
|
}
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class MatchStatsRepository {
|
export class MatchStatsRepository {
|
||||||
constructor(private readonly connectionService: ConnectionService) {}
|
constructor(private readonly connectionService: ConnectionService) {}
|
||||||
|
|
||||||
|
public async hasCurrentCompetitionFragment(params: {
|
||||||
|
matchId: mongoose.Types.ObjectId;
|
||||||
|
sourceCompetitionId: mongoose.Types.ObjectId;
|
||||||
|
sourceRevision: number;
|
||||||
|
projectorVersion: number;
|
||||||
|
builderVersion: number;
|
||||||
|
}): Promise<boolean> {
|
||||||
|
const MatchStatsModel = await this.connectionService.getModel('matchStats');
|
||||||
|
return Boolean(
|
||||||
|
await MatchStatsModel.exists({
|
||||||
|
matchId: params.matchId,
|
||||||
|
sourceCompetitionId: params.sourceCompetitionId,
|
||||||
|
sourceRevision: { $gte: params.sourceRevision },
|
||||||
|
projectorVersion: { $gte: params.projectorVersion },
|
||||||
|
builderVersion: { $gte: params.builderVersion },
|
||||||
|
}).exec(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
public async upsert(
|
public async upsert(
|
||||||
fragment: Omit<MatchStats, 'createdAt' | 'updatedAt'>,
|
fragment: Omit<MatchStats, 'createdAt' | 'updatedAt'>,
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const MatchStatsModel = await this.connectionService.getModel('matchStats');
|
const MatchStatsModel = await this.connectionService.getModel('matchStats');
|
||||||
|
if (
|
||||||
|
!fragment.sourceCompetitionId ||
|
||||||
|
fragment.sourceRevision === undefined
|
||||||
|
) {
|
||||||
|
const updated = await MatchStatsModel.updateOne(
|
||||||
|
{
|
||||||
|
matchId: fragment.matchId,
|
||||||
|
sourceCompetitionId: { $exists: false },
|
||||||
|
},
|
||||||
|
{ $set: fragment },
|
||||||
|
{ upsert: false },
|
||||||
|
).exec();
|
||||||
|
if (updated.matchedCount > 0) return;
|
||||||
|
|
||||||
|
// A legacy builder must never overwrite a Competition-backed fragment
|
||||||
|
// that appeared while the legacy source was being read.
|
||||||
|
try {
|
||||||
await MatchStatsModel.updateOne(
|
await MatchStatsModel.updateOne(
|
||||||
{ matchId: fragment.matchId },
|
{ matchId: fragment.matchId },
|
||||||
{ $set: fragment },
|
{ $setOnInsert: fragment },
|
||||||
{ upsert: true },
|
{ upsert: true },
|
||||||
).exec();
|
).exec();
|
||||||
|
} catch (error) {
|
||||||
|
if (!isDuplicateKeyError(error)) throw error;
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const revisionGuard = competitionRevisionGuard(fragment);
|
||||||
|
const updated = await MatchStatsModel.updateOne(
|
||||||
|
revisionGuard,
|
||||||
|
{ $set: fragment },
|
||||||
|
{ upsert: false },
|
||||||
|
).exec();
|
||||||
|
if (updated.matchedCount > 0) return;
|
||||||
|
|
||||||
|
// If no read model exists, insert it. If a newer revision won the race,
|
||||||
|
// this filter matches it and $setOnInsert intentionally changes nothing.
|
||||||
|
try {
|
||||||
|
await MatchStatsModel.updateOne(
|
||||||
|
{ matchId: fragment.matchId },
|
||||||
|
{ $setOnInsert: fragment },
|
||||||
|
{ upsert: true },
|
||||||
|
).exec();
|
||||||
|
} catch (error) {
|
||||||
|
if (!isDuplicateKeyError(error)) throw error;
|
||||||
|
}
|
||||||
|
|
||||||
|
// A lower revision can win the initial insert between the guarded miss and
|
||||||
|
// the upsert. Re-run the monotonic CAS so every concurrent builder converges
|
||||||
|
// to the highest source revision; a newer winner simply does not match.
|
||||||
|
await MatchStatsModel.updateOne(
|
||||||
|
revisionGuard,
|
||||||
|
{ $set: fragment },
|
||||||
|
{ upsert: false },
|
||||||
|
).exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async deleteByMatch(matchId: mongoose.Types.ObjectId): Promise<void> {
|
public async deleteByMatch(
|
||||||
|
matchId: mongoose.Types.ObjectId,
|
||||||
|
guard?: MatchStatsDeleteGuard,
|
||||||
|
): Promise<void> {
|
||||||
const MatchStatsModel = await this.connectionService.getModel('matchStats');
|
const MatchStatsModel = await this.connectionService.getModel('matchStats');
|
||||||
await MatchStatsModel.deleteOne({ matchId }).exec();
|
await MatchStatsModel.deleteOne(
|
||||||
|
guard
|
||||||
|
? {
|
||||||
|
matchId,
|
||||||
|
$or: [
|
||||||
|
{ sourceCompetitionId: { $exists: false } },
|
||||||
|
{
|
||||||
|
sourceCompetitionId: guard.sourceCompetitionId,
|
||||||
|
$or: [
|
||||||
|
{ sourceRevision: { $exists: false } },
|
||||||
|
{ sourceRevision: { $lte: guard.sourceRevision } },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}
|
||||||
|
: { matchId },
|
||||||
|
).exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async deleteByMatches(
|
public async deleteByMatches(
|
||||||
@@ -31,6 +139,16 @@ export class MatchStatsRepository {
|
|||||||
await MatchStatsModel.deleteMany({ matchId: { $in: matchIds } }).exec();
|
await MatchStatsModel.deleteMany({ matchId: { $in: matchIds } }).exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async deleteLegacyByMatch(
|
||||||
|
matchId: mongoose.Types.ObjectId,
|
||||||
|
): Promise<void> {
|
||||||
|
const MatchStatsModel = await this.connectionService.getModel('matchStats');
|
||||||
|
await MatchStatsModel.deleteOne({
|
||||||
|
matchId,
|
||||||
|
sourceCompetitionId: { $exists: false },
|
||||||
|
}).exec();
|
||||||
|
}
|
||||||
|
|
||||||
public async findByMatch(
|
public async findByMatch(
|
||||||
matchId: mongoose.Types.ObjectId,
|
matchId: mongoose.Types.ObjectId,
|
||||||
): Promise<MatchStatsDocument | null> {
|
): Promise<MatchStatsDocument | null> {
|
||||||
@@ -38,6 +156,119 @@ export class MatchStatsRepository {
|
|||||||
return MatchStatsModel.findOne({ matchId }).exec();
|
return MatchStatsModel.findOne({ matchId }).exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async findByRiotMatchIds(riotMatchIds: string[]) {
|
||||||
|
const MatchStatsModel = await this.connectionService.getModel('matchStats');
|
||||||
|
return MatchStatsModel.find({
|
||||||
|
'gameDetails.riotMatchId': { $in: riotMatchIds },
|
||||||
|
})
|
||||||
|
.select({
|
||||||
|
matchId: 1,
|
||||||
|
communityId: 1,
|
||||||
|
'gameDetails.riotMatchId': 1,
|
||||||
|
'gameDetails.rawAvailable': 1,
|
||||||
|
})
|
||||||
|
.lean()
|
||||||
|
.exec();
|
||||||
|
}
|
||||||
|
|
||||||
|
public async findMatchPage(params: {
|
||||||
|
communityId: mongoose.Types.ObjectId;
|
||||||
|
from?: number;
|
||||||
|
to?: number;
|
||||||
|
query?: string;
|
||||||
|
format?: 'pair' | 'tournament';
|
||||||
|
playerId?: string;
|
||||||
|
championId?: number;
|
||||||
|
cursor?: number;
|
||||||
|
cursorMatchId?: string;
|
||||||
|
limit: number;
|
||||||
|
}) {
|
||||||
|
const model = await this.connectionService.getModel('matchStats');
|
||||||
|
const filter: Record<string, unknown> = { communityId: params.communityId };
|
||||||
|
const conditions: Array<Record<string, unknown>> = [];
|
||||||
|
const gameCreation = {
|
||||||
|
...(params.from === undefined ? {} : { $gte: params.from }),
|
||||||
|
...(params.to === undefined ? {} : { $lte: params.to }),
|
||||||
|
};
|
||||||
|
if (Object.keys(gameCreation).length > 0) {
|
||||||
|
conditions.push({
|
||||||
|
$or: [
|
||||||
|
{ gameDetails: { $elemMatch: { gameCreation } } },
|
||||||
|
{
|
||||||
|
'gameDetails.0': { $exists: false },
|
||||||
|
gameCreationMin: gameCreation,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (params.from !== undefined)
|
||||||
|
filter.gameCreationMax = { $gte: params.from };
|
||||||
|
if (params.to !== undefined) filter.gameCreationMin = { $lte: params.to };
|
||||||
|
if (params.championId) {
|
||||||
|
filter.records = {
|
||||||
|
$elemMatch: {
|
||||||
|
championId: params.championId,
|
||||||
|
...(Object.keys(gameCreation).length > 0 ? { gameCreation } : {}),
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (params.query) {
|
||||||
|
const search = {
|
||||||
|
$regex: params.query.replace(/[.*+?^$\x7b\x7d()|[\]\\]/g, '\\$&'),
|
||||||
|
$options: 'i',
|
||||||
|
};
|
||||||
|
conditions.push({
|
||||||
|
$or: [
|
||||||
|
{ 'matchCard.title': search },
|
||||||
|
{ 'matchCard.teams.name': search },
|
||||||
|
{ 'matchCard.teams.members.summonerName': search },
|
||||||
|
],
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (params.format) {
|
||||||
|
filter['matchCard.teams.1'] = { $exists: true };
|
||||||
|
filter['matchCard.teams.2'] = { $exists: params.format === 'tournament' };
|
||||||
|
}
|
||||||
|
if (params.playerId) {
|
||||||
|
filter['matchCard.teams.members.userId'] = params.playerId;
|
||||||
|
}
|
||||||
|
if (params.cursor !== undefined) {
|
||||||
|
const cursor = new Date(params.cursor);
|
||||||
|
if (params.cursorMatchId) {
|
||||||
|
conditions.push({
|
||||||
|
$or: [
|
||||||
|
{ scheduledAt: { $lt: cursor } },
|
||||||
|
{
|
||||||
|
scheduledAt: cursor,
|
||||||
|
matchId: {
|
||||||
|
$lt: new mongoose.Types.ObjectId(params.cursorMatchId),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
filter.scheduledAt = { $lt: cursor };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (conditions.length > 0) filter.$and = conditions;
|
||||||
|
return model
|
||||||
|
.find(filter)
|
||||||
|
.select({
|
||||||
|
matchId: 1,
|
||||||
|
scheduledAt: 1,
|
||||||
|
matchCard: 1,
|
||||||
|
sourceCompetitionId: 1,
|
||||||
|
sourceRevision: 1,
|
||||||
|
'gameDetails.gameNumber': 1,
|
||||||
|
'gameDetails.gameCreation': 1,
|
||||||
|
'gameDetails.rawAvailable': 1,
|
||||||
|
})
|
||||||
|
.sort({ scheduledAt: -1, matchId: -1 })
|
||||||
|
.limit(params.limit)
|
||||||
|
.lean()
|
||||||
|
.exec();
|
||||||
|
}
|
||||||
|
|
||||||
public async findByCommunity(params: {
|
public async findByCommunity(params: {
|
||||||
communityId: mongoose.Types.ObjectId;
|
communityId: mongoose.Types.ObjectId;
|
||||||
fromGameCreation?: number;
|
fromGameCreation?: number;
|
||||||
@@ -61,6 +292,54 @@ export class MatchStatsRepository {
|
|||||||
.exec();
|
.exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async findSeasonStats(params: {
|
||||||
|
communityId: mongoose.Types.ObjectId;
|
||||||
|
from?: number;
|
||||||
|
to?: number;
|
||||||
|
}) {
|
||||||
|
const model = await this.connectionService.getModel('matchStats');
|
||||||
|
return model
|
||||||
|
.find({
|
||||||
|
communityId: params.communityId,
|
||||||
|
...(params.from === undefined
|
||||||
|
? {}
|
||||||
|
: { gameCreationMax: { $gte: params.from } }),
|
||||||
|
...(params.to === undefined
|
||||||
|
? {}
|
||||||
|
: { gameCreationMin: { $lte: params.to } }),
|
||||||
|
})
|
||||||
|
.select({
|
||||||
|
_id: 0,
|
||||||
|
matchId: 1,
|
||||||
|
scheduledAt: 1,
|
||||||
|
'records.userId': 1,
|
||||||
|
'records.summonerName': 1,
|
||||||
|
'records.tagLine': 1,
|
||||||
|
'records.profileIconId': 1,
|
||||||
|
'records.gameCreation': 1,
|
||||||
|
'records.gameNumber': 1,
|
||||||
|
'records.matchId': 1,
|
||||||
|
'records.championId': 1,
|
||||||
|
'records.teamPosition': 1,
|
||||||
|
'records.win': 1,
|
||||||
|
'records.kills': 1,
|
||||||
|
'records.deaths': 1,
|
||||||
|
'records.assists': 1,
|
||||||
|
'records.gpm': 1,
|
||||||
|
'records.csPerMin': 1,
|
||||||
|
'records.killParticipation': 1,
|
||||||
|
'records.visionScore': 1,
|
||||||
|
'records.damageShare': 1,
|
||||||
|
'gameDetails.gameCreation': 1,
|
||||||
|
'gameDetails.gameNumber': 1,
|
||||||
|
'gameDetails.winnerSide': 1,
|
||||||
|
'gameDetails.rawAvailable': 1,
|
||||||
|
})
|
||||||
|
.sort({ scheduledAt: -1 })
|
||||||
|
.lean()
|
||||||
|
.exec();
|
||||||
|
}
|
||||||
|
|
||||||
public async findByUser(params: {
|
public async findByUser(params: {
|
||||||
communityId: mongoose.Types.ObjectId;
|
communityId: mongoose.Types.ObjectId;
|
||||||
userId: mongoose.Types.ObjectId;
|
userId: mongoose.Types.ObjectId;
|
||||||
@@ -68,6 +347,60 @@ export class MatchStatsRepository {
|
|||||||
toGameCreation?: number;
|
toGameCreation?: number;
|
||||||
}): Promise<MatchStatsDocument[]> {
|
}): Promise<MatchStatsDocument[]> {
|
||||||
const MatchStatsModel = await this.connectionService.getModel('matchStats');
|
const MatchStatsModel = await this.connectionService.getModel('matchStats');
|
||||||
|
const filter = this.buildUserFilter(params);
|
||||||
|
|
||||||
|
return MatchStatsModel.find(filter).sort({ scheduledAt: -1 }).exec();
|
||||||
|
}
|
||||||
|
|
||||||
|
public async findUserRecordFragments(params: {
|
||||||
|
communityId: mongoose.Types.ObjectId;
|
||||||
|
userId: mongoose.Types.ObjectId;
|
||||||
|
fromGameCreation?: number;
|
||||||
|
toGameCreation?: number;
|
||||||
|
limit?: number;
|
||||||
|
}): Promise<MatchStatsUserRecordFragment[]> {
|
||||||
|
const MatchStatsModel = await this.connectionService.getModel('matchStats');
|
||||||
|
const filter = this.buildUserFilter(params);
|
||||||
|
|
||||||
|
// User history only needs records for summaries/page selection; gameDetails
|
||||||
|
// are much larger and are fetched separately for the visible page.
|
||||||
|
return MatchStatsModel.find(filter)
|
||||||
|
.sort({ scheduledAt: -1 })
|
||||||
|
.limit(params.limit ?? 300)
|
||||||
|
.select({
|
||||||
|
_id: 0,
|
||||||
|
matchId: 1,
|
||||||
|
records: 1,
|
||||||
|
builderVersion: 1,
|
||||||
|
'gameDetails.gameNumber': 1,
|
||||||
|
'gameDetails.rawAvailable': 1,
|
||||||
|
})
|
||||||
|
.lean<MatchStatsUserRecordFragment[]>()
|
||||||
|
.exec();
|
||||||
|
}
|
||||||
|
|
||||||
|
public async findDetailsByMatches(params: {
|
||||||
|
communityId: mongoose.Types.ObjectId;
|
||||||
|
matchIds: mongoose.Types.ObjectId[];
|
||||||
|
}): Promise<MatchStatsDetailFragment[]> {
|
||||||
|
if (params.matchIds.length === 0) return [];
|
||||||
|
|
||||||
|
const MatchStatsModel = await this.connectionService.getModel('matchStats');
|
||||||
|
return MatchStatsModel.find({
|
||||||
|
communityId: params.communityId,
|
||||||
|
matchId: { $in: params.matchIds },
|
||||||
|
})
|
||||||
|
.select({ _id: 0, matchId: 1, gameDetails: 1 })
|
||||||
|
.lean<MatchStatsDetailFragment[]>()
|
||||||
|
.exec();
|
||||||
|
}
|
||||||
|
|
||||||
|
private buildUserFilter(params: {
|
||||||
|
communityId: mongoose.Types.ObjectId;
|
||||||
|
userId: mongoose.Types.ObjectId;
|
||||||
|
fromGameCreation?: number;
|
||||||
|
toGameCreation?: number;
|
||||||
|
}): Record<string, unknown> {
|
||||||
const filter: Record<string, unknown> = {
|
const filter: Record<string, unknown> = {
|
||||||
communityId: params.communityId,
|
communityId: params.communityId,
|
||||||
userIds: params.userId,
|
userIds: params.userId,
|
||||||
@@ -78,7 +411,35 @@ export class MatchStatsRepository {
|
|||||||
if (params.toGameCreation !== undefined) {
|
if (params.toGameCreation !== undefined) {
|
||||||
filter.gameCreationMin = { $lte: params.toGameCreation };
|
filter.gameCreationMin = { $lte: params.toGameCreation };
|
||||||
}
|
}
|
||||||
|
return filter;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return MatchStatsModel.find(filter).sort({ scheduledAt: -1 }).exec();
|
function competitionRevisionGuard(
|
||||||
|
fragment: Omit<MatchStats, 'createdAt' | 'updatedAt'>,
|
||||||
|
) {
|
||||||
|
return {
|
||||||
|
matchId: fragment.matchId,
|
||||||
|
$or: [
|
||||||
|
{ sourceCompetitionId: { $exists: false } },
|
||||||
|
{ sourceCompetitionId: fragment.sourceCompetitionId },
|
||||||
|
],
|
||||||
|
$and: [
|
||||||
|
{
|
||||||
|
$or: [
|
||||||
|
{ sourceRevision: { $exists: false } },
|
||||||
|
{ sourceRevision: { $lte: fragment.sourceRevision } },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function isDuplicateKeyError(error: unknown): boolean {
|
||||||
|
return (
|
||||||
|
typeof error === 'object' &&
|
||||||
|
error !== null &&
|
||||||
|
'code' in error &&
|
||||||
|
error.code === 11_000
|
||||||
|
);
|
||||||
}
|
}
|
||||||
@@ -3,6 +3,7 @@ import { ConnectionService } from '../global/database/connection.service';
|
|||||||
import { MatchStatsFragmentBuilder } from './match-stats-fragment.builder';
|
import { MatchStatsFragmentBuilder } from './match-stats-fragment.builder';
|
||||||
import { MatchStatsRepository } from './match-stats.repository';
|
import { MatchStatsRepository } from './match-stats.repository';
|
||||||
import { MatchStatsService } from './match-stats.service';
|
import { MatchStatsService } from './match-stats.service';
|
||||||
|
import { MATCH_STATS_BUILDER_VERSION } from './match-stats.types';
|
||||||
|
|
||||||
describe('MatchStatsService', () => {
|
describe('MatchStatsService', () => {
|
||||||
it('deletes an existing fragment when the match is no longer eligible', async () => {
|
it('deletes an existing fragment when the match is no longer eligible', async () => {
|
||||||
@@ -17,11 +18,13 @@ describe('MatchStatsService', () => {
|
|||||||
const connectionService = {
|
const connectionService = {
|
||||||
getModel: jest.fn().mockImplementation(async (name: string) => {
|
getModel: jest.fn().mockImplementation(async (name: string) => {
|
||||||
if (name === 'match') return { findById };
|
if (name === 'match') return { findById };
|
||||||
|
if (name === 'competition') return { findOne: () => queryResult(null) };
|
||||||
if (name === 'riotMatch') return {};
|
if (name === 'riotMatch') return {};
|
||||||
throw new Error(`Unexpected model: ${name}`);
|
throw new Error(`Unexpected model: ${name}`);
|
||||||
}),
|
}),
|
||||||
} as unknown as ConnectionService;
|
} as unknown as ConnectionService;
|
||||||
const repository = {
|
const repository = {
|
||||||
|
hasCurrentCompetitionFragment: jest.fn().mockResolvedValue(false),
|
||||||
deleteByMatch: jest.fn().mockResolvedValue(undefined),
|
deleteByMatch: jest.fn().mockResolvedValue(undefined),
|
||||||
upsert: jest.fn(),
|
upsert: jest.fn(),
|
||||||
} as unknown as jest.Mocked<MatchStatsRepository>;
|
} as unknown as jest.Mocked<MatchStatsRepository>;
|
||||||
@@ -29,6 +32,7 @@ describe('MatchStatsService', () => {
|
|||||||
connectionService,
|
connectionService,
|
||||||
repository,
|
repository,
|
||||||
{} as MatchStatsFragmentBuilder,
|
{} as MatchStatsFragmentBuilder,
|
||||||
|
{ getMatchTimeline: jest.fn() } as never,
|
||||||
);
|
);
|
||||||
|
|
||||||
await service.buildAndUpsert(matchId);
|
await service.buildAndUpsert(matchId);
|
||||||
@@ -37,6 +41,58 @@ describe('MatchStatsService', () => {
|
|||||||
expect(repository.upsert).not.toHaveBeenCalled();
|
expect(repository.upsert).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('revision-guards deletion when a Competition reversal leaves zero games', async () => {
|
||||||
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
|
const competitionId = new mongoose.Types.ObjectId();
|
||||||
|
const match = {
|
||||||
|
_id: matchId,
|
||||||
|
communityId,
|
||||||
|
scheduledAt: new Date('2026-07-12T10:00:00.000Z'),
|
||||||
|
status: 'in-progress',
|
||||||
|
teams: [],
|
||||||
|
result: undefined,
|
||||||
|
};
|
||||||
|
const competition = {
|
||||||
|
_id: competitionId,
|
||||||
|
revision: 12,
|
||||||
|
projectorVersion: 3,
|
||||||
|
teams: [],
|
||||||
|
projection: { phase: 'ready', games: [] },
|
||||||
|
};
|
||||||
|
const connectionService = {
|
||||||
|
getModel: jest.fn().mockImplementation(async (name: string) => {
|
||||||
|
if (name === 'match') {
|
||||||
|
return { findById: () => queryResult(match, false) };
|
||||||
|
}
|
||||||
|
if (name === 'competition') {
|
||||||
|
return { findOne: () => queryResult(competition) };
|
||||||
|
}
|
||||||
|
if (name === 'riotMatch') return {};
|
||||||
|
throw new Error(`Unexpected model: ${name}`);
|
||||||
|
}),
|
||||||
|
} as unknown as ConnectionService;
|
||||||
|
const repository = {
|
||||||
|
hasCurrentCompetitionFragment: jest.fn().mockResolvedValue(false),
|
||||||
|
deleteByMatch: jest.fn().mockResolvedValue(undefined),
|
||||||
|
upsert: jest.fn(),
|
||||||
|
} as unknown as jest.Mocked<MatchStatsRepository>;
|
||||||
|
const service = new MatchStatsService(
|
||||||
|
connectionService,
|
||||||
|
repository,
|
||||||
|
{} as MatchStatsFragmentBuilder,
|
||||||
|
{ getMatchTimeline: jest.fn() } as never,
|
||||||
|
);
|
||||||
|
|
||||||
|
await service.buildAndUpsert(matchId, { sourceRevision: 12 });
|
||||||
|
|
||||||
|
expect(repository.deleteByMatch).toHaveBeenCalledWith(matchId, {
|
||||||
|
sourceCompetitionId: competitionId,
|
||||||
|
sourceRevision: 12,
|
||||||
|
});
|
||||||
|
expect(repository.upsert).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
it('upserts a fragment for eligible matches', async () => {
|
it('upserts a fragment for eligible matches', async () => {
|
||||||
const matchId = new mongoose.Types.ObjectId();
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
const communityId = new mongoose.Types.ObjectId();
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
@@ -53,17 +109,32 @@ describe('MatchStatsService', () => {
|
|||||||
});
|
});
|
||||||
const riotFind = jest.fn().mockReturnValue({
|
const riotFind = jest.fn().mockReturnValue({
|
||||||
lean: () => ({
|
lean: () => ({
|
||||||
exec: jest.fn().mockResolvedValue([{ matchId: 'KR_1', raw: {} }]),
|
exec: jest.fn().mockResolvedValue([
|
||||||
|
{
|
||||||
|
matchId: 'KR_1',
|
||||||
|
raw: {},
|
||||||
|
timeline: {
|
||||||
|
metadata: {
|
||||||
|
dataVersion: '2',
|
||||||
|
matchId: 'KR_1',
|
||||||
|
participants: [],
|
||||||
|
},
|
||||||
|
info: { frameInterval: 60_000, frames: [] },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
]),
|
||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
const connectionService = {
|
const connectionService = {
|
||||||
getModel: jest.fn().mockImplementation(async (name: string) => {
|
getModel: jest.fn().mockImplementation(async (name: string) => {
|
||||||
if (name === 'match') return { findById };
|
if (name === 'match') return { findById };
|
||||||
|
if (name === 'competition') return { findOne: () => queryResult(null) };
|
||||||
if (name === 'riotMatch') return { find: riotFind };
|
if (name === 'riotMatch') return { find: riotFind };
|
||||||
throw new Error(`Unexpected model: ${name}`);
|
throw new Error(`Unexpected model: ${name}`);
|
||||||
}),
|
}),
|
||||||
} as unknown as ConnectionService;
|
} as unknown as ConnectionService;
|
||||||
const repository = {
|
const repository = {
|
||||||
|
hasCurrentCompetitionFragment: jest.fn().mockResolvedValue(false),
|
||||||
upsert: jest.fn().mockResolvedValue(undefined),
|
upsert: jest.fn().mockResolvedValue(undefined),
|
||||||
deleteByMatch: jest.fn(),
|
deleteByMatch: jest.fn(),
|
||||||
} as unknown as jest.Mocked<MatchStatsRepository>;
|
} as unknown as jest.Mocked<MatchStatsRepository>;
|
||||||
@@ -82,6 +153,7 @@ describe('MatchStatsService', () => {
|
|||||||
connectionService,
|
connectionService,
|
||||||
repository,
|
repository,
|
||||||
builder,
|
builder,
|
||||||
|
{ getMatchTimeline: jest.fn() } as never,
|
||||||
);
|
);
|
||||||
|
|
||||||
await service.buildAndUpsert(matchId);
|
await service.buildAndUpsert(matchId);
|
||||||
@@ -89,7 +161,11 @@ describe('MatchStatsService', () => {
|
|||||||
expect(builder.buildFragment).toHaveBeenCalledWith({
|
expect(builder.buildFragment).toHaveBeenCalledWith({
|
||||||
match,
|
match,
|
||||||
rawByRiotMatchId: expect.any(Map),
|
rawByRiotMatchId: expect.any(Map),
|
||||||
|
timelineByRiotMatchId: expect.any(Map),
|
||||||
});
|
});
|
||||||
|
expect(
|
||||||
|
builder.buildFragment.mock.calls[0][0].timelineByRiotMatchId,
|
||||||
|
).toHaveProperty('size', 0);
|
||||||
expect(repository.upsert).toHaveBeenCalledWith(
|
expect(repository.upsert).toHaveBeenCalledWith(
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
matchId,
|
matchId,
|
||||||
@@ -97,8 +173,476 @@ describe('MatchStatsService', () => {
|
|||||||
scheduledAt,
|
scheduledAt,
|
||||||
gameCreationMin: 1_000,
|
gameCreationMin: 1_000,
|
||||||
gameCreationMax: 2_000,
|
gameCreationMax: 2_000,
|
||||||
builderVersion: 1,
|
builderVersion: MATCH_STATS_BUILDER_VERSION,
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('retries unusable timeline caches and stores a later usable fetch', async () => {
|
||||||
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
|
const match = {
|
||||||
|
_id: matchId,
|
||||||
|
communityId,
|
||||||
|
scheduledAt: new Date('2026-05-03T00:00:00.000Z'),
|
||||||
|
status: 'finished',
|
||||||
|
result: { games: [{ riotMatchId: 'KR_1' }] },
|
||||||
|
};
|
||||||
|
const emptyTimeline = {
|
||||||
|
info: { frameInterval: 60_000, frames: [] },
|
||||||
|
};
|
||||||
|
const partialTimeline = {
|
||||||
|
info: {
|
||||||
|
frameInterval: 60_000,
|
||||||
|
frames: [{ timestamp: 0, events: [] }],
|
||||||
|
},
|
||||||
|
};
|
||||||
|
const nonPositiveTimeline = {
|
||||||
|
info: {
|
||||||
|
frameInterval: 0,
|
||||||
|
frames: [timelineFrame(120_000)],
|
||||||
|
},
|
||||||
|
};
|
||||||
|
const truncatedTimeline = {
|
||||||
|
info: {
|
||||||
|
frameInterval: 60_000,
|
||||||
|
frames: [timelineFrame()],
|
||||||
|
},
|
||||||
|
};
|
||||||
|
const usableTimeline = {
|
||||||
|
metadata: {
|
||||||
|
dataVersion: '2',
|
||||||
|
matchId: 'KR_1',
|
||||||
|
participants: ['puuid-1'],
|
||||||
|
},
|
||||||
|
info: {
|
||||||
|
frameInterval: 60_000,
|
||||||
|
frames: [timelineFrame(120_000)],
|
||||||
|
},
|
||||||
|
};
|
||||||
|
const cachedTimelines = [
|
||||||
|
emptyTimeline,
|
||||||
|
partialTimeline,
|
||||||
|
nonPositiveTimeline,
|
||||||
|
truncatedTimeline,
|
||||||
|
];
|
||||||
|
let buildIndex = 0;
|
||||||
|
const riotFind = jest.fn().mockImplementation(() => ({
|
||||||
|
lean: () => ({
|
||||||
|
exec: jest.fn().mockResolvedValue([
|
||||||
|
{
|
||||||
|
matchId: 'KR_1',
|
||||||
|
raw: { info: { gameDuration: 120 } },
|
||||||
|
timeline: cachedTimelines[Math.min(buildIndex++, 3)],
|
||||||
|
},
|
||||||
|
]),
|
||||||
|
}),
|
||||||
|
}));
|
||||||
|
const updateExec = jest.fn().mockResolvedValue(undefined);
|
||||||
|
let storedUpdate:
|
||||||
|
| {
|
||||||
|
filter: unknown;
|
||||||
|
update: { $set: { timeline: unknown; timelineFetchedAt: Date } };
|
||||||
|
}
|
||||||
|
| undefined;
|
||||||
|
const updateOne = jest.fn(
|
||||||
|
(
|
||||||
|
filter: unknown,
|
||||||
|
update: { $set: { timeline: unknown; timelineFetchedAt: Date } },
|
||||||
|
) => {
|
||||||
|
storedUpdate = { filter, update };
|
||||||
|
return { exec: updateExec };
|
||||||
|
},
|
||||||
|
);
|
||||||
|
const connectionService = {
|
||||||
|
getModel: jest.fn().mockImplementation((name: string) => {
|
||||||
|
if (name === 'match') {
|
||||||
|
return Promise.resolve({ findById: () => queryResult(match, false) });
|
||||||
|
}
|
||||||
|
if (name === 'competition') {
|
||||||
|
return Promise.resolve({ findOne: () => queryResult(null) });
|
||||||
|
}
|
||||||
|
if (name === 'riotMatch') {
|
||||||
|
return Promise.resolve({ find: riotFind, updateOne });
|
||||||
|
}
|
||||||
|
if (name === 'community') {
|
||||||
|
return Promise.resolve({
|
||||||
|
findById: () => ({
|
||||||
|
select: () => queryResult({ riotRegion: 'asia' }),
|
||||||
|
}),
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
return Promise.reject(new Error(`Unexpected model: ${name}`));
|
||||||
|
}),
|
||||||
|
} as unknown as ConnectionService;
|
||||||
|
const repository = {
|
||||||
|
hasCurrentCompetitionFragment: jest.fn().mockResolvedValue(false),
|
||||||
|
upsert: jest.fn().mockResolvedValue(undefined),
|
||||||
|
deleteByMatch: jest.fn(),
|
||||||
|
deleteLegacyByMatch: jest.fn(),
|
||||||
|
} as unknown as jest.Mocked<MatchStatsRepository>;
|
||||||
|
type BuildParams = Parameters<
|
||||||
|
MatchStatsFragmentBuilder['buildFragment']
|
||||||
|
>[0];
|
||||||
|
const buildCalls: BuildParams[] = [];
|
||||||
|
const builtFragment: ReturnType<
|
||||||
|
MatchStatsFragmentBuilder['buildFragment']
|
||||||
|
> = {
|
||||||
|
matchCard: {
|
||||||
|
matchId: matchId.toString(),
|
||||||
|
title: '내전',
|
||||||
|
scheduledAt: match.scheduledAt.toISOString(),
|
||||||
|
status: 'finished',
|
||||||
|
gameCount: 1,
|
||||||
|
games: [],
|
||||||
|
teams: [],
|
||||||
|
seriesResults: [],
|
||||||
|
},
|
||||||
|
records: [],
|
||||||
|
gameDetails: [],
|
||||||
|
userIds: [],
|
||||||
|
championIds: [],
|
||||||
|
gameCreationMin: 1_000,
|
||||||
|
gameCreationMax: 2_000,
|
||||||
|
};
|
||||||
|
const buildFragment = jest.fn((params: BuildParams) => {
|
||||||
|
buildCalls.push(params);
|
||||||
|
return builtFragment;
|
||||||
|
});
|
||||||
|
const builder = {
|
||||||
|
buildFragment,
|
||||||
|
} as unknown as jest.Mocked<MatchStatsFragmentBuilder>;
|
||||||
|
const getMatchTimeline = jest
|
||||||
|
.fn()
|
||||||
|
.mockRejectedValueOnce(new Error('temporary Riot failure'))
|
||||||
|
.mockRejectedValueOnce(new Error('temporary Riot failure'))
|
||||||
|
.mockRejectedValueOnce(new Error('temporary Riot failure'))
|
||||||
|
.mockResolvedValueOnce(usableTimeline);
|
||||||
|
const service = new MatchStatsService(
|
||||||
|
connectionService,
|
||||||
|
repository,
|
||||||
|
builder,
|
||||||
|
{ getMatchTimeline } as never,
|
||||||
|
);
|
||||||
|
|
||||||
|
await service.buildAndUpsert(matchId, { includeTimeline: true });
|
||||||
|
await service.buildAndUpsert(matchId, { includeTimeline: true });
|
||||||
|
await service.buildAndUpsert(matchId, { includeTimeline: true });
|
||||||
|
await service.buildAndUpsert(matchId, { includeTimeline: true });
|
||||||
|
|
||||||
|
expect(getMatchTimeline).toHaveBeenCalledTimes(4);
|
||||||
|
expect(buildFragment).toHaveBeenCalledTimes(4);
|
||||||
|
expect(buildCalls[0].timelineByRiotMatchId).toHaveProperty('size', 0);
|
||||||
|
expect(buildCalls[1].timelineByRiotMatchId).toHaveProperty('size', 0);
|
||||||
|
expect(buildCalls[2].timelineByRiotMatchId?.get('KR_1')).toBeUndefined();
|
||||||
|
expect(buildCalls[3].timelineByRiotMatchId?.get('KR_1')).toBe(
|
||||||
|
usableTimeline,
|
||||||
|
);
|
||||||
|
for (const call of buildCalls) {
|
||||||
|
expect(call).not.toHaveProperty('timelineLoadAttempted');
|
||||||
|
}
|
||||||
|
expect(updateOne).toHaveBeenCalledTimes(1);
|
||||||
|
expect(storedUpdate?.filter).toEqual({ matchId: 'KR_1' });
|
||||||
|
expect(storedUpdate?.update.$set.timeline).toBe(usableTimeline);
|
||||||
|
expect(storedUpdate?.update.$set.timelineFetchedAt).toBeInstanceOf(Date);
|
||||||
|
expect(updateExec).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('builds from the Competition projection and records its source revision', async () => {
|
||||||
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
|
const competitionId = new mongoose.Types.ObjectId();
|
||||||
|
const teamAId = new mongoose.Types.ObjectId();
|
||||||
|
const teamBId = new mongoose.Types.ObjectId();
|
||||||
|
const userAId = new mongoose.Types.ObjectId();
|
||||||
|
const userBId = new mongoose.Types.ObjectId();
|
||||||
|
const match = {
|
||||||
|
_id: matchId,
|
||||||
|
communityId,
|
||||||
|
scheduledAt: new Date('2026-07-12T10:00:00.000Z'),
|
||||||
|
status: 'in-progress',
|
||||||
|
teams: [],
|
||||||
|
result: { games: [{ riotMatchId: 'KR_LEGACY_MUST_NOT_BE_USED' }] },
|
||||||
|
};
|
||||||
|
const competition = {
|
||||||
|
_id: competitionId,
|
||||||
|
revision: 12,
|
||||||
|
projectorVersion: 3,
|
||||||
|
teams: [
|
||||||
|
{ teamId: teamAId, legacyTeamIndex: 8, displayOrder: 1 },
|
||||||
|
{ teamId: teamBId, legacyTeamIndex: 3, displayOrder: 2 },
|
||||||
|
],
|
||||||
|
projection: {
|
||||||
|
phase: 'running',
|
||||||
|
games: [
|
||||||
|
{
|
||||||
|
displayNumber: 4,
|
||||||
|
evidence: { type: 'riot', riotMatchId: 'KR_COMPETITION' },
|
||||||
|
teams: {
|
||||||
|
blue: { teamId: teamAId.toString() },
|
||||||
|
red: { teamId: teamBId.toString() },
|
||||||
|
},
|
||||||
|
winnerTeamId: teamAId.toString(),
|
||||||
|
startedAt: '2026-07-12T10:00:00.000Z',
|
||||||
|
durationSeconds: 1800,
|
||||||
|
participants: [
|
||||||
|
participant(userAId, teamAId, 'blue', true),
|
||||||
|
participant(userBId, teamBId, 'red', false),
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
};
|
||||||
|
const riotFind = jest.fn().mockReturnValue({
|
||||||
|
lean: () => ({
|
||||||
|
exec: jest
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValue([{ matchId: 'KR_COMPETITION', raw: {} }]),
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
const connectionService = {
|
||||||
|
getModel: jest.fn().mockImplementation(async (name: string) => {
|
||||||
|
if (name === 'match')
|
||||||
|
return { findById: () => queryResult(match, false) };
|
||||||
|
if (name === 'competition') {
|
||||||
|
return { findOne: () => queryResult(competition) };
|
||||||
|
}
|
||||||
|
if (name === 'riotMatch') return { find: riotFind };
|
||||||
|
throw new Error(`Unexpected model: ${name}`);
|
||||||
|
}),
|
||||||
|
} as unknown as ConnectionService;
|
||||||
|
const repository = {
|
||||||
|
hasCurrentCompetitionFragment: jest.fn().mockResolvedValue(false),
|
||||||
|
upsert: jest.fn().mockResolvedValue(undefined),
|
||||||
|
deleteByMatch: jest.fn(),
|
||||||
|
} as unknown as jest.Mocked<MatchStatsRepository>;
|
||||||
|
const builder = {
|
||||||
|
buildFragment: jest.fn().mockReturnValue({
|
||||||
|
matchCard: {},
|
||||||
|
records: [],
|
||||||
|
gameDetails: [],
|
||||||
|
userIds: [],
|
||||||
|
championIds: [],
|
||||||
|
gameCreationMin: 1,
|
||||||
|
gameCreationMax: 2,
|
||||||
|
}),
|
||||||
|
} as unknown as jest.Mocked<MatchStatsFragmentBuilder>;
|
||||||
|
const service = new MatchStatsService(
|
||||||
|
connectionService,
|
||||||
|
repository,
|
||||||
|
builder,
|
||||||
|
{ getMatchTimeline: jest.fn() } as never,
|
||||||
|
);
|
||||||
|
|
||||||
|
await service.buildAndUpsert(matchId, { sourceRevision: 12 });
|
||||||
|
|
||||||
|
expect(riotFind).toHaveBeenCalledWith({
|
||||||
|
matchId: { $in: ['KR_COMPETITION'] },
|
||||||
|
});
|
||||||
|
expect(builder.buildFragment).toHaveBeenCalledWith(
|
||||||
|
expect.objectContaining({
|
||||||
|
match: expect.objectContaining({
|
||||||
|
result: expect.objectContaining({
|
||||||
|
riotMatchIds: ['KR_COMPETITION'],
|
||||||
|
games: [
|
||||||
|
expect.objectContaining({
|
||||||
|
gameNumber: 4,
|
||||||
|
blueTeamIndex: 8,
|
||||||
|
redTeamIndex: 3,
|
||||||
|
winnerTeamIndex: 8,
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
expect(repository.upsert).toHaveBeenCalledWith(
|
||||||
|
expect.objectContaining({
|
||||||
|
sourceCompetitionId: competitionId,
|
||||||
|
sourceRevision: 12,
|
||||||
|
projectorVersion: 3,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('removes a fragment written after its Competition Match was deleted', async () => {
|
||||||
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
|
const competitionId = new mongoose.Types.ObjectId();
|
||||||
|
const teamAId = new mongoose.Types.ObjectId();
|
||||||
|
const teamBId = new mongoose.Types.ObjectId();
|
||||||
|
const match = {
|
||||||
|
_id: matchId,
|
||||||
|
communityId,
|
||||||
|
scheduledAt: new Date('2026-07-12T10:00:00.000Z'),
|
||||||
|
status: 'in-progress',
|
||||||
|
teams: [],
|
||||||
|
result: undefined,
|
||||||
|
};
|
||||||
|
const competition = {
|
||||||
|
_id: competitionId,
|
||||||
|
revision: 12,
|
||||||
|
projectorVersion: 3,
|
||||||
|
teams: [
|
||||||
|
{ teamId: teamAId, legacyTeamIndex: 1, displayOrder: 1 },
|
||||||
|
{ teamId: teamBId, legacyTeamIndex: 2, displayOrder: 2 },
|
||||||
|
],
|
||||||
|
projection: {
|
||||||
|
phase: 'running',
|
||||||
|
games: [
|
||||||
|
{
|
||||||
|
id: new mongoose.Types.ObjectId(),
|
||||||
|
displayNumber: 1,
|
||||||
|
evidence: { type: 'legacy', legacyReference: 'legacy:1' },
|
||||||
|
teams: {
|
||||||
|
blue: { teamId: teamAId.toString() },
|
||||||
|
red: { teamId: teamBId.toString() },
|
||||||
|
},
|
||||||
|
winnerTeamId: teamAId.toString(),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
};
|
||||||
|
const findById = jest
|
||||||
|
.fn()
|
||||||
|
.mockReturnValueOnce(queryResult(match, false))
|
||||||
|
.mockReturnValueOnce(queryResult(null, false));
|
||||||
|
const findCompetition = jest.fn().mockReturnValue(queryResult(competition));
|
||||||
|
const connectionService = {
|
||||||
|
getModel: jest.fn().mockImplementation(async (name: string) => {
|
||||||
|
if (name === 'match') return { findById };
|
||||||
|
if (name === 'competition') return { findOne: findCompetition };
|
||||||
|
if (name === 'riotMatch') return {};
|
||||||
|
throw new Error(`Unexpected model: ${name}`);
|
||||||
|
}),
|
||||||
|
} as unknown as ConnectionService;
|
||||||
|
const repository = {
|
||||||
|
hasCurrentCompetitionFragment: jest.fn().mockResolvedValue(false),
|
||||||
|
upsert: jest.fn().mockResolvedValue(undefined),
|
||||||
|
deleteByMatch: jest.fn().mockResolvedValue(undefined),
|
||||||
|
deleteLegacyByMatch: jest.fn(),
|
||||||
|
} as unknown as jest.Mocked<MatchStatsRepository>;
|
||||||
|
const builder = {
|
||||||
|
buildFragment: jest.fn().mockReturnValue({
|
||||||
|
matchCard: {},
|
||||||
|
records: [],
|
||||||
|
gameDetails: [],
|
||||||
|
userIds: [],
|
||||||
|
championIds: [],
|
||||||
|
gameCreationMin: 1,
|
||||||
|
gameCreationMax: 2,
|
||||||
|
}),
|
||||||
|
} as unknown as jest.Mocked<MatchStatsFragmentBuilder>;
|
||||||
|
const service = new MatchStatsService(
|
||||||
|
connectionService,
|
||||||
|
repository,
|
||||||
|
builder,
|
||||||
|
{ getMatchTimeline: jest.fn() } as never,
|
||||||
|
);
|
||||||
|
|
||||||
|
await service.buildAndUpsert(matchId, { sourceRevision: 12 });
|
||||||
|
|
||||||
|
expect(repository.upsert).toHaveBeenCalled();
|
||||||
|
expect(repository.deleteByMatch).toHaveBeenCalledWith(matchId, {
|
||||||
|
sourceCompetitionId: competitionId,
|
||||||
|
sourceRevision: 12,
|
||||||
|
});
|
||||||
|
expect(repository.upsert.mock.invocationCallOrder[0]).toBeLessThan(
|
||||||
|
repository.deleteByMatch.mock.invocationCallOrder[0],
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not rebuild before the requested Competition revision is visible', async () => {
|
||||||
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
|
const riotFind = jest.fn();
|
||||||
|
const connectionService = {
|
||||||
|
getModel: jest.fn().mockImplementation(async (name: string) => {
|
||||||
|
if (name === 'match') {
|
||||||
|
return {
|
||||||
|
findById: () =>
|
||||||
|
queryResult(
|
||||||
|
{
|
||||||
|
_id: matchId,
|
||||||
|
status: 'in-progress',
|
||||||
|
},
|
||||||
|
false,
|
||||||
|
),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (name === 'competition') {
|
||||||
|
return {
|
||||||
|
findOne: () => queryResult({ revision: 11 }),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (name === 'riotMatch') return { find: riotFind };
|
||||||
|
throw new Error(`Unexpected model: ${name}`);
|
||||||
|
}),
|
||||||
|
} as unknown as ConnectionService;
|
||||||
|
const repository = {
|
||||||
|
hasCurrentCompetitionFragment: jest.fn().mockResolvedValue(false),
|
||||||
|
upsert: jest.fn(),
|
||||||
|
deleteByMatch: jest.fn(),
|
||||||
|
} as unknown as jest.Mocked<MatchStatsRepository>;
|
||||||
|
const builder = {
|
||||||
|
buildFragment: jest.fn(),
|
||||||
|
} as unknown as jest.Mocked<MatchStatsFragmentBuilder>;
|
||||||
|
const service = new MatchStatsService(
|
||||||
|
connectionService,
|
||||||
|
repository,
|
||||||
|
builder,
|
||||||
|
{ getMatchTimeline: jest.fn() } as never,
|
||||||
|
);
|
||||||
|
|
||||||
|
await service.buildAndUpsert(matchId, { sourceRevision: 12 });
|
||||||
|
|
||||||
|
expect(riotFind).not.toHaveBeenCalled();
|
||||||
|
expect(builder.buildFragment).not.toHaveBeenCalled();
|
||||||
|
expect(repository.upsert).not.toHaveBeenCalled();
|
||||||
|
expect(repository.deleteByMatch).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
function participant(
|
||||||
|
userId: mongoose.Types.ObjectId,
|
||||||
|
teamId: mongoose.Types.ObjectId,
|
||||||
|
side: 'blue' | 'red',
|
||||||
|
win: boolean,
|
||||||
|
) {
|
||||||
|
return {
|
||||||
|
userId: userId.toString(),
|
||||||
|
teamId: teamId.toString(),
|
||||||
|
side,
|
||||||
|
summonerName: 'player',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
championId: 1,
|
||||||
|
kills: 1,
|
||||||
|
deaths: 1,
|
||||||
|
assists: 1,
|
||||||
|
win,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function queryResult<T>(value: T, lean = true) {
|
||||||
|
const query = {
|
||||||
|
lean: jest.fn(),
|
||||||
|
exec: jest.fn().mockResolvedValue(value),
|
||||||
|
};
|
||||||
|
query.lean.mockReturnValue(query);
|
||||||
|
return lean ? query : { exec: query.exec };
|
||||||
|
}
|
||||||
|
|
||||||
|
function timelineFrame(timestamp = 0) {
|
||||||
|
return {
|
||||||
|
timestamp,
|
||||||
|
events: [],
|
||||||
|
participantFrames: {
|
||||||
|
'1': {
|
||||||
|
participantId: 1,
|
||||||
|
totalGold: 500,
|
||||||
|
xp: 0,
|
||||||
|
minionsKilled: 0,
|
||||||
|
jungleMinionsKilled: 0,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,31 +1,83 @@
|
|||||||
import { Injectable } from '@nestjs/common';
|
import { Injectable, Logger } from '@nestjs/common';
|
||||||
import mongoose from 'mongoose';
|
import mongoose from 'mongoose';
|
||||||
import { ConnectionService } from '../global/database/connection.service';
|
import { ConnectionService } from '../global/database/connection.service';
|
||||||
import type { MatchDocument } from '../global/database/schema';
|
import type { MatchDocument } from '../global/database/schema';
|
||||||
import type { RiotMatchDto } from '../riot/riot.types';
|
import { RiotMatchService } from '../riot/riot-match.service';
|
||||||
|
import {
|
||||||
|
RIOT_REGIONAL_ROUTES,
|
||||||
|
type RiotMatchDto,
|
||||||
|
type RiotMatchTimelineDto,
|
||||||
|
type RiotRegionalRoute,
|
||||||
|
} from '../riot/riot.types';
|
||||||
import { MatchStatsFragmentBuilder } from './match-stats-fragment.builder';
|
import { MatchStatsFragmentBuilder } from './match-stats-fragment.builder';
|
||||||
import { MatchStatsRepository } from './match-stats.repository';
|
import { MatchStatsRepository } from './match-stats.repository';
|
||||||
import { MATCH_STATS_BUILDER_VERSION } from './match-stats.types';
|
import { MATCH_STATS_BUILDER_VERSION } from './match-stats.types';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class MatchStatsService {
|
export class MatchStatsService {
|
||||||
|
private readonly logger = new Logger(MatchStatsService.name);
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly connectionService: ConnectionService,
|
private readonly connectionService: ConnectionService,
|
||||||
private readonly repository: MatchStatsRepository,
|
private readonly repository: MatchStatsRepository,
|
||||||
private readonly builder: MatchStatsFragmentBuilder,
|
private readonly builder: MatchStatsFragmentBuilder,
|
||||||
|
private readonly riotMatchService: RiotMatchService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public async buildAndUpsert(matchId: mongoose.Types.ObjectId): Promise<void> {
|
public async buildAndUpsert(
|
||||||
|
matchId: mongoose.Types.ObjectId,
|
||||||
|
options: { includeTimeline?: boolean; sourceRevision?: number } = {},
|
||||||
|
): Promise<void> {
|
||||||
const MatchModel = await this.connectionService.getModel('match');
|
const MatchModel = await this.connectionService.getModel('match');
|
||||||
|
const CompetitionModel =
|
||||||
|
await this.connectionService.getModel('competition');
|
||||||
const RiotMatchModel = await this.connectionService.getModel('riotMatch');
|
const RiotMatchModel = await this.connectionService.getModel('riotMatch');
|
||||||
const match = await MatchModel.findById(matchId).exec();
|
const match = await MatchModel.findById(matchId).exec();
|
||||||
if (!match) return;
|
if (!match) return;
|
||||||
if (!this.isEligible(match)) {
|
const competition = await CompetitionModel.findOne({ matchId })
|
||||||
|
.lean()
|
||||||
|
.exec();
|
||||||
|
if (
|
||||||
|
options.sourceRevision !== undefined &&
|
||||||
|
(!competition || competition.revision < options.sourceRevision)
|
||||||
|
) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const competitionSource = competition
|
||||||
|
? competitionStatsSource(match, competition)
|
||||||
|
: undefined;
|
||||||
|
const sourceMatch = competitionSource?.match ?? match;
|
||||||
|
if (!this.isEligible(sourceMatch) && competition?.phase !== 'completed') {
|
||||||
|
if (competitionSource) {
|
||||||
|
await this.repository.deleteByMatch(matchId, {
|
||||||
|
sourceCompetitionId: competitionSource.sourceCompetitionId,
|
||||||
|
sourceRevision: competitionSource.sourceRevision,
|
||||||
|
});
|
||||||
|
} else {
|
||||||
await this.repository.deleteByMatch(matchId);
|
await this.repository.deleteByMatch(matchId);
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const riotIds = [
|
// Outbox redelivery (including older events observing the latest revision)
|
||||||
|
// must not reload Riot payloads or replace an already enriched fragment.
|
||||||
|
// Explicit rebuilds and timeline hydration still run at the same revision.
|
||||||
|
if (
|
||||||
|
options.sourceRevision !== undefined &&
|
||||||
|
!options.includeTimeline &&
|
||||||
|
competitionSource &&
|
||||||
|
(await this.repository.hasCurrentCompetitionFragment({
|
||||||
|
matchId,
|
||||||
|
sourceCompetitionId: competitionSource.sourceCompetitionId,
|
||||||
|
sourceRevision: competitionSource.sourceRevision,
|
||||||
|
projectorVersion: competitionSource.projectorVersion,
|
||||||
|
builderVersion: MATCH_STATS_BUILDER_VERSION,
|
||||||
|
}))
|
||||||
|
) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const riotIds = competitionSource?.riotMatchIds ?? [
|
||||||
...new Set(
|
...new Set(
|
||||||
(match.result?.games ?? [])
|
(match.result?.games ?? [])
|
||||||
.map((game) => game.riotMatchId)
|
.map((game) => game.riotMatchId)
|
||||||
@@ -41,7 +93,56 @@ export class MatchStatsService {
|
|||||||
const rawByRiotMatchId = new Map(
|
const rawByRiotMatchId = new Map(
|
||||||
riotDocs.map((doc) => [doc.matchId, doc.raw as unknown as RiotMatchDto]),
|
riotDocs.map((doc) => [doc.matchId, doc.raw as unknown as RiotMatchDto]),
|
||||||
);
|
);
|
||||||
const fragment = this.builder.buildFragment({ match, rawByRiotMatchId });
|
const timelineByRiotMatchId = new Map<string, RiotMatchTimelineDto>();
|
||||||
|
for (const doc of riotDocs) {
|
||||||
|
if (isUsableRiotMatchTimeline(doc.timeline, doc.raw)) {
|
||||||
|
timelineByRiotMatchId.set(doc.matchId, doc.timeline);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
options.includeTimeline &&
|
||||||
|
riotDocs.length > 0 &&
|
||||||
|
timelineByRiotMatchId.size < riotDocs.length
|
||||||
|
) {
|
||||||
|
const region = await this.resolveRiotRegion(match.communityId);
|
||||||
|
for (const doc of riotDocs) {
|
||||||
|
if (timelineByRiotMatchId.has(doc.matchId)) continue;
|
||||||
|
try {
|
||||||
|
const timeline = await this.riotMatchService.getMatchTimeline(
|
||||||
|
doc.matchId,
|
||||||
|
{ region },
|
||||||
|
);
|
||||||
|
if (!isUsableRiotMatchTimeline(timeline, doc.raw)) {
|
||||||
|
this.logger.warn(
|
||||||
|
`Ignored unusable match timeline for ${doc.matchId}.`,
|
||||||
|
);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
await RiotMatchModel.updateOne(
|
||||||
|
{ matchId: doc.matchId },
|
||||||
|
{
|
||||||
|
$set: {
|
||||||
|
timeline: timeline as unknown as Record<string, unknown>,
|
||||||
|
timelineFetchedAt: new Date(),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
).exec();
|
||||||
|
timelineByRiotMatchId.set(doc.matchId, timeline);
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.warn(
|
||||||
|
`Failed to fetch match timeline for ${doc.matchId}: ${
|
||||||
|
error instanceof Error ? error.message : error
|
||||||
|
}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const fragment = this.builder.buildFragment({
|
||||||
|
match: sourceMatch,
|
||||||
|
rawByRiotMatchId,
|
||||||
|
timelineByRiotMatchId,
|
||||||
|
});
|
||||||
|
|
||||||
await this.repository.upsert({
|
await this.repository.upsert({
|
||||||
matchId: match._id,
|
matchId: match._id,
|
||||||
@@ -56,7 +157,19 @@ export class MatchStatsService {
|
|||||||
gameDetails: fragment.gameDetails,
|
gameDetails: fragment.gameDetails,
|
||||||
builtAt: new Date(),
|
builtAt: new Date(),
|
||||||
builderVersion: MATCH_STATS_BUILDER_VERSION,
|
builderVersion: MATCH_STATS_BUILDER_VERSION,
|
||||||
|
...(competitionSource
|
||||||
|
? {
|
||||||
|
sourceCompetitionId: competitionSource.sourceCompetitionId,
|
||||||
|
sourceRevision: competitionSource.sourceRevision,
|
||||||
|
projectorVersion: competitionSource.projectorVersion,
|
||||||
|
}
|
||||||
|
: {}),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Source reads and the read-model write are intentionally separated by
|
||||||
|
// Riot/timeline work. Revalidate after the write so a concurrent aggregate
|
||||||
|
// deletion cannot resurrect MatchStats after the delete transaction.
|
||||||
|
await this.removeFragmentIfSourceChanged(matchId, competitionSource);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async removeByMatch(matchId: mongoose.Types.ObjectId): Promise<void> {
|
public async removeByMatch(matchId: mongoose.Types.ObjectId): Promise<void> {
|
||||||
@@ -76,7 +189,10 @@ export class MatchStatsService {
|
|||||||
const matches = await MatchModel.find({
|
const matches = await MatchModel.find({
|
||||||
communityId,
|
communityId,
|
||||||
status: { $in: ['finished', 'in-progress'] },
|
status: { $in: ['finished', 'in-progress'] },
|
||||||
'result.games.0': { $exists: true },
|
$or: [
|
||||||
|
{ competitionId: { $exists: true } },
|
||||||
|
{ 'result.games.0': { $exists: true } },
|
||||||
|
],
|
||||||
})
|
})
|
||||||
.sort({ scheduledAt: -1 })
|
.sort({ scheduledAt: -1 })
|
||||||
.select({ _id: 1 })
|
.select({ _id: 1 })
|
||||||
@@ -101,4 +217,276 @@ export class MatchStatsService {
|
|||||||
Boolean(match.result?.games?.length)
|
Boolean(match.result?.games?.length)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async resolveRiotRegion(
|
||||||
|
communityId: mongoose.Types.ObjectId,
|
||||||
|
): Promise<RiotRegionalRoute> {
|
||||||
|
const CommunityModel = await this.connectionService.getModel('community');
|
||||||
|
const community = await CommunityModel.findById(communityId)
|
||||||
|
.select({ riotRegion: 1 })
|
||||||
|
.lean()
|
||||||
|
.exec();
|
||||||
|
const region = community?.riotRegion;
|
||||||
|
return RIOT_REGIONAL_ROUTES.includes(region as RiotRegionalRoute)
|
||||||
|
? (region as RiotRegionalRoute)
|
||||||
|
: 'asia';
|
||||||
|
}
|
||||||
|
|
||||||
|
private async removeFragmentIfSourceChanged(
|
||||||
|
matchId: mongoose.Types.ObjectId,
|
||||||
|
source:
|
||||||
|
| {
|
||||||
|
sourceCompetitionId: mongoose.Types.ObjectId;
|
||||||
|
sourceRevision: number;
|
||||||
|
}
|
||||||
|
| undefined,
|
||||||
|
): Promise<void> {
|
||||||
|
const [MatchModel, CompetitionModel] = await Promise.all([
|
||||||
|
this.connectionService.getModel('match'),
|
||||||
|
this.connectionService.getModel('competition'),
|
||||||
|
]);
|
||||||
|
const [currentMatch, currentCompetition] = await Promise.all([
|
||||||
|
MatchModel.findById(matchId).exec(),
|
||||||
|
CompetitionModel.findOne({
|
||||||
|
matchId,
|
||||||
|
...(source
|
||||||
|
? {
|
||||||
|
_id: source.sourceCompetitionId,
|
||||||
|
revision: source.sourceRevision,
|
||||||
|
}
|
||||||
|
: {}),
|
||||||
|
})
|
||||||
|
.lean()
|
||||||
|
.exec(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
if (source) {
|
||||||
|
if (!currentMatch || !currentCompetition) {
|
||||||
|
await this.repository.deleteByMatch(matchId, {
|
||||||
|
sourceCompetitionId: source.sourceCompetitionId,
|
||||||
|
sourceRevision: source.sourceRevision,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!currentMatch || currentCompetition) {
|
||||||
|
await this.repository.deleteLegacyByMatch(matchId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function isUsableRiotMatchTimeline(
|
||||||
|
value: unknown,
|
||||||
|
rawMatch: unknown,
|
||||||
|
): value is RiotMatchTimelineDto {
|
||||||
|
if (
|
||||||
|
!isRecord(value) ||
|
||||||
|
!isRecord(value.info) ||
|
||||||
|
!isRecord(rawMatch) ||
|
||||||
|
!isRecord(rawMatch.info)
|
||||||
|
) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
const frameInterval = finiteNumber(value.info.frameInterval);
|
||||||
|
const gameDuration = finiteNumber(rawMatch.info.gameDuration);
|
||||||
|
const frames = value.info.frames;
|
||||||
|
if (
|
||||||
|
frameInterval === undefined ||
|
||||||
|
frameInterval <= 0 ||
|
||||||
|
gameDuration === undefined ||
|
||||||
|
gameDuration < 0 ||
|
||||||
|
!Array.isArray(frames) ||
|
||||||
|
frames.length === 0 ||
|
||||||
|
!frames.every(isUsableTimelineFrame)
|
||||||
|
) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const lastTimestamp = Math.max(
|
||||||
|
...frames.map((frame) => (frame as { timestamp: number }).timestamp),
|
||||||
|
);
|
||||||
|
return Math.abs(gameDuration * 1_000 - lastTimestamp) < frameInterval;
|
||||||
|
}
|
||||||
|
|
||||||
|
function isUsableTimelineFrame(value: unknown): boolean {
|
||||||
|
if (
|
||||||
|
!isRecord(value) ||
|
||||||
|
finiteNumber(value.timestamp) === undefined ||
|
||||||
|
!Array.isArray(value.events) ||
|
||||||
|
!value.events.every(
|
||||||
|
(event) =>
|
||||||
|
isRecord(event) &&
|
||||||
|
typeof event.type === 'string' &&
|
||||||
|
finiteNumber(event.timestamp) !== undefined,
|
||||||
|
) ||
|
||||||
|
!isRecord(value.participantFrames)
|
||||||
|
) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
const participantFrames = Object.values(value.participantFrames);
|
||||||
|
return (
|
||||||
|
participantFrames.length > 0 &&
|
||||||
|
participantFrames.every(
|
||||||
|
(participantFrame) =>
|
||||||
|
isRecord(participantFrame) &&
|
||||||
|
finiteNumber(participantFrame.participantId) !== undefined &&
|
||||||
|
finiteNumber(participantFrame.totalGold) !== undefined &&
|
||||||
|
finiteNumber(participantFrame.xp) !== undefined,
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function isRecord(value: unknown): value is Record<string, unknown> {
|
||||||
|
return typeof value === 'object' && value !== null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function competitionStatsSource(
|
||||||
|
match: MatchDocument,
|
||||||
|
competition: {
|
||||||
|
_id: mongoose.Types.ObjectId;
|
||||||
|
revision: number;
|
||||||
|
projectorVersion: number;
|
||||||
|
teams: unknown[];
|
||||||
|
projection: Record<string, unknown>;
|
||||||
|
},
|
||||||
|
): {
|
||||||
|
match: MatchDocument;
|
||||||
|
riotMatchIds: string[];
|
||||||
|
sourceCompetitionId: mongoose.Types.ObjectId;
|
||||||
|
sourceRevision: number;
|
||||||
|
projectorVersion: number;
|
||||||
|
} {
|
||||||
|
const teamIndexById = new Map<string, number>();
|
||||||
|
for (const rawTeam of competition.teams) {
|
||||||
|
if (!isRecord(rawTeam)) continue;
|
||||||
|
const teamId = identifier(rawTeam.teamId);
|
||||||
|
const legacyTeamIndex = finiteNumber(rawTeam.legacyTeamIndex);
|
||||||
|
const displayOrder = finiteNumber(rawTeam.displayOrder);
|
||||||
|
if (teamId && (legacyTeamIndex ?? displayOrder)) {
|
||||||
|
teamIndexById.set(teamId, legacyTeamIndex ?? displayOrder!);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const rawGames = Array.isArray(competition.projection.games)
|
||||||
|
? competition.projection.games
|
||||||
|
: [];
|
||||||
|
const riotMatchIds = new Set<string>();
|
||||||
|
const games = rawGames.flatMap((rawGame, gameIndex) => {
|
||||||
|
if (!isRecord(rawGame)) return [];
|
||||||
|
const teams = isRecord(rawGame.teams) ? rawGame.teams : undefined;
|
||||||
|
const blue = teams && isRecord(teams.blue) ? teams.blue : undefined;
|
||||||
|
const red = teams && isRecord(teams.red) ? teams.red : undefined;
|
||||||
|
const blueTeamId = identifier(blue?.teamId);
|
||||||
|
const redTeamId = identifier(red?.teamId);
|
||||||
|
const winnerTeamId = identifier(rawGame.winnerTeamId);
|
||||||
|
const blueTeamIndex = blueTeamId
|
||||||
|
? teamIndexById.get(blueTeamId)
|
||||||
|
: undefined;
|
||||||
|
const redTeamIndex = redTeamId ? teamIndexById.get(redTeamId) : undefined;
|
||||||
|
const winnerTeamIndex = winnerTeamId
|
||||||
|
? teamIndexById.get(winnerTeamId)
|
||||||
|
: undefined;
|
||||||
|
if (!blueTeamIndex || !redTeamIndex || !winnerTeamIndex) return [];
|
||||||
|
|
||||||
|
const evidence = isRecord(rawGame.evidence) ? rawGame.evidence : undefined;
|
||||||
|
const riotMatchId =
|
||||||
|
evidence?.type === 'riot' && typeof evidence.riotMatchId === 'string'
|
||||||
|
? evidence.riotMatchId
|
||||||
|
: typeof evidence?.legacyReference === 'string'
|
||||||
|
? evidence.legacyReference
|
||||||
|
: `competition:${identifier(rawGame.id) ?? 'game'}`;
|
||||||
|
if (evidence?.type === 'riot') riotMatchIds.add(riotMatchId);
|
||||||
|
const participantValues = Array.isArray(rawGame.participants)
|
||||||
|
? rawGame.participants
|
||||||
|
: [];
|
||||||
|
const participants = participantValues.flatMap((rawParticipant) => {
|
||||||
|
if (!isRecord(rawParticipant)) return [];
|
||||||
|
const userId = identifier(rawParticipant.userId);
|
||||||
|
const teamId = identifier(rawParticipant.teamId);
|
||||||
|
const teamIndex = teamId ? teamIndexById.get(teamId) : undefined;
|
||||||
|
const side = rawParticipant.side;
|
||||||
|
if (
|
||||||
|
!userId ||
|
||||||
|
!mongoose.isValidObjectId(userId) ||
|
||||||
|
!teamIndex ||
|
||||||
|
(side !== 'blue' && side !== 'red')
|
||||||
|
) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
userId: new mongoose.Types.ObjectId(userId),
|
||||||
|
teamIndex,
|
||||||
|
side,
|
||||||
|
championId: finiteNumber(rawParticipant.championId) ?? 0,
|
||||||
|
kills: finiteNumber(rawParticipant.kills) ?? 0,
|
||||||
|
deaths: finiteNumber(rawParticipant.deaths) ?? 0,
|
||||||
|
assists: finiteNumber(rawParticipant.assists) ?? 0,
|
||||||
|
win: teamId === winnerTeamId,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
});
|
||||||
|
const startedAt = dateFromUnknown(rawGame.startedAt);
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
gameNumber: finiteNumber(rawGame.displayNumber) ?? gameIndex + 1,
|
||||||
|
riotMatchId,
|
||||||
|
blueTeamIndex,
|
||||||
|
redTeamIndex,
|
||||||
|
winnerTeamIndex,
|
||||||
|
winnerSide:
|
||||||
|
winnerTeamIndex === blueTeamIndex
|
||||||
|
? ('blue' as const)
|
||||||
|
: ('red' as const),
|
||||||
|
gameCreation: Number.isNaN(startedAt.getTime())
|
||||||
|
? 0
|
||||||
|
: startedAt.getTime(),
|
||||||
|
gameDuration: finiteNumber(rawGame.durationSeconds) ?? 0,
|
||||||
|
participants,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
});
|
||||||
|
const base =
|
||||||
|
typeof match.toObject === 'function' ? match.toObject() : { ...match };
|
||||||
|
return {
|
||||||
|
match: {
|
||||||
|
...base,
|
||||||
|
status:
|
||||||
|
competition.projection.phase === 'completed'
|
||||||
|
? 'finished'
|
||||||
|
: games.length > 0
|
||||||
|
? 'in-progress'
|
||||||
|
: match.status,
|
||||||
|
result: {
|
||||||
|
riotMatchIds: games.map(({ riotMatchId }) => riotMatchId),
|
||||||
|
games,
|
||||||
|
seriesResults: [],
|
||||||
|
},
|
||||||
|
} as unknown as MatchDocument,
|
||||||
|
riotMatchIds: [...riotMatchIds],
|
||||||
|
sourceCompetitionId: competition._id,
|
||||||
|
sourceRevision: competition.revision,
|
||||||
|
projectorVersion: competition.projectorVersion,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function identifier(value: unknown): string | undefined {
|
||||||
|
if (typeof value === 'string' && value.length > 0) return value;
|
||||||
|
if (value instanceof mongoose.Types.ObjectId) return value.toHexString();
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
function dateFromUnknown(value: unknown): Date {
|
||||||
|
if (value instanceof Date) return new Date(value.getTime());
|
||||||
|
if (typeof value === 'string' || typeof value === 'number') {
|
||||||
|
return new Date(value);
|
||||||
|
}
|
||||||
|
return new Date(Number.NaN);
|
||||||
|
}
|
||||||
|
|
||||||
|
function finiteNumber(value: unknown): number | undefined {
|
||||||
|
return typeof value === 'number' && Number.isFinite(value)
|
||||||
|
? value
|
||||||
|
: undefined;
|
||||||
}
|
}
|
||||||
@@ -4,7 +4,7 @@ import type {
|
|||||||
} from '../global/database/schema';
|
} from '../global/database/schema';
|
||||||
import type { InternalMatchCardView } from './community-stats.types';
|
import type { InternalMatchCardView } from './community-stats.types';
|
||||||
|
|
||||||
export const MATCH_STATS_BUILDER_VERSION = 1;
|
export const MATCH_STATS_BUILDER_VERSION = 11;
|
||||||
|
|
||||||
export type InternalRecord = MatchStatsRecord;
|
export type InternalRecord = MatchStatsRecord;
|
||||||
export type InternalGameDetail = MatchStatsGameDetail;
|
export type InternalGameDetail = MatchStatsGameDetail;
|
||||||
|
|||||||
@@ -6,10 +6,7 @@ import {
|
|||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import mongoose from 'mongoose';
|
import mongoose from 'mongoose';
|
||||||
import { ConnectionService } from '../global/database/connection.service';
|
import { ConnectionService } from '../global/database/connection.service';
|
||||||
import {
|
import { CommunityDocument, UserDocument } from '../global/database/schema';
|
||||||
CommunityDocument,
|
|
||||||
UserDocument,
|
|
||||||
} from '../global/database/schema';
|
|
||||||
|
|
||||||
export interface CreateCommunityInput {
|
export interface CreateCommunityInput {
|
||||||
name: string;
|
name: string;
|
||||||
|
|||||||
@@ -0,0 +1,558 @@
|
|||||||
|
import { Types } from 'mongoose';
|
||||||
|
import { ConnectionService } from '../global/database/connection.service';
|
||||||
|
import {
|
||||||
|
CompetitionBootstrapError,
|
||||||
|
CompetitionBootstrapService,
|
||||||
|
type CompetitionBootstrapMatch,
|
||||||
|
} from './competition-bootstrap.service';
|
||||||
|
import type { SeriesDefinition } from './domain/series-graph';
|
||||||
|
|
||||||
|
describe('CompetitionBootstrapService', () => {
|
||||||
|
it('creates a deterministic paired-Series Competition and immutable snapshots', async () => {
|
||||||
|
const firstHarness = createHarness();
|
||||||
|
const firstService = new CompetitionBootstrapService(
|
||||||
|
firstHarness.connectionService,
|
||||||
|
);
|
||||||
|
const match = matchSnapshot({ gameMode: 'pair', teamCount: 2 });
|
||||||
|
|
||||||
|
const first = await firstService.bootstrap(match);
|
||||||
|
|
||||||
|
const inserted = firstHarness.insertedPayloads[0];
|
||||||
|
expect(inserted).toMatchObject({
|
||||||
|
_id: expect.any(Types.ObjectId),
|
||||||
|
matchId: MATCH_ID,
|
||||||
|
communityId: COMMUNITY_ID,
|
||||||
|
schemaVersion: 1,
|
||||||
|
projectorVersion: 1,
|
||||||
|
revision: 0,
|
||||||
|
phase: 'ready',
|
||||||
|
format: {
|
||||||
|
type: 'paired-series',
|
||||||
|
rule: { type: 'fixed-games', gameCount: 3, drawPolicy: 'allow' },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
expect(inserted.teams).toEqual([
|
||||||
|
expect.objectContaining({
|
||||||
|
teamId: expect.any(Types.ObjectId),
|
||||||
|
legacyTeamIndex: 1,
|
||||||
|
displayOrder: 1,
|
||||||
|
seedNumber: 1,
|
||||||
|
name: 'Team 1',
|
||||||
|
members: [
|
||||||
|
expect.objectContaining({
|
||||||
|
userId: USER_IDS[0],
|
||||||
|
displayName: 'Player 1#KR1',
|
||||||
|
gameName: 'Player 1',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
profileIconId: 101,
|
||||||
|
assignedPosition: 'TOP',
|
||||||
|
cost: 10,
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
}),
|
||||||
|
expect.objectContaining({
|
||||||
|
teamId: expect.any(Types.ObjectId),
|
||||||
|
legacyTeamIndex: 2,
|
||||||
|
displayOrder: 2,
|
||||||
|
seedNumber: 2,
|
||||||
|
name: 'Team 2',
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
expect(inserted.seriesGraph).toHaveLength(1);
|
||||||
|
expect(inserted.seriesGraph[0]).toMatchObject({
|
||||||
|
code: 'PAIR_M1',
|
||||||
|
slots: [
|
||||||
|
{
|
||||||
|
position: 'A',
|
||||||
|
source: {
|
||||||
|
type: 'team',
|
||||||
|
teamId: inserted.teams[0].teamId.toString(),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
position: 'B',
|
||||||
|
source: {
|
||||||
|
type: 'team',
|
||||||
|
teamId: inserted.teams[1].teamId.toString(),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
expect(inserted.projection).toMatchObject({
|
||||||
|
competitionId: inserted._id.toString(),
|
||||||
|
sourceRevision: 0,
|
||||||
|
projectorVersion: 1,
|
||||||
|
formatType: 'paired-series',
|
||||||
|
phase: 'ready',
|
||||||
|
});
|
||||||
|
expect(first._id).toEqual(inserted._id);
|
||||||
|
|
||||||
|
const secondHarness = createHarness();
|
||||||
|
const secondService = new CompetitionBootstrapService(
|
||||||
|
secondHarness.connectionService,
|
||||||
|
);
|
||||||
|
await secondService.bootstrap({
|
||||||
|
...match,
|
||||||
|
teams: [...match.teams].reverse(),
|
||||||
|
participants: [...match.participants].reverse(),
|
||||||
|
});
|
||||||
|
|
||||||
|
const secondInserted = secondHarness.insertedPayloads[0];
|
||||||
|
expect(secondInserted._id).toEqual(inserted._id);
|
||||||
|
expect(secondInserted.teams.map(({ teamId }) => teamId)).toEqual(
|
||||||
|
inserted.teams.map(({ teamId }) => teamId),
|
||||||
|
);
|
||||||
|
expect(secondInserted.seriesGraph).toEqual(inserted.seriesGraph);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('maps round-robin configuration and preserves a limited round count', async () => {
|
||||||
|
const harness = createHarness();
|
||||||
|
const service = new CompetitionBootstrapService(harness.connectionService);
|
||||||
|
|
||||||
|
await service.bootstrap(
|
||||||
|
matchSnapshot({
|
||||||
|
gameMode: 'round-robin',
|
||||||
|
teamCount: 4,
|
||||||
|
gameCount: 2,
|
||||||
|
roundRobinMaxRounds: 2,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(harness.insertedPayloads[0]).toMatchObject({
|
||||||
|
format: {
|
||||||
|
type: 'round-robin',
|
||||||
|
rule: { type: 'fixed-games', gameCount: 2, drawPolicy: 'allow' },
|
||||||
|
maxRounds: 2,
|
||||||
|
tieBreakers: ['series-wins', 'game-diff', 'head-to-head'],
|
||||||
|
},
|
||||||
|
});
|
||||||
|
expect(harness.insertedPayloads[0].seriesGraph).toHaveLength(4);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('maps double elimination seeds and stage-specific Series rules', async () => {
|
||||||
|
const harness = createHarness();
|
||||||
|
const service = new CompetitionBootstrapService(harness.connectionService);
|
||||||
|
const match = matchSnapshot({
|
||||||
|
gameMode: 'double-elimination',
|
||||||
|
teamCount: 4,
|
||||||
|
gameCount: 5,
|
||||||
|
});
|
||||||
|
match.doubleElimination = {
|
||||||
|
teamCount: 4,
|
||||||
|
resetFinalEnabled: true,
|
||||||
|
seeds: [
|
||||||
|
{ seedNumber: 1, teamIndex: 3 },
|
||||||
|
{ seedNumber: 2, teamIndex: 1 },
|
||||||
|
{ seedNumber: 3, teamIndex: 4 },
|
||||||
|
{ seedNumber: 4, teamIndex: 2 },
|
||||||
|
],
|
||||||
|
};
|
||||||
|
|
||||||
|
await service.bootstrap(match);
|
||||||
|
|
||||||
|
const inserted = harness.insertedPayloads[0];
|
||||||
|
expect(inserted.format).toEqual({
|
||||||
|
type: 'double-elimination',
|
||||||
|
teamCount: 4,
|
||||||
|
resetFinalEnabled: true,
|
||||||
|
rules: {
|
||||||
|
upper: { type: 'first-to', winsRequired: 3, maxGames: 5 },
|
||||||
|
lower: { type: 'first-to', winsRequired: 1, maxGames: 1 },
|
||||||
|
grandFinal: { type: 'first-to', winsRequired: 1, maxGames: 1 },
|
||||||
|
resetFinal: { type: 'first-to', winsRequired: 1, maxGames: 1 },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
expect(
|
||||||
|
inserted.teams.map(({ legacyTeamIndex, seedNumber }) => ({
|
||||||
|
legacyTeamIndex,
|
||||||
|
seedNumber,
|
||||||
|
})),
|
||||||
|
).toEqual([
|
||||||
|
{ legacyTeamIndex: 1, seedNumber: 2 },
|
||||||
|
{ legacyTeamIndex: 2, seedNumber: 4 },
|
||||||
|
{ legacyTeamIndex: 3, seedNumber: 1 },
|
||||||
|
{ legacyTeamIndex: 4, seedNumber: 3 },
|
||||||
|
]);
|
||||||
|
expect(
|
||||||
|
inserted.seriesGraph.find(({ code }) => code === 'WB_R1_M1')?.rule,
|
||||||
|
).toEqual({ type: 'first-to', winsRequired: 3, maxGames: 5 });
|
||||||
|
expect(
|
||||||
|
inserted.seriesGraph.find(({ code }) => code?.startsWith('LB_'))?.rule,
|
||||||
|
).toEqual({ type: 'first-to', winsRequired: 1, maxGames: 1 });
|
||||||
|
expect(
|
||||||
|
inserted.seriesGraph.find(({ code }) => code === 'GF')?.rule,
|
||||||
|
).toEqual({ type: 'first-to', winsRequired: 1, maxGames: 1 });
|
||||||
|
expect(
|
||||||
|
inserted.seriesGraph.find(({ code }) => code === 'GF_RESET'),
|
||||||
|
).toMatchObject({
|
||||||
|
rule: { type: 'first-to', winsRequired: 1, maxGames: 1 },
|
||||||
|
activation: { type: 'grand-final-reset-required' },
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects double elimination until authoritative seeds are persisted', async () => {
|
||||||
|
const harness = createHarness();
|
||||||
|
const service = new CompetitionBootstrapService(harness.connectionService);
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.bootstrap(
|
||||||
|
matchSnapshot({
|
||||||
|
gameMode: 'double-elimination',
|
||||||
|
teamCount: 4,
|
||||||
|
gameCount: 3,
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
).rejects.toMatchObject({
|
||||||
|
code: 'INVALID_MATCH_TEAM_SNAPSHOT',
|
||||||
|
httpStatus: 422,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(harness.connectionService.createSession).not.toHaveBeenCalled();
|
||||||
|
expect(harness.competitionModel.findOneAndUpdate).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('gives a configured BO3 grand final three slots without changing the other stage rules', async () => {
|
||||||
|
const harness = createHarness();
|
||||||
|
const service = new CompetitionBootstrapService(harness.connectionService);
|
||||||
|
const match = matchSnapshot({
|
||||||
|
gameMode: 'double-elimination',
|
||||||
|
teamCount: 4,
|
||||||
|
gameCount: 5,
|
||||||
|
});
|
||||||
|
match.doubleElimination = {
|
||||||
|
teamCount: 4,
|
||||||
|
resetFinalEnabled: true,
|
||||||
|
grandFinalGameCount: 3,
|
||||||
|
seeds: [1, 2, 3, 4].map((teamIndex) => ({
|
||||||
|
seedNumber: teamIndex,
|
||||||
|
teamIndex,
|
||||||
|
})),
|
||||||
|
};
|
||||||
|
|
||||||
|
await service.bootstrap(match);
|
||||||
|
|
||||||
|
const { format, seriesGraph } = harness.insertedPayloads[0];
|
||||||
|
expect(format).toMatchObject({
|
||||||
|
rules: {
|
||||||
|
upper: { maxGames: 5, winsRequired: 3 },
|
||||||
|
lower: { maxGames: 1, winsRequired: 1 },
|
||||||
|
grandFinal: { maxGames: 3, winsRequired: 2 },
|
||||||
|
resetFinal: { maxGames: 1, winsRequired: 1 },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
expect(
|
||||||
|
seriesGraph.find(({ code }) => code === 'GF')?.gameSlots,
|
||||||
|
).toHaveLength(3);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects incomplete and duplicate team assignments before opening a transaction', async () => {
|
||||||
|
const cases: Array<[string, (match: CompetitionBootstrapMatch) => void]> = [
|
||||||
|
[
|
||||||
|
'the Match lifecycle is still recruiting',
|
||||||
|
(match) => {
|
||||||
|
match.status = 'recruiting';
|
||||||
|
},
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'an active participant is not assigned',
|
||||||
|
(match) => {
|
||||||
|
match.teams[1].members = [];
|
||||||
|
},
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'the same team index is repeated',
|
||||||
|
(match) => {
|
||||||
|
match.teams[1].teamIndex = match.teams[0].teamIndex;
|
||||||
|
},
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'one member is assigned to multiple teams',
|
||||||
|
(match) => {
|
||||||
|
match.teams[1].members[0].userId = match.teams[0].members[0].userId;
|
||||||
|
},
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'a team member has no participant snapshot',
|
||||||
|
(match) => {
|
||||||
|
match.teams[1].members[0].userId = new Types.ObjectId();
|
||||||
|
},
|
||||||
|
],
|
||||||
|
];
|
||||||
|
|
||||||
|
for (const [label, mutate] of cases) {
|
||||||
|
const harness = createHarness();
|
||||||
|
const service = new CompetitionBootstrapService(
|
||||||
|
harness.connectionService,
|
||||||
|
);
|
||||||
|
const match = matchSnapshot({ gameMode: 'pair', teamCount: 2 });
|
||||||
|
mutate(match);
|
||||||
|
|
||||||
|
await expect(service.bootstrap(match)).rejects.toMatchObject({
|
||||||
|
name: 'CompetitionBootstrapError',
|
||||||
|
code: 'INVALID_MATCH_TEAM_SNAPSHOT',
|
||||||
|
httpStatus: 422,
|
||||||
|
});
|
||||||
|
expect(harness.connectionService.createSession).not.toHaveBeenCalled();
|
||||||
|
expect(harness.competitionModel.findOneAndUpdate).not.toHaveBeenCalled();
|
||||||
|
expect(label).toBeTruthy();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects bracket mode live but explicitly maps it for legacy migration', async () => {
|
||||||
|
const liveHarness = createHarness();
|
||||||
|
const liveService = new CompetitionBootstrapService(
|
||||||
|
liveHarness.connectionService,
|
||||||
|
);
|
||||||
|
const match = matchSnapshot({ gameMode: 'bracket', teamCount: 2 });
|
||||||
|
|
||||||
|
await expect(liveService.bootstrap(match)).rejects.toEqual(
|
||||||
|
expect.objectContaining<Partial<CompetitionBootstrapError>>({
|
||||||
|
code: 'UNSUPPORTED_LIVE_MATCH_MODE',
|
||||||
|
httpStatus: 422,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
const migrationHarness = createHarness();
|
||||||
|
const migrationService = new CompetitionBootstrapService(
|
||||||
|
migrationHarness.connectionService,
|
||||||
|
);
|
||||||
|
await migrationService.bootstrap(match, { source: 'legacy-migration' });
|
||||||
|
|
||||||
|
expect(migrationHarness.insertedPayloads[0].format.type).toBe(
|
||||||
|
'paired-series',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('upserts once and links only an unlinked or already-linked Match in one transaction', async () => {
|
||||||
|
const harness = createHarness();
|
||||||
|
const service = new CompetitionBootstrapService(harness.connectionService);
|
||||||
|
|
||||||
|
const competition = await service.bootstrap(
|
||||||
|
matchSnapshot({ gameMode: 'pair', teamCount: 2 }),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(harness.competitionModel.findOneAndUpdate).toHaveBeenCalledWith(
|
||||||
|
{ matchId: MATCH_ID },
|
||||||
|
{ $setOnInsert: harness.insertedPayloads[0] },
|
||||||
|
expect.objectContaining({
|
||||||
|
upsert: true,
|
||||||
|
returnDocument: 'after',
|
||||||
|
setDefaultsOnInsert: true,
|
||||||
|
session: harness.sessions[0],
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
expect(harness.matchModel.updateOne).toHaveBeenCalledWith(
|
||||||
|
{
|
||||||
|
_id: MATCH_ID,
|
||||||
|
status: 'team-built',
|
||||||
|
teamBuiltAt: new Date('2026-07-12T00:05:00.000Z'),
|
||||||
|
$or: [
|
||||||
|
{ competitionId: { $exists: false } },
|
||||||
|
{ competitionId: null },
|
||||||
|
{ competitionId: competition._id },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{ $set: { competitionId: competition._id } },
|
||||||
|
{ session: harness.sessions[0] },
|
||||||
|
);
|
||||||
|
expect(harness.sessions[0].commitTransaction).toHaveBeenCalledTimes(1);
|
||||||
|
expect(harness.sessions[0].abortTransaction).not.toHaveBeenCalled();
|
||||||
|
expect(harness.sessions[0].endSession).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('reuses an existing Competition without replacing its immutable snapshot', async () => {
|
||||||
|
const existingId = new Types.ObjectId('64b000000000000000000099');
|
||||||
|
const existing = {
|
||||||
|
_id: existingId,
|
||||||
|
matchId: MATCH_ID,
|
||||||
|
teams: [{ name: 'Original immutable team snapshot' }],
|
||||||
|
revision: 4,
|
||||||
|
};
|
||||||
|
const harness = createHarness({ existingCompetition: existing });
|
||||||
|
const service = new CompetitionBootstrapService(harness.connectionService);
|
||||||
|
|
||||||
|
const result = await service.bootstrap(
|
||||||
|
matchSnapshot({ gameMode: 'pair', teamCount: 2 }),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(result).toBe(existing);
|
||||||
|
expect(harness.competitionModel.findOneAndUpdate.mock.calls[0][1]).toEqual({
|
||||||
|
$setOnInsert: harness.insertedPayloads[0],
|
||||||
|
});
|
||||||
|
expect(harness.matchModel.updateOne.mock.calls[0][1]).toEqual({
|
||||||
|
$set: { competitionId: existingId },
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('retries a duplicate-key bootstrap race and safely converges on the winner', async () => {
|
||||||
|
const duplicateKey = Object.assign(new Error('duplicate key'), {
|
||||||
|
code: 11000,
|
||||||
|
});
|
||||||
|
const winner = {
|
||||||
|
_id: new Types.ObjectId('64b000000000000000000098'),
|
||||||
|
matchId: MATCH_ID,
|
||||||
|
revision: 0,
|
||||||
|
};
|
||||||
|
const harness = createHarness({
|
||||||
|
competitionResults: [duplicateKey, winner],
|
||||||
|
sessionCount: 2,
|
||||||
|
});
|
||||||
|
const service = new CompetitionBootstrapService(harness.connectionService);
|
||||||
|
|
||||||
|
const result = await service.bootstrap(
|
||||||
|
matchSnapshot({ gameMode: 'pair', teamCount: 2 }),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(result).toBe(winner);
|
||||||
|
expect(harness.connectionService.createSession).toHaveBeenCalledTimes(2);
|
||||||
|
expect(harness.sessions[0].abortTransaction).toHaveBeenCalledTimes(1);
|
||||||
|
expect(harness.sessions[0].commitTransaction).not.toHaveBeenCalled();
|
||||||
|
expect(harness.sessions[0].endSession).toHaveBeenCalledTimes(1);
|
||||||
|
expect(harness.sessions[1].commitTransaction).toHaveBeenCalledTimes(1);
|
||||||
|
expect(harness.matchModel.updateOne).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('aborts when the Match is already linked to a different Competition', async () => {
|
||||||
|
const harness = createHarness({ matchUpdateResult: { matchedCount: 0 } });
|
||||||
|
const service = new CompetitionBootstrapService(harness.connectionService);
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.bootstrap(matchSnapshot({ gameMode: 'pair', teamCount: 2 })),
|
||||||
|
).rejects.toMatchObject({
|
||||||
|
code: 'MATCH_COMPETITION_LINK_CONFLICT',
|
||||||
|
httpStatus: 409,
|
||||||
|
});
|
||||||
|
expect(harness.sessions[0].abortTransaction).toHaveBeenCalledTimes(1);
|
||||||
|
expect(harness.sessions[0].commitTransaction).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
const MATCH_ID = new Types.ObjectId('64b000000000000000000001');
|
||||||
|
const COMMUNITY_ID = new Types.ObjectId('64b000000000000000000002');
|
||||||
|
const USER_IDS = Array.from(
|
||||||
|
{ length: 8 },
|
||||||
|
(_, index) =>
|
||||||
|
new Types.ObjectId(
|
||||||
|
`64b0000000000000000001${String(index + 1).padStart(2, '0')}`,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
function matchSnapshot(params: {
|
||||||
|
gameMode: CompetitionBootstrapMatch['gameMode'];
|
||||||
|
teamCount: number;
|
||||||
|
gameCount?: number;
|
||||||
|
roundRobinMaxRounds?: number;
|
||||||
|
}): CompetitionBootstrapMatch {
|
||||||
|
const participants = USER_IDS.slice(0, params.teamCount).map(
|
||||||
|
(userId, index) => ({
|
||||||
|
userId,
|
||||||
|
gameName: `Player ${index + 1}`,
|
||||||
|
tagLine: 'KR1',
|
||||||
|
profileIconId: 101 + index,
|
||||||
|
preferredPositions: [],
|
||||||
|
joinedAt: new Date('2026-07-12T00:00:00.000Z'),
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
return {
|
||||||
|
_id: MATCH_ID,
|
||||||
|
communityId: COMMUNITY_ID,
|
||||||
|
status: 'team-built',
|
||||||
|
teamBuiltAt: new Date('2026-07-12T00:05:00.000Z'),
|
||||||
|
gameCount: params.gameCount ?? 3,
|
||||||
|
gameMode: params.gameMode,
|
||||||
|
...(params.roundRobinMaxRounds === undefined
|
||||||
|
? {}
|
||||||
|
: { roundRobinMaxRounds: params.roundRobinMaxRounds }),
|
||||||
|
participants,
|
||||||
|
teams: participants.map((participant, index) => ({
|
||||||
|
teamIndex: index + 1,
|
||||||
|
name: `Team ${index + 1}`,
|
||||||
|
captainUserId: participant.userId,
|
||||||
|
members: [
|
||||||
|
{
|
||||||
|
userId: participant.userId,
|
||||||
|
assignedPosition: 'TOP',
|
||||||
|
cost: 10 + index,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
})),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
interface InsertPayload {
|
||||||
|
_id: Types.ObjectId;
|
||||||
|
teams: Array<{
|
||||||
|
teamId: Types.ObjectId;
|
||||||
|
legacyTeamIndex: number;
|
||||||
|
seedNumber: number;
|
||||||
|
}>;
|
||||||
|
seriesGraph: SeriesDefinition[];
|
||||||
|
[key: string]: any;
|
||||||
|
}
|
||||||
|
|
||||||
|
function createHarness(
|
||||||
|
options: {
|
||||||
|
existingCompetition?: Record<string, unknown>;
|
||||||
|
competitionResults?: Array<Record<string, unknown> | Error>;
|
||||||
|
matchUpdateResult?: { matchedCount: number };
|
||||||
|
sessionCount?: number;
|
||||||
|
} = {},
|
||||||
|
) {
|
||||||
|
const sessions = Array.from(
|
||||||
|
{ length: options.sessionCount ?? 1 },
|
||||||
|
createSession,
|
||||||
|
);
|
||||||
|
const insertedPayloads: InsertPayload[] = [];
|
||||||
|
let competitionCall = 0;
|
||||||
|
const competitionModel = {
|
||||||
|
findOneAndUpdate: jest.fn(
|
||||||
|
(_filter: unknown, update: { $setOnInsert: InsertPayload }) => {
|
||||||
|
insertedPayloads.push(update.$setOnInsert);
|
||||||
|
const selected = options.competitionResults?.[competitionCall++];
|
||||||
|
if (selected instanceof Error) return rejectedQuery(selected);
|
||||||
|
return queryResult(
|
||||||
|
selected ?? options.existingCompetition ?? update.$setOnInsert,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
};
|
||||||
|
const matchModel = {
|
||||||
|
updateOne: jest
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValue(options.matchUpdateResult ?? { matchedCount: 1 }),
|
||||||
|
};
|
||||||
|
const models: Record<string, unknown> = {
|
||||||
|
competition: competitionModel,
|
||||||
|
match: matchModel,
|
||||||
|
};
|
||||||
|
let sessionIndex = 0;
|
||||||
|
const connectionService = {
|
||||||
|
createSession: jest.fn(() => Promise.resolve(sessions[sessionIndex++])),
|
||||||
|
getModel: jest.fn((name: string) => Promise.resolve(models[name])),
|
||||||
|
} as unknown as jest.Mocked<ConnectionService>;
|
||||||
|
|
||||||
|
return {
|
||||||
|
sessions,
|
||||||
|
insertedPayloads,
|
||||||
|
competitionModel,
|
||||||
|
matchModel,
|
||||||
|
connectionService,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function createSession() {
|
||||||
|
return {
|
||||||
|
startTransaction: jest.fn(),
|
||||||
|
commitTransaction: jest.fn().mockResolvedValue(undefined),
|
||||||
|
abortTransaction: jest.fn().mockResolvedValue(undefined),
|
||||||
|
endSession: jest.fn().mockResolvedValue(undefined),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function queryResult<T>(value: T) {
|
||||||
|
return { exec: jest.fn().mockResolvedValue(value) };
|
||||||
|
}
|
||||||
|
|
||||||
|
function rejectedQuery(error: Error) {
|
||||||
|
return { exec: jest.fn().mockRejectedValue(error) };
|
||||||
|
}
|
||||||
@@ -0,0 +1,646 @@
|
|||||||
|
import { createHash } from 'node:crypto';
|
||||||
|
import { Injectable } from '@nestjs/common';
|
||||||
|
import mongoose, { Types } from 'mongoose';
|
||||||
|
import { ConnectionService } from '../global/database/connection.service';
|
||||||
|
import type {
|
||||||
|
MatchGameMode,
|
||||||
|
MatchParticipant,
|
||||||
|
MatchStatus,
|
||||||
|
MatchTeam,
|
||||||
|
} from '../global/database/schema';
|
||||||
|
import type {
|
||||||
|
CompetitionDocument,
|
||||||
|
CompetitionTeamSnapshot,
|
||||||
|
} from './competition.schema';
|
||||||
|
import {
|
||||||
|
generateSeriesGraph,
|
||||||
|
type CompetitionGraphFormat,
|
||||||
|
type CompetitionGraphTeam,
|
||||||
|
type SeriesDefinition,
|
||||||
|
} from './domain/series-graph';
|
||||||
|
import {
|
||||||
|
projectCompetition,
|
||||||
|
type CompetitionProjection,
|
||||||
|
} from './domain/competition-projector';
|
||||||
|
|
||||||
|
const COMPETITION_SCHEMA_VERSION = 1;
|
||||||
|
const COMPETITION_PROJECTOR_VERSION = 1;
|
||||||
|
const BOOTSTRAP_TRANSACTION_ATTEMPTS = 3;
|
||||||
|
|
||||||
|
export interface CompetitionBootstrapMatch {
|
||||||
|
_id: Types.ObjectId;
|
||||||
|
communityId: Types.ObjectId;
|
||||||
|
competitionId?: Types.ObjectId;
|
||||||
|
status: MatchStatus;
|
||||||
|
teamBuiltAt: Date;
|
||||||
|
gameCount: number;
|
||||||
|
gameMode: MatchGameMode;
|
||||||
|
roundRobinMaxRounds?: number;
|
||||||
|
participants: MatchParticipant[];
|
||||||
|
teams: MatchTeam[];
|
||||||
|
doubleElimination?: {
|
||||||
|
teamCount: 4 | 8;
|
||||||
|
resetFinalEnabled: boolean;
|
||||||
|
grandFinalGameCount?: 1 | 3 | 5;
|
||||||
|
seeds: Array<{ seedNumber: number; teamIndex: number }>;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface CompetitionBootstrapOptions {
|
||||||
|
/** `bracket` is accepted only by the explicit legacy migration path. */
|
||||||
|
source?: 'live' | 'legacy-migration';
|
||||||
|
}
|
||||||
|
|
||||||
|
export type CompetitionBootstrapErrorCode =
|
||||||
|
| 'INVALID_MATCH_TEAM_SNAPSHOT'
|
||||||
|
| 'INVALID_MATCH_FORMAT'
|
||||||
|
| 'UNSUPPORTED_LIVE_MATCH_MODE'
|
||||||
|
| 'COMPETITION_TRANSACTION_UNAVAILABLE'
|
||||||
|
| 'COMPETITION_BOOTSTRAP_FAILED'
|
||||||
|
| 'COMPETITION_BOOTSTRAP_RACE'
|
||||||
|
| 'MATCH_COMPETITION_LINK_CONFLICT';
|
||||||
|
|
||||||
|
export class CompetitionBootstrapError extends Error {
|
||||||
|
constructor(
|
||||||
|
public readonly code: CompetitionBootstrapErrorCode,
|
||||||
|
message: string,
|
||||||
|
public readonly httpStatus: 409 | 422 | 500,
|
||||||
|
public readonly details?: Readonly<Record<string, unknown>>,
|
||||||
|
) {
|
||||||
|
super(message);
|
||||||
|
this.name = 'CompetitionBootstrapError';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
interface CompetitionInsertPayload {
|
||||||
|
_id: Types.ObjectId;
|
||||||
|
matchId: Types.ObjectId;
|
||||||
|
communityId: Types.ObjectId;
|
||||||
|
schemaVersion: number;
|
||||||
|
projectorVersion: number;
|
||||||
|
revision: number;
|
||||||
|
phase: CompetitionProjection['phase'];
|
||||||
|
teams: CompetitionTeamSnapshot[];
|
||||||
|
format: CompetitionGraphFormat;
|
||||||
|
seriesGraph: SeriesDefinition[];
|
||||||
|
projection: CompetitionProjection;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Freezes the recruiting Match into the one-to-one Competition aggregate.
|
||||||
|
* Retries only repeat deterministic upserts, so duplicate creators and unknown
|
||||||
|
* commit outcomes converge without replacing an existing immutable snapshot.
|
||||||
|
*/
|
||||||
|
@Injectable()
|
||||||
|
export class CompetitionBootstrapService {
|
||||||
|
constructor(private readonly connectionService: ConnectionService) {}
|
||||||
|
|
||||||
|
public async bootstrap(
|
||||||
|
match: CompetitionBootstrapMatch,
|
||||||
|
options: CompetitionBootstrapOptions = {},
|
||||||
|
): Promise<CompetitionDocument> {
|
||||||
|
const payload = buildCompetitionInsertPayload(
|
||||||
|
match,
|
||||||
|
options.source ?? 'live',
|
||||||
|
);
|
||||||
|
const [CompetitionModel, MatchModel] = await Promise.all([
|
||||||
|
this.connectionService.getModel('competition'),
|
||||||
|
this.connectionService.getModel('match'),
|
||||||
|
]);
|
||||||
|
|
||||||
|
let lastRetryableError: unknown;
|
||||||
|
for (
|
||||||
|
let attempt = 1;
|
||||||
|
attempt <= BOOTSTRAP_TRANSACTION_ATTEMPTS;
|
||||||
|
attempt += 1
|
||||||
|
) {
|
||||||
|
const session = await this.connectionService.createSession();
|
||||||
|
if (!session) {
|
||||||
|
throw new CompetitionBootstrapError(
|
||||||
|
'COMPETITION_TRANSACTION_UNAVAILABLE',
|
||||||
|
'A MongoDB transaction is required to bootstrap a Competition.',
|
||||||
|
500,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
session.startTransaction();
|
||||||
|
const competition = await CompetitionModel.findOneAndUpdate(
|
||||||
|
{ matchId: match._id },
|
||||||
|
{ $setOnInsert: payload },
|
||||||
|
{
|
||||||
|
upsert: true,
|
||||||
|
returnDocument: 'after',
|
||||||
|
setDefaultsOnInsert: true,
|
||||||
|
session,
|
||||||
|
},
|
||||||
|
).exec();
|
||||||
|
if (!competition) {
|
||||||
|
throw new CompetitionBootstrapError(
|
||||||
|
'COMPETITION_BOOTSTRAP_FAILED',
|
||||||
|
'Competition upsert returned no document.',
|
||||||
|
500,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const linkResult = await MatchModel.updateOne(
|
||||||
|
{
|
||||||
|
_id: match._id,
|
||||||
|
status: match.status,
|
||||||
|
teamBuiltAt: match.teamBuiltAt,
|
||||||
|
$or: [
|
||||||
|
{ competitionId: { $exists: false } },
|
||||||
|
{ competitionId: null },
|
||||||
|
{ competitionId: competition._id },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{ $set: { competitionId: competition._id } },
|
||||||
|
{ session },
|
||||||
|
);
|
||||||
|
if (linkResult.matchedCount !== 1) {
|
||||||
|
throw new CompetitionBootstrapError(
|
||||||
|
'MATCH_COMPETITION_LINK_CONFLICT',
|
||||||
|
'Match is missing or linked to a different Competition.',
|
||||||
|
409,
|
||||||
|
{ matchId: match._id.toString() },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
await session.commitTransaction();
|
||||||
|
return competition;
|
||||||
|
} catch (error) {
|
||||||
|
await session.abortTransaction().catch(() => undefined);
|
||||||
|
if (
|
||||||
|
attempt < BOOTSTRAP_TRANSACTION_ATTEMPTS &&
|
||||||
|
isRetryableBootstrapError(error)
|
||||||
|
) {
|
||||||
|
lastRetryableError = error;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (isRetryableBootstrapError(error)) {
|
||||||
|
throw new CompetitionBootstrapError(
|
||||||
|
'COMPETITION_BOOTSTRAP_RACE',
|
||||||
|
'Competition bootstrap did not converge after concurrent writes.',
|
||||||
|
409,
|
||||||
|
{ matchId: match._id.toString() },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
throw error;
|
||||||
|
} finally {
|
||||||
|
await session.endSession().catch(() => undefined);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new CompetitionBootstrapError(
|
||||||
|
'COMPETITION_BOOTSTRAP_RACE',
|
||||||
|
'Competition bootstrap retry budget was exhausted.',
|
||||||
|
409,
|
||||||
|
{
|
||||||
|
matchId: match._id.toString(),
|
||||||
|
cause:
|
||||||
|
lastRetryableError instanceof Error
|
||||||
|
? lastRetryableError.message
|
||||||
|
: String(lastRetryableError),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildCompetitionInsertPayload(
|
||||||
|
match: CompetitionBootstrapMatch,
|
||||||
|
source: NonNullable<CompetitionBootstrapOptions['source']>,
|
||||||
|
): CompetitionInsertPayload {
|
||||||
|
assertObjectId(match._id, 'Match ID');
|
||||||
|
assertObjectId(match.communityId, 'Community ID');
|
||||||
|
if (match.status === 'recruiting' || !(match.teamBuiltAt instanceof Date)) {
|
||||||
|
throw new CompetitionBootstrapError(
|
||||||
|
'INVALID_MATCH_TEAM_SNAPSHOT',
|
||||||
|
'Competition bootstrap requires a finalized team-built Match lifecycle.',
|
||||||
|
422,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
assertPositiveInteger(match.gameCount, 'Match game count');
|
||||||
|
|
||||||
|
const competitionId = stableObjectId(match._id, 'competition');
|
||||||
|
const teams = snapshotTeams(match, competitionId);
|
||||||
|
const graphTeams = teams.map(
|
||||||
|
({ teamId, displayOrder, seedNumber }): CompetitionGraphTeam => ({
|
||||||
|
teamId: teamId.toString(),
|
||||||
|
displayOrder,
|
||||||
|
seedNumber,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
const format = mapMatchFormat(match, teams, source);
|
||||||
|
|
||||||
|
let seriesGraph: SeriesDefinition[];
|
||||||
|
let projection: CompetitionProjection;
|
||||||
|
try {
|
||||||
|
seriesGraph = generateSeriesGraph({
|
||||||
|
competitionId: competitionId.toString(),
|
||||||
|
teams: graphTeams,
|
||||||
|
format,
|
||||||
|
});
|
||||||
|
projection = projectCompetition({
|
||||||
|
competitionId: competitionId.toString(),
|
||||||
|
revision: 0,
|
||||||
|
projectorVersion: COMPETITION_PROJECTOR_VERSION,
|
||||||
|
teams: graphTeams,
|
||||||
|
format,
|
||||||
|
seriesGraph,
|
||||||
|
facts: [],
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
throw new CompetitionBootstrapError(
|
||||||
|
'INVALID_MATCH_FORMAT',
|
||||||
|
error instanceof Error
|
||||||
|
? error.message
|
||||||
|
: 'The Match cannot produce a valid Competition graph.',
|
||||||
|
422,
|
||||||
|
{
|
||||||
|
matchId: match._id.toString(),
|
||||||
|
domainCode: readErrorCode(error),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
_id: competitionId,
|
||||||
|
matchId: match._id,
|
||||||
|
communityId: match.communityId,
|
||||||
|
schemaVersion: COMPETITION_SCHEMA_VERSION,
|
||||||
|
projectorVersion: COMPETITION_PROJECTOR_VERSION,
|
||||||
|
revision: 0,
|
||||||
|
phase: projection.phase,
|
||||||
|
teams,
|
||||||
|
format,
|
||||||
|
seriesGraph,
|
||||||
|
projection,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function snapshotTeams(
|
||||||
|
match: CompetitionBootstrapMatch,
|
||||||
|
competitionId: Types.ObjectId,
|
||||||
|
): CompetitionTeamSnapshot[] {
|
||||||
|
if (!Array.isArray(match.teams) || match.teams.length < 2) {
|
||||||
|
throw invalidTeamSnapshot(
|
||||||
|
'A Competition requires at least two built teams.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (!Array.isArray(match.participants)) {
|
||||||
|
throw invalidTeamSnapshot('Match participants are missing.');
|
||||||
|
}
|
||||||
|
|
||||||
|
const participantById = new Map<string, MatchParticipant>();
|
||||||
|
for (const participant of match.participants) {
|
||||||
|
const userId = objectIdString(participant?.userId);
|
||||||
|
if (!userId || participantById.has(userId)) {
|
||||||
|
throw invalidTeamSnapshot(
|
||||||
|
'Match participants must have unique ObjectId user identities.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
participantById.set(userId, participant);
|
||||||
|
}
|
||||||
|
|
||||||
|
const orderedTeams = [...match.teams].sort(
|
||||||
|
(left, right) => left.teamIndex - right.teamIndex,
|
||||||
|
);
|
||||||
|
const teamIndexes = new Set<number>();
|
||||||
|
const assignedUserIds = new Set<string>();
|
||||||
|
const memberCounts = new Set<number>();
|
||||||
|
const snapshots: CompetitionTeamSnapshot[] = [];
|
||||||
|
|
||||||
|
for (const [displayIndex, team] of orderedTeams.entries()) {
|
||||||
|
if (
|
||||||
|
!Number.isInteger(team.teamIndex) ||
|
||||||
|
team.teamIndex < 1 ||
|
||||||
|
teamIndexes.has(team.teamIndex)
|
||||||
|
) {
|
||||||
|
throw invalidTeamSnapshot(
|
||||||
|
'Built teams must have unique positive integer team indexes.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
teamIndexes.add(team.teamIndex);
|
||||||
|
if (typeof team.name !== 'string' || team.name.trim().length === 0) {
|
||||||
|
throw invalidTeamSnapshot('Every built team needs a non-empty name.');
|
||||||
|
}
|
||||||
|
if (!Array.isArray(team.members) || team.members.length === 0) {
|
||||||
|
throw invalidTeamSnapshot('Every built team needs at least one member.');
|
||||||
|
}
|
||||||
|
memberCounts.add(team.members.length);
|
||||||
|
|
||||||
|
const memberSnapshots = [...team.members]
|
||||||
|
.sort(compareTeamMembers)
|
||||||
|
.map((member) => {
|
||||||
|
const userId = objectIdString(member.userId);
|
||||||
|
const participant = userId ? participantById.get(userId) : undefined;
|
||||||
|
if (
|
||||||
|
!userId ||
|
||||||
|
!participant ||
|
||||||
|
participant.excluded === true ||
|
||||||
|
assignedUserIds.has(userId)
|
||||||
|
) {
|
||||||
|
throw invalidTeamSnapshot(
|
||||||
|
'Every non-excluded participant must be assigned to exactly one team.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
assignedUserIds.add(userId);
|
||||||
|
|
||||||
|
const gameName = nonEmptyString(participant.gameName);
|
||||||
|
const tagLine = nonEmptyString(participant.tagLine);
|
||||||
|
return {
|
||||||
|
userId: member.userId,
|
||||||
|
displayName: gameName
|
||||||
|
? tagLine
|
||||||
|
? `${gameName}#${tagLine}`
|
||||||
|
: gameName
|
||||||
|
: userId,
|
||||||
|
...(gameName ? { gameName } : {}),
|
||||||
|
...(tagLine ? { tagLine } : {}),
|
||||||
|
...(participant.profileIconId === undefined
|
||||||
|
? {}
|
||||||
|
: { profileIconId: participant.profileIconId }),
|
||||||
|
assignedPosition: member.assignedPosition,
|
||||||
|
...(member.cost === undefined ? {} : { cost: member.cost }),
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
if (team.captainUserId) {
|
||||||
|
const captainUserId = team.captainUserId.toString();
|
||||||
|
if (
|
||||||
|
!memberSnapshots.some(
|
||||||
|
({ userId }) => userId.toString() === captainUserId,
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
throw invalidTeamSnapshot('A team captain must belong to that team.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
snapshots.push({
|
||||||
|
teamId: stableObjectId(
|
||||||
|
competitionId,
|
||||||
|
'team',
|
||||||
|
`legacy-team-index:${team.teamIndex}`,
|
||||||
|
),
|
||||||
|
legacyTeamIndex: team.teamIndex,
|
||||||
|
displayOrder: displayIndex + 1,
|
||||||
|
seedNumber: displayIndex + 1,
|
||||||
|
name: team.name.trim(),
|
||||||
|
...(team.captainUserId ? { captainUserId: team.captainUserId } : {}),
|
||||||
|
members: memberSnapshots,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (memberCounts.size !== 1) {
|
||||||
|
throw invalidTeamSnapshot(
|
||||||
|
'All built teams must have the same member count.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const activeParticipantIds = [...participantById]
|
||||||
|
.filter(([, participant]) => participant.excluded !== true)
|
||||||
|
.map(([userId]) => userId);
|
||||||
|
if (
|
||||||
|
activeParticipantIds.length !== assignedUserIds.size ||
|
||||||
|
activeParticipantIds.some((userId) => !assignedUserIds.has(userId))
|
||||||
|
) {
|
||||||
|
throw invalidTeamSnapshot(
|
||||||
|
'Every non-excluded participant must be assigned to exactly one team.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
applySeeds(match, snapshots);
|
||||||
|
return snapshots;
|
||||||
|
}
|
||||||
|
|
||||||
|
function applySeeds(
|
||||||
|
match: CompetitionBootstrapMatch,
|
||||||
|
teams: CompetitionTeamSnapshot[],
|
||||||
|
): void {
|
||||||
|
if (match.gameMode !== 'double-elimination') return;
|
||||||
|
const configuredSeeds = match.doubleElimination?.seeds ?? [];
|
||||||
|
if (configuredSeeds.length === 0) {
|
||||||
|
throw invalidTeamSnapshot(
|
||||||
|
'Double-elimination seeds must be finalized before Competition bootstrap.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (configuredSeeds.length !== teams.length) {
|
||||||
|
throw invalidTeamSnapshot(
|
||||||
|
'Double-elimination seeds must include every built team exactly once.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const validTeamIndexes = new Set(
|
||||||
|
teams.map(({ legacyTeamIndex }) => legacyTeamIndex as number),
|
||||||
|
);
|
||||||
|
const seedByTeamIndex = new Map<number, number>();
|
||||||
|
const seedNumbers = new Set<number>();
|
||||||
|
for (const seed of configuredSeeds) {
|
||||||
|
if (
|
||||||
|
!Number.isInteger(seed.seedNumber) ||
|
||||||
|
seed.seedNumber < 1 ||
|
||||||
|
seed.seedNumber > teams.length ||
|
||||||
|
seedNumbers.has(seed.seedNumber) ||
|
||||||
|
!validTeamIndexes.has(seed.teamIndex) ||
|
||||||
|
seedByTeamIndex.has(seed.teamIndex)
|
||||||
|
) {
|
||||||
|
throw invalidTeamSnapshot(
|
||||||
|
'Double-elimination seeds must be unique and contiguous.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
seedNumbers.add(seed.seedNumber);
|
||||||
|
seedByTeamIndex.set(seed.teamIndex, seed.seedNumber);
|
||||||
|
}
|
||||||
|
for (const team of teams) {
|
||||||
|
team.seedNumber = seedByTeamIndex.get(team.legacyTeamIndex as number)!;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function mapMatchFormat(
|
||||||
|
match: CompetitionBootstrapMatch,
|
||||||
|
teams: CompetitionTeamSnapshot[],
|
||||||
|
source: NonNullable<CompetitionBootstrapOptions['source']>,
|
||||||
|
): CompetitionGraphFormat {
|
||||||
|
switch (match.gameMode) {
|
||||||
|
case 'pair':
|
||||||
|
return fixedGameFormat('paired-series', match.gameCount);
|
||||||
|
case 'bracket':
|
||||||
|
if (source !== 'legacy-migration') {
|
||||||
|
throw new CompetitionBootstrapError(
|
||||||
|
'UNSUPPORTED_LIVE_MATCH_MODE',
|
||||||
|
'Legacy bracket mode can only be bootstrapped by migration.',
|
||||||
|
422,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return fixedGameFormat('paired-series', match.gameCount);
|
||||||
|
case 'round-robin':
|
||||||
|
if (
|
||||||
|
match.roundRobinMaxRounds !== undefined &&
|
||||||
|
(!Number.isInteger(match.roundRobinMaxRounds) ||
|
||||||
|
match.roundRobinMaxRounds < 1)
|
||||||
|
) {
|
||||||
|
throw new CompetitionBootstrapError(
|
||||||
|
'INVALID_MATCH_FORMAT',
|
||||||
|
'Round-robin max rounds must be a positive integer.',
|
||||||
|
422,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
type: 'round-robin',
|
||||||
|
rule: fixedGamesRule(match.gameCount),
|
||||||
|
...(match.roundRobinMaxRounds === undefined
|
||||||
|
? {}
|
||||||
|
: { maxRounds: match.roundRobinMaxRounds }),
|
||||||
|
tieBreakers: ['series-wins', 'game-diff', 'head-to-head'],
|
||||||
|
};
|
||||||
|
case 'double-elimination': {
|
||||||
|
if (teams.length !== 4 && teams.length !== 8) {
|
||||||
|
throw new CompetitionBootstrapError(
|
||||||
|
'INVALID_MATCH_FORMAT',
|
||||||
|
'Double elimination supports only four or eight teams.',
|
||||||
|
422,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
match.doubleElimination?.teamCount !== undefined &&
|
||||||
|
match.doubleElimination.teamCount !== teams.length
|
||||||
|
) {
|
||||||
|
throw new CompetitionBootstrapError(
|
||||||
|
'INVALID_MATCH_FORMAT',
|
||||||
|
'Double-elimination team count does not match the built teams.',
|
||||||
|
422,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const bestOfOne = {
|
||||||
|
type: 'first-to' as const,
|
||||||
|
winsRequired: 1,
|
||||||
|
maxGames: 1,
|
||||||
|
};
|
||||||
|
const grandFinalGameCount =
|
||||||
|
match.doubleElimination?.grandFinalGameCount ?? 1;
|
||||||
|
return {
|
||||||
|
type: 'double-elimination',
|
||||||
|
teamCount: teams.length,
|
||||||
|
resetFinalEnabled: match.doubleElimination?.resetFinalEnabled ?? false,
|
||||||
|
rules: {
|
||||||
|
upper: {
|
||||||
|
type: 'first-to',
|
||||||
|
winsRequired: Math.floor(match.gameCount / 2) + 1,
|
||||||
|
maxGames: match.gameCount,
|
||||||
|
},
|
||||||
|
lower: { ...bestOfOne },
|
||||||
|
grandFinal: {
|
||||||
|
type: 'first-to',
|
||||||
|
winsRequired: Math.floor(grandFinalGameCount / 2) + 1,
|
||||||
|
maxGames: grandFinalGameCount,
|
||||||
|
},
|
||||||
|
resetFinal: { ...bestOfOne },
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function fixedGameFormat(
|
||||||
|
type: 'paired-series',
|
||||||
|
gameCount: number,
|
||||||
|
): Extract<CompetitionGraphFormat, { type: 'paired-series' }> {
|
||||||
|
return { type, rule: fixedGamesRule(gameCount) };
|
||||||
|
}
|
||||||
|
|
||||||
|
function fixedGamesRule(gameCount: number) {
|
||||||
|
return {
|
||||||
|
type: 'fixed-games' as const,
|
||||||
|
gameCount,
|
||||||
|
drawPolicy: 'allow' as const,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function stableObjectId(
|
||||||
|
namespaceId: Types.ObjectId,
|
||||||
|
entityKind: string,
|
||||||
|
...logicalKey: string[]
|
||||||
|
): Types.ObjectId {
|
||||||
|
const hex = createHash('sha256')
|
||||||
|
.update(JSON.stringify([namespaceId.toString(), entityKind, ...logicalKey]))
|
||||||
|
.digest('hex')
|
||||||
|
.slice(0, 24);
|
||||||
|
return new Types.ObjectId(hex);
|
||||||
|
}
|
||||||
|
|
||||||
|
function compareTeamMembers(
|
||||||
|
left: MatchTeam['members'][number],
|
||||||
|
right: MatchTeam['members'][number],
|
||||||
|
): number {
|
||||||
|
const positionOrder = ['TOP', 'JGL', 'MID', 'ADC', 'SUP'];
|
||||||
|
return (
|
||||||
|
positionOrder.indexOf(left.assignedPosition) -
|
||||||
|
positionOrder.indexOf(right.assignedPosition) ||
|
||||||
|
left.userId.toString().localeCompare(right.userId.toString())
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function invalidTeamSnapshot(message: string): CompetitionBootstrapError {
|
||||||
|
return new CompetitionBootstrapError(
|
||||||
|
'INVALID_MATCH_TEAM_SNAPSHOT',
|
||||||
|
message,
|
||||||
|
422,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function assertPositiveInteger(value: number, label: string): void {
|
||||||
|
if (!Number.isInteger(value) || value < 1) {
|
||||||
|
throw new CompetitionBootstrapError(
|
||||||
|
'INVALID_MATCH_FORMAT',
|
||||||
|
`${label} must be a positive integer.`,
|
||||||
|
422,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function assertObjectId(
|
||||||
|
value: unknown,
|
||||||
|
label: string,
|
||||||
|
): asserts value is Types.ObjectId {
|
||||||
|
if (!(value instanceof mongoose.Types.ObjectId)) {
|
||||||
|
throw invalidTeamSnapshot(`${label} must be a MongoDB ObjectId.`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function objectIdString(value: unknown): string | undefined {
|
||||||
|
return value instanceof mongoose.Types.ObjectId
|
||||||
|
? value.toString()
|
||||||
|
: undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
function nonEmptyString(value: unknown): string | undefined {
|
||||||
|
if (typeof value !== 'string') return undefined;
|
||||||
|
const trimmed = value.trim();
|
||||||
|
return trimmed.length > 0 ? trimmed : undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
function readErrorCode(error: unknown): string | undefined {
|
||||||
|
if (
|
||||||
|
typeof error === 'object' &&
|
||||||
|
error !== null &&
|
||||||
|
'code' in error &&
|
||||||
|
typeof error.code === 'string'
|
||||||
|
) {
|
||||||
|
return error.code;
|
||||||
|
}
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
function isRetryableBootstrapError(error: unknown): boolean {
|
||||||
|
const candidate = error as {
|
||||||
|
code?: number;
|
||||||
|
codeName?: string;
|
||||||
|
hasErrorLabel?: (label: string) => boolean;
|
||||||
|
};
|
||||||
|
return Boolean(
|
||||||
|
candidate?.code === 11000 ||
|
||||||
|
candidate?.code === 112 ||
|
||||||
|
candidate?.codeName === 'WriteConflict' ||
|
||||||
|
candidate?.hasErrorLabel?.('TransientTransactionError') ||
|
||||||
|
candidate?.hasErrorLabel?.('UnknownTransactionCommitResult'),
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,765 @@
|
|||||||
|
import { Types } from 'mongoose';
|
||||||
|
import { ConnectionService } from '../global/database/connection.service';
|
||||||
|
import { CompetitionCommandService } from './competition-command.service';
|
||||||
|
import { projectCompetition } from './domain/competition-projector';
|
||||||
|
|
||||||
|
jest.mock('./domain/competition-projector', () => ({
|
||||||
|
projectCompetition: jest.fn(),
|
||||||
|
}));
|
||||||
|
|
||||||
|
const mockedProjectCompetition = jest.mocked(projectCompetition);
|
||||||
|
|
||||||
|
describe('CompetitionCommandService', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
jest.useFakeTimers().setSystemTime(new Date('2026-07-12T10:00:00.000Z'));
|
||||||
|
mockedProjectCompetition.mockReset();
|
||||||
|
mockedProjectCompetition.mockReturnValue(PROJECTION as never);
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
jest.useRealTimers();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects a stale expected revision and aborts without writing', async () => {
|
||||||
|
const harness = createHarness({ competitionRevision: 8 });
|
||||||
|
const service = new CompetitionCommandService(harness.connectionService);
|
||||||
|
|
||||||
|
await expect(service.acceptGame(acceptGameCommand())).rejects.toMatchObject(
|
||||||
|
{
|
||||||
|
code: 'STALE_COMPETITION_REVISION',
|
||||||
|
httpStatus: 412,
|
||||||
|
details: { expectedRevision: 7, actualRevision: 8 },
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(harness.factModel.insertMany).not.toHaveBeenCalled();
|
||||||
|
expect(harness.competitionModel.findOneAndUpdate).not.toHaveBeenCalled();
|
||||||
|
expect(harness.outboxModel.insertMany).not.toHaveBeenCalled();
|
||||||
|
expect(harness.session.abortTransaction).toHaveBeenCalledTimes(1);
|
||||||
|
expect(harness.session.commitTransaction).not.toHaveBeenCalled();
|
||||||
|
expect(harness.session.endSession).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('uses the expected revision in the persistence CAS and aborts a lost race', async () => {
|
||||||
|
const harness = createHarness({ casResult: null });
|
||||||
|
const service = new CompetitionCommandService(harness.connectionService);
|
||||||
|
|
||||||
|
await expect(service.acceptGame(acceptGameCommand())).rejects.toMatchObject(
|
||||||
|
{
|
||||||
|
code: 'STALE_COMPETITION_REVISION',
|
||||||
|
httpStatus: 412,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
const [casFilter, casUpdate, casOptions] = harness.competitionModel
|
||||||
|
.findOneAndUpdate.mock.calls[0] as unknown as [
|
||||||
|
Record<string, unknown>,
|
||||||
|
{ $inc: Record<string, unknown>; $set: Record<string, unknown> },
|
||||||
|
Record<string, unknown>,
|
||||||
|
];
|
||||||
|
expect(casFilter).toEqual({ _id: COMPETITION_ID, revision: 7 });
|
||||||
|
expect(casUpdate).toMatchObject({
|
||||||
|
$inc: { revision: 1 },
|
||||||
|
$set: { projection: PROJECTION },
|
||||||
|
});
|
||||||
|
expect(casOptions).toMatchObject({
|
||||||
|
returnDocument: 'after',
|
||||||
|
session: harness.session,
|
||||||
|
});
|
||||||
|
expect(harness.session.abortTransaction).toHaveBeenCalledTimes(1);
|
||||||
|
expect(harness.session.commitTransaction).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('replays an exact Idempotency-Key request without appending a second fact', async () => {
|
||||||
|
const harness = createHarness();
|
||||||
|
let storedReceipt: Record<string, unknown> | null = null;
|
||||||
|
harness.outboxModel.findOne.mockImplementation(() =>
|
||||||
|
queryResult(storedReceipt),
|
||||||
|
);
|
||||||
|
harness.outboxModel.insertMany.mockImplementation(
|
||||||
|
([receipt]: Array<Record<string, unknown>>) => {
|
||||||
|
storedReceipt = receipt;
|
||||||
|
return Promise.resolve([receipt]);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
const service = new CompetitionCommandService(harness.connectionService);
|
||||||
|
const command = acceptGameCommand();
|
||||||
|
|
||||||
|
const first = await service.acceptGame(command);
|
||||||
|
const replay = await service.acceptGame(command);
|
||||||
|
|
||||||
|
expect(first).toMatchObject({ revision: 8, replayed: false });
|
||||||
|
expect(replay).toMatchObject({
|
||||||
|
commandId: first.commandId,
|
||||||
|
revision: 8,
|
||||||
|
replayed: true,
|
||||||
|
});
|
||||||
|
expect(replay.competition).toEqual(first.competition);
|
||||||
|
expect(harness.factModel.insertMany).toHaveBeenCalledTimes(1);
|
||||||
|
expect(harness.competitionModel.findOneAndUpdate).toHaveBeenCalledTimes(1);
|
||||||
|
expect(harness.outboxModel.insertMany).toHaveBeenCalledTimes(1);
|
||||||
|
expect(mockedProjectCompetition).toHaveBeenCalledTimes(1);
|
||||||
|
expect(harness.session.commitTransaction).toHaveBeenCalledTimes(2);
|
||||||
|
expect(harness.session.abortTransaction).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('replays a concurrently committed identical command after a duplicate-key race', async () => {
|
||||||
|
const harness = createHarness();
|
||||||
|
let committedReceipt: Record<string, unknown> | null = null;
|
||||||
|
harness.outboxModel.findOne.mockImplementation(() =>
|
||||||
|
queryResult(committedReceipt),
|
||||||
|
);
|
||||||
|
harness.factModel.insertMany.mockImplementationOnce(
|
||||||
|
async ([fact]: Array<Record<string, unknown>>) => {
|
||||||
|
committedReceipt = {
|
||||||
|
competitionId: COMPETITION_ID,
|
||||||
|
idempotencyKey: fact.idempotencyKey,
|
||||||
|
requestHash: fact.requestHash,
|
||||||
|
commandId: fact.commandId,
|
||||||
|
revision: fact.revision,
|
||||||
|
payload: {
|
||||||
|
projection: PROJECTION,
|
||||||
|
phase: PROJECTION.phase,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
throw Object.assign(new Error('duplicate command fact'), {
|
||||||
|
code: 11_000,
|
||||||
|
});
|
||||||
|
},
|
||||||
|
);
|
||||||
|
const service = new CompetitionCommandService(harness.connectionService);
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.acceptGame(acceptGameCommand()),
|
||||||
|
).resolves.toMatchObject({
|
||||||
|
revision: 8,
|
||||||
|
replayed: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(harness.connectionService.createSession).toHaveBeenCalledTimes(2);
|
||||||
|
expect(harness.factModel.insertMany).toHaveBeenCalledTimes(1);
|
||||||
|
expect(harness.competitionModel.findOneAndUpdate).not.toHaveBeenCalled();
|
||||||
|
expect(harness.outboxModel.insertMany).not.toHaveBeenCalled();
|
||||||
|
expect(harness.session.abortTransaction).toHaveBeenCalledTimes(1);
|
||||||
|
expect(harness.session.commitTransaction).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects the same Idempotency-Key when its payload hash differs', async () => {
|
||||||
|
const harness = createHarness();
|
||||||
|
harness.outboxModel.findOne.mockReturnValue(
|
||||||
|
queryResult({
|
||||||
|
idempotencyKey: 'riot:KR_7000000001',
|
||||||
|
requestHash: 'a-different-payload-hash',
|
||||||
|
commandId: 'cmpcmd_original',
|
||||||
|
revision: 8,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
const service = new CompetitionCommandService(harness.connectionService);
|
||||||
|
|
||||||
|
await expect(service.acceptGame(acceptGameCommand())).rejects.toMatchObject(
|
||||||
|
{
|
||||||
|
code: 'IDEMPOTENCY_KEY_CONFLICT',
|
||||||
|
httpStatus: 409,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(harness.competitionModel.findById).not.toHaveBeenCalled();
|
||||||
|
expect(harness.factModel.insertMany).not.toHaveBeenCalled();
|
||||||
|
expect(harness.session.abortTransaction).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('atomically accepts a code-backed game, projects it, and enqueues an event', async () => {
|
||||||
|
const harness = createHarness();
|
||||||
|
const service = new CompetitionCommandService(harness.connectionService);
|
||||||
|
const command = {
|
||||||
|
...acceptGameCommand(),
|
||||||
|
tournamentCode: {
|
||||||
|
tournamentCodeId: TOURNAMENT_CODE_ID,
|
||||||
|
riotMatchId: 'KR_7000000001',
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
const result = await service.acceptGame(command);
|
||||||
|
|
||||||
|
expect(result).toMatchObject({ revision: 8, replayed: false });
|
||||||
|
expect(harness.session.startTransaction).toHaveBeenCalledTimes(1);
|
||||||
|
const [insertedFacts, factOptions] = harness.factModel.insertMany.mock
|
||||||
|
.calls[0] as unknown as [
|
||||||
|
Array<Record<string, unknown>>,
|
||||||
|
Record<string, unknown>,
|
||||||
|
];
|
||||||
|
expect(insertedFacts).toHaveLength(1);
|
||||||
|
expect(insertedFacts[0]).toMatchObject({
|
||||||
|
type: 'game-accepted',
|
||||||
|
revision: 8,
|
||||||
|
ordinalWithinRevision: 1,
|
||||||
|
gameId: GAME_ID,
|
||||||
|
seriesId: SERIES_ID,
|
||||||
|
gameSlotId: GAME_SLOT_ID,
|
||||||
|
startedAt: new Date('2026-07-12T09:30:00.000Z'),
|
||||||
|
durationSeconds: 1_800,
|
||||||
|
participants: [
|
||||||
|
{
|
||||||
|
userId: USER_ID.toHexString(),
|
||||||
|
teamId: TEAM_A_ID.toHexString(),
|
||||||
|
side: 'blue',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
expect(factOptions).toEqual({ session: harness.session });
|
||||||
|
|
||||||
|
const projectionInput = mockedProjectCompetition.mock.calls[0][0];
|
||||||
|
const projectedFact = projectionInput.facts[0] as Record<string, unknown>;
|
||||||
|
const projectedMapping = projectedFact.mapping as Record<string, unknown>;
|
||||||
|
expect(projectionInput.competitionId).toBe(COMPETITION_ID.toHexString());
|
||||||
|
expect(projectionInput.revision).toBe(8);
|
||||||
|
expect(typeof projectedFact.id).toBe('string');
|
||||||
|
expect(projectedFact).toMatchObject({
|
||||||
|
type: 'game-accepted',
|
||||||
|
seriesId: SERIES_ID.toHexString(),
|
||||||
|
});
|
||||||
|
expect(projectedMapping.winnerTeamId).toBe(TEAM_A_ID.toHexString());
|
||||||
|
|
||||||
|
const [assignmentFilter, assignmentUpdate, assignmentOptions] = harness
|
||||||
|
.assignmentModel.updateOne.mock.calls[0] as unknown as [
|
||||||
|
Record<string, unknown>,
|
||||||
|
{ $set: Record<string, unknown> },
|
||||||
|
Record<string, unknown>,
|
||||||
|
];
|
||||||
|
expect(assignmentFilter).toMatchObject({
|
||||||
|
competitionId: COMPETITION_ID,
|
||||||
|
gameSlotId: GAME_SLOT_ID,
|
||||||
|
tournamentCodeId: TOURNAMENT_CODE_ID,
|
||||||
|
state: 'reserved',
|
||||||
|
});
|
||||||
|
expect(assignmentUpdate.$set.state).toBe('used');
|
||||||
|
expect(assignmentOptions).toEqual({ session: harness.session });
|
||||||
|
|
||||||
|
const [codeFilter, codeUpdate, codeOptions] = harness.tournamentCodeModel
|
||||||
|
.updateOne.mock.calls[0] as unknown as [
|
||||||
|
Record<string, unknown>,
|
||||||
|
{ $set: Record<string, unknown> },
|
||||||
|
Record<string, unknown>,
|
||||||
|
];
|
||||||
|
expect(codeFilter).toEqual({
|
||||||
|
_id: TOURNAMENT_CODE_ID,
|
||||||
|
state: 'reserved',
|
||||||
|
});
|
||||||
|
expect(codeUpdate.$set.state).toBe('used');
|
||||||
|
expect(codeOptions).toEqual({ session: harness.session });
|
||||||
|
|
||||||
|
const [outboxRecords, outboxOptions] = harness.outboxModel.insertMany.mock
|
||||||
|
.calls[0] as unknown as [
|
||||||
|
Array<Record<string, unknown>>,
|
||||||
|
Record<string, unknown>,
|
||||||
|
];
|
||||||
|
expect(outboxRecords).toHaveLength(1);
|
||||||
|
expect(outboxRecords[0]).toMatchObject({
|
||||||
|
revision: 8,
|
||||||
|
type: 'competition.projection-updated',
|
||||||
|
state: 'pending',
|
||||||
|
payload: { projection: PROJECTION },
|
||||||
|
});
|
||||||
|
expect(outboxOptions).toEqual({ session: harness.session });
|
||||||
|
expect(harness.session.commitTransaction).toHaveBeenCalledTimes(1);
|
||||||
|
expect(harness.session.abortTransaction).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('appends an administrative adjudication through the same command runner', async () => {
|
||||||
|
const harness = createHarness();
|
||||||
|
const service = new CompetitionCommandService(harness.connectionService);
|
||||||
|
|
||||||
|
const result = await service.adjudicateSeries({
|
||||||
|
competitionId: COMPETITION_ID,
|
||||||
|
expectedRevision: 7,
|
||||||
|
idempotencyKey: 'admin:series:walkover:1',
|
||||||
|
actor: { type: 'user', userId: USER_ID },
|
||||||
|
seriesId: SERIES_ID,
|
||||||
|
decision: { type: 'walkover', winnerTeamId: TEAM_B_ID },
|
||||||
|
reason: 'Opponent did not appear before the deadline.',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(result).toMatchObject({ revision: 8, replayed: false });
|
||||||
|
expect(harness.factModel.insertMany).toHaveBeenCalledWith(
|
||||||
|
[
|
||||||
|
expect.objectContaining({
|
||||||
|
type: 'series-adjudicated',
|
||||||
|
seriesId: SERIES_ID,
|
||||||
|
decision: { type: 'walkover', winnerTeamId: TEAM_B_ID },
|
||||||
|
reason: 'Opponent did not appear before the deadline.',
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
{ session: harness.session },
|
||||||
|
);
|
||||||
|
expect(harness.assignmentModel.updateOne).not.toHaveBeenCalled();
|
||||||
|
expect(harness.session.commitTransaction).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('previews a strict or cascade reversal against the requested revision', async () => {
|
||||||
|
const reversal = reversalFixture();
|
||||||
|
const harness = createHarness({
|
||||||
|
competition: reversal.competition,
|
||||||
|
facts: reversal.facts,
|
||||||
|
assignments: reversal.assignments,
|
||||||
|
});
|
||||||
|
const service = new CompetitionCommandService(harness.connectionService);
|
||||||
|
|
||||||
|
const preview = await service.previewSeriesReversal({
|
||||||
|
competitionId: COMPETITION_ID,
|
||||||
|
expectedRevision: 7,
|
||||||
|
seriesId: reversal.parentSeriesId,
|
||||||
|
mode: 'cascade',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(preview).toMatchObject({
|
||||||
|
sourceRevision: 7,
|
||||||
|
impactHash: expect.stringMatching(/^[a-f0-9]{64}$/),
|
||||||
|
impact: {
|
||||||
|
seriesIds: [
|
||||||
|
reversal.parentSeriesId.toHexString(),
|
||||||
|
reversal.childSeriesId.toHexString(),
|
||||||
|
],
|
||||||
|
factIds: [
|
||||||
|
reversal.parentFactId.toHexString(),
|
||||||
|
reversal.childFactId.toHexString(),
|
||||||
|
],
|
||||||
|
releasesReservedCodes: 1,
|
||||||
|
voidsUsedCodes: 1,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects a reversal preview at a stale revision', async () => {
|
||||||
|
const reversal = reversalFixture();
|
||||||
|
const harness = createHarness({ competition: reversal.competition });
|
||||||
|
const service = new CompetitionCommandService(harness.connectionService);
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.previewSeriesReversal({
|
||||||
|
competitionId: COMPETITION_ID,
|
||||||
|
expectedRevision: 6,
|
||||||
|
seriesId: reversal.parentSeriesId,
|
||||||
|
mode: 'strict',
|
||||||
|
}),
|
||||||
|
).rejects.toMatchObject({
|
||||||
|
code: 'STALE_COMPETITION_REVISION',
|
||||||
|
httpStatus: 412,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('hash-confirms and atomically appends cascade reversal facts', async () => {
|
||||||
|
const reversal = reversalFixture();
|
||||||
|
const harness = createHarness({
|
||||||
|
competition: reversal.competition,
|
||||||
|
facts: reversal.facts,
|
||||||
|
assignments: reversal.assignments,
|
||||||
|
});
|
||||||
|
const service = new CompetitionCommandService(harness.connectionService);
|
||||||
|
const preview = await service.previewSeriesReversal({
|
||||||
|
competitionId: COMPETITION_ID,
|
||||||
|
expectedRevision: 7,
|
||||||
|
seriesId: reversal.parentSeriesId,
|
||||||
|
mode: 'cascade',
|
||||||
|
});
|
||||||
|
|
||||||
|
const result = await service.reverseSeries({
|
||||||
|
competitionId: COMPETITION_ID,
|
||||||
|
expectedRevision: 7,
|
||||||
|
idempotencyKey: 'admin:reverse:1',
|
||||||
|
actor: { type: 'user', userId: USER_ID },
|
||||||
|
seriesId: reversal.parentSeriesId,
|
||||||
|
mode: 'cascade',
|
||||||
|
reason: 'Wrong result ingestion',
|
||||||
|
impactHash: preview.impactHash,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(result).toMatchObject({ revision: 8, replayed: false });
|
||||||
|
expect(harness.factModel.insertMany).toHaveBeenCalledWith(
|
||||||
|
[
|
||||||
|
expect.objectContaining({
|
||||||
|
_id: expect.any(Types.ObjectId),
|
||||||
|
type: 'game-voided',
|
||||||
|
gameAcceptedFactId: reversal.parentFactId,
|
||||||
|
revision: 8,
|
||||||
|
ordinalWithinRevision: 1,
|
||||||
|
reason: 'Wrong result ingestion',
|
||||||
|
}),
|
||||||
|
expect.objectContaining({
|
||||||
|
_id: expect.any(Types.ObjectId),
|
||||||
|
type: 'game-voided',
|
||||||
|
gameAcceptedFactId: reversal.childFactId,
|
||||||
|
revision: 8,
|
||||||
|
ordinalWithinRevision: 2,
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
{ session: harness.session },
|
||||||
|
);
|
||||||
|
expect(harness.assignmentModel.updateMany).toHaveBeenCalledWith(
|
||||||
|
expect.objectContaining({
|
||||||
|
competitionId: COMPETITION_ID,
|
||||||
|
gameSlotId: {
|
||||||
|
$in: expect.arrayContaining([
|
||||||
|
reversal.parentGameSlotId,
|
||||||
|
reversal.childGameSlotId,
|
||||||
|
]),
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
expect.any(Array),
|
||||||
|
{ session: harness.session },
|
||||||
|
);
|
||||||
|
expect(harness.tournamentCodeModel.updateMany).toHaveBeenCalled();
|
||||||
|
expect(harness.matchModel.updateOne).toHaveBeenCalledWith(
|
||||||
|
{ _id: reversal.competition.matchId },
|
||||||
|
{
|
||||||
|
$pull: {
|
||||||
|
tournamentCodeIds: {
|
||||||
|
$in: [reversal.parentCodeId, reversal.childCodeId],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{ session: harness.session },
|
||||||
|
);
|
||||||
|
const [, codeReversalPipeline] = harness.tournamentCodeModel.updateMany.mock
|
||||||
|
.calls[0] as unknown as [
|
||||||
|
Record<string, unknown>,
|
||||||
|
Array<Record<string, any>>,
|
||||||
|
];
|
||||||
|
expect(codeReversalPipeline[0].$set).toMatchObject({
|
||||||
|
state: {
|
||||||
|
$cond: [{ $eq: ['$state', 'reserved'] }, 'released', 'voided'],
|
||||||
|
},
|
||||||
|
matchId: {
|
||||||
|
$cond: [{ $eq: ['$state', 'reserved'] }, '$$REMOVE', '$matchId'],
|
||||||
|
},
|
||||||
|
gameNumber: {
|
||||||
|
$cond: [{ $eq: ['$state', 'reserved'] }, '$$REMOVE', '$gameNumber'],
|
||||||
|
},
|
||||||
|
bracketMatchId: {
|
||||||
|
$cond: [{ $eq: ['$state', 'reserved'] }, '$$REMOVE', '$bracketMatchId'],
|
||||||
|
},
|
||||||
|
reservedAt: {
|
||||||
|
$cond: [{ $eq: ['$state', 'reserved'] }, '$$REMOVE', '$reservedAt'],
|
||||||
|
},
|
||||||
|
});
|
||||||
|
expect(harness.competitionModel.findOneAndUpdate).toHaveBeenCalledWith(
|
||||||
|
{ _id: COMPETITION_ID, revision: 7 },
|
||||||
|
expect.objectContaining({ $inc: { revision: 1 } }),
|
||||||
|
expect.objectContaining({ session: harness.session }),
|
||||||
|
);
|
||||||
|
expect(harness.outboxModel.insertMany).toHaveBeenCalledTimes(1);
|
||||||
|
expect(harness.session.commitTransaction).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('retries a cascade reversal after a transient transaction conflict', async () => {
|
||||||
|
const reversal = reversalFixture();
|
||||||
|
const harness = createHarness({
|
||||||
|
competition: reversal.competition,
|
||||||
|
facts: reversal.facts,
|
||||||
|
assignments: reversal.assignments,
|
||||||
|
});
|
||||||
|
harness.factModel.insertMany
|
||||||
|
.mockRejectedValueOnce(
|
||||||
|
Object.assign(new Error('write conflict'), {
|
||||||
|
code: 112,
|
||||||
|
codeName: 'WriteConflict',
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
.mockResolvedValueOnce([]);
|
||||||
|
const service = new CompetitionCommandService(harness.connectionService);
|
||||||
|
const preview = await service.previewSeriesReversal({
|
||||||
|
competitionId: COMPETITION_ID,
|
||||||
|
expectedRevision: 7,
|
||||||
|
seriesId: reversal.parentSeriesId,
|
||||||
|
mode: 'cascade',
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.reverseSeries({
|
||||||
|
competitionId: COMPETITION_ID,
|
||||||
|
expectedRevision: 7,
|
||||||
|
idempotencyKey: 'admin:reverse:transient-retry',
|
||||||
|
actor: { type: 'user', userId: USER_ID },
|
||||||
|
seriesId: reversal.parentSeriesId,
|
||||||
|
mode: 'cascade',
|
||||||
|
reason: 'Wrong result ingestion',
|
||||||
|
impactHash: preview.impactHash,
|
||||||
|
}),
|
||||||
|
).resolves.toMatchObject({ revision: 8, replayed: false });
|
||||||
|
|
||||||
|
expect(harness.connectionService.createSession).toHaveBeenCalledTimes(2);
|
||||||
|
expect(harness.factModel.insertMany).toHaveBeenCalledTimes(2);
|
||||||
|
expect(harness.session.abortTransaction).toHaveBeenCalledTimes(1);
|
||||||
|
expect(harness.session.commitTransaction).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
const COMPETITION_ID = new Types.ObjectId('64b000000000000000000001');
|
||||||
|
const SERIES_ID = new Types.ObjectId('64b000000000000000000002');
|
||||||
|
const GAME_SLOT_ID = new Types.ObjectId('64b000000000000000000003');
|
||||||
|
const GAME_ID = new Types.ObjectId('64b000000000000000000004');
|
||||||
|
const TEAM_A_ID = new Types.ObjectId('64b000000000000000000005');
|
||||||
|
const TEAM_B_ID = new Types.ObjectId('64b000000000000000000006');
|
||||||
|
const USER_ID = new Types.ObjectId('64b000000000000000000007');
|
||||||
|
const TOURNAMENT_CODE_ID = new Types.ObjectId('64b000000000000000000008');
|
||||||
|
|
||||||
|
const PROJECTION = {
|
||||||
|
sourceRevision: 8,
|
||||||
|
projectorVersion: 1,
|
||||||
|
phase: 'running',
|
||||||
|
formatType: 'paired-series',
|
||||||
|
series: [],
|
||||||
|
games: [],
|
||||||
|
gameSlots: [],
|
||||||
|
rounds: [],
|
||||||
|
connectors: [],
|
||||||
|
};
|
||||||
|
|
||||||
|
function acceptGameCommand() {
|
||||||
|
return {
|
||||||
|
competitionId: COMPETITION_ID,
|
||||||
|
expectedRevision: 7,
|
||||||
|
idempotencyKey: 'riot:KR_7000000001',
|
||||||
|
actor: { type: 'system' as const },
|
||||||
|
occurredAt: new Date('2026-07-12T09:59:00.000Z'),
|
||||||
|
gameId: GAME_ID,
|
||||||
|
seriesId: SERIES_ID,
|
||||||
|
gameSlotId: GAME_SLOT_ID,
|
||||||
|
ordinal: 1,
|
||||||
|
evidence: {
|
||||||
|
type: 'riot' as const,
|
||||||
|
riotMatchId: 'KR_7000000001',
|
||||||
|
payloadHash: 'sha256:riot-payload',
|
||||||
|
},
|
||||||
|
mapping: {
|
||||||
|
mappingVersion: 1,
|
||||||
|
confidence: 1,
|
||||||
|
blueTeamId: TEAM_A_ID,
|
||||||
|
redTeamId: TEAM_B_ID,
|
||||||
|
winnerTeamId: TEAM_A_ID,
|
||||||
|
participantAssignments: [],
|
||||||
|
},
|
||||||
|
startedAt: new Date('2026-07-12T09:30:00.000Z'),
|
||||||
|
durationSeconds: 1_800,
|
||||||
|
participants: [
|
||||||
|
{
|
||||||
|
userId: USER_ID.toHexString(),
|
||||||
|
teamId: TEAM_A_ID.toHexString(),
|
||||||
|
side: 'blue',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function createHarness(
|
||||||
|
options: {
|
||||||
|
competitionRevision?: number;
|
||||||
|
casResult?: Record<string, unknown> | null;
|
||||||
|
competition?: Record<string, unknown>;
|
||||||
|
facts?: Array<Record<string, unknown>>;
|
||||||
|
assignments?: Array<Record<string, unknown>>;
|
||||||
|
} = {},
|
||||||
|
) {
|
||||||
|
const session = {
|
||||||
|
startTransaction: jest.fn(),
|
||||||
|
commitTransaction: jest.fn().mockResolvedValue(undefined),
|
||||||
|
abortTransaction: jest.fn().mockResolvedValue(undefined),
|
||||||
|
endSession: jest.fn().mockResolvedValue(undefined),
|
||||||
|
};
|
||||||
|
const competition =
|
||||||
|
options.competition ??
|
||||||
|
competitionDocument(options.competitionRevision ?? 7);
|
||||||
|
const competitionModel = {
|
||||||
|
findById: jest.fn().mockReturnValue(queryResult(competition)),
|
||||||
|
findOneAndUpdate: jest
|
||||||
|
.fn()
|
||||||
|
.mockReturnValue(
|
||||||
|
queryResult(
|
||||||
|
options.casResult === undefined
|
||||||
|
? competitionDocument(8, PROJECTION)
|
||||||
|
: options.casResult,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
};
|
||||||
|
const factModel = {
|
||||||
|
find: jest.fn().mockReturnValue(queryResult(options.facts ?? [])),
|
||||||
|
insertMany: jest.fn().mockResolvedValue([]),
|
||||||
|
};
|
||||||
|
const outboxModel = {
|
||||||
|
findOne: jest.fn().mockReturnValue(queryResult(null)),
|
||||||
|
insertMany: jest.fn().mockResolvedValue([]),
|
||||||
|
};
|
||||||
|
const assignmentModel = {
|
||||||
|
find: jest.fn().mockReturnValue(queryResult(options.assignments ?? [])),
|
||||||
|
updateOne: jest.fn().mockResolvedValue({ modifiedCount: 1 }),
|
||||||
|
updateMany: jest.fn().mockResolvedValue({ modifiedCount: 2 }),
|
||||||
|
};
|
||||||
|
const tournamentCodeModel = {
|
||||||
|
updateOne: jest.fn().mockResolvedValue({ modifiedCount: 1 }),
|
||||||
|
updateMany: jest.fn().mockResolvedValue({ modifiedCount: 2 }),
|
||||||
|
};
|
||||||
|
const matchModel = {
|
||||||
|
updateOne: jest
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValue({ matchedCount: 1, modifiedCount: 1 }),
|
||||||
|
};
|
||||||
|
const models: Record<string, unknown> = {
|
||||||
|
competition: competitionModel,
|
||||||
|
competitionFact: factModel,
|
||||||
|
competitionOutbox: outboxModel,
|
||||||
|
tournamentCodeAssignment: assignmentModel,
|
||||||
|
tournamentCode: tournamentCodeModel,
|
||||||
|
match: matchModel,
|
||||||
|
};
|
||||||
|
const connectionService = {
|
||||||
|
createSession: jest.fn().mockResolvedValue(session),
|
||||||
|
getModel: jest.fn((name: string) => Promise.resolve(models[name])),
|
||||||
|
} as unknown as jest.Mocked<ConnectionService>;
|
||||||
|
|
||||||
|
return {
|
||||||
|
session,
|
||||||
|
competitionModel,
|
||||||
|
factModel,
|
||||||
|
outboxModel,
|
||||||
|
assignmentModel,
|
||||||
|
tournamentCodeModel,
|
||||||
|
matchModel,
|
||||||
|
connectionService,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function competitionDocument(revision: number, projection = PROJECTION) {
|
||||||
|
return {
|
||||||
|
_id: COMPETITION_ID,
|
||||||
|
matchId: new Types.ObjectId('64b000000000000000000010'),
|
||||||
|
communityId: new Types.ObjectId('64b000000000000000000011'),
|
||||||
|
schemaVersion: 1,
|
||||||
|
projectorVersion: 1,
|
||||||
|
revision,
|
||||||
|
phase: 'running',
|
||||||
|
teams: [
|
||||||
|
{ teamId: TEAM_A_ID, displayOrder: 1, seedNumber: 1 },
|
||||||
|
{ teamId: TEAM_B_ID, displayOrder: 2, seedNumber: 2 },
|
||||||
|
],
|
||||||
|
format: {
|
||||||
|
type: 'paired-series',
|
||||||
|
rule: { type: 'first-to', winsRequired: 2, maxGames: 3 },
|
||||||
|
},
|
||||||
|
seriesGraph: [],
|
||||||
|
projection,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function queryResult<T>(value: T) {
|
||||||
|
const query = {
|
||||||
|
session: jest.fn(),
|
||||||
|
sort: jest.fn(),
|
||||||
|
lean: jest.fn(),
|
||||||
|
exec: jest.fn().mockResolvedValue(value),
|
||||||
|
};
|
||||||
|
query.session.mockReturnValue(query);
|
||||||
|
query.sort.mockReturnValue(query);
|
||||||
|
query.lean.mockReturnValue(query);
|
||||||
|
return query;
|
||||||
|
}
|
||||||
|
|
||||||
|
function reversalFixture() {
|
||||||
|
const parentSeriesId = new Types.ObjectId('64b000000000000000000021');
|
||||||
|
const childSeriesId = new Types.ObjectId('64b000000000000000000022');
|
||||||
|
const parentFactId = new Types.ObjectId('64b000000000000000000023');
|
||||||
|
const childFactId = new Types.ObjectId('64b000000000000000000024');
|
||||||
|
const parentGameSlotId = new Types.ObjectId('64b000000000000000000025');
|
||||||
|
const childGameSlotId = new Types.ObjectId('64b000000000000000000026');
|
||||||
|
const parentCodeId = new Types.ObjectId('64b000000000000000000027');
|
||||||
|
const childCodeId = new Types.ObjectId('64b000000000000000000028');
|
||||||
|
const series = (
|
||||||
|
id: Types.ObjectId,
|
||||||
|
sourceA: Record<string, unknown>,
|
||||||
|
sourceB: Record<string, unknown>,
|
||||||
|
) => ({
|
||||||
|
id: id.toHexString(),
|
||||||
|
stage: { type: 'upper', displayOrder: 1 },
|
||||||
|
slots: [
|
||||||
|
{ position: 'A', source: sourceA },
|
||||||
|
{ position: 'B', source: sourceB },
|
||||||
|
],
|
||||||
|
rule: { type: 'first-to', winsRequired: 1, maxGames: 1 },
|
||||||
|
gameSlots: [],
|
||||||
|
});
|
||||||
|
const accepted = (
|
||||||
|
_id: Types.ObjectId,
|
||||||
|
seriesId: Types.ObjectId,
|
||||||
|
gameSlotId: Types.ObjectId,
|
||||||
|
) => ({
|
||||||
|
_id,
|
||||||
|
competitionId: COMPETITION_ID,
|
||||||
|
type: 'game-accepted',
|
||||||
|
revision: 1,
|
||||||
|
ordinalWithinRevision: 1,
|
||||||
|
commandId: `command-${_id.toHexString()}`,
|
||||||
|
idempotencyKey: `key-${_id.toHexString()}`,
|
||||||
|
requestHash: `hash-${_id.toHexString()}`,
|
||||||
|
schemaVersion: 1,
|
||||||
|
actor: { type: 'system' },
|
||||||
|
occurredAt: new Date('2026-07-12T00:00:00.000Z'),
|
||||||
|
recordedAt: new Date('2026-07-12T00:00:00.000Z'),
|
||||||
|
gameId: new Types.ObjectId(),
|
||||||
|
seriesId,
|
||||||
|
gameSlotId,
|
||||||
|
ordinal: 1,
|
||||||
|
evidence: { type: 'legacy', legacyReference: 'legacy' },
|
||||||
|
mapping: {
|
||||||
|
blueTeamId: TEAM_A_ID,
|
||||||
|
redTeamId: TEAM_B_ID,
|
||||||
|
winnerTeamId: TEAM_A_ID,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return {
|
||||||
|
parentSeriesId,
|
||||||
|
childSeriesId,
|
||||||
|
parentFactId,
|
||||||
|
childFactId,
|
||||||
|
parentGameSlotId,
|
||||||
|
childGameSlotId,
|
||||||
|
parentCodeId,
|
||||||
|
childCodeId,
|
||||||
|
competition: {
|
||||||
|
...competitionDocument(7),
|
||||||
|
seriesGraph: [
|
||||||
|
series(
|
||||||
|
parentSeriesId,
|
||||||
|
{ type: 'team', teamId: TEAM_A_ID.toHexString() },
|
||||||
|
{ type: 'team', teamId: TEAM_B_ID.toHexString() },
|
||||||
|
),
|
||||||
|
series(
|
||||||
|
childSeriesId,
|
||||||
|
{
|
||||||
|
type: 'series-outcome',
|
||||||
|
seriesId: parentSeriesId.toHexString(),
|
||||||
|
select: 'winner',
|
||||||
|
},
|
||||||
|
{ type: 'team', teamId: TEAM_B_ID.toHexString() },
|
||||||
|
),
|
||||||
|
],
|
||||||
|
},
|
||||||
|
facts: [
|
||||||
|
accepted(parentFactId, parentSeriesId, parentGameSlotId),
|
||||||
|
accepted(childFactId, childSeriesId, childGameSlotId),
|
||||||
|
],
|
||||||
|
assignments: [
|
||||||
|
{
|
||||||
|
competitionId: COMPETITION_ID,
|
||||||
|
seriesId: parentSeriesId,
|
||||||
|
gameSlotId: parentGameSlotId,
|
||||||
|
tournamentCodeId: parentCodeId,
|
||||||
|
state: 'used',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
competitionId: COMPETITION_ID,
|
||||||
|
seriesId: childSeriesId,
|
||||||
|
gameSlotId: childGameSlotId,
|
||||||
|
tournamentCodeId: childCodeId,
|
||||||
|
state: 'reserved',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
}
|
||||||
Loaded 100 of 635 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user