Compare commits
11
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4c263fb15e | ||
|
|
e623715ea5 | ||
|
|
928d68cf00 | ||
|
|
27ebed0954 | ||
|
|
b899cfdae1 | ||
|
|
09d70aaf2f | ||
|
|
f917120363 | ||
|
|
e850f0d9bb | ||
|
|
ee399da924 | ||
|
|
14626516ff | ||
|
|
e3da5d83b6 |
No files matched your search
@@ -1,18 +0,0 @@
|
||||
.git
|
||||
.gitignore
|
||||
|
||||
node_modules
|
||||
**/node_modules
|
||||
|
||||
dist
|
||||
**/dist
|
||||
coverage
|
||||
**/coverage
|
||||
|
||||
.env
|
||||
.env.*
|
||||
*.log
|
||||
|
||||
.DS_Store
|
||||
.vscode
|
||||
.idea
|
||||
+2
-13
@@ -1,5 +1,5 @@
|
||||
bin/
|
||||
/lib/
|
||||
lib/
|
||||
dist/
|
||||
node_modules/
|
||||
.pnpm-store/
|
||||
@@ -21,15 +21,4 @@ website/LICENSE
|
||||
|
||||
!.claude/settings.json
|
||||
|
||||
*.temp.MD
|
||||
|
||||
*.md
|
||||
!README.md
|
||||
!AGENTS.md
|
||||
!agents/**/*.md
|
||||
!skills/**/*.md
|
||||
/tmp/
|
||||
/user-game-history/
|
||||
/*.txt
|
||||
/*.png
|
||||
|
||||
*.temp.MD
|
||||
@@ -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 +0,0 @@
|
||||
77
|
||||
-49
@@ -1,49 +0,0 @@
|
||||
# syntax=docker/dockerfile:1.7
|
||||
|
||||
FROM node:24-bookworm-slim AS pnpm-base
|
||||
|
||||
ENV PNPM_HOME=/pnpm
|
||||
ENV PATH="${PNPM_HOME}:${PATH}"
|
||||
|
||||
RUN corepack enable
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
FROM pnpm-base AS deps
|
||||
|
||||
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
|
||||
COPY apps/api/package.json apps/api/package.json
|
||||
COPY apps/web/package.json apps/web/package.json
|
||||
|
||||
RUN pnpm install --frozen-lockfile --filter api... --filter lolympus-tournament-support
|
||||
|
||||
FROM deps AS build
|
||||
|
||||
COPY apps/api apps/api
|
||||
|
||||
RUN pnpm --filter api build
|
||||
|
||||
FROM pnpm-base AS prod-deps
|
||||
|
||||
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
|
||||
COPY apps/api/package.json apps/api/package.json
|
||||
COPY apps/web/package.json apps/web/package.json
|
||||
|
||||
RUN pnpm install --prod --frozen-lockfile --filter api... --filter lolympus-tournament-support
|
||||
|
||||
FROM gcr.io/distroless/nodejs24-debian13:nonroot AS runtime
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
# ENV NODE_ENV=prod
|
||||
|
||||
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/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=build --chown=nonroot:nonroot /app/apps/api/dist ./apps/api/dist
|
||||
COPY --chown=nonroot:nonroot apps/project.env ./project.env
|
||||
|
||||
EXPOSE 10712
|
||||
|
||||
CMD ["apps/api/dist/main.js"]
|
||||
@@ -1,480 +0,0 @@
|
||||
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,143 +0,0 @@
|
||||
# LOLYMPUS
|
||||
|
||||
LOLYMPUS는 리그 오브 레전드 커뮤니티의 여러 이벤트 중 내전(사용자 설정 게임)을 운영할 때 필요한 일정 관리, 참여자 모집, 팀 빌딩, 토너먼트 코드 배정, 경기 진행, 실시간 라이브 방송(추후 지원 예정), 결과 수집, 전적 확인을 한곳에서 처리하기 위한 웹 애플리케이션입니다.
|
||||
|
||||
<p align="center">
|
||||
<video
|
||||
src="https://git.dahyeon.us/dahyeon/lolympus-tournament-support/raw/branch/release/77/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/77/docs/screenshots/lolympus-demo.mp4">3초 간격 데모 영상 보기</a>
|
||||
</video>
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
<a href="https://git.dahyeon.us/dahyeon/lolympus-tournament-support/raw/branch/release/77/docs/screenshots/lolympus-demo.mp4">3초 간격 데모 영상 보기</a>
|
||||
</p>
|
||||
|
||||
## 배포 주소
|
||||
|
||||
| Environment | Version | URL |
|
||||
| ----------- | ------- | -------------------------------------- |
|
||||
| Production | v77 | <https://lolympus.dahyeon.us/> |
|
||||
| Staging | v77 | <https://890c50be.lolympus.pages.dev/> |
|
||||
|
||||
## 개요
|
||||
|
||||
내전 운영은 사람을 모으는 것에서 끝나지 않습니다. 참가자의 티어와 포지션을 확인하고, 팀장을 정하고, 팀을 나누고, 경기마다 토너먼트 코드를 전달하고, 끝난 뒤 결과와 전적까지 정리해야 합니다.
|
||||
|
||||
LOLYMPUS는 이 반복 작업을 줄이는 데 초점을 맞췄습니다. 운영자는 전체 진행 상황을 한눈에 보고, 참가자는 카카오톡 연동을 통해 쉽게 일정 확인/참가 신청하고 본인이 속한 팀과 다음 경기 정보를 빠르게 확인할 수 있습니다.
|
||||
|
||||
## 워크플로우
|
||||
|
||||
1. **내전 개설과 모집**
|
||||
내전 일정, 진행 방식, 정원, 공지사항을 등록하고 참가 신청 현황을 확인합니다.
|
||||
|
||||
2. **참가자 정보 확인**
|
||||
Riot 계정 기반으로 소환사명, 태그, 프로필 아이콘, 솔로랭크/자유랭크 티어, 선호 포지션을 보여줍니다.
|
||||
|
||||
3. **팀 빌딩과 경매**
|
||||
팀장을 기준으로 팀을 구성하거나, 경매 방식으로 참가자를 배정합니다. 현재 입찰가, 팀별 포인트, 낙찰 기록을 함께 관리합니다.
|
||||
|
||||
4. **팀별 진행 페이지**
|
||||
각 팀은 예정 경기, 상대 팀, 라인업, 토너먼트 코드를 한 화면에서 확인하고 복사할 수 있습니다.
|
||||
|
||||
5. **결과 수집과 통계**
|
||||
Riot Match-V5 데이터를 이용해 경기 결과를 수집하고, 소환사별 전적과 커뮤니티 리더보드를 제공합니다.
|
||||
|
||||
## 스크린샷
|
||||
|
||||
상단의 경매 화면은 LOLYMPUS가 단순 참가자 목록을 넘어서 실제 팀빌딩 운영까지 다루는 대표 화면입니다. 3초 간격 데모 영상은 README 렌더러가 video 태그를 지원하면 자동/반복 재생되고, 세부 화면은 아래 PNG 원본을 기준으로 볼 수 있습니다.
|
||||
|
||||
| 경매 팀빌딩 |
|
||||
| ----------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| <a href="docs/screenshots/lolympus-demo.mp4"><img src="docs/screenshots/lolympus-auction.png" alt="LOLYMPUS 경매 팀빌딩" width="840"></a> |
|
||||
|
||||
| 내전 목록 | 모집 상세 |
|
||||
| ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------- |
|
||||
| <img src="docs/screenshots/lolympus-match-list.png" alt="LOLYMPUS 내전 목록" width="420"> | <img src="docs/screenshots/lolympus-match-recruiting.png" alt="LOLYMPUS 모집 상세" width="420"> |
|
||||
|
||||
| 단판 경기 결과 | 개인 전적 |
|
||||
| ------------------------------------------------------------------------------------------------------ | --------------------------------------------------------------------------------------------- |
|
||||
| <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"> |
|
||||
|
||||
| 경기 상세 |
|
||||
| ------------------------------------------------------------------------------------------- |
|
||||
| <img src="docs/screenshots/lolympus-match-detail.png" alt="LOLYMPUS 경기 상세" width="840"> |
|
||||
|
||||
## 기능
|
||||
|
||||
- 내전 생성, 수정, 모집 상태 변경, 참가자 목록 확인
|
||||
- 카카오톡 명령어를 통한 일정 조회, 내전 참가, 취소, 계정 등록 등 기능 제공
|
||||
- Riot 계정 기반 참가자 프로필, 티어, 포지션 확인
|
||||
- 팀장 지정, 포지션 기반 팀 구성, 다팀 내전 지원
|
||||
- 팀장 경매 방식의 참가자 낙찰과 입찰 기록 관리
|
||||
- 경기별 토너먼트 코드 배정과 팀별 복사 UI
|
||||
- 팀별 경기 일정, 상대 팀, 라인업, 결과 확인
|
||||
- Riot Match-V5 기반 결과 수집, 개인 전적, 리더보드 제공
|
||||
- Dakao/NATS 기반 커뮤니티 명령 연동
|
||||
|
||||
## 기술 스택
|
||||
|
||||
- React
|
||||
- Vite
|
||||
- TypeScript
|
||||
- TanStack Query
|
||||
- NestJS
|
||||
- MongoDB
|
||||
- Redis/Garnet
|
||||
- NATS
|
||||
- Riot API
|
||||
- pnpm workspace
|
||||
- Kubernetes
|
||||
- ArgoCD
|
||||
|
||||
## 디렉터리 구조
|
||||
|
||||
```text
|
||||
apps/
|
||||
api/ NestJS API server
|
||||
web/ React + Vite client
|
||||
docs/
|
||||
screenshots/ README and project screenshots
|
||||
scripts/ deployment and maintenance scripts
|
||||
```
|
||||
|
||||
## 사전 요구사항
|
||||
|
||||
- Node.js 24 이상
|
||||
- pnpm 10.4.1 (`packageManager` 기준, `corepack enable`로 활성화 권장)
|
||||
- MongoDB 7.0, Redis 5.0 이상, NATS 실행 환경
|
||||
|
||||
## 실행 방법
|
||||
|
||||
```bash
|
||||
pnpm install
|
||||
pnpm start:api:dev
|
||||
pnpm start:web:dev
|
||||
```
|
||||
|
||||
웹 앱은 기본적으로 `apps/web/.env.development` 값을 사용합니다. API 환경값은 `apps/project.env`와 실행 환경의 시크릿 설정을 함께 확인합니다.
|
||||
|
||||
카카오톡 기반 명령어 기능은 Dakao(커스텀 카카오톡 게이트웨이) 연동이 필요합니다. Dakao가 실행 중이 아니거나 NATS를 통해 API 서버와 연결되어 있지 않으면 일정 조회, 내전 참가, 참가 취소, 계정 등록 같은 카카오톡 명령어는 사용할 수 없습니다.
|
||||
|
||||
## 커맨드
|
||||
|
||||
| Command | Description |
|
||||
| --------------------------------- | -------------------------------- |
|
||||
| `pnpm start:web:dev` | 웹 앱 개발 서버 실행 |
|
||||
| `pnpm start:api:dev` | API 서버 dev 환경 실행 |
|
||||
| `pnpm --filter api test` | 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).
|
||||
@@ -25,13 +25,6 @@
|
||||
|
||||
[Nest](https://github.com/nestjs/nest) framework TypeScript starter repository.
|
||||
|
||||
## Riot Background Refresh
|
||||
|
||||
Stale Riot accounts refresh automatically between KST 03:00 and 10:00.
|
||||
The scheduler picks active users whose
|
||||
`lastRefreshRequestedAt` is older than 6 hours, oldest first, and uses a
|
||||
background-only Riot token bucket capped at roughly 40% of the app rate limit.
|
||||
|
||||
## Project setup
|
||||
|
||||
```bash
|
||||
|
||||
+6
-15
@@ -8,14 +8,12 @@
|
||||
"scripts": {
|
||||
"build": "nest build",
|
||||
"format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
|
||||
"seed:dev": "ts-node src/seed.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:staging": "node -e \"process.env.NODE_ENV='staging'; require('./dist/main.js')\"",
|
||||
"start:prod": "node -e \"process.env.NODE_ENV='prod'; require('./dist/main.js')\"",
|
||||
"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:prod": "pm2 start npm --name lolympus-tournament-support --update-env -- run start:prod",
|
||||
"start:dev": "pwsh -Command \"[System.Environment]::SetEnvironmentVariable('NODE_ENV', 'dev'); \"./start.ps1\"\"",
|
||||
"start:test": "pwsh -Command \"[System.Environment]::SetEnvironmentVariable('NODE_ENV', 'test'); \"./start.ps1\"\"",
|
||||
"start:prod": "pwsh -Command \"[System.Environment]::SetEnvironmentVariable('NODE_ENV', 'prod'); \"./start.ps1\"\"",
|
||||
"pm2:dev": "pwsh -Command \"[System.Environment]::SetEnvironmentVariable('NODE_ENV', 'dev'); ./start.ps1 -UsePm2\"",
|
||||
"pm2:test": "pwsh -Command \"[System.Environment]::SetEnvironmentVariable('NODE_ENV', 'test'); ./start.ps1 -UsePm2\"",
|
||||
"pm2:prod": "pwsh -Command \"[System.Environment]::SetEnvironmentVariable('NODE_ENV', 'prod'); ./start.ps1 -UsePm2\"",
|
||||
"start:debug": "nest start --debug --watch",
|
||||
"lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
|
||||
"test": "jest",
|
||||
@@ -29,18 +27,11 @@
|
||||
"@nestjs/config": "^4.0.4",
|
||||
"@nestjs/core": "^11.0.1",
|
||||
"@nestjs/platform-express": "^11.0.1",
|
||||
"@nestjs/platform-socket.io": "^11.1.19",
|
||||
"@nestjs/swagger": "^11.2.7",
|
||||
"@nestjs/websockets": "^11.1.19",
|
||||
"class-transformer": "^0.5.1",
|
||||
"class-validator": "^0.15.1",
|
||||
"jose": "^6.2.2",
|
||||
"mongoose": "^9.4.1",
|
||||
"nats": "^2.29.3",
|
||||
"redis": "^5.12.1",
|
||||
"reflect-metadata": "^0.2.2",
|
||||
"rxjs": "^7.8.1",
|
||||
"socket.io": "^4.8.3",
|
||||
"temporal-polyfill": "^0.3.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import { Controller, Get } from '@nestjs/common';
|
||||
import { AllowPublicAccess } from './modules/auth/allow-public-access.decorator';
|
||||
import { AppService } from './app.service';
|
||||
|
||||
@Controller()
|
||||
@@ -7,7 +6,6 @@ export class AppController {
|
||||
constructor(private readonly appService: AppService) {}
|
||||
|
||||
@Get()
|
||||
@AllowPublicAccess()
|
||||
getHello(): string {
|
||||
return this.appService.getHello();
|
||||
}
|
||||
|
||||
@@ -2,20 +2,8 @@ import { Module } from '@nestjs/common';
|
||||
import { ConfigModule } from '@nestjs/config';
|
||||
import { AppController } from './app.controller';
|
||||
import { AppService } from './app.service';
|
||||
import { AuctionModule } from './modules/auction/auction.module';
|
||||
import { AuthModule } from './modules/auth/auth.module';
|
||||
import { CommunityModule } from './modules/community/community.module';
|
||||
import { CommunityStatsModule } from './modules/community-stats/community-stats.module';
|
||||
import { DakaoModule } from './modules/dakao/dakao.module';
|
||||
import { GlobalModule } from './modules/global/global.module';
|
||||
import { LegacyImportModule } from './modules/legacy-import/legacy-import.module';
|
||||
import { MatchHistoryModule } from './modules/match-history/match-history.module';
|
||||
import { MatchModule } from './modules/match/match.module';
|
||||
import { BackgroundRefreshModule } from './modules/riot-background-refresh/background-refresh.module';
|
||||
import { RiotModule } from './modules/riot/riot.module';
|
||||
import { TournamentCodeModule } from './modules/tournament-code/tournament-code.module';
|
||||
import { TournamentResultModule } from './modules/tournament-result/tournament-result.module';
|
||||
import { UserModule } from './modules/user/user.module';
|
||||
|
||||
@Module({
|
||||
imports: [
|
||||
@@ -24,19 +12,7 @@ import { UserModule } from './modules/user/user.module';
|
||||
envFilePath: ['../project.env', 'project.env'],
|
||||
}),
|
||||
GlobalModule,
|
||||
AuthModule,
|
||||
RiotModule,
|
||||
BackgroundRefreshModule,
|
||||
CommunityModule,
|
||||
CommunityStatsModule,
|
||||
MatchModule,
|
||||
MatchHistoryModule,
|
||||
LegacyImportModule,
|
||||
TournamentCodeModule,
|
||||
TournamentResultModule,
|
||||
AuctionModule,
|
||||
UserModule,
|
||||
DakaoModule,
|
||||
],
|
||||
controllers: [AppController],
|
||||
providers: [AppService],
|
||||
|
||||
@@ -1,67 +0,0 @@
|
||||
import {
|
||||
createCorsOrigin,
|
||||
isAllowedCorsOrigin,
|
||||
resolveWebOrigins,
|
||||
} from './cors-origin';
|
||||
|
||||
describe('CORS origin resolution', () => {
|
||||
it('allows Cloudflare Pages preview origins in dev and staging', () => {
|
||||
const origin = 'https://807e0ea6.lolympus.pages.dev';
|
||||
|
||||
expect(isAllowedCorsOrigin(origin, 'dev')).toBe(true);
|
||||
expect(isAllowedCorsOrigin(origin, 'staging')).toBe(true);
|
||||
});
|
||||
|
||||
it('does not allow Cloudflare Pages preview origins in prod', () => {
|
||||
expect(
|
||||
isAllowedCorsOrigin('https://807e0ea6.lolympus.pages.dev', 'prod'),
|
||||
).toBe(false);
|
||||
});
|
||||
|
||||
it('rejects similar but unsafe Pages origins', () => {
|
||||
expect(
|
||||
isAllowedCorsOrigin('http://807e0ea6.lolympus.pages.dev', 'staging'),
|
||||
).toBe(false);
|
||||
expect(isAllowedCorsOrigin('https://lolympus.pages.dev', 'staging')).toBe(
|
||||
false,
|
||||
);
|
||||
expect(
|
||||
isAllowedCorsOrigin('https://a.b.lolympus.pages.dev', 'staging'),
|
||||
).toBe(false);
|
||||
expect(
|
||||
isAllowedCorsOrigin(
|
||||
'https://807e0ea6.lolympus.pages.dev.evil.com',
|
||||
'staging',
|
||||
),
|
||||
).toBe(false);
|
||||
});
|
||||
|
||||
it('keeps configured web origins allowed', () => {
|
||||
expect(
|
||||
isAllowedCorsOrigin('https://example.com', 'prod', [
|
||||
'https://example.com',
|
||||
]),
|
||||
).toBe(true);
|
||||
});
|
||||
|
||||
it('falls back to default web origins when WEB_ORIGIN is empty', () => {
|
||||
expect(resolveWebOrigins('')).toContain('http://localhost:5173');
|
||||
});
|
||||
|
||||
it('creates a Nest CORS callback from the same rules', (done) => {
|
||||
const corsOrigin = createCorsOrigin('staging');
|
||||
|
||||
expect(corsOrigin).not.toBe(true);
|
||||
if (corsOrigin === true) return;
|
||||
|
||||
corsOrigin('https://807e0ea6.lolympus.pages.dev', (error, allow) => {
|
||||
expect(error).toBeNull();
|
||||
expect(allow).toBe(true);
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('keeps dev CORS permissive for local development', () => {
|
||||
expect(createCorsOrigin('dev')).toBe(true);
|
||||
});
|
||||
});
|
||||
@@ -1,101 +0,0 @@
|
||||
import type { CustomOrigin } from '@nestjs/common/interfaces/external/cors-options.interface';
|
||||
|
||||
const DEFAULT_WEB_ORIGINS = [
|
||||
'http://localhost:5173',
|
||||
'http://126.dahyeon.us:5173',
|
||||
'https://lolympus.dahyeon.us',
|
||||
];
|
||||
|
||||
const PAGES_DEV_ORIGIN_HOST_PATTERN =
|
||||
/^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.lolympus\.pages\.dev$/i;
|
||||
|
||||
const PAGES_DEV_CORS_ENVIRONMENTS = new Set(['dev', 'staging']);
|
||||
|
||||
function parseOrigin(origin: string, allowPath: boolean): URL | null {
|
||||
const trimmedOrigin = origin.trim();
|
||||
if (trimmedOrigin.length === 0) return null;
|
||||
|
||||
try {
|
||||
const url = new URL(trimmedOrigin);
|
||||
if (
|
||||
!allowPath &&
|
||||
(url.pathname !== '/' || url.search !== '' || url.hash !== '')
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return url;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
function normalizeOrigin(origin: string, allowPath = false): string | null {
|
||||
const url = parseOrigin(origin, allowPath);
|
||||
if (!url) return null;
|
||||
|
||||
return `${url.protocol}//${url.host}`;
|
||||
}
|
||||
|
||||
export function resolveWebOrigins(
|
||||
webOrigin = process.env.WEB_ORIGIN,
|
||||
): string[] {
|
||||
const configuredOrigins = webOrigin
|
||||
?.split(',')
|
||||
.map((origin) => normalizeOrigin(origin, true))
|
||||
.filter((origin): origin is string => origin !== null);
|
||||
|
||||
if (configuredOrigins && configuredOrigins.length > 0) {
|
||||
return configuredOrigins;
|
||||
}
|
||||
|
||||
return [...DEFAULT_WEB_ORIGINS];
|
||||
}
|
||||
|
||||
export function isLolympusPagesDevOrigin(origin: string): boolean {
|
||||
const url = parseOrigin(origin, false);
|
||||
if (!url) return false;
|
||||
|
||||
return (
|
||||
url.protocol === 'https:' &&
|
||||
url.port === '' &&
|
||||
PAGES_DEV_ORIGIN_HOST_PATTERN.test(url.hostname)
|
||||
);
|
||||
}
|
||||
|
||||
export function isAllowedCorsOrigin(
|
||||
requestOrigin: string | undefined,
|
||||
nodeEnv = process.env.NODE_ENV,
|
||||
webOrigins = resolveWebOrigins(),
|
||||
): boolean {
|
||||
if (!requestOrigin) return false;
|
||||
|
||||
const normalizedRequestOrigin = normalizeOrigin(requestOrigin);
|
||||
if (!normalizedRequestOrigin) return false;
|
||||
|
||||
const normalizedWebOrigins = webOrigins
|
||||
.map((origin) => normalizeOrigin(origin, true))
|
||||
.filter((origin): origin is string => origin !== null);
|
||||
|
||||
if (normalizedWebOrigins.includes(normalizedRequestOrigin)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return (
|
||||
PAGES_DEV_CORS_ENVIRONMENTS.has(nodeEnv ?? '') &&
|
||||
isLolympusPagesDevOrigin(requestOrigin)
|
||||
);
|
||||
}
|
||||
|
||||
export function createCorsOrigin(
|
||||
nodeEnv = process.env.NODE_ENV,
|
||||
webOrigin = process.env.WEB_ORIGIN,
|
||||
): true | CustomOrigin {
|
||||
if (nodeEnv === 'dev') return true;
|
||||
|
||||
const webOrigins = resolveWebOrigins(webOrigin);
|
||||
|
||||
return (requestOrigin, callback) => {
|
||||
callback(null, isAllowedCorsOrigin(requestOrigin, nodeEnv, webOrigins));
|
||||
};
|
||||
}
|
||||
+3
-24
@@ -1,29 +1,8 @@
|
||||
import { ValidationPipe } from '@nestjs/common';
|
||||
import { NestFactory } from '@nestjs/core';
|
||||
import { AppModule } from './app.module';
|
||||
import { createCorsOrigin } from './cors-origin';
|
||||
|
||||
async function bootstrap() {
|
||||
const app = await NestFactory.create(AppModule, {
|
||||
rawBody: true,
|
||||
});
|
||||
|
||||
const nodeEnv = process.env.NODE_ENV;
|
||||
const isDev = nodeEnv === 'dev';
|
||||
|
||||
app.enableCors({
|
||||
origin: createCorsOrigin(nodeEnv),
|
||||
credentials: true,
|
||||
allowedHeaders: ['Authorization', 'Content-Type', 'X-Auth-User-Id'],
|
||||
});
|
||||
app.useGlobalPipes(
|
||||
new ValidationPipe({
|
||||
whitelist: true,
|
||||
forbidNonWhitelisted: true,
|
||||
transform: true,
|
||||
transformOptions: { enableImplicitConversion: false },
|
||||
}),
|
||||
);
|
||||
await app.listen(isDev ? 3000 : 10712);
|
||||
const app = await NestFactory.create(AppModule);
|
||||
await app.listen(process.env.PORT ?? 3000);
|
||||
}
|
||||
void bootstrap();
|
||||
bootstrap();
|
||||
@@ -1,190 +0,0 @@
|
||||
import {
|
||||
BadRequestException,
|
||||
Body,
|
||||
Controller,
|
||||
Delete,
|
||||
Get,
|
||||
HttpCode,
|
||||
HttpStatus,
|
||||
Param,
|
||||
Post,
|
||||
UseGuards,
|
||||
} from '@nestjs/common';
|
||||
import mongoose from 'mongoose';
|
||||
import { AllowPublicAccess } from '../auth/allow-public-access.decorator';
|
||||
import { CurrentUser } from '../auth/current-user.decorator';
|
||||
import { Roles } from '../auth/roles.decorator';
|
||||
import { RolesGuard } from '../auth/roles.guard';
|
||||
import { ParseObjectIdPipe } from '../common/parse-object-id.pipe';
|
||||
import type { UserDocument } from '../global/database/schema';
|
||||
import { AuctionService } from './auction.service';
|
||||
import { AuctionGateway } from './auction.gateway';
|
||||
import {
|
||||
PlaceBidDto,
|
||||
SoldDto,
|
||||
StartAuctionDto,
|
||||
UndoAuctionDto,
|
||||
} from './dto/auction.dto';
|
||||
|
||||
@Controller('communities/:communityId/matches/:matchId/auction')
|
||||
export class AuctionController {
|
||||
constructor(
|
||||
private readonly auctionService: AuctionService,
|
||||
private readonly auctionGateway: AuctionGateway,
|
||||
) {}
|
||||
|
||||
@Post()
|
||||
@Roles('admin', 'owner')
|
||||
@UseGuards(RolesGuard)
|
||||
public async startAuction(
|
||||
@CurrentUser() currentUser: UserDocument,
|
||||
@Param('communityId', ParseObjectIdPipe)
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
||||
@Body() body: StartAuctionDto,
|
||||
) {
|
||||
this.assertSameCommunity(currentUser, communityId);
|
||||
return this.auctionService.start({
|
||||
matchId,
|
||||
communityId,
|
||||
captains: body.captains.map((c) => ({
|
||||
teamIndex: c.teamIndex,
|
||||
userId: new mongoose.Types.ObjectId(c.userId),
|
||||
initialPoints: c.initialPoints,
|
||||
})),
|
||||
initialPoints: body.initialPoints ?? 1000,
|
||||
maxTimerSeconds: body.maxTimerSeconds ?? 30,
|
||||
bidExtensionSeconds: body.bidExtensionSeconds ?? 5,
|
||||
topTierThreshold: body.topTierThreshold ?? 'NONE',
|
||||
manualTopTierUserIds: (body.manualTopTierUserIds ?? []).map(
|
||||
(userId) => new mongoose.Types.ObjectId(userId),
|
||||
),
|
||||
});
|
||||
}
|
||||
|
||||
@Get()
|
||||
@AllowPublicAccess()
|
||||
public async getAuction(
|
||||
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
||||
) {
|
||||
return this.auctionService.getByMatchId(matchId);
|
||||
}
|
||||
|
||||
// 공개 — 팀장 2명만 쓸 엔드포인트(트러스트 기반, 10명 동시 관전).
|
||||
@Post('open-bidding')
|
||||
@AllowPublicAccess()
|
||||
@HttpCode(HttpStatus.OK)
|
||||
public async openBidding(
|
||||
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
||||
) {
|
||||
return this.auctionService.openBidding(matchId);
|
||||
}
|
||||
|
||||
@Post('bids')
|
||||
@AllowPublicAccess()
|
||||
@HttpCode(HttpStatus.OK)
|
||||
public async placeBid(
|
||||
@CurrentUser() currentUser: UserDocument | undefined,
|
||||
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
||||
@Body() body: PlaceBidDto,
|
||||
) {
|
||||
return this.auctionService.placeBid({
|
||||
matchId,
|
||||
teamIndex: body.teamIndex,
|
||||
amount: body.amount,
|
||||
bidderUserId: this.resolveBidder(currentUser, body.bidderUserId),
|
||||
});
|
||||
}
|
||||
|
||||
@Post('sold')
|
||||
@AllowPublicAccess()
|
||||
@HttpCode(HttpStatus.OK)
|
||||
public async markSold(
|
||||
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
||||
@Body() body: SoldDto,
|
||||
) {
|
||||
return this.auctionService.markSold({
|
||||
matchId,
|
||||
assignedPosition: body.assignedPosition,
|
||||
});
|
||||
}
|
||||
|
||||
@Post('next')
|
||||
@AllowPublicAccess()
|
||||
@HttpCode(HttpStatus.OK)
|
||||
public async next(
|
||||
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
||||
) {
|
||||
return this.auctionService.next(matchId);
|
||||
}
|
||||
|
||||
@Get('history')
|
||||
@Roles('admin', 'owner')
|
||||
@UseGuards(RolesGuard)
|
||||
public async listHistory(
|
||||
@CurrentUser() currentUser: UserDocument,
|
||||
@Param('communityId', ParseObjectIdPipe)
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
||||
) {
|
||||
this.assertSameCommunity(currentUser, communityId);
|
||||
return this.auctionService.listHistory({ matchId, communityId });
|
||||
}
|
||||
|
||||
@Post('undo')
|
||||
@Roles('admin', 'owner')
|
||||
@UseGuards(RolesGuard)
|
||||
@HttpCode(HttpStatus.OK)
|
||||
public async undo(
|
||||
@CurrentUser() currentUser: UserDocument,
|
||||
@Param('communityId', ParseObjectIdPipe)
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
||||
@Body() body: UndoAuctionDto,
|
||||
) {
|
||||
this.assertSameCommunity(currentUser, communityId);
|
||||
const auction = await this.auctionService.undoTo({
|
||||
matchId,
|
||||
communityId,
|
||||
sequence: body.sequence,
|
||||
});
|
||||
this.auctionGateway.broadcastState(matchId.toString(), auction);
|
||||
return auction;
|
||||
}
|
||||
|
||||
@Delete()
|
||||
@Roles('admin', 'owner')
|
||||
@UseGuards(RolesGuard)
|
||||
@HttpCode(HttpStatus.NO_CONTENT)
|
||||
public async resetAuction(
|
||||
@CurrentUser() currentUser: UserDocument,
|
||||
@Param('communityId', ParseObjectIdPipe)
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
||||
) {
|
||||
this.assertSameCommunity(currentUser, communityId);
|
||||
await this.auctionService.reset({ matchId, communityId });
|
||||
this.auctionGateway.broadcastReset(matchId.toString());
|
||||
}
|
||||
|
||||
private resolveBidder(
|
||||
currentUser: UserDocument | undefined,
|
||||
bodyBidder?: string,
|
||||
): mongoose.Types.ObjectId | undefined {
|
||||
if (currentUser) return currentUser._id;
|
||||
if (!bodyBidder) return undefined;
|
||||
if (!mongoose.isValidObjectId(bodyBidder)) {
|
||||
throw new BadRequestException('Invalid bidderUserId.');
|
||||
}
|
||||
return new mongoose.Types.ObjectId(bodyBidder);
|
||||
}
|
||||
|
||||
private assertSameCommunity(
|
||||
user: UserDocument,
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
): void {
|
||||
if (!user.communityId.equals(communityId)) {
|
||||
throw new BadRequestException('Different community.');
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,467 +0,0 @@
|
||||
import { Logger } from '@nestjs/common';
|
||||
import {
|
||||
ConnectedSocket,
|
||||
MessageBody,
|
||||
OnGatewayConnection,
|
||||
OnGatewayDisconnect,
|
||||
SubscribeMessage,
|
||||
WebSocketGateway,
|
||||
WebSocketServer,
|
||||
} from '@nestjs/websockets';
|
||||
import mongoose from 'mongoose';
|
||||
import type { JWTPayload } from 'jose';
|
||||
import { Namespace, Socket } from 'socket.io';
|
||||
import { AuthService } from '../auth/auth.service';
|
||||
import { IdentityService } from '../auth/identity.service';
|
||||
import { JwtService } from '../auth/jwt.service';
|
||||
import { ConnectionService } from '../global/database/connection.service';
|
||||
import type {
|
||||
AuctionChatMessage,
|
||||
AuctionDocument,
|
||||
IdentityDocument,
|
||||
Position,
|
||||
UserDocument,
|
||||
} from '../global/database/schema';
|
||||
import { AuctionService } from './auction.service';
|
||||
|
||||
interface JoinAuctionPayload {
|
||||
matchId: string;
|
||||
}
|
||||
|
||||
interface BidPayload {
|
||||
teamIndex: number;
|
||||
amount: number;
|
||||
bidderUserId?: string;
|
||||
}
|
||||
|
||||
interface SoldPayload {
|
||||
assignedPosition?: Position;
|
||||
}
|
||||
|
||||
interface ChatMessagePayload {
|
||||
message?: string;
|
||||
displayName?: string;
|
||||
}
|
||||
|
||||
@WebSocketGateway({
|
||||
namespace: '/auction',
|
||||
cors: {
|
||||
origin: true,
|
||||
credentials: true,
|
||||
allowedHeaders: ['Authorization', 'Content-Type', 'X-Auth-User-Id'],
|
||||
},
|
||||
})
|
||||
export class AuctionGateway
|
||||
implements OnGatewayConnection, OnGatewayDisconnect
|
||||
{
|
||||
@WebSocketServer()
|
||||
private server!: Namespace;
|
||||
|
||||
private readonly logger = new Logger(AuctionGateway.name);
|
||||
private readonly roomTimers = new Map<string, NodeJS.Timeout>();
|
||||
|
||||
constructor(
|
||||
private readonly auctionService: AuctionService,
|
||||
private readonly authService: AuthService,
|
||||
private readonly jwtService: JwtService,
|
||||
private readonly identityService: IdentityService,
|
||||
private readonly connectionService: ConnectionService,
|
||||
) {}
|
||||
|
||||
public async handleConnection(socket: Socket) {
|
||||
try {
|
||||
await this.authenticateSocket(socket);
|
||||
this.logger.debug(`Auction client connected: ${socket.id}`);
|
||||
} catch (err) {
|
||||
this.logger.warn(
|
||||
`Auction client authentication failed: ${
|
||||
err instanceof Error ? err.message : err
|
||||
}`,
|
||||
);
|
||||
socket.disconnect(true);
|
||||
}
|
||||
}
|
||||
|
||||
public handleDisconnect(socket: Socket) {
|
||||
const matchId = this.getSocketMatchId(socket);
|
||||
if (!matchId) return;
|
||||
this.maybeClearRoomTimer(matchId);
|
||||
}
|
||||
|
||||
@SubscribeMessage('join')
|
||||
public async handleJoin(
|
||||
@ConnectedSocket() socket: Socket,
|
||||
@MessageBody() payload: JoinAuctionPayload,
|
||||
) {
|
||||
if (!payload?.matchId || !mongoose.isValidObjectId(payload.matchId)) {
|
||||
this.emitError(socket, 'Invalid matchId.');
|
||||
return;
|
||||
}
|
||||
|
||||
await socket.join(payload.matchId);
|
||||
socket.data.matchId = payload.matchId;
|
||||
|
||||
try {
|
||||
await this.resolveSocketUserForMatch(socket, payload.matchId);
|
||||
const auction = await this.auctionService.getByMatchId(
|
||||
new mongoose.Types.ObjectId(payload.matchId),
|
||||
);
|
||||
this.emitChatHistory(socket, auction);
|
||||
this.broadcastState(payload.matchId, auction);
|
||||
} catch (error) {
|
||||
this.emitKnownError(socket, error);
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeMessage('bid')
|
||||
public async handleBid(
|
||||
@ConnectedSocket() socket: Socket,
|
||||
@MessageBody() payload: BidPayload,
|
||||
) {
|
||||
const matchId = this.requireJoinedMatchId(socket);
|
||||
if (!matchId) return;
|
||||
|
||||
const bidderUserId = this.resolveBidderUserId(socket, payload?.bidderUserId);
|
||||
if (payload?.bidderUserId && !bidderUserId) {
|
||||
this.emitError(socket, 'Invalid bidderUserId.');
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const auction = await this.auctionService.placeBid({
|
||||
matchId: new mongoose.Types.ObjectId(matchId),
|
||||
teamIndex: payload.teamIndex,
|
||||
amount: payload.amount,
|
||||
bidderUserId,
|
||||
});
|
||||
this.broadcastState(matchId, auction);
|
||||
} catch (error) {
|
||||
this.emitKnownError(socket, error);
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeMessage('open-bidding')
|
||||
public async handleOpenBidding(@ConnectedSocket() socket: Socket) {
|
||||
const matchId = this.requireJoinedMatchId(socket);
|
||||
if (!matchId) return;
|
||||
|
||||
try {
|
||||
const auction = await this.auctionService.openBidding(
|
||||
new mongoose.Types.ObjectId(matchId),
|
||||
);
|
||||
this.broadcastState(matchId, auction);
|
||||
} catch (error) {
|
||||
this.emitKnownError(socket, error);
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeMessage('sold')
|
||||
public async handleSold(
|
||||
@ConnectedSocket() socket: Socket,
|
||||
@MessageBody() payload: SoldPayload,
|
||||
) {
|
||||
const matchId = this.requireJoinedMatchId(socket);
|
||||
if (!matchId) return;
|
||||
|
||||
try {
|
||||
const auction = await this.auctionService.markSold({
|
||||
matchId: new mongoose.Types.ObjectId(matchId),
|
||||
assignedPosition: payload?.assignedPosition,
|
||||
});
|
||||
this.broadcastState(matchId, auction);
|
||||
} catch (error) {
|
||||
this.emitKnownError(socket, error);
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeMessage('next')
|
||||
public async handleNext(@ConnectedSocket() socket: Socket) {
|
||||
const matchId = this.requireJoinedMatchId(socket);
|
||||
if (!matchId) return;
|
||||
|
||||
try {
|
||||
const auction = await this.auctionService.next(
|
||||
new mongoose.Types.ObjectId(matchId),
|
||||
);
|
||||
this.broadcastState(matchId, auction);
|
||||
} catch (error) {
|
||||
this.emitKnownError(socket, error);
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeMessage('chat-message')
|
||||
public async handleChatMessage(
|
||||
@ConnectedSocket() socket: Socket,
|
||||
@MessageBody() payload: ChatMessagePayload,
|
||||
) {
|
||||
const matchId = this.requireJoinedMatchId(socket);
|
||||
if (!matchId) return;
|
||||
|
||||
if (typeof payload?.message !== 'string') {
|
||||
this.emitError(socket, 'Chat message is required.');
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const { message } = await this.auctionService.appendChatMessage({
|
||||
matchId: new mongoose.Types.ObjectId(matchId),
|
||||
userId: this.resolveSocketUserId(socket),
|
||||
displayName: this.resolveChatDisplayName(socket, payload.displayName),
|
||||
message: payload.message,
|
||||
});
|
||||
this.server
|
||||
.to(matchId)
|
||||
.emit('chat-message', this.serializeChatMessage(message));
|
||||
} catch (error) {
|
||||
this.emitKnownError(socket, error);
|
||||
}
|
||||
}
|
||||
|
||||
private requireJoinedMatchId(socket: Socket): string | null {
|
||||
const matchId = this.getSocketMatchId(socket);
|
||||
if (!matchId) {
|
||||
this.emitError(socket, 'Join a match room before sending events.');
|
||||
return null;
|
||||
}
|
||||
return matchId;
|
||||
}
|
||||
|
||||
private getSocketMatchId(socket: Socket): string | undefined {
|
||||
return typeof socket.data.matchId === 'string'
|
||||
? socket.data.matchId
|
||||
: undefined;
|
||||
}
|
||||
|
||||
private resolveBidderUserId(
|
||||
socket: Socket,
|
||||
payloadBidderUserId?: string,
|
||||
): mongoose.Types.ObjectId | undefined {
|
||||
const candidate =
|
||||
payloadBidderUserId ??
|
||||
(socket.data.user as UserDocument | undefined)?._id.toString() ??
|
||||
this.readHandshakeUserId(socket);
|
||||
if (!candidate || !mongoose.isValidObjectId(candidate)) {
|
||||
return undefined;
|
||||
}
|
||||
return new mongoose.Types.ObjectId(candidate);
|
||||
}
|
||||
|
||||
private readHandshakeUserId(socket: Socket): string | undefined {
|
||||
const authUserId = socket.handshake.auth['x-auth-user-id'];
|
||||
if (typeof authUserId === 'string') return authUserId;
|
||||
|
||||
const header = socket.handshake.headers['x-auth-user-id'];
|
||||
return Array.isArray(header) ? header[0] : header;
|
||||
}
|
||||
|
||||
private resolveSocketUserId(
|
||||
socket: Socket,
|
||||
): mongoose.Types.ObjectId | undefined {
|
||||
return (socket.data.user as UserDocument | undefined)?._id;
|
||||
}
|
||||
|
||||
private resolveChatDisplayName(
|
||||
socket: Socket,
|
||||
fallbackDisplayName?: string,
|
||||
): string {
|
||||
const user = socket.data.user as UserDocument | undefined;
|
||||
const primaryRiotAccount =
|
||||
user?.riotAccounts.find((entry) => entry.isPrimary) ??
|
||||
user?.riotAccounts[0];
|
||||
if (primaryRiotAccount?.gameName) {
|
||||
return primaryRiotAccount.tagLine
|
||||
? `${primaryRiotAccount.gameName}#${primaryRiotAccount.tagLine}`
|
||||
: primaryRiotAccount.gameName;
|
||||
}
|
||||
|
||||
if (user?.kakaoTalkNickname) return user.kakaoTalkNickname;
|
||||
if (user?.discordNickname) return user.discordNickname;
|
||||
|
||||
const identity = socket.data.identity as IdentityDocument | undefined;
|
||||
if (identity?.displayName) return identity.displayName;
|
||||
if (identity?.email) return identity.email;
|
||||
|
||||
return fallbackDisplayName ?? '관전자';
|
||||
}
|
||||
|
||||
private async authenticateSocket(socket: Socket): Promise<void> {
|
||||
const fallback = await this.authService.resolveDevUserById(
|
||||
this.readHandshakeUserId(socket),
|
||||
);
|
||||
if (fallback) {
|
||||
socket.data.user = fallback.user;
|
||||
socket.data.identity = fallback.identity;
|
||||
return;
|
||||
}
|
||||
|
||||
const token = this.readHandshakeToken(socket);
|
||||
if (!token) {
|
||||
// 임시 운영용: 경매 진행 중에는 로그인 없이도 관전/팀장 모드 선택/입찰을 허용한다.
|
||||
return;
|
||||
}
|
||||
|
||||
const { payload } = await this.jwtService.verify(
|
||||
token,
|
||||
'MICROSOFT_ENTRAID',
|
||||
);
|
||||
socket.data.identity = await this.identityService.findOrCreateByOid({
|
||||
entraOid: this.requireStringClaim(payload, 'oid'),
|
||||
tenantId: this.stringClaim(payload.tid),
|
||||
email:
|
||||
this.stringClaim(payload.preferred_username) ??
|
||||
this.stringClaim(payload.email),
|
||||
displayName: this.stringClaim(payload.name),
|
||||
});
|
||||
}
|
||||
|
||||
private readHandshakeToken(socket: Socket): string | undefined {
|
||||
const authToken = socket.handshake.auth.token;
|
||||
if (typeof authToken === 'string' && authToken.trim()) {
|
||||
return authToken.trim().replace(/^Bearer\s+/i, '');
|
||||
}
|
||||
|
||||
const header = socket.handshake.headers.authorization;
|
||||
const authorization = Array.isArray(header) ? header[0] : header;
|
||||
if (authorization?.startsWith('Bearer ')) {
|
||||
return authorization.slice('Bearer '.length).trim();
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
|
||||
private async resolveSocketUserForMatch(
|
||||
socket: Socket,
|
||||
matchId: string,
|
||||
): Promise<void> {
|
||||
if (socket.data.user || !socket.data.identity) return;
|
||||
|
||||
const MatchModel = await this.connectionService.getModel('match');
|
||||
const match = await MatchModel.findById(matchId).select({
|
||||
communityId: 1,
|
||||
});
|
||||
if (!match) return;
|
||||
|
||||
const UserModel = await this.connectionService.getModel('user');
|
||||
socket.data.user = await UserModel.findOne({
|
||||
communityId: match.communityId,
|
||||
identityId: (socket.data.identity as IdentityDocument)._id,
|
||||
}).exec();
|
||||
}
|
||||
|
||||
private requireStringClaim(payload: JWTPayload, key: string): string {
|
||||
const value = payload[key];
|
||||
if (typeof value !== 'string' || value.length === 0) {
|
||||
throw new Error(`Token is missing ${key} claim.`);
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
private stringClaim(value: unknown): string | undefined {
|
||||
return typeof value === 'string' && value.length > 0 ? value : undefined;
|
||||
}
|
||||
|
||||
public broadcastState(matchId: string, auction: AuctionDocument) {
|
||||
this.server.to(matchId).emit('state', this.serializeAuction(auction));
|
||||
this.syncRoomTimer(matchId, auction);
|
||||
}
|
||||
|
||||
public broadcastReset(matchId: string) {
|
||||
this.clearRoomTimer(matchId);
|
||||
this.server.to(matchId).emit('reset', { matchId });
|
||||
}
|
||||
|
||||
private emitChatHistory(socket: Socket, auction: AuctionDocument) {
|
||||
socket.emit('chat-history', {
|
||||
messages: (auction.chatMessages ?? []).map((message) =>
|
||||
this.serializeChatMessage(message),
|
||||
),
|
||||
});
|
||||
}
|
||||
|
||||
private syncRoomTimer(matchId: string, auction: AuctionDocument) {
|
||||
this.clearRoomTimer(matchId);
|
||||
if (!auction.currentDeadline) return;
|
||||
|
||||
const deadline = auction.currentDeadline;
|
||||
const deadlineIso = deadline.toISOString();
|
||||
if (Date.now() >= deadline.getTime()) {
|
||||
void this.handleDeadlineExpiry(matchId);
|
||||
return;
|
||||
}
|
||||
this.server.to(matchId).emit('tick', {
|
||||
deadline: deadlineIso,
|
||||
serverTime: new Date().toISOString(),
|
||||
});
|
||||
|
||||
const timer = setInterval(() => {
|
||||
this.server.to(matchId).emit('tick', {
|
||||
deadline: deadlineIso,
|
||||
serverTime: new Date().toISOString(),
|
||||
});
|
||||
|
||||
if (Date.now() >= deadline.getTime()) {
|
||||
this.clearRoomTimer(matchId);
|
||||
void this.handleDeadlineExpiry(matchId);
|
||||
}
|
||||
}, 1000);
|
||||
|
||||
this.roomTimers.set(matchId, timer);
|
||||
}
|
||||
|
||||
private async handleDeadlineExpiry(matchIdStr: string) {
|
||||
const matchId = new mongoose.Types.ObjectId(matchIdStr);
|
||||
const auction = await this.auctionService
|
||||
.getByMatchId(matchId)
|
||||
.catch(() => null);
|
||||
if (!auction || auction.phase !== 'bidding') return;
|
||||
if (!auction.currentDeadline || auction.currentDeadline.getTime() > Date.now()) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const nextAuction =
|
||||
auction.currentBid > 0
|
||||
? await this.auctionService.markSold({ matchId })
|
||||
: await this.auctionService.markPassed(matchId);
|
||||
this.broadcastState(matchIdStr, nextAuction);
|
||||
} catch (error) {
|
||||
this.emitKnownErrorToRoom(matchIdStr, error);
|
||||
}
|
||||
}
|
||||
|
||||
private maybeClearRoomTimer(matchId: string) {
|
||||
const room = this.server.adapter.rooms.get(matchId);
|
||||
if (room && room.size > 0) return;
|
||||
this.clearRoomTimer(matchId);
|
||||
}
|
||||
|
||||
private clearRoomTimer(matchId: string) {
|
||||
const timer = this.roomTimers.get(matchId);
|
||||
if (!timer) return;
|
||||
clearInterval(timer);
|
||||
this.roomTimers.delete(matchId);
|
||||
}
|
||||
|
||||
private emitKnownError(socket: Socket, error: unknown) {
|
||||
const message =
|
||||
error instanceof Error ? error.message : 'Unexpected auction gateway error.';
|
||||
this.emitError(socket, message);
|
||||
}
|
||||
|
||||
private emitKnownErrorToRoom(matchId: string, error: unknown) {
|
||||
const message =
|
||||
error instanceof Error ? error.message : 'Unexpected auction gateway error.';
|
||||
this.server.to(matchId).emit('error', { message });
|
||||
}
|
||||
|
||||
private emitError(socket: Socket, message: string) {
|
||||
socket.emit('error', { message });
|
||||
}
|
||||
|
||||
private serializeAuction(auction: AuctionDocument) {
|
||||
return JSON.parse(JSON.stringify(auction));
|
||||
}
|
||||
|
||||
private serializeChatMessage(message: AuctionChatMessage) {
|
||||
return JSON.parse(JSON.stringify(message));
|
||||
}
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
import { Module } from '@nestjs/common';
|
||||
import { RiotModule } from '../riot/riot.module';
|
||||
import { TournamentCodeModule } from '../tournament-code/tournament-code.module';
|
||||
import { TournamentResultModule } from '../tournament-result/tournament-result.module';
|
||||
import { AuctionGateway } from './auction.gateway';
|
||||
import { AuctionController } from './auction.controller';
|
||||
import { AuctionService } from './auction.service';
|
||||
|
||||
@Module({
|
||||
imports: [RiotModule, TournamentCodeModule, TournamentResultModule],
|
||||
controllers: [AuctionController],
|
||||
providers: [AuctionService, AuctionGateway],
|
||||
exports: [AuctionService],
|
||||
})
|
||||
export class AuctionModule {}
|
||||
@@ -1,928 +0,0 @@
|
||||
import mongoose from 'mongoose';
|
||||
import { AuctionService } from './auction.service';
|
||||
|
||||
describe('AuctionService', () => {
|
||||
function createService(models: Record<string, unknown>) {
|
||||
const auctionHistoryModel = {
|
||||
findOne: jest.fn().mockReturnValue({
|
||||
sort: jest.fn().mockReturnValue({
|
||||
select: jest.fn().mockReturnValue({
|
||||
lean: jest.fn().mockReturnValue({
|
||||
exec: jest.fn().mockResolvedValue(null),
|
||||
}),
|
||||
}),
|
||||
}),
|
||||
}),
|
||||
create: jest.fn().mockResolvedValue(undefined),
|
||||
deleteMany: jest.fn().mockReturnValue({
|
||||
session: jest.fn().mockResolvedValue(undefined),
|
||||
}),
|
||||
};
|
||||
const allModels = {
|
||||
auctionHistory: auctionHistoryModel,
|
||||
...models,
|
||||
};
|
||||
const connectionService = {
|
||||
getModel: jest.fn((name: string) => allModels[name]),
|
||||
createSession: jest.fn(),
|
||||
};
|
||||
const enrichmentService = {
|
||||
enrichRiotAccount: jest.fn(),
|
||||
};
|
||||
const tournamentCodeService = {
|
||||
reserveForMatch: jest.fn().mockResolvedValue(undefined),
|
||||
releaseFromMatch: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const tournamentResultService = {
|
||||
scheduleInitialPoll: jest.fn().mockResolvedValue(null),
|
||||
cancelPolling: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
|
||||
return {
|
||||
service: new AuctionService(
|
||||
connectionService as never,
|
||||
enrichmentService as never,
|
||||
tournamentCodeService as never,
|
||||
tournamentResultService as never,
|
||||
),
|
||||
connectionService,
|
||||
tournamentCodeService,
|
||||
tournamentResultService,
|
||||
auctionHistoryModel,
|
||||
};
|
||||
}
|
||||
|
||||
function createFullTeam(teamIndex: number) {
|
||||
return {
|
||||
teamIndex,
|
||||
captainUserId: new mongoose.Types.ObjectId(),
|
||||
points: 100,
|
||||
members: Array.from({ length: 4 }, () => ({
|
||||
userId: new mongoose.Types.ObjectId(),
|
||||
assignedPosition: 'MID',
|
||||
cost: 10,
|
||||
})),
|
||||
};
|
||||
}
|
||||
|
||||
afterEach(() => {
|
||||
jest.restoreAllMocks();
|
||||
jest.useRealTimers();
|
||||
});
|
||||
|
||||
it('starts an auction without reserving tournament codes before teams are complete', async () => {
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const userIds = Array.from(
|
||||
{ length: 10 },
|
||||
() => new mongoose.Types.ObjectId(),
|
||||
);
|
||||
const participants = userIds.map((userId, index) => ({
|
||||
userId,
|
||||
preferredPositions: [{ position: 'MID', priority: 1 }],
|
||||
joinedAt: new Date(index),
|
||||
excluded: false,
|
||||
}));
|
||||
const match = {
|
||||
_id: matchId,
|
||||
communityId,
|
||||
participants,
|
||||
status: 'recruiting',
|
||||
teamBuiltAt: undefined,
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const users = userIds.slice(2).map((userId, index) => ({
|
||||
_id: userId,
|
||||
riotAccounts: [
|
||||
{
|
||||
puuid: `puuid-${index}`,
|
||||
gameName: `Player${index}`,
|
||||
tagLine: 'KR1',
|
||||
profileIconId: index,
|
||||
tiers: [],
|
||||
championMasteries: [],
|
||||
recentStatsSummary: undefined,
|
||||
lastRefreshRequestedAt: new Date(),
|
||||
isPrimary: true,
|
||||
},
|
||||
],
|
||||
}));
|
||||
const auction = {
|
||||
_id: new mongoose.Types.ObjectId(),
|
||||
matchId,
|
||||
toObject: jest.fn().mockReturnValue({ matchId }),
|
||||
};
|
||||
const { service, tournamentCodeService, tournamentResultService } =
|
||||
createService({
|
||||
match: {
|
||||
findById: jest.fn().mockResolvedValue(match),
|
||||
},
|
||||
user: {
|
||||
find: jest.fn().mockResolvedValue(users),
|
||||
},
|
||||
auction: {
|
||||
findOne: jest.fn().mockResolvedValue(null),
|
||||
create: jest.fn().mockResolvedValue(auction),
|
||||
},
|
||||
community: {
|
||||
findById: jest.fn().mockReturnValue({
|
||||
select: jest.fn().mockReturnValue({
|
||||
lean: jest.fn().mockReturnValue({
|
||||
exec: jest.fn().mockResolvedValue({
|
||||
riotPlatform: 'kr',
|
||||
riotRegion: 'asia',
|
||||
}),
|
||||
}),
|
||||
}),
|
||||
}),
|
||||
},
|
||||
});
|
||||
|
||||
await service.start({
|
||||
matchId,
|
||||
communityId,
|
||||
captains: [
|
||||
{ teamIndex: 1, userId: userIds[0] },
|
||||
{ teamIndex: 2, userId: userIds[1] },
|
||||
],
|
||||
initialPoints: 1000,
|
||||
maxTimerSeconds: 30,
|
||||
bidExtensionSeconds: 5,
|
||||
topTierThreshold: 'NONE',
|
||||
manualTopTierUserIds: [],
|
||||
});
|
||||
|
||||
expect(match.status).toBe('team-built');
|
||||
expect(match.teamBuiltAt).toBeInstanceOf(Date);
|
||||
expect(match.save).toHaveBeenCalledTimes(1);
|
||||
expect(tournamentCodeService.reserveForMatch).not.toHaveBeenCalled();
|
||||
expect(tournamentResultService.scheduleInitialPoll).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('appends a chat message and keeps only the latest 200 messages', async () => {
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const userId = new mongoose.Types.ObjectId();
|
||||
const oldMessages = Array.from({ length: 200 }, (_, index) => ({
|
||||
id: `old-${index}`,
|
||||
displayName: 'Old',
|
||||
message: `old message ${index}`,
|
||||
sentAt: new Date(index),
|
||||
}));
|
||||
const auction = {
|
||||
matchId,
|
||||
chatMessages: oldMessages,
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const { service } = createService({
|
||||
auction: {
|
||||
findOne: jest.fn().mockResolvedValue(auction),
|
||||
},
|
||||
});
|
||||
|
||||
const appended = await service.appendChatMessage({
|
||||
matchId,
|
||||
userId,
|
||||
displayName: ' Captain One ',
|
||||
message: ' 좋은 픽입니다 ',
|
||||
});
|
||||
|
||||
expect(appended.message).toMatchObject({
|
||||
userId,
|
||||
displayName: 'Captain One',
|
||||
message: '좋은 픽입니다',
|
||||
});
|
||||
expect(appended.message.id).toHaveLength(36);
|
||||
expect(appended.message.sentAt).toBeInstanceOf(Date);
|
||||
expect(auction.chatMessages).toHaveLength(200);
|
||||
expect(auction.chatMessages[0].id).toBe('old-1');
|
||||
expect(auction.chatMessages.at(-1)).toBe(appended.message);
|
||||
expect(auction.save).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('rejects blank and overly long chat messages', async () => {
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const auction = {
|
||||
matchId,
|
||||
chatMessages: [],
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const { service } = createService({
|
||||
auction: {
|
||||
findOne: jest.fn().mockResolvedValue(auction),
|
||||
},
|
||||
});
|
||||
|
||||
await expect(
|
||||
service.appendChatMessage({
|
||||
matchId,
|
||||
displayName: 'Spectator',
|
||||
message: ' ',
|
||||
}),
|
||||
).rejects.toThrow('Chat message is required.');
|
||||
await expect(
|
||||
service.appendChatMessage({
|
||||
matchId,
|
||||
displayName: 'Spectator',
|
||||
message: 'a'.repeat(301),
|
||||
}),
|
||||
).rejects.toThrow('Chat message must be 300 characters or less.');
|
||||
expect(auction.save).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('randomizes the non-captain player order when starting an auction', async () => {
|
||||
const randomSpy = jest.spyOn(Math, 'random').mockReturnValue(0);
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const userIds = Array.from(
|
||||
{ length: 10 },
|
||||
() => new mongoose.Types.ObjectId(),
|
||||
);
|
||||
const participants = userIds.map((userId, index) => ({
|
||||
userId,
|
||||
preferredPositions: [{ position: 'MID', priority: 1 }],
|
||||
joinedAt: new Date(index),
|
||||
excluded: false,
|
||||
}));
|
||||
const match = {
|
||||
_id: matchId,
|
||||
communityId,
|
||||
participants,
|
||||
status: 'recruiting',
|
||||
teamBuiltAt: undefined,
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const users = userIds.slice(2).map((userId, index) => ({
|
||||
_id: userId,
|
||||
riotAccounts: [
|
||||
{
|
||||
puuid: `puuid-${index}`,
|
||||
gameName: `Player${index}`,
|
||||
tagLine: 'KR1',
|
||||
profileIconId: index,
|
||||
tiers: [],
|
||||
championMasteries: [],
|
||||
recentStatsSummary: undefined,
|
||||
lastRefreshRequestedAt: new Date(),
|
||||
isPrimary: true,
|
||||
},
|
||||
],
|
||||
}));
|
||||
const auctionCreate = jest.fn().mockImplementation(async (payload) => ({
|
||||
_id: new mongoose.Types.ObjectId(),
|
||||
matchId,
|
||||
toObject: jest.fn().mockReturnValue({ matchId, ...payload }),
|
||||
}));
|
||||
const { service } = createService({
|
||||
match: {
|
||||
findById: jest.fn().mockResolvedValue(match),
|
||||
},
|
||||
user: {
|
||||
find: jest.fn().mockResolvedValue(users),
|
||||
},
|
||||
auction: {
|
||||
findOne: jest.fn().mockResolvedValue(null),
|
||||
create: auctionCreate,
|
||||
},
|
||||
community: {
|
||||
findById: jest.fn().mockReturnValue({
|
||||
select: jest.fn().mockReturnValue({
|
||||
lean: jest.fn().mockReturnValue({
|
||||
exec: jest.fn().mockResolvedValue({
|
||||
riotPlatform: 'kr',
|
||||
riotRegion: 'asia',
|
||||
}),
|
||||
}),
|
||||
}),
|
||||
}),
|
||||
},
|
||||
});
|
||||
|
||||
await service.start({
|
||||
matchId,
|
||||
communityId,
|
||||
captains: [
|
||||
{ teamIndex: 1, userId: userIds[0] },
|
||||
{ teamIndex: 2, userId: userIds[1] },
|
||||
],
|
||||
initialPoints: 1000,
|
||||
maxTimerSeconds: 30,
|
||||
bidExtensionSeconds: 5,
|
||||
topTierThreshold: 'NONE',
|
||||
manualTopTierUserIds: [],
|
||||
});
|
||||
|
||||
const signupOrder = userIds.slice(2).map((userId) => userId.toString());
|
||||
const auctionOrder = auctionCreate.mock.calls[0][0].order.map(
|
||||
(player: { userId: mongoose.Types.ObjectId }) =>
|
||||
player.userId.toString(),
|
||||
);
|
||||
|
||||
expect(auctionOrder).not.toEqual(signupOrder);
|
||||
expect([...auctionOrder].sort()).toEqual([...signupOrder].sort());
|
||||
expect(randomSpy).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('includes tier history in auction player snapshots when starting an auction', async () => {
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const userIds = Array.from(
|
||||
{ length: 10 },
|
||||
() => new mongoose.Types.ObjectId(),
|
||||
);
|
||||
const participants = userIds.map((userId, index) => ({
|
||||
userId,
|
||||
preferredPositions: [{ position: 'MID', priority: 1 }],
|
||||
joinedAt: new Date(index),
|
||||
excluded: false,
|
||||
}));
|
||||
const match = {
|
||||
_id: matchId,
|
||||
communityId,
|
||||
participants,
|
||||
status: 'recruiting',
|
||||
teamBuiltAt: undefined,
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const tierHistory = [
|
||||
{
|
||||
queueType: 'RANKED_SOLO_5x5',
|
||||
tier: 'GOLD',
|
||||
rank: 'II',
|
||||
leaguePoints: 42,
|
||||
wins: 30,
|
||||
losses: 24,
|
||||
recordedAt: new Date('2026-05-01T00:00:00.000Z'),
|
||||
},
|
||||
{
|
||||
queueType: 'RANKED_SOLO_5x5',
|
||||
tier: 'PLATINUM',
|
||||
rank: 'IV',
|
||||
leaguePoints: 15,
|
||||
wins: 34,
|
||||
losses: 27,
|
||||
recordedAt: new Date('2026-05-08T00:00:00.000Z'),
|
||||
},
|
||||
];
|
||||
const users = userIds.slice(2).map((userId, index) => ({
|
||||
_id: userId,
|
||||
riotAccounts: [
|
||||
{
|
||||
puuid: `puuid-${index}`,
|
||||
gameName: `Player${index}`,
|
||||
tagLine: 'KR1',
|
||||
profileIconId: index,
|
||||
tiers: [],
|
||||
tierHistory: index === 0 ? tierHistory : [],
|
||||
championMasteries: [],
|
||||
recentStatsSummary: undefined,
|
||||
lastRefreshRequestedAt: new Date(),
|
||||
isPrimary: true,
|
||||
},
|
||||
],
|
||||
}));
|
||||
const auctionCreate = jest.fn().mockImplementation(async (payload) => ({
|
||||
_id: new mongoose.Types.ObjectId(),
|
||||
matchId,
|
||||
toObject: jest.fn().mockReturnValue({ matchId, ...payload }),
|
||||
}));
|
||||
const { service } = createService({
|
||||
match: {
|
||||
findById: jest.fn().mockResolvedValue(match),
|
||||
},
|
||||
user: {
|
||||
find: jest.fn().mockResolvedValue(users),
|
||||
},
|
||||
auction: {
|
||||
findOne: jest.fn().mockResolvedValue(null),
|
||||
create: auctionCreate,
|
||||
},
|
||||
community: {
|
||||
findById: jest.fn().mockReturnValue({
|
||||
select: jest.fn().mockReturnValue({
|
||||
lean: jest.fn().mockReturnValue({
|
||||
exec: jest.fn().mockResolvedValue({
|
||||
riotPlatform: 'kr',
|
||||
riotRegion: 'asia',
|
||||
}),
|
||||
}),
|
||||
}),
|
||||
}),
|
||||
},
|
||||
});
|
||||
|
||||
await service.start({
|
||||
matchId,
|
||||
communityId,
|
||||
captains: [
|
||||
{ teamIndex: 1, userId: userIds[0] },
|
||||
{ teamIndex: 2, userId: userIds[1] },
|
||||
],
|
||||
initialPoints: 1000,
|
||||
maxTimerSeconds: 30,
|
||||
bidExtensionSeconds: 5,
|
||||
topTierThreshold: 'NONE',
|
||||
manualTopTierUserIds: [],
|
||||
});
|
||||
|
||||
const firstPlayerSnapshot = auctionCreate.mock.calls[0][0].order.find(
|
||||
(player: { userId: mongoose.Types.ObjectId }) =>
|
||||
player.userId.equals(userIds[2]),
|
||||
);
|
||||
|
||||
expect(firstPlayerSnapshot).toMatchObject({
|
||||
userId: userIds[2],
|
||||
tierHistory,
|
||||
});
|
||||
});
|
||||
|
||||
it('rejects bids when the team already has 5 members including captain', async () => {
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const auction = {
|
||||
phase: 'bidding',
|
||||
teams: [createFullTeam(1), createFullTeam(2)],
|
||||
currentBid: 10,
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const { service } = createService({
|
||||
auction: {
|
||||
findOne: jest.fn().mockResolvedValue(auction),
|
||||
},
|
||||
});
|
||||
|
||||
await expect(
|
||||
service.placeBid({
|
||||
matchId,
|
||||
teamIndex: 1,
|
||||
amount: 20,
|
||||
}),
|
||||
).rejects.toThrow('Team already has maximum members.');
|
||||
expect(auction.save).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('extends a short bid deadline using the configured bid extension seconds', async () => {
|
||||
const now = new Date('2026-05-02T00:00:00.000Z');
|
||||
jest.useFakeTimers().setSystemTime(now);
|
||||
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const captainUserId = new mongoose.Types.ObjectId();
|
||||
const auction = {
|
||||
_id: new mongoose.Types.ObjectId(),
|
||||
matchId,
|
||||
phase: 'bidding',
|
||||
teams: [
|
||||
{
|
||||
teamIndex: 1,
|
||||
captainUserId,
|
||||
points: 1000,
|
||||
members: [],
|
||||
},
|
||||
],
|
||||
currentBid: 10,
|
||||
currentDeadline: new Date(now.getTime() + 2000),
|
||||
maxTimerSeconds: 30,
|
||||
bidExtensionSeconds: 12,
|
||||
bids: [],
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
toObject: jest.fn().mockReturnValue({ _id: 'auction', matchId }),
|
||||
};
|
||||
const { service } = createService({
|
||||
auction: {
|
||||
findOne: jest.fn().mockResolvedValue(auction),
|
||||
},
|
||||
});
|
||||
|
||||
await service.placeBid({
|
||||
matchId,
|
||||
teamIndex: 1,
|
||||
amount: 20,
|
||||
});
|
||||
|
||||
expect(auction.currentDeadline).toEqual(
|
||||
new Date(now.getTime() + 12000),
|
||||
);
|
||||
expect(auction.save).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('rejects sold confirmation when the winning team is already full', async () => {
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const auction = {
|
||||
phase: 'bidding',
|
||||
currentBidderTeamIndex: 1,
|
||||
currentBid: 20,
|
||||
currentIndex: 0,
|
||||
order: [
|
||||
{
|
||||
userId: new mongoose.Types.ObjectId(),
|
||||
preferredPositions: [{ position: 'ADC', priority: 1 }],
|
||||
},
|
||||
],
|
||||
teams: [createFullTeam(1), createFullTeam(2)],
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const { service } = createService({
|
||||
auction: {
|
||||
findOne: jest.fn().mockResolvedValue(auction),
|
||||
},
|
||||
});
|
||||
|
||||
await expect(service.markSold({ matchId })).rejects.toThrow(
|
||||
'Team already has maximum members.',
|
||||
);
|
||||
expect(auction.save).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('marks a zero-bid player as passed and queues them for another round', async () => {
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const playerId = new mongoose.Types.ObjectId();
|
||||
const auction = {
|
||||
_id: new mongoose.Types.ObjectId(),
|
||||
matchId,
|
||||
phase: 'bidding',
|
||||
currentBid: 0,
|
||||
currentIndex: 0,
|
||||
auctionRound: 1,
|
||||
order: [
|
||||
{
|
||||
userId: playerId,
|
||||
preferredPositions: [{ position: 'MID', priority: 1 }],
|
||||
passCount: 0,
|
||||
},
|
||||
],
|
||||
passedQueue: [],
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
toObject: jest.fn().mockReturnValue({ _id: 'auction', matchId }),
|
||||
};
|
||||
const { service } = createService({
|
||||
auction: {
|
||||
findOne: jest.fn().mockResolvedValue(auction),
|
||||
},
|
||||
});
|
||||
|
||||
await service.markPassed(matchId);
|
||||
|
||||
expect(auction.phase).toBe('passed');
|
||||
expect(auction.order[0].passCount).toBe(1);
|
||||
expect(auction.passedQueue).toHaveLength(1);
|
||||
expect(auction.save).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('queues zero-bid passes after the first auction round', async () => {
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const playerId = new mongoose.Types.ObjectId();
|
||||
const auction = {
|
||||
_id: new mongoose.Types.ObjectId(),
|
||||
matchId,
|
||||
phase: 'bidding',
|
||||
currentBid: 0,
|
||||
currentIndex: 0,
|
||||
auctionRound: 2,
|
||||
order: [
|
||||
{
|
||||
userId: playerId,
|
||||
preferredPositions: [{ position: 'MID', priority: 1 }],
|
||||
passCount: 1,
|
||||
},
|
||||
],
|
||||
passedQueue: [],
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
toObject: jest.fn().mockReturnValue({ _id: 'auction', matchId }),
|
||||
};
|
||||
const { service } = createService({
|
||||
auction: {
|
||||
findOne: jest.fn().mockResolvedValue(auction),
|
||||
},
|
||||
});
|
||||
|
||||
await service.markPassed(matchId);
|
||||
|
||||
expect(auction.phase).toBe('passed');
|
||||
expect(auction.order[0].passCount).toBe(2);
|
||||
expect(auction.passedQueue).toHaveLength(1);
|
||||
expect(auction.passedQueue[0]).toMatchObject({
|
||||
userId: playerId.toString(),
|
||||
preferredPositions: [{ position: 'MID', priority: 1 }],
|
||||
passCount: 2,
|
||||
});
|
||||
});
|
||||
|
||||
it('requeues second-pass players instead of force-assigning them', async () => {
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const captainOneId = new mongoose.Types.ObjectId();
|
||||
const captainTwoId = new mongoose.Types.ObjectId();
|
||||
const passedPlayerId = new mongoose.Types.ObjectId();
|
||||
const passedPlayer = {
|
||||
userId: passedPlayerId,
|
||||
preferredPositions: [{ position: 'SUP', priority: 1 }],
|
||||
passCount: 2,
|
||||
};
|
||||
const auction = {
|
||||
_id: new mongoose.Types.ObjectId(),
|
||||
matchId,
|
||||
phase: 'passed',
|
||||
currentIndex: 0,
|
||||
auctionRound: 2,
|
||||
order: [passedPlayer],
|
||||
passedQueue: [passedPlayer],
|
||||
teams: [
|
||||
{
|
||||
teamIndex: 1,
|
||||
captainUserId: captainOneId,
|
||||
points: 10,
|
||||
members: [],
|
||||
},
|
||||
{
|
||||
teamIndex: 2,
|
||||
captainUserId: captainTwoId,
|
||||
points: 50,
|
||||
members: [],
|
||||
},
|
||||
],
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
toObject: jest.fn().mockReturnValue({ _id: 'auction', matchId }),
|
||||
};
|
||||
const { service } = createService({
|
||||
auction: {
|
||||
findOne: jest.fn().mockResolvedValue(auction),
|
||||
},
|
||||
});
|
||||
|
||||
await service.next(matchId);
|
||||
|
||||
expect(auction.phase).toBe('presenting');
|
||||
expect(auction.auctionRound).toBe(3);
|
||||
expect(auction.currentIndex).toBe(1);
|
||||
expect(auction.order).toHaveLength(2);
|
||||
expect(auction.order[1]).toMatchObject({
|
||||
userId: passedPlayerId.toString(),
|
||||
preferredPositions: [{ position: 'SUP', priority: 1 }],
|
||||
passCount: 2,
|
||||
});
|
||||
expect(auction.passedQueue).toEqual([]);
|
||||
expect(auction.teams[0].members).toEqual([]);
|
||||
expect(auction.teams[1].members).toEqual([]);
|
||||
expect(auction.teams[0].points).toBe(10);
|
||||
expect(auction.teams[1].points).toBe(50);
|
||||
});
|
||||
|
||||
it('syncs completed auction teams into the match document', async () => {
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const blueCaptainId = new mongoose.Types.ObjectId();
|
||||
const redCaptainId = new mongoose.Types.ObjectId();
|
||||
const blueMemberId = new mongoose.Types.ObjectId();
|
||||
const redMemberId = new mongoose.Types.ObjectId();
|
||||
|
||||
const auction = {
|
||||
matchId,
|
||||
phase: 'sold',
|
||||
currentIndex: 1,
|
||||
order: [{ userId: blueMemberId }, { userId: redMemberId }],
|
||||
teams: [
|
||||
{
|
||||
teamIndex: 1,
|
||||
captainUserId: blueCaptainId,
|
||||
points: 970,
|
||||
members: [
|
||||
{
|
||||
userId: blueMemberId,
|
||||
assignedPosition: 'ADC',
|
||||
cost: 30,
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
teamIndex: 2,
|
||||
captainUserId: redCaptainId,
|
||||
points: 940,
|
||||
members: [
|
||||
{
|
||||
userId: redMemberId,
|
||||
assignedPosition: 'JGL',
|
||||
cost: 60,
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const match = {
|
||||
participants: [
|
||||
{
|
||||
userId: blueCaptainId,
|
||||
preferredPositions: [{ position: 'TOP', priority: 1 }],
|
||||
},
|
||||
{
|
||||
userId: redCaptainId,
|
||||
preferredPositions: [{ position: 'MID', priority: 1 }],
|
||||
},
|
||||
{
|
||||
userId: blueMemberId,
|
||||
preferredPositions: [{ position: 'ADC', priority: 1 }],
|
||||
},
|
||||
{
|
||||
userId: redMemberId,
|
||||
preferredPositions: [{ position: 'JGL', priority: 1 }],
|
||||
},
|
||||
],
|
||||
status: 'team-built',
|
||||
teams: [],
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const { service, tournamentCodeService, tournamentResultService } =
|
||||
createService({
|
||||
auction: {
|
||||
findOne: jest.fn().mockResolvedValue(auction),
|
||||
},
|
||||
match: {
|
||||
findById: jest.fn().mockResolvedValue(match),
|
||||
},
|
||||
});
|
||||
|
||||
await service.next(matchId);
|
||||
|
||||
expect(auction.phase).toBe('complete');
|
||||
expect(auction.completedAt).toBeInstanceOf(Date);
|
||||
expect(auction.save).toHaveBeenCalledTimes(1);
|
||||
expect(match.save).toHaveBeenCalledTimes(1);
|
||||
expect(match.teams).toEqual([
|
||||
{
|
||||
teamIndex: 1,
|
||||
name: '1팀',
|
||||
captainUserId: blueCaptainId,
|
||||
members: [
|
||||
{
|
||||
userId: blueCaptainId,
|
||||
assignedPosition: 'TOP',
|
||||
cost: 0,
|
||||
},
|
||||
{
|
||||
userId: blueMemberId,
|
||||
assignedPosition: 'ADC',
|
||||
cost: 30,
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
teamIndex: 2,
|
||||
name: '2팀',
|
||||
captainUserId: redCaptainId,
|
||||
members: [
|
||||
{
|
||||
userId: redCaptainId,
|
||||
assignedPosition: 'MID',
|
||||
cost: 0,
|
||||
},
|
||||
{
|
||||
userId: redMemberId,
|
||||
assignedPosition: 'JGL',
|
||||
cost: 60,
|
||||
},
|
||||
],
|
||||
},
|
||||
]);
|
||||
expect(tournamentCodeService.reserveForMatch).toHaveBeenCalledWith(match);
|
||||
expect(tournamentResultService.scheduleInitialPoll).toHaveBeenCalledWith(
|
||||
match,
|
||||
);
|
||||
});
|
||||
|
||||
it('clears match teams when resetting an auction', async () => {
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const session = {
|
||||
startTransaction: jest.fn(),
|
||||
commitTransaction: jest.fn().mockResolvedValue(undefined),
|
||||
abortTransaction: jest.fn().mockResolvedValue(undefined),
|
||||
endSession: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const auction = {
|
||||
deleteOne: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const match = {
|
||||
communityId,
|
||||
status: 'team-built',
|
||||
teams: [
|
||||
{
|
||||
teamIndex: 1,
|
||||
name: '1팀',
|
||||
members: [],
|
||||
},
|
||||
],
|
||||
tournamentCodeIds: [new mongoose.Types.ObjectId()],
|
||||
gameSchedule: [{ gameNumber: 1, teamAIndex: 1, teamBIndex: 2 }],
|
||||
participants: [],
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const auctionFindOneQuery = {
|
||||
session: jest.fn().mockResolvedValue(auction),
|
||||
};
|
||||
const matchFindByIdQuery = {
|
||||
session: jest.fn().mockResolvedValue(match),
|
||||
};
|
||||
const { service, connectionService } = createService({
|
||||
auction: {
|
||||
findOne: jest.fn().mockReturnValue(auctionFindOneQuery),
|
||||
},
|
||||
match: {
|
||||
findById: jest.fn().mockReturnValue(matchFindByIdQuery),
|
||||
},
|
||||
});
|
||||
connectionService.createSession.mockResolvedValue(session);
|
||||
|
||||
await service.reset({ matchId, communityId });
|
||||
|
||||
expect(match.status).toBe('recruiting');
|
||||
expect(match.teams).toEqual([]);
|
||||
expect(match.tournamentCodeIds).toEqual([]);
|
||||
expect(match.gameSchedule).toEqual([]);
|
||||
expect(match.save).toHaveBeenCalledWith({ session });
|
||||
expect(session.commitTransaction).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('undoes to a history snapshot and releases resources when leaving complete', async () => {
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const auctionId = new mongoose.Types.ObjectId();
|
||||
const session = {
|
||||
startTransaction: jest.fn(),
|
||||
commitTransaction: jest.fn().mockResolvedValue(undefined),
|
||||
abortTransaction: jest.fn().mockResolvedValue(undefined),
|
||||
endSession: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const auction = {
|
||||
_id: auctionId,
|
||||
matchId,
|
||||
completedAt: new Date(),
|
||||
};
|
||||
const snapshot = {
|
||||
_id: auctionId.toString(),
|
||||
matchId: matchId.toString(),
|
||||
phase: 'bidding',
|
||||
order: [],
|
||||
teams: [],
|
||||
};
|
||||
const restored = { _id: auctionId, phase: 'bidding' };
|
||||
const match = {
|
||||
communityId,
|
||||
status: 'finished',
|
||||
result: { games: [] },
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const auctionFindOneQuery = {
|
||||
session: jest.fn().mockResolvedValue(auction),
|
||||
};
|
||||
const matchFindByIdQuery = {
|
||||
session: jest.fn().mockResolvedValue(match),
|
||||
};
|
||||
const historyFindOneQuery = {
|
||||
session: jest.fn().mockReturnValue({
|
||||
lean: jest.fn().mockReturnValue({
|
||||
exec: jest.fn().mockResolvedValue({
|
||||
auctionId,
|
||||
matchId,
|
||||
sequence: 3,
|
||||
snapshotBefore: snapshot,
|
||||
}),
|
||||
}),
|
||||
}),
|
||||
};
|
||||
const historyDeleteManyQuery = {
|
||||
session: jest.fn().mockReturnValue({
|
||||
exec: jest.fn().mockResolvedValue(undefined),
|
||||
}),
|
||||
};
|
||||
const auctionReplaceOne = jest.fn().mockReturnValue({
|
||||
exec: jest.fn().mockResolvedValue(undefined),
|
||||
});
|
||||
const { service, connectionService, tournamentCodeService, tournamentResultService } =
|
||||
createService({
|
||||
auction: {
|
||||
findOne: jest.fn().mockReturnValue(auctionFindOneQuery),
|
||||
replaceOne: auctionReplaceOne,
|
||||
findById: jest.fn().mockResolvedValue(restored),
|
||||
},
|
||||
auctionHistory: {
|
||||
findOne: jest.fn().mockReturnValue(historyFindOneQuery),
|
||||
deleteMany: jest.fn().mockReturnValue(historyDeleteManyQuery),
|
||||
},
|
||||
match: {
|
||||
findById: jest.fn().mockReturnValue(matchFindByIdQuery),
|
||||
},
|
||||
});
|
||||
connectionService.createSession.mockResolvedValue(session);
|
||||
|
||||
await expect(
|
||||
service.undoTo({ matchId, communityId, sequence: 3 }),
|
||||
).resolves.toBe(restored);
|
||||
|
||||
expect(tournamentCodeService.releaseFromMatch).toHaveBeenCalledWith(match);
|
||||
expect(tournamentResultService.cancelPolling).toHaveBeenCalledWith(match);
|
||||
expect(match.status).toBe('team-built');
|
||||
expect(match.result).toBeUndefined();
|
||||
expect(auctionReplaceOne).toHaveBeenCalledWith(
|
||||
{ _id: auctionId },
|
||||
snapshot,
|
||||
{ session },
|
||||
);
|
||||
expect(session.commitTransaction).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
});
|
||||
@@ -1,982 +0,0 @@
|
||||
import {
|
||||
BadRequestException,
|
||||
Injectable,
|
||||
InternalServerErrorException,
|
||||
Logger,
|
||||
NotFoundException,
|
||||
} from '@nestjs/common';
|
||||
import { randomUUID } from 'crypto';
|
||||
import mongoose from 'mongoose';
|
||||
import { ConnectionService } from '../global/database/connection.service';
|
||||
import {
|
||||
AuctionActionType,
|
||||
AuctionChatMessage,
|
||||
AuctionDocument,
|
||||
AuctionPlayerSnapshot,
|
||||
AuctionTeam,
|
||||
AuctionTopTierThreshold,
|
||||
MatchParticipant,
|
||||
MatchTeamMember,
|
||||
Position,
|
||||
RiotAccount,
|
||||
} from '../global/database/schema';
|
||||
import { RiotAccountEnrichmentService } from '../riot/riot-account-enrichment.service';
|
||||
import type { RiotPlatformRoute, RiotRegionalRoute } from '../riot/riot.types';
|
||||
import { TournamentCodeService } from '../tournament-code/tournament-code.service';
|
||||
import { TournamentResultService } from '../tournament-result/tournament-result.service';
|
||||
|
||||
const AUCTION_MAX_TEAM_SIZE = 5;
|
||||
const AUCTION_BACKGROUND_ENRICHMENT_CONCURRENCY = 1;
|
||||
const AUCTION_ENRICHMENT_COOLDOWN_MS = 3 * 60 * 60 * 1000;
|
||||
const AUCTION_CHAT_MAX_MESSAGES = 200;
|
||||
const AUCTION_CHAT_MAX_MESSAGE_LENGTH = 300;
|
||||
const AUCTION_CHAT_MAX_DISPLAY_NAME_LENGTH = 24;
|
||||
|
||||
interface StartAuctionParams {
|
||||
matchId: mongoose.Types.ObjectId;
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
captains: {
|
||||
teamIndex: number;
|
||||
userId: mongoose.Types.ObjectId;
|
||||
initialPoints?: number;
|
||||
}[];
|
||||
initialPoints: number;
|
||||
maxTimerSeconds: number;
|
||||
bidExtensionSeconds: number;
|
||||
topTierThreshold: AuctionTopTierThreshold;
|
||||
manualTopTierUserIds: mongoose.Types.ObjectId[];
|
||||
}
|
||||
|
||||
interface PlaceBidParams {
|
||||
matchId: mongoose.Types.ObjectId;
|
||||
teamIndex: number;
|
||||
amount: number;
|
||||
bidderUserId?: mongoose.Types.ObjectId;
|
||||
}
|
||||
|
||||
interface MarkSoldParams {
|
||||
matchId: mongoose.Types.ObjectId;
|
||||
assignedPosition?: Position;
|
||||
}
|
||||
|
||||
interface AppendChatMessageParams {
|
||||
matchId: mongoose.Types.ObjectId;
|
||||
userId?: mongoose.Types.ObjectId;
|
||||
displayName?: string;
|
||||
message: string;
|
||||
}
|
||||
|
||||
export interface AuctionHistoryView {
|
||||
sequence: number;
|
||||
action: AuctionActionType;
|
||||
actionLabel: string;
|
||||
takenAt: Date;
|
||||
}
|
||||
|
||||
interface AuctionEnrichmentTarget {
|
||||
userId: mongoose.Types.ObjectId;
|
||||
puuid: string;
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class AuctionService {
|
||||
private readonly logger = new Logger(AuctionService.name);
|
||||
|
||||
constructor(
|
||||
private readonly connectionService: ConnectionService,
|
||||
private readonly enrichmentService: RiotAccountEnrichmentService,
|
||||
private readonly tournamentCodeService: TournamentCodeService,
|
||||
private readonly tournamentResultService: TournamentResultService,
|
||||
) {}
|
||||
|
||||
public async start(params: StartAuctionParams): Promise<AuctionDocument> {
|
||||
const MatchModel = await this.connectionService.getModel('match');
|
||||
const UserModel = await this.connectionService.getModel('user');
|
||||
const AuctionModel = await this.connectionService.getModel('auction');
|
||||
const CommunityModel = await this.connectionService.getModel('community');
|
||||
|
||||
const match = await MatchModel.findById(params.matchId);
|
||||
if (!match) throw new NotFoundException('Match not found.');
|
||||
if (!match.communityId.equals(params.communityId)) {
|
||||
throw new BadRequestException('Match does not belong to this community.');
|
||||
}
|
||||
|
||||
const existing = await AuctionModel.findOne({ matchId: params.matchId });
|
||||
if (existing) {
|
||||
throw new BadRequestException('Auction already exists for this match.');
|
||||
}
|
||||
|
||||
const activeParticipants = this.applyAuctionCut(match);
|
||||
const desiredAuctionCount = activeParticipants.length;
|
||||
if (desiredAuctionCount < 10) {
|
||||
throw new BadRequestException('Not enough participants (need at least 10).');
|
||||
}
|
||||
const expectedCaptainCount = desiredAuctionCount / AUCTION_MAX_TEAM_SIZE;
|
||||
if (params.captains.length !== expectedCaptainCount) {
|
||||
throw new BadRequestException(
|
||||
`Expected ${expectedCaptainCount} captains for ${desiredAuctionCount} participants.`,
|
||||
);
|
||||
}
|
||||
this.assertCaptainAssignments(
|
||||
params.captains,
|
||||
activeParticipants,
|
||||
expectedCaptainCount,
|
||||
);
|
||||
const captainUserIds = params.captains.map((c) => c.userId);
|
||||
|
||||
const basePlayerUsers = await UserModel.find({
|
||||
_id: {
|
||||
$in: activeParticipants
|
||||
.filter((p) => !captainUserIds.some((cid) => cid.equals(p.userId)))
|
||||
.map((p) => p.userId),
|
||||
},
|
||||
});
|
||||
const community = await CommunityModel.findById(match.communityId)
|
||||
.select({ riotPlatform: 1, riotRegion: 1 })
|
||||
.lean()
|
||||
.exec();
|
||||
const platform = community?.riotPlatform ?? 'kr';
|
||||
const region = community?.riotRegion ?? 'asia';
|
||||
|
||||
const enrichCooldownCutoff = Date.now() - AUCTION_ENRICHMENT_COOLDOWN_MS;
|
||||
const enrichTargets = basePlayerUsers.flatMap((user) => {
|
||||
const account =
|
||||
user.riotAccounts.find((entry) => entry.isPrimary) ?? user.riotAccounts[0];
|
||||
if (!account?.puuid) return [];
|
||||
if (this.wasRecentlyRefreshed(account, enrichCooldownCutoff)) return [];
|
||||
return [{ userId: user._id, puuid: account.puuid }];
|
||||
});
|
||||
|
||||
const userById = new Map(basePlayerUsers.map((u) => [u._id.toString(), u]));
|
||||
|
||||
const nonCaptainPuuids = new Set<string>();
|
||||
const order: AuctionPlayerSnapshot[] = [];
|
||||
for (const participant of activeParticipants) {
|
||||
if (captainUserIds.some((cid) => cid.equals(participant.userId))) {
|
||||
continue;
|
||||
}
|
||||
const user = userById.get(participant.userId.toString());
|
||||
if (!user) continue;
|
||||
const primary =
|
||||
user.riotAccounts.find((a) => a.isPrimary) ?? user.riotAccounts[0];
|
||||
if (!primary) {
|
||||
throw new BadRequestException(
|
||||
`Participant ${user._id.toString()} has no Riot account.`,
|
||||
);
|
||||
}
|
||||
if (nonCaptainPuuids.has(primary.puuid)) continue;
|
||||
nonCaptainPuuids.add(primary.puuid);
|
||||
order.push({
|
||||
userId: user._id,
|
||||
puuid: primary.puuid,
|
||||
gameName: primary.gameName,
|
||||
tagLine: primary.tagLine,
|
||||
profileIconId: primary.profileIconId,
|
||||
preferredPositions: participant.preferredPositions,
|
||||
tiers: primary.tiers,
|
||||
tierHistory: primary.tierHistory ?? [],
|
||||
masteries: primary.championMasteries,
|
||||
recentStatsSummary: primary.recentStatsSummary,
|
||||
passCount: 0,
|
||||
});
|
||||
}
|
||||
const shuffledOrder = this.shuffleAuctionPlayerOrder(order);
|
||||
const prioritizedOrder = this.applyTopTierPriority(
|
||||
shuffledOrder,
|
||||
params.topTierThreshold,
|
||||
params.manualTopTierUserIds,
|
||||
);
|
||||
|
||||
const auction = await AuctionModel.create({
|
||||
matchId: params.matchId,
|
||||
phase: 'presenting',
|
||||
teams: params.captains.map((c) => ({
|
||||
teamIndex: c.teamIndex,
|
||||
captainUserId: c.userId,
|
||||
points: c.initialPoints ?? params.initialPoints,
|
||||
members: [],
|
||||
})),
|
||||
order: prioritizedOrder,
|
||||
passedQueue: [],
|
||||
auctionRound: 1,
|
||||
currentIndex: 0,
|
||||
bids: [],
|
||||
currentBid: 0,
|
||||
maxTimerSeconds: params.maxTimerSeconds,
|
||||
bidExtensionSeconds: params.bidExtensionSeconds,
|
||||
initialPoints: params.initialPoints,
|
||||
topTierThreshold: params.topTierThreshold,
|
||||
manualTopTierUserIds:
|
||||
params.topTierThreshold === 'MANUAL' ? params.manualTopTierUserIds : [],
|
||||
startedAt: new Date(),
|
||||
});
|
||||
await this.recordSnapshot(auction, 'start');
|
||||
|
||||
match.status = 'team-built';
|
||||
match.teamBuiltAt = match.teamBuiltAt ?? new Date();
|
||||
await match.save();
|
||||
this.enqueueBackgroundOrderEnrichment({
|
||||
auctionId: auction._id,
|
||||
targets: enrichTargets,
|
||||
platform,
|
||||
region,
|
||||
});
|
||||
|
||||
return auction;
|
||||
}
|
||||
|
||||
public async getByMatchId(
|
||||
matchId: mongoose.Types.ObjectId,
|
||||
): Promise<AuctionDocument> {
|
||||
const AuctionModel = await this.connectionService.getModel('auction');
|
||||
const auction = await AuctionModel.findOne({ matchId });
|
||||
if (!auction) throw new NotFoundException('Auction not found.');
|
||||
return auction;
|
||||
}
|
||||
|
||||
public async appendChatMessage(params: AppendChatMessageParams): Promise<{
|
||||
auction: AuctionDocument;
|
||||
message: AuctionChatMessage;
|
||||
}> {
|
||||
const auction = await this.getByMatchId(params.matchId);
|
||||
const messageText = this.normalizeChatMessage(params.message);
|
||||
const message: AuctionChatMessage = {
|
||||
id: randomUUID(),
|
||||
userId: params.userId,
|
||||
displayName: this.normalizeChatDisplayName(params.displayName),
|
||||
message: messageText,
|
||||
sentAt: new Date(),
|
||||
};
|
||||
|
||||
auction.chatMessages ??= [];
|
||||
auction.chatMessages.push(message);
|
||||
const overflow = auction.chatMessages.length - AUCTION_CHAT_MAX_MESSAGES;
|
||||
if (overflow > 0) {
|
||||
auction.chatMessages.splice(0, overflow);
|
||||
}
|
||||
|
||||
await auction.save();
|
||||
return { auction, message };
|
||||
}
|
||||
|
||||
public async listHistory(params: {
|
||||
matchId: mongoose.Types.ObjectId;
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
}): Promise<AuctionHistoryView[]> {
|
||||
const MatchModel = await this.connectionService.getModel('match');
|
||||
const AuctionHistoryModel =
|
||||
await this.connectionService.getModel('auctionHistory');
|
||||
const match = await MatchModel.findById(params.matchId).select({
|
||||
communityId: 1,
|
||||
});
|
||||
if (!match) throw new NotFoundException('Match not found.');
|
||||
if (!match.communityId.equals(params.communityId)) {
|
||||
throw new BadRequestException('Match does not belong to this community.');
|
||||
}
|
||||
|
||||
const entries = await AuctionHistoryModel.find({ matchId: params.matchId })
|
||||
.sort({ sequence: -1 })
|
||||
.limit(100)
|
||||
.lean()
|
||||
.exec();
|
||||
|
||||
return entries.map((entry) => ({
|
||||
sequence: entry.sequence,
|
||||
action: entry.action,
|
||||
actionLabel: this.formatHistoryActionLabel(entry.action),
|
||||
takenAt: entry.takenAt,
|
||||
}));
|
||||
}
|
||||
|
||||
public async openBidding(
|
||||
matchId: mongoose.Types.ObjectId,
|
||||
): Promise<AuctionDocument> {
|
||||
const auction = await this.getByMatchId(matchId);
|
||||
if (auction.phase !== 'presenting') {
|
||||
throw new BadRequestException('Auction is not in presenting phase.');
|
||||
}
|
||||
await this.recordSnapshot(auction, 'open-bidding');
|
||||
auction.phase = 'bidding';
|
||||
auction.currentBid = 0;
|
||||
auction.currentBidderTeamIndex = undefined;
|
||||
auction.currentDeadline = this.createDeadline(auction.maxTimerSeconds);
|
||||
await auction.save();
|
||||
return auction;
|
||||
}
|
||||
|
||||
public async placeBid(params: PlaceBidParams): Promise<AuctionDocument> {
|
||||
const auction = await this.getByMatchId(params.matchId);
|
||||
if (auction.phase !== 'bidding') {
|
||||
throw new BadRequestException('Auction is not in bidding phase.');
|
||||
}
|
||||
const team = this.findAuctionTeamByIndex(auction, params.teamIndex);
|
||||
if (!team) throw new BadRequestException('Unknown team.');
|
||||
if (params.amount <= auction.currentBid) {
|
||||
throw new BadRequestException('Bid must exceed current bid.');
|
||||
}
|
||||
if (params.amount > team.points) {
|
||||
throw new BadRequestException('Bid exceeds team points.');
|
||||
}
|
||||
this.assertTeamHasSlot(team);
|
||||
// 임시 운영용: 클라이언트에서 선택한 팀장 모드를 신뢰하고 실제 로그인 사용자 검증은 건너뛴다.
|
||||
|
||||
await this.recordSnapshot(auction, 'bid', params.bidderUserId);
|
||||
auction.currentBid = params.amount;
|
||||
auction.currentBidderTeamIndex = params.teamIndex;
|
||||
auction.currentDeadline = this.createDeadline(
|
||||
this.resolveBidExtensionSeconds(auction),
|
||||
);
|
||||
auction.bids.push({
|
||||
teamIndex: params.teamIndex,
|
||||
amount: params.amount,
|
||||
bidderUserId: team.captainUserId,
|
||||
timestamp: new Date(),
|
||||
});
|
||||
await auction.save();
|
||||
return auction;
|
||||
}
|
||||
|
||||
public async markSold(params: MarkSoldParams): Promise<AuctionDocument> {
|
||||
const auction = await this.getByMatchId(params.matchId);
|
||||
if (auction.phase !== 'bidding') {
|
||||
throw new BadRequestException('Auction is not in bidding phase.');
|
||||
}
|
||||
if (!auction.currentBidderTeamIndex || auction.currentBid <= 0) {
|
||||
throw new BadRequestException('No bid to mark sold.');
|
||||
}
|
||||
const team = this.findAuctionTeamByIndex(
|
||||
auction,
|
||||
auction.currentBidderTeamIndex,
|
||||
);
|
||||
if (!team) throw new BadRequestException('Winning team not found.');
|
||||
this.assertTeamHasSlot(team);
|
||||
|
||||
const current = auction.order[auction.currentIndex];
|
||||
if (!current) throw new BadRequestException('No current player.');
|
||||
|
||||
await this.recordSnapshot(auction, 'sold');
|
||||
const preferredPrimary = current.preferredPositions[0]?.position;
|
||||
team.members.push({
|
||||
userId: current.userId,
|
||||
assignedPosition: params.assignedPosition ?? preferredPrimary ?? 'MID',
|
||||
cost: auction.currentBid,
|
||||
});
|
||||
team.points -= auction.currentBid;
|
||||
auction.phase = 'sold';
|
||||
auction.currentDeadline = undefined;
|
||||
await auction.save();
|
||||
return auction;
|
||||
}
|
||||
|
||||
public async markPassed(
|
||||
matchId: mongoose.Types.ObjectId,
|
||||
): Promise<AuctionDocument> {
|
||||
const auction = await this.getByMatchId(matchId);
|
||||
if (auction.phase !== 'bidding') {
|
||||
throw new BadRequestException('Auction is not in bidding phase.');
|
||||
}
|
||||
if (auction.currentBid > 0) {
|
||||
throw new BadRequestException('Cannot pass a player with an active bid.');
|
||||
}
|
||||
const current = auction.order[auction.currentIndex];
|
||||
if (!current) throw new BadRequestException('No current player.');
|
||||
|
||||
await this.recordSnapshot(auction, 'passed');
|
||||
current.passCount = (current.passCount ?? 0) + 1;
|
||||
auction.passedQueue ??= [];
|
||||
auction.passedQueue.push(this.cloneAuctionPlayerSnapshot(current));
|
||||
auction.phase = 'passed';
|
||||
auction.currentDeadline = undefined;
|
||||
await auction.save();
|
||||
return auction;
|
||||
}
|
||||
|
||||
public async next(
|
||||
matchId: mongoose.Types.ObjectId,
|
||||
): Promise<AuctionDocument> {
|
||||
const auction = await this.getByMatchId(matchId);
|
||||
if (
|
||||
auction.phase !== 'sold' &&
|
||||
auction.phase !== 'presenting' &&
|
||||
auction.phase !== 'passed'
|
||||
) {
|
||||
throw new BadRequestException('Cannot advance from current phase.');
|
||||
}
|
||||
const nextIndex = auction.currentIndex + 1;
|
||||
const completesAuction =
|
||||
nextIndex >= auction.order.length &&
|
||||
(auction.passedQueue?.length ?? 0) === 0;
|
||||
await this.recordSnapshot(auction, completesAuction ? 'complete' : 'next');
|
||||
if (nextIndex >= auction.order.length) {
|
||||
if ((auction.passedQueue?.length ?? 0) > 0) {
|
||||
auction.order.push(
|
||||
...auction.passedQueue.map((player) =>
|
||||
this.cloneAuctionPlayerSnapshot(player),
|
||||
),
|
||||
);
|
||||
auction.passedQueue = [];
|
||||
auction.auctionRound = (auction.auctionRound ?? 1) + 1;
|
||||
auction.currentIndex = nextIndex;
|
||||
auction.phase = 'presenting';
|
||||
auction.currentBid = 0;
|
||||
auction.currentBidderTeamIndex = undefined;
|
||||
} else {
|
||||
auction.phase = 'complete';
|
||||
auction.completedAt = new Date();
|
||||
}
|
||||
} else {
|
||||
auction.currentIndex = nextIndex;
|
||||
auction.phase = 'presenting';
|
||||
auction.currentBid = 0;
|
||||
auction.currentBidderTeamIndex = undefined;
|
||||
}
|
||||
auction.currentDeadline = undefined;
|
||||
await auction.save();
|
||||
if (auction.phase === 'complete') {
|
||||
await this.syncMatchTeamsFromAuction(auction);
|
||||
}
|
||||
return auction;
|
||||
}
|
||||
|
||||
public async reset(params: {
|
||||
matchId: mongoose.Types.ObjectId;
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
}): Promise<void> {
|
||||
const AuctionModel = await this.connectionService.getModel('auction');
|
||||
const AuctionHistoryModel =
|
||||
await this.connectionService.getModel('auctionHistory');
|
||||
const MatchModel = await this.connectionService.getModel('match');
|
||||
|
||||
const session = await this.connectionService.createSession();
|
||||
if (!session) {
|
||||
throw new InternalServerErrorException('Failed to start DB session.');
|
||||
}
|
||||
try {
|
||||
session.startTransaction();
|
||||
const auction = await AuctionModel.findOne({
|
||||
matchId: params.matchId,
|
||||
}).session(session);
|
||||
if (!auction) throw new NotFoundException('Auction not found.');
|
||||
|
||||
const match = await MatchModel.findById(params.matchId).session(session);
|
||||
if (!match) throw new NotFoundException('Match not found.');
|
||||
if (!match.communityId.equals(params.communityId)) {
|
||||
throw new BadRequestException('Community mismatch.');
|
||||
}
|
||||
|
||||
await auction.deleteOne({ session });
|
||||
await AuctionHistoryModel.deleteMany({ auctionId: auction._id }).session(
|
||||
session,
|
||||
);
|
||||
if (match.status === 'team-built') {
|
||||
await this.tournamentCodeService.releaseFromMatch(match);
|
||||
match.status = 'recruiting';
|
||||
match.teams = [];
|
||||
match.tournamentCodeIds = [];
|
||||
match.gameSchedule = [];
|
||||
match.participants.forEach((participant) => {
|
||||
participant.excluded = false;
|
||||
});
|
||||
match.teamBuiltAt = undefined;
|
||||
match.result = undefined;
|
||||
match.resultPollState = undefined;
|
||||
await match.save({ session });
|
||||
}
|
||||
await session.commitTransaction();
|
||||
} catch (err) {
|
||||
await session.abortTransaction();
|
||||
throw err;
|
||||
} finally {
|
||||
await session.endSession();
|
||||
}
|
||||
}
|
||||
|
||||
public async undoTo(params: {
|
||||
matchId: mongoose.Types.ObjectId;
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
sequence: number;
|
||||
}): Promise<AuctionDocument> {
|
||||
const AuctionModel = await this.connectionService.getModel('auction');
|
||||
const AuctionHistoryModel =
|
||||
await this.connectionService.getModel('auctionHistory');
|
||||
const MatchModel = await this.connectionService.getModel('match');
|
||||
|
||||
const session = await this.connectionService.createSession();
|
||||
if (!session) {
|
||||
throw new InternalServerErrorException('Failed to start DB session.');
|
||||
}
|
||||
|
||||
try {
|
||||
session.startTransaction();
|
||||
const auction = await AuctionModel.findOne({
|
||||
matchId: params.matchId,
|
||||
}).session(session);
|
||||
if (!auction) throw new NotFoundException('Auction not found.');
|
||||
|
||||
const match = await MatchModel.findById(params.matchId).session(session);
|
||||
if (!match) throw new NotFoundException('Match not found.');
|
||||
if (!match.communityId.equals(params.communityId)) {
|
||||
throw new BadRequestException('Community mismatch.');
|
||||
}
|
||||
|
||||
const history = await AuctionHistoryModel.findOne({
|
||||
auctionId: auction._id,
|
||||
sequence: params.sequence,
|
||||
})
|
||||
.session(session)
|
||||
.lean()
|
||||
.exec();
|
||||
if (!history) throw new NotFoundException('Auction history not found.');
|
||||
|
||||
const snapshot = history.snapshotBefore;
|
||||
if (!snapshot || typeof snapshot !== 'object') {
|
||||
throw new BadRequestException('Auction history snapshot is invalid.');
|
||||
}
|
||||
|
||||
const undoingCompletedAuction =
|
||||
Boolean(auction.completedAt) && !('completedAt' in snapshot);
|
||||
if (undoingCompletedAuction) {
|
||||
await this.tournamentCodeService.releaseFromMatch(match);
|
||||
await this.tournamentResultService.cancelPolling(match);
|
||||
match.status = 'team-built';
|
||||
match.result = undefined;
|
||||
await match.save({ session });
|
||||
}
|
||||
|
||||
await AuctionModel.replaceOne({ _id: auction._id }, snapshot, {
|
||||
session,
|
||||
}).exec();
|
||||
await AuctionHistoryModel.deleteMany({
|
||||
auctionId: auction._id,
|
||||
sequence: { $gt: params.sequence },
|
||||
})
|
||||
.session(session)
|
||||
.exec();
|
||||
|
||||
await session.commitTransaction();
|
||||
const restored = await AuctionModel.findById(auction._id);
|
||||
if (!restored) throw new NotFoundException('Auction not found.');
|
||||
return restored;
|
||||
} catch (err) {
|
||||
await session.abortTransaction();
|
||||
throw err;
|
||||
} finally {
|
||||
await session.endSession();
|
||||
}
|
||||
}
|
||||
|
||||
private applyTopTierPriority(
|
||||
order: AuctionPlayerSnapshot[],
|
||||
threshold: AuctionTopTierThreshold,
|
||||
manualTopTierUserIds: mongoose.Types.ObjectId[],
|
||||
): AuctionPlayerSnapshot[] {
|
||||
if (threshold === 'NONE') return order;
|
||||
if (threshold === 'MANUAL') {
|
||||
const manualIds = new Set(
|
||||
manualTopTierUserIds.map((userId) => userId.toString()),
|
||||
);
|
||||
if (manualIds.size === 0) return order;
|
||||
const selected = order.filter((snap) =>
|
||||
manualIds.has(snap.userId.toString()),
|
||||
);
|
||||
const rest = order.filter(
|
||||
(snap) => !manualIds.has(snap.userId.toString()),
|
||||
);
|
||||
return [...selected, ...rest];
|
||||
}
|
||||
|
||||
const ranks = [
|
||||
'IRON',
|
||||
'BRONZE',
|
||||
'SILVER',
|
||||
'GOLD',
|
||||
'PLATINUM',
|
||||
'EMERALD',
|
||||
'DIAMOND',
|
||||
'MASTER',
|
||||
'GRANDMASTER',
|
||||
'CHALLENGER',
|
||||
];
|
||||
const cutoff = ranks.indexOf(threshold);
|
||||
const score = (snap: AuctionPlayerSnapshot) => {
|
||||
const solo = snap.tiers.find(
|
||||
(tier) => tier.queueType === 'RANKED_SOLO_5x5',
|
||||
);
|
||||
if (!solo) return -1;
|
||||
const tierIdx = ranks.indexOf(solo.tier);
|
||||
if (tierIdx < cutoff) return -1;
|
||||
const rankBonus =
|
||||
({ I: 4, II: 3, III: 2, IV: 1, '': 0 } as Record<string, number>)[
|
||||
solo.rank
|
||||
] ?? 0;
|
||||
return tierIdx * 1000 + rankBonus * 100 + (solo.leaguePoints ?? 0) * 0.001;
|
||||
};
|
||||
|
||||
const top = order
|
||||
.filter((snap) => score(snap) >= 0)
|
||||
.sort((left, right) => score(right) - score(left));
|
||||
const rest = order.filter((snap) => score(snap) < 0);
|
||||
return [...top, ...rest];
|
||||
}
|
||||
|
||||
private shuffleAuctionPlayerOrder(
|
||||
order: AuctionPlayerSnapshot[],
|
||||
): AuctionPlayerSnapshot[] {
|
||||
const shuffled = [...order];
|
||||
for (let index = shuffled.length - 1; index > 0; index -= 1) {
|
||||
const swapIndex = Math.floor(Math.random() * (index + 1));
|
||||
[shuffled[index], shuffled[swapIndex]] = [
|
||||
shuffled[swapIndex],
|
||||
shuffled[index],
|
||||
];
|
||||
}
|
||||
return shuffled;
|
||||
}
|
||||
|
||||
private cloneAuctionPlayerSnapshot(
|
||||
player: AuctionPlayerSnapshot,
|
||||
): AuctionPlayerSnapshot {
|
||||
return JSON.parse(JSON.stringify(player)) as AuctionPlayerSnapshot;
|
||||
}
|
||||
|
||||
private normalizeChatMessage(message: string): string {
|
||||
const normalized = message.trim();
|
||||
if (!normalized) {
|
||||
throw new BadRequestException('Chat message is required.');
|
||||
}
|
||||
if (Array.from(normalized).length > AUCTION_CHAT_MAX_MESSAGE_LENGTH) {
|
||||
throw new BadRequestException(
|
||||
`Chat message must be ${AUCTION_CHAT_MAX_MESSAGE_LENGTH} characters or less.`,
|
||||
);
|
||||
}
|
||||
return normalized;
|
||||
}
|
||||
|
||||
private normalizeChatDisplayName(displayName: string | undefined): string {
|
||||
const normalized = displayName?.trim() || '관전자';
|
||||
const chars = Array.from(normalized);
|
||||
if (chars.length <= AUCTION_CHAT_MAX_DISPLAY_NAME_LENGTH) {
|
||||
return normalized;
|
||||
}
|
||||
return chars.slice(0, AUCTION_CHAT_MAX_DISPLAY_NAME_LENGTH).join('');
|
||||
}
|
||||
|
||||
private async recordSnapshot(
|
||||
auction: AuctionDocument,
|
||||
action: AuctionActionType,
|
||||
actorUserId?: mongoose.Types.ObjectId,
|
||||
): Promise<void> {
|
||||
const AuctionHistoryModel =
|
||||
await this.connectionService.getModel('auctionHistory');
|
||||
const latest = await AuctionHistoryModel.findOne({ auctionId: auction._id })
|
||||
.sort({ sequence: -1 })
|
||||
.select({ sequence: 1 })
|
||||
.lean()
|
||||
.exec();
|
||||
const snapshotBefore =
|
||||
typeof auction.toObject === 'function'
|
||||
? auction.toObject({ depopulate: true })
|
||||
: auction;
|
||||
|
||||
await AuctionHistoryModel.create({
|
||||
auctionId: auction._id,
|
||||
matchId: auction.matchId,
|
||||
sequence: (latest?.sequence ?? 0) + 1,
|
||||
action,
|
||||
actorUserId,
|
||||
snapshotBefore: JSON.parse(JSON.stringify(snapshotBefore)),
|
||||
takenAt: new Date(),
|
||||
});
|
||||
}
|
||||
|
||||
private formatHistoryActionLabel(action: AuctionActionType): string {
|
||||
switch (action) {
|
||||
case 'start':
|
||||
return '경매 시작';
|
||||
case 'open-bidding':
|
||||
return '입찰 열기';
|
||||
case 'bid':
|
||||
return '입찰';
|
||||
case 'sold':
|
||||
return '낙찰 처리';
|
||||
case 'passed':
|
||||
return '유찰';
|
||||
case 'next':
|
||||
return '다음 선수';
|
||||
case 'complete':
|
||||
return '경매 완료';
|
||||
default:
|
||||
return action;
|
||||
}
|
||||
}
|
||||
|
||||
private applyAuctionCut(match: {
|
||||
participants: MatchParticipant[];
|
||||
}): MatchParticipant[] {
|
||||
const ordered = [...match.participants].sort(
|
||||
(left, right) => left.joinedAt.getTime() - right.joinedAt.getTime(),
|
||||
);
|
||||
const desiredAuctionCount = Math.floor(ordered.length / 10) * 10;
|
||||
const activeIds = new Set(
|
||||
ordered
|
||||
.slice(0, desiredAuctionCount)
|
||||
.map((participant) => participant.userId.toString()),
|
||||
);
|
||||
match.participants.forEach((participant) => {
|
||||
participant.excluded = !activeIds.has(participant.userId.toString());
|
||||
});
|
||||
return ordered.slice(0, desiredAuctionCount);
|
||||
}
|
||||
|
||||
private assertCaptainAssignments(
|
||||
captains: StartAuctionParams['captains'],
|
||||
activeParticipants: Array<{ userId: mongoose.Types.ObjectId }>,
|
||||
expectedCaptainCount: number,
|
||||
): void {
|
||||
const activeUserIds = new Set(
|
||||
activeParticipants.map((participant) => participant.userId.toString()),
|
||||
);
|
||||
const captainUserIds = new Set<string>();
|
||||
const teamIndexes = new Set<number>();
|
||||
|
||||
for (const captain of captains) {
|
||||
const userId = captain.userId.toString();
|
||||
if (!activeUserIds.has(userId)) {
|
||||
throw new BadRequestException(
|
||||
'All captains must be active participants of the match.',
|
||||
);
|
||||
}
|
||||
if (captainUserIds.has(userId)) {
|
||||
throw new BadRequestException('Captains must be different users.');
|
||||
}
|
||||
captainUserIds.add(userId);
|
||||
|
||||
if (
|
||||
!Number.isInteger(captain.teamIndex) ||
|
||||
captain.teamIndex < 1 ||
|
||||
captain.teamIndex > expectedCaptainCount
|
||||
) {
|
||||
throw new BadRequestException('Captain teamIndex is out of range.');
|
||||
}
|
||||
if (teamIndexes.has(captain.teamIndex)) {
|
||||
throw new BadRequestException('Duplicate captain team assignment.');
|
||||
}
|
||||
teamIndexes.add(captain.teamIndex);
|
||||
}
|
||||
|
||||
for (let teamIndex = 1; teamIndex <= expectedCaptainCount; teamIndex += 1) {
|
||||
if (!teamIndexes.has(teamIndex)) {
|
||||
throw new BadRequestException('Each teamIndex needs one captain.');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private findAuctionTeamByIndex(
|
||||
auction: AuctionDocument,
|
||||
teamIndex: number,
|
||||
): AuctionTeam | undefined {
|
||||
return auction.teams.find((team) => team.teamIndex === teamIndex);
|
||||
}
|
||||
|
||||
private createDeadline(secondsFromNow: number): Date {
|
||||
return new Date(Date.now() + secondsFromNow * 1000);
|
||||
}
|
||||
|
||||
private resolveBidExtensionSeconds(auction: AuctionDocument): number {
|
||||
const maxTimerSeconds = Math.max(5, auction.maxTimerSeconds ?? 30);
|
||||
const bidExtensionSeconds = Math.max(0, auction.bidExtensionSeconds ?? 5);
|
||||
const minimumRemainingSeconds = Math.min(
|
||||
maxTimerSeconds,
|
||||
bidExtensionSeconds,
|
||||
);
|
||||
|
||||
if (!auction.currentDeadline) {
|
||||
return maxTimerSeconds;
|
||||
}
|
||||
|
||||
const remainingSeconds = Math.ceil(
|
||||
(auction.currentDeadline.getTime() - Date.now()) / 1000,
|
||||
);
|
||||
return Math.min(
|
||||
maxTimerSeconds,
|
||||
Math.max(minimumRemainingSeconds, remainingSeconds),
|
||||
);
|
||||
}
|
||||
|
||||
private assertTeamHasSlot(team: AuctionTeam): void {
|
||||
if (this.countTeamMembersIncludingCaptain(team) >= AUCTION_MAX_TEAM_SIZE) {
|
||||
throw new BadRequestException('Team already has maximum members.');
|
||||
}
|
||||
}
|
||||
|
||||
private countTeamMembersIncludingCaptain(team: AuctionTeam): number {
|
||||
const userIds = new Set<string>([team.captainUserId.toString()]);
|
||||
for (const member of team.members) {
|
||||
userIds.add(member.userId.toString());
|
||||
}
|
||||
return userIds.size;
|
||||
}
|
||||
|
||||
private async syncMatchTeamsFromAuction(
|
||||
auction: AuctionDocument,
|
||||
): Promise<void> {
|
||||
const MatchModel = await this.connectionService.getModel('match');
|
||||
const match = await MatchModel.findById(auction.matchId);
|
||||
if (!match) throw new NotFoundException('Match not found.');
|
||||
|
||||
const participantByUserId = new Map(
|
||||
match.participants.map((participant) => [
|
||||
participant.userId.toString(),
|
||||
participant,
|
||||
]),
|
||||
);
|
||||
|
||||
match.teams = auction.teams.map((team) => {
|
||||
const captain = participantByUserId.get(team.captainUserId.toString());
|
||||
const members: MatchTeamMember[] = [
|
||||
{
|
||||
userId: team.captainUserId,
|
||||
assignedPosition: captain?.preferredPositions[0]?.position ?? 'MID',
|
||||
cost: 0,
|
||||
},
|
||||
...team.members
|
||||
.filter((member) => !member.userId.equals(team.captainUserId))
|
||||
.map((member) => ({
|
||||
userId: member.userId,
|
||||
assignedPosition: member.assignedPosition,
|
||||
cost: member.cost,
|
||||
})),
|
||||
];
|
||||
|
||||
return {
|
||||
teamIndex: team.teamIndex,
|
||||
name: this.resolveTeamName(team.teamIndex),
|
||||
captainUserId: team.captainUserId,
|
||||
members,
|
||||
};
|
||||
});
|
||||
match.status = 'team-built';
|
||||
match.teamBuiltAt = match.teamBuiltAt ?? new Date();
|
||||
await match.save();
|
||||
await this.tournamentCodeService.reserveForMatch(match);
|
||||
await this.tournamentResultService.scheduleInitialPoll(match);
|
||||
}
|
||||
|
||||
private enqueueBackgroundOrderEnrichment(params: {
|
||||
auctionId: mongoose.Types.ObjectId;
|
||||
targets: AuctionEnrichmentTarget[];
|
||||
platform: RiotPlatformRoute;
|
||||
region: RiotRegionalRoute;
|
||||
}): void {
|
||||
if (params.targets.length === 0) return;
|
||||
|
||||
// 경매 시작 UX를 막지 않도록 Riot 최신화는 뒤에서 1명씩 천천히 수행한다.
|
||||
void this.refreshOrderSnapshotsFromRiot(params).catch((error: unknown) => {
|
||||
this.logger.warn(
|
||||
`Auction background Riot refresh failed for ${params.auctionId.toString()}: ${
|
||||
error instanceof Error ? error.message : error
|
||||
}`,
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
private async refreshOrderSnapshotsFromRiot(params: {
|
||||
auctionId: mongoose.Types.ObjectId;
|
||||
targets: AuctionEnrichmentTarget[];
|
||||
platform: RiotPlatformRoute;
|
||||
region: RiotRegionalRoute;
|
||||
}): Promise<void> {
|
||||
const AuctionModel = await this.connectionService.getModel('auction');
|
||||
|
||||
this.logger.debug(
|
||||
`Refreshing Riot snapshots for ${params.targets.length} auction players in background.`,
|
||||
);
|
||||
|
||||
await runWithConcurrency(
|
||||
params.targets,
|
||||
AUCTION_BACKGROUND_ENRICHMENT_CONCURRENCY,
|
||||
async (target) => {
|
||||
try {
|
||||
const result = await this.enrichmentService.enrichRiotAccount({
|
||||
userId: target.userId,
|
||||
puuid: target.puuid,
|
||||
options: {
|
||||
force: false,
|
||||
platform: params.platform,
|
||||
region: params.region,
|
||||
},
|
||||
});
|
||||
const account = result.account;
|
||||
if (!account) return;
|
||||
|
||||
await AuctionModel.updateOne(
|
||||
{
|
||||
_id: params.auctionId,
|
||||
'order.userId': target.userId,
|
||||
},
|
||||
{
|
||||
$set: {
|
||||
'order.$.gameName': account.gameName,
|
||||
'order.$.tagLine': account.tagLine,
|
||||
'order.$.profileIconId': account.profileIconId,
|
||||
'order.$.tiers': account.tiers,
|
||||
'order.$.tierHistory': account.tierHistory ?? [],
|
||||
'order.$.masteries': account.championMasteries,
|
||||
'order.$.recentStatsSummary': account.recentStatsSummary,
|
||||
updatedAt: new Date(),
|
||||
},
|
||||
},
|
||||
).exec();
|
||||
} catch (error: unknown) {
|
||||
this.logger.warn(
|
||||
`Failed to refresh auction Riot snapshot for ${target.puuid}: ${
|
||||
error instanceof Error ? error.message : error
|
||||
}`,
|
||||
);
|
||||
}
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
private wasRecentlyRefreshed(account: RiotAccount, cutoff: number): boolean {
|
||||
return this.getLatestRefreshAt(account) >= cutoff;
|
||||
}
|
||||
|
||||
private getLatestRefreshAt(account: RiotAccount): number {
|
||||
const timestamps = [
|
||||
account.lastRefreshRequestedAt,
|
||||
account.recentStatsFetchedAt,
|
||||
account.championMasteriesFetchedAt,
|
||||
account.matchIdsFetchedAt,
|
||||
...account.tiers.map((tier) => tier.fetchedAt),
|
||||
];
|
||||
|
||||
return timestamps.reduce((latest, value) => {
|
||||
const timestamp = value instanceof Date ? value.getTime() : 0;
|
||||
return Math.max(latest, timestamp);
|
||||
}, 0);
|
||||
}
|
||||
|
||||
private resolveTeamName(teamIndex: number): string {
|
||||
return `${teamIndex}팀`;
|
||||
}
|
||||
}
|
||||
|
||||
async function runWithConcurrency<T>(
|
||||
items: T[],
|
||||
concurrency: number,
|
||||
worker: (item: T) => Promise<void>,
|
||||
): Promise<void> {
|
||||
if (items.length === 0) return;
|
||||
|
||||
const queue = [...items];
|
||||
const runners = Array.from({ length: Math.min(concurrency, queue.length) }, async () => {
|
||||
while (queue.length > 0) {
|
||||
const item = queue.shift();
|
||||
if (item === undefined) return;
|
||||
await worker(item);
|
||||
}
|
||||
});
|
||||
|
||||
await Promise.allSettled(runners);
|
||||
}
|
||||
@@ -1,93 +0,0 @@
|
||||
import { Type } from 'class-transformer';
|
||||
import {
|
||||
ArrayMaxSize,
|
||||
ArrayMinSize,
|
||||
IsArray,
|
||||
IsEnum,
|
||||
IsInt,
|
||||
IsMongoId,
|
||||
IsOptional,
|
||||
Max,
|
||||
Min,
|
||||
ValidateNested,
|
||||
} from 'class-validator';
|
||||
import { AUCTION_TOP_TIER_THRESHOLDS } from '../../global/database/schema';
|
||||
|
||||
export type AuctionTopTierThreshold =
|
||||
(typeof AUCTION_TOP_TIER_THRESHOLDS)[number];
|
||||
|
||||
class CaptainAssignmentDto {
|
||||
@IsInt()
|
||||
@Min(1)
|
||||
teamIndex!: number;
|
||||
|
||||
@IsMongoId()
|
||||
userId!: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsInt()
|
||||
@Min(100)
|
||||
@Max(100000)
|
||||
initialPoints?: number;
|
||||
}
|
||||
|
||||
export class StartAuctionDto {
|
||||
@IsArray()
|
||||
@ArrayMinSize(2)
|
||||
@ArrayMaxSize(16)
|
||||
@ValidateNested({ each: true })
|
||||
@Type(() => CaptainAssignmentDto)
|
||||
captains!: CaptainAssignmentDto[];
|
||||
|
||||
@IsOptional()
|
||||
@IsInt()
|
||||
@Min(100)
|
||||
@Max(100000)
|
||||
initialPoints?: number;
|
||||
|
||||
@IsOptional()
|
||||
@IsEnum(AUCTION_TOP_TIER_THRESHOLDS)
|
||||
topTierThreshold?: AuctionTopTierThreshold;
|
||||
|
||||
@IsOptional()
|
||||
@IsArray()
|
||||
@ArrayMaxSize(100)
|
||||
@IsMongoId({ each: true })
|
||||
manualTopTierUserIds?: string[];
|
||||
|
||||
@IsOptional()
|
||||
@IsInt()
|
||||
@Min(5)
|
||||
maxTimerSeconds?: number;
|
||||
|
||||
@IsOptional()
|
||||
@IsInt()
|
||||
@Min(0)
|
||||
bidExtensionSeconds?: number;
|
||||
}
|
||||
|
||||
export class PlaceBidDto {
|
||||
@IsInt()
|
||||
@Min(1)
|
||||
teamIndex!: number;
|
||||
|
||||
@IsInt()
|
||||
@Min(1)
|
||||
amount!: number;
|
||||
|
||||
@IsOptional()
|
||||
@IsMongoId()
|
||||
bidderUserId?: string;
|
||||
}
|
||||
|
||||
export class SoldDto {
|
||||
@IsOptional()
|
||||
@IsEnum(['TOP', 'JGL', 'MID', 'ADC', 'SUP'])
|
||||
assignedPosition?: 'TOP' | 'JGL' | 'MID' | 'ADC' | 'SUP';
|
||||
}
|
||||
|
||||
export class UndoAuctionDto {
|
||||
@IsInt()
|
||||
@Min(1)
|
||||
sequence!: number;
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
import { SetMetadata } from '@nestjs/common';
|
||||
|
||||
export const METADATA_KEY_IS_PUBLIC_ACCESS_ALLOWED =
|
||||
'lolympus:allow_public_access';
|
||||
|
||||
export const AllowPublicAccess = () =>
|
||||
SetMetadata(METADATA_KEY_IS_PUBLIC_ACCESS_ALLOWED, true);
|
||||
@@ -1,16 +0,0 @@
|
||||
import type { JWTHeaderParameters, JWTPayload } from 'jose';
|
||||
import type {
|
||||
IdentityDocument,
|
||||
UserDocument,
|
||||
} from '../global/database/schema';
|
||||
import type { IdentityProviderName } from './jwt.service';
|
||||
|
||||
declare module 'express' {
|
||||
interface Request {
|
||||
tokenPayload?: JWTPayload;
|
||||
tokenHeader?: JWTHeaderParameters;
|
||||
identityProvider?: IdentityProviderName;
|
||||
identity?: IdentityDocument;
|
||||
user?: UserDocument;
|
||||
}
|
||||
}
|
||||
@@ -1,18 +0,0 @@
|
||||
import { Injectable, NestMiddleware } from '@nestjs/common';
|
||||
import type { NextFunction, Request, Response } from 'express';
|
||||
import { AuthService } from './auth.service';
|
||||
import './auth-request';
|
||||
|
||||
@Injectable()
|
||||
export class AuthMiddleware implements NestMiddleware {
|
||||
constructor(private readonly authService: AuthService) {}
|
||||
|
||||
public async use(req: Request, _res: Response, next: NextFunction) {
|
||||
const fallback = await this.authService.resolveDevFallbackFromRequest(req);
|
||||
if (fallback) {
|
||||
req.user = fallback.user;
|
||||
req.identity = fallback.identity;
|
||||
}
|
||||
next();
|
||||
}
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
import { Global, Module } from '@nestjs/common';
|
||||
import { APP_GUARD } from '@nestjs/core';
|
||||
import { AuthService } from './auth.service';
|
||||
import { IdentityResolverGuard } from './identity-resolver.guard';
|
||||
import { IdentityService } from './identity.service';
|
||||
import { JwtAuthGuard } from './jwt.guard';
|
||||
import { JwtService } from './jwt.service';
|
||||
import { RolesGuard } from './roles.guard';
|
||||
import { UserResolverGuard } from './user-resolver.guard';
|
||||
|
||||
@Global()
|
||||
@Module({
|
||||
providers: [
|
||||
AuthService,
|
||||
JwtService,
|
||||
IdentityService,
|
||||
JwtAuthGuard,
|
||||
IdentityResolverGuard,
|
||||
UserResolverGuard,
|
||||
RolesGuard,
|
||||
{ provide: APP_GUARD, useClass: JwtAuthGuard },
|
||||
{ provide: APP_GUARD, useClass: IdentityResolverGuard },
|
||||
{ provide: APP_GUARD, useClass: UserResolverGuard },
|
||||
],
|
||||
exports: [
|
||||
AuthService,
|
||||
JwtService,
|
||||
IdentityService,
|
||||
UserResolverGuard,
|
||||
RolesGuard,
|
||||
],
|
||||
})
|
||||
export class AuthModule {}
|
||||
@@ -1,62 +0,0 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import type { Request } from 'express';
|
||||
import mongoose from 'mongoose';
|
||||
import { ConnectionService } from '../global/database/connection.service';
|
||||
import {
|
||||
IdentityDocument,
|
||||
UserDocument,
|
||||
} from '../global/database/schema';
|
||||
import { SecretService } from '../global/secret/secret.service';
|
||||
import './auth-request';
|
||||
|
||||
interface DevFallbackResult {
|
||||
user: UserDocument;
|
||||
identity?: IdentityDocument;
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class AuthService {
|
||||
constructor(
|
||||
private readonly connectionService: ConnectionService,
|
||||
private readonly secretService: SecretService,
|
||||
) {}
|
||||
|
||||
public async resolveDevFallbackFromRequest(
|
||||
req: Request,
|
||||
): Promise<DevFallbackResult | null> {
|
||||
if (!(await this.isDevHeaderEnabled())) return null;
|
||||
const header = req.headers['x-auth-user-id'];
|
||||
const userId = Array.isArray(header) ? header[0] : header;
|
||||
return this.resolveDevUserById(userId);
|
||||
}
|
||||
|
||||
public async resolveDevUserById(
|
||||
userId: unknown,
|
||||
): Promise<DevFallbackResult | null> {
|
||||
if (!(await this.isDevHeaderEnabled())) return null;
|
||||
if (typeof userId !== 'string' || !mongoose.isValidObjectId(userId)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const UserModel = await this.connectionService.getModel('user');
|
||||
const user = await UserModel.findById(userId).exec();
|
||||
if (!user) return null;
|
||||
|
||||
const result: DevFallbackResult = { user };
|
||||
if (user.identityId) {
|
||||
const IdentityModel = await this.connectionService.getModel('identity');
|
||||
const identity = await IdentityModel.findById(user.identityId).exec();
|
||||
if (identity) result.identity = identity;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private async isDevHeaderEnabled(): Promise<boolean> {
|
||||
if (process.env.NODE_ENV === 'prod') return false;
|
||||
const value = await this.secretService.get<string>(
|
||||
'AUTH_DEV_HEADER_ENABLED',
|
||||
process.env.AUTH_DEV_HEADER_ENABLED ?? 'false',
|
||||
);
|
||||
return value === 'true';
|
||||
}
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
import { createParamDecorator, ExecutionContext } from '@nestjs/common';
|
||||
import type { Request } from 'express';
|
||||
import { IdentityDocument } from '../global/database/schema';
|
||||
import './auth-request';
|
||||
|
||||
export const CurrentIdentity = createParamDecorator(
|
||||
(_data: unknown, ctx: ExecutionContext): IdentityDocument | undefined => {
|
||||
const req = ctx.switchToHttp().getRequest<Request>();
|
||||
return req.identity;
|
||||
},
|
||||
);
|
||||
@@ -1,11 +0,0 @@
|
||||
import { createParamDecorator, ExecutionContext } from '@nestjs/common';
|
||||
import type { Request } from 'express';
|
||||
import { UserDocument } from '../global/database/schema';
|
||||
import './auth-request';
|
||||
|
||||
export const CurrentUser = createParamDecorator(
|
||||
(_data: unknown, ctx: ExecutionContext): UserDocument | undefined => {
|
||||
const req = ctx.switchToHttp().getRequest<Request>();
|
||||
return req.user;
|
||||
},
|
||||
);
|
||||
@@ -1,38 +0,0 @@
|
||||
import {
|
||||
CanActivate,
|
||||
ExecutionContext,
|
||||
Injectable,
|
||||
UnauthorizedException,
|
||||
} from '@nestjs/common';
|
||||
import type { Request } from 'express';
|
||||
import { IdentityService } from './identity.service';
|
||||
import './auth-request';
|
||||
|
||||
@Injectable()
|
||||
export class IdentityResolverGuard implements CanActivate {
|
||||
constructor(private readonly identityService: IdentityService) {}
|
||||
|
||||
public async canActivate(context: ExecutionContext): Promise<boolean> {
|
||||
const request = context.switchToHttp().getRequest<Request>();
|
||||
if (request.identity || !request.tokenPayload) return true;
|
||||
|
||||
const entraOid = stringClaim(request.tokenPayload.oid);
|
||||
if (!entraOid) {
|
||||
throw new UnauthorizedException('Token is missing oid claim.');
|
||||
}
|
||||
|
||||
request.identity = await this.identityService.findOrCreateByOid({
|
||||
entraOid,
|
||||
tenantId: stringClaim(request.tokenPayload.tid),
|
||||
email:
|
||||
stringClaim(request.tokenPayload.preferred_username) ??
|
||||
stringClaim(request.tokenPayload.email),
|
||||
displayName: stringClaim(request.tokenPayload.name),
|
||||
});
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
function stringClaim(value: unknown): string | undefined {
|
||||
return typeof value === 'string' && value.length > 0 ? value : undefined;
|
||||
}
|
||||
@@ -1,39 +0,0 @@
|
||||
import { Injectable, InternalServerErrorException } from '@nestjs/common';
|
||||
import { ConnectionService } from '../global/database/connection.service';
|
||||
import { IdentityDocument } from '../global/database/schema';
|
||||
|
||||
interface IdentityInput {
|
||||
entraOid: string;
|
||||
tenantId?: string;
|
||||
email?: string;
|
||||
displayName?: string;
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class IdentityService {
|
||||
constructor(private readonly connectionService: ConnectionService) {}
|
||||
|
||||
public async findOrCreateByOid(
|
||||
input: IdentityInput,
|
||||
): Promise<IdentityDocument> {
|
||||
const IdentityModel = await this.connectionService.getModel('identity');
|
||||
const identity = await IdentityModel.findOneAndUpdate(
|
||||
{ entraOid: input.entraOid },
|
||||
{
|
||||
$set: {
|
||||
tenantId: input.tenantId,
|
||||
email: input.email,
|
||||
displayName: input.displayName,
|
||||
lastSignInAt: new Date(),
|
||||
},
|
||||
$setOnInsert: { entraOid: input.entraOid },
|
||||
},
|
||||
{ upsert: true, returnDocument: 'after', setDefaultsOnInsert: true },
|
||||
).exec();
|
||||
|
||||
if (!identity) {
|
||||
throw new InternalServerErrorException('Failed to resolve identity.');
|
||||
}
|
||||
return identity;
|
||||
}
|
||||
}
|
||||
@@ -1,91 +0,0 @@
|
||||
import {
|
||||
CanActivate,
|
||||
ExecutionContext,
|
||||
Injectable,
|
||||
UnauthorizedException,
|
||||
} from '@nestjs/common';
|
||||
import { Reflector } from '@nestjs/core';
|
||||
import { decodeJwt } from 'jose';
|
||||
import type { Request } from 'express';
|
||||
import { METADATA_KEY_IS_PUBLIC_ACCESS_ALLOWED } from './allow-public-access.decorator';
|
||||
import { AuthService } from './auth.service';
|
||||
import { IdentityProviderName, JwtService } from './jwt.service';
|
||||
import './auth-request';
|
||||
|
||||
@Injectable()
|
||||
export class JwtAuthGuard implements CanActivate {
|
||||
constructor(
|
||||
private readonly reflector: Reflector,
|
||||
private readonly jwtService: JwtService,
|
||||
private readonly authService: AuthService,
|
||||
) {}
|
||||
|
||||
public async canActivate(context: ExecutionContext): Promise<boolean> {
|
||||
const request = context.switchToHttp().getRequest<Request>();
|
||||
const isPublicAccessAllowed = this.reflector.getAllAndOverride<boolean>(
|
||||
METADATA_KEY_IS_PUBLIC_ACCESS_ALLOWED,
|
||||
[context.getHandler(), context.getClass()],
|
||||
);
|
||||
const authz = request.headers?.authorization;
|
||||
const authzHeader = Array.isArray(authz) ? authz[0] : authz;
|
||||
|
||||
if (!authzHeader) {
|
||||
const fallback =
|
||||
await this.authService.resolveDevFallbackFromRequest(request);
|
||||
if (fallback) {
|
||||
request.user = fallback.user;
|
||||
request.identity = fallback.identity;
|
||||
return true;
|
||||
}
|
||||
if (isPublicAccessAllowed) return true;
|
||||
throw new UnauthorizedException(
|
||||
'Missing or invalid Authorization header',
|
||||
);
|
||||
}
|
||||
|
||||
if (!authzHeader.startsWith('Bearer ')) {
|
||||
throw new UnauthorizedException(
|
||||
'Missing or invalid Authorization header',
|
||||
);
|
||||
}
|
||||
|
||||
const token = authzHeader.slice('Bearer '.length).trim();
|
||||
if (!token) {
|
||||
throw new UnauthorizedException('Empty bearer token');
|
||||
}
|
||||
|
||||
const identityProvider = this.pickIdPFromToken(token);
|
||||
|
||||
try {
|
||||
const verifyResult = await this.jwtService.verify(
|
||||
token,
|
||||
identityProvider,
|
||||
);
|
||||
request.tokenPayload = verifyResult.payload;
|
||||
request.tokenHeader = verifyResult.protectedHeader;
|
||||
request.identityProvider = identityProvider;
|
||||
return true;
|
||||
} catch (err) {
|
||||
const message =
|
||||
err instanceof Error ? err.message : 'JWT verification failed';
|
||||
throw new UnauthorizedException(message);
|
||||
}
|
||||
}
|
||||
|
||||
private pickIdPFromToken(token: string): IdentityProviderName {
|
||||
try {
|
||||
const { iss } = decodeJwt(token) as { iss?: string };
|
||||
if (!iss) {
|
||||
throw new Error('Token has no issuer (iss) claim');
|
||||
}
|
||||
const lower = iss.toLowerCase();
|
||||
if (lower.includes('login.microsoftonline.com')) {
|
||||
return 'MICROSOFT_ENTRAID';
|
||||
}
|
||||
throw new Error(`Unknown issuer: ${iss}`);
|
||||
} catch (err) {
|
||||
const message = err instanceof Error ? err.message : 'Unable to decode token';
|
||||
throw new UnauthorizedException(message);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,100 +0,0 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import {
|
||||
createRemoteJWKSet,
|
||||
jwtVerify,
|
||||
JWTPayload,
|
||||
JWTVerifyGetKey,
|
||||
JWTVerifyResult,
|
||||
} from 'jose';
|
||||
import { SecretService } from '../global/secret/secret.service';
|
||||
|
||||
export type IdentityProviderName = 'MICROSOFT_ENTRAID';
|
||||
|
||||
interface EntraConfig {
|
||||
tenantId: string;
|
||||
audience: string;
|
||||
issuer: string;
|
||||
allowedAlgs: string[];
|
||||
jwks: JWTVerifyGetKey;
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class JwtService {
|
||||
private entraConfig?: EntraConfig;
|
||||
private readonly clockTolerance = Number(
|
||||
process.env.JWT_CLOCK_TOLERANCE || 5,
|
||||
);
|
||||
|
||||
constructor(private readonly secretService: SecretService) {}
|
||||
|
||||
public async verify(
|
||||
token: string,
|
||||
identityProvider: IdentityProviderName,
|
||||
): Promise<JWTVerifyResult<JWTPayload>> {
|
||||
if (!token) {
|
||||
throw new Error('Empty token');
|
||||
}
|
||||
|
||||
if (identityProvider !== 'MICROSOFT_ENTRAID') {
|
||||
throw new Error(`Identity provider not configured: ${identityProvider}`);
|
||||
}
|
||||
|
||||
const provider = await this.getEntraConfig();
|
||||
const result = await jwtVerify(token, provider.jwks, {
|
||||
issuer: provider.issuer,
|
||||
audience: provider.audience,
|
||||
algorithms: provider.allowedAlgs,
|
||||
clockTolerance: this.clockTolerance,
|
||||
});
|
||||
|
||||
const { payload, protectedHeader } = result;
|
||||
if (!provider.allowedAlgs.includes(protectedHeader.alg as string)) {
|
||||
throw new Error(`Unexpected alg: ${protectedHeader.alg}`);
|
||||
}
|
||||
if (payload.ver && payload.ver !== '2.0') {
|
||||
throw new Error(`Unsupported Entra token version: ${payload.ver}`);
|
||||
}
|
||||
if (payload.tid && payload.tid !== provider.tenantId) {
|
||||
throw new Error(`Unexpected tenant: ${payload.tid}`);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private async getEntraConfig(): Promise<EntraConfig> {
|
||||
if (this.entraConfig) return this.entraConfig;
|
||||
|
||||
await this.secretService.ready();
|
||||
const [audience, tenantId, allowedAlgsRaw] = await Promise.all([
|
||||
this.secretService.get<string>('JWT_CLAIM_AUDIENCE'),
|
||||
this.secretService.get<string>('MICROSOFT_ENTRAID_TENANT_ID'),
|
||||
this.secretService.get<string>('MICROSOFT_ENTRAID_ALLOWED_ALGS', 'RS256'),
|
||||
]);
|
||||
|
||||
const allowedAlgs = allowedAlgsRaw
|
||||
.split(',')
|
||||
.map((alg) => alg.trim())
|
||||
.filter(Boolean);
|
||||
if (allowedAlgs.length === 0) {
|
||||
allowedAlgs.push('RS256');
|
||||
}
|
||||
|
||||
const issuer = `https://login.microsoftonline.com/${tenantId}/v2.0`;
|
||||
const jwks = createRemoteJWKSet(
|
||||
new URL('https://login.microsoftonline.com/common/discovery/v2.0/keys'),
|
||||
{
|
||||
cooldownDuration: 30_000,
|
||||
timeoutDuration: 10_000,
|
||||
},
|
||||
);
|
||||
|
||||
this.entraConfig = {
|
||||
tenantId,
|
||||
audience,
|
||||
issuer,
|
||||
allowedAlgs,
|
||||
jwks,
|
||||
};
|
||||
return this.entraConfig;
|
||||
}
|
||||
}
|
||||
@@ -1,35 +0,0 @@
|
||||
import { CommunityRole } from '../global/database/schema';
|
||||
|
||||
export type Permission =
|
||||
| 'community:edit'
|
||||
| 'community:delete'
|
||||
| 'community:transfer'
|
||||
| 'user:role:manage'
|
||||
| 'match:create'
|
||||
| 'match:edit'
|
||||
| 'match:delete'
|
||||
| 'auction:manage';
|
||||
|
||||
type PermissionSet = readonly Permission[] | readonly ['*'];
|
||||
|
||||
export const ROLE_PERMISSIONS: Record<CommunityRole, PermissionSet> = {
|
||||
owner: ['*'] as const,
|
||||
admin: [
|
||||
'community:edit',
|
||||
'user:role:manage',
|
||||
'match:create',
|
||||
'match:edit',
|
||||
'match:delete',
|
||||
'auction:manage',
|
||||
] as const,
|
||||
member: [] as const,
|
||||
};
|
||||
|
||||
export function roleHasPermission(
|
||||
role: CommunityRole,
|
||||
permission: Permission,
|
||||
): boolean {
|
||||
const perms = ROLE_PERMISSIONS[role];
|
||||
if (perms.length === 1 && perms[0] === '*') return true;
|
||||
return (perms as readonly Permission[]).includes(permission);
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
import { SetMetadata } from '@nestjs/common';
|
||||
import { CommunityRole } from '../global/database/schema';
|
||||
|
||||
export const ROLES_KEY = 'lolympus:roles';
|
||||
|
||||
export const Roles = (...roles: CommunityRole[]) =>
|
||||
SetMetadata(ROLES_KEY, roles);
|
||||
@@ -1,36 +0,0 @@
|
||||
import {
|
||||
CanActivate,
|
||||
ExecutionContext,
|
||||
ForbiddenException,
|
||||
Injectable,
|
||||
UnauthorizedException,
|
||||
} from '@nestjs/common';
|
||||
import { Reflector } from '@nestjs/core';
|
||||
import type { Request } from 'express';
|
||||
import { CommunityRole, UserDocument } from '../global/database/schema';
|
||||
import { ROLES_KEY } from './roles.decorator';
|
||||
import './auth-request';
|
||||
|
||||
@Injectable()
|
||||
export class RolesGuard implements CanActivate {
|
||||
constructor(private readonly reflector: Reflector) {}
|
||||
|
||||
public canActivate(context: ExecutionContext): boolean {
|
||||
const requiredRoles = this.reflector.getAllAndOverride<CommunityRole[]>(
|
||||
ROLES_KEY,
|
||||
[context.getHandler(), context.getClass()],
|
||||
);
|
||||
if (!requiredRoles || requiredRoles.length === 0) return true;
|
||||
|
||||
const req = context.switchToHttp().getRequest<Request>();
|
||||
const user = req.user as UserDocument | undefined;
|
||||
if (!user && req.identity) {
|
||||
throw new ForbiddenException('No membership in this community.');
|
||||
}
|
||||
if (!user) throw new UnauthorizedException('Authentication required.');
|
||||
if (!requiredRoles.includes(user.role)) {
|
||||
throw new ForbiddenException('Insufficient role.');
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -1,55 +0,0 @@
|
||||
import { ExecutionContext } from '@nestjs/common';
|
||||
import mongoose from 'mongoose';
|
||||
import { ConnectionService } from '../global/database/connection.service';
|
||||
import { IdentityDocument, UserDocument } from '../global/database/schema';
|
||||
import { UserResolverGuard } from './user-resolver.guard';
|
||||
import './auth-request';
|
||||
|
||||
function createContext(request: Record<string, unknown>): ExecutionContext {
|
||||
return {
|
||||
switchToHttp: () => ({
|
||||
getRequest: () => request,
|
||||
}),
|
||||
} as ExecutionContext;
|
||||
}
|
||||
|
||||
describe('UserResolverGuard', () => {
|
||||
it('resolves the community membership before role guards run', async () => {
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const identityId = new mongoose.Types.ObjectId();
|
||||
const user = { _id: new mongoose.Types.ObjectId() } as UserDocument;
|
||||
const findOne = jest.fn().mockReturnValue({
|
||||
exec: jest.fn().mockResolvedValue(user),
|
||||
});
|
||||
const connectionService = {
|
||||
getModel: jest.fn().mockResolvedValue({ findOne }),
|
||||
} as unknown as ConnectionService;
|
||||
const request = {
|
||||
params: { communityId: communityId.toString() },
|
||||
identity: { _id: identityId } as IdentityDocument,
|
||||
};
|
||||
const guard = new UserResolverGuard(connectionService);
|
||||
|
||||
await expect(guard.canActivate(createContext(request))).resolves.toBe(true);
|
||||
|
||||
expect(findOne).toHaveBeenCalledWith({
|
||||
communityId,
|
||||
identityId,
|
||||
});
|
||||
expect(request.user).toBe(user);
|
||||
});
|
||||
|
||||
it('skips lookup when there is no resolved identity', async () => {
|
||||
const connectionService = {
|
||||
getModel: jest.fn(),
|
||||
} as unknown as ConnectionService;
|
||||
const request = {
|
||||
params: { communityId: new mongoose.Types.ObjectId().toString() },
|
||||
};
|
||||
const guard = new UserResolverGuard(connectionService);
|
||||
|
||||
await expect(guard.canActivate(createContext(request))).resolves.toBe(true);
|
||||
|
||||
expect(connectionService.getModel).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -1,33 +0,0 @@
|
||||
import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
|
||||
import type { Request } from 'express';
|
||||
import mongoose from 'mongoose';
|
||||
import { ConnectionService } from '../global/database/connection.service';
|
||||
import './auth-request';
|
||||
|
||||
@Injectable()
|
||||
export class UserResolverGuard implements CanActivate {
|
||||
constructor(private readonly connectionService: ConnectionService) {}
|
||||
|
||||
public async canActivate(context: ExecutionContext): Promise<boolean> {
|
||||
const request = context.switchToHttp().getRequest<Request>();
|
||||
const communityId = request.params?.communityId;
|
||||
|
||||
if (
|
||||
request.user ||
|
||||
!request.identity ||
|
||||
typeof communityId !== 'string' ||
|
||||
!mongoose.isValidObjectId(communityId)
|
||||
) {
|
||||
return true;
|
||||
}
|
||||
|
||||
const UserModel = await this.connectionService.getModel('user');
|
||||
const user = await UserModel.findOne({
|
||||
communityId: new mongoose.Types.ObjectId(communityId),
|
||||
identityId: request.identity._id,
|
||||
}).exec();
|
||||
|
||||
if (user) request.user = user;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
import {
|
||||
ArgumentMetadata,
|
||||
BadRequestException,
|
||||
Injectable,
|
||||
PipeTransform,
|
||||
} from '@nestjs/common';
|
||||
import mongoose from 'mongoose';
|
||||
|
||||
@Injectable()
|
||||
export class ParseObjectIdPipe
|
||||
implements PipeTransform<string, mongoose.Types.ObjectId>
|
||||
{
|
||||
public transform(
|
||||
value: string,
|
||||
metadata: ArgumentMetadata,
|
||||
): mongoose.Types.ObjectId {
|
||||
if (!mongoose.isValidObjectId(value)) {
|
||||
throw new BadRequestException(
|
||||
`Invalid ObjectId for ${metadata.data ?? 'param'}.`,
|
||||
);
|
||||
}
|
||||
return new mongoose.Types.ObjectId(value);
|
||||
}
|
||||
}
|
||||
@@ -1,59 +0,0 @@
|
||||
import { Injectable, Logger } from '@nestjs/common';
|
||||
import { GarnetService } from '../global/garnet/garnet.service';
|
||||
|
||||
const COMMUNITY_STATS_TTL_SECONDS = 5 * 60;
|
||||
const COMMUNITY_STATS_DETAIL_TTL_SECONDS = 24 * 60 * 60;
|
||||
|
||||
@Injectable()
|
||||
export class CommunityStatsCacheService {
|
||||
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(
|
||||
key: string,
|
||||
value: unknown,
|
||||
ttlSeconds = COMMUNITY_STATS_TTL_SECONDS,
|
||||
): Promise<void> {
|
||||
return this.garnetService.setJson(key, value, ttlSeconds);
|
||||
}
|
||||
|
||||
public setDetail(key: string, value: unknown): Promise<void> {
|
||||
return this.set(key, value, COMMUNITY_STATS_DETAIL_TTL_SECONDS);
|
||||
}
|
||||
|
||||
public async invalidateCommunity(communityId: string): Promise<number> {
|
||||
const prefix = `riot:communitystats:`;
|
||||
const match = `${prefix}*${communityId}*`;
|
||||
const client = this.garnetService.raw();
|
||||
let cursor = '0';
|
||||
let deleted = 0;
|
||||
|
||||
do {
|
||||
const reply = (await client.sendCommand([
|
||||
'SCAN',
|
||||
cursor,
|
||||
'MATCH',
|
||||
match,
|
||||
'COUNT',
|
||||
'100',
|
||||
])) as [string, string[]];
|
||||
cursor = reply[0];
|
||||
const keys = reply[1] ?? [];
|
||||
if (keys.length > 0) {
|
||||
deleted += await client.del(keys);
|
||||
}
|
||||
} while (cursor !== '0');
|
||||
|
||||
if (deleted > 0) {
|
||||
this.logger.debug(
|
||||
`Invalidated ${deleted} community stats cache keys for ${communityId}.`,
|
||||
);
|
||||
}
|
||||
return deleted;
|
||||
}
|
||||
}
|
||||
@@ -1,115 +0,0 @@
|
||||
import { Controller, Get, Param, Query } from '@nestjs/common';
|
||||
import mongoose from 'mongoose';
|
||||
import { AllowPublicAccess } from '../auth/allow-public-access.decorator';
|
||||
import { ParseObjectIdPipe } from '../common/parse-object-id.pipe';
|
||||
import { CommunityStatsService } from './community-stats.service';
|
||||
import type { CommunityStatsFilters } from './community-stats.types';
|
||||
|
||||
@Controller('communities/:communityId')
|
||||
export class CommunityStatsController {
|
||||
constructor(private readonly communityStatsService: CommunityStatsService) {}
|
||||
|
||||
@Get('internal-stats/matches')
|
||||
@AllowPublicAccess()
|
||||
public getMatches(
|
||||
@Param('communityId', ParseObjectIdPipe)
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
@Query('seasonId') seasonId?: string,
|
||||
@Query('from') from?: string,
|
||||
@Query('to') to?: string,
|
||||
@Query('championId') championId?: string,
|
||||
@Query('cursor') cursor?: string,
|
||||
@Query('limit') limit?: string,
|
||||
) {
|
||||
return this.communityStatsService.getMatches({
|
||||
communityId,
|
||||
filters: this.toFilters({ seasonId, from, to, championId, cursor, limit }),
|
||||
});
|
||||
}
|
||||
|
||||
@Get('internal-stats/leaderboard')
|
||||
@AllowPublicAccess()
|
||||
public getLeaderboard(
|
||||
@Param('communityId', ParseObjectIdPipe)
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
@Query('seasonId') seasonId?: string,
|
||||
@Query('from') from?: string,
|
||||
@Query('to') to?: string,
|
||||
@Query('championId') championId?: string,
|
||||
) {
|
||||
return this.communityStatsService.getLeaderboard({
|
||||
communityId,
|
||||
filters: this.toFilters({ seasonId, from, to, championId }),
|
||||
});
|
||||
}
|
||||
|
||||
@Get('internal-stats/team-insights')
|
||||
@AllowPublicAccess()
|
||||
public getTeamInsights(
|
||||
@Param('communityId', ParseObjectIdPipe)
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
@Query('seasonId') seasonId?: string,
|
||||
@Query('from') from?: string,
|
||||
@Query('to') to?: string,
|
||||
@Query('championId') championId?: string,
|
||||
) {
|
||||
return this.communityStatsService.getTeamInsights({
|
||||
communityId,
|
||||
filters: this.toFilters({ seasonId, from, to, championId }),
|
||||
});
|
||||
}
|
||||
|
||||
@Get('internal-stats/match/:matchId')
|
||||
@AllowPublicAccess()
|
||||
public getMatchDetail(
|
||||
@Param('communityId', ParseObjectIdPipe)
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
||||
) {
|
||||
return this.communityStatsService.getMatchDetail({ communityId, matchId });
|
||||
}
|
||||
|
||||
@Get('users/:userId/internal-history')
|
||||
@AllowPublicAccess()
|
||||
public getUserInternalHistory(
|
||||
@Param('communityId', ParseObjectIdPipe)
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
@Param('userId', ParseObjectIdPipe) userId: mongoose.Types.ObjectId,
|
||||
@Query('seasonId') seasonId?: string,
|
||||
@Query('from') from?: string,
|
||||
@Query('to') to?: string,
|
||||
@Query('championId') championId?: string,
|
||||
@Query('cursor') cursor?: string,
|
||||
@Query('limit') limit?: string,
|
||||
) {
|
||||
return this.communityStatsService.getUserInternalHistory({
|
||||
communityId,
|
||||
userId,
|
||||
filters: this.toFilters({ seasonId, from, to, championId, cursor, limit }),
|
||||
});
|
||||
}
|
||||
|
||||
private toFilters(params: {
|
||||
seasonId?: string;
|
||||
from?: string;
|
||||
to?: string;
|
||||
championId?: string;
|
||||
cursor?: string;
|
||||
limit?: string;
|
||||
}): CommunityStatsFilters {
|
||||
return {
|
||||
seasonId: params.seasonId,
|
||||
from: params.from,
|
||||
to: params.to,
|
||||
championId: this.toNumber(params.championId),
|
||||
cursor: this.toNumber(params.cursor),
|
||||
limit: this.toNumber(params.limit),
|
||||
};
|
||||
}
|
||||
|
||||
private toNumber(value: string | undefined): number | undefined {
|
||||
if (!value) return undefined;
|
||||
const parsed = Number(value);
|
||||
return Number.isFinite(parsed) ? parsed : undefined;
|
||||
}
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
import { Module } from '@nestjs/common';
|
||||
import { RiotModule } from '../riot/riot.module';
|
||||
import { CommunityStatsCacheService } from './community-stats-cache.service';
|
||||
import { CommunityStatsController } from './community-stats.controller';
|
||||
import { CommunityStatsService } from './community-stats.service';
|
||||
import { MatchStatsFragmentBuilder } from './match-stats-fragment.builder';
|
||||
import { MatchStatsRepository } from './match-stats.repository';
|
||||
import { MatchStatsService } from './match-stats.service';
|
||||
|
||||
@Module({
|
||||
imports: [RiotModule],
|
||||
controllers: [CommunityStatsController],
|
||||
providers: [
|
||||
CommunityStatsService,
|
||||
CommunityStatsCacheService,
|
||||
MatchStatsFragmentBuilder,
|
||||
MatchStatsRepository,
|
||||
MatchStatsService,
|
||||
],
|
||||
exports: [CommunityStatsService, MatchStatsService],
|
||||
})
|
||||
export class CommunityStatsModule {}
|
||||
@@ -1,194 +0,0 @@
|
||||
import mongoose from 'mongoose';
|
||||
import { ConnectionService } from '../global/database/connection.service';
|
||||
import { 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 type { InternalGameDetail, 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('ignores stale detail cache entries missing timeline build fields', 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',
|
||||
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],
|
||||
},
|
||||
],
|
||||
};
|
||||
const staleCache = {
|
||||
match,
|
||||
games: [
|
||||
{
|
||||
gameNumber: 1,
|
||||
riotMatchId: 'KR_1',
|
||||
gameCreation: 1_000,
|
||||
gameDuration: 1_800,
|
||||
teams: [
|
||||
{
|
||||
teamIndex: 1,
|
||||
side: 'blue',
|
||||
win: true,
|
||||
objectives: { tower: 1, dragon: 0, baron: 0 },
|
||||
participants: [
|
||||
{
|
||||
summonerName: 'Player',
|
||||
perks: {
|
||||
primaryStyle: 8000,
|
||||
subStyle: 8400,
|
||||
keystone: 8010,
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
} as unknown as InternalMatchDetailResponse;
|
||||
const cacheService = {
|
||||
get: jest.fn().mockResolvedValue(staleCache),
|
||||
setDetail: jest.fn().mockResolvedValue(undefined),
|
||||
} as unknown as jest.Mocked<CommunityStatsCacheService>;
|
||||
const matchStatsService = {
|
||||
buildAndUpsert: jest.fn().mockResolvedValue(undefined),
|
||||
} as unknown as jest.Mocked<MatchStatsService>;
|
||||
const service = new CommunityStatsService(
|
||||
{} 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 response = await service.getMatchDetail({ communityId, matchId });
|
||||
|
||||
expect(response.games[0].timeline).toHaveLength(1);
|
||||
expect(response.games[0].teams[0].participants[0].itemBuild).toHaveLength(
|
||||
1,
|
||||
);
|
||||
expect(response.games[0].teams[0].participants[0].perks).toMatchObject({
|
||||
selectedPerkIds: [8010, 9111, 9105, 8299, 8444, 8451],
|
||||
});
|
||||
expect(matchStatsService.buildAndUpsert).not.toHaveBeenCalled();
|
||||
expect(cacheService.setDetail).toHaveBeenCalledWith(
|
||||
expect.stringContaining(':r3:'),
|
||||
response,
|
||||
);
|
||||
});
|
||||
});
|
||||
File diff suppressed because it is too large.
Load diff
@@ -1,245 +0,0 @@
|
||||
import type {
|
||||
MatchStatsItemBuildEvent,
|
||||
MatchStatsRunePerks,
|
||||
MatchStatsSkillBuildEvent,
|
||||
RiotLane,
|
||||
TeamSide,
|
||||
} from '../global/database/schema';
|
||||
import type { RecentMatchView, HistorySeasonDto } from '../match-history/match-history.types';
|
||||
|
||||
export interface CommunityStatsFilters {
|
||||
seasonId?: string;
|
||||
from?: string;
|
||||
to?: string;
|
||||
championId?: number;
|
||||
cursor?: number;
|
||||
limit?: number;
|
||||
}
|
||||
|
||||
export interface InternalMatchListResponse {
|
||||
matches: InternalMatchCardView[];
|
||||
nextCursor: number | null;
|
||||
season: HistorySeasonDto;
|
||||
}
|
||||
|
||||
export interface InternalMatchCardView {
|
||||
matchId: string;
|
||||
title: string;
|
||||
scheduledAt: string;
|
||||
status: 'finished' | 'in-progress';
|
||||
gameCount: number;
|
||||
winnerTeamIndex?: number;
|
||||
seriesResults: Array<{
|
||||
teamAIndex: number;
|
||||
teamBIndex: number;
|
||||
teamAWins: number;
|
||||
teamBWins: number;
|
||||
winnerTeamIndex?: number;
|
||||
}>;
|
||||
games: Array<{
|
||||
gameNumber: number;
|
||||
riotMatchId: string | null;
|
||||
blueTeamIndex: number;
|
||||
redTeamIndex: number;
|
||||
winnerTeamIndex: number | null;
|
||||
winnerSide: TeamSide | null;
|
||||
gameDuration: number;
|
||||
}>;
|
||||
teams: Array<{
|
||||
teamIndex: number;
|
||||
name: string;
|
||||
members: Array<{
|
||||
userId: string;
|
||||
summonerName: string;
|
||||
profileIconId: number;
|
||||
}>;
|
||||
}>;
|
||||
}
|
||||
|
||||
export interface LeaderboardResponse {
|
||||
rows: LeaderboardRow[];
|
||||
season: HistorySeasonDto;
|
||||
}
|
||||
|
||||
export interface LeaderboardRow {
|
||||
userId: string;
|
||||
summonerName: string;
|
||||
profileIconId: number;
|
||||
games: number;
|
||||
wins: number;
|
||||
losses: number;
|
||||
winRate: number;
|
||||
totalKills: number;
|
||||
totalDeaths: number;
|
||||
totalAssists: number;
|
||||
kda: number;
|
||||
avgGoldPerMin: number;
|
||||
avgKillParticipation: number;
|
||||
avgCsPerMin: number;
|
||||
avgDamageShare: number;
|
||||
avgVisionScore: number;
|
||||
byLane: Partial<Record<RiotLane, { games: number; wins: number; kda: number }>>;
|
||||
topChampions: Array<{ championId: number; games: number; winRate: number }>;
|
||||
}
|
||||
|
||||
export interface LeaderHighlight {
|
||||
metric: number;
|
||||
userId: string;
|
||||
summonerName: string;
|
||||
championId?: number;
|
||||
matchId?: string;
|
||||
isSingleGame: boolean;
|
||||
}
|
||||
|
||||
export interface TeamInsightsResponse {
|
||||
season: HistorySeasonDto;
|
||||
sideWinRate: {
|
||||
blue: number;
|
||||
red: number;
|
||||
bluePicks: number;
|
||||
redPicks: number;
|
||||
};
|
||||
topKda: LeaderHighlight | null;
|
||||
mostKills: LeaderHighlight | null;
|
||||
topTeamGpm: LeaderHighlight | null;
|
||||
topKillParticipation: LeaderHighlight | null;
|
||||
bestFarm: LeaderHighlight | null;
|
||||
minGamesThreshold: number;
|
||||
}
|
||||
|
||||
export interface InternalMatchDetailResponse {
|
||||
match: InternalMatchCardView;
|
||||
games: Array<{
|
||||
gameNumber: number;
|
||||
riotMatchId: string;
|
||||
gameCreation: 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;
|
||||
}>;
|
||||
teams: Array<{
|
||||
teamIndex: number;
|
||||
side: TeamSide;
|
||||
win: boolean;
|
||||
objectives: {
|
||||
tower: number;
|
||||
dragon: number;
|
||||
inhibitor: number;
|
||||
baron: number;
|
||||
riftHerald: number;
|
||||
voidGrub: number;
|
||||
elderDragon: number;
|
||||
};
|
||||
bans: Array<{ championId: number; pickTurn: number }>;
|
||||
participants: Array<{
|
||||
userId: string | null;
|
||||
summonerName: string;
|
||||
tagLine: string;
|
||||
teamIndex: number;
|
||||
side: TeamSide;
|
||||
teamPosition: string;
|
||||
championId: number;
|
||||
championLevel: number;
|
||||
kills: number;
|
||||
deaths: number;
|
||||
assists: number;
|
||||
cs: number;
|
||||
csPerMin: number;
|
||||
gold: number;
|
||||
gpm: number;
|
||||
damageDealtToChampions: number;
|
||||
damageTaken: number;
|
||||
damageShare: number;
|
||||
killParticipation: number;
|
||||
visionScore: number;
|
||||
wardsPlaced: number;
|
||||
wardsKilled: number;
|
||||
controlWardsBought: number;
|
||||
firstBloodKill: boolean;
|
||||
firstBloodAssist: boolean;
|
||||
items: number[];
|
||||
trinket: number;
|
||||
summonerSpells: [number, number];
|
||||
perks: MatchStatsRunePerks;
|
||||
itemBuild: MatchStatsItemBuildEvent[];
|
||||
skillBuild: MatchStatsSkillBuildEvent[];
|
||||
win: boolean;
|
||||
}>;
|
||||
}>;
|
||||
}>;
|
||||
}
|
||||
|
||||
export interface UserInternalHistoryResponse {
|
||||
season: HistorySeasonDto;
|
||||
championStats: LeaderboardChampionStats;
|
||||
summary: {
|
||||
windowSize: number;
|
||||
winRate: number;
|
||||
wins: number;
|
||||
losses: number;
|
||||
streak: { type: 'win' | 'loss'; count: number } | null;
|
||||
kda: number;
|
||||
avgKills: number;
|
||||
avgDeaths: number;
|
||||
avgAssists: number;
|
||||
bestRating: {
|
||||
rating: number | 'Perfect';
|
||||
kills: number;
|
||||
deaths: number;
|
||||
assists: number;
|
||||
matchId: string;
|
||||
} | null;
|
||||
positionRates: Partial<Record<RiotLane, number>>;
|
||||
topChampions: Array<{
|
||||
championId: number;
|
||||
games: number;
|
||||
winRate: number;
|
||||
pickRate: number;
|
||||
avgRating: number;
|
||||
}>;
|
||||
lastFetchedAt: string | null;
|
||||
};
|
||||
matches: RecentMatchView[];
|
||||
nextCursor: number | null;
|
||||
lastFetchedAt: string | null;
|
||||
}
|
||||
|
||||
export interface LeaderboardChampionStats {
|
||||
queueGroup: 'internal';
|
||||
rank: 'all';
|
||||
queueIds: number[];
|
||||
season: HistorySeasonDto;
|
||||
lastFetchedAt: string | null;
|
||||
champions: Array<{
|
||||
championId: number;
|
||||
games: number;
|
||||
wins: number;
|
||||
losses: number;
|
||||
winRate: number;
|
||||
avgKills: number;
|
||||
avgDeaths: number;
|
||||
avgAssists: number;
|
||||
kda: number;
|
||||
totalKills: number;
|
||||
totalDeaths: number;
|
||||
totalAssists: number;
|
||||
doubleKills: number;
|
||||
tripleKills: number;
|
||||
quadraKills: number;
|
||||
pentaKills: number;
|
||||
avgCs: number;
|
||||
avgCsPerMin: number;
|
||||
}>;
|
||||
totals: LeaderboardChampionStats['champions'][number];
|
||||
}
|
||||
@@ -1,396 +0,0 @@
|
||||
import mongoose from 'mongoose';
|
||||
import type { MatchDocument } from '../global/database/schema';
|
||||
import type { RiotMatchDto, RiotMatchTimelineDto } from '../riot/riot.types';
|
||||
import { MatchStatsFragmentBuilder } from './match-stats-fragment.builder';
|
||||
|
||||
function makeMatch(): MatchDocument {
|
||||
const userId = new mongoose.Types.ObjectId();
|
||||
return {
|
||||
_id: new mongoose.Types.ObjectId(),
|
||||
communityId: new mongoose.Types.ObjectId(),
|
||||
title: '내전',
|
||||
scheduledAt: new Date('2026-05-03T00:00:00.000Z'),
|
||||
status: 'finished',
|
||||
gameCount: 1,
|
||||
participants: [
|
||||
{
|
||||
userId,
|
||||
puuid: 'puuid-1',
|
||||
gameName: 'Player',
|
||||
profileIconId: 7,
|
||||
},
|
||||
],
|
||||
teams: [
|
||||
{
|
||||
teamIndex: 1,
|
||||
name: 'A',
|
||||
members: [{ userId, assignedPosition: 'TOP' }],
|
||||
},
|
||||
{ teamIndex: 2, name: 'B', members: [] },
|
||||
],
|
||||
result: {
|
||||
winnerTeamIndex: 1,
|
||||
riotMatchIds: ['KR_1'],
|
||||
games: [
|
||||
{
|
||||
gameNumber: 1,
|
||||
riotMatchId: 'KR_1',
|
||||
blueTeamIndex: 1,
|
||||
redTeamIndex: 2,
|
||||
winnerTeamIndex: 1,
|
||||
winnerSide: 'blue',
|
||||
gameCreation: 1_000,
|
||||
gameDuration: 1_800,
|
||||
participants: [
|
||||
{
|
||||
userId,
|
||||
teamIndex: 1,
|
||||
side: 'blue',
|
||||
championId: 266,
|
||||
kills: 5,
|
||||
deaths: 1,
|
||||
assists: 7,
|
||||
win: true,
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
seriesResults: [
|
||||
{
|
||||
teamAIndex: 1,
|
||||
teamBIndex: 2,
|
||||
teamAWins: 1,
|
||||
teamBWins: 0,
|
||||
winnerTeamIndex: 1,
|
||||
},
|
||||
],
|
||||
},
|
||||
} as unknown as MatchDocument;
|
||||
}
|
||||
|
||||
describe('MatchStatsFragmentBuilder', () => {
|
||||
it('builds a fallback fragment without raw Riot match data', () => {
|
||||
const builder = new MatchStatsFragmentBuilder();
|
||||
const match = makeMatch();
|
||||
|
||||
const fragment = builder.buildFragment({
|
||||
match,
|
||||
rawByRiotMatchId: new Map(),
|
||||
});
|
||||
|
||||
expect(fragment.matchCard.matchId).toBe(match._id.toString());
|
||||
expect(fragment.gameCreationMin).toBe(1_000);
|
||||
expect(fragment.gameCreationMax).toBe(1_000);
|
||||
expect(fragment.userIds.map((id) => id.toString())).toEqual([
|
||||
match.participants[0].userId.toString(),
|
||||
]);
|
||||
expect(fragment.championIds).toEqual([266]);
|
||||
expect(fragment.records).toHaveLength(1);
|
||||
expect(fragment.records[0]).toMatchObject({
|
||||
summonerName: 'Player',
|
||||
championId: 266,
|
||||
kills: 5,
|
||||
deaths: 1,
|
||||
assists: 7,
|
||||
win: true,
|
||||
});
|
||||
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 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,
|
||||
},
|
||||
],
|
||||
},
|
||||
};
|
||||
const timeline = {
|
||||
metadata: {
|
||||
dataVersion: '2',
|
||||
matchId: 'KR_1',
|
||||
participants: ['puuid-1'],
|
||||
},
|
||||
info: {
|
||||
frameInterval: 60_000,
|
||||
frames: [
|
||||
{
|
||||
timestamp: 0,
|
||||
participantFrames: {
|
||||
'1': { participantId: 1, totalGold: 500, xp: 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 },
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
};
|
||||
|
||||
const fragment = builder.buildFragment({
|
||||
match,
|
||||
rawByRiotMatchId: new Map([['KR_1', raw as RiotMatchDto]]),
|
||||
timelineByRiotMatchId: new Map([
|
||||
['KR_1', timeline as RiotMatchTimelineDto],
|
||||
]),
|
||||
});
|
||||
|
||||
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: 0, xp: 0 },
|
||||
goldDiff: 500,
|
||||
xpDiff: 0,
|
||||
},
|
||||
{
|
||||
timestamp: 60,
|
||||
blue: { gold: 1_150, xp: 550 },
|
||||
red: { gold: 0, xp: 0 },
|
||||
goldDiff: 1_150,
|
||||
xpDiff: 550,
|
||||
},
|
||||
],
|
||||
});
|
||||
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({
|
||||
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' },
|
||||
],
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -1,719 +0,0 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import mongoose from 'mongoose';
|
||||
import type {
|
||||
MatchDocument,
|
||||
MatchGameResultParticipant,
|
||||
MatchStatsItemBuildEvent,
|
||||
MatchStatsObjectiveEvent,
|
||||
MatchStatsObjectiveSummary,
|
||||
MatchStatsSkillBuildEvent,
|
||||
MatchStatsTimelinePoint,
|
||||
TeamSide,
|
||||
} from '../global/database/schema';
|
||||
import type {
|
||||
RiotMatchDto,
|
||||
RiotMatchParticipantDto,
|
||||
RiotMatchTimelineDto,
|
||||
} from '../riot/riot.types';
|
||||
import type { InternalMatchCardView } from './community-stats.types';
|
||||
import type {
|
||||
InternalGameDetail,
|
||||
InternalRecord,
|
||||
MatchStatsFragment,
|
||||
} from './match-stats.types';
|
||||
|
||||
interface ParticipantBuildEvents {
|
||||
items: MatchStatsItemBuildEvent[];
|
||||
skills: MatchStatsSkillBuildEvent[];
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class MatchStatsFragmentBuilder {
|
||||
public buildFragment(params: {
|
||||
match: MatchDocument;
|
||||
rawByRiotMatchId: Map<string, RiotMatchDto>;
|
||||
timelineByRiotMatchId?: Map<string, RiotMatchTimelineDto>;
|
||||
timelineLoadAttempted?: boolean;
|
||||
}): MatchStatsFragment {
|
||||
const games = [...(params.match.result?.games ?? [])].sort(
|
||||
(left, right) => left.gameNumber - right.gameNumber,
|
||||
);
|
||||
const matchCard = this.toMatchCard(params.match, games);
|
||||
const gameDetails = games.map((game) => {
|
||||
const raw = params.rawByRiotMatchId.get(game.riotMatchId);
|
||||
const timeline = params.timelineByRiotMatchId?.get(game.riotMatchId);
|
||||
return raw
|
||||
? this.toGameDetail(
|
||||
params.match,
|
||||
game,
|
||||
raw,
|
||||
timeline,
|
||||
params.timelineLoadAttempted === true,
|
||||
)
|
||||
: this.toFallbackGameDetail(params.match, game);
|
||||
});
|
||||
const records = gameDetails.flatMap((detail) =>
|
||||
detail.teams.flatMap((team) => team.participants),
|
||||
);
|
||||
const gameCreations = gameDetails.map((detail) => detail.gameCreation);
|
||||
|
||||
return {
|
||||
matchCard,
|
||||
records,
|
||||
gameDetails,
|
||||
userIds: [
|
||||
...new Map(
|
||||
records
|
||||
.filter((record) => mongoose.isValidObjectId(record.userId))
|
||||
.map((record) => [
|
||||
record.userId,
|
||||
new mongoose.Types.ObjectId(record.userId),
|
||||
]),
|
||||
).values(),
|
||||
],
|
||||
championIds: [...new Set(records.map((record) => record.championId))],
|
||||
gameCreationMin:
|
||||
gameCreations.length > 0
|
||||
? Math.min(...gameCreations)
|
||||
: params.match.scheduledAt.getTime(),
|
||||
gameCreationMax:
|
||||
gameCreations.length > 0
|
||||
? Math.max(...gameCreations)
|
||||
: params.match.scheduledAt.getTime(),
|
||||
};
|
||||
}
|
||||
|
||||
private toMatchCard(
|
||||
match: MatchDocument,
|
||||
games: NonNullable<MatchDocument['result']>['games'],
|
||||
): InternalMatchCardView {
|
||||
const participantById = new Map(
|
||||
match.participants.map((participant) => [
|
||||
participant.userId.toString(),
|
||||
participant,
|
||||
]),
|
||||
);
|
||||
return {
|
||||
matchId: match._id.toString(),
|
||||
title: match.title,
|
||||
scheduledAt: match.scheduledAt.toISOString(),
|
||||
status: match.status === 'finished' ? 'finished' : 'in-progress',
|
||||
gameCount: match.gameCount,
|
||||
winnerTeamIndex: match.result?.winnerTeamIndex,
|
||||
seriesResults: match.result?.seriesResults ?? [],
|
||||
games: games.map((game) => ({
|
||||
gameNumber: game.gameNumber,
|
||||
riotMatchId: game.riotMatchId ?? null,
|
||||
blueTeamIndex: game.blueTeamIndex,
|
||||
redTeamIndex: game.redTeamIndex,
|
||||
winnerTeamIndex: game.winnerTeamIndex ?? null,
|
||||
winnerSide: game.winnerSide ?? null,
|
||||
gameDuration: game.gameDuration,
|
||||
})),
|
||||
teams: match.teams.map((team) => ({
|
||||
teamIndex: team.teamIndex,
|
||||
name: team.name,
|
||||
members: team.members.map((member) => {
|
||||
const participant = participantById.get(member.userId.toString());
|
||||
return {
|
||||
userId: member.userId.toString(),
|
||||
summonerName: participant?.gameName ?? 'Unknown',
|
||||
profileIconId: participant?.profileIconId ?? 0,
|
||||
};
|
||||
}),
|
||||
})),
|
||||
};
|
||||
}
|
||||
|
||||
private toGameDetail(
|
||||
match: MatchDocument,
|
||||
game: NonNullable<MatchDocument['result']>['games'][number],
|
||||
raw: RiotMatchDto,
|
||||
timeline?: RiotMatchTimelineDto,
|
||||
timelineLoadAttempted = false,
|
||||
): InternalGameDetail {
|
||||
const puuidByUserId = new Map(
|
||||
match.participants
|
||||
.filter((participant) => participant.puuid)
|
||||
.map((participant) => [
|
||||
participant.userId.toString(),
|
||||
participant.puuid as string,
|
||||
]),
|
||||
);
|
||||
const rawByPuuid = new Map(
|
||||
raw.info.participants.map((participant) => [
|
||||
participant.puuid,
|
||||
participant,
|
||||
]),
|
||||
);
|
||||
const rawTeamIdBySide = new Map<TeamSide, number>();
|
||||
for (const participant of game.participants) {
|
||||
const puuid = puuidByUserId.get(participant.userId.toString());
|
||||
const rawParticipant = puuid ? rawByPuuid.get(puuid) : undefined;
|
||||
if (rawParticipant) {
|
||||
rawTeamIdBySide.set(participant.side, rawParticipant.teamId);
|
||||
}
|
||||
}
|
||||
const sideByParticipantId = this.toSideByParticipantId(
|
||||
raw,
|
||||
rawTeamIdBySide,
|
||||
);
|
||||
const objectiveEvents = this.toObjectiveEvents(
|
||||
timeline,
|
||||
rawTeamIdBySide,
|
||||
sideByParticipantId,
|
||||
);
|
||||
const timelineObjectives = this.toTimelineObjectives(objectiveEvents);
|
||||
const buildEventsByParticipantId =
|
||||
this.toBuildEventsByParticipantId(timeline);
|
||||
|
||||
return {
|
||||
gameNumber: game.gameNumber,
|
||||
riotMatchId: game.riotMatchId,
|
||||
gameCreation: game.gameCreation,
|
||||
gameDuration: game.gameDuration,
|
||||
gameVersion: raw.info.gameVersion,
|
||||
winnerSide: game.winnerSide,
|
||||
timeline: this.toTimeline(raw, rawTeamIdBySide, timeline),
|
||||
timelineLoaded: timelineLoadAttempted || Boolean(timeline),
|
||||
objectiveEvents,
|
||||
teams: (['blue', 'red'] as TeamSide[]).map((side) => {
|
||||
const teamIndex =
|
||||
side === 'blue' ? game.blueTeamIndex : game.redTeamIndex;
|
||||
const rawTeamId = rawTeamIdBySide.get(side);
|
||||
const rawTeam = raw.info.teams.find(
|
||||
(team) => team.teamId === rawTeamId,
|
||||
);
|
||||
const teamRawParticipants = raw.info.participants.filter(
|
||||
(participant) => participant.teamId === rawTeamId,
|
||||
);
|
||||
const teamKills = teamRawParticipants.reduce(
|
||||
(sum, participant) => sum + participant.kills,
|
||||
0,
|
||||
);
|
||||
const teamDamage = teamRawParticipants.reduce(
|
||||
(sum, participant) => sum + participant.totalDamageDealtToChampions,
|
||||
0,
|
||||
);
|
||||
return {
|
||||
teamIndex,
|
||||
side,
|
||||
win: game.winnerSide === side,
|
||||
objectives: this.toObjectiveSummary(
|
||||
rawTeam,
|
||||
timelineObjectives.get(side),
|
||||
Boolean(timeline),
|
||||
),
|
||||
bans: (rawTeam?.bans ?? []).map((ban) => ({
|
||||
championId: ban.championId,
|
||||
pickTurn: ban.pickTurn,
|
||||
})),
|
||||
participants: game.participants
|
||||
.filter((participant) => participant.side === side)
|
||||
.map((participant) => {
|
||||
const rawParticipant = rawByPuuid.get(
|
||||
puuidByUserId.get(participant.userId.toString()) ?? '',
|
||||
);
|
||||
return this.toRecord({
|
||||
match,
|
||||
game,
|
||||
participant,
|
||||
rawParticipant,
|
||||
buildEvents: rawParticipant
|
||||
? buildEventsByParticipantId.get(
|
||||
rawParticipant.participantId,
|
||||
)
|
||||
: undefined,
|
||||
teamKills,
|
||||
teamDamage,
|
||||
});
|
||||
}),
|
||||
};
|
||||
}),
|
||||
};
|
||||
}
|
||||
|
||||
private toFallbackGameDetail(
|
||||
match: MatchDocument,
|
||||
game: NonNullable<MatchDocument['result']>['games'][number],
|
||||
): InternalGameDetail {
|
||||
return {
|
||||
gameNumber: game.gameNumber,
|
||||
riotMatchId: game.riotMatchId,
|
||||
gameCreation: game.gameCreation,
|
||||
gameDuration: game.gameDuration,
|
||||
winnerSide: game.winnerSide,
|
||||
timeline: [],
|
||||
timelineLoaded: false,
|
||||
objectiveEvents: [],
|
||||
teams: (['blue', 'red'] as TeamSide[]).map((side) => ({
|
||||
teamIndex: side === 'blue' ? game.blueTeamIndex : game.redTeamIndex,
|
||||
side,
|
||||
win: game.winnerSide === side,
|
||||
objectives: emptyObjectives(),
|
||||
bans: [],
|
||||
participants: game.participants
|
||||
.filter((participant) => participant.side === side)
|
||||
.map((participant) =>
|
||||
this.toRecord({
|
||||
match,
|
||||
game,
|
||||
participant,
|
||||
teamKills: 0,
|
||||
teamDamage: 0,
|
||||
}),
|
||||
),
|
||||
})),
|
||||
};
|
||||
}
|
||||
|
||||
private toRecord(params: {
|
||||
match: MatchDocument;
|
||||
game: NonNullable<MatchDocument['result']>['games'][number];
|
||||
participant: MatchGameResultParticipant;
|
||||
rawParticipant?: RiotMatchParticipantDto;
|
||||
buildEvents?: ParticipantBuildEvents;
|
||||
teamKills: number;
|
||||
teamDamage: number;
|
||||
}): InternalRecord {
|
||||
const {
|
||||
match,
|
||||
game,
|
||||
participant,
|
||||
rawParticipant,
|
||||
buildEvents,
|
||||
teamKills,
|
||||
teamDamage,
|
||||
} = params;
|
||||
const snapshot = match.participants.find((item) =>
|
||||
item.userId.equals(participant.userId),
|
||||
);
|
||||
const minutes = Math.max(
|
||||
(rawParticipant?.timePlayed ?? game.gameDuration) / 60,
|
||||
1,
|
||||
);
|
||||
const cs = rawParticipant
|
||||
? rawParticipant.totalMinionsKilled + rawParticipant.neutralMinionsKilled
|
||||
: 0;
|
||||
const damage = rawParticipant?.totalDamageDealtToChampions ?? 0;
|
||||
const killParticipation = percent(
|
||||
participant.kills + participant.assists,
|
||||
teamKills,
|
||||
);
|
||||
const damageShare = percent(damage, teamDamage);
|
||||
const rating = this.resolveRating({
|
||||
kills: participant.kills,
|
||||
deaths: participant.deaths,
|
||||
assists: participant.assists,
|
||||
killParticipation,
|
||||
csPerMin: average(cs, minutes),
|
||||
damageShare,
|
||||
visionPerMin: average(rawParticipant?.visionScore ?? 0, minutes),
|
||||
});
|
||||
|
||||
return {
|
||||
matchId: match._id.toString(),
|
||||
title: match.title,
|
||||
scheduledAt: match.scheduledAt,
|
||||
gameNumber: game.gameNumber,
|
||||
riotMatchId: game.riotMatchId,
|
||||
gameCreation: game.gameCreation,
|
||||
gameDuration: game.gameDuration,
|
||||
userId: participant.userId.toString(),
|
||||
summonerName:
|
||||
snapshot?.gameName ??
|
||||
rawParticipant?.riotIdGameName ??
|
||||
rawParticipant?.summonerName ??
|
||||
'Unknown',
|
||||
tagLine: snapshot?.tagLine ?? rawParticipant?.riotIdTagLine ?? '',
|
||||
profileIconId: snapshot?.profileIconId ?? 0,
|
||||
teamIndex: participant.teamIndex,
|
||||
side: participant.side,
|
||||
championId: participant.championId,
|
||||
championLevel: rawParticipant?.champLevel ?? 0,
|
||||
teamPosition:
|
||||
rawParticipant?.teamPosition ||
|
||||
rawParticipant?.individualPosition ||
|
||||
'',
|
||||
kills: participant.kills,
|
||||
deaths: participant.deaths,
|
||||
assists: participant.assists,
|
||||
win: participant.win,
|
||||
cs,
|
||||
csPerMin: average(cs, minutes),
|
||||
gold: rawParticipant?.goldEarned ?? 0,
|
||||
gpm: average(rawParticipant?.goldEarned ?? 0, minutes),
|
||||
damageDealtToChampions: damage,
|
||||
damageTaken: rawParticipant?.totalDamageTaken ?? 0,
|
||||
damageShare,
|
||||
killParticipation,
|
||||
visionScore: rawParticipant?.visionScore ?? 0,
|
||||
controlWardsBought: numberField(
|
||||
rawParticipant,
|
||||
'visionWardsBoughtInGame',
|
||||
),
|
||||
wardsPlaced: rawParticipant?.wardsPlaced ?? 0,
|
||||
wardsKilled: rawParticipant?.wardsKilled ?? 0,
|
||||
firstBloodKill: booleanField(rawParticipant, 'firstBloodKill'),
|
||||
firstBloodAssist: booleanField(rawParticipant, 'firstBloodAssist'),
|
||||
items: [
|
||||
rawParticipant?.item0 ?? 0,
|
||||
rawParticipant?.item1 ?? 0,
|
||||
rawParticipant?.item2 ?? 0,
|
||||
rawParticipant?.item3 ?? 0,
|
||||
rawParticipant?.item4 ?? 0,
|
||||
rawParticipant?.item5 ?? 0,
|
||||
],
|
||||
trinket: rawParticipant?.item6 ?? 0,
|
||||
summonerSpells: [
|
||||
rawParticipant?.summoner1Id ?? 0,
|
||||
rawParticipant?.summoner2Id ?? 0,
|
||||
],
|
||||
perks: rawParticipant ? this.resolvePerks(rawParticipant) : {},
|
||||
itemBuild: buildEvents?.items ?? [],
|
||||
skillBuild: buildEvents?.skills ?? [],
|
||||
rating,
|
||||
};
|
||||
}
|
||||
|
||||
private resolvePerks(participant: RiotMatchParticipantDto) {
|
||||
const primary = participant.perks.styles.find(
|
||||
(style) => style.description === 'primaryStyle',
|
||||
);
|
||||
const sub = participant.perks.styles.find(
|
||||
(style) => style.description === 'subStyle',
|
||||
);
|
||||
return {
|
||||
primaryStyle: primary?.style,
|
||||
subStyle: sub?.style,
|
||||
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 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 toObjectiveEvents(
|
||||
timeline: RiotMatchTimelineDto | undefined,
|
||||
rawTeamIdBySide: Map<TeamSide, number>,
|
||||
sideByParticipantId: Map<number, TeamSide>,
|
||||
): MatchStatsObjectiveEvent[] {
|
||||
if (!timeline?.info.frames.length) return [];
|
||||
|
||||
const sideByTeamId = new Map<number, TeamSide>();
|
||||
for (const [side, teamId] of rawTeamIdBySide.entries()) {
|
||||
sideByTeamId.set(teamId, side);
|
||||
}
|
||||
|
||||
const objectiveEvents: MatchStatsObjectiveEvent[] = [];
|
||||
for (const frame of timeline.info.frames) {
|
||||
for (const event of frame.events ?? []) {
|
||||
if (event.type !== 'ELITE_MONSTER_KILL') continue;
|
||||
const side =
|
||||
(typeof event.killerTeamId === 'number'
|
||||
? sideByTeamId.get(event.killerTeamId)
|
||||
: undefined) ??
|
||||
(typeof event.killerId === 'number'
|
||||
? sideByParticipantId.get(event.killerId)
|
||||
: undefined);
|
||||
if (!side) continue;
|
||||
const timestamp = Math.max(0, Math.round(event.timestamp / 1000));
|
||||
switch (event.monsterType) {
|
||||
case 'BARON_NASHOR':
|
||||
objectiveEvents.push({ timestamp, side, type: 'baron' });
|
||||
break;
|
||||
case 'RIFTHERALD':
|
||||
objectiveEvents.push({ timestamp, side, type: 'riftHerald' });
|
||||
break;
|
||||
case 'HORDE':
|
||||
objectiveEvents.push({ timestamp, side, type: 'voidGrub' });
|
||||
break;
|
||||
case 'DRAGON':
|
||||
if (event.monsterSubType === 'ELDER_DRAGON') {
|
||||
objectiveEvents.push({
|
||||
timestamp,
|
||||
side,
|
||||
type: 'elderDragon',
|
||||
monsterSubType: event.monsterSubType,
|
||||
});
|
||||
} else {
|
||||
objectiveEvents.push({
|
||||
timestamp,
|
||||
side,
|
||||
type: 'dragon',
|
||||
monsterSubType: event.monsterSubType,
|
||||
});
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return objectiveEvents.sort((left, right) => left.timestamp - right.timestamp);
|
||||
}
|
||||
|
||||
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,
|
||||
hasTimeline: boolean,
|
||||
): MatchStatsObjectiveSummary {
|
||||
const rawObjectives = rawTeam?.objectives;
|
||||
return {
|
||||
tower: rawObjectives?.tower?.kills ?? 0,
|
||||
dragon: hasTimeline
|
||||
? (timelineObjectives?.dragon ?? 0)
|
||||
: (rawObjectives?.dragon?.kills ?? 0),
|
||||
inhibitor: rawObjectives?.inhibitor?.kills ?? 0,
|
||||
baron: hasTimeline
|
||||
? (timelineObjectives?.baron ?? 0)
|
||||
: (rawObjectives?.baron?.kills ?? 0),
|
||||
riftHerald: hasTimeline
|
||||
? (timelineObjectives?.riftHerald ?? 0)
|
||||
: (rawObjectives?.riftHerald?.kills ?? 0),
|
||||
voidGrub: hasTimeline
|
||||
? (timelineObjectives?.voidGrub ?? 0)
|
||||
: (rawObjectives?.horde?.kills ?? 0),
|
||||
elderDragon: timelineObjectives?.elderDragon ?? 0,
|
||||
};
|
||||
}
|
||||
|
||||
private resolveRating(params: {
|
||||
kills: number;
|
||||
deaths: number;
|
||||
assists: number;
|
||||
killParticipation: number;
|
||||
csPerMin: number;
|
||||
damageShare: number;
|
||||
visionPerMin: number;
|
||||
}): number {
|
||||
const kdaScore = kda(params.kills, params.deaths, params.assists);
|
||||
const score =
|
||||
Math.min(kdaScore / 6, 1) * 4 +
|
||||
Math.min(params.killParticipation / 100, 1) * 2 +
|
||||
Math.min(params.csPerMin / 9, 1) * 2 +
|
||||
Math.min(params.damageShare / 35, 1) +
|
||||
Math.min(params.visionPerMin / 2, 1);
|
||||
return round(score);
|
||||
}
|
||||
}
|
||||
|
||||
function kda(kills: number, deaths: number, assists: number): number {
|
||||
return deaths === 0 ? kills + assists : round((kills + assists) / deaths);
|
||||
}
|
||||
|
||||
function percent(value: number, total: number): number {
|
||||
return total > 0 ? Math.round((value / total) * 100) : 0;
|
||||
}
|
||||
|
||||
function average(value: number, total: number): number {
|
||||
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 round(value: number): number {
|
||||
return Math.round(value * 10) / 10;
|
||||
}
|
||||
|
||||
function numberField(
|
||||
participant: RiotMatchParticipantDto | undefined,
|
||||
key: string,
|
||||
): number {
|
||||
const value = participant?.[key];
|
||||
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,
|
||||
};
|
||||
}
|
||||
@@ -1,84 +0,0 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import mongoose from 'mongoose';
|
||||
import { ConnectionService } from '../global/database/connection.service';
|
||||
import type { MatchStats, MatchStatsDocument } from '../global/database/schema';
|
||||
|
||||
@Injectable()
|
||||
export class MatchStatsRepository {
|
||||
constructor(private readonly connectionService: ConnectionService) {}
|
||||
|
||||
public async upsert(
|
||||
fragment: Omit<MatchStats, 'createdAt' | 'updatedAt'>,
|
||||
): Promise<void> {
|
||||
const MatchStatsModel = await this.connectionService.getModel('matchStats');
|
||||
await MatchStatsModel.updateOne(
|
||||
{ matchId: fragment.matchId },
|
||||
{ $set: fragment },
|
||||
{ upsert: true },
|
||||
).exec();
|
||||
}
|
||||
|
||||
public async deleteByMatch(matchId: mongoose.Types.ObjectId): Promise<void> {
|
||||
const MatchStatsModel = await this.connectionService.getModel('matchStats');
|
||||
await MatchStatsModel.deleteOne({ matchId }).exec();
|
||||
}
|
||||
|
||||
public async deleteByMatches(
|
||||
matchIds: mongoose.Types.ObjectId[],
|
||||
): Promise<void> {
|
||||
if (matchIds.length === 0) return;
|
||||
const MatchStatsModel = await this.connectionService.getModel('matchStats');
|
||||
await MatchStatsModel.deleteMany({ matchId: { $in: matchIds } }).exec();
|
||||
}
|
||||
|
||||
public async findByMatch(
|
||||
matchId: mongoose.Types.ObjectId,
|
||||
): Promise<MatchStatsDocument | null> {
|
||||
const MatchStatsModel = await this.connectionService.getModel('matchStats');
|
||||
return MatchStatsModel.findOne({ matchId }).exec();
|
||||
}
|
||||
|
||||
public async findByCommunity(params: {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
fromGameCreation?: number;
|
||||
toGameCreation?: number;
|
||||
limit?: number;
|
||||
}): Promise<MatchStatsDocument[]> {
|
||||
const MatchStatsModel = await this.connectionService.getModel('matchStats');
|
||||
const filter: Record<string, unknown> = {
|
||||
communityId: params.communityId,
|
||||
};
|
||||
if (params.fromGameCreation !== undefined) {
|
||||
filter.gameCreationMax = { $gte: params.fromGameCreation };
|
||||
}
|
||||
if (params.toGameCreation !== undefined) {
|
||||
filter.gameCreationMin = { $lte: params.toGameCreation };
|
||||
}
|
||||
|
||||
return MatchStatsModel.find(filter)
|
||||
.sort({ scheduledAt: -1 })
|
||||
.limit(params.limit ?? 300)
|
||||
.exec();
|
||||
}
|
||||
|
||||
public async findByUser(params: {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
userId: mongoose.Types.ObjectId;
|
||||
fromGameCreation?: number;
|
||||
toGameCreation?: number;
|
||||
}): Promise<MatchStatsDocument[]> {
|
||||
const MatchStatsModel = await this.connectionService.getModel('matchStats');
|
||||
const filter: Record<string, unknown> = {
|
||||
communityId: params.communityId,
|
||||
userIds: params.userId,
|
||||
};
|
||||
if (params.fromGameCreation !== undefined) {
|
||||
filter.gameCreationMax = { $gte: params.fromGameCreation };
|
||||
}
|
||||
if (params.toGameCreation !== undefined) {
|
||||
filter.gameCreationMin = { $lte: params.toGameCreation };
|
||||
}
|
||||
|
||||
return MatchStatsModel.find(filter).sort({ scheduledAt: -1 }).exec();
|
||||
}
|
||||
}
|
||||
@@ -1,121 +0,0 @@
|
||||
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';
|
||||
|
||||
describe('MatchStatsService', () => {
|
||||
it('deletes an existing fragment when the match is no longer eligible', async () => {
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const findById = jest.fn().mockReturnValue({
|
||||
exec: jest.fn().mockResolvedValue({
|
||||
_id: matchId,
|
||||
status: 'recruiting',
|
||||
result: undefined,
|
||||
}),
|
||||
});
|
||||
const connectionService = {
|
||||
getModel: jest.fn().mockImplementation(async (name: string) => {
|
||||
if (name === 'match') return { findById };
|
||||
if (name === 'riotMatch') return {};
|
||||
throw new Error(`Unexpected model: ${name}`);
|
||||
}),
|
||||
} as unknown as ConnectionService;
|
||||
const repository = {
|
||||
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);
|
||||
|
||||
expect(repository.deleteByMatch).toHaveBeenCalledWith(matchId);
|
||||
expect(repository.upsert).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('upserts a fragment for eligible matches', async () => {
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const scheduledAt = new Date('2026-05-03T00:00:00.000Z');
|
||||
const match = {
|
||||
_id: matchId,
|
||||
communityId,
|
||||
scheduledAt,
|
||||
status: 'finished',
|
||||
result: { games: [{ riotMatchId: 'KR_1' }] },
|
||||
};
|
||||
const findById = jest.fn().mockReturnValue({
|
||||
exec: jest.fn().mockResolvedValue(match),
|
||||
});
|
||||
const riotFind = jest.fn().mockReturnValue({
|
||||
lean: () => ({
|
||||
exec: jest.fn().mockResolvedValue([
|
||||
{
|
||||
matchId: 'KR_1',
|
||||
raw: {},
|
||||
timeline: {
|
||||
metadata: {
|
||||
dataVersion: '2',
|
||||
matchId: 'KR_1',
|
||||
participants: [],
|
||||
},
|
||||
info: { frameInterval: 60_000, frames: [] },
|
||||
},
|
||||
},
|
||||
]),
|
||||
}),
|
||||
});
|
||||
const connectionService = {
|
||||
getModel: jest.fn().mockImplementation(async (name: string) => {
|
||||
if (name === 'match') return { findById };
|
||||
if (name === 'riotMatch') return { find: riotFind };
|
||||
throw new Error(`Unexpected model: ${name}`);
|
||||
}),
|
||||
} as unknown as ConnectionService;
|
||||
const repository = {
|
||||
upsert: jest.fn().mockResolvedValue(undefined),
|
||||
deleteByMatch: jest.fn(),
|
||||
} as unknown as jest.Mocked<MatchStatsRepository>;
|
||||
const builder = {
|
||||
buildFragment: jest.fn().mockReturnValue({
|
||||
matchCard: { matchId: matchId.toString() },
|
||||
records: [],
|
||||
gameDetails: [],
|
||||
userIds: [],
|
||||
championIds: [],
|
||||
gameCreationMin: 1_000,
|
||||
gameCreationMax: 2_000,
|
||||
}),
|
||||
} as unknown as jest.Mocked<MatchStatsFragmentBuilder>;
|
||||
const service = new MatchStatsService(
|
||||
connectionService,
|
||||
repository,
|
||||
builder,
|
||||
{ getMatchTimeline: jest.fn() } as never,
|
||||
);
|
||||
|
||||
await service.buildAndUpsert(matchId);
|
||||
|
||||
expect(builder.buildFragment).toHaveBeenCalledWith({
|
||||
match,
|
||||
rawByRiotMatchId: expect.any(Map),
|
||||
timelineByRiotMatchId: expect.any(Map),
|
||||
timelineLoadAttempted: false,
|
||||
});
|
||||
expect(repository.upsert).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
matchId,
|
||||
communityId,
|
||||
scheduledAt,
|
||||
gameCreationMin: 1_000,
|
||||
gameCreationMax: 2_000,
|
||||
builderVersion: 9,
|
||||
}),
|
||||
);
|
||||
});
|
||||
});
|
||||
@@ -1,185 +0,0 @@
|
||||
import { Injectable, Logger } from '@nestjs/common';
|
||||
import mongoose from 'mongoose';
|
||||
import { ConnectionService } from '../global/database/connection.service';
|
||||
import type { MatchDocument } from '../global/database/schema';
|
||||
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 { MatchStatsRepository } from './match-stats.repository';
|
||||
import { MATCH_STATS_BUILDER_VERSION } from './match-stats.types';
|
||||
|
||||
@Injectable()
|
||||
export class MatchStatsService {
|
||||
private readonly logger = new Logger(MatchStatsService.name);
|
||||
|
||||
constructor(
|
||||
private readonly connectionService: ConnectionService,
|
||||
private readonly repository: MatchStatsRepository,
|
||||
private readonly builder: MatchStatsFragmentBuilder,
|
||||
private readonly riotMatchService: RiotMatchService,
|
||||
) {}
|
||||
|
||||
public async buildAndUpsert(
|
||||
matchId: mongoose.Types.ObjectId,
|
||||
options: { includeTimeline?: boolean } = {},
|
||||
): Promise<void> {
|
||||
const MatchModel = await this.connectionService.getModel('match');
|
||||
const RiotMatchModel = await this.connectionService.getModel('riotMatch');
|
||||
const match = await MatchModel.findById(matchId).exec();
|
||||
if (!match) return;
|
||||
if (!this.isEligible(match)) {
|
||||
await this.repository.deleteByMatch(matchId);
|
||||
return;
|
||||
}
|
||||
|
||||
const riotIds = [
|
||||
...new Set(
|
||||
(match.result?.games ?? [])
|
||||
.map((game) => game.riotMatchId)
|
||||
.filter((riotMatchId): riotMatchId is string => Boolean(riotMatchId)),
|
||||
),
|
||||
];
|
||||
const riotDocs =
|
||||
riotIds.length > 0
|
||||
? await RiotMatchModel.find({ matchId: { $in: riotIds } })
|
||||
.lean()
|
||||
.exec()
|
||||
: [];
|
||||
const rawByRiotMatchId = new Map(
|
||||
riotDocs.map((doc) => [doc.matchId, doc.raw as unknown as RiotMatchDto]),
|
||||
);
|
||||
const timelineByRiotMatchId = new Map<string, RiotMatchTimelineDto>();
|
||||
for (const doc of riotDocs) {
|
||||
if (isRiotMatchTimelineDto(doc.timeline)) {
|
||||
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 },
|
||||
);
|
||||
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,
|
||||
rawByRiotMatchId,
|
||||
timelineByRiotMatchId,
|
||||
timelineLoadAttempted: options.includeTimeline === true,
|
||||
});
|
||||
|
||||
await this.repository.upsert({
|
||||
matchId: match._id,
|
||||
communityId: match.communityId,
|
||||
scheduledAt: match.scheduledAt,
|
||||
gameCreationMin: fragment.gameCreationMin,
|
||||
gameCreationMax: fragment.gameCreationMax,
|
||||
userIds: fragment.userIds,
|
||||
championIds: fragment.championIds,
|
||||
matchCard: fragment.matchCard as unknown as Record<string, unknown>,
|
||||
records: fragment.records,
|
||||
gameDetails: fragment.gameDetails,
|
||||
builtAt: new Date(),
|
||||
builderVersion: MATCH_STATS_BUILDER_VERSION,
|
||||
});
|
||||
}
|
||||
|
||||
public async removeByMatch(matchId: mongoose.Types.ObjectId): Promise<void> {
|
||||
await this.repository.deleteByMatch(matchId);
|
||||
}
|
||||
|
||||
public async removeByMatches(
|
||||
matchIds: mongoose.Types.ObjectId[],
|
||||
): Promise<void> {
|
||||
await this.repository.deleteByMatches(matchIds);
|
||||
}
|
||||
|
||||
public async backfillCommunity(
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
): Promise<{ processed: number; failed: number }> {
|
||||
const MatchModel = await this.connectionService.getModel('match');
|
||||
const matches = await MatchModel.find({
|
||||
communityId,
|
||||
status: { $in: ['finished', 'in-progress'] },
|
||||
'result.games.0': { $exists: true },
|
||||
})
|
||||
.sort({ scheduledAt: -1 })
|
||||
.select({ _id: 1 })
|
||||
.exec();
|
||||
|
||||
let processed = 0;
|
||||
let failed = 0;
|
||||
for (const match of matches) {
|
||||
try {
|
||||
await this.buildAndUpsert(match._id);
|
||||
processed += 1;
|
||||
} catch {
|
||||
failed += 1;
|
||||
}
|
||||
}
|
||||
return { processed, failed };
|
||||
}
|
||||
|
||||
private isEligible(match: MatchDocument): boolean {
|
||||
return (
|
||||
(match.status === 'finished' || match.status === 'in-progress') &&
|
||||
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';
|
||||
}
|
||||
}
|
||||
|
||||
function isRiotMatchTimelineDto(
|
||||
value: unknown,
|
||||
): value is RiotMatchTimelineDto {
|
||||
if (!isRecord(value) || !isRecord(value.info)) return false;
|
||||
return Array.isArray(value.info.frames);
|
||||
}
|
||||
|
||||
function isRecord(value: unknown): value is Record<string, unknown> {
|
||||
return typeof value === 'object' && value !== null;
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
import type {
|
||||
MatchStatsGameDetail,
|
||||
MatchStatsRecord,
|
||||
} from '../global/database/schema';
|
||||
import type { InternalMatchCardView } from './community-stats.types';
|
||||
|
||||
export const MATCH_STATS_BUILDER_VERSION = 9;
|
||||
|
||||
export type InternalRecord = MatchStatsRecord;
|
||||
export type InternalGameDetail = MatchStatsGameDetail;
|
||||
|
||||
export interface MatchStatsFragment {
|
||||
matchCard: InternalMatchCardView;
|
||||
records: InternalRecord[];
|
||||
gameDetails: InternalGameDetail[];
|
||||
userIds: import('mongoose').Types.ObjectId[];
|
||||
championIds: number[];
|
||||
gameCreationMin: number;
|
||||
gameCreationMax: number;
|
||||
}
|
||||
@@ -1,107 +0,0 @@
|
||||
import {
|
||||
Body,
|
||||
Controller,
|
||||
BadRequestException,
|
||||
ForbiddenException,
|
||||
Get,
|
||||
Param,
|
||||
Patch,
|
||||
Post,
|
||||
Req,
|
||||
UseGuards,
|
||||
} from '@nestjs/common';
|
||||
import type { Request } from 'express';
|
||||
import mongoose from 'mongoose';
|
||||
import { AllowPublicAccess } from '../auth/allow-public-access.decorator';
|
||||
import { CurrentUser } from '../auth/current-user.decorator';
|
||||
import { Roles } from '../auth/roles.decorator';
|
||||
import { RolesGuard } from '../auth/roles.guard';
|
||||
import { ParseObjectIdPipe } from '../common/parse-object-id.pipe';
|
||||
import type { UserDocument } from '../global/database/schema';
|
||||
import '../auth/auth-request';
|
||||
import { CommunityService } from './community.service';
|
||||
import { CreateCommunityDto } from './dto/create-community.dto';
|
||||
import { TransferOwnershipDto } from './dto/transfer-ownership.dto';
|
||||
|
||||
@Controller('communities')
|
||||
export class CommunityController {
|
||||
constructor(private readonly communityService: CommunityService) {}
|
||||
|
||||
@Post()
|
||||
@AllowPublicAccess()
|
||||
public async createCommunity(
|
||||
@Body() body: CreateCommunityDto,
|
||||
@Req() req: Request,
|
||||
) {
|
||||
if (!req.identity && !body.owner) {
|
||||
throw new BadRequestException(
|
||||
'owner is required when not authenticated.',
|
||||
);
|
||||
}
|
||||
return this.communityService.createCommunityWithOwner({
|
||||
...body,
|
||||
identityId: req.identity?._id,
|
||||
});
|
||||
}
|
||||
|
||||
@Get(':communityId')
|
||||
@AllowPublicAccess()
|
||||
public async getCommunity(
|
||||
@Param('communityId', ParseObjectIdPipe)
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
) {
|
||||
return this.communityService.getById(communityId);
|
||||
}
|
||||
|
||||
@Patch(':communityId/members/:userId/promote')
|
||||
@Roles('owner')
|
||||
@UseGuards(RolesGuard)
|
||||
public async promoteToAdmin(
|
||||
@CurrentUser() currentUser: UserDocument,
|
||||
@Param('communityId', ParseObjectIdPipe)
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
@Param('userId', ParseObjectIdPipe) targetUserId: mongoose.Types.ObjectId,
|
||||
) {
|
||||
this.assertOwnerOfCommunity(currentUser, communityId);
|
||||
return this.communityService.promoteToAdmin({ communityId, targetUserId });
|
||||
}
|
||||
|
||||
@Patch(':communityId/members/:userId/demote')
|
||||
@Roles('owner')
|
||||
@UseGuards(RolesGuard)
|
||||
public async demoteToMember(
|
||||
@CurrentUser() currentUser: UserDocument,
|
||||
@Param('communityId', ParseObjectIdPipe)
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
@Param('userId', ParseObjectIdPipe) targetUserId: mongoose.Types.ObjectId,
|
||||
) {
|
||||
this.assertOwnerOfCommunity(currentUser, communityId);
|
||||
return this.communityService.demoteToMember({ communityId, targetUserId });
|
||||
}
|
||||
|
||||
@Patch(':communityId/transfer-ownership')
|
||||
@Roles('owner')
|
||||
@UseGuards(RolesGuard)
|
||||
public async transferOwnership(
|
||||
@CurrentUser() currentUser: UserDocument,
|
||||
@Param('communityId', ParseObjectIdPipe)
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
@Body() body: TransferOwnershipDto,
|
||||
) {
|
||||
this.assertOwnerOfCommunity(currentUser, communityId);
|
||||
return this.communityService.transferOwnership({
|
||||
communityId,
|
||||
currentOwnerUserId: currentUser._id,
|
||||
newOwnerUserId: new mongoose.Types.ObjectId(body.newOwnerUserId),
|
||||
});
|
||||
}
|
||||
|
||||
private assertOwnerOfCommunity(
|
||||
user: UserDocument,
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
): void {
|
||||
if (!user.communityId.equals(communityId)) {
|
||||
throw new ForbiddenException('You do not belong to this community.');
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
import { Module } from '@nestjs/common';
|
||||
import { CommunityController } from './community.controller';
|
||||
import { CommunityService } from './community.service';
|
||||
|
||||
@Module({
|
||||
controllers: [CommunityController],
|
||||
providers: [CommunityService],
|
||||
exports: [CommunityService],
|
||||
})
|
||||
export class CommunityModule {}
|
||||
@@ -1,196 +0,0 @@
|
||||
import {
|
||||
BadRequestException,
|
||||
Injectable,
|
||||
InternalServerErrorException,
|
||||
NotFoundException,
|
||||
} from '@nestjs/common';
|
||||
import mongoose from 'mongoose';
|
||||
import { ConnectionService } from '../global/database/connection.service';
|
||||
import {
|
||||
CommunityDocument,
|
||||
UserDocument,
|
||||
} from '../global/database/schema';
|
||||
|
||||
export interface CreateCommunityInput {
|
||||
name: string;
|
||||
description?: string;
|
||||
identityId?: mongoose.Types.ObjectId;
|
||||
owner?: {
|
||||
kakaoTalkId?: string;
|
||||
kakaoTalkNickname?: string;
|
||||
discordId?: string;
|
||||
discordNickname?: string;
|
||||
};
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class CommunityService {
|
||||
constructor(private readonly connectionService: ConnectionService) {}
|
||||
|
||||
public async getById(
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
): Promise<CommunityDocument> {
|
||||
const CommunityModel = await this.connectionService.getModel('community');
|
||||
const community = await CommunityModel.findById(communityId).exec();
|
||||
if (!community) throw new NotFoundException('Community not found.');
|
||||
return community;
|
||||
}
|
||||
|
||||
public async createCommunityWithOwner(input: CreateCommunityInput): Promise<{
|
||||
community: CommunityDocument;
|
||||
owner: UserDocument;
|
||||
}> {
|
||||
const CommunityModel = await this.connectionService.getModel('community');
|
||||
const UserModel = await this.connectionService.getModel('user');
|
||||
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const ownerUserId = new mongoose.Types.ObjectId();
|
||||
|
||||
const session = await this.connectionService.createSession();
|
||||
if (!session) {
|
||||
throw new InternalServerErrorException('Failed to start DB session.');
|
||||
}
|
||||
|
||||
try {
|
||||
session.startTransaction();
|
||||
|
||||
const [community] = await CommunityModel.create(
|
||||
[
|
||||
{
|
||||
_id: communityId,
|
||||
name: input.name,
|
||||
description: input.description ?? '',
|
||||
ownerUserId,
|
||||
},
|
||||
],
|
||||
{ session },
|
||||
);
|
||||
|
||||
const [owner] = await UserModel.create(
|
||||
[
|
||||
{
|
||||
_id: ownerUserId,
|
||||
communityId,
|
||||
identityId: input.identityId,
|
||||
role: 'owner',
|
||||
kakaoTalkId: input.owner?.kakaoTalkId,
|
||||
kakaoTalkNickname: input.owner?.kakaoTalkNickname,
|
||||
discordId: input.owner?.discordId,
|
||||
discordNickname: input.owner?.discordNickname,
|
||||
},
|
||||
],
|
||||
{ session },
|
||||
);
|
||||
|
||||
await session.commitTransaction();
|
||||
return { community, owner };
|
||||
} catch (err) {
|
||||
await session.abortTransaction();
|
||||
throw err;
|
||||
} finally {
|
||||
await session.endSession();
|
||||
}
|
||||
}
|
||||
|
||||
public async promoteToAdmin(params: {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
targetUserId: mongoose.Types.ObjectId;
|
||||
}): Promise<UserDocument> {
|
||||
return this.changeNonOwnerRole({ ...params, nextRole: 'admin' });
|
||||
}
|
||||
|
||||
public async demoteToMember(params: {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
targetUserId: mongoose.Types.ObjectId;
|
||||
}): Promise<UserDocument> {
|
||||
return this.changeNonOwnerRole({ ...params, nextRole: 'member' });
|
||||
}
|
||||
|
||||
public async transferOwnership(params: {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
currentOwnerUserId: mongoose.Types.ObjectId;
|
||||
newOwnerUserId: mongoose.Types.ObjectId;
|
||||
}): Promise<{
|
||||
community: CommunityDocument;
|
||||
previousOwner: UserDocument;
|
||||
newOwner: UserDocument;
|
||||
}> {
|
||||
if (params.currentOwnerUserId.equals(params.newOwnerUserId)) {
|
||||
throw new BadRequestException('New owner is already the current owner.');
|
||||
}
|
||||
|
||||
const CommunityModel = await this.connectionService.getModel('community');
|
||||
const UserModel = await this.connectionService.getModel('user');
|
||||
|
||||
const session = await this.connectionService.createSession();
|
||||
if (!session) {
|
||||
throw new InternalServerErrorException('Failed to start DB session.');
|
||||
}
|
||||
|
||||
try {
|
||||
session.startTransaction();
|
||||
|
||||
const community = await CommunityModel.findById(
|
||||
params.communityId,
|
||||
).session(session);
|
||||
if (!community) throw new NotFoundException('Community not found.');
|
||||
if (!community.ownerUserId.equals(params.currentOwnerUserId)) {
|
||||
throw new BadRequestException('Acting user is not the current owner.');
|
||||
}
|
||||
|
||||
const [previousOwner, newOwner] = await Promise.all([
|
||||
UserModel.findById(params.currentOwnerUserId).session(session),
|
||||
UserModel.findById(params.newOwnerUserId).session(session),
|
||||
]);
|
||||
if (!previousOwner)
|
||||
throw new NotFoundException('Previous owner user not found.');
|
||||
if (!newOwner) throw new NotFoundException('New owner user not found.');
|
||||
if (!newOwner.communityId.equals(params.communityId)) {
|
||||
throw new BadRequestException(
|
||||
'New owner does not belong to this community.',
|
||||
);
|
||||
}
|
||||
|
||||
community.ownerUserId = newOwner._id;
|
||||
previousOwner.role = 'admin';
|
||||
newOwner.role = 'owner';
|
||||
|
||||
await Promise.all([
|
||||
community.save({ session }),
|
||||
previousOwner.save({ session }),
|
||||
newOwner.save({ session }),
|
||||
]);
|
||||
|
||||
await session.commitTransaction();
|
||||
return { community, previousOwner, newOwner };
|
||||
} catch (err) {
|
||||
await session.abortTransaction();
|
||||
throw err;
|
||||
} finally {
|
||||
await session.endSession();
|
||||
}
|
||||
}
|
||||
|
||||
private async changeNonOwnerRole(params: {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
targetUserId: mongoose.Types.ObjectId;
|
||||
nextRole: 'admin' | 'member';
|
||||
}): Promise<UserDocument> {
|
||||
const UserModel = await this.connectionService.getModel('user');
|
||||
const user = await UserModel.findById(params.targetUserId);
|
||||
if (!user) throw new NotFoundException('Target user not found.');
|
||||
if (!user.communityId.equals(params.communityId)) {
|
||||
throw new BadRequestException(
|
||||
'Target user does not belong to this community.',
|
||||
);
|
||||
}
|
||||
if (user.role === 'owner') {
|
||||
throw new BadRequestException(
|
||||
'Owner role must be changed via transferOwnership.',
|
||||
);
|
||||
}
|
||||
user.role = params.nextRole;
|
||||
await user.save();
|
||||
return user;
|
||||
}
|
||||
}
|
||||
@@ -1,47 +0,0 @@
|
||||
import { Type } from 'class-transformer';
|
||||
import {
|
||||
IsOptional,
|
||||
IsString,
|
||||
MaxLength,
|
||||
MinLength,
|
||||
ValidateNested,
|
||||
} from 'class-validator';
|
||||
|
||||
class CreateCommunityOwnerDto {
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
@MaxLength(64)
|
||||
kakaoTalkId?: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
@MaxLength(64)
|
||||
kakaoTalkNickname?: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
@MaxLength(64)
|
||||
discordId?: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
@MaxLength(64)
|
||||
discordNickname?: string;
|
||||
}
|
||||
|
||||
export class CreateCommunityDto {
|
||||
@IsString()
|
||||
@MinLength(1)
|
||||
@MaxLength(64)
|
||||
name!: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
@MaxLength(1024)
|
||||
description?: string;
|
||||
|
||||
@IsOptional()
|
||||
@ValidateNested()
|
||||
@Type(() => CreateCommunityOwnerDto)
|
||||
owner?: CreateCommunityOwnerDto;
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
import { IsMongoId } from 'class-validator';
|
||||
|
||||
export class TransferOwnershipDto {
|
||||
@IsMongoId()
|
||||
newOwnerUserId!: string;
|
||||
}
|
||||
@@ -1,123 +0,0 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import { ConnectionService } from '../global/database/connection.service';
|
||||
|
||||
const DEFAULT_LEASE_MS = 5 * 60 * 1000;
|
||||
|
||||
export type DakaoInboxClaimResult =
|
||||
| { status: 'claimed' }
|
||||
| { status: 'duplicate' }
|
||||
| { status: 'inflight' };
|
||||
|
||||
@Injectable()
|
||||
export class DakaoInboxService {
|
||||
constructor(private readonly connectionService: ConnectionService) {}
|
||||
|
||||
public async claim(params: {
|
||||
consumer: string;
|
||||
projectId: string;
|
||||
chatLogLogId: string;
|
||||
leaseMs?: number;
|
||||
}): Promise<DakaoInboxClaimResult> {
|
||||
const Model = await this.connectionService.getModel('dakaoInboundMessage');
|
||||
const now = new Date();
|
||||
const processingExpiresAt = new Date(
|
||||
now.getTime() + (params.leaseMs ?? DEFAULT_LEASE_MS),
|
||||
);
|
||||
|
||||
try {
|
||||
await Model.create({
|
||||
consumer: params.consumer,
|
||||
projectId: params.projectId,
|
||||
chatLogLogId: params.chatLogLogId,
|
||||
state: 'processing',
|
||||
attempts: 1,
|
||||
processingExpiresAt,
|
||||
});
|
||||
return { status: 'claimed' };
|
||||
} catch (err) {
|
||||
if ((err as { code?: number })?.code !== 11000) throw err;
|
||||
}
|
||||
|
||||
const existing = await Model.findOne({
|
||||
consumer: params.consumer,
|
||||
projectId: params.projectId,
|
||||
chatLogLogId: params.chatLogLogId,
|
||||
})
|
||||
.lean()
|
||||
.exec();
|
||||
if (!existing) return { status: 'inflight' };
|
||||
if (existing.state === 'processed') return { status: 'duplicate' };
|
||||
if (
|
||||
existing.state === 'processing' &&
|
||||
existing.processingExpiresAt &&
|
||||
existing.processingExpiresAt > now
|
||||
) {
|
||||
return { status: 'inflight' };
|
||||
}
|
||||
|
||||
const updated = await Model.updateOne(
|
||||
{
|
||||
_id: existing._id,
|
||||
$or: [
|
||||
{ state: 'failed' },
|
||||
{ state: 'processing', processingExpiresAt: { $lte: now } },
|
||||
],
|
||||
},
|
||||
{
|
||||
$set: {
|
||||
state: 'processing',
|
||||
processingExpiresAt,
|
||||
},
|
||||
$inc: { attempts: 1 },
|
||||
},
|
||||
).exec();
|
||||
return updated.modifiedCount > 0
|
||||
? { status: 'claimed' }
|
||||
: { status: 'inflight' };
|
||||
}
|
||||
|
||||
public async markProcessed(params: {
|
||||
consumer: string;
|
||||
projectId: string;
|
||||
chatLogLogId: string;
|
||||
}): Promise<void> {
|
||||
const Model = await this.connectionService.getModel('dakaoInboundMessage');
|
||||
await Model.updateOne(
|
||||
{
|
||||
consumer: params.consumer,
|
||||
projectId: params.projectId,
|
||||
chatLogLogId: params.chatLogLogId,
|
||||
},
|
||||
{
|
||||
$set: {
|
||||
state: 'processed',
|
||||
processedAt: new Date(),
|
||||
},
|
||||
$unset: { processingExpiresAt: '', lastError: '' },
|
||||
},
|
||||
).exec();
|
||||
}
|
||||
|
||||
public async markFailed(params: {
|
||||
consumer: string;
|
||||
projectId: string;
|
||||
chatLogLogId: string;
|
||||
error: unknown;
|
||||
}): Promise<void> {
|
||||
const Model = await this.connectionService.getModel('dakaoInboundMessage');
|
||||
await Model.updateOne(
|
||||
{
|
||||
consumer: params.consumer,
|
||||
projectId: params.projectId,
|
||||
chatLogLogId: params.chatLogLogId,
|
||||
},
|
||||
{
|
||||
$set: {
|
||||
state: 'failed',
|
||||
lastError: (params.error as Error)?.message ?? String(params.error),
|
||||
},
|
||||
$unset: { processingExpiresAt: '' },
|
||||
},
|
||||
).exec();
|
||||
}
|
||||
}
|
||||
@@ -1,64 +0,0 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import { NatsService } from '../global/nats/nats.service';
|
||||
import { resolveDakaoNatsNames } from './dakao.nats-names';
|
||||
|
||||
@Injectable()
|
||||
export class DakaoJetStreamResourceService {
|
||||
private ensurePromise: Promise<void> | null = null;
|
||||
|
||||
constructor(private readonly natsService: NatsService) {}
|
||||
|
||||
public async ensure(): Promise<void> {
|
||||
this.ensurePromise ??= this.ensureInternal();
|
||||
await this.ensurePromise;
|
||||
}
|
||||
|
||||
private async ensureInternal(): Promise<void> {
|
||||
const names = resolveDakaoNatsNames();
|
||||
await this.natsService.ensureJetStreamStream({
|
||||
name: names.streams.botCommand,
|
||||
subjects: [names.subjects.botCommandSubmitted],
|
||||
retention: 'workqueue',
|
||||
replicas: 1,
|
||||
});
|
||||
await this.natsService.ensureJetStreamConsumer({
|
||||
stream: names.streams.botCommand,
|
||||
durable: names.consumers.botCommand,
|
||||
filterSubject: names.subjects.botCommandSubmitted,
|
||||
description: 'LolyMpus Dakao bot command handler',
|
||||
replicas: 1,
|
||||
});
|
||||
|
||||
await this.natsService.ensureJetStreamStream({
|
||||
name: names.streams.sendRequest,
|
||||
subjects: [names.subjects.chatSendMessage],
|
||||
retention: 'workqueue',
|
||||
replicas: 1,
|
||||
});
|
||||
await this.natsService.ensureJetStreamConsumer({
|
||||
stream: names.streams.sendRequest,
|
||||
durable: names.consumers.sendRequest,
|
||||
filterSubject: names.subjects.chatSendMessage,
|
||||
description: 'Dakao send-message worker',
|
||||
replicas: 1,
|
||||
});
|
||||
|
||||
await this.natsService.ensureJetStreamStream({
|
||||
name: names.streams.sendResult,
|
||||
subjects: [
|
||||
names.subjects.chatSendMessageSucceeded,
|
||||
names.subjects.chatSendMessageFailed,
|
||||
],
|
||||
retention: 'limits',
|
||||
maxAgeDays: 30,
|
||||
replicas: 1,
|
||||
});
|
||||
await this.natsService.ensureJetStreamConsumer({
|
||||
stream: names.streams.sendResult,
|
||||
durable: names.consumers.sendResult,
|
||||
filterSubject: `${names.env}.lolympus.dakao.chat.send-message.*.v1`,
|
||||
description: 'LolyMpus Dakao send-message result handler',
|
||||
replicas: 1,
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -1,47 +0,0 @@
|
||||
import {
|
||||
Injectable,
|
||||
Logger,
|
||||
OnModuleDestroy,
|
||||
OnModuleInit,
|
||||
} from '@nestjs/common';
|
||||
import { DakaoOutboxService } from './dakao-outbox.service';
|
||||
|
||||
const SWEEP_INTERVAL_MS = 60 * 1000;
|
||||
const STALE_OUTBOX_MS = 5 * 60 * 1000;
|
||||
|
||||
@Injectable()
|
||||
export class DakaoOutboxSweeperService
|
||||
implements OnModuleInit, OnModuleDestroy
|
||||
{
|
||||
private readonly logger = new Logger(DakaoOutboxSweeperService.name);
|
||||
private timer: NodeJS.Timeout | undefined;
|
||||
|
||||
constructor(private readonly outboxService: DakaoOutboxService) {}
|
||||
|
||||
onModuleInit() {
|
||||
this.timer = setInterval(() => {
|
||||
void this.sweep();
|
||||
}, SWEEP_INTERVAL_MS);
|
||||
this.timer.unref();
|
||||
}
|
||||
|
||||
onModuleDestroy() {
|
||||
if (this.timer) clearInterval(this.timer);
|
||||
}
|
||||
|
||||
private async sweep(): Promise<void> {
|
||||
try {
|
||||
const swept = await this.outboxService.sweepStale({
|
||||
staleMs: STALE_OUTBOX_MS,
|
||||
limit: 20,
|
||||
});
|
||||
if (swept > 0) {
|
||||
this.logger.warn(`Re-published ${swept} stale Dakao outbox messages.`);
|
||||
}
|
||||
} catch (err) {
|
||||
this.logger.error(
|
||||
`Dakao outbox sweep failed: ${(err as Error)?.stack ?? err}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,116 +0,0 @@
|
||||
import { ConnectionService } from '../global/database/connection.service';
|
||||
import { NatsService } from '../global/nats/nats.service';
|
||||
import { DakaoOutboxService } from './dakao-outbox.service';
|
||||
import { DakaoResultSubjects } from './dakao.types';
|
||||
|
||||
function execResult<T>(value: T) {
|
||||
return { exec: jest.fn().mockResolvedValue(value) };
|
||||
}
|
||||
|
||||
function makeService(outboxModel: Record<string, unknown>) {
|
||||
const connectionService = {
|
||||
getModel: jest.fn().mockResolvedValue(outboxModel),
|
||||
} as unknown as ConnectionService;
|
||||
const natsService = {
|
||||
publishJetStream: jest.fn().mockResolvedValue(undefined),
|
||||
} as unknown as NatsService;
|
||||
|
||||
return {
|
||||
service: new DakaoOutboxService(connectionService, natsService),
|
||||
connectionService,
|
||||
natsService,
|
||||
};
|
||||
}
|
||||
|
||||
describe('DakaoOutboxService', () => {
|
||||
it('persists result subjects when enqueuing send-message commands', async () => {
|
||||
const outboxModel = {
|
||||
findOneAndUpdate: jest.fn().mockReturnValue(execResult({})),
|
||||
updateOne: jest.fn().mockReturnValue(execResult({})),
|
||||
};
|
||||
const { service, natsService } = makeService(outboxModel);
|
||||
const resultSubjects: DakaoResultSubjects = {
|
||||
succeeded: 'staging.lolympus.dakao.chat.send-message.succeeded.v1',
|
||||
failed: 'staging.lolympus.dakao.chat.send-message.failed.v1',
|
||||
};
|
||||
|
||||
await service.enqueueAndPublish({
|
||||
subject: 'staging.dakao.chat.send-message.v1',
|
||||
eventId: 'lolympus:chat.send-message:chat-log-1',
|
||||
envelope: {
|
||||
schema: 'dakao.command.v1',
|
||||
eventId: 'lolympus:chat.send-message:chat-log-1',
|
||||
type: 'chat.send-message',
|
||||
eventSource: 'lolympus',
|
||||
correlationId: 'chat-log-1',
|
||||
resultSubjects,
|
||||
payload: {
|
||||
chatroomId: '18474390111480678',
|
||||
segments: [{ kind: 'text', text: 'done' }],
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
expect(outboxModel.findOneAndUpdate).toHaveBeenCalledWith(
|
||||
{ eventId: 'lolympus:chat.send-message:chat-log-1' },
|
||||
expect.objectContaining({
|
||||
$setOnInsert: expect.objectContaining({ resultSubjects }),
|
||||
}),
|
||||
expect.any(Object),
|
||||
);
|
||||
expect(natsService.publishJetStream).toHaveBeenCalledWith(
|
||||
'staging.dakao.chat.send-message.v1',
|
||||
expect.objectContaining({ resultSubjects }),
|
||||
{ messageId: 'lolympus:chat.send-message:chat-log-1' },
|
||||
);
|
||||
});
|
||||
|
||||
it('restores send-message result subjects when sweeping legacy stale rows', async () => {
|
||||
const previousNodeEnv = process.env.NODE_ENV;
|
||||
process.env.NODE_ENV = 'staging';
|
||||
|
||||
try {
|
||||
const exec = jest.fn().mockResolvedValue([
|
||||
{
|
||||
eventId: 'lolympus:chat.send-message:chat-log-1',
|
||||
type: 'chat.send-message',
|
||||
eventSource: 'lolympus',
|
||||
subject: 'staging.dakao.chat.send-message.v1',
|
||||
correlationId: 'chat-log-1',
|
||||
payload: {
|
||||
chatroomId: '18474390111480678',
|
||||
segments: [{ kind: 'text', text: 'done' }],
|
||||
},
|
||||
},
|
||||
]);
|
||||
const lean = jest.fn().mockReturnValue({ exec });
|
||||
const limit = jest.fn().mockReturnValue({ lean });
|
||||
const sort = jest.fn().mockReturnValue({ limit });
|
||||
const outboxModel = {
|
||||
find: jest.fn().mockReturnValue({ sort }),
|
||||
};
|
||||
const { service } = makeService(outboxModel);
|
||||
const enqueue = jest
|
||||
.spyOn(service, 'enqueueAndPublish')
|
||||
.mockResolvedValue(undefined);
|
||||
|
||||
await expect(service.sweepStale({ staleMs: 1, limit: 1 })).resolves.toBe(
|
||||
1,
|
||||
);
|
||||
|
||||
expect(enqueue).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
envelope: expect.objectContaining({
|
||||
resultSubjects: {
|
||||
succeeded:
|
||||
'staging.lolympus.dakao.chat.send-message.succeeded.v1',
|
||||
failed: 'staging.lolympus.dakao.chat.send-message.failed.v1',
|
||||
},
|
||||
}),
|
||||
}),
|
||||
);
|
||||
} finally {
|
||||
process.env.NODE_ENV = previousNodeEnv;
|
||||
}
|
||||
});
|
||||
});
|
||||
@@ -1,191 +0,0 @@
|
||||
import { Injectable, Logger } from '@nestjs/common';
|
||||
import { ConnectionService } from '../global/database/connection.service';
|
||||
import { NatsService } from '../global/nats/nats.service';
|
||||
import { resolveDakaoNatsNames } from './dakao.nats-names';
|
||||
import {
|
||||
DakaoCommandEnvelope,
|
||||
DakaoResultEnvelope,
|
||||
DakaoResultSubjects,
|
||||
} from './dakao.types';
|
||||
|
||||
const CHAT_SEND_MESSAGE_TYPE = 'chat.send-message';
|
||||
const TERMINAL_STATES = ['sent', 'failed'] as const;
|
||||
|
||||
@Injectable()
|
||||
export class DakaoOutboxService {
|
||||
private readonly logger = new Logger(DakaoOutboxService.name);
|
||||
private readonly chatSendMessageResultSubjects = {
|
||||
succeeded: resolveDakaoNatsNames().subjects.chatSendMessageSucceeded,
|
||||
failed: resolveDakaoNatsNames().subjects.chatSendMessageFailed,
|
||||
};
|
||||
|
||||
constructor(
|
||||
private readonly connectionService: ConnectionService,
|
||||
private readonly natsService: NatsService,
|
||||
) {}
|
||||
|
||||
public async enqueueAndPublish<TPayload>(params: {
|
||||
subject: string;
|
||||
eventId: string;
|
||||
envelope: DakaoCommandEnvelope<TPayload>;
|
||||
}): Promise<void> {
|
||||
const OutboxModel =
|
||||
await this.connectionService.getModel('dakaoOutboxMessage');
|
||||
await OutboxModel.findOneAndUpdate(
|
||||
{ eventId: params.eventId },
|
||||
{
|
||||
$setOnInsert: {
|
||||
eventId: params.eventId,
|
||||
eventSource: params.envelope.eventSource,
|
||||
type: params.envelope.type,
|
||||
subject: params.subject,
|
||||
correlationId: params.envelope.correlationId,
|
||||
resultSubjects: params.envelope.resultSubjects,
|
||||
payload: params.envelope.payload as Record<string, unknown>,
|
||||
state: 'pending',
|
||||
publishAttempts: 0,
|
||||
compensationState: 'none',
|
||||
},
|
||||
},
|
||||
{ upsert: true, returnDocument: 'after', setDefaultsOnInsert: true },
|
||||
).exec();
|
||||
|
||||
try {
|
||||
await this.natsService.publishJetStream(params.subject, params.envelope, {
|
||||
messageId: params.eventId,
|
||||
});
|
||||
await OutboxModel.updateOne(
|
||||
{
|
||||
eventId: params.eventId,
|
||||
state: { $nin: TERMINAL_STATES },
|
||||
},
|
||||
{
|
||||
$set: {
|
||||
state: 'published',
|
||||
publishedAt: new Date(),
|
||||
},
|
||||
$inc: { publishAttempts: 1 },
|
||||
$unset: { lastPublishError: '' },
|
||||
},
|
||||
).exec();
|
||||
} catch (err) {
|
||||
await OutboxModel.updateOne(
|
||||
{
|
||||
eventId: params.eventId,
|
||||
state: { $nin: TERMINAL_STATES },
|
||||
},
|
||||
{
|
||||
$inc: { publishAttempts: 1 },
|
||||
$set: {
|
||||
lastPublishError: (err as Error)?.message ?? String(err),
|
||||
},
|
||||
},
|
||||
).exec();
|
||||
this.logger.error(
|
||||
`Failed to publish Dakao outbox eventId=${params.eventId}: ${
|
||||
(err as Error)?.stack ?? err
|
||||
}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
public async applySendResult(params: {
|
||||
subject: string;
|
||||
envelope: DakaoResultEnvelope;
|
||||
}): Promise<{ duplicate: boolean; terminalState?: 'sent' | 'failed' }> {
|
||||
const ResultModel = await this.connectionService.getModel(
|
||||
'dakaoSendResultEvent',
|
||||
);
|
||||
const OutboxModel =
|
||||
await this.connectionService.getModel('dakaoOutboxMessage');
|
||||
|
||||
try {
|
||||
await ResultModel.create({
|
||||
eventId: params.envelope.eventId,
|
||||
requestEventId: params.envelope.requestEventId,
|
||||
eventSource: params.envelope.eventSource,
|
||||
requestEventSource: params.envelope.requestEventSource,
|
||||
type: params.envelope.type,
|
||||
subject: params.subject,
|
||||
status: params.envelope.status,
|
||||
correlationId: params.envelope.correlationId,
|
||||
handledAt: new Date(params.envelope.handledAt),
|
||||
providerMessageId: params.envelope.providerMessageId,
|
||||
error: params.envelope.error,
|
||||
raw: params.envelope as unknown as Record<string, unknown>,
|
||||
});
|
||||
} catch (err) {
|
||||
if ((err as { code?: number })?.code === 11000) {
|
||||
return { duplicate: true };
|
||||
}
|
||||
throw err;
|
||||
}
|
||||
|
||||
const terminalState =
|
||||
params.envelope.status === 'succeeded' ? 'sent' : 'failed';
|
||||
await OutboxModel.updateOne(
|
||||
{
|
||||
eventId: params.envelope.requestEventId,
|
||||
state: { $nin: TERMINAL_STATES },
|
||||
},
|
||||
{
|
||||
$set: {
|
||||
state: terminalState,
|
||||
terminalAt: new Date(),
|
||||
resultEventId: params.envelope.eventId,
|
||||
terminalError: params.envelope.error,
|
||||
compensationState:
|
||||
params.envelope.status === 'failed' ? 'pending' : 'none',
|
||||
compensationReason: params.envelope.error?.code,
|
||||
},
|
||||
},
|
||||
).exec();
|
||||
|
||||
return { duplicate: false, terminalState };
|
||||
}
|
||||
|
||||
public async sweepStale(params?: {
|
||||
staleMs?: number;
|
||||
limit?: number;
|
||||
}): Promise<number> {
|
||||
const OutboxModel =
|
||||
await this.connectionService.getModel('dakaoOutboxMessage');
|
||||
const staleBefore = new Date(
|
||||
Date.now() - (params?.staleMs ?? 5 * 60 * 1000),
|
||||
);
|
||||
const rows = await OutboxModel.find({
|
||||
state: { $in: ['pending', 'published'] },
|
||||
updatedAt: { $lte: staleBefore },
|
||||
})
|
||||
.sort({ updatedAt: 1 })
|
||||
.limit(params?.limit ?? 20)
|
||||
.lean()
|
||||
.exec();
|
||||
|
||||
for (const row of rows) {
|
||||
await this.enqueueAndPublish({
|
||||
subject: row.subject,
|
||||
eventId: row.eventId,
|
||||
envelope: {
|
||||
schema: 'dakao.command.v1',
|
||||
eventId: row.eventId,
|
||||
type: row.type,
|
||||
eventSource: row.eventSource,
|
||||
correlationId: row.correlationId,
|
||||
resultSubjects:
|
||||
row.resultSubjects ?? this.resolveDefaultResultSubjects(row.type),
|
||||
payload: row.payload,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
return rows.length;
|
||||
}
|
||||
|
||||
private resolveDefaultResultSubjects(
|
||||
type: string,
|
||||
): DakaoResultSubjects | undefined {
|
||||
if (type !== CHAT_SEND_MESSAGE_TYPE) return undefined;
|
||||
return this.chatSendMessageResultSubjects;
|
||||
}
|
||||
}
|
||||
@@ -1,81 +0,0 @@
|
||||
import { Injectable, Logger, OnModuleInit } from '@nestjs/common';
|
||||
import { NatsService } from '../global/nats/nats.service';
|
||||
import { DakaoJetStreamResourceService } from './dakao-jetstream-resource.service';
|
||||
import { resolveDakaoNatsNames } from './dakao.nats-names';
|
||||
import { DakaoOutboxService } from './dakao-outbox.service';
|
||||
import { DakaoResultEnvelope } from './dakao.types';
|
||||
|
||||
@Injectable()
|
||||
export class DakaoSendResultSubscriber implements OnModuleInit {
|
||||
private readonly logger = new Logger(DakaoSendResultSubscriber.name);
|
||||
|
||||
constructor(
|
||||
private readonly natsService: NatsService,
|
||||
private readonly resources: DakaoJetStreamResourceService,
|
||||
private readonly outboxService: DakaoOutboxService,
|
||||
) {}
|
||||
|
||||
async onModuleInit() {
|
||||
await this.resources.ensure();
|
||||
const names = resolveDakaoNatsNames();
|
||||
void this.natsService.consumeJetStream<DakaoResultEnvelope>(
|
||||
{
|
||||
stream: names.streams.sendResult,
|
||||
durable: names.consumers.sendResult,
|
||||
},
|
||||
(event, msg) => this.handleResult(event, msg.subject),
|
||||
);
|
||||
this.logger.log(
|
||||
`Dakao send-result subscriber ready on stream="${names.streams.sendResult}" durable="${names.consumers.sendResult}"`,
|
||||
);
|
||||
}
|
||||
|
||||
private async handleResult(
|
||||
event: DakaoResultEnvelope,
|
||||
subject: string,
|
||||
): Promise<void> {
|
||||
if (!this.validate(event)) {
|
||||
this.logger.warn(`Ignoring invalid Dakao send-result on ${subject}`);
|
||||
return;
|
||||
}
|
||||
|
||||
const result = await this.outboxService.applySendResult({
|
||||
subject,
|
||||
envelope: event,
|
||||
});
|
||||
if (result.duplicate) {
|
||||
this.logger.log(
|
||||
`Duplicate Dakao result ignored eventId=${event.eventId}`,
|
||||
);
|
||||
return;
|
||||
}
|
||||
this.logger.log(
|
||||
`Dakao result applied eventId=${event.eventId} requestEventId=${event.requestEventId} state=${result.terminalState ?? '-'}`,
|
||||
);
|
||||
}
|
||||
|
||||
private validate(event: unknown): event is DakaoResultEnvelope {
|
||||
if (!event || typeof event !== 'object') return false;
|
||||
const e = event as Partial<DakaoResultEnvelope>;
|
||||
if (e.schema !== 'dakao.result.v1') return false;
|
||||
if (typeof e.eventId !== 'string' || e.eventId.length === 0) return false;
|
||||
if (typeof e.requestEventId !== 'string' || e.requestEventId.length === 0) {
|
||||
return false;
|
||||
}
|
||||
if (typeof e.eventSource !== 'string' || e.eventSource.length === 0)
|
||||
return false;
|
||||
if (
|
||||
typeof e.requestEventSource !== 'string' ||
|
||||
e.requestEventSource.length === 0
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
if (e.status !== 'succeeded' && e.status !== 'failed') return false;
|
||||
if (
|
||||
typeof e.handledAt !== 'string' ||
|
||||
Number.isNaN(Date.parse(e.handledAt))
|
||||
)
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -1,148 +0,0 @@
|
||||
import { SecretService } from '../global/secret/secret.service';
|
||||
import { DakaoUrlShortenerService } from './dakao-url-shortener.service';
|
||||
|
||||
describe('DakaoUrlShortenerService', () => {
|
||||
const originalEnv = process.env;
|
||||
const originalFetch = global.fetch;
|
||||
|
||||
beforeEach(() => {
|
||||
process.env = { ...originalEnv };
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
process.env = originalEnv;
|
||||
global.fetch = originalFetch;
|
||||
jest.restoreAllMocks();
|
||||
});
|
||||
|
||||
function makeService(token = 'shortener-token') {
|
||||
const secretService = {
|
||||
get: jest.fn().mockResolvedValue(token),
|
||||
} as unknown as jest.Mocked<SecretService>;
|
||||
|
||||
return {
|
||||
service: new DakaoUrlShortenerService(secretService),
|
||||
secretService,
|
||||
};
|
||||
}
|
||||
|
||||
it('posts a production match detail URL with a deterministic slug', async () => {
|
||||
process.env.NODE_ENV = 'prod';
|
||||
global.fetch = jest.fn().mockResolvedValue({
|
||||
ok: true,
|
||||
status: 201,
|
||||
json: jest
|
||||
.fn()
|
||||
.mockResolvedValue({ shortUrl: 'https://go.dahyeon.us/lmtpAB12' }),
|
||||
} as unknown as Response);
|
||||
const { service } = makeService();
|
||||
|
||||
const shortUrl = await service.shortenMatchLink({
|
||||
matchId: '333333333333333333333333',
|
||||
shortCode: 'ab12',
|
||||
});
|
||||
|
||||
expect(shortUrl).toBe('https://go.dahyeon.us/lmtpAB12');
|
||||
expect(global.fetch).toHaveBeenCalledWith(
|
||||
'https://go.dahyeon.us/api/shorten',
|
||||
expect.objectContaining({
|
||||
method: 'POST',
|
||||
headers: expect.objectContaining({
|
||||
Accept: 'application/json',
|
||||
Authorization: 'Bearer shortener-token',
|
||||
'Content-Type': 'application/json',
|
||||
}),
|
||||
}),
|
||||
);
|
||||
const init = (global.fetch as jest.Mock).mock.calls[0][1] as RequestInit;
|
||||
expect(JSON.parse(init.body as string)).toEqual({
|
||||
slug: 'lmtpAB12',
|
||||
url: 'https://lolympus.dahyeon.us/match/333333333333333333333333',
|
||||
redirectStatus: 302,
|
||||
expiresAt: null,
|
||||
});
|
||||
});
|
||||
|
||||
it('uses staging slug prefix and configured target base URL outside production', async () => {
|
||||
process.env.NODE_ENV = 'staging';
|
||||
process.env.URL_SHORTENER_TARGET_BASE_URL =
|
||||
'https://staging.lolympus.pages.dev/';
|
||||
global.fetch = jest.fn().mockResolvedValue({
|
||||
ok: true,
|
||||
status: 201,
|
||||
json: jest
|
||||
.fn()
|
||||
.mockResolvedValue({ shortUrl: 'https://go.dahyeon.us/lmtsCD34' }),
|
||||
} as unknown as Response);
|
||||
const { service } = makeService();
|
||||
|
||||
await service.shortenMatchLink({
|
||||
matchId: '444444444444444444444444',
|
||||
shortCode: 'cd34',
|
||||
});
|
||||
|
||||
const init = (global.fetch as jest.Mock).mock.calls[0][1] as RequestInit;
|
||||
expect(JSON.parse(init.body as string)).toEqual(
|
||||
expect.objectContaining({
|
||||
slug: 'lmtsCD34',
|
||||
url: 'https://staging.lolympus.pages.dev/match/444444444444444444444444',
|
||||
}),
|
||||
);
|
||||
});
|
||||
|
||||
it('builds the direct match detail URL for fallback output', () => {
|
||||
process.env.URL_SHORTENER_TARGET_BASE_URL =
|
||||
'https://staging.lolympus.pages.dev/';
|
||||
const { service } = makeService();
|
||||
|
||||
expect(service.buildMatchDetailUrl('444444444444444444444444')).toBe(
|
||||
'https://staging.lolympus.pages.dev/match/444444444444444444444444',
|
||||
);
|
||||
});
|
||||
|
||||
it('skips shortener calls when the bearer token is missing', async () => {
|
||||
global.fetch = jest.fn();
|
||||
const { service } = makeService('');
|
||||
|
||||
await expect(
|
||||
service.shortenMatchLink({
|
||||
matchId: '333333333333333333333333',
|
||||
shortCode: 'AB12',
|
||||
}),
|
||||
).resolves.toBeUndefined();
|
||||
expect(global.fetch).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('returns the deterministic short URL when the slug already exists', async () => {
|
||||
process.env.NODE_ENV = 'prod';
|
||||
global.fetch = jest.fn().mockResolvedValue({
|
||||
ok: false,
|
||||
status: 409,
|
||||
text: jest.fn().mockResolvedValue('Conflict'),
|
||||
} as unknown as Response);
|
||||
const { service } = makeService();
|
||||
|
||||
await expect(
|
||||
service.shortenMatchLink({
|
||||
matchId: '333333333333333333333333',
|
||||
shortCode: 'AB12',
|
||||
}),
|
||||
).resolves.toBe('https://go.dahyeon.us/lmtpAB12');
|
||||
});
|
||||
|
||||
it('returns undefined when the shortener rejects the request', async () => {
|
||||
global.fetch = jest.fn().mockResolvedValue({
|
||||
ok: false,
|
||||
status: 500,
|
||||
text: jest.fn().mockResolvedValue('server error'),
|
||||
} as unknown as Response);
|
||||
const { service } = makeService();
|
||||
|
||||
await expect(
|
||||
service.shortenMatchLink({
|
||||
matchId: '333333333333333333333333',
|
||||
shortCode: 'AB12',
|
||||
}),
|
||||
).resolves.toBeUndefined();
|
||||
});
|
||||
});
|
||||
@@ -1,180 +0,0 @@
|
||||
import { Injectable, Logger } from '@nestjs/common';
|
||||
import { SecretService } from '../global/secret/secret.service';
|
||||
|
||||
const DEFAULT_SHORTENER_API_URL = 'https://go.dahyeon.us/api/shorten';
|
||||
const DEFAULT_SHORTENER_BASE_URL = 'https://go.dahyeon.us';
|
||||
const DEFAULT_TARGET_BASE_URL = 'https://lolympus.dahyeon.us';
|
||||
const DEFAULT_TIMEOUT_MS = 1500;
|
||||
|
||||
interface ShortenMatchLinkParams {
|
||||
matchId: string;
|
||||
shortCode: string | undefined;
|
||||
}
|
||||
|
||||
interface ShortenerResponseBody {
|
||||
shortUrl?: unknown;
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class DakaoUrlShortenerService {
|
||||
private readonly logger = new Logger(DakaoUrlShortenerService.name);
|
||||
|
||||
constructor(private readonly secretService: SecretService) {}
|
||||
|
||||
public async shortenMatchLink(
|
||||
params: ShortenMatchLinkParams,
|
||||
): Promise<string | undefined> {
|
||||
const shortCode = params.shortCode?.trim().toUpperCase();
|
||||
if (!shortCode) return undefined;
|
||||
|
||||
const token = await this.resolveToken();
|
||||
if (!token) return undefined;
|
||||
|
||||
const slug = `${this.resolveSlugPrefix()}${shortCode}`;
|
||||
const requestBody = {
|
||||
slug,
|
||||
url: this.buildMatchDetailUrl(params.matchId),
|
||||
redirectStatus: 302,
|
||||
expiresAt: null,
|
||||
};
|
||||
|
||||
const controller = new AbortController();
|
||||
const timeout = setTimeout(
|
||||
() => controller.abort(),
|
||||
this.resolveTimeoutMs(),
|
||||
);
|
||||
|
||||
try {
|
||||
const response = await fetch(this.resolveApiUrl(), {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
Accept: 'application/json',
|
||||
Authorization: `Bearer ${token}`,
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify(requestBody),
|
||||
signal: controller.signal,
|
||||
});
|
||||
|
||||
if (response.status === 409) {
|
||||
return this.buildShortUrl(slug);
|
||||
}
|
||||
|
||||
if (!response.ok) {
|
||||
await this.logFailedResponse(response, slug);
|
||||
return undefined;
|
||||
}
|
||||
|
||||
const payload = await this.parseResponseBody(response);
|
||||
const shortUrl = payload?.shortUrl;
|
||||
return typeof shortUrl === 'string' && shortUrl.trim()
|
||||
? shortUrl.trim()
|
||||
: this.buildShortUrl(slug);
|
||||
} catch (error) {
|
||||
this.logger.warn(
|
||||
`URL shortener request failed for slug="${slug}": ${error instanceof Error ? error.message : String(error)}`,
|
||||
);
|
||||
return undefined;
|
||||
} finally {
|
||||
clearTimeout(timeout);
|
||||
}
|
||||
}
|
||||
|
||||
private async resolveToken(): Promise<string | undefined> {
|
||||
try {
|
||||
const token = await this.secretService.get<string>(
|
||||
'URL_SHORTENER_TOKEN',
|
||||
'',
|
||||
);
|
||||
return token.trim() || undefined;
|
||||
} catch (error) {
|
||||
this.logger.warn(
|
||||
`URL shortener token unavailable: ${error instanceof Error ? error.message : String(error)}`,
|
||||
);
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
|
||||
private resolveSlugPrefix(): 'lmtp' | 'lmts' {
|
||||
const nodeEnv = process.env.NODE_ENV?.trim().toLowerCase();
|
||||
return nodeEnv === 'prod' || nodeEnv === 'production' ? 'lmtp' : 'lmts';
|
||||
}
|
||||
|
||||
public buildMatchDetailUrl(matchId: string): string {
|
||||
return `${this.resolveTargetBaseUrl()}/match/${encodeURIComponent(matchId)}`;
|
||||
}
|
||||
|
||||
private buildShortUrl(slug: string): string {
|
||||
return `${this.resolveShortenerBaseUrl()}/${encodeURIComponent(slug)}`;
|
||||
}
|
||||
|
||||
private resolveApiUrl(): string {
|
||||
return (
|
||||
process.env.URL_SHORTENER_API_URL?.trim() || DEFAULT_SHORTENER_API_URL
|
||||
);
|
||||
}
|
||||
|
||||
private resolveShortenerBaseUrl(): string {
|
||||
return (
|
||||
this.normalizeBaseUrl(process.env.URL_SHORTENER_BASE_URL) ??
|
||||
this.normalizeOrigin(this.resolveApiUrl()) ??
|
||||
DEFAULT_SHORTENER_BASE_URL
|
||||
);
|
||||
}
|
||||
|
||||
private resolveTargetBaseUrl(): string {
|
||||
return (
|
||||
this.normalizeBaseUrl(process.env.URL_SHORTENER_TARGET_BASE_URL) ??
|
||||
this.normalizeBaseUrl(process.env.WEB_ORIGIN) ??
|
||||
DEFAULT_TARGET_BASE_URL
|
||||
);
|
||||
}
|
||||
|
||||
private resolveTimeoutMs(): number {
|
||||
const configured = Number(process.env.URL_SHORTENER_TIMEOUT_MS);
|
||||
return Number.isFinite(configured) && configured > 0
|
||||
? configured
|
||||
: DEFAULT_TIMEOUT_MS;
|
||||
}
|
||||
|
||||
private normalizeBaseUrl(value: string | undefined): string | undefined {
|
||||
const raw = value?.split(',')[0]?.trim();
|
||||
if (!raw) return undefined;
|
||||
|
||||
try {
|
||||
const url = new URL(raw);
|
||||
const pathname = url.pathname.replace(/\/+$/u, '');
|
||||
return `${url.origin}${pathname}`;
|
||||
} catch {
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
|
||||
private normalizeOrigin(value: string): string | undefined {
|
||||
try {
|
||||
return new URL(value).origin;
|
||||
} catch {
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
|
||||
private async parseResponseBody(
|
||||
response: Response,
|
||||
): Promise<ShortenerResponseBody | undefined> {
|
||||
try {
|
||||
return (await response.json()) as ShortenerResponseBody;
|
||||
} catch {
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
|
||||
private async logFailedResponse(
|
||||
response: Response,
|
||||
slug: string,
|
||||
): Promise<void> {
|
||||
const body = await response.text().catch(() => '');
|
||||
this.logger.warn(
|
||||
`URL shortener returned ${response.status} for slug="${slug}"${body ? `: ${body.slice(0, 200)}` : ''}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,247 +0,0 @@
|
||||
import mongoose from 'mongoose';
|
||||
import { ConnectionService } from '../global/database/connection.service';
|
||||
import { RiotAccount, UserDocument } from '../global/database/schema';
|
||||
import { RiotAccountEnrichmentService } from '../riot/riot-account-enrichment.service';
|
||||
import { RiotAccountService } from '../riot/riot-account.service';
|
||||
import { DakaoUserService } from './dakao-user.service';
|
||||
|
||||
const objectId = (hex: string) => new mongoose.Types.ObjectId(hex);
|
||||
|
||||
function makeQuery<T>(value: T) {
|
||||
return {
|
||||
exec: jest.fn().mockResolvedValue(value),
|
||||
};
|
||||
}
|
||||
|
||||
function makeService(params: {
|
||||
user: Partial<UserDocument> | null;
|
||||
community?: Record<string, unknown> | null;
|
||||
riotAccountService?: Partial<RiotAccountService>;
|
||||
enrichmentService?: Partial<RiotAccountEnrichmentService>;
|
||||
}) {
|
||||
const findOneAndUpdate = jest
|
||||
.fn()
|
||||
.mockReturnValue(makeQuery(params.user as UserDocument));
|
||||
const findOne = jest.fn().mockReturnValue(makeQuery(params.user));
|
||||
const findById = jest.fn().mockReturnValue({
|
||||
select: jest.fn().mockReturnValue({
|
||||
lean: jest.fn().mockReturnValue(makeQuery(params.community ?? {})),
|
||||
}),
|
||||
});
|
||||
const connectionService = {
|
||||
getModel: jest.fn().mockImplementation(async (name: string) => {
|
||||
if (name === 'user') return { findOneAndUpdate, findOne };
|
||||
if (name === 'community') return { findById };
|
||||
throw new Error(`Unexpected model: ${name}`);
|
||||
}),
|
||||
} as unknown as ConnectionService;
|
||||
const riotAccountService = {
|
||||
getByRiotId: jest.fn(),
|
||||
...params.riotAccountService,
|
||||
} as unknown as RiotAccountService;
|
||||
const enrichmentService = {
|
||||
enrichRiotAccount: jest.fn(),
|
||||
...params.enrichmentService,
|
||||
} as unknown as RiotAccountEnrichmentService;
|
||||
|
||||
return {
|
||||
service: new DakaoUserService(
|
||||
connectionService,
|
||||
riotAccountService,
|
||||
enrichmentService,
|
||||
),
|
||||
connectionService,
|
||||
findOneAndUpdate,
|
||||
findOne,
|
||||
findById,
|
||||
riotAccountService,
|
||||
enrichmentService,
|
||||
};
|
||||
}
|
||||
|
||||
describe('DakaoUserService', () => {
|
||||
it('registers an additional Riot account when the user already has one', async () => {
|
||||
const save = jest.fn().mockResolvedValue(undefined);
|
||||
const existingAccount = {
|
||||
puuid: 'puuid-1',
|
||||
gameName: '기존소환사',
|
||||
tagLine: 'KR1',
|
||||
isPrimary: true,
|
||||
} as RiotAccount;
|
||||
const {
|
||||
service,
|
||||
connectionService,
|
||||
riotAccountService,
|
||||
enrichmentService,
|
||||
} = makeService({
|
||||
user: {
|
||||
_id: objectId('222222222222222222222222'),
|
||||
riotAccounts: [existingAccount],
|
||||
save,
|
||||
} as Partial<UserDocument>,
|
||||
riotAccountService: {
|
||||
getByRiotId: jest.fn().mockResolvedValue({
|
||||
puuid: 'puuid-2',
|
||||
gameName: '새소환사',
|
||||
tagLine: 'KR2',
|
||||
}),
|
||||
},
|
||||
enrichmentService: {
|
||||
enrichRiotAccount: jest.fn().mockResolvedValue({ account: null }),
|
||||
},
|
||||
});
|
||||
|
||||
const result = await service.registerRiotAccount({
|
||||
communityId: objectId('111111111111111111111111'),
|
||||
kakaoTalkId: 'kakao-user-1',
|
||||
kakaoTalkNickname: '프리리',
|
||||
gameName: '새소환사',
|
||||
tagLine: 'KR2',
|
||||
});
|
||||
|
||||
expect(result.riotAccount).toMatchObject({
|
||||
puuid: 'puuid-2',
|
||||
gameName: '새소환사',
|
||||
tagLine: 'KR2',
|
||||
isPrimary: false,
|
||||
});
|
||||
expect((result.user.riotAccounts as RiotAccount[])[0]).toMatchObject({
|
||||
puuid: 'puuid-1',
|
||||
isPrimary: true,
|
||||
});
|
||||
expect(result.user.riotAccounts).toHaveLength(2);
|
||||
expect(connectionService.getModel).toHaveBeenCalledWith('user');
|
||||
expect(connectionService.getModel).toHaveBeenCalledWith('community');
|
||||
expect(riotAccountService.getByRiotId).toHaveBeenCalledWith(
|
||||
'새소환사',
|
||||
'KR2',
|
||||
{
|
||||
region: 'asia',
|
||||
},
|
||||
);
|
||||
expect(enrichmentService.enrichRiotAccount).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
userId: expect.any(mongoose.Types.ObjectId),
|
||||
puuid: 'puuid-2',
|
||||
options: { force: true, platform: 'kr', region: 'asia' },
|
||||
}),
|
||||
);
|
||||
expect(save).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('reuses an already attached Riot account by puuid', async () => {
|
||||
const save = jest.fn().mockResolvedValue(undefined);
|
||||
const existingAccount = {
|
||||
puuid: 'puuid-1',
|
||||
gameName: '기존소환사',
|
||||
tagLine: 'KR1',
|
||||
isPrimary: true,
|
||||
} as RiotAccount;
|
||||
const { service, enrichmentService } = makeService({
|
||||
user: {
|
||||
_id: objectId('222222222222222222222222'),
|
||||
riotAccounts: [existingAccount],
|
||||
save,
|
||||
} as Partial<UserDocument>,
|
||||
riotAccountService: {
|
||||
getByRiotId: jest.fn().mockResolvedValue({
|
||||
puuid: 'puuid-1',
|
||||
gameName: '바뀐소환사',
|
||||
tagLine: 'KR1',
|
||||
}),
|
||||
},
|
||||
});
|
||||
|
||||
const result = await service.registerRiotAccount({
|
||||
communityId: objectId('111111111111111111111111'),
|
||||
kakaoTalkId: 'kakao-user-1',
|
||||
kakaoTalkNickname: '프리리',
|
||||
gameName: '바뀐소환사',
|
||||
tagLine: 'KR1',
|
||||
});
|
||||
|
||||
expect(result.user.riotAccounts).toHaveLength(1);
|
||||
expect(result.riotAccount).toMatchObject({
|
||||
puuid: 'puuid-1',
|
||||
gameName: '바뀐소환사',
|
||||
tagLine: 'KR1',
|
||||
isPrimary: true,
|
||||
});
|
||||
expect(enrichmentService.enrichRiotAccount).not.toHaveBeenCalled();
|
||||
expect(save).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('changes the primary Riot account for the Dakao user', async () => {
|
||||
const save = jest.fn().mockResolvedValue(undefined);
|
||||
const oldPrimary = {
|
||||
puuid: 'puuid-1',
|
||||
gameName: '기존소환사',
|
||||
tagLine: 'KR1',
|
||||
isPrimary: true,
|
||||
} as RiotAccount;
|
||||
const nextPrimary = {
|
||||
puuid: 'puuid-2',
|
||||
gameName: '프리리',
|
||||
tagLine: 'KR1',
|
||||
isPrimary: false,
|
||||
} as RiotAccount;
|
||||
const { service, findOne } = makeService({
|
||||
user: {
|
||||
_id: objectId('222222222222222222222222'),
|
||||
kakaoTalkNickname: '이전닉',
|
||||
riotAccounts: [oldPrimary, nextPrimary],
|
||||
save,
|
||||
} as Partial<UserDocument>,
|
||||
});
|
||||
|
||||
const result = await service.changePrimaryRiotAccount({
|
||||
communityId: objectId('111111111111111111111111'),
|
||||
kakaoTalkId: 'kakao-user-1',
|
||||
kakaoTalkNickname: '프리리',
|
||||
gameName: '프리리',
|
||||
tagLine: 'KR1',
|
||||
});
|
||||
|
||||
expect(findOne).toHaveBeenCalledWith({
|
||||
communityId: objectId('111111111111111111111111'),
|
||||
kakaoTalkId: 'kakao-user-1',
|
||||
});
|
||||
expect(oldPrimary.isPrimary).toBe(false);
|
||||
expect(nextPrimary.isPrimary).toBe(true);
|
||||
expect(result.riotAccount).toBe(nextPrimary);
|
||||
expect(result.user.kakaoTalkNickname).toBe('프리리');
|
||||
expect(save).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('rejects primary account changes for unregistered Riot accounts', async () => {
|
||||
const save = jest.fn().mockResolvedValue(undefined);
|
||||
const { service } = makeService({
|
||||
user: {
|
||||
_id: objectId('222222222222222222222222'),
|
||||
riotAccounts: [
|
||||
{
|
||||
puuid: 'puuid-1',
|
||||
gameName: '기존소환사',
|
||||
tagLine: 'KR1',
|
||||
isPrimary: true,
|
||||
},
|
||||
],
|
||||
save,
|
||||
} as Partial<UserDocument>,
|
||||
});
|
||||
|
||||
await expect(
|
||||
service.changePrimaryRiotAccount({
|
||||
communityId: objectId('111111111111111111111111'),
|
||||
kakaoTalkId: 'kakao-user-1',
|
||||
kakaoTalkNickname: '프리리',
|
||||
gameName: '프리리',
|
||||
tagLine: 'KR1',
|
||||
}),
|
||||
).rejects.toMatchObject({
|
||||
code: 'riot_account_not_found',
|
||||
detail: '프리리#KR1',
|
||||
});
|
||||
expect(save).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -1,465 +0,0 @@
|
||||
import { Injectable, Logger } from '@nestjs/common';
|
||||
import mongoose, { isValidObjectId } from 'mongoose';
|
||||
import { ConnectionService } from '../global/database/connection.service';
|
||||
import {
|
||||
Position,
|
||||
PositionPreference,
|
||||
RiotAccount,
|
||||
UserDocument,
|
||||
} from '../global/database/schema';
|
||||
import { RiotApiError } from '../riot/riot.client.service';
|
||||
import { RiotAccountEnrichmentService } from '../riot/riot-account-enrichment.service';
|
||||
import { RiotAccountService } from '../riot/riot-account.service';
|
||||
import {
|
||||
RIOT_PLATFORM_ROUTES,
|
||||
RIOT_REGIONAL_ROUTES,
|
||||
RiotPlatformRoute,
|
||||
RiotRegionalRoute,
|
||||
} from '../riot/riot.types';
|
||||
import { formatCodePoints, normalizeRiotIdPart } from './riot-id.util';
|
||||
|
||||
export class DakaoUserError extends Error {
|
||||
constructor(
|
||||
public readonly code:
|
||||
| 'invalid_project_id'
|
||||
| 'community_not_found'
|
||||
| 'riot_account_not_found'
|
||||
| 'riot_account_already_registered'
|
||||
| 'riot_account_conflict'
|
||||
| 'riot_account_lookup_failed',
|
||||
public readonly detail?: string,
|
||||
) {
|
||||
super(`Dakao user error: ${code}${detail ? ` (${detail})` : ''}`);
|
||||
}
|
||||
}
|
||||
|
||||
interface ResolveContext {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
kakaoTalkId: string;
|
||||
kakaoTalkNickname: string;
|
||||
gameName: string;
|
||||
tagLine: string;
|
||||
}
|
||||
|
||||
interface ResolveResult {
|
||||
user: UserDocument;
|
||||
riotAccount: RiotAccount;
|
||||
}
|
||||
|
||||
interface RiotRouting {
|
||||
platform: RiotPlatformRoute;
|
||||
region: RiotRegionalRoute;
|
||||
}
|
||||
|
||||
interface ResolvedRiotIdentity {
|
||||
requestedGameName: string;
|
||||
requestedTagLine: string;
|
||||
dto: { puuid: string; gameName: string | null; tagLine: string | null };
|
||||
}
|
||||
|
||||
const DEFAULT_RIOT_PLATFORM: RiotPlatformRoute = 'kr';
|
||||
const DEFAULT_RIOT_REGION: RiotRegionalRoute = 'asia';
|
||||
|
||||
@Injectable()
|
||||
export class DakaoUserService {
|
||||
private readonly logger = new Logger(DakaoUserService.name);
|
||||
|
||||
constructor(
|
||||
private readonly connectionService: ConnectionService,
|
||||
private readonly riotAccountService: RiotAccountService,
|
||||
private readonly enrichmentService: RiotAccountEnrichmentService,
|
||||
) {}
|
||||
|
||||
public async resolveCommunityIdByDakaoProjectId(
|
||||
dakaoProjectId: string,
|
||||
): Promise<mongoose.Types.ObjectId> {
|
||||
if (!isValidObjectId(dakaoProjectId)) {
|
||||
throw new DakaoUserError('invalid_project_id', dakaoProjectId);
|
||||
}
|
||||
|
||||
const CommunityModel = await this.connectionService.getModel('community');
|
||||
const community = await CommunityModel.findOne({
|
||||
dakaoProjectId: dakaoProjectId,
|
||||
})
|
||||
.select({ _id: 1 })
|
||||
.lean()
|
||||
.exec();
|
||||
if (!community) {
|
||||
throw new DakaoUserError('community_not_found', dakaoProjectId);
|
||||
}
|
||||
return community._id as mongoose.Types.ObjectId;
|
||||
}
|
||||
|
||||
public async upsertUser(params: {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
kakaoTalkId: string;
|
||||
kakaoTalkNickname: string;
|
||||
}): Promise<UserDocument> {
|
||||
const UserModel = await this.connectionService.getModel('user');
|
||||
const user = await UserModel.findOneAndUpdate(
|
||||
{ communityId: params.communityId, kakaoTalkId: params.kakaoTalkId },
|
||||
{
|
||||
$set: { kakaoTalkNickname: params.kakaoTalkNickname },
|
||||
$setOnInsert: {
|
||||
communityId: params.communityId,
|
||||
kakaoTalkId: params.kakaoTalkId,
|
||||
role: 'member',
|
||||
isActivated: true,
|
||||
},
|
||||
},
|
||||
{ upsert: true, returnDocument: 'after', setDefaultsOnInsert: true },
|
||||
).exec();
|
||||
if (!user) {
|
||||
// upsert + returnDocument='after' 이면 항상 반환되지만 타입 안전을 위해 가드.
|
||||
throw new DakaoUserError('community_not_found');
|
||||
}
|
||||
return user;
|
||||
}
|
||||
|
||||
public async findUserByKakaoTalkId(params: {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
kakaoTalkId: string;
|
||||
}): Promise<UserDocument | null> {
|
||||
const UserModel = await this.connectionService.getModel('user');
|
||||
return UserModel.findOne({
|
||||
communityId: params.communityId,
|
||||
kakaoTalkId: params.kakaoTalkId,
|
||||
}).exec();
|
||||
}
|
||||
|
||||
public async resolveRiotAccount(
|
||||
context: ResolveContext,
|
||||
): Promise<ResolveResult> {
|
||||
const user = await this.upsertUser(context);
|
||||
const routing = await this.resolveRiotRouting(context.communityId);
|
||||
const { requestedGameName, requestedTagLine, dto } =
|
||||
await this.lookupRiotIdentity(context, routing);
|
||||
const nextGameName = dto.gameName ?? requestedGameName;
|
||||
const nextTagLine = dto.tagLine ?? requestedTagLine;
|
||||
|
||||
const existing = user.riotAccounts.find(
|
||||
(a) =>
|
||||
a.gameName.toLowerCase() === requestedGameName.toLowerCase() &&
|
||||
a.tagLine.toLowerCase() === requestedTagLine.toLowerCase(),
|
||||
);
|
||||
if (existing) {
|
||||
this.logger.log(
|
||||
`Found existing Riot account ${requestedGameName}#${requestedTagLine}: puuid=${existing.puuid}`,
|
||||
);
|
||||
}
|
||||
|
||||
if (existing) {
|
||||
if (existing.puuid !== dto.puuid) {
|
||||
this.logger.warn(
|
||||
`Riot account puuid mismatch for ${requestedGameName}#${requestedTagLine}: stored=${existing.puuid} resolved=${dto.puuid}. Updating stored account.`,
|
||||
);
|
||||
existing.puuid = dto.puuid;
|
||||
existing.gameName = nextGameName;
|
||||
existing.tagLine = nextTagLine;
|
||||
this.clearRiotCache(existing);
|
||||
await this.saveUserHandlingDuplicate(user, nextGameName, nextTagLine);
|
||||
return this.enrichAttachedAccount({
|
||||
user,
|
||||
riotAccount: existing,
|
||||
platform: routing.platform,
|
||||
region: routing.region,
|
||||
});
|
||||
}
|
||||
|
||||
if (
|
||||
existing.gameName !== nextGameName ||
|
||||
existing.tagLine !== nextTagLine
|
||||
) {
|
||||
existing.gameName = nextGameName;
|
||||
existing.tagLine = nextTagLine;
|
||||
await user.save();
|
||||
}
|
||||
return { user, riotAccount: existing };
|
||||
}
|
||||
|
||||
const existingByPuuid = user.riotAccounts.find(
|
||||
(account) => account.puuid === dto.puuid,
|
||||
);
|
||||
if (existingByPuuid) {
|
||||
if (
|
||||
existingByPuuid.gameName !== nextGameName ||
|
||||
existingByPuuid.tagLine !== nextTagLine
|
||||
) {
|
||||
existingByPuuid.gameName = nextGameName;
|
||||
existingByPuuid.tagLine = nextTagLine;
|
||||
await user.save();
|
||||
}
|
||||
return { user, riotAccount: existingByPuuid };
|
||||
}
|
||||
|
||||
return this.attachRiotAccount({
|
||||
user,
|
||||
puuid: dto.puuid,
|
||||
gameName: nextGameName,
|
||||
tagLine: nextTagLine,
|
||||
platform: routing.platform,
|
||||
region: routing.region,
|
||||
});
|
||||
}
|
||||
|
||||
public async registerRiotAccount(
|
||||
context: ResolveContext,
|
||||
): Promise<ResolveResult> {
|
||||
return this.resolveRiotAccount(context);
|
||||
}
|
||||
|
||||
public async registerPrimaryRiotAccount(
|
||||
context: ResolveContext,
|
||||
): Promise<ResolveResult> {
|
||||
return this.registerRiotAccount(context);
|
||||
}
|
||||
|
||||
public async registerPreferredPositions(params: {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
kakaoTalkId: string;
|
||||
kakaoTalkNickname: string;
|
||||
positions: Position[];
|
||||
}): Promise<UserDocument> {
|
||||
const user = await this.upsertUser({
|
||||
communityId: params.communityId,
|
||||
kakaoTalkId: params.kakaoTalkId,
|
||||
kakaoTalkNickname: params.kakaoTalkNickname,
|
||||
});
|
||||
user.preferredPositions = this.toPositionPreferences(params.positions);
|
||||
await user.save();
|
||||
return user;
|
||||
}
|
||||
|
||||
public async changePrimaryRiotAccount(
|
||||
context: ResolveContext,
|
||||
): Promise<ResolveResult> {
|
||||
const requestedGameName = normalizeRiotIdPart(context.gameName);
|
||||
const requestedTagLine = normalizeRiotIdPart(context.tagLine);
|
||||
const detail = `${requestedGameName}#${requestedTagLine}`;
|
||||
|
||||
const user = await this.findUserByKakaoTalkId({
|
||||
communityId: context.communityId,
|
||||
kakaoTalkId: context.kakaoTalkId,
|
||||
});
|
||||
if (!user) {
|
||||
throw new DakaoUserError('riot_account_not_found', detail);
|
||||
}
|
||||
|
||||
const target = user.riotAccounts.find(
|
||||
(account) =>
|
||||
normalizeRiotIdPart(account.gameName).toLowerCase() ===
|
||||
requestedGameName.toLowerCase() &&
|
||||
normalizeRiotIdPart(account.tagLine).toLowerCase() ===
|
||||
requestedTagLine.toLowerCase(),
|
||||
);
|
||||
if (!target) {
|
||||
throw new DakaoUserError('riot_account_not_found', detail);
|
||||
}
|
||||
|
||||
if (context.kakaoTalkNickname.trim()) {
|
||||
user.kakaoTalkNickname = context.kakaoTalkNickname;
|
||||
}
|
||||
for (const account of user.riotAccounts) {
|
||||
account.isPrimary = account.puuid === target.puuid;
|
||||
}
|
||||
await user.save();
|
||||
|
||||
return { user, riotAccount: target };
|
||||
}
|
||||
|
||||
private toPositionPreferences(positions: Position[]): PositionPreference[] {
|
||||
return positions.map((position, index) => ({
|
||||
position,
|
||||
priority: index + 1,
|
||||
}));
|
||||
}
|
||||
|
||||
private async lookupRiotIdentity(
|
||||
context: ResolveContext,
|
||||
routing: RiotRouting,
|
||||
): Promise<ResolvedRiotIdentity> {
|
||||
const requestedGameName = normalizeRiotIdPart(context.gameName);
|
||||
const requestedTagLine = normalizeRiotIdPart(context.tagLine);
|
||||
this.logRiotIdNormalization(context, requestedGameName, requestedTagLine);
|
||||
|
||||
try {
|
||||
const dto = await this.riotAccountService.getByRiotId(
|
||||
requestedGameName,
|
||||
requestedTagLine,
|
||||
{ region: routing.region },
|
||||
);
|
||||
this.logger.log(
|
||||
`Resolved Riot ID ${requestedGameName}#${requestedTagLine} via ${routing.region}: puuid=${dto.puuid} canonical=${dto.gameName ?? '-'}#${dto.tagLine ?? '-'}`,
|
||||
);
|
||||
return { requestedGameName, requestedTagLine, dto };
|
||||
} catch (err) {
|
||||
if (err instanceof RiotApiError && err.status === 404) {
|
||||
throw new DakaoUserError(
|
||||
'riot_account_not_found',
|
||||
`${requestedGameName}#${requestedTagLine}`,
|
||||
);
|
||||
}
|
||||
this.logger.error(
|
||||
`Riot account lookup failed for ${requestedGameName}#${requestedTagLine}: ${
|
||||
(err as Error)?.message ?? err
|
||||
}`,
|
||||
);
|
||||
throw new DakaoUserError(
|
||||
'riot_account_lookup_failed',
|
||||
(err as Error)?.message,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private logRiotIdNormalization(
|
||||
context: ResolveContext,
|
||||
normalizedGameName: string,
|
||||
normalizedTagLine: string,
|
||||
): void {
|
||||
if (
|
||||
context.gameName === normalizedGameName &&
|
||||
context.tagLine === normalizedTagLine
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.logger.warn(
|
||||
`Normalized Riot ID input ${context.gameName}#${context.tagLine} -> ${normalizedGameName}#${normalizedTagLine} ` +
|
||||
`(gameNameCodePoints=${formatCodePoints(context.gameName)}, tagLineCodePoints=${formatCodePoints(context.tagLine)})`,
|
||||
);
|
||||
}
|
||||
|
||||
private async resolveRiotRouting(
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
): Promise<RiotRouting> {
|
||||
const CommunityModel = await this.connectionService.getModel('community');
|
||||
const community = await CommunityModel.findById(communityId)
|
||||
.select({ riotPlatform: 1, riotRegion: 1 })
|
||||
.lean()
|
||||
.exec();
|
||||
|
||||
return {
|
||||
platform: this.toRiotPlatform(community?.riotPlatform),
|
||||
region: this.toRiotRegion(community?.riotRegion),
|
||||
};
|
||||
}
|
||||
|
||||
private async attachRiotAccount(params: {
|
||||
user: UserDocument;
|
||||
puuid: string;
|
||||
gameName: string;
|
||||
tagLine: string;
|
||||
platform: RiotPlatformRoute;
|
||||
region: RiotRegionalRoute;
|
||||
}): Promise<ResolveResult> {
|
||||
const { user } = params;
|
||||
const isFirst = user.riotAccounts.length === 0;
|
||||
user.riotAccounts.push({
|
||||
puuid: params.puuid,
|
||||
gameName: params.gameName,
|
||||
tagLine: params.tagLine,
|
||||
profileIconId: 0,
|
||||
revisionDate: 0,
|
||||
summonerLevel: 0,
|
||||
isPrimary: isFirst,
|
||||
tiers: [],
|
||||
tierHistory: [],
|
||||
matchIds: [],
|
||||
championMasteries: [],
|
||||
championRecords: {},
|
||||
} as unknown as RiotAccount);
|
||||
|
||||
await this.saveUserHandlingDuplicate(user, params.gameName, params.tagLine);
|
||||
|
||||
const attached = user.riotAccounts.find((a) => a.puuid === params.puuid);
|
||||
if (!attached) {
|
||||
throw new DakaoUserError('riot_account_lookup_failed', 'attach failed');
|
||||
}
|
||||
|
||||
return this.enrichAttachedAccount({
|
||||
user,
|
||||
riotAccount: attached,
|
||||
platform: params.platform,
|
||||
region: params.region,
|
||||
});
|
||||
}
|
||||
|
||||
private async enrichAttachedAccount(params: {
|
||||
user: UserDocument;
|
||||
riotAccount: RiotAccount;
|
||||
platform: RiotPlatformRoute;
|
||||
region: RiotRegionalRoute;
|
||||
}): Promise<ResolveResult> {
|
||||
// 외부 API 실패는 등록 자체를 막지 않음.
|
||||
try {
|
||||
const enrichResult = await this.enrichmentService.enrichRiotAccount({
|
||||
userId: params.user._id,
|
||||
puuid: params.riotAccount.puuid,
|
||||
options: {
|
||||
force: true,
|
||||
platform: params.platform,
|
||||
region: params.region,
|
||||
},
|
||||
});
|
||||
if (enrichResult.account) {
|
||||
return { user: params.user, riotAccount: enrichResult.account };
|
||||
}
|
||||
} catch (err) {
|
||||
this.logger.warn(
|
||||
`Riot enrichment failed (continuing with empty data): ${
|
||||
(err as Error)?.message ?? err
|
||||
}`,
|
||||
);
|
||||
}
|
||||
return { user: params.user, riotAccount: params.riotAccount };
|
||||
}
|
||||
|
||||
private async saveUserHandlingDuplicate(
|
||||
user: UserDocument,
|
||||
gameName: string,
|
||||
tagLine: string,
|
||||
): Promise<void> {
|
||||
try {
|
||||
await user.save();
|
||||
} catch (err) {
|
||||
// 같은 communityId + puuid 중복은 다른 유저가 이미 등록한 케이스.
|
||||
if ((err as { code?: number })?.code === 11000) {
|
||||
throw new DakaoUserError(
|
||||
'riot_account_conflict',
|
||||
`${gameName}#${tagLine}`,
|
||||
);
|
||||
}
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
private clearRiotCache(account: RiotAccount): void {
|
||||
account.profileIconId = 0;
|
||||
account.revisionDate = 0;
|
||||
account.summonerLevel = 0;
|
||||
account.tiers = [];
|
||||
account.tierHistory = [];
|
||||
account.matchIds = [];
|
||||
account.matchIdsFetchedAt = undefined;
|
||||
account.recentStatsSummary = undefined;
|
||||
account.recentStatsFetchedAt = undefined;
|
||||
account.championMasteries = [];
|
||||
account.championMasteriesFetchedAt = undefined;
|
||||
account.championRecords = {};
|
||||
account.championRecordsFetchedAt = undefined;
|
||||
}
|
||||
|
||||
private toRiotPlatform(value: unknown): RiotPlatformRoute {
|
||||
return typeof value === 'string' &&
|
||||
RIOT_PLATFORM_ROUTES.includes(value as RiotPlatformRoute)
|
||||
? (value as RiotPlatformRoute)
|
||||
: DEFAULT_RIOT_PLATFORM;
|
||||
}
|
||||
|
||||
private toRiotRegion(value: unknown): RiotRegionalRoute {
|
||||
return typeof value === 'string' &&
|
||||
RIOT_REGIONAL_ROUTES.includes(value as RiotRegionalRoute)
|
||||
? (value as RiotRegionalRoute)
|
||||
: DEFAULT_RIOT_REGION;
|
||||
}
|
||||
}
|
||||
@@ -1,46 +0,0 @@
|
||||
import { Module } from '@nestjs/common';
|
||||
import { MatchModule } from '../match/match.module';
|
||||
import { RiotModule } from '../riot/riot.module';
|
||||
import { DAKAO_OPTIONS, createDefaultDakaoOptions } from './dakao.options';
|
||||
import { DakaoPublisher } from './dakao.publisher';
|
||||
import { DakaoSubscriber } from './dakao.subscriber';
|
||||
import { DakaoInboxService } from './dakao-inbox.service';
|
||||
import { DakaoJetStreamResourceService } from './dakao-jetstream-resource.service';
|
||||
import { DakaoOutboxSweeperService } from './dakao-outbox-sweeper.service';
|
||||
import { DakaoOutboxService } from './dakao-outbox.service';
|
||||
import { DakaoUserService } from './dakao-user.service';
|
||||
import { DakaoSendResultSubscriber } from './dakao-send-result.subscriber';
|
||||
import { DakaoUrlShortenerService } from './dakao-url-shortener.service';
|
||||
import { AccountRegisterHandler } from './handlers/account-register.handler';
|
||||
import { MatchCancelHandler } from './handlers/match-cancel.handler';
|
||||
import { MatchJoinHandler } from './handlers/match-join.handler';
|
||||
import { MatchListHandler } from './handlers/match-list.handler';
|
||||
import { PreferredPositionRegisterHandler } from './handlers/preferred-position-register.handler';
|
||||
import { PrimaryAccountChangeHandler } from './handlers/primary-account-change.handler';
|
||||
|
||||
@Module({
|
||||
imports: [RiotModule, MatchModule],
|
||||
providers: [
|
||||
{
|
||||
provide: DAKAO_OPTIONS,
|
||||
useFactory: createDefaultDakaoOptions,
|
||||
},
|
||||
DakaoOutboxService,
|
||||
DakaoOutboxSweeperService,
|
||||
DakaoInboxService,
|
||||
DakaoJetStreamResourceService,
|
||||
DakaoPublisher,
|
||||
DakaoSubscriber,
|
||||
DakaoSendResultSubscriber,
|
||||
DakaoUserService,
|
||||
DakaoUrlShortenerService,
|
||||
AccountRegisterHandler,
|
||||
MatchListHandler,
|
||||
MatchJoinHandler,
|
||||
MatchCancelHandler,
|
||||
PreferredPositionRegisterHandler,
|
||||
PrimaryAccountChangeHandler,
|
||||
],
|
||||
exports: [DakaoPublisher],
|
||||
})
|
||||
export class DakaoModule {}
|
||||
@@ -1,38 +0,0 @@
|
||||
import { resolveDakaoNatsNames } from './dakao.nats-names';
|
||||
|
||||
describe('resolveDakaoNatsNames', () => {
|
||||
it('resolves staging subjects and JetStream resources from NODE_ENV=staging', () => {
|
||||
expect(resolveDakaoNatsNames('staging')).toEqual({
|
||||
env: 'staging',
|
||||
shortEnv: 'STG',
|
||||
subjects: {
|
||||
botCommandSubmitted: 'staging.lolympus.dakao.bot-command.submitted.v1',
|
||||
chatSendMessage: 'staging.dakao.chat.send-message.v1',
|
||||
chatSendMessageSucceeded:
|
||||
'staging.lolympus.dakao.chat.send-message.succeeded.v1',
|
||||
chatSendMessageFailed:
|
||||
'staging.lolympus.dakao.chat.send-message.failed.v1',
|
||||
},
|
||||
streams: {
|
||||
botCommand: 'STG_DAKAO_TO_LOLYMPUS_BOTCMD',
|
||||
sendRequest: 'STG_DAKAO_SENDREQ',
|
||||
sendResult: 'STG_DAKAO_TO_LOLYMPUS_SENDRES',
|
||||
},
|
||||
consumers: {
|
||||
botCommand: 'STG_LOLYMPUS_BOTCMD',
|
||||
sendRequest: 'STG_DAKAO_SENDREQ_WORKER',
|
||||
sendResult: 'STG_LOLYMPUS_SENDRES',
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
it('keeps JetStream resource names within the 32 character safety target', () => {
|
||||
const names = resolveDakaoNatsNames('prod');
|
||||
const resources = [
|
||||
...Object.values(names.streams),
|
||||
...Object.values(names.consumers),
|
||||
];
|
||||
|
||||
expect(resources.every((name) => name.length <= 32)).toBe(true);
|
||||
});
|
||||
});
|
||||
@@ -1,68 +0,0 @@
|
||||
export type DakaoRuntimeEnv = 'dev' | 'staging' | 'prod';
|
||||
export type DakaoShortEnv = 'DEV' | 'STG' | 'PROD';
|
||||
|
||||
export interface DakaoNatsNames {
|
||||
env: DakaoRuntimeEnv;
|
||||
shortEnv: DakaoShortEnv;
|
||||
subjects: {
|
||||
botCommandSubmitted: string;
|
||||
chatSendMessage: string;
|
||||
chatSendMessageSucceeded: string;
|
||||
chatSendMessageFailed: string;
|
||||
};
|
||||
streams: {
|
||||
botCommand: string;
|
||||
sendRequest: string;
|
||||
sendResult: string;
|
||||
};
|
||||
consumers: {
|
||||
botCommand: string;
|
||||
sendRequest: string;
|
||||
sendResult: string;
|
||||
};
|
||||
}
|
||||
|
||||
export function resolveDakaoNatsNames(
|
||||
nodeEnv = process.env.NODE_ENV,
|
||||
): DakaoNatsNames {
|
||||
const env = resolveRuntimeEnv(nodeEnv);
|
||||
const shortEnv = toShortEnv(env);
|
||||
|
||||
return {
|
||||
env,
|
||||
shortEnv,
|
||||
subjects: {
|
||||
botCommandSubmitted: `${env}.lolympus.dakao.bot-command.submitted.v1`,
|
||||
chatSendMessage: `${env}.dakao.chat.send-message.v1`,
|
||||
chatSendMessageSucceeded: `${env}.lolympus.dakao.chat.send-message.succeeded.v1`,
|
||||
chatSendMessageFailed: `${env}.lolympus.dakao.chat.send-message.failed.v1`,
|
||||
},
|
||||
streams: {
|
||||
botCommand: `${shortEnv}_DAKAO_TO_LOLYMPUS_BOTCMD`,
|
||||
sendRequest: `${shortEnv}_DAKAO_SENDREQ`,
|
||||
sendResult: `${shortEnv}_DAKAO_TO_LOLYMPUS_SENDRES`,
|
||||
},
|
||||
consumers: {
|
||||
botCommand: `${shortEnv}_LOLYMPUS_BOTCMD`,
|
||||
sendRequest: `${shortEnv}_DAKAO_SENDREQ_WORKER`,
|
||||
sendResult: `${shortEnv}_LOLYMPUS_SENDRES`,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
function resolveRuntimeEnv(nodeEnv?: string): DakaoRuntimeEnv {
|
||||
if (nodeEnv === 'prod' || nodeEnv === 'production') return 'prod';
|
||||
if (nodeEnv === 'staging') return 'staging';
|
||||
return 'dev';
|
||||
}
|
||||
|
||||
function toShortEnv(env: DakaoRuntimeEnv): DakaoShortEnv {
|
||||
switch (env) {
|
||||
case 'prod':
|
||||
return 'PROD';
|
||||
case 'staging':
|
||||
return 'STG';
|
||||
case 'dev':
|
||||
return 'DEV';
|
||||
}
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
import { randomUUID } from 'crypto';
|
||||
|
||||
export const DAKAO_OPTIONS = Symbol('DAKAO_OPTIONS');
|
||||
|
||||
export interface DakaoOptions {
|
||||
instanceId: string;
|
||||
}
|
||||
|
||||
export function createDefaultDakaoOptions(): DakaoOptions {
|
||||
return {
|
||||
instanceId: process.env.DAKAO_INSTANCE_ID || randomUUID(),
|
||||
};
|
||||
}
|
||||
@@ -1,109 +0,0 @@
|
||||
import { SecretService } from '../global/secret/secret.service';
|
||||
import { DakaoCommandEnvelope, DakaoSendMessagePayload } from './dakao.types';
|
||||
import { DakaoPublisher } from './dakao.publisher';
|
||||
import { DakaoOutboxService } from './dakao-outbox.service';
|
||||
|
||||
function makePublisher() {
|
||||
const outboxService = {
|
||||
enqueueAndPublish: jest.fn().mockResolvedValue(undefined),
|
||||
} as unknown as DakaoOutboxService;
|
||||
const secretService = {} as SecretService;
|
||||
const previousNodeEnv = process.env.NODE_ENV;
|
||||
process.env.NODE_ENV = 'staging';
|
||||
|
||||
try {
|
||||
const publisher = new DakaoPublisher(secretService, outboxService, {
|
||||
instanceId: 'staging-instance',
|
||||
});
|
||||
|
||||
return { publisher, outboxService };
|
||||
} finally {
|
||||
process.env.NODE_ENV = previousNodeEnv;
|
||||
}
|
||||
}
|
||||
|
||||
function getPublishedEnvelope(
|
||||
outboxService: DakaoOutboxService,
|
||||
): DakaoCommandEnvelope<DakaoSendMessagePayload> {
|
||||
const enqueue = outboxService.enqueueAndPublish as jest.Mock;
|
||||
return enqueue.mock.calls[0][0]
|
||||
.envelope as DakaoCommandEnvelope<DakaoSendMessagePayload>;
|
||||
}
|
||||
|
||||
describe('DakaoPublisher', () => {
|
||||
it('keeps valid mention segments intact', async () => {
|
||||
const { publisher, outboxService } = makePublisher();
|
||||
|
||||
await publisher.sendMessage({
|
||||
chatroomId: '18474390111480678',
|
||||
segments: [
|
||||
{
|
||||
kind: 'mention',
|
||||
userId: '6215844374579825921',
|
||||
displayText: '날으는꼴뚜기/95/여/D',
|
||||
},
|
||||
{ kind: 'text', text: ' 신청 완료' },
|
||||
],
|
||||
});
|
||||
|
||||
expect(getPublishedEnvelope(outboxService).payload.segments).toEqual([
|
||||
{
|
||||
kind: 'mention',
|
||||
userId: '6215844374579825921',
|
||||
displayText: '날으는꼴뚜기/95/여/D',
|
||||
},
|
||||
{ kind: 'text', text: ' 신청 완료' },
|
||||
]);
|
||||
});
|
||||
|
||||
it('downgrades invalid mention segments to text before publishing', async () => {
|
||||
const { publisher, outboxService } = makePublisher();
|
||||
|
||||
await publisher.sendMessage({
|
||||
chatroomId: '18474390111480678',
|
||||
segments: [
|
||||
{
|
||||
kind: 'mention',
|
||||
userId: '-123',
|
||||
displayText: '소쿠리',
|
||||
},
|
||||
{ kind: 'text', text: ' 신청 완료' },
|
||||
],
|
||||
});
|
||||
|
||||
expect(getPublishedEnvelope(outboxService).payload.segments).toEqual([
|
||||
{ kind: 'text', text: '@소쿠리' },
|
||||
{ kind: 'text', text: ' 신청 완료' },
|
||||
]);
|
||||
});
|
||||
|
||||
it('uses deterministic event ids and the shared Dakao send subject', async () => {
|
||||
const { publisher, outboxService } = makePublisher();
|
||||
|
||||
await publisher.sendMessage({
|
||||
chatroomId: '18474390111480678',
|
||||
segments: [{ kind: 'text', text: '신청 완료' }],
|
||||
correlationId: 'chat-log-1',
|
||||
});
|
||||
|
||||
const enqueue = outboxService.enqueueAndPublish as jest.Mock;
|
||||
expect(enqueue.mock.calls[0][0]).toMatchObject({
|
||||
subject: 'staging.dakao.chat.send-message.v1',
|
||||
eventId: 'lolympus:chat.send-message:chat-log-1',
|
||||
});
|
||||
expect(getPublishedEnvelope(outboxService)).toMatchObject({
|
||||
schema: 'dakao.command.v1',
|
||||
eventId: 'lolympus:chat.send-message:chat-log-1',
|
||||
eventSource: 'lolympus',
|
||||
type: 'chat.send-message',
|
||||
correlationId: 'chat-log-1',
|
||||
resultSubjects: {
|
||||
succeeded: 'staging.lolympus.dakao.chat.send-message.succeeded.v1',
|
||||
failed: 'staging.lolympus.dakao.chat.send-message.failed.v1',
|
||||
},
|
||||
});
|
||||
expect(getPublishedEnvelope(outboxService)).not.toHaveProperty(
|
||||
'replySubject',
|
||||
);
|
||||
});
|
||||
});
|
||||
@@ -1,138 +0,0 @@
|
||||
import { Inject, Injectable, Logger, OnModuleInit } from '@nestjs/common';
|
||||
import { randomUUID } from 'crypto';
|
||||
import { SecretService } from '../global/secret/secret.service';
|
||||
import {
|
||||
DakaoCommandEnvelope,
|
||||
DakaoResultSubjects,
|
||||
DakaoSegment,
|
||||
DakaoSendMessagePayload,
|
||||
} from './dakao.types';
|
||||
import type { DakaoOptions } from './dakao.options';
|
||||
import { DAKAO_OPTIONS } from './dakao.options';
|
||||
import { resolveDakaoNatsNames } from './dakao.nats-names';
|
||||
import { DakaoOutboxService } from './dakao-outbox.service';
|
||||
|
||||
const EVENT_SOURCE_DEFAULT = 'lolympus';
|
||||
|
||||
@Injectable()
|
||||
export class DakaoPublisher implements OnModuleInit {
|
||||
private readonly logger = new Logger(DakaoPublisher.name);
|
||||
private readonly names = resolveDakaoNatsNames();
|
||||
private sendMessageSubject = this.names.subjects.chatSendMessage;
|
||||
private resultSubjects: DakaoResultSubjects = {
|
||||
succeeded: this.names.subjects.chatSendMessageSucceeded,
|
||||
failed: this.names.subjects.chatSendMessageFailed,
|
||||
};
|
||||
private eventSource = EVENT_SOURCE_DEFAULT;
|
||||
|
||||
constructor(
|
||||
private readonly secretService: SecretService,
|
||||
private readonly outboxService: DakaoOutboxService,
|
||||
@Inject(DAKAO_OPTIONS) private readonly options: DakaoOptions,
|
||||
) {}
|
||||
|
||||
async onModuleInit() {
|
||||
const sendOverride = await this.secretService
|
||||
.get<string>('DAKAO_CHAT_SEND_MESSAGE_SUBJECT')
|
||||
.catch(() => undefined);
|
||||
const sourceOverride = await this.secretService
|
||||
.get<string>('DAKAO_EVENT_SOURCE')
|
||||
.catch(() => undefined);
|
||||
|
||||
this.sendMessageSubject =
|
||||
sendOverride || resolveDakaoNatsNames().subjects.chatSendMessage;
|
||||
this.resultSubjects = {
|
||||
succeeded: this.names.subjects.chatSendMessageSucceeded,
|
||||
failed: this.names.subjects.chatSendMessageFailed,
|
||||
};
|
||||
this.eventSource = sourceOverride || EVENT_SOURCE_DEFAULT;
|
||||
|
||||
this.logger.log(
|
||||
`Dakao send-message publisher ready on subject="${this.sendMessageSubject}" source="${this.eventSource}" instanceId="${this.options.instanceId}"`,
|
||||
);
|
||||
}
|
||||
|
||||
public async sendMessage(params: {
|
||||
chatroomId: string;
|
||||
segments: DakaoSegment[];
|
||||
correlationId?: string;
|
||||
eventId?: string;
|
||||
}): Promise<void> {
|
||||
const eventId =
|
||||
params.eventId ??
|
||||
(params.correlationId
|
||||
? `${this.eventSource}:chat.send-message:${params.correlationId}`
|
||||
: `${this.eventSource}:chat.send-message:${randomUUID()}`);
|
||||
const payload: DakaoSendMessagePayload = {
|
||||
chatroomId: params.chatroomId,
|
||||
segments: this.normalizeSegments(params.segments),
|
||||
};
|
||||
const envelope: DakaoCommandEnvelope<DakaoSendMessagePayload> = {
|
||||
schema: 'dakao.command.v1',
|
||||
eventId,
|
||||
type: 'chat.send-message',
|
||||
eventSource: this.eventSource,
|
||||
correlationId: params.correlationId,
|
||||
resultSubjects: this.resultSubjects,
|
||||
payload,
|
||||
};
|
||||
await this.outboxService.enqueueAndPublish({
|
||||
subject: this.sendMessageSubject,
|
||||
eventId,
|
||||
envelope,
|
||||
});
|
||||
}
|
||||
|
||||
private normalizeSegments(segments: DakaoSegment[]): DakaoSegment[] {
|
||||
const normalized: DakaoSegment[] = [];
|
||||
|
||||
for (const segment of segments) {
|
||||
if (segment.kind === 'text') {
|
||||
if (segment.text.length > 0) normalized.push(segment);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (segment.kind === 'mention') {
|
||||
const userId = segment.userId.trim();
|
||||
const displayText = segment.displayText.trim();
|
||||
|
||||
if (this.isPositiveIntegerString(userId) && displayText.length > 0) {
|
||||
normalized.push({ kind: 'mention', userId, displayText });
|
||||
continue;
|
||||
}
|
||||
|
||||
const fallbackText = this.renderMentionFallback(displayText, userId);
|
||||
this.logger.warn(
|
||||
`Dakao mention downgraded to text because userId/displayText is invalid: userId="${userId || '-'}" displayText="${displayText || '-'}"`,
|
||||
);
|
||||
normalized.push({ kind: 'text', text: fallbackText });
|
||||
continue;
|
||||
}
|
||||
|
||||
const id = segment.id.trim();
|
||||
const altText = segment.altText.trim();
|
||||
if (id.length > 0 && altText.length > 0 && !/[()@]/.test(altText)) {
|
||||
normalized.push({ kind: 'emoticon', id, altText });
|
||||
continue;
|
||||
}
|
||||
|
||||
this.logger.warn(
|
||||
`Dakao emoticon downgraded to text because id/altText is invalid: id="${id || '-'}" altText="${altText || '-'}"`,
|
||||
);
|
||||
normalized.push({ kind: 'text', text: `(${altText || '이모티콘'})` });
|
||||
}
|
||||
|
||||
return normalized.length > 0
|
||||
? normalized
|
||||
: [{ kind: 'text', text: '명령 처리 결과를 보낼 수 없습니다.' }];
|
||||
}
|
||||
|
||||
private isPositiveIntegerString(value: string): boolean {
|
||||
return /^[1-9]\d*$/.test(value);
|
||||
}
|
||||
|
||||
private renderMentionFallback(displayText: string, userId: string): string {
|
||||
const label = displayText || userId || '사용자';
|
||||
return label.startsWith('@') ? label : `@${label}`;
|
||||
}
|
||||
}
|
||||
@@ -1,107 +0,0 @@
|
||||
import { DakaoSubscriber } from './dakao.subscriber';
|
||||
import { DakaoInboundEvent, DakaoSegment } from './dakao.types';
|
||||
import { CommandParseError } from './parsers/command.parser';
|
||||
|
||||
function makeSubscriber(): DakaoSubscriber {
|
||||
return new DakaoSubscriber(
|
||||
{} as never,
|
||||
{} as never,
|
||||
{} as never,
|
||||
{} as never,
|
||||
{} as never,
|
||||
{} as never,
|
||||
{} as never,
|
||||
{} as never,
|
||||
{} as never,
|
||||
{} as never,
|
||||
{} as never,
|
||||
{} as never,
|
||||
);
|
||||
}
|
||||
|
||||
const event = {
|
||||
projectId: '111111111111111111111111',
|
||||
chatroomId: 'chatroom-1',
|
||||
nickname: '프리리',
|
||||
userId: '12345',
|
||||
origin: {
|
||||
chatId: 'chat-1',
|
||||
logId: 'log-1',
|
||||
chatLog: {
|
||||
logId: 'log-1',
|
||||
chatId: 'chat-1',
|
||||
authorId: '12345',
|
||||
type: 1,
|
||||
sendAt: 0,
|
||||
message: '!내전',
|
||||
},
|
||||
},
|
||||
} satisfies DakaoInboundEvent;
|
||||
|
||||
describe('DakaoSubscriber', () => {
|
||||
it('renders usage help with star emoticon command lines', () => {
|
||||
const subscriber = makeSubscriber() as unknown as {
|
||||
parseErrorReply: (
|
||||
event: DakaoInboundEvent,
|
||||
senderNickname: string,
|
||||
err: CommandParseError,
|
||||
) => DakaoSegment[];
|
||||
};
|
||||
|
||||
const segments = subscriber.parseErrorReply(
|
||||
event,
|
||||
'프리리',
|
||||
new CommandParseError('usage'),
|
||||
);
|
||||
|
||||
expect(segments).toEqual([
|
||||
{ kind: 'mention', userId: '12345', displayText: '프리리' },
|
||||
{ kind: 'text', text: ' 사용법\n' },
|
||||
{ kind: 'emoticon', id: '1200281_035', altText: '스타' },
|
||||
{ kind: 'text', text: ' !내전 일정\n' },
|
||||
{ kind: 'emoticon', id: '1200281_035', altText: '스타' },
|
||||
{
|
||||
kind: 'text',
|
||||
text: ' !내전 신청 코드 소환사이름#태그 포지션1,포지션2\n',
|
||||
},
|
||||
{ kind: 'emoticon', id: '1200281_035', altText: '스타' },
|
||||
{ kind: 'text', text: ' !내전 계정등록 소환사이름#태그\n' },
|
||||
{ kind: 'emoticon', id: '1200281_035', altText: '스타' },
|
||||
{
|
||||
kind: 'text',
|
||||
text: ' !내전 선호포지션등록 포지션1,포지션2\n',
|
||||
},
|
||||
{ kind: 'emoticon', id: '1200281_035', altText: '스타' },
|
||||
{
|
||||
kind: 'text',
|
||||
text: ' !내전 대표계정변경 소환사이름#태그',
|
||||
},
|
||||
]);
|
||||
});
|
||||
|
||||
it('keeps the unknown command header before star emoticon usage lines', () => {
|
||||
const subscriber = makeSubscriber() as unknown as {
|
||||
parseErrorReply: (
|
||||
event: DakaoInboundEvent,
|
||||
senderNickname: string,
|
||||
err: CommandParseError,
|
||||
) => DakaoSegment[];
|
||||
};
|
||||
|
||||
const segments = subscriber.parseErrorReply(
|
||||
event,
|
||||
'프리리',
|
||||
new CommandParseError('unknown_command', '폭파'),
|
||||
);
|
||||
|
||||
expect(segments.slice(0, 2)).toEqual([
|
||||
{ kind: 'mention', userId: '12345', displayText: '프리리' },
|
||||
{ kind: 'text', text: ' 알 수 없는 명령어입니다.\n' },
|
||||
]);
|
||||
expect(segments).toContainEqual({
|
||||
kind: 'emoticon',
|
||||
id: '1200281_035',
|
||||
altText: '스타',
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -1,308 +0,0 @@
|
||||
import { Injectable, Logger, OnModuleInit } from '@nestjs/common';
|
||||
import mongoose from 'mongoose';
|
||||
import { NatsService } from '../global/nats/nats.service';
|
||||
import { SecretService } from '../global/secret/secret.service';
|
||||
import { CommandParseError, parseCommand } from './parsers/command.parser';
|
||||
import { DakaoInboundEvent, DakaoLong, DakaoSegment } from './dakao.types';
|
||||
import { DakaoPublisher } from './dakao.publisher';
|
||||
import { DakaoUserError, DakaoUserService } from './dakao-user.service';
|
||||
import { AccountRegisterHandler } from './handlers/account-register.handler';
|
||||
import { MatchCancelHandler } from './handlers/match-cancel.handler';
|
||||
import { MatchJoinHandler } from './handlers/match-join.handler';
|
||||
import { MatchListHandler } from './handlers/match-list.handler';
|
||||
import { PreferredPositionRegisterHandler } from './handlers/preferred-position-register.handler';
|
||||
import { PrimaryAccountChangeHandler } from './handlers/primary-account-change.handler';
|
||||
import { resolveDakaoNatsNames } from './dakao.nats-names';
|
||||
import { DakaoInboxService } from './dakao-inbox.service';
|
||||
import { DakaoJetStreamResourceService } from './dakao-jetstream-resource.service';
|
||||
|
||||
@Injectable()
|
||||
export class DakaoSubscriber implements OnModuleInit {
|
||||
private readonly logger = new Logger(DakaoSubscriber.name);
|
||||
private readonly natsNames = resolveDakaoNatsNames();
|
||||
private botUserId: string | undefined;
|
||||
private readonly usageCommands = [
|
||||
'!내전 일정',
|
||||
'!내전 신청 코드 소환사이름#태그 포지션1,포지션2',
|
||||
'!내전 계정등록 소환사이름#태그',
|
||||
'!내전 선호포지션등록 포지션1,포지션2',
|
||||
'!내전 대표계정변경 소환사이름#태그',
|
||||
];
|
||||
|
||||
constructor(
|
||||
private readonly natsService: NatsService,
|
||||
private readonly secretService: SecretService,
|
||||
private readonly dakaoUserService: DakaoUserService,
|
||||
private readonly publisher: DakaoPublisher,
|
||||
private readonly inbox: DakaoInboxService,
|
||||
private readonly resources: DakaoJetStreamResourceService,
|
||||
private readonly accountRegisterHandler: AccountRegisterHandler,
|
||||
private readonly matchListHandler: MatchListHandler,
|
||||
private readonly matchJoinHandler: MatchJoinHandler,
|
||||
private readonly matchCancelHandler: MatchCancelHandler,
|
||||
private readonly preferredPositionRegisterHandler: PreferredPositionRegisterHandler,
|
||||
private readonly primaryAccountChangeHandler: PrimaryAccountChangeHandler,
|
||||
) {}
|
||||
|
||||
async onModuleInit() {
|
||||
this.botUserId = await this.secretService
|
||||
.get<string>('DAKAO_BOT_USER_ID')
|
||||
.catch(() => undefined);
|
||||
|
||||
await this.resources.ensure();
|
||||
void this.natsService.consumeJetStream<DakaoInboundEvent>(
|
||||
{
|
||||
stream: this.natsNames.streams.botCommand,
|
||||
durable: this.natsNames.consumers.botCommand,
|
||||
},
|
||||
(event) => this.handleEvent(event),
|
||||
);
|
||||
this.logger.log(
|
||||
`Dakao inbound subscriber ready on stream="${this.natsNames.streams.botCommand}" durable="${this.natsNames.consumers.botCommand}"`,
|
||||
);
|
||||
}
|
||||
|
||||
private async handleEvent(event: DakaoInboundEvent): Promise<void> {
|
||||
if (!this.validate(event)) return;
|
||||
|
||||
if (this.botUserId && event.userId === this.botUserId) {
|
||||
return;
|
||||
}
|
||||
|
||||
const chatLogLogId = this.serializeDakaoLong(event.origin.chatLog.logId);
|
||||
let claimed = false;
|
||||
if (chatLogLogId) {
|
||||
const claim = await this.inbox.claim({
|
||||
consumer: this.natsNames.consumers.botCommand,
|
||||
projectId: event.projectId,
|
||||
chatLogLogId,
|
||||
});
|
||||
if (claim.status === 'duplicate') return;
|
||||
if (claim.status === 'inflight') {
|
||||
throw new Error(
|
||||
`Dakao event is already being processed projectId=${event.projectId} logId=${chatLogLogId}`,
|
||||
);
|
||||
}
|
||||
claimed = true;
|
||||
}
|
||||
|
||||
let communityId: mongoose.Types.ObjectId;
|
||||
try {
|
||||
communityId =
|
||||
await this.dakaoUserService.resolveCommunityIdByDakaoProjectId(
|
||||
event.projectId,
|
||||
);
|
||||
} catch (err) {
|
||||
if (err instanceof DakaoUserError) {
|
||||
if (err.code === 'invalid_project_id') {
|
||||
this.logger.warn(
|
||||
`Invalid dakao projectId format: ${event.projectId}`,
|
||||
);
|
||||
if (claimed) await this.markProcessed(event, chatLogLogId);
|
||||
return;
|
||||
}
|
||||
if (err.code === 'community_not_found') {
|
||||
// 우리 쪽이 모르는 projectId. 메시지를 보내봤자 컨텍스트가 없으므로 로그만.
|
||||
this.logger.warn(`Unknown dakao projectId: ${event.projectId}`);
|
||||
if (claimed) await this.markProcessed(event, chatLogLogId);
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (claimed) await this.markFailed(event, chatLogLogId, err);
|
||||
throw err;
|
||||
}
|
||||
|
||||
let segments: DakaoSegment[];
|
||||
const senderNickname = this.resolveSenderNickname(event);
|
||||
const correlationId = chatLogLogId;
|
||||
try {
|
||||
const command = parseCommand(event.origin.chatLog.message);
|
||||
|
||||
switch (command.kind) {
|
||||
case 'match-list':
|
||||
segments = await this.matchListHandler.handle({
|
||||
communityId,
|
||||
senderUserId: event.userId,
|
||||
senderNickname,
|
||||
});
|
||||
break;
|
||||
case 'account-register':
|
||||
segments = await this.accountRegisterHandler.handle({
|
||||
communityId,
|
||||
senderUserId: event.userId,
|
||||
senderNickname,
|
||||
gameName: command.gameName,
|
||||
tagLine: command.tagLine,
|
||||
});
|
||||
break;
|
||||
case 'primary-account-change':
|
||||
segments = await this.primaryAccountChangeHandler.handle({
|
||||
communityId,
|
||||
senderUserId: event.userId,
|
||||
senderNickname,
|
||||
gameName: command.gameName,
|
||||
tagLine: command.tagLine,
|
||||
});
|
||||
break;
|
||||
case 'match-join':
|
||||
segments = await this.matchJoinHandler.handle({
|
||||
communityId,
|
||||
matchAndRiotId: command.matchAndRiotId,
|
||||
senderUserId: event.userId,
|
||||
senderNickname,
|
||||
positions: command.positions?.positions,
|
||||
});
|
||||
break;
|
||||
case 'preferred-position-register':
|
||||
segments = await this.preferredPositionRegisterHandler.handle({
|
||||
communityId,
|
||||
senderUserId: event.userId,
|
||||
senderNickname,
|
||||
positions: command.positions.positions,
|
||||
});
|
||||
break;
|
||||
case 'match-cancel':
|
||||
segments = await this.matchCancelHandler.handle({
|
||||
communityId,
|
||||
matchId: command.matchId,
|
||||
senderUserId: event.userId,
|
||||
senderNickname,
|
||||
});
|
||||
break;
|
||||
}
|
||||
|
||||
await this.publisher.sendMessage({
|
||||
chatroomId: event.chatroomId,
|
||||
segments,
|
||||
correlationId,
|
||||
});
|
||||
if (claimed) await this.markProcessed(event, chatLogLogId);
|
||||
} catch (err) {
|
||||
if (err instanceof CommandParseError) {
|
||||
// not_a_command 는 명령이 아닌 일반 메시지 → 무시.
|
||||
if (err.code === 'not_a_command') {
|
||||
if (claimed) await this.markProcessed(event, chatLogLogId);
|
||||
return;
|
||||
}
|
||||
await this.publisher.sendMessage({
|
||||
chatroomId: event.chatroomId,
|
||||
segments: this.parseErrorReply(event, senderNickname, err),
|
||||
correlationId,
|
||||
});
|
||||
if (claimed) await this.markProcessed(event, chatLogLogId);
|
||||
return;
|
||||
}
|
||||
this.logger.error(
|
||||
`Unhandled dakao event error: ${(err as Error)?.stack ?? err}`,
|
||||
);
|
||||
if (claimed) await this.markFailed(event, chatLogLogId, err);
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
private validate(event: unknown): event is DakaoInboundEvent {
|
||||
if (!event || typeof event !== 'object') return false;
|
||||
const e = event as Partial<DakaoInboundEvent>;
|
||||
if (typeof e.projectId !== 'string' || e.projectId.length === 0)
|
||||
return false;
|
||||
if (typeof e.chatroomId !== 'string' || e.chatroomId.length === 0)
|
||||
return false;
|
||||
if (typeof e.nickname !== 'string') return false;
|
||||
if (typeof e.userId !== 'string' || e.userId.length === 0) return false;
|
||||
if (!e.origin || typeof e.origin !== 'object') return false;
|
||||
const chatLog = (e.origin as { chatLog?: unknown }).chatLog;
|
||||
if (!chatLog || typeof chatLog !== 'object') return false;
|
||||
if (typeof (chatLog as { message?: unknown }).message !== 'string')
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
private serializeDakaoLong(value: DakaoLong | string | undefined): string {
|
||||
if (typeof value === 'string') return value;
|
||||
if (!value || typeof value !== 'object') return '';
|
||||
const high = BigInt(value.high ?? 0);
|
||||
const low = BigInt.asUintN(32, BigInt(value.low ?? 0));
|
||||
const combined = (high << 32n) | low;
|
||||
return value.unsigned
|
||||
? BigInt.asUintN(64, combined).toString()
|
||||
: BigInt.asIntN(64, combined).toString();
|
||||
}
|
||||
|
||||
private resolveSenderNickname(event: DakaoInboundEvent): string {
|
||||
const primary = event.nickname?.trim();
|
||||
if (primary) return primary;
|
||||
const fallback = event.origin.authorNickname?.trim();
|
||||
return fallback ?? '';
|
||||
}
|
||||
|
||||
private async markProcessed(
|
||||
event: DakaoInboundEvent,
|
||||
chatLogLogId: string,
|
||||
): Promise<void> {
|
||||
await this.inbox.markProcessed({
|
||||
consumer: this.natsNames.consumers.botCommand,
|
||||
projectId: event.projectId,
|
||||
chatLogLogId,
|
||||
});
|
||||
}
|
||||
|
||||
private async markFailed(
|
||||
event: DakaoInboundEvent,
|
||||
chatLogLogId: string,
|
||||
error: unknown,
|
||||
): Promise<void> {
|
||||
await this.inbox.markFailed({
|
||||
consumer: this.natsNames.consumers.botCommand,
|
||||
projectId: event.projectId,
|
||||
chatLogLogId,
|
||||
error,
|
||||
});
|
||||
}
|
||||
|
||||
private parseErrorReply(
|
||||
event: DakaoInboundEvent,
|
||||
senderNickname: string,
|
||||
err: CommandParseError,
|
||||
): DakaoSegment[] {
|
||||
const head: DakaoSegment[] = [
|
||||
{
|
||||
kind: 'mention',
|
||||
userId: event.userId,
|
||||
displayText: senderNickname,
|
||||
},
|
||||
];
|
||||
const text = ((): string => {
|
||||
switch (err.code) {
|
||||
case 'unknown_command':
|
||||
return ` 알 수 없는 명령어입니다.\n`;
|
||||
case 'usage':
|
||||
return ` 내전 명령어 사용법\n`;
|
||||
case 'invalid_match_id':
|
||||
return ` 매치 ID 형식이 올바르지 않습니다 (${err.detail ?? ''}).`;
|
||||
case 'invalid_riot_id':
|
||||
return ` 라이엇 ID 형식이 올바르지 않습니다 (예: 프리리#KR1).`;
|
||||
case 'invalid_position':
|
||||
return ` 포지션 입력이 올바르지 않습니다. 쉼표로 구분해서 최소 2개를 중복 없이 입력해주세요. 사용 가능: 탑, 정글, 미드, 원딜, 서폿`;
|
||||
default:
|
||||
return ` 명령을 처리할 수 없습니다.`;
|
||||
}
|
||||
})();
|
||||
if (err.code === 'unknown_command' || err.code === 'usage') {
|
||||
return [...head, { kind: 'text', text }, ...this.usageCommandSegments()];
|
||||
}
|
||||
return [...head, { kind: 'text', text }];
|
||||
}
|
||||
|
||||
private usageCommandSegments(): DakaoSegment[] {
|
||||
return this.usageCommands.flatMap((command, index) => [
|
||||
{ kind: 'emoticon', id: '1200281_035', altText: '스타' } as const,
|
||||
{
|
||||
kind: 'text',
|
||||
text:
|
||||
index === this.usageCommands.length - 1
|
||||
? ` ${command}`
|
||||
: ` ${command} \n`,
|
||||
} as const,
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -1,111 +0,0 @@
|
||||
// dakao NATS contracts
|
||||
// inbound: dakao 가 {env}.lolympus.dakao.bot-command.submitted.v1 로 발행하는 이벤트
|
||||
// outbound: 우리가 {env}.dakao.chat.send-message.v1 로 발행하는 명령
|
||||
// result: dakao 가 {env}.lolympus.dakao.chat.send-message.{succeeded|failed}.v1 로 발행하는 결과 이벤트
|
||||
|
||||
// ===== Inbound =====
|
||||
export interface DakaoLong {
|
||||
high?: number;
|
||||
low?: number;
|
||||
unsigned?: boolean;
|
||||
}
|
||||
|
||||
export interface DakaoOriginChatLog {
|
||||
logId: DakaoLong | string;
|
||||
chatId: DakaoLong | string;
|
||||
authorId: DakaoLong | string;
|
||||
type: number;
|
||||
sendAt: number;
|
||||
message: string;
|
||||
prevId?: DakaoLong | string;
|
||||
msgId?: number;
|
||||
revision?: number;
|
||||
scope?: number;
|
||||
}
|
||||
|
||||
export interface DakaoOrigin {
|
||||
chatId: DakaoLong | string;
|
||||
logId: DakaoLong | string;
|
||||
authorNickname?: string;
|
||||
chatLog: DakaoOriginChatLog;
|
||||
noSeen?: boolean;
|
||||
notiRead?: boolean;
|
||||
li?: number;
|
||||
status?: number;
|
||||
}
|
||||
|
||||
export interface DakaoInboundEvent {
|
||||
projectId: string;
|
||||
chatroomId: string;
|
||||
nickname: string;
|
||||
userId: string;
|
||||
origin: DakaoOrigin;
|
||||
}
|
||||
|
||||
// ===== Outbound: chat.send-message =====
|
||||
export interface DakaoTextSegment {
|
||||
kind: 'text';
|
||||
text: string;
|
||||
}
|
||||
|
||||
export interface DakaoMentionSegment {
|
||||
kind: 'mention';
|
||||
userId: string;
|
||||
displayText: string;
|
||||
}
|
||||
|
||||
export interface DakaoEmoticonSegment {
|
||||
kind: 'emoticon';
|
||||
id: string;
|
||||
altText: string;
|
||||
}
|
||||
|
||||
export type DakaoSegment =
|
||||
| DakaoTextSegment
|
||||
| DakaoMentionSegment
|
||||
| DakaoEmoticonSegment;
|
||||
|
||||
export interface DakaoSendMessagePayload {
|
||||
chatroomId: string;
|
||||
segments: DakaoSegment[];
|
||||
attachment?: string | Record<string, unknown>;
|
||||
type?: number;
|
||||
noSeen?: boolean;
|
||||
scope?: number;
|
||||
silence?: boolean;
|
||||
}
|
||||
|
||||
export interface DakaoResultSubjects {
|
||||
succeeded: string;
|
||||
failed: string;
|
||||
}
|
||||
|
||||
export interface DakaoCommandEnvelope<TPayload> {
|
||||
schema: 'dakao.command.v1';
|
||||
eventId: string;
|
||||
type: string;
|
||||
eventSource: string;
|
||||
correlationId?: string;
|
||||
resultSubjects?: DakaoResultSubjects;
|
||||
payload: TPayload;
|
||||
}
|
||||
|
||||
// ===== Result =====
|
||||
export interface DakaoResultEnvelope {
|
||||
schema: 'dakao.result.v1';
|
||||
eventId: string;
|
||||
requestEventId: string;
|
||||
type: string;
|
||||
eventSource: string;
|
||||
requestEventSource: string;
|
||||
status: 'succeeded' | 'failed';
|
||||
handledAt: string;
|
||||
correlationId?: string;
|
||||
providerMessageId?: string;
|
||||
result?: Record<string, unknown>;
|
||||
error?: {
|
||||
code: string;
|
||||
message: string;
|
||||
retryable: boolean;
|
||||
};
|
||||
}
|
||||
@@ -1,73 +0,0 @@
|
||||
import mongoose from 'mongoose';
|
||||
import { DakaoUserError, DakaoUserService } from '../dakao-user.service';
|
||||
import { AccountRegisterHandler } from './account-register.handler';
|
||||
|
||||
const objectId = (hex: string) => new mongoose.Types.ObjectId(hex);
|
||||
|
||||
function makeHandler(dakaoUserService?: Partial<DakaoUserService>) {
|
||||
return new AccountRegisterHandler({
|
||||
registerRiotAccount: jest.fn(),
|
||||
...dakaoUserService,
|
||||
} as unknown as DakaoUserService);
|
||||
}
|
||||
|
||||
const baseParams = {
|
||||
communityId: objectId('111111111111111111111111'),
|
||||
senderUserId: 'kakao-user-1',
|
||||
senderNickname: '프리리',
|
||||
gameName: '프리리',
|
||||
tagLine: 'KR1',
|
||||
};
|
||||
|
||||
describe('AccountRegisterHandler', () => {
|
||||
it('registers a Riot account through DakaoUserService', async () => {
|
||||
const registerRiotAccount = jest.fn().mockResolvedValue({
|
||||
user: { _id: objectId('222222222222222222222222') },
|
||||
riotAccount: { gameName: '프리리', tagLine: 'KR1' },
|
||||
});
|
||||
const handler = makeHandler({
|
||||
registerRiotAccount,
|
||||
});
|
||||
|
||||
const segments = await handler.handle(baseParams);
|
||||
|
||||
expect(registerRiotAccount).toHaveBeenCalledWith({
|
||||
communityId: baseParams.communityId,
|
||||
kakaoTalkId: 'kakao-user-1',
|
||||
kakaoTalkNickname: '프리리',
|
||||
gameName: '프리리',
|
||||
tagLine: 'KR1',
|
||||
});
|
||||
expect(segments).toEqual([
|
||||
expect.objectContaining({ kind: 'mention', userId: 'kakao-user-1' }),
|
||||
expect.objectContaining({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('등록 계정: 프리리#KR1'),
|
||||
}),
|
||||
]);
|
||||
});
|
||||
|
||||
it('translates Riot account conflict errors', async () => {
|
||||
const handler = makeHandler({
|
||||
registerRiotAccount: jest
|
||||
.fn()
|
||||
.mockRejectedValue(
|
||||
new DakaoUserError('riot_account_conflict', '기존소환사#KR1'),
|
||||
),
|
||||
});
|
||||
|
||||
const segments = await handler.handle(baseParams);
|
||||
|
||||
expect(segments).toEqual([
|
||||
expect.objectContaining({ kind: 'mention', userId: 'kakao-user-1' }),
|
||||
expect.objectContaining({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('이미 다른 사용자가 등록한 라이엇 계정'),
|
||||
}),
|
||||
]);
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('기존소환사#KR1'),
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -1,81 +0,0 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import mongoose from 'mongoose';
|
||||
import { DakaoSegment } from '../dakao.types';
|
||||
import { DakaoUserError, DakaoUserService } from '../dakao-user.service';
|
||||
|
||||
interface AccountRegisterHandlerParams {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
senderUserId: string;
|
||||
senderNickname: string;
|
||||
gameName: string;
|
||||
tagLine: string;
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class AccountRegisterHandler {
|
||||
constructor(private readonly dakaoUserService: DakaoUserService) {}
|
||||
|
||||
public async handle(
|
||||
params: AccountRegisterHandlerParams,
|
||||
): Promise<DakaoSegment[]> {
|
||||
try {
|
||||
const resolved = await this.dakaoUserService.registerRiotAccount({
|
||||
communityId: params.communityId,
|
||||
kakaoTalkId: params.senderUserId,
|
||||
kakaoTalkNickname: params.senderNickname,
|
||||
gameName: params.gameName,
|
||||
tagLine: params.tagLine,
|
||||
});
|
||||
|
||||
return [
|
||||
{
|
||||
kind: 'mention',
|
||||
userId: params.senderUserId,
|
||||
displayText: params.senderNickname,
|
||||
},
|
||||
{
|
||||
kind: 'text',
|
||||
text:
|
||||
` 계정 등록 완료` +
|
||||
`\n등록 계정: ${resolved.riotAccount.gameName}#${resolved.riotAccount.tagLine}`,
|
||||
},
|
||||
];
|
||||
} catch (err) {
|
||||
if (err instanceof DakaoUserError) {
|
||||
return this.errorReply(params, this.translateUserError(err));
|
||||
}
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
private errorReply(
|
||||
params: AccountRegisterHandlerParams,
|
||||
message: string,
|
||||
): DakaoSegment[] {
|
||||
return [
|
||||
{
|
||||
kind: 'mention',
|
||||
userId: params.senderUserId,
|
||||
displayText: params.senderNickname,
|
||||
},
|
||||
{ kind: 'text', text: ` ${message}` },
|
||||
];
|
||||
}
|
||||
|
||||
private translateUserError(err: DakaoUserError): string {
|
||||
switch (err.code) {
|
||||
case 'invalid_project_id':
|
||||
return '커뮤니티 식별자가 올바르지 않습니다.';
|
||||
case 'community_not_found':
|
||||
return '연결된 커뮤니티를 찾을 수 없습니다.';
|
||||
case 'riot_account_not_found':
|
||||
return `라이엇 계정을 찾을 수 없습니다 (${err.detail ?? ''}).`;
|
||||
case 'riot_account_already_registered':
|
||||
return `이미 등록된 라이엇 계정이 있습니다 (${err.detail ?? ''}). 변경이 필요하면 운영자에게 문의해주세요.`;
|
||||
case 'riot_account_conflict':
|
||||
return `이미 다른 사용자가 등록한 라이엇 계정입니다 (${err.detail ?? ''}).`;
|
||||
case 'riot_account_lookup_failed':
|
||||
return '라이엇 계정 조회 중 오류가 발생했습니다. 잠시 후 다시 시도해주세요.';
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,168 +0,0 @@
|
||||
import { BadRequestException } from '@nestjs/common';
|
||||
import mongoose from 'mongoose';
|
||||
import { MatchService } from '../../match/match.service';
|
||||
import { DakaoUserService } from '../dakao-user.service';
|
||||
import { MatchCancelHandler } from './match-cancel.handler';
|
||||
|
||||
const objectId = (hex: string) => new mongoose.Types.ObjectId(hex);
|
||||
|
||||
function makeHandler(overrides?: {
|
||||
matchService?: Partial<MatchService>;
|
||||
dakaoUserService?: Partial<DakaoUserService>;
|
||||
}): MatchCancelHandler {
|
||||
const matchService = {
|
||||
cancelJoin: jest.fn(),
|
||||
list: jest.fn(),
|
||||
...overrides?.matchService,
|
||||
} as unknown as MatchService;
|
||||
const dakaoUserService = {
|
||||
findUserByKakaoTalkId: jest.fn(),
|
||||
...overrides?.dakaoUserService,
|
||||
} as unknown as DakaoUserService;
|
||||
return new MatchCancelHandler(matchService, dakaoUserService);
|
||||
}
|
||||
|
||||
const baseParams = {
|
||||
communityId: objectId('111111111111111111111111'),
|
||||
matchId: '69b63bc96da18dfdb218ee8c',
|
||||
senderUserId: 'kakao-user-1',
|
||||
senderNickname: '프리리',
|
||||
};
|
||||
|
||||
describe('MatchCancelHandler', () => {
|
||||
it('rejects unknown match reference without cancelling', async () => {
|
||||
const cancelJoin = jest.fn();
|
||||
const handler = makeHandler({
|
||||
matchService: {
|
||||
cancelJoin,
|
||||
list: jest.fn().mockResolvedValue([]),
|
||||
} as Partial<MatchService>,
|
||||
dakaoUserService: {
|
||||
findUserByKakaoTalkId: jest.fn().mockResolvedValue({
|
||||
_id: objectId('222222222222222222222222'),
|
||||
}),
|
||||
} as Partial<DakaoUserService>,
|
||||
});
|
||||
|
||||
const segments = await handler.handle({
|
||||
...baseParams,
|
||||
matchId: 'not-an-id',
|
||||
});
|
||||
|
||||
expect(cancelJoin).not.toHaveBeenCalled();
|
||||
expect(segments).toEqual([
|
||||
expect.objectContaining({ kind: 'mention', userId: 'kakao-user-1' }),
|
||||
expect.objectContaining({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('모집 중인 내전이 없습니다'),
|
||||
}),
|
||||
]);
|
||||
});
|
||||
|
||||
it('replies with success for registered user cancellation', async () => {
|
||||
const cancelJoin = jest.fn().mockResolvedValue({
|
||||
title: '저녁 내전',
|
||||
participants: [{}, {}],
|
||||
maxParticipants: 10,
|
||||
});
|
||||
const findUserByKakaoTalkId = jest.fn().mockResolvedValue({
|
||||
_id: objectId('222222222222222222222222'),
|
||||
});
|
||||
const handler = makeHandler({
|
||||
matchService: { cancelJoin } as Partial<MatchService>,
|
||||
dakaoUserService: {
|
||||
findUserByKakaoTalkId,
|
||||
} as Partial<DakaoUserService>,
|
||||
});
|
||||
|
||||
const segments = await handler.handle(baseParams);
|
||||
|
||||
expect(findUserByKakaoTalkId).toHaveBeenCalledWith({
|
||||
communityId: baseParams.communityId,
|
||||
kakaoTalkId: 'kakao-user-1',
|
||||
});
|
||||
expect(cancelJoin).toHaveBeenCalledWith({
|
||||
matchId: expect.any(mongoose.Types.ObjectId),
|
||||
userId: expect.any(mongoose.Types.ObjectId),
|
||||
});
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('참가 취소 완료 (2/10)'),
|
||||
});
|
||||
});
|
||||
|
||||
it('resolves cancellation by short code', async () => {
|
||||
const matchId = objectId('333333333333333333333333');
|
||||
const cancelJoin = jest.fn().mockResolvedValue({
|
||||
title: '저녁 내전',
|
||||
participants: [{}, {}],
|
||||
maxParticipants: 10,
|
||||
});
|
||||
const findUserByKakaoTalkId = jest.fn().mockResolvedValue({
|
||||
_id: objectId('222222222222222222222222'),
|
||||
});
|
||||
const handler = makeHandler({
|
||||
matchService: {
|
||||
cancelJoin,
|
||||
list: jest.fn().mockResolvedValue([
|
||||
{ _id: matchId, title: '저녁 내전', shortCode: 'AB12' },
|
||||
]),
|
||||
} as Partial<MatchService>,
|
||||
dakaoUserService: {
|
||||
findUserByKakaoTalkId,
|
||||
} as Partial<DakaoUserService>,
|
||||
});
|
||||
|
||||
await handler.handle({
|
||||
...baseParams,
|
||||
matchId: 'AB12',
|
||||
});
|
||||
|
||||
expect(cancelJoin).toHaveBeenCalledWith({
|
||||
matchId,
|
||||
userId: expect.any(mongoose.Types.ObjectId),
|
||||
});
|
||||
});
|
||||
|
||||
it('asks unregistered user to register first', async () => {
|
||||
const cancelJoin = jest.fn();
|
||||
const handler = makeHandler({
|
||||
matchService: { cancelJoin } as Partial<MatchService>,
|
||||
dakaoUserService: {
|
||||
findUserByKakaoTalkId: jest.fn().mockResolvedValue(null),
|
||||
} as Partial<DakaoUserService>,
|
||||
});
|
||||
|
||||
const segments = await handler.handle(baseParams);
|
||||
|
||||
expect(cancelJoin).not.toHaveBeenCalled();
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('계정을 등록'),
|
||||
});
|
||||
});
|
||||
|
||||
it('translates not-joined cancellation errors', async () => {
|
||||
const handler = makeHandler({
|
||||
matchService: {
|
||||
cancelJoin: jest
|
||||
.fn()
|
||||
.mockRejectedValue(
|
||||
new BadRequestException('User has not joined this match.'),
|
||||
),
|
||||
} as Partial<MatchService>,
|
||||
dakaoUserService: {
|
||||
findUserByKakaoTalkId: jest.fn().mockResolvedValue({
|
||||
_id: objectId('222222222222222222222222'),
|
||||
}),
|
||||
} as Partial<DakaoUserService>,
|
||||
});
|
||||
|
||||
const segments = await handler.handle(baseParams);
|
||||
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('신청한 내전이 아닙니다'),
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -1,126 +0,0 @@
|
||||
import {
|
||||
BadRequestException,
|
||||
Injectable,
|
||||
NotFoundException,
|
||||
} from '@nestjs/common';
|
||||
import mongoose from 'mongoose';
|
||||
import { MatchService } from '../../match/match.service';
|
||||
import { DakaoSegment } from '../dakao.types';
|
||||
import { DakaoUserService } from '../dakao-user.service';
|
||||
import { resolveRecruitingMatchReference } from './match-reference.util';
|
||||
|
||||
interface CancelHandlerParams {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
matchId: string;
|
||||
senderUserId: string; // kakaoTalkId
|
||||
senderNickname: string; // kakaoTalkNickname
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class MatchCancelHandler {
|
||||
constructor(
|
||||
private readonly matchService: MatchService,
|
||||
private readonly dakaoUserService: DakaoUserService,
|
||||
) {}
|
||||
|
||||
public async handle(params: CancelHandlerParams): Promise<DakaoSegment[]> {
|
||||
const user = await this.dakaoUserService.findUserByKakaoTalkId({
|
||||
communityId: params.communityId,
|
||||
kakaoTalkId: params.senderUserId,
|
||||
});
|
||||
if (!user) {
|
||||
return this.errorReply(
|
||||
params,
|
||||
'먼저 !내전 계정등록 <닉네임>#<태그> 로 계정을 등록해주세요.',
|
||||
);
|
||||
}
|
||||
|
||||
const matchTarget = await this.resolveCancelTarget(params);
|
||||
if (typeof matchTarget === 'string') {
|
||||
return this.errorReply(params, matchTarget);
|
||||
}
|
||||
|
||||
try {
|
||||
const match = await this.matchService.cancelJoin({
|
||||
matchId: matchTarget,
|
||||
userId: user._id,
|
||||
});
|
||||
|
||||
return [
|
||||
{
|
||||
kind: 'mention',
|
||||
userId: params.senderUserId,
|
||||
displayText: params.senderNickname,
|
||||
},
|
||||
{
|
||||
kind: 'text',
|
||||
text:
|
||||
` 참가 취소 완료 (${match.participants.length}/${match.maxParticipants})` +
|
||||
`\n내전: ${match.title}`,
|
||||
},
|
||||
];
|
||||
} catch (err) {
|
||||
if (err instanceof NotFoundException) {
|
||||
return this.errorReply(params, '내전을 찾을 수 없습니다.');
|
||||
}
|
||||
if (err instanceof BadRequestException) {
|
||||
return this.errorReply(params, this.translateBadRequest(err.message));
|
||||
}
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
private async resolveCancelTarget(
|
||||
params: CancelHandlerParams,
|
||||
): Promise<mongoose.Types.ObjectId | string> {
|
||||
if (mongoose.isValidObjectId(params.matchId)) {
|
||||
return new mongoose.Types.ObjectId(params.matchId);
|
||||
}
|
||||
|
||||
const recruitingMatches = await this.matchService.list({
|
||||
communityId: params.communityId,
|
||||
status: 'recruiting',
|
||||
limit: 50,
|
||||
});
|
||||
if (recruitingMatches.length === 0) {
|
||||
return '모집 중인 내전이 없습니다.';
|
||||
}
|
||||
|
||||
const result = resolveRecruitingMatchReference(
|
||||
params.matchId,
|
||||
recruitingMatches,
|
||||
);
|
||||
if (result.kind === 'matched') {
|
||||
return result.match._id;
|
||||
}
|
||||
if (result.kind === 'ambiguous') {
|
||||
return `내전 코드 또는 제목이 여러 개와 겹칩니다 (${result.titles.join(', ')}). 더 길게 입력하거나 ID를 사용해주세요.`;
|
||||
}
|
||||
return '모집 중인 내전을 찾을 수 없습니다. !내전 리스트에서 코드 또는 제목을 확인해주세요.';
|
||||
}
|
||||
|
||||
private errorReply(
|
||||
params: CancelHandlerParams,
|
||||
message: string,
|
||||
): DakaoSegment[] {
|
||||
return [
|
||||
{
|
||||
kind: 'mention',
|
||||
userId: params.senderUserId,
|
||||
displayText: params.senderNickname,
|
||||
},
|
||||
{ kind: 'text', text: ` ${message}` },
|
||||
];
|
||||
}
|
||||
|
||||
private translateBadRequest(raw: string): string {
|
||||
if (raw.includes('different communities')) {
|
||||
return '이 내전은 현재 채팅방의 커뮤니티 소속이 아닙니다.';
|
||||
}
|
||||
if (raw.includes('not recruiting')) {
|
||||
return '모집 중인 내전만 참가 취소할 수 있습니다.';
|
||||
}
|
||||
if (raw.includes('has not joined')) return '신청한 내전이 아닙니다.';
|
||||
return raw;
|
||||
}
|
||||
}
|
||||
@@ -1,389 +0,0 @@
|
||||
import { BadRequestException } from '@nestjs/common';
|
||||
import mongoose from 'mongoose';
|
||||
import { MatchService } from '../../match/match.service';
|
||||
import { DakaoUserError, DakaoUserService } from '../dakao-user.service';
|
||||
import { MatchJoinHandler } from './match-join.handler';
|
||||
|
||||
const objectId = (hex: string) => new mongoose.Types.ObjectId(hex);
|
||||
|
||||
function makeHandler(overrides?: {
|
||||
matchService?: Partial<MatchService>;
|
||||
dakaoUserService?: Partial<DakaoUserService>;
|
||||
}): MatchJoinHandler {
|
||||
const matchService = {
|
||||
join: jest.fn(),
|
||||
list: jest.fn(),
|
||||
...overrides?.matchService,
|
||||
} as unknown as MatchService;
|
||||
const dakaoUserService = {
|
||||
resolveRiotAccount: jest.fn(),
|
||||
findUserByKakaoTalkId: jest.fn(),
|
||||
...overrides?.dakaoUserService,
|
||||
} as unknown as DakaoUserService;
|
||||
return new MatchJoinHandler(matchService, dakaoUserService);
|
||||
}
|
||||
|
||||
const baseParams = {
|
||||
communityId: objectId('111111111111111111111111'),
|
||||
matchAndRiotId: '69b63bc96da18dfdb218ee8c 프리리#KR1',
|
||||
senderUserId: 'kakao-user-1',
|
||||
senderNickname: '프리리',
|
||||
positions: ['MID', 'TOP'] as const,
|
||||
};
|
||||
|
||||
describe('MatchJoinHandler', () => {
|
||||
it('rejects missing match reference when multiple matches are recruiting', async () => {
|
||||
const resolveRiotAccount = jest.fn();
|
||||
const handler = makeHandler({
|
||||
matchService: {
|
||||
list: jest.fn().mockResolvedValue([
|
||||
{ _id: objectId('333333333333333333333333'), title: '저녁 내전' },
|
||||
{ _id: objectId('444444444444444444444444'), title: '심야 내전' },
|
||||
]),
|
||||
} as Partial<MatchService>,
|
||||
dakaoUserService: {
|
||||
resolveRiotAccount,
|
||||
} as Partial<DakaoUserService>,
|
||||
});
|
||||
const segments = await handler.handle({
|
||||
...baseParams,
|
||||
matchAndRiotId: '프리리#KR1',
|
||||
positions: [...baseParams.positions],
|
||||
});
|
||||
expect(resolveRiotAccount).not.toHaveBeenCalled();
|
||||
expect(segments).toEqual([
|
||||
expect.objectContaining({ kind: 'mention', userId: 'kakao-user-1' }),
|
||||
expect.objectContaining({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('코드 또는 제목'),
|
||||
}),
|
||||
]);
|
||||
});
|
||||
|
||||
it('replies with success and uses input position priority', async () => {
|
||||
const join = jest.fn().mockResolvedValue({
|
||||
title: '저녁 내전',
|
||||
participants: [{}, {}, {}],
|
||||
maxParticipants: 10,
|
||||
});
|
||||
const resolveRiotAccount = jest.fn().mockResolvedValue({
|
||||
user: { _id: objectId('222222222222222222222222') },
|
||||
riotAccount: { puuid: 'puuid-1', gameName: '프리리', tagLine: 'KR1' },
|
||||
});
|
||||
const handler = makeHandler({
|
||||
matchService: { join } as Partial<MatchService>,
|
||||
dakaoUserService: {
|
||||
resolveRiotAccount,
|
||||
} as Partial<DakaoUserService>,
|
||||
});
|
||||
|
||||
const segments = await handler.handle({
|
||||
...baseParams,
|
||||
positions: [...baseParams.positions],
|
||||
});
|
||||
|
||||
expect(resolveRiotAccount).toHaveBeenCalledWith({
|
||||
communityId: baseParams.communityId,
|
||||
kakaoTalkId: 'kakao-user-1',
|
||||
kakaoTalkNickname: '프리리',
|
||||
gameName: '프리리',
|
||||
tagLine: 'KR1',
|
||||
});
|
||||
expect(join).toHaveBeenCalledWith({
|
||||
matchId: expect.any(mongoose.Types.ObjectId),
|
||||
userId: expect.any(mongoose.Types.ObjectId),
|
||||
preferredPositions: [
|
||||
{ position: 'MID', priority: 1 },
|
||||
{ position: 'TOP', priority: 2 },
|
||||
],
|
||||
riotPuuid: 'puuid-1',
|
||||
});
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('신청 완료 (3/10)'),
|
||||
});
|
||||
});
|
||||
|
||||
it('uses the only recruiting match when match reference is omitted', async () => {
|
||||
const matchId = objectId('333333333333333333333333');
|
||||
const join = jest.fn().mockResolvedValue({
|
||||
title: '저녁 내전',
|
||||
participants: [{}],
|
||||
maxParticipants: 10,
|
||||
});
|
||||
const handler = makeHandler({
|
||||
matchService: {
|
||||
list: jest
|
||||
.fn()
|
||||
.mockResolvedValue([{ _id: matchId, title: '저녁 내전' }]),
|
||||
join,
|
||||
} as Partial<MatchService>,
|
||||
dakaoUserService: {
|
||||
resolveRiotAccount: jest.fn().mockResolvedValue({
|
||||
user: { _id: objectId('222222222222222222222222') },
|
||||
riotAccount: { puuid: 'puuid-1', gameName: '프리리', tagLine: 'KR1' },
|
||||
}),
|
||||
} as Partial<DakaoUserService>,
|
||||
});
|
||||
|
||||
const segments = await handler.handle({
|
||||
...baseParams,
|
||||
matchAndRiotId: '프리리#KR1',
|
||||
positions: [...baseParams.positions],
|
||||
});
|
||||
|
||||
expect(join).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
matchId,
|
||||
}),
|
||||
);
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('신청 완료 (1/10)'),
|
||||
});
|
||||
});
|
||||
|
||||
it('resolves a unique recruiting match by title prefix', async () => {
|
||||
const matchId = objectId('333333333333333333333333');
|
||||
const join = jest.fn().mockResolvedValue({
|
||||
title: '저녁 내전',
|
||||
participants: [{}],
|
||||
maxParticipants: 10,
|
||||
});
|
||||
const handler = makeHandler({
|
||||
matchService: {
|
||||
list: jest.fn().mockResolvedValue([
|
||||
{ _id: matchId, title: '저녁 내전' },
|
||||
{ _id: objectId('444444444444444444444444'), title: '심야 내전' },
|
||||
]),
|
||||
join,
|
||||
} as Partial<MatchService>,
|
||||
dakaoUserService: {
|
||||
resolveRiotAccount: jest.fn().mockResolvedValue({
|
||||
user: { _id: objectId('222222222222222222222222') },
|
||||
riotAccount: { puuid: 'puuid-1', gameName: '프리리', tagLine: 'KR1' },
|
||||
}),
|
||||
} as Partial<DakaoUserService>,
|
||||
});
|
||||
|
||||
await handler.handle({
|
||||
...baseParams,
|
||||
matchAndRiotId: '저녁 프리리#KR1',
|
||||
positions: [...baseParams.positions],
|
||||
});
|
||||
|
||||
expect(join).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
matchId,
|
||||
}),
|
||||
);
|
||||
});
|
||||
|
||||
it('resolves a recruiting match by short code', async () => {
|
||||
const matchId = objectId('333333333333333333333333');
|
||||
const join = jest.fn().mockResolvedValue({
|
||||
title: '저녁 내전',
|
||||
participants: [{}],
|
||||
maxParticipants: 10,
|
||||
});
|
||||
const handler = makeHandler({
|
||||
matchService: {
|
||||
list: jest.fn().mockResolvedValue([
|
||||
{ _id: matchId, title: '저녁 내전', shortCode: 'AB12' },
|
||||
{
|
||||
_id: objectId('444444444444444444444444'),
|
||||
title: '심야 내전',
|
||||
shortCode: 'CD34',
|
||||
},
|
||||
]),
|
||||
join,
|
||||
} as Partial<MatchService>,
|
||||
dakaoUserService: {
|
||||
resolveRiotAccount: jest.fn().mockResolvedValue({
|
||||
user: { _id: objectId('222222222222222222222222') },
|
||||
riotAccount: { puuid: 'puuid-1', gameName: '프리리', tagLine: 'KR1' },
|
||||
}),
|
||||
} as Partial<DakaoUserService>,
|
||||
});
|
||||
|
||||
await handler.handle({
|
||||
...baseParams,
|
||||
matchAndRiotId: 'AB12 프리리#KR1',
|
||||
positions: [...baseParams.positions],
|
||||
});
|
||||
|
||||
expect(join).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
matchId,
|
||||
}),
|
||||
);
|
||||
});
|
||||
|
||||
it('uses registered account and preferred positions for abbreviated join', async () => {
|
||||
const matchId = objectId('333333333333333333333333');
|
||||
const userId = objectId('222222222222222222222222');
|
||||
const join = jest.fn().mockResolvedValue({
|
||||
title: '저녁 내전',
|
||||
participants: [{}],
|
||||
maxParticipants: 10,
|
||||
});
|
||||
const resolveRiotAccount = jest.fn();
|
||||
const handler = makeHandler({
|
||||
matchService: {
|
||||
list: jest.fn().mockResolvedValue([
|
||||
{ _id: matchId, title: '저녁 내전', shortCode: 'AB12' },
|
||||
]),
|
||||
join,
|
||||
} as Partial<MatchService>,
|
||||
dakaoUserService: {
|
||||
resolveRiotAccount,
|
||||
findUserByKakaoTalkId: jest.fn().mockResolvedValue({
|
||||
_id: userId,
|
||||
riotAccounts: [
|
||||
{
|
||||
puuid: 'puuid-1',
|
||||
gameName: '프리리',
|
||||
tagLine: 'KR1',
|
||||
isPrimary: true,
|
||||
},
|
||||
],
|
||||
preferredPositions: [
|
||||
{ position: 'MID', priority: 1 },
|
||||
{ position: 'JGL', priority: 2 },
|
||||
],
|
||||
}),
|
||||
} as Partial<DakaoUserService>,
|
||||
});
|
||||
|
||||
const segments = await handler.handle({
|
||||
...baseParams,
|
||||
matchAndRiotId: 'AB12',
|
||||
positions: undefined,
|
||||
});
|
||||
|
||||
expect(resolveRiotAccount).not.toHaveBeenCalled();
|
||||
expect(join).toHaveBeenCalledWith({
|
||||
matchId,
|
||||
userId,
|
||||
preferredPositions: [
|
||||
{ position: 'MID', priority: 1 },
|
||||
{ position: 'JGL', priority: 2 },
|
||||
],
|
||||
riotPuuid: 'puuid-1',
|
||||
});
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('계정: 프리리#KR1'),
|
||||
});
|
||||
});
|
||||
|
||||
it('asks abbreviated join users to register missing preferred positions', async () => {
|
||||
const matchId = objectId('333333333333333333333333');
|
||||
const join = jest.fn();
|
||||
const handler = makeHandler({
|
||||
matchService: {
|
||||
list: jest.fn().mockResolvedValue([
|
||||
{ _id: matchId, title: '저녁 내전', shortCode: 'AB12' },
|
||||
]),
|
||||
join,
|
||||
} as Partial<MatchService>,
|
||||
dakaoUserService: {
|
||||
findUserByKakaoTalkId: jest.fn().mockResolvedValue({
|
||||
_id: objectId('222222222222222222222222'),
|
||||
riotAccounts: [
|
||||
{
|
||||
puuid: 'puuid-1',
|
||||
gameName: '프리리',
|
||||
tagLine: 'KR1',
|
||||
isPrimary: true,
|
||||
},
|
||||
],
|
||||
preferredPositions: [],
|
||||
}),
|
||||
} as Partial<DakaoUserService>,
|
||||
});
|
||||
|
||||
const segments = await handler.handle({
|
||||
...baseParams,
|
||||
matchAndRiotId: 'AB12',
|
||||
positions: undefined,
|
||||
});
|
||||
|
||||
expect(join).not.toHaveBeenCalled();
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('선호포지션등록'),
|
||||
});
|
||||
});
|
||||
|
||||
it('rejects ambiguous title prefixes', async () => {
|
||||
const resolveRiotAccount = jest.fn();
|
||||
const handler = makeHandler({
|
||||
matchService: {
|
||||
list: jest.fn().mockResolvedValue([
|
||||
{ _id: objectId('333333333333333333333333'), title: '저녁 내전 A' },
|
||||
{ _id: objectId('444444444444444444444444'), title: '저녁 내전 B' },
|
||||
]),
|
||||
} as Partial<MatchService>,
|
||||
dakaoUserService: {
|
||||
resolveRiotAccount,
|
||||
} as Partial<DakaoUserService>,
|
||||
});
|
||||
|
||||
const segments = await handler.handle({
|
||||
...baseParams,
|
||||
matchAndRiotId: '저녁 프리리#KR1',
|
||||
positions: [...baseParams.positions],
|
||||
});
|
||||
|
||||
expect(resolveRiotAccount).not.toHaveBeenCalled();
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('여러 개와 겹칩니다'),
|
||||
});
|
||||
});
|
||||
|
||||
it('translates riot_account_not_found errors', async () => {
|
||||
const handler = makeHandler({
|
||||
dakaoUserService: {
|
||||
resolveRiotAccount: jest
|
||||
.fn()
|
||||
.mockRejectedValue(
|
||||
new DakaoUserError('riot_account_not_found', '프리리#KR1'),
|
||||
),
|
||||
} as Partial<DakaoUserService>,
|
||||
});
|
||||
const segments = await handler.handle({
|
||||
...baseParams,
|
||||
positions: [...baseParams.positions],
|
||||
});
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('라이엇 계정을 찾을 수 없습니다'),
|
||||
});
|
||||
});
|
||||
|
||||
it('translates match BadRequest into korean', async () => {
|
||||
const handler = makeHandler({
|
||||
matchService: {
|
||||
join: jest
|
||||
.fn()
|
||||
.mockRejectedValue(new BadRequestException('Match is full.')),
|
||||
} as Partial<MatchService>,
|
||||
dakaoUserService: {
|
||||
resolveRiotAccount: jest.fn().mockResolvedValue({
|
||||
user: { _id: objectId('222222222222222222222222') },
|
||||
riotAccount: { puuid: 'p', gameName: 'g', tagLine: 't' },
|
||||
}),
|
||||
} as Partial<DakaoUserService>,
|
||||
});
|
||||
const segments = await handler.handle({
|
||||
...baseParams,
|
||||
positions: [...baseParams.positions],
|
||||
});
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('정원이 가득'),
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -1,352 +0,0 @@
|
||||
import {
|
||||
BadRequestException,
|
||||
Injectable,
|
||||
NotFoundException,
|
||||
} from '@nestjs/common';
|
||||
import mongoose from 'mongoose';
|
||||
import { MatchService } from '../../match/match.service';
|
||||
import {
|
||||
MatchDocument,
|
||||
Position,
|
||||
PositionPreference,
|
||||
RiotAccount,
|
||||
UserDocument,
|
||||
} from '../../global/database/schema';
|
||||
import { DakaoSegment } from '../dakao.types';
|
||||
import { DakaoUserError, DakaoUserService } from '../dakao-user.service';
|
||||
import { normalizeRiotIdPart } from '../riot-id.util';
|
||||
import { resolveRecruitingMatchReference } from './match-reference.util';
|
||||
|
||||
interface JoinHandlerParams {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
matchAndRiotId: string;
|
||||
senderUserId: string; // kakaoTalkId
|
||||
senderNickname: string; // kakaoTalkNickname
|
||||
positions?: Position[];
|
||||
}
|
||||
|
||||
interface ResolvedJoinTarget {
|
||||
matchId: mongoose.Types.ObjectId;
|
||||
gameName?: string;
|
||||
tagLine?: string;
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class MatchJoinHandler {
|
||||
constructor(
|
||||
private readonly matchService: MatchService,
|
||||
private readonly dakaoUserService: DakaoUserService,
|
||||
) {}
|
||||
|
||||
public async handle(params: JoinHandlerParams): Promise<DakaoSegment[]> {
|
||||
const joinTarget = await this.resolveJoinTarget(params);
|
||||
if (typeof joinTarget === 'string') {
|
||||
return this.errorReply(params, joinTarget);
|
||||
}
|
||||
|
||||
let resolved:
|
||||
| { user: UserDocument; riotAccount: RiotAccount }
|
||||
| string;
|
||||
try {
|
||||
resolved =
|
||||
joinTarget.gameName && joinTarget.tagLine
|
||||
? await this.dakaoUserService.resolveRiotAccount({
|
||||
communityId: params.communityId,
|
||||
kakaoTalkId: params.senderUserId,
|
||||
kakaoTalkNickname: params.senderNickname,
|
||||
gameName: joinTarget.gameName,
|
||||
tagLine: joinTarget.tagLine,
|
||||
})
|
||||
: await this.resolveRegisteredRiotAccount(params);
|
||||
} catch (err) {
|
||||
if (err instanceof DakaoUserError) {
|
||||
return this.errorReply(params, this.translateUserError(err));
|
||||
}
|
||||
throw err;
|
||||
}
|
||||
if (typeof resolved === 'string') {
|
||||
return this.errorReply(params, resolved);
|
||||
}
|
||||
|
||||
const preferredPositions = this.resolvePreferredPositions(
|
||||
params.positions,
|
||||
resolved.user.preferredPositions,
|
||||
);
|
||||
if (typeof preferredPositions === 'string') {
|
||||
return this.errorReply(params, preferredPositions);
|
||||
}
|
||||
|
||||
try {
|
||||
const match = await this.matchService.join({
|
||||
matchId: joinTarget.matchId,
|
||||
userId: resolved.user._id,
|
||||
preferredPositions,
|
||||
riotPuuid: resolved.riotAccount.puuid,
|
||||
});
|
||||
|
||||
return [
|
||||
{
|
||||
kind: 'mention',
|
||||
userId: params.senderUserId,
|
||||
displayText: params.senderNickname,
|
||||
},
|
||||
{
|
||||
kind: 'text',
|
||||
text:
|
||||
` 신청 완료 (${match.participants.length}/${match.maxParticipants})` +
|
||||
`\n내전: ${match.title}` +
|
||||
`\n계정: ${resolved.riotAccount.gameName}#${resolved.riotAccount.tagLine}` +
|
||||
`\n포지션: ${preferredPositions
|
||||
.map((entry) => entry.position)
|
||||
.join(', ')}`,
|
||||
},
|
||||
];
|
||||
} catch (err) {
|
||||
if (err instanceof NotFoundException) {
|
||||
return this.errorReply(params, '내전을 찾을 수 없습니다.');
|
||||
}
|
||||
if (err instanceof BadRequestException) {
|
||||
return this.errorReply(params, this.translateBadRequest(err.message));
|
||||
}
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
private async resolveJoinTarget(
|
||||
params: JoinHandlerParams,
|
||||
): Promise<ResolvedJoinTarget | string> {
|
||||
if (!params.matchAndRiotId.includes('#')) {
|
||||
return this.resolveJoinTargetWithoutRiotId(params);
|
||||
}
|
||||
|
||||
const riotId = this.parseRiotId(params.matchAndRiotId);
|
||||
if (typeof riotId === 'string') return riotId;
|
||||
|
||||
const objectIdMatch = riotId.gameNameWithOptionalMatchRef.match(
|
||||
/^([a-f0-9]{24})(?:\s+(.+))?$/i,
|
||||
);
|
||||
if (objectIdMatch) {
|
||||
const gameName = normalizeRiotIdPart(objectIdMatch[2] ?? '');
|
||||
if (!gameName) {
|
||||
return '라이엇 ID 형식이 올바르지 않습니다 (예: 프리리#KR1).';
|
||||
}
|
||||
return {
|
||||
matchId: new mongoose.Types.ObjectId(objectIdMatch[1]),
|
||||
gameName,
|
||||
tagLine: riotId.tagLine,
|
||||
};
|
||||
}
|
||||
|
||||
const recruitingMatches = await this.matchService.list({
|
||||
communityId: params.communityId,
|
||||
status: 'recruiting',
|
||||
limit: 50,
|
||||
});
|
||||
if (recruitingMatches.length === 0) {
|
||||
return '모집 중인 내전이 없습니다.';
|
||||
}
|
||||
|
||||
const titleTarget = this.resolveTitleTarget(
|
||||
riotId.gameNameWithOptionalMatchRef,
|
||||
recruitingMatches,
|
||||
);
|
||||
if (titleTarget.kind === 'matched') {
|
||||
return {
|
||||
matchId: titleTarget.match._id,
|
||||
gameName: titleTarget.gameName,
|
||||
tagLine: riotId.tagLine,
|
||||
};
|
||||
}
|
||||
if (titleTarget.kind === 'ambiguous') {
|
||||
return `내전 코드 또는 제목이 여러 개와 겹칩니다 (${titleTarget.titles.join(', ')}). 더 길게 입력하거나 ID를 사용해주세요.`;
|
||||
}
|
||||
|
||||
if (recruitingMatches.length === 1) {
|
||||
return {
|
||||
matchId: recruitingMatches[0]._id,
|
||||
gameName: riotId.gameNameWithOptionalMatchRef,
|
||||
tagLine: riotId.tagLine,
|
||||
};
|
||||
}
|
||||
|
||||
return '모집 중인 내전을 찾을 수 없습니다. !내전 리스트에서 코드 또는 제목을 확인해주세요.';
|
||||
}
|
||||
|
||||
private async resolveJoinTargetWithoutRiotId(
|
||||
params: JoinHandlerParams,
|
||||
): Promise<ResolvedJoinTarget | string> {
|
||||
const reference = params.matchAndRiotId.trim();
|
||||
if (/^[a-f0-9]{24}$/i.test(reference)) {
|
||||
return {
|
||||
matchId: new mongoose.Types.ObjectId(reference),
|
||||
};
|
||||
}
|
||||
|
||||
const recruitingMatches = await this.matchService.list({
|
||||
communityId: params.communityId,
|
||||
status: 'recruiting',
|
||||
limit: 50,
|
||||
});
|
||||
if (recruitingMatches.length === 0) {
|
||||
return '모집 중인 내전이 없습니다.';
|
||||
}
|
||||
|
||||
if (!reference) {
|
||||
if (recruitingMatches.length === 1) {
|
||||
return { matchId: recruitingMatches[0]._id };
|
||||
}
|
||||
return '모집 중인 내전이 여러 개입니다. !내전 일정에서 코드 또는 제목을 확인해주세요.';
|
||||
}
|
||||
|
||||
const result = resolveRecruitingMatchReference(
|
||||
reference,
|
||||
recruitingMatches,
|
||||
);
|
||||
if (result.kind === 'matched') {
|
||||
return { matchId: result.match._id };
|
||||
}
|
||||
if (result.kind === 'ambiguous') {
|
||||
return `내전 코드 또는 제목이 여러 개와 겹칩니다 (${result.titles.join(', ')}). 더 길게 입력하거나 ID를 사용해주세요.`;
|
||||
}
|
||||
return '모집 중인 내전을 찾을 수 없습니다. !내전 일정에서 코드 또는 제목을 확인해주세요.';
|
||||
}
|
||||
|
||||
private parseRiotId(
|
||||
value: string,
|
||||
): { gameNameWithOptionalMatchRef: string; tagLine: string } | string {
|
||||
const hashIndex = value.lastIndexOf('#');
|
||||
if (hashIndex <= 0 || hashIndex === value.length - 1) {
|
||||
return '라이엇 ID 형식이 올바르지 않습니다 (예: 프리리#KR1).';
|
||||
}
|
||||
|
||||
const gameNameWithOptionalMatchRef = normalizeRiotIdPart(
|
||||
value.slice(0, hashIndex),
|
||||
);
|
||||
const tagLine = normalizeRiotIdPart(value.slice(hashIndex + 1));
|
||||
if (!gameNameWithOptionalMatchRef || !tagLine) {
|
||||
return '라이엇 ID 형식이 올바르지 않습니다 (예: 프리리#KR1).';
|
||||
}
|
||||
return { gameNameWithOptionalMatchRef, tagLine };
|
||||
}
|
||||
|
||||
private resolveTitleTarget(
|
||||
value: string,
|
||||
matches: MatchDocument[],
|
||||
):
|
||||
| { kind: 'matched'; match: MatchDocument; gameName: string }
|
||||
| { kind: 'ambiguous'; titles: string[] }
|
||||
| { kind: 'not-found' } {
|
||||
let ambiguousTitles: string[] | null = null;
|
||||
|
||||
for (const splitAt of splitPositionsFromRight(value)) {
|
||||
const matchTitlePrefix = value.slice(0, splitAt).trim();
|
||||
const gameName = normalizeRiotIdPart(value.slice(splitAt + 1));
|
||||
if (!matchTitlePrefix || !gameName) continue;
|
||||
|
||||
const result = resolveRecruitingMatchReference(
|
||||
matchTitlePrefix,
|
||||
matches,
|
||||
);
|
||||
if (result.kind === 'matched') {
|
||||
return { kind: 'matched', match: result.match, gameName };
|
||||
}
|
||||
if (result.kind === 'ambiguous') {
|
||||
ambiguousTitles = result.titles;
|
||||
}
|
||||
}
|
||||
|
||||
return ambiguousTitles
|
||||
? { kind: 'ambiguous', titles: ambiguousTitles }
|
||||
: { kind: 'not-found' };
|
||||
}
|
||||
|
||||
private async resolveRegisteredRiotAccount(
|
||||
params: JoinHandlerParams,
|
||||
): Promise<{ user: UserDocument; riotAccount: RiotAccount } | string> {
|
||||
const user = await this.dakaoUserService.findUserByKakaoTalkId({
|
||||
communityId: params.communityId,
|
||||
kakaoTalkId: params.senderUserId,
|
||||
});
|
||||
if (!user) {
|
||||
return '먼저 !내전 계정등록 <닉네임>#<태그> 로 계정을 등록해주세요.';
|
||||
}
|
||||
|
||||
const riotAccount =
|
||||
user.riotAccounts.find((account) => account.isPrimary) ??
|
||||
user.riotAccounts[0];
|
||||
if (!riotAccount) {
|
||||
return '먼저 !내전 계정등록 <닉네임>#<태그> 로 계정을 등록해주세요.';
|
||||
}
|
||||
|
||||
return { user, riotAccount };
|
||||
}
|
||||
|
||||
private resolvePreferredPositions(
|
||||
inputPositions: Position[] | undefined,
|
||||
registeredPositions: PositionPreference[],
|
||||
): PositionPreference[] | string {
|
||||
if (inputPositions?.length) {
|
||||
return inputPositions.map((position, index) => ({
|
||||
position,
|
||||
priority: index + 1,
|
||||
}));
|
||||
}
|
||||
|
||||
const preferredPositions = [...(registeredPositions ?? [])]
|
||||
.sort((left, right) => left.priority - right.priority)
|
||||
.filter((entry) => entry.position);
|
||||
if (preferredPositions.length < 2) {
|
||||
return '선호포지션을 입력하거나 !내전 선호포지션등록 미드,정글 로 먼저 등록해주세요.';
|
||||
}
|
||||
|
||||
return preferredPositions;
|
||||
}
|
||||
|
||||
private errorReply(
|
||||
params: JoinHandlerParams,
|
||||
message: string,
|
||||
): DakaoSegment[] {
|
||||
return [
|
||||
{
|
||||
kind: 'mention',
|
||||
userId: params.senderUserId,
|
||||
displayText: params.senderNickname,
|
||||
},
|
||||
{ kind: 'text', text: ` ${message}` },
|
||||
];
|
||||
}
|
||||
|
||||
private translateUserError(err: DakaoUserError): string {
|
||||
switch (err.code) {
|
||||
case 'invalid_project_id':
|
||||
return '커뮤니티 식별자가 올바르지 않습니다.';
|
||||
case 'community_not_found':
|
||||
return '연결된 커뮤니티를 찾을 수 없습니다.';
|
||||
case 'riot_account_not_found':
|
||||
return `라이엇 계정을 찾을 수 없습니다 (${err.detail ?? ''}).`;
|
||||
case 'riot_account_already_registered':
|
||||
return `이미 등록된 라이엇 계정이 있습니다 (${err.detail ?? ''}).`;
|
||||
case 'riot_account_conflict':
|
||||
return `이미 다른 사용자가 등록한 라이엇 계정입니다 (${err.detail ?? ''}).`;
|
||||
case 'riot_account_lookup_failed':
|
||||
return '라이엇 계정 조회 중 오류가 발생했습니다. 잠시 후 다시 시도해주세요.';
|
||||
}
|
||||
}
|
||||
|
||||
private translateBadRequest(raw: string): string {
|
||||
if (raw.includes('different communities'))
|
||||
return '이 내전은 현재 채팅방의 커뮤니티 소속이 아닙니다.';
|
||||
if (raw.includes('not recruiting')) return '모집 중인 내전이 아닙니다.';
|
||||
if (raw.includes('full')) return '정원이 가득 찼습니다.';
|
||||
if (raw.includes('already joined')) return '이미 신청한 내전입니다.';
|
||||
return raw;
|
||||
}
|
||||
}
|
||||
|
||||
function splitPositionsFromRight(value: string): number[] {
|
||||
const positions: number[] = [];
|
||||
for (let index = value.length - 1; index >= 0; index -= 1) {
|
||||
if (/\s/.test(value[index])) positions.push(index);
|
||||
}
|
||||
return positions;
|
||||
}
|
||||
@@ -1,122 +0,0 @@
|
||||
import mongoose from 'mongoose';
|
||||
import { MatchService } from '../../match/match.service';
|
||||
import { DakaoUrlShortenerService } from '../dakao-url-shortener.service';
|
||||
import { MatchListHandler } from './match-list.handler';
|
||||
|
||||
const objectId = (hex: string) => new mongoose.Types.ObjectId(hex);
|
||||
|
||||
function makeHandler(params: {
|
||||
matchService: Partial<MatchService>;
|
||||
urlShortener?: Partial<DakaoUrlShortenerService>;
|
||||
}): MatchListHandler {
|
||||
return new MatchListHandler(
|
||||
params.matchService as MatchService,
|
||||
{
|
||||
shortenMatchLink: jest.fn().mockResolvedValue(undefined),
|
||||
buildMatchDetailUrl: jest.fn(
|
||||
(matchId: string) => `https://lolympus.dahyeon.us/match/${matchId}`,
|
||||
),
|
||||
...params.urlShortener,
|
||||
} as unknown as DakaoUrlShortenerService,
|
||||
);
|
||||
}
|
||||
|
||||
describe('MatchListHandler', () => {
|
||||
it('prints short codes, compact KST dates, and short links', async () => {
|
||||
const match = {
|
||||
_id: objectId('333333333333333333333333'),
|
||||
title: '토요 내전',
|
||||
shortCode: 'AB12',
|
||||
participants: [{}, {}],
|
||||
maxParticipants: 10,
|
||||
scheduledAt: new Date('2026-05-02T10:30:00.000Z'),
|
||||
};
|
||||
const matchService = {
|
||||
list: jest.fn().mockResolvedValue([match]),
|
||||
ensureShortCode: jest.fn().mockResolvedValue(match),
|
||||
};
|
||||
const urlShortener = {
|
||||
shortenMatchLink: jest
|
||||
.fn()
|
||||
.mockResolvedValue('https://go.dahyeon.us/lmtpAB12'),
|
||||
};
|
||||
const handler = makeHandler({ matchService, urlShortener });
|
||||
|
||||
const segments = await handler.handle({
|
||||
communityId: objectId('111111111111111111111111'),
|
||||
senderUserId: 'kakao-user-1',
|
||||
senderNickname: '프리리',
|
||||
});
|
||||
|
||||
expect(matchService.ensureShortCode).toHaveBeenCalledWith(match);
|
||||
expect(urlShortener.shortenMatchLink).toHaveBeenCalledWith({
|
||||
matchId: '333333333333333333333333',
|
||||
shortCode: 'AB12',
|
||||
});
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('토요 내전 (2/10) 5/2 19:30'),
|
||||
});
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('코드: AB12'),
|
||||
});
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('링크: https://go.dahyeon.us/lmtpAB12'),
|
||||
});
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.not.stringContaining('2026-05-02'),
|
||||
});
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.not.stringContaining('ID:'),
|
||||
});
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.not.stringContaining('계정등록:'),
|
||||
});
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.not.stringContaining('신청:'),
|
||||
});
|
||||
});
|
||||
|
||||
it('falls back to a direct match detail link when short link creation is skipped', async () => {
|
||||
const match = {
|
||||
_id: objectId('333333333333333333333333'),
|
||||
title: '토요 내전',
|
||||
shortCode: 'AB12',
|
||||
participants: [],
|
||||
maxParticipants: 10,
|
||||
scheduledAt: new Date('2026-05-02T10:30:00.000Z'),
|
||||
};
|
||||
const handler = makeHandler({
|
||||
matchService: {
|
||||
list: jest.fn().mockResolvedValue([match]),
|
||||
ensureShortCode: jest.fn().mockResolvedValue(match),
|
||||
},
|
||||
urlShortener: {
|
||||
shortenMatchLink: jest.fn().mockResolvedValue(undefined),
|
||||
},
|
||||
});
|
||||
|
||||
const segments = await handler.handle({
|
||||
communityId: objectId('111111111111111111111111'),
|
||||
senderUserId: 'kakao-user-1',
|
||||
senderNickname: '프리리',
|
||||
});
|
||||
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('코드: AB12'),
|
||||
});
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining(
|
||||
'링크: https://lolympus.dahyeon.us/match/333333333333333333333333',
|
||||
),
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -1,95 +0,0 @@
|
||||
import { Injectable, Logger } from '@nestjs/common';
|
||||
import mongoose from 'mongoose';
|
||||
import { MatchDocument } from '../../global/database/schema';
|
||||
import { MatchService } from '../../match/match.service';
|
||||
import { DakaoSegment } from '../dakao.types';
|
||||
import { DakaoUrlShortenerService } from '../dakao-url-shortener.service';
|
||||
|
||||
@Injectable()
|
||||
export class MatchListHandler {
|
||||
private readonly logger = new Logger(MatchListHandler.name);
|
||||
|
||||
constructor(
|
||||
private readonly matchService: MatchService,
|
||||
private readonly urlShortener: DakaoUrlShortenerService,
|
||||
) {}
|
||||
|
||||
public async handle(params: {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
senderUserId: string;
|
||||
senderNickname: string;
|
||||
}): Promise<DakaoSegment[]> {
|
||||
const matches = await this.matchService.list({
|
||||
communityId: params.communityId,
|
||||
status: 'recruiting',
|
||||
limit: 10,
|
||||
});
|
||||
|
||||
if (matches.length === 0) {
|
||||
return [
|
||||
{
|
||||
kind: 'mention',
|
||||
userId: params.senderUserId,
|
||||
displayText: params.senderNickname,
|
||||
},
|
||||
{ kind: 'text', text: ' 모집 중인 내전이 없습니다.' },
|
||||
];
|
||||
}
|
||||
|
||||
const matchesWithCodes = await Promise.all(
|
||||
matches.map((match) => this.matchService.ensureShortCode(match)),
|
||||
);
|
||||
|
||||
const lines = await Promise.all(
|
||||
matchesWithCodes.map(async (m, i) => {
|
||||
const filled = m.participants.length;
|
||||
const cap = m.maxParticipants;
|
||||
const time = formatScheduledAt(m.scheduledAt);
|
||||
const shortUrl = await this.createShortUrl(m);
|
||||
const linkLine = shortUrl ? `\n 링크: ${shortUrl}` : '';
|
||||
return `\n${i + 1}. ${m.title} (${filled}/${cap}) ${time}\n 코드: ${m.shortCode}${linkLine}`;
|
||||
}),
|
||||
);
|
||||
|
||||
return [
|
||||
{
|
||||
kind: 'mention',
|
||||
userId: params.senderUserId,
|
||||
displayText: params.senderNickname,
|
||||
},
|
||||
{
|
||||
kind: 'text',
|
||||
text: ` 모집 중인 내전 ${matches.length}건${lines.join('')}`,
|
||||
},
|
||||
];
|
||||
}
|
||||
|
||||
private async createShortUrl(
|
||||
match: MatchDocument,
|
||||
): Promise<string | undefined> {
|
||||
try {
|
||||
const shortUrl = await this.urlShortener.shortenMatchLink({
|
||||
matchId: String(match._id),
|
||||
shortCode: match.shortCode,
|
||||
});
|
||||
return (
|
||||
shortUrl ?? this.urlShortener.buildMatchDetailUrl(String(match._id))
|
||||
);
|
||||
} catch (error) {
|
||||
this.logger.warn(
|
||||
`Failed to create dakao match short URL for match="${String(match._id)}": ${error instanceof Error ? error.message : String(error)}`,
|
||||
);
|
||||
return this.urlShortener.buildMatchDetailUrl(String(match._id));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function formatScheduledAt(date: Date): string {
|
||||
// M/D HH:mm (KST 표기)
|
||||
const kst = new Date(date.getTime() + 9 * 60 * 60 * 1000);
|
||||
const month = kst.getUTCMonth() + 1;
|
||||
const day = kst.getUTCDate();
|
||||
const hh = String(kst.getUTCHours()).padStart(2, '0');
|
||||
const mi = String(kst.getUTCMinutes()).padStart(2, '0');
|
||||
return `${month}/${day} ${hh}:${mi}`;
|
||||
}
|
||||
@@ -1,63 +0,0 @@
|
||||
import type { MatchDocument } from '../../global/database/schema';
|
||||
|
||||
export type MatchReferenceResult =
|
||||
| { kind: 'matched'; match: MatchDocument }
|
||||
| { kind: 'ambiguous'; titles: string[] }
|
||||
| { kind: 'not-found' };
|
||||
|
||||
export function resolveRecruitingMatchReference(
|
||||
reference: string,
|
||||
matches: MatchDocument[],
|
||||
): MatchReferenceResult {
|
||||
const normalizedCode = normalizeShortCode(reference);
|
||||
const codeMatches = matches.filter(
|
||||
(match) =>
|
||||
match.shortCode && normalizeShortCode(match.shortCode) === normalizedCode,
|
||||
);
|
||||
if (codeMatches.length === 1) {
|
||||
return { kind: 'matched', match: codeMatches[0] };
|
||||
}
|
||||
if (codeMatches.length > 1) {
|
||||
return {
|
||||
kind: 'ambiguous',
|
||||
titles: codeMatches.map((match) => match.title),
|
||||
};
|
||||
}
|
||||
|
||||
const normalizedReference = normalizeLookup(reference);
|
||||
const exactMatches = matches.filter(
|
||||
(match) => normalizeLookup(match.title) === normalizedReference,
|
||||
);
|
||||
if (exactMatches.length === 1) {
|
||||
return { kind: 'matched', match: exactMatches[0] };
|
||||
}
|
||||
if (exactMatches.length > 1) {
|
||||
return {
|
||||
kind: 'ambiguous',
|
||||
titles: exactMatches.map((match) => match.title),
|
||||
};
|
||||
}
|
||||
|
||||
const prefixMatches = matches.filter((match) =>
|
||||
normalizeLookup(match.title).startsWith(normalizedReference),
|
||||
);
|
||||
if (prefixMatches.length === 1) {
|
||||
return { kind: 'matched', match: prefixMatches[0] };
|
||||
}
|
||||
if (prefixMatches.length > 1) {
|
||||
return {
|
||||
kind: 'ambiguous',
|
||||
titles: prefixMatches.map((match) => match.title),
|
||||
};
|
||||
}
|
||||
|
||||
return { kind: 'not-found' };
|
||||
}
|
||||
|
||||
function normalizeLookup(value: string): string {
|
||||
return value.normalize('NFC').trim().replace(/\s+/g, ' ').toLowerCase();
|
||||
}
|
||||
|
||||
function normalizeShortCode(value: string): string {
|
||||
return value.normalize('NFC').trim().replace(/\s+/g, '').toUpperCase();
|
||||
}
|
||||
@@ -1,41 +0,0 @@
|
||||
import mongoose from 'mongoose';
|
||||
import { DakaoUserService } from '../dakao-user.service';
|
||||
import { PreferredPositionRegisterHandler } from './preferred-position-register.handler';
|
||||
|
||||
const objectId = (hex: string) => new mongoose.Types.ObjectId(hex);
|
||||
|
||||
describe('PreferredPositionRegisterHandler', () => {
|
||||
it('registers preferred positions for abbreviated joins', async () => {
|
||||
const registerPreferredPositions = jest.fn().mockResolvedValue({
|
||||
preferredPositions: [
|
||||
{ position: 'MID', priority: 1 },
|
||||
{ position: 'JGL', priority: 2 },
|
||||
],
|
||||
});
|
||||
const handler = new PreferredPositionRegisterHandler({
|
||||
registerPreferredPositions,
|
||||
} as unknown as DakaoUserService);
|
||||
|
||||
const segments = await handler.handle({
|
||||
communityId: objectId('111111111111111111111111'),
|
||||
senderUserId: 'kakao-user-1',
|
||||
senderNickname: '프리리',
|
||||
positions: ['MID', 'JGL'],
|
||||
});
|
||||
|
||||
expect(registerPreferredPositions).toHaveBeenCalledWith({
|
||||
communityId: objectId('111111111111111111111111'),
|
||||
kakaoTalkId: 'kakao-user-1',
|
||||
kakaoTalkNickname: '프리리',
|
||||
positions: ['MID', 'JGL'],
|
||||
});
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('선호 포지션 등록 완료'),
|
||||
});
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('!내전 신청 <내전코드>'),
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -1,54 +0,0 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import mongoose from 'mongoose';
|
||||
import { Position } from '../../global/database/schema';
|
||||
import { DakaoSegment } from '../dakao.types';
|
||||
import { DakaoUserService } from '../dakao-user.service';
|
||||
|
||||
const POSITION_LABELS: Record<Position, string> = {
|
||||
TOP: '탑',
|
||||
JGL: '정글',
|
||||
MID: '미드',
|
||||
ADC: '원딜',
|
||||
SUP: '서포터',
|
||||
};
|
||||
|
||||
interface PreferredPositionRegisterHandlerParams {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
senderUserId: string;
|
||||
senderNickname: string;
|
||||
positions: Position[];
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class PreferredPositionRegisterHandler {
|
||||
constructor(private readonly dakaoUserService: DakaoUserService) {}
|
||||
|
||||
public async handle(
|
||||
params: PreferredPositionRegisterHandlerParams,
|
||||
): Promise<DakaoSegment[]> {
|
||||
const user = await this.dakaoUserService.registerPreferredPositions({
|
||||
communityId: params.communityId,
|
||||
kakaoTalkId: params.senderUserId,
|
||||
kakaoTalkNickname: params.senderNickname,
|
||||
positions: params.positions,
|
||||
});
|
||||
|
||||
return [
|
||||
{
|
||||
kind: 'mention',
|
||||
userId: params.senderUserId,
|
||||
displayText: params.senderNickname,
|
||||
},
|
||||
{
|
||||
kind: 'text',
|
||||
text:
|
||||
` 선호 포지션 등록 완료` +
|
||||
`\n포지션: ${user.preferredPositions
|
||||
.sort((left, right) => left.priority - right.priority)
|
||||
.map((entry) => POSITION_LABELS[entry.position])
|
||||
.join(', ')}` +
|
||||
`\n이제 !내전 신청 <내전코드> 로 간단히 신청할 수 있습니다.`,
|
||||
},
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -1,73 +0,0 @@
|
||||
import mongoose from 'mongoose';
|
||||
import { DakaoUserError, DakaoUserService } from '../dakao-user.service';
|
||||
import { PrimaryAccountChangeHandler } from './primary-account-change.handler';
|
||||
|
||||
const objectId = (hex: string) => new mongoose.Types.ObjectId(hex);
|
||||
|
||||
function makeHandler(dakaoUserService?: Partial<DakaoUserService>) {
|
||||
return new PrimaryAccountChangeHandler({
|
||||
changePrimaryRiotAccount: jest.fn(),
|
||||
...dakaoUserService,
|
||||
} as unknown as DakaoUserService);
|
||||
}
|
||||
|
||||
const baseParams = {
|
||||
communityId: objectId('111111111111111111111111'),
|
||||
senderUserId: 'kakao-user-1',
|
||||
senderNickname: '프리리',
|
||||
gameName: '프리리',
|
||||
tagLine: 'KR1',
|
||||
};
|
||||
|
||||
describe('PrimaryAccountChangeHandler', () => {
|
||||
it('changes the primary Riot account through DakaoUserService', async () => {
|
||||
const changePrimaryRiotAccount = jest.fn().mockResolvedValue({
|
||||
user: { _id: objectId('222222222222222222222222') },
|
||||
riotAccount: { gameName: '프리리', tagLine: 'KR1' },
|
||||
});
|
||||
const handler = makeHandler({
|
||||
changePrimaryRiotAccount,
|
||||
});
|
||||
|
||||
const segments = await handler.handle(baseParams);
|
||||
|
||||
expect(changePrimaryRiotAccount).toHaveBeenCalledWith({
|
||||
communityId: baseParams.communityId,
|
||||
kakaoTalkId: 'kakao-user-1',
|
||||
kakaoTalkNickname: '프리리',
|
||||
gameName: '프리리',
|
||||
tagLine: 'KR1',
|
||||
});
|
||||
expect(segments).toEqual([
|
||||
expect.objectContaining({ kind: 'mention', userId: 'kakao-user-1' }),
|
||||
expect.objectContaining({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('대표 계정 변경 완료'),
|
||||
}),
|
||||
]);
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('대표 계정: 프리리#KR1'),
|
||||
});
|
||||
});
|
||||
|
||||
it('asks users to register the Riot account first when not found', async () => {
|
||||
const handler = makeHandler({
|
||||
changePrimaryRiotAccount: jest
|
||||
.fn()
|
||||
.mockRejectedValue(
|
||||
new DakaoUserError('riot_account_not_found', '프리리#KR1'),
|
||||
),
|
||||
});
|
||||
|
||||
const segments = await handler.handle(baseParams);
|
||||
|
||||
expect(segments).toEqual([
|
||||
expect.objectContaining({ kind: 'mention', userId: 'kakao-user-1' }),
|
||||
expect.objectContaining({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('먼저 !내전 계정등록'),
|
||||
}),
|
||||
]);
|
||||
});
|
||||
});
|
||||
@@ -1,81 +0,0 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import mongoose from 'mongoose';
|
||||
import { DakaoSegment } from '../dakao.types';
|
||||
import { DakaoUserError, DakaoUserService } from '../dakao-user.service';
|
||||
|
||||
interface PrimaryAccountChangeHandlerParams {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
senderUserId: string;
|
||||
senderNickname: string;
|
||||
gameName: string;
|
||||
tagLine: string;
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class PrimaryAccountChangeHandler {
|
||||
constructor(private readonly dakaoUserService: DakaoUserService) {}
|
||||
|
||||
public async handle(
|
||||
params: PrimaryAccountChangeHandlerParams,
|
||||
): Promise<DakaoSegment[]> {
|
||||
try {
|
||||
const resolved = await this.dakaoUserService.changePrimaryRiotAccount({
|
||||
communityId: params.communityId,
|
||||
kakaoTalkId: params.senderUserId,
|
||||
kakaoTalkNickname: params.senderNickname,
|
||||
gameName: params.gameName,
|
||||
tagLine: params.tagLine,
|
||||
});
|
||||
|
||||
return [
|
||||
{
|
||||
kind: 'mention',
|
||||
userId: params.senderUserId,
|
||||
displayText: params.senderNickname,
|
||||
},
|
||||
{
|
||||
kind: 'text',
|
||||
text:
|
||||
` 대표 계정 변경 완료` +
|
||||
`\n대표 계정: ${resolved.riotAccount.gameName}#${resolved.riotAccount.tagLine}`,
|
||||
},
|
||||
];
|
||||
} catch (err) {
|
||||
if (err instanceof DakaoUserError) {
|
||||
return this.errorReply(params, this.translateUserError(err));
|
||||
}
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
private errorReply(
|
||||
params: PrimaryAccountChangeHandlerParams,
|
||||
message: string,
|
||||
): DakaoSegment[] {
|
||||
return [
|
||||
{
|
||||
kind: 'mention',
|
||||
userId: params.senderUserId,
|
||||
displayText: params.senderNickname,
|
||||
},
|
||||
{ kind: 'text', text: ` ${message}` },
|
||||
];
|
||||
}
|
||||
|
||||
private translateUserError(err: DakaoUserError): string {
|
||||
switch (err.code) {
|
||||
case 'invalid_project_id':
|
||||
return '커뮤니티 식별자가 올바르지 않습니다.';
|
||||
case 'community_not_found':
|
||||
return '연결된 커뮤니티를 찾을 수 없습니다.';
|
||||
case 'riot_account_not_found':
|
||||
return `등록된 라이엇 계정을 찾을 수 없습니다 (${err.detail ?? ''}). 먼저 !내전 계정등록 <닉네임>#<태그> 로 계정을 등록해주세요.`;
|
||||
case 'riot_account_already_registered':
|
||||
return `이미 등록된 라이엇 계정이 있습니다 (${err.detail ?? ''}).`;
|
||||
case 'riot_account_conflict':
|
||||
return `이미 다른 사용자가 등록한 라이엇 계정입니다 (${err.detail ?? ''}).`;
|
||||
case 'riot_account_lookup_failed':
|
||||
return '라이엇 계정 조회 중 오류가 발생했습니다. 잠시 후 다시 시도해주세요.';
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,35 +0,0 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
|
||||
const TTL_MS = 5 * 60 * 1000;
|
||||
const MAX_ENTRIES = 5000;
|
||||
|
||||
@Injectable()
|
||||
export class IdempotencyCache {
|
||||
private readonly entries = new Map<string, number>();
|
||||
|
||||
public has(key: string): boolean {
|
||||
const expiresAt = this.entries.get(key);
|
||||
if (expiresAt === undefined) return false;
|
||||
if (expiresAt < Date.now()) {
|
||||
this.entries.delete(key);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public remember(key: string): void {
|
||||
this.evictExpired();
|
||||
if (this.entries.size >= MAX_ENTRIES) {
|
||||
const oldestKey = this.entries.keys().next().value;
|
||||
if (oldestKey !== undefined) this.entries.delete(oldestKey);
|
||||
}
|
||||
this.entries.set(key, Date.now() + TTL_MS);
|
||||
}
|
||||
|
||||
private evictExpired(): void {
|
||||
const now = Date.now();
|
||||
for (const [key, expiresAt] of this.entries) {
|
||||
if (expiresAt < now) this.entries.delete(key);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,189 +0,0 @@
|
||||
import { CommandParseError, parseCommand } from './command.parser';
|
||||
|
||||
describe('parseCommand', () => {
|
||||
it('parses match-list command (목록)', () => {
|
||||
expect(parseCommand('!내전 목록')).toEqual({ kind: 'match-list' });
|
||||
});
|
||||
|
||||
it('parses match-list command (리스트)', () => {
|
||||
expect(parseCommand('!내전 리스트')).toEqual({ kind: 'match-list' });
|
||||
});
|
||||
|
||||
it('parses match-list command (일정)', () => {
|
||||
expect(parseCommand('!내전 일정')).toEqual({ kind: 'match-list' });
|
||||
});
|
||||
|
||||
it('parses match-join command with simple riot id', () => {
|
||||
const result = parseCommand(
|
||||
'!내전 신청 69b63bc96da18dfdb218ee8c 프리리#KR1 미드,탑',
|
||||
);
|
||||
expect(result).toMatchObject({
|
||||
kind: 'match-join',
|
||||
matchAndRiotId: '69b63bc96da18dfdb218ee8c 프리리#KR1',
|
||||
});
|
||||
if (result.kind === 'match-join') {
|
||||
expect(result.positions.positions).toEqual(['MID', 'TOP']);
|
||||
}
|
||||
});
|
||||
|
||||
it('handles riot game name with spaces', () => {
|
||||
const result = parseCommand(
|
||||
'!내전 신청 69b63bc96da18dfdb218ee8c hello world#KR1 미드,서폿',
|
||||
);
|
||||
expect(result).toMatchObject({
|
||||
kind: 'match-join',
|
||||
matchAndRiotId: '69b63bc96da18dfdb218ee8c hello world#KR1',
|
||||
});
|
||||
});
|
||||
|
||||
it('parses hidden unicode differences in riot id input', () => {
|
||||
const decomposedGameName = '프리리'.normalize('NFD');
|
||||
const result = parseCommand(
|
||||
`!내전 신청 69b63bc96da18dfdb218ee8c ${decomposedGameName}\u200B#KR1\uFEFF 미드,탑`,
|
||||
);
|
||||
|
||||
expect(result).toMatchObject({
|
||||
kind: 'match-join',
|
||||
matchAndRiotId: `69b63bc96da18dfdb218ee8c ${decomposedGameName}\u200B#KR1`,
|
||||
});
|
||||
});
|
||||
|
||||
it('parses match-join command without explicit match id', () => {
|
||||
const result = parseCommand('!내전 신청 프리리#KR1 미드,탑');
|
||||
expect(result).toMatchObject({
|
||||
kind: 'match-join',
|
||||
matchAndRiotId: '프리리#KR1',
|
||||
});
|
||||
});
|
||||
|
||||
it('parses match-join command with title prefix', () => {
|
||||
const result = parseCommand('!내전 신청 저녁 프리리#KR1 미드,탑');
|
||||
expect(result).toMatchObject({
|
||||
kind: 'match-join',
|
||||
matchAndRiotId: '저녁 프리리#KR1',
|
||||
});
|
||||
});
|
||||
|
||||
it('parses abbreviated match-join command with only match code', () => {
|
||||
expect(parseCommand('!내전 신청 cab1')).toEqual({
|
||||
kind: 'match-join',
|
||||
matchAndRiotId: 'cab1',
|
||||
});
|
||||
});
|
||||
|
||||
it('parses match-join command with registered account and explicit positions', () => {
|
||||
const result = parseCommand('!내전 신청 cab1 미드,서포터');
|
||||
expect(result).toMatchObject({
|
||||
kind: 'match-join',
|
||||
matchAndRiotId: 'cab1',
|
||||
});
|
||||
if (result.kind === 'match-join') {
|
||||
expect(result.positions?.positions).toEqual(['MID', 'SUP']);
|
||||
}
|
||||
});
|
||||
|
||||
it('parses preferred position registration command', () => {
|
||||
const result = parseCommand('!내전 선호포지션등록 미드,SPT');
|
||||
expect(result).toMatchObject({
|
||||
kind: 'preferred-position-register',
|
||||
});
|
||||
if (result.kind === 'preferred-position-register') {
|
||||
expect(result.positions.positions).toEqual(['MID', 'SUP']);
|
||||
}
|
||||
});
|
||||
|
||||
it('parses match-cancel command (취소)', () => {
|
||||
expect(parseCommand('!내전 취소 69b63bc96da18dfdb218ee8c')).toEqual({
|
||||
kind: 'match-cancel',
|
||||
matchId: '69b63bc96da18dfdb218ee8c',
|
||||
});
|
||||
});
|
||||
|
||||
it('parses match-cancel command (참가취소)', () => {
|
||||
expect(parseCommand('!내전 참가취소 69b63bc96da18dfdb218ee8c')).toEqual({
|
||||
kind: 'match-cancel',
|
||||
matchId: '69b63bc96da18dfdb218ee8c',
|
||||
});
|
||||
});
|
||||
|
||||
it('parses match-cancel command with short code', () => {
|
||||
expect(parseCommand('!내전 취소 AB12')).toEqual({
|
||||
kind: 'match-cancel',
|
||||
matchId: 'AB12',
|
||||
});
|
||||
});
|
||||
|
||||
it('parses account register command', () => {
|
||||
expect(parseCommand('!내전 계정등록 hello world#KR1')).toEqual({
|
||||
kind: 'account-register',
|
||||
gameName: 'hello world',
|
||||
tagLine: 'KR1',
|
||||
});
|
||||
});
|
||||
|
||||
it('parses primary account change command', () => {
|
||||
expect(parseCommand('!내전 대표계정변경 프리리#KR1')).toEqual({
|
||||
kind: 'primary-account-change',
|
||||
gameName: '프리리',
|
||||
tagLine: 'KR1',
|
||||
});
|
||||
});
|
||||
|
||||
it('normalizes primary account change riot id', () => {
|
||||
const decomposedGameName = '프리리'.normalize('NFD');
|
||||
expect(
|
||||
parseCommand(`!내전 대표계정변경 ${decomposedGameName}\u200B#KR1\uFEFF`),
|
||||
).toEqual({
|
||||
kind: 'primary-account-change',
|
||||
gameName: '프리리',
|
||||
tagLine: 'KR1',
|
||||
});
|
||||
});
|
||||
|
||||
it('normalizes account register riot id', () => {
|
||||
const decomposedGameName = '프리리'.normalize('NFD');
|
||||
expect(
|
||||
parseCommand(`!내전 계정등록 ${decomposedGameName}\u200B#KR1\uFEFF`),
|
||||
).toEqual({
|
||||
kind: 'account-register',
|
||||
gameName: '프리리',
|
||||
tagLine: 'KR1',
|
||||
});
|
||||
});
|
||||
|
||||
it('throws not_a_command for non-prefix messages', () => {
|
||||
expect(() => parseCommand('안녕하세요')).toThrow(/not_a_command/);
|
||||
});
|
||||
|
||||
it('throws usage for bare command prefix', () => {
|
||||
expect(() => parseCommand('!내전')).toThrow(/usage/);
|
||||
});
|
||||
|
||||
it('throws unknown_command for unrecognized subcommands', () => {
|
||||
expect(() => parseCommand('!내전 폭파')).toThrow(/unknown_command/);
|
||||
});
|
||||
|
||||
it('allows non-objectid join match reference for title matching', () => {
|
||||
expect(
|
||||
parseCommand('!내전 신청 not-an-id 프리리#KR1 미드,탑'),
|
||||
).toMatchObject({
|
||||
kind: 'match-join',
|
||||
matchAndRiotId: 'not-an-id 프리리#KR1',
|
||||
});
|
||||
});
|
||||
|
||||
it('allows match-join without riot id for registered-account flow', () => {
|
||||
expect(
|
||||
parseCommand('!내전 신청 69b63bc96da18dfdb218ee8c 미드,탑'),
|
||||
).toMatchObject({
|
||||
kind: 'match-join',
|
||||
matchAndRiotId: '69b63bc96da18dfdb218ee8c',
|
||||
});
|
||||
});
|
||||
|
||||
it('throws invalid_position for too few positions', () => {
|
||||
expect(() => {
|
||||
parseCommand('!내전 신청 69b63bc96da18dfdb218ee8c 프리리#KR1 미드');
|
||||
}).toThrow(CommandParseError);
|
||||
});
|
||||
});
|
||||
@@ -1,202 +0,0 @@
|
||||
import {
|
||||
ParsedPositions,
|
||||
isPositionAlias,
|
||||
parsePositionList,
|
||||
} from './position.parser';
|
||||
import { normalizeRiotIdPart } from '../riot-id.util';
|
||||
|
||||
export type DakaoCommand =
|
||||
| { kind: 'match-list' }
|
||||
| {
|
||||
kind: 'account-register';
|
||||
gameName: string;
|
||||
tagLine: string;
|
||||
}
|
||||
| {
|
||||
kind: 'primary-account-change';
|
||||
gameName: string;
|
||||
tagLine: string;
|
||||
}
|
||||
| {
|
||||
kind: 'match-join';
|
||||
matchAndRiotId: string;
|
||||
positions?: ParsedPositions;
|
||||
}
|
||||
| {
|
||||
kind: 'match-cancel';
|
||||
matchId: string;
|
||||
}
|
||||
| {
|
||||
kind: 'preferred-position-register';
|
||||
positions: ParsedPositions;
|
||||
};
|
||||
|
||||
export class CommandParseError extends Error {
|
||||
constructor(
|
||||
public readonly code:
|
||||
| 'not_a_command'
|
||||
| 'unknown_command'
|
||||
| 'usage'
|
||||
| 'invalid_riot_id'
|
||||
| 'invalid_position'
|
||||
| 'invalid_match_id',
|
||||
public readonly detail?: string,
|
||||
) {
|
||||
super(`Command parse error: ${code}${detail ? ` (${detail})` : ''}`);
|
||||
}
|
||||
}
|
||||
|
||||
const COMMAND_PREFIX = '!내전';
|
||||
|
||||
export function parseCommand(rawMessage: string): DakaoCommand {
|
||||
const message = rawMessage.trim();
|
||||
if (!message.startsWith(COMMAND_PREFIX)) {
|
||||
throw new CommandParseError('not_a_command');
|
||||
}
|
||||
|
||||
const rest = message.slice(COMMAND_PREFIX.length).trim();
|
||||
if (rest.length === 0) {
|
||||
throw new CommandParseError('usage');
|
||||
}
|
||||
|
||||
const firstSpace = rest.search(/\s/);
|
||||
const subCommand = firstSpace === -1 ? rest : rest.slice(0, firstSpace);
|
||||
const args = firstSpace === -1 ? '' : rest.slice(firstSpace + 1).trim();
|
||||
|
||||
switch (subCommand) {
|
||||
case '목록':
|
||||
case '리스트':
|
||||
case '일정':
|
||||
return { kind: 'match-list' };
|
||||
case '신청':
|
||||
return parseJoinArgs(args);
|
||||
case '취소':
|
||||
case '참가취소':
|
||||
return parseCancelArgs(args);
|
||||
case '계정등록':
|
||||
return parseAccountRegisterArgs(args);
|
||||
case '대표계정변경':
|
||||
return parsePrimaryAccountChangeArgs(args);
|
||||
case '선호포지션등록':
|
||||
case '포지션등록':
|
||||
return parsePreferredPositionRegisterArgs(args);
|
||||
default:
|
||||
throw new CommandParseError('unknown_command', subCommand);
|
||||
}
|
||||
}
|
||||
|
||||
function parseAccountRegisterArgs(args: string): DakaoCommand {
|
||||
const riotId = parseRiotIdArgs(args);
|
||||
return {
|
||||
kind: 'account-register',
|
||||
gameName: riotId.gameName,
|
||||
tagLine: riotId.tagLine,
|
||||
};
|
||||
}
|
||||
|
||||
function parsePrimaryAccountChangeArgs(args: string): DakaoCommand {
|
||||
const riotId = parseRiotIdArgs(args);
|
||||
return {
|
||||
kind: 'primary-account-change',
|
||||
gameName: riotId.gameName,
|
||||
tagLine: riotId.tagLine,
|
||||
};
|
||||
}
|
||||
|
||||
function parseRiotIdArgs(args: string): { gameName: string; tagLine: string } {
|
||||
if (args.length === 0) {
|
||||
throw new CommandParseError('usage');
|
||||
}
|
||||
|
||||
const hashIndex = args.lastIndexOf('#');
|
||||
if (hashIndex <= 0 || hashIndex === args.length - 1) {
|
||||
throw new CommandParseError('invalid_riot_id', args);
|
||||
}
|
||||
|
||||
const gameName = normalizeRiotIdPart(args.slice(0, hashIndex));
|
||||
const tagLine = normalizeRiotIdPart(args.slice(hashIndex + 1));
|
||||
if (gameName.length === 0 || tagLine.length === 0) {
|
||||
throw new CommandParseError('invalid_riot_id', args);
|
||||
}
|
||||
|
||||
return { gameName, tagLine };
|
||||
}
|
||||
|
||||
function parseCancelArgs(args: string): DakaoCommand {
|
||||
const matchId = args.trim();
|
||||
if (matchId.length === 0) {
|
||||
throw new CommandParseError('usage');
|
||||
}
|
||||
|
||||
return {
|
||||
kind: 'match-cancel',
|
||||
matchId,
|
||||
};
|
||||
}
|
||||
|
||||
function parseJoinArgs(args: string): DakaoCommand {
|
||||
const trimmed = args.trim();
|
||||
if (trimmed.length === 0) {
|
||||
return { kind: 'match-join', matchAndRiotId: '' };
|
||||
}
|
||||
|
||||
// 마지막 토큰이 포지션 리스트(쉼표 포함). 그 앞은 내전 식별자(선택)와 라이엇 ID.
|
||||
// 형식: [<matchId|title...>] <gameName...>#<tagLine> <pos1>,<pos2>...
|
||||
// 끝에서부터 토큰을 분리해 안정적으로 파싱한다.
|
||||
const lastSpace = trimmed.lastIndexOf(' ');
|
||||
if (lastSpace === -1) {
|
||||
const singlePartPositions = tryParseTrailingPositions(trimmed);
|
||||
if (singlePartPositions) {
|
||||
return {
|
||||
kind: 'match-join',
|
||||
matchAndRiotId: '',
|
||||
positions: singlePartPositions,
|
||||
};
|
||||
}
|
||||
return { kind: 'match-join', matchAndRiotId: trimmed };
|
||||
}
|
||||
|
||||
const trailingPart = trimmed.slice(lastSpace + 1).trim();
|
||||
const matchAndRiotId = trimmed.slice(0, lastSpace).trim();
|
||||
const positions = tryParseTrailingPositions(trailingPart);
|
||||
if (positions) {
|
||||
if (!matchAndRiotId) throw new CommandParseError('usage');
|
||||
return {
|
||||
kind: 'match-join',
|
||||
matchAndRiotId,
|
||||
positions,
|
||||
};
|
||||
}
|
||||
|
||||
return {
|
||||
kind: 'match-join',
|
||||
matchAndRiotId: trimmed,
|
||||
};
|
||||
}
|
||||
|
||||
function parsePreferredPositionRegisterArgs(args: string): DakaoCommand {
|
||||
if (args.trim().length === 0) {
|
||||
throw new CommandParseError('usage');
|
||||
}
|
||||
|
||||
return {
|
||||
kind: 'preferred-position-register',
|
||||
positions: parsePositionsOrThrow(args),
|
||||
};
|
||||
}
|
||||
|
||||
function tryParseTrailingPositions(input: string): ParsedPositions | undefined {
|
||||
if (!input.includes(',') && !isPositionAlias(input)) return undefined;
|
||||
return parsePositionsOrThrow(input);
|
||||
}
|
||||
|
||||
function parsePositionsOrThrow(input: string): ParsedPositions {
|
||||
try {
|
||||
return parsePositionList(input);
|
||||
} catch (err) {
|
||||
throw new CommandParseError(
|
||||
'invalid_position',
|
||||
(err as Error)?.message ?? input,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,41 +0,0 @@
|
||||
import { parsePositionList, PositionParseError } from './position.parser';
|
||||
|
||||
describe('parsePositionList', () => {
|
||||
it('parses two korean positions in priority order', () => {
|
||||
const result = parsePositionList('미드,탑');
|
||||
expect(result.positions).toEqual(['MID', 'TOP']);
|
||||
});
|
||||
|
||||
it('parses english aliases case-insensitively', () => {
|
||||
const result = parsePositionList('JGL, SPT');
|
||||
expect(result.positions).toEqual(['JGL', 'SUP']);
|
||||
});
|
||||
|
||||
it('accepts up to 5 distinct positions', () => {
|
||||
const result = parsePositionList('탑,정글,미드,원딜,서폿');
|
||||
expect(result.positions).toEqual(['TOP', 'JGL', 'MID', 'ADC', 'SUP']);
|
||||
});
|
||||
|
||||
it('rejects when fewer than 2 positions', () => {
|
||||
expect(() => parsePositionList('미드')).toThrow(PositionParseError);
|
||||
expect(() => parsePositionList('미드')).toThrow(/too_few/);
|
||||
});
|
||||
|
||||
it('rejects when more than 5 positions', () => {
|
||||
expect(() => parsePositionList('탑,정글,미드,원딜,서폿,바텀')).toThrow(
|
||||
/too_many/,
|
||||
);
|
||||
});
|
||||
|
||||
it('rejects duplicates after alias normalization', () => {
|
||||
expect(() => parsePositionList('미드,mid')).toThrow(/duplicate/);
|
||||
});
|
||||
|
||||
it('rejects unknown tokens', () => {
|
||||
expect(() => parsePositionList('미드,캐리')).toThrow(/unknown/);
|
||||
});
|
||||
|
||||
it('rejects empty input', () => {
|
||||
expect(() => parsePositionList('')).toThrow(/empty/);
|
||||
});
|
||||
});
|
||||
@@ -1,97 +0,0 @@
|
||||
import { Position } from '../../global/database/schema';
|
||||
|
||||
const POSITION_ALIASES: Record<string, Position> = {
|
||||
// TOP
|
||||
top: 'TOP',
|
||||
탑: 'TOP',
|
||||
top레인: 'TOP',
|
||||
// JUNGLE
|
||||
jgl: 'JGL',
|
||||
jungle: 'JGL',
|
||||
jng: 'JGL',
|
||||
jg: 'JGL',
|
||||
정글: 'JGL',
|
||||
정글러: 'JGL',
|
||||
// MID
|
||||
mid: 'MID',
|
||||
middle: 'MID',
|
||||
미드: 'MID',
|
||||
// ADC (BOTTOM)
|
||||
adc: 'ADC',
|
||||
ad: 'ADC',
|
||||
bot: 'ADC',
|
||||
bottom: 'ADC',
|
||||
원딜: 'ADC',
|
||||
바텀: 'ADC',
|
||||
// SUP
|
||||
sup: 'SUP',
|
||||
supp: 'SUP',
|
||||
spt: 'SUP',
|
||||
sp: 'SUP',
|
||||
support: 'SUP',
|
||||
서폿: 'SUP',
|
||||
서포터: 'SUP',
|
||||
};
|
||||
|
||||
export interface ParsedPositions {
|
||||
positions: Position[];
|
||||
}
|
||||
|
||||
export class PositionParseError extends Error {
|
||||
constructor(
|
||||
public readonly reason:
|
||||
| 'too_few'
|
||||
| 'too_many'
|
||||
| 'duplicate'
|
||||
| 'unknown'
|
||||
| 'empty',
|
||||
public readonly token?: string,
|
||||
) {
|
||||
super(`Position parse error: ${reason}${token ? ` (${token})` : ''}`);
|
||||
}
|
||||
}
|
||||
|
||||
export function parsePositionList(input: string): ParsedPositions {
|
||||
const trimmed = input.trim();
|
||||
if (trimmed.length === 0) {
|
||||
throw new PositionParseError('empty');
|
||||
}
|
||||
|
||||
const tokens = trimmed
|
||||
.split(',')
|
||||
.map((t) => t.trim())
|
||||
.filter((t) => t.length > 0);
|
||||
|
||||
if (tokens.length < 2) {
|
||||
throw new PositionParseError('too_few');
|
||||
}
|
||||
if (tokens.length > 5) {
|
||||
throw new PositionParseError('too_many');
|
||||
}
|
||||
|
||||
const positions: Position[] = [];
|
||||
const seen = new Set<Position>();
|
||||
|
||||
for (const token of tokens) {
|
||||
const key = normalizePositionAlias(token);
|
||||
const mapped = POSITION_ALIASES[key];
|
||||
if (!mapped) {
|
||||
throw new PositionParseError('unknown', token);
|
||||
}
|
||||
if (seen.has(mapped)) {
|
||||
throw new PositionParseError('duplicate', token);
|
||||
}
|
||||
seen.add(mapped);
|
||||
positions.push(mapped);
|
||||
}
|
||||
|
||||
return { positions };
|
||||
}
|
||||
|
||||
export function isPositionAlias(input: string): boolean {
|
||||
return Boolean(POSITION_ALIASES[normalizePositionAlias(input)]);
|
||||
}
|
||||
|
||||
function normalizePositionAlias(input: string): string {
|
||||
return input.toLowerCase().replace(/\s+/g, '');
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
const ZERO_WIDTH_CHARACTERS = /[\u200B-\u200D\uFEFF]/g;
|
||||
|
||||
export function normalizeRiotIdPart(value: string): string {
|
||||
return value.replace(ZERO_WIDTH_CHARACTERS, '').trim().normalize('NFC');
|
||||
}
|
||||
|
||||
export function formatCodePoints(value: string): string {
|
||||
return Array.from(value)
|
||||
.map((char) => {
|
||||
const codePoint = char.codePointAt(0);
|
||||
return `U+${codePoint?.toString(16).toUpperCase().padStart(4, '0')}`;
|
||||
})
|
||||
.join(' ');
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
import { resolveMongoDbName } from './connection.service';
|
||||
|
||||
describe('resolveMongoDbName', () => {
|
||||
it('uses production database only for prod', () => {
|
||||
expect(resolveMongoDbName('prod')).toBe('lolympus');
|
||||
});
|
||||
|
||||
it('uses isolated databases for non-production environments', () => {
|
||||
expect(resolveMongoDbName('dev')).toBe('lolympus-dev');
|
||||
expect(resolveMongoDbName('staging')).toBe('lolympus-staging');
|
||||
expect(resolveMongoDbName('')).toBe('lolympus-dev');
|
||||
expect(resolveMongoDbName('local')).toBe('lolympus-dev');
|
||||
});
|
||||
});
|
||||
@@ -1,20 +1,14 @@
|
||||
import { Injectable, Scope, OnModuleInit } from '@nestjs/common';
|
||||
import mongoose from 'mongoose';
|
||||
import { SecretService } from '../secret/secret.service';
|
||||
import { tournamentModelDefinitions, TournamentModelTypes } from './schema';
|
||||
|
||||
export function resolveMongoDbName(nodeEnv = process.env.NODE_ENV): string {
|
||||
if (nodeEnv === 'prod') return 'lolympus';
|
||||
if (nodeEnv === 'staging') return 'lolympus-staging';
|
||||
return 'lolympus-dev';
|
||||
}
|
||||
import { moeumModelDefinitions, MoeumModelTypes } from './schema';
|
||||
|
||||
@Injectable({ scope: Scope.DEFAULT })
|
||||
export class ConnectionService implements OnModuleInit {
|
||||
private connection: mongoose.Connection | null = null;
|
||||
constructor(private readonly secretService: SecretService) {}
|
||||
|
||||
private tournamentModels: Map<string, mongoose.Model<any>> | null = null;
|
||||
private moeumModels: Map<string, mongoose.Model<any>> | null = null;
|
||||
|
||||
public async getConnection(): Promise<mongoose.Connection> {
|
||||
if (this.connection !== null && this.connection.readyState === 1) {
|
||||
@@ -24,32 +18,32 @@ export class ConnectionService implements OnModuleInit {
|
||||
const connectionString = await this.secretService.get(
|
||||
'MONGODB_CONNECTION_STRING',
|
||||
);
|
||||
const dbName = resolveMongoDbName();
|
||||
const defaultConnection = await mongoose
|
||||
.createConnection(connectionString, {
|
||||
dbName,
|
||||
dbName: 'moeum',
|
||||
minPoolSize: 10,
|
||||
maxPoolSize: 20,
|
||||
})
|
||||
.asPromise();
|
||||
this.connection = defaultConnection;
|
||||
console.log(`Default Connection이 새로 생성됨. dbName=${dbName}`);
|
||||
console.log('Default Connection이 새로 생성됨.');
|
||||
|
||||
return this.connection;
|
||||
}
|
||||
|
||||
public async getModel<K extends keyof TournamentModelTypes>(
|
||||
public async getMoeumModels<K extends keyof MoeumModelTypes>(
|
||||
modelKey: K,
|
||||
): Promise<mongoose.Model<TournamentModelTypes[K]>> {
|
||||
if (this.tournamentModels)
|
||||
return this.tournamentModels.get(modelKey) as mongoose.Model<
|
||||
TournamentModelTypes[K]
|
||||
): Promise<mongoose.Model<MoeumModelTypes[K]>> {
|
||||
if (this.moeumModels)
|
||||
return this.moeumModels.get(modelKey) as mongoose.Model<
|
||||
MoeumModelTypes[K]
|
||||
>;
|
||||
|
||||
const models = new Map<K, mongoose.Model<TournamentModelTypes[K]>>();
|
||||
const moeumModels = new Map<K, mongoose.Model<MoeumModelTypes[K]>>();
|
||||
// const connection = await this.getTenantConnection(tenantId);
|
||||
const connection = await this.getConnection();
|
||||
|
||||
tournamentModelDefinitions.forEach((modelDefinition) => {
|
||||
moeumModelDefinitions.forEach((modelDefinition) => {
|
||||
// 이미 생성된 경우 컴파일 스킵.
|
||||
if (
|
||||
Object.prototype.hasOwnProperty.call(
|
||||
@@ -57,15 +51,15 @@ export class ConnectionService implements OnModuleInit {
|
||||
modelDefinition.name,
|
||||
)
|
||||
) {
|
||||
models.set(
|
||||
moeumModels.set(
|
||||
modelDefinition.name as K,
|
||||
connection.models[modelDefinition.name],
|
||||
);
|
||||
return;
|
||||
} else {
|
||||
models.set(
|
||||
moeumModels.set(
|
||||
modelDefinition.name as K,
|
||||
connection.model<TournamentModelTypes[K]>(
|
||||
connection.model<MoeumModelTypes[K]>(
|
||||
modelDefinition.name,
|
||||
modelDefinition.schema,
|
||||
modelDefinition.schemaName,
|
||||
@@ -74,8 +68,8 @@ export class ConnectionService implements OnModuleInit {
|
||||
}
|
||||
});
|
||||
|
||||
this.tournamentModels = models;
|
||||
return models.get(modelKey) as mongoose.Model<TournamentModelTypes[K]>;
|
||||
this.moeumModels = moeumModels;
|
||||
return moeumModels.get(modelKey) as mongoose.Model<MoeumModelTypes[K]>;
|
||||
}
|
||||
|
||||
public async createSession(
|
||||
|
||||
@@ -1,102 +0,0 @@
|
||||
import { NestFactory } from '@nestjs/core';
|
||||
import mongoose from 'mongoose';
|
||||
import { AppModule } from '../../../../app.module';
|
||||
import { ConnectionService } from '../connection.service';
|
||||
import { MatchStatsService } from '../../../community-stats/match-stats.service';
|
||||
|
||||
interface Options {
|
||||
communityId?: mongoose.Types.ObjectId;
|
||||
dryRun: boolean;
|
||||
force: boolean;
|
||||
}
|
||||
|
||||
async function main() {
|
||||
const options = parseArgs(process.argv.slice(2));
|
||||
const app = await NestFactory.createApplicationContext(AppModule, {
|
||||
logger: ['log', 'warn', 'error'],
|
||||
});
|
||||
|
||||
try {
|
||||
const connectionService = app.get(ConnectionService);
|
||||
const matchStatsService = app.get(MatchStatsService);
|
||||
const MatchModel = await connectionService.getModel('match');
|
||||
const MatchStatsModel = await connectionService.getModel('matchStats');
|
||||
|
||||
const filter: Record<string, unknown> = {
|
||||
status: { $in: ['finished', 'in-progress'] },
|
||||
'result.games.0': { $exists: true },
|
||||
};
|
||||
if (options.communityId) filter.communityId = options.communityId;
|
||||
|
||||
const matches = await MatchModel.find(filter)
|
||||
.sort({ scheduledAt: -1 })
|
||||
.select({ _id: 1 })
|
||||
.exec();
|
||||
console.log(`match_stats backfill target=${matches.length}`);
|
||||
|
||||
let processed = 0;
|
||||
let skipped = 0;
|
||||
let failed = 0;
|
||||
|
||||
for (const match of matches) {
|
||||
if (!options.force) {
|
||||
const existing = await MatchStatsModel.exists({ matchId: match._id });
|
||||
if (existing) {
|
||||
skipped += 1;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
if (options.dryRun) {
|
||||
processed += 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
try {
|
||||
await matchStatsService.buildAndUpsert(match._id);
|
||||
processed += 1;
|
||||
} catch (error) {
|
||||
failed += 1;
|
||||
console.warn(
|
||||
`failed ${match._id.toString()}: ${
|
||||
error instanceof Error ? error.message : error
|
||||
}`,
|
||||
);
|
||||
}
|
||||
|
||||
if ((processed + skipped + failed) % 50 === 0) {
|
||||
console.log(
|
||||
`progress processed=${processed} skipped=${skipped} failed=${failed}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
console.log(
|
||||
`done processed=${processed} skipped=${skipped} failed=${failed}`,
|
||||
);
|
||||
} finally {
|
||||
await app.close();
|
||||
}
|
||||
}
|
||||
|
||||
function parseArgs(args: string[]): Options {
|
||||
const options: Options = { dryRun: false, force: false };
|
||||
for (let index = 0; index < args.length; index += 1) {
|
||||
const arg = args[index];
|
||||
if (arg === '--dry-run') options.dryRun = true;
|
||||
if (arg === '--force') options.force = true;
|
||||
if (arg === '--community-id') {
|
||||
const value = args[index + 1];
|
||||
if (!value || !mongoose.isValidObjectId(value)) {
|
||||
throw new Error('--community-id requires a valid ObjectId');
|
||||
}
|
||||
options.communityId = new mongoose.Types.ObjectId(value);
|
||||
index += 1;
|
||||
}
|
||||
}
|
||||
return options;
|
||||
}
|
||||
|
||||
void main().catch((error) => {
|
||||
console.error(error);
|
||||
process.exit(1);
|
||||
});
|
||||
@@ -1,574 +0,0 @@
|
||||
import 'reflect-metadata';
|
||||
import { Module } from '@nestjs/common';
|
||||
import { ConfigModule } from '@nestjs/config';
|
||||
import { NestFactory } from '@nestjs/core';
|
||||
import mongoose from 'mongoose';
|
||||
import { readFile } from 'node:fs/promises';
|
||||
import { resolve } from 'node:path';
|
||||
import { ConnectionService, resolveMongoDbName } from '../connection.service';
|
||||
import type {
|
||||
MatchGameResult,
|
||||
MatchParticipant,
|
||||
MatchSeriesResult,
|
||||
MatchTeam,
|
||||
Position,
|
||||
PositionPreference,
|
||||
TeamSide,
|
||||
TierInfo,
|
||||
} from '../schema';
|
||||
import { SecretModule } from '../../secret/secret.module';
|
||||
|
||||
const TEMP_JOB_ID = 'temp-finished-30-players-6-teams';
|
||||
const TEAM_COUNT = 6;
|
||||
const TEAM_SIZE = 5;
|
||||
const TOTAL_PLAYERS = TEAM_COUNT * TEAM_SIZE;
|
||||
const GAME_COUNT_PER_SERIES_GROUP = 5;
|
||||
const POSITIONS: Position[] = ['TOP', 'JGL', 'MID', 'ADC', 'SUP'];
|
||||
const CHAMPION_IDS = [
|
||||
266, 64, 103, 222, 412, 24, 421, 134, 145, 497, 58, 121, 777, 202, 111, 39,
|
||||
120, 7, 81, 89, 114, 104, 157, 51, 432, 92, 234, 61, 21, 53,
|
||||
];
|
||||
|
||||
interface CliOptions {
|
||||
communityId?: string;
|
||||
dryRun: boolean;
|
||||
nodeEnv: string;
|
||||
replace: boolean;
|
||||
scheduledAt: Date;
|
||||
title: string;
|
||||
}
|
||||
|
||||
interface TempPlayer {
|
||||
userId: mongoose.Types.ObjectId;
|
||||
puuid: string;
|
||||
gameName: string;
|
||||
tagLine: string;
|
||||
profileIconId: number;
|
||||
tier: TierInfo;
|
||||
preferredPositions: PositionPreference[];
|
||||
}
|
||||
|
||||
interface CommunityLean {
|
||||
_id: mongoose.Types.ObjectId;
|
||||
name?: string;
|
||||
}
|
||||
|
||||
@Module({
|
||||
imports: [
|
||||
ConfigModule.forRoot({
|
||||
isGlobal: true,
|
||||
envFilePath: [
|
||||
resolve(__dirname, '../../../../../../project.env'),
|
||||
resolve(process.cwd(), '../project.env'),
|
||||
resolve(process.cwd(), 'apps/project.env'),
|
||||
resolve(process.cwd(), 'project.env'),
|
||||
],
|
||||
}),
|
||||
SecretModule,
|
||||
],
|
||||
providers: [ConnectionService],
|
||||
})
|
||||
class TempSeedModule {}
|
||||
|
||||
async function loadMachineEnvFile() {
|
||||
const homeDir = process.env.HOME ?? process.env.USERPROFILE;
|
||||
if (!homeDir) return;
|
||||
|
||||
const machineEnvFile = resolve(homeDir, 'source/global-env-vars.txt');
|
||||
|
||||
try {
|
||||
const file = await readFile(machineEnvFile, 'utf8');
|
||||
for (const rawLine of file.split(/\r?\n/)) {
|
||||
const line = rawLine.trim();
|
||||
if (!line || line.startsWith('#')) continue;
|
||||
|
||||
const matched = line.match(/^([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.*)$/);
|
||||
if (!matched) continue;
|
||||
|
||||
const [, key, rawValue] = matched;
|
||||
process.env[key] = rawValue.replace(/^["']|["']$/g, '');
|
||||
}
|
||||
} catch {
|
||||
// 로컬 machine env 파일이 없으면 그냥 지나간다.
|
||||
}
|
||||
}
|
||||
|
||||
function parseArgs(argv: string[]): CliOptions {
|
||||
let communityId =
|
||||
process.env.VITE_DEFAULT_COMMUNITY_ID ?? process.env.DEFAULT_COMMUNITY_ID;
|
||||
let dryRun = false;
|
||||
let nodeEnv = process.env.NODE_ENV ?? 'dev';
|
||||
let replace = false;
|
||||
let scheduledAt = new Date(Date.now() - 24 * 60 * 60 * 1000);
|
||||
let title = `결과 검증 임시 내전 30인 6팀 ${formatStamp(new Date())}`;
|
||||
|
||||
for (let index = 0; index < argv.length; index += 1) {
|
||||
const arg = argv[index];
|
||||
if (arg === '--community-id') {
|
||||
const value = argv[index + 1];
|
||||
if (!value) throw new Error('--community-id requires an ObjectId.');
|
||||
communityId = value;
|
||||
index += 1;
|
||||
continue;
|
||||
}
|
||||
if (arg.startsWith('--community-id=')) {
|
||||
communityId = arg.slice('--community-id='.length);
|
||||
continue;
|
||||
}
|
||||
if (arg === '--dry-run') {
|
||||
dryRun = true;
|
||||
continue;
|
||||
}
|
||||
if (arg === '--env') {
|
||||
const value = argv[index + 1];
|
||||
if (!value) throw new Error('--env requires dev, staging, or prod.');
|
||||
nodeEnv = value;
|
||||
index += 1;
|
||||
continue;
|
||||
}
|
||||
if (arg.startsWith('--env=')) {
|
||||
nodeEnv = arg.slice('--env='.length);
|
||||
continue;
|
||||
}
|
||||
if (arg === '--replace') {
|
||||
replace = true;
|
||||
continue;
|
||||
}
|
||||
if (arg === '--scheduled-at') {
|
||||
scheduledAt = parseDateArg(argv[index + 1], '--scheduled-at');
|
||||
index += 1;
|
||||
continue;
|
||||
}
|
||||
if (arg.startsWith('--scheduled-at=')) {
|
||||
scheduledAt = parseDateArg(
|
||||
arg.slice('--scheduled-at='.length),
|
||||
'--scheduled-at',
|
||||
);
|
||||
continue;
|
||||
}
|
||||
if (arg === '--title') {
|
||||
const value = argv[index + 1];
|
||||
if (!value) throw new Error('--title requires a value.');
|
||||
title = value;
|
||||
index += 1;
|
||||
continue;
|
||||
}
|
||||
if (arg.startsWith('--title=')) {
|
||||
title = arg.slice('--title='.length);
|
||||
continue;
|
||||
}
|
||||
if (arg === '--help' || arg === '-h') {
|
||||
printHelp();
|
||||
process.exit(0);
|
||||
}
|
||||
throw new Error(`Unknown argument: ${arg}`);
|
||||
}
|
||||
|
||||
if (!['dev', 'staging', 'prod'].includes(nodeEnv)) {
|
||||
throw new Error('--env must be dev, staging, or prod.');
|
||||
}
|
||||
if (communityId && !mongoose.isValidObjectId(communityId)) {
|
||||
throw new Error('--community-id must be a valid ObjectId.');
|
||||
}
|
||||
|
||||
return {
|
||||
communityId: communityId?.trim() || undefined,
|
||||
dryRun,
|
||||
nodeEnv,
|
||||
replace,
|
||||
scheduledAt,
|
||||
title,
|
||||
};
|
||||
}
|
||||
|
||||
function parseDateArg(value: string | undefined, label: string): Date {
|
||||
if (!value) throw new Error(`${label} requires an ISO date value.`);
|
||||
const parsed = new Date(value);
|
||||
if (Number.isNaN(parsed.getTime())) {
|
||||
throw new Error(`${label} must be a valid ISO date value.`);
|
||||
}
|
||||
return parsed;
|
||||
}
|
||||
|
||||
function printHelp() {
|
||||
console.log(`Usage:
|
||||
pnpm --filter api exec ts-node src/modules/global/database/dev-seeds/create-temp-finished-match.ts
|
||||
pnpm --filter api exec ts-node src/modules/global/database/dev-seeds/create-temp-finished-match.ts --replace
|
||||
|
||||
Options:
|
||||
--community-id <id> Community ObjectId. Defaults to env or first community.
|
||||
--dry-run Print the payload summary without writing.
|
||||
--env <env> dev | staging | prod. Default: NODE_ENV or dev.
|
||||
--replace Delete previous temp matches created by this script first.
|
||||
--scheduled-at <iso> Scheduled date. Default: yesterday.
|
||||
--title <title> Match title. Default: timestamped temp title.
|
||||
`);
|
||||
}
|
||||
|
||||
async function main() {
|
||||
const options = parseArgs(process.argv.slice(2));
|
||||
process.env.NODE_ENV = options.nodeEnv;
|
||||
await loadMachineEnvFile();
|
||||
|
||||
const app = await NestFactory.createApplicationContext(TempSeedModule, {
|
||||
logger: ['log', 'warn', 'error'],
|
||||
});
|
||||
|
||||
try {
|
||||
const connectionService = app.get(ConnectionService);
|
||||
const CommunityModel = await connectionService.getModel('community');
|
||||
const MatchModel = await connectionService.getModel('match');
|
||||
const community = await resolveCommunity(
|
||||
CommunityModel,
|
||||
options.communityId,
|
||||
);
|
||||
|
||||
const payload = buildMatchPayload(community._id, options);
|
||||
|
||||
console.log(
|
||||
`[temp result seed] mode=${options.dryRun ? 'dry-run' : 'apply'} env=${options.nodeEnv} db=${resolveMongoDbName(options.nodeEnv)}`,
|
||||
);
|
||||
console.log(
|
||||
`[temp result seed] community=${community.name ?? '(unnamed)'} (${community._id.toString()})`,
|
||||
);
|
||||
console.log(
|
||||
`[temp result seed] title="${options.title}" participants=${payload.participants.length} teams=${payload.teams.length} games=${payload.result.games.length}`,
|
||||
);
|
||||
|
||||
if (options.dryRun) {
|
||||
console.log('[temp result seed] No writes were made.');
|
||||
return;
|
||||
}
|
||||
|
||||
if (options.replace) {
|
||||
const deleteResult = await MatchModel.deleteMany({
|
||||
communityId: community._id,
|
||||
'legacyImportSource.jobId': TEMP_JOB_ID,
|
||||
}).exec();
|
||||
console.log(
|
||||
`[temp result seed] deleted=${deleteResult.deletedCount ?? 0}`,
|
||||
);
|
||||
}
|
||||
|
||||
const match = await MatchModel.create(payload);
|
||||
console.log(`[temp result seed] created=${match._id.toString()}`);
|
||||
console.log(`[temp result seed] route=/match/${match._id.toString()}`);
|
||||
} finally {
|
||||
await app.close();
|
||||
}
|
||||
}
|
||||
|
||||
async function resolveCommunity(
|
||||
CommunityModel: mongoose.Model<unknown>,
|
||||
communityId?: string,
|
||||
): Promise<CommunityLean> {
|
||||
const community = communityId
|
||||
? await CommunityModel.findById(communityId)
|
||||
.select({ name: 1 })
|
||||
.lean<CommunityLean>()
|
||||
.exec()
|
||||
: await CommunityModel.findOne()
|
||||
.sort({ createdAt: 1 })
|
||||
.select({ name: 1 })
|
||||
.lean<CommunityLean>()
|
||||
.exec();
|
||||
|
||||
if (!community) {
|
||||
throw new Error(
|
||||
communityId
|
||||
? `Community not found: ${communityId}`
|
||||
: 'No community found. Pass --community-id.',
|
||||
);
|
||||
}
|
||||
|
||||
return community;
|
||||
}
|
||||
|
||||
function buildMatchPayload(
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
options: CliOptions,
|
||||
) {
|
||||
const now = new Date();
|
||||
const players = buildPlayers(now);
|
||||
const participants = players.map(
|
||||
(player, index): MatchParticipant => ({
|
||||
userId: player.userId,
|
||||
puuid: player.puuid,
|
||||
gameName: player.gameName,
|
||||
tagLine: player.tagLine,
|
||||
profileIconId: player.profileIconId,
|
||||
tier: player.tier,
|
||||
preferredPositions: player.preferredPositions,
|
||||
joinedAt: new Date(
|
||||
options.scheduledAt.getTime() - (TOTAL_PLAYERS - index) * 60000,
|
||||
),
|
||||
excluded: false,
|
||||
}),
|
||||
);
|
||||
const teams = buildTeams(players);
|
||||
const games = buildGames(players, options.scheduledAt);
|
||||
const seriesResults = buildSeriesResults(games);
|
||||
const winnerTeamIndex = resolveOverallWinner(seriesResults);
|
||||
|
||||
return {
|
||||
communityId,
|
||||
title: options.title,
|
||||
description:
|
||||
'결과 페이지 검증용으로 생성된 30명, 6팀, 15경기 완료 임시 데이터입니다.',
|
||||
mapId: 11,
|
||||
status: 'finished',
|
||||
scheduledAt: options.scheduledAt,
|
||||
maxParticipants: TOTAL_PLAYERS,
|
||||
gameCount: GAME_COUNT_PER_SERIES_GROUP,
|
||||
gameMode: 'round-robin',
|
||||
tournamentCodeIds: [],
|
||||
teamBuiltAt: new Date(options.scheduledAt.getTime() - 30 * 60000),
|
||||
participants,
|
||||
teams,
|
||||
result: {
|
||||
winnerTeamIndex,
|
||||
mvpUserId: players[0].userId,
|
||||
riotMatchIds: games.map((game) => game.riotMatchId),
|
||||
games,
|
||||
seriesResults,
|
||||
},
|
||||
resultPollState: {
|
||||
startedAt: new Date(options.scheduledAt.getTime() + 2 * 60 * 60 * 1000),
|
||||
lastPolledAt: now,
|
||||
lastPollOutcome: 'matched',
|
||||
matchedCount: games.length,
|
||||
expandedToAllPuuids: true,
|
||||
state: 'complete',
|
||||
},
|
||||
legacyImported: true,
|
||||
legacyImportSource: {
|
||||
importedAt: now,
|
||||
importedBy: players[0].userId,
|
||||
triggeringPuuid: players[0].puuid,
|
||||
jobId: TEMP_JOB_ID,
|
||||
},
|
||||
prizes: ['1등 팀: 결과 화면 검증용 임시 상품', 'MVP: Temp01'],
|
||||
notices: ['이 매치는 UI 검증용 임시 데이터입니다.'],
|
||||
schedule: [
|
||||
{ time: '20:00', label: '로비 오픈' },
|
||||
{ time: '20:10', label: '1경기 시작' },
|
||||
{ time: '23:30', label: '풀리그 종료' },
|
||||
],
|
||||
};
|
||||
}
|
||||
|
||||
function buildPlayers(now: Date): TempPlayer[] {
|
||||
return Array.from({ length: TOTAL_PLAYERS }, (_, index) => {
|
||||
const playerNumber = index + 1;
|
||||
const primaryPosition = POSITIONS[index % POSITIONS.length];
|
||||
|
||||
return {
|
||||
userId: new mongoose.Types.ObjectId(),
|
||||
puuid: `temp-result-puuid-${playerNumber.toString().padStart(2, '0')}`,
|
||||
gameName: `Temp${playerNumber.toString().padStart(2, '0')}`,
|
||||
tagLine: `T${playerNumber.toString().padStart(3, '0')}`,
|
||||
profileIconId: 20 + playerNumber,
|
||||
tier: buildTier(playerNumber, now),
|
||||
preferredPositions: buildPreferredPositions(primaryPosition),
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
function buildPreferredPositions(
|
||||
primaryPosition: Position,
|
||||
): PositionPreference[] {
|
||||
const ordered = [
|
||||
primaryPosition,
|
||||
...POSITIONS.filter((position) => position !== primaryPosition),
|
||||
];
|
||||
return ordered.map((position, index) => ({
|
||||
position,
|
||||
priority: index + 1,
|
||||
}));
|
||||
}
|
||||
|
||||
function buildTier(playerNumber: number, fetchedAt: Date): TierInfo {
|
||||
const tiers = [
|
||||
['CHALLENGER', 'I'],
|
||||
['GRANDMASTER', 'I'],
|
||||
['MASTER', 'I'],
|
||||
['DIAMOND', 'I'],
|
||||
['DIAMOND', 'II'],
|
||||
['EMERALD', 'I'],
|
||||
['EMERALD', 'II'],
|
||||
['PLATINUM', 'I'],
|
||||
['PLATINUM', 'II'],
|
||||
['GOLD', 'I'],
|
||||
] as const;
|
||||
const [tier, rank] = tiers[(playerNumber - 1) % tiers.length];
|
||||
|
||||
return {
|
||||
queueType: 'RANKED_SOLO_5x5',
|
||||
tier,
|
||||
rank,
|
||||
leaguePoints: (playerNumber * 17) % 100,
|
||||
wins: 40 + playerNumber,
|
||||
losses: 22 + (playerNumber % 13),
|
||||
fetchedAt,
|
||||
};
|
||||
}
|
||||
|
||||
function buildTeams(players: TempPlayer[]): MatchTeam[] {
|
||||
return Array.from({ length: TEAM_COUNT }, (_, teamOffset) => {
|
||||
const teamIndex = teamOffset + 1;
|
||||
const members = players
|
||||
.slice(teamOffset * TEAM_SIZE, (teamOffset + 1) * TEAM_SIZE)
|
||||
.map((player, memberOffset) => ({
|
||||
userId: player.userId,
|
||||
assignedPosition: POSITIONS[memberOffset],
|
||||
cost: memberOffset === 0 ? 0 : 80 + teamIndex * 15 + memberOffset * 20,
|
||||
}));
|
||||
|
||||
return {
|
||||
teamIndex,
|
||||
name: `${teamIndex}팀`,
|
||||
captainUserId: members[0]?.userId,
|
||||
members,
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
function buildGames(
|
||||
players: TempPlayer[],
|
||||
scheduledAt: Date,
|
||||
): MatchGameResult[] {
|
||||
const games: MatchGameResult[] = [];
|
||||
const playersByTeam = new Map<number, TempPlayer[]>();
|
||||
|
||||
for (let teamIndex = 1; teamIndex <= TEAM_COUNT; teamIndex += 1) {
|
||||
playersByTeam.set(
|
||||
teamIndex,
|
||||
players.slice((teamIndex - 1) * TEAM_SIZE, teamIndex * TEAM_SIZE),
|
||||
);
|
||||
}
|
||||
|
||||
for (let teamAIndex = 1; teamAIndex <= TEAM_COUNT; teamAIndex += 1) {
|
||||
for (
|
||||
let teamBIndex = teamAIndex + 1;
|
||||
teamBIndex <= TEAM_COUNT;
|
||||
teamBIndex += 1
|
||||
) {
|
||||
const gameNumber = games.length + 1;
|
||||
const lowerTeamStartsBlue = gameNumber % 2 === 1;
|
||||
const blueTeamIndex = lowerTeamStartsBlue ? teamAIndex : teamBIndex;
|
||||
const redTeamIndex = lowerTeamStartsBlue ? teamBIndex : teamAIndex;
|
||||
const winnerTeamIndex = teamAIndex;
|
||||
const winnerSide: TeamSide =
|
||||
winnerTeamIndex === blueTeamIndex ? 'blue' : 'red';
|
||||
const gameCreation = scheduledAt.getTime() + gameNumber * 20 * 60 * 1000;
|
||||
const riotMatchId = `KR_TEMP_30X6_${formatStamp(scheduledAt)}_${gameNumber
|
||||
.toString()
|
||||
.padStart(2, '0')}`;
|
||||
|
||||
games.push({
|
||||
gameNumber,
|
||||
riotMatchId,
|
||||
blueTeamIndex,
|
||||
redTeamIndex,
|
||||
winnerTeamIndex,
|
||||
winnerSide,
|
||||
gameCreation,
|
||||
gameDuration: 1650 + gameNumber * 23,
|
||||
participants: [
|
||||
...buildGameParticipants({
|
||||
players: playersByTeam.get(blueTeamIndex) ?? [],
|
||||
teamIndex: blueTeamIndex,
|
||||
side: 'blue',
|
||||
winnerTeamIndex,
|
||||
gameNumber,
|
||||
}),
|
||||
...buildGameParticipants({
|
||||
players: playersByTeam.get(redTeamIndex) ?? [],
|
||||
teamIndex: redTeamIndex,
|
||||
side: 'red',
|
||||
winnerTeamIndex,
|
||||
gameNumber,
|
||||
}),
|
||||
],
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
return games;
|
||||
}
|
||||
|
||||
function buildGameParticipants(params: {
|
||||
players: TempPlayer[];
|
||||
teamIndex: number;
|
||||
side: TeamSide;
|
||||
winnerTeamIndex: number;
|
||||
gameNumber: number;
|
||||
}): MatchGameResult['participants'] {
|
||||
const didWin = params.teamIndex === params.winnerTeamIndex;
|
||||
|
||||
return params.players.map((player, index) => {
|
||||
const championIndex =
|
||||
(params.gameNumber + params.teamIndex + index) % CHAMPION_IDS.length;
|
||||
return {
|
||||
userId: player.userId,
|
||||
teamIndex: params.teamIndex,
|
||||
side: params.side,
|
||||
championId: CHAMPION_IDS[championIndex],
|
||||
kills: didWin
|
||||
? 4 + ((params.gameNumber + index) % 8)
|
||||
: 1 + ((params.gameNumber + index) % 5),
|
||||
deaths: didWin ? 1 + (index % 4) : 4 + ((params.gameNumber + index) % 7),
|
||||
assists: didWin
|
||||
? 7 + ((params.gameNumber + index) % 12)
|
||||
: 3 + ((params.gameNumber + index) % 8),
|
||||
win: didWin,
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
function buildSeriesResults(games: MatchGameResult[]): MatchSeriesResult[] {
|
||||
return games.map((game) => {
|
||||
const teamAIndex = Math.min(game.blueTeamIndex, game.redTeamIndex);
|
||||
const teamBIndex = Math.max(game.blueTeamIndex, game.redTeamIndex);
|
||||
|
||||
return {
|
||||
teamAIndex,
|
||||
teamBIndex,
|
||||
teamAWins: game.winnerTeamIndex === teamAIndex ? 1 : 0,
|
||||
teamBWins: game.winnerTeamIndex === teamBIndex ? 1 : 0,
|
||||
winnerTeamIndex: game.winnerTeamIndex,
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
function resolveOverallWinner(
|
||||
seriesResults: MatchSeriesResult[],
|
||||
): number | undefined {
|
||||
const winsByTeam = new Map<number, number>();
|
||||
for (const series of seriesResults) {
|
||||
if (!series.winnerTeamIndex) continue;
|
||||
winsByTeam.set(
|
||||
series.winnerTeamIndex,
|
||||
(winsByTeam.get(series.winnerTeamIndex) ?? 0) + 1,
|
||||
);
|
||||
}
|
||||
|
||||
return [...winsByTeam.entries()].sort(
|
||||
(left, right) => right[1] - left[1],
|
||||
)[0]?.[0];
|
||||
}
|
||||
|
||||
function formatStamp(date: Date): string {
|
||||
const year = date.getFullYear();
|
||||
const month = `${date.getMonth() + 1}`.padStart(2, '0');
|
||||
const day = `${date.getDate()}`.padStart(2, '0');
|
||||
const hours = `${date.getHours()}`.padStart(2, '0');
|
||||
const minutes = `${date.getMinutes()}`.padStart(2, '0');
|
||||
const seconds = `${date.getSeconds()}`.padStart(2, '0');
|
||||
return `${year}${month}${day}-${hours}${minutes}${seconds}`;
|
||||
}
|
||||
|
||||
void main().catch((error: unknown) => {
|
||||
console.error(error instanceof Error ? error.message : error);
|
||||
process.exitCode = 1;
|
||||
});
|
||||
Loaded 100 of 301 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user