diff --git a/BUILD_NUMBER b/BUILD_NUMBER index 69a893aa..780fea92 100644 --- a/BUILD_NUMBER +++ b/BUILD_NUMBER @@ -1 +1 @@ -66 +77 \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..ede5d544 --- /dev/null +++ b/LICENSE @@ -0,0 +1,480 @@ + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1991 Free Software Foundation, Inc. + + 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. + + + Copyright (C) + + 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 . + +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. + + , 1 April 1990 + Moe Ghoul, President of Vice + +That's all there is to it! diff --git a/README.md b/README.md index b878c3ac..876df721 100644 --- a/README.md +++ b/README.md @@ -1,56 +1,89 @@ # LOLYMPUS -![LOLYMPUS match list](docs/screenshots/lolympus-match-list.png) +LOLYMPUS는 리그 오브 레전드 커뮤니티의 여러 이벤트 중 내전(사용자 설정 게임)을 운영할 때 필요한 일정 관리, 참여자 모집, 팀 빌딩, 토너먼트 코드 배정, 경기 진행, 실시간 라이브 방송(추후 지원 예정), 결과 수집, 전적 확인을 한곳에서 처리하기 위한 웹 애플리케이션입니다. -## Overview +

+ +

-LOLYMPUS는 리그 오브 레전드 내전을 운영할 때 필요한 것들을 한곳에 모아둔 웹 애플리케이션입니다. +

+ 3초 간격 데모 영상 보기 +

-참가자 모집, 팀 편성, 경매, 토너먼트 코드 배정, 경기 결과 수집, 전적 확인처럼 운영자가 매번 손으로 챙기던 일을 줄이는 데 초점을 맞췄습니다. 처음부터 큰 서비스로 만들었다기보다는, 실제 커뮤니티 내전을 굴리면서 불편했던 부분을 하나씩 붙여가며 만든 프로젝트입니다. +## 배포 주소 -## Purpose +| Environment | Version | URL | +| ----------- | ------- | -------------------------------------- | +| Production | v77 | | +| Staging | v77 | | -내전은 사람만 모이면 끝나는 일이 아니었습니다. 참가자 티어를 확인하고, 포지션을 맞추고, 팀장을 정하고, 경기마다 토너먼트 코드를 나눠주고, 끝난 뒤 결과까지 정리해야 했습니다. +## 개요 -이 프로젝트는 그 흐름을 최대한 덜 번거롭게 만들기 위해 시작했습니다. 운영자는 전체 진행 상황을 보고, 참가자는 본인이 속한 팀과 다음 경기를 빠르게 확인할 수 있도록 구성했습니다. +내전 운영은 사람을 모으는 것에서 끝나지 않습니다. 참가자의 티어와 포지션을 확인하고, 팀장을 정하고, 팀을 나누고, 경기마다 토너먼트 코드를 전달하고, 끝난 뒤 결과와 전적까지 정리해야 합니다. -## Screens +LOLYMPUS는 이 반복 작업을 줄이는 데 초점을 맞췄습니다. 운영자는 전체 진행 상황을 한눈에 보고, 참가자는 카카오톡 연동을 통해 쉽게 일정 확인/참가 신청하고 본인이 속한 팀과 다음 경기 정보를 빠르게 확인할 수 있습니다. -### Match detail +## 워크플로우 -![LOLYMPUS match detail](docs/screenshots/lolympus-match-detail.png) +1. **내전 개설과 모집** + 내전 일정, 진행 방식, 정원, 공지사항을 등록하고 참가 신청 현황을 확인합니다. -### Team progress +2. **참가자 정보 확인** + Riot 계정 기반으로 소환사명, 태그, 프로필 아이콘, 솔로랭크/자유랭크 티어, 선호 포지션을 보여줍니다. -![LOLYMPUS team progress](docs/screenshots/lolympus-team-progress.png) +3. **팀 빌딩과 경매** + 팀장을 기준으로 팀을 구성하거나, 경매 방식으로 참가자를 배정합니다. 현재 입찰가, 팀별 포인트, 낙찰 기록을 함께 관리합니다. -## Functionalities +4. **팀별 진행 페이지** + 각 팀은 예정 경기, 상대 팀, 라인업, 토너먼트 코드를 한 화면에서 확인하고 복사할 수 있습니다. -**1. 내전 관리** -내전 생성, 수정, 모집 상태 변경, 참가자 목록 확인을 할 수 있습니다. +5. **결과 수집과 통계** + Riot Match-V5 데이터를 이용해 경기 결과를 수집하고, 소환사별 전적과 커뮤니티 리더보드를 제공합니다. -**2. 참가자 정보 관리** -Riot 계정 정보를 기반으로 소환사명, 태그, 프로필 아이콘, 솔로랭크/자유랭크 티어, 선호 포지션을 보여줍니다. +## 스크린샷 -**3. 팀 빌딩** -팀장을 정하고 포지션을 맞춰 팀을 구성합니다. 여러 팀이 참여하는 내전도 처리할 수 있습니다. +상단의 경매 화면은 LOLYMPUS가 단순 참가자 목록을 넘어서 실제 팀빌딩 운영까지 다루는 대표 화면입니다. 3초 간격 데모 영상은 README 렌더러가 video 태그를 지원하면 자동/반복 재생되고, 세부 화면은 아래 PNG 원본을 기준으로 볼 수 있습니다. -**4. 경매 진행** -팀장 경매 방식으로 참가자를 뽑을 수 있고, 현재 입찰가와 낙찰 기록을 관리합니다. +| 경매 팀빌딩 | +| ----------------------------------------------------------------------------------------------------------------------------------------- | +| LOLYMPUS 경매 팀빌딩 | -**5. 토너먼트 코드 관리** -업로드한 토너먼트 코드를 경기별로 배정하고, 팀별 진행 페이지에서 바로 복사할 수 있게 했습니다. +| 내전 목록 | 모집 상세 | +| ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------- | +| LOLYMPUS 내전 목록 | LOLYMPUS 모집 상세 | -**6. 팀별 진행 페이지** -각 팀이 자기 경기 일정, 상대 팀, 토너먼트 코드, 종료된 경기 결과를 한 화면에서 확인할 수 있습니다. +| 단판 경기 결과 | 개인 전적 | +| ------------------------------------------------------------------------------------------------------ | --------------------------------------------------------------------------------------------- | +| LOLYMPUS 단판 경기 결과 | LOLYMPUS 소환사 전적 | -**7. 전적 수집과 통계** -Riot Match-V5 데이터를 이용해 내전 결과를 수집하고, 개인 전적과 커뮤니티 리더보드를 보여줍니다. +| 경기 상세 | +| ------------------------------------------------------------------------------------------- | +| LOLYMPUS 경기 상세 | -**8. 커뮤니티 명령 연동** -Dakao/NATS 기반 명령을 받아 참가 신청이나 운영 흐름과 연결할 수 있도록 구성했습니다. +## 기능 -## Used technologies +- 내전 생성, 수정, 모집 상태 변경, 참가자 목록 확인 +- 카카오톡 명령어를 통한 일정 조회, 내전 참가, 취소, 계정 등록 등 기능 제공 +- Riot 계정 기반 참가자 프로필, 티어, 포지션 확인 +- 팀장 지정, 포지션 기반 팀 구성, 다팀 내전 지원 +- 팀장 경매 방식의 참가자 낙찰과 입찰 기록 관리 +- 경기별 토너먼트 코드 배정과 팀별 복사 UI +- 팀별 경기 일정, 상대 팀, 라인업, 결과 확인 +- Riot Match-V5 기반 결과 수집, 개인 전적, 리더보드 제공 +- Dakao/NATS 기반 커뮤니티 명령 연동 + +## 기술 스택 - React - Vite @@ -62,47 +95,49 @@ Dakao/NATS 기반 명령을 받아 참가 신청이나 운영 흐름과 연결 - NATS - Riot API - pnpm workspace +- Kubernetes +- ArgoCD -## Project structure +## 디렉터리 구조 ```text apps/ api/ NestJS API server web/ React + Vite client -scripts/ deployment and maintenance scripts +docs/ + screenshots/ README and project screenshots +scripts/ deployment and maintenance scripts ``` -## How to run +## 사전 요구사항 + +- 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 dev:web +pnpm start:web:dev ``` -웹 앱은 기본적으로 `apps/web/.env.development` 값을 사용합니다. API 환경값은 `apps/project.env`와 실행 환경의 시크릿 설정을 같이 확인합니다. +웹 앱은 기본적으로 `apps/web/.env.development` 값을 사용합니다. API 환경값은 `apps/project.env`와 실행 환경의 시크릿 설정을 함께 확인합니다. -## Checks +카카오톡 기반 명령어 기능은 Dakao(커스텀 카카오톡 게이트웨이) 연동이 필요합니다. Dakao가 실행 중이 아니거나 NATS를 통해 API 서버와 연결되어 있지 않으면 일정 조회, 내전 참가, 참가 취소, 계정 등록 같은 카카오톡 명령어는 사용할 수 없습니다. -```bash -pnpm --filter api test -pnpm --filter web build:staging -``` +## 커맨드 -현재 정리된 기준으로 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 배포 | -## Deployment branches +## 라이선스 -`main`은 항상 배포 가능한 trunk로 유지하고 dev 배포 기준으로 사용합니다. -빌드 번호는 `BUILD_NUMBER` 파일에서 1씩 증가시키며, 현재 시작 번호는 `66`입니다. -staging 검증이 필요할 때는 `release/66` 같은 임시 브랜치를 만들고, -검증이 끝나면 삭제합니다. - -```bash -git push origin main:release/66 -pnpm deploy:web:staging -``` - -staging Pages 배포 스크립트는 `CF_PAGES_STAGING_BRANCH`가 있으면 그 값을 -사용하고, 없으면 최신 `release/*` 브랜치를 자동으로 선택합니다. 최신 기준은 -브랜치가 가리키는 커밋 시각이며, 동률이면 브랜치명 내림차순입니다. +This project is licensed under the GNU Library General Public License v2.0. See [LICENSE](LICENSE) for details. diff --git a/apps/api/README.md b/apps/api/README.md index a5a96613..1b15cc36 100644 --- a/apps/api/README.md +++ b/apps/api/README.md @@ -27,8 +27,8 @@ ## Riot Background Refresh -Set `RIOT_BG_REFRESH_ENABLED=true` to refresh stale Riot accounts automatically -between KST 03:00 and 10:00. The scheduler picks active users whose +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. diff --git a/apps/api/src/modules/auction/auction.controller.ts b/apps/api/src/modules/auction/auction.controller.ts index 86acec54..70fd1560 100644 --- a/apps/api/src/modules/auction/auction.controller.ts +++ b/apps/api/src/modules/auction/auction.controller.ts @@ -164,6 +164,7 @@ export class AuctionController { ) { this.assertSameCommunity(currentUser, communityId); await this.auctionService.reset({ matchId, communityId }); + this.auctionGateway.broadcastReset(matchId.toString()); } private resolveBidder( diff --git a/apps/api/src/modules/auction/auction.gateway.ts b/apps/api/src/modules/auction/auction.gateway.ts index b868285b..91c0c613 100644 --- a/apps/api/src/modules/auction/auction.gateway.ts +++ b/apps/api/src/modules/auction/auction.gateway.ts @@ -16,6 +16,7 @@ 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, @@ -37,6 +38,11 @@ interface SoldPayload { assignedPosition?: Position; } +interface ChatMessagePayload { + message?: string; + displayName?: string; +} + @WebSocketGateway({ namespace: '/auction', cors: { @@ -100,6 +106,7 @@ export class AuctionGateway 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); @@ -182,6 +189,34 @@ export class AuctionGateway } } + @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) { @@ -219,6 +254,36 @@ export class AuctionGateway 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 { const fallback = await this.authService.resolveDevUserById( this.readHandshakeUserId(socket), @@ -299,6 +364,19 @@ export class AuctionGateway 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; @@ -382,4 +460,8 @@ export class AuctionGateway private serializeAuction(auction: AuctionDocument) { return JSON.parse(JSON.stringify(auction)); } + + private serializeChatMessage(message: AuctionChatMessage) { + return JSON.parse(JSON.stringify(message)); + } } diff --git a/apps/api/src/modules/auction/auction.service.spec.ts b/apps/api/src/modules/auction/auction.service.spec.ts index ff5cfc6f..82992acc 100644 --- a/apps/api/src/modules/auction/auction.service.spec.ts +++ b/apps/api/src/modules/auction/auction.service.spec.ts @@ -159,6 +159,76 @@ describe('AuctionService', () => { 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(); @@ -252,6 +322,119 @@ describe('AuctionService', () => { 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 = { @@ -348,7 +531,7 @@ describe('AuctionService', () => { expect(auction.save).not.toHaveBeenCalled(); }); - it('marks a zero-bid player as passed and queues them for round two', async () => { + 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 = { @@ -383,25 +566,63 @@ describe('AuctionService', () => { expect(auction.save).toHaveBeenCalledTimes(1); }); - it('force-assigns second-pass players to the open team with most points', async () => { + 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: [ - { - userId: passedPlayerId, - preferredPositions: [{ position: 'SUP', priority: 1 }], - passCount: 2, - }, - ], - passedQueue: [], + order: [passedPlayer], + passedQueue: [passedPlayer], teams: [ { teamIndex: 1, @@ -419,46 +640,28 @@ describe('AuctionService', () => { save: jest.fn().mockResolvedValue(undefined), toObject: jest.fn().mockReturnValue({ _id: 'auction', matchId }), }; - const match = { - participants: [ - { - userId: captainOneId, - preferredPositions: [{ position: 'TOP', priority: 1 }], - }, - { - userId: captainTwoId, - preferredPositions: [{ position: 'JGL', priority: 1 }], - }, - { - userId: passedPlayerId, - preferredPositions: [{ position: 'SUP', priority: 1 }], - }, - ], - status: 'team-built', - teams: [], - teamBuiltAt: undefined, - save: jest.fn().mockResolvedValue(undefined), - }; const { service } = createService({ auction: { findOne: jest.fn().mockResolvedValue(auction), }, - match: { - findById: jest.fn().mockResolvedValue(match), - }, }); await service.next(matchId); - expect(auction.phase).toBe('complete'); - expect(auction.teams[1].members).toEqual([ - { - userId: passedPlayerId, - assignedPosition: 'SUP', - cost: 1, - }, - ]); - expect(auction.teams[1].points).toBe(49); + 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 () => { diff --git a/apps/api/src/modules/auction/auction.service.ts b/apps/api/src/modules/auction/auction.service.ts index b93d66b8..557bc8eb 100644 --- a/apps/api/src/modules/auction/auction.service.ts +++ b/apps/api/src/modules/auction/auction.service.ts @@ -5,10 +5,12 @@ import { 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, @@ -26,6 +28,9 @@ import { TournamentResultService } from '../tournament-result/tournament-result. 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; @@ -54,6 +59,13 @@ interface MarkSoldParams { assignedPosition?: Position; } +interface AppendChatMessageParams { + matchId: mongoose.Types.ObjectId; + userId?: mongoose.Types.ObjectId; + displayName?: string; + message: string; +} + export interface AuctionHistoryView { sequence: number; action: AuctionActionType; @@ -162,6 +174,7 @@ export class AuctionService { profileIconId: primary.profileIconId, preferredPositions: participant.preferredPositions, tiers: primary.tiers, + tierHistory: primary.tierHistory ?? [], masteries: primary.championMasteries, recentStatsSummary: primary.recentStatsSummary, passCount: 0, @@ -221,6 +234,31 @@ export class AuctionService { 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; @@ -345,9 +383,8 @@ export class AuctionService { await this.recordSnapshot(auction, 'passed'); current.passCount = (current.passCount ?? 0) + 1; - if ((auction.auctionRound ?? 1) === 1) { - auction.passedQueue.push(this.cloneAuctionPlayerSnapshot(current)); - } + auction.passedQueue ??= []; + auction.passedQueue.push(this.cloneAuctionPlayerSnapshot(current)); auction.phase = 'passed'; auction.currentDeadline = undefined; await auction.save(); @@ -368,29 +405,22 @@ export class AuctionService { const nextIndex = auction.currentIndex + 1; const completesAuction = nextIndex >= auction.order.length && - !( - (auction.auctionRound ?? 1) === 1 && - (auction.passedQueue?.length ?? 0) > 0 - ); + (auction.passedQueue?.length ?? 0) === 0; await this.recordSnapshot(auction, completesAuction ? 'complete' : 'next'); if (nextIndex >= auction.order.length) { - if ( - (auction.auctionRound ?? 1) === 1 && - (auction.passedQueue?.length ?? 0) > 0 - ) { + if ((auction.passedQueue?.length ?? 0) > 0) { auction.order.push( ...auction.passedQueue.map((player) => this.cloneAuctionPlayerSnapshot(player), ), ); auction.passedQueue = []; - auction.auctionRound = 2; + auction.auctionRound = (auction.auctionRound ?? 1) + 1; auction.currentIndex = nextIndex; auction.phase = 'presenting'; auction.currentBid = 0; auction.currentBidderTeamIndex = undefined; } else { - this.forceAssignRemainingPasses(auction); auction.phase = 'complete'; auction.completedAt = new Date(); } @@ -603,47 +633,34 @@ export class AuctionService { return shuffled; } - private forceAssignRemainingPasses(auction: AuctionDocument): void { - const forcedPlayers = auction.order.filter( - (player) => - (player.passCount ?? 0) >= 2 && - !this.isAuctionPlayerAssigned(auction, player.userId), - ); - - for (const player of forcedPlayers) { - const targetTeam = [...auction.teams] - .filter( - (team) => this.countTeamMembersIncludingCaptain(team) < AUCTION_MAX_TEAM_SIZE, - ) - .sort((left, right) => right.points - left.points)[0]; - if (!targetTeam) return; - - const preferredPrimary = player.preferredPositions[0]?.position; - targetTeam.members.push({ - userId: player.userId, - assignedPosition: preferredPrimary ?? 'MID', - cost: 1, - }); - targetTeam.points = Math.max(0, targetTeam.points - 1); - } - } - - private isAuctionPlayerAssigned( - auction: AuctionDocument, - userId: mongoose.Types.ObjectId, - ): boolean { - const userIdText = userId.toString(); - return auction.teams.some((team) => - team.members.some((member) => member.userId.toString() === userIdText), - ); - } - 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, @@ -903,6 +920,7 @@ export class AuctionService { '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(), diff --git a/apps/api/src/modules/dakao/dakao-outbox.service.spec.ts b/apps/api/src/modules/dakao/dakao-outbox.service.spec.ts new file mode 100644 index 00000000..97b6c264 --- /dev/null +++ b/apps/api/src/modules/dakao/dakao-outbox.service.spec.ts @@ -0,0 +1,116 @@ +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(value: T) { + return { exec: jest.fn().mockResolvedValue(value) }; +} + +function makeService(outboxModel: Record) { + 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; + } + }); +}); diff --git a/apps/api/src/modules/dakao/dakao-outbox.service.ts b/apps/api/src/modules/dakao/dakao-outbox.service.ts index ca58d2cd..21fb7cda 100644 --- a/apps/api/src/modules/dakao/dakao-outbox.service.ts +++ b/apps/api/src/modules/dakao/dakao-outbox.service.ts @@ -1,13 +1,23 @@ import { Injectable, Logger } from '@nestjs/common'; import { ConnectionService } from '../global/database/connection.service'; import { NatsService } from '../global/nats/nats.service'; -import { DakaoCommandEnvelope, DakaoResultEnvelope } from './dakao.types'; +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, @@ -30,6 +40,7 @@ export class DakaoOutboxService { type: params.envelope.type, subject: params.subject, correlationId: params.envelope.correlationId, + resultSubjects: params.envelope.resultSubjects, payload: params.envelope.payload as Record, state: 'pending', publishAttempts: 0, @@ -161,6 +172,8 @@ export class DakaoOutboxService { type: row.type, eventSource: row.eventSource, correlationId: row.correlationId, + resultSubjects: + row.resultSubjects ?? this.resolveDefaultResultSubjects(row.type), payload: row.payload, }, }); @@ -168,4 +181,11 @@ export class DakaoOutboxService { return rows.length; } + + private resolveDefaultResultSubjects( + type: string, + ): DakaoResultSubjects | undefined { + if (type !== CHAT_SEND_MESSAGE_TYPE) return undefined; + return this.chatSendMessageResultSubjects; + } } diff --git a/apps/api/src/modules/dakao/dakao-url-shortener.service.spec.ts b/apps/api/src/modules/dakao/dakao-url-shortener.service.spec.ts new file mode 100644 index 00000000..d42cb1bb --- /dev/null +++ b/apps/api/src/modules/dakao/dakao-url-shortener.service.spec.ts @@ -0,0 +1,148 @@ +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; + + 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(); + }); +}); diff --git a/apps/api/src/modules/dakao/dakao-url-shortener.service.ts b/apps/api/src/modules/dakao/dakao-url-shortener.service.ts new file mode 100644 index 00000000..c987facd --- /dev/null +++ b/apps/api/src/modules/dakao/dakao-url-shortener.service.ts @@ -0,0 +1,180 @@ +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 { + 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 { + try { + const token = await this.secretService.get( + '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 { + try { + return (await response.json()) as ShortenerResponseBody; + } catch { + return undefined; + } + } + + private async logFailedResponse( + response: Response, + slug: string, + ): Promise { + const body = await response.text().catch(() => ''); + this.logger.warn( + `URL shortener returned ${response.status} for slug="${slug}"${body ? `: ${body.slice(0, 200)}` : ''}`, + ); + } +} diff --git a/apps/api/src/modules/dakao/dakao-user.service.spec.ts b/apps/api/src/modules/dakao/dakao-user.service.spec.ts index bcbedb98..a8b98cd0 100644 --- a/apps/api/src/modules/dakao/dakao-user.service.spec.ts +++ b/apps/api/src/modules/dakao/dakao-user.service.spec.ts @@ -14,7 +14,7 @@ function makeQuery(value: T) { } function makeService(params: { - user: Partial; + user: Partial | null; community?: Record | null; riotAccountService?: Partial; enrichmentService?: Partial; @@ -22,6 +22,7 @@ function makeService(params: { 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 ?? {})), @@ -29,7 +30,7 @@ function makeService(params: { }); const connectionService = { getModel: jest.fn().mockImplementation(async (name: string) => { - if (name === 'user') return { findOneAndUpdate }; + if (name === 'user') return { findOneAndUpdate, findOne }; if (name === 'community') return { findById }; throw new Error(`Unexpected model: ${name}`); }), @@ -51,6 +52,7 @@ function makeService(params: { ), connectionService, findOneAndUpdate, + findOne, findById, riotAccountService, enrichmentService, @@ -168,4 +170,78 @@ describe('DakaoUserService', () => { 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, + }); + + 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, + }); + + 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(); + }); }); diff --git a/apps/api/src/modules/dakao/dakao-user.service.ts b/apps/api/src/modules/dakao/dakao-user.service.ts index 2ffb22c4..15b31553 100644 --- a/apps/api/src/modules/dakao/dakao-user.service.ts +++ b/apps/api/src/modules/dakao/dakao-user.service.ts @@ -230,6 +230,43 @@ export class DakaoUserService { return user; } + public async changePrimaryRiotAccount( + context: ResolveContext, + ): Promise { + 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, diff --git a/apps/api/src/modules/dakao/dakao.module.ts b/apps/api/src/modules/dakao/dakao.module.ts index c9520727..5ff93408 100644 --- a/apps/api/src/modules/dakao/dakao.module.ts +++ b/apps/api/src/modules/dakao/dakao.module.ts @@ -10,11 +10,13 @@ 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], @@ -31,11 +33,13 @@ import { PreferredPositionRegisterHandler } from './handlers/preferred-position- DakaoSubscriber, DakaoSendResultSubscriber, DakaoUserService, + DakaoUrlShortenerService, AccountRegisterHandler, MatchListHandler, MatchJoinHandler, MatchCancelHandler, PreferredPositionRegisterHandler, + PrimaryAccountChangeHandler, ], exports: [DakaoPublisher], }) diff --git a/apps/api/src/modules/dakao/dakao.publisher.spec.ts b/apps/api/src/modules/dakao/dakao.publisher.spec.ts index 84a382b7..c61575f9 100644 --- a/apps/api/src/modules/dakao/dakao.publisher.spec.ts +++ b/apps/api/src/modules/dakao/dakao.publisher.spec.ts @@ -97,6 +97,10 @@ describe('DakaoPublisher', () => { 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', diff --git a/apps/api/src/modules/dakao/dakao.publisher.ts b/apps/api/src/modules/dakao/dakao.publisher.ts index 0d788af4..44ea636a 100644 --- a/apps/api/src/modules/dakao/dakao.publisher.ts +++ b/apps/api/src/modules/dakao/dakao.publisher.ts @@ -3,6 +3,7 @@ import { randomUUID } from 'crypto'; import { SecretService } from '../global/secret/secret.service'; import { DakaoCommandEnvelope, + DakaoResultSubjects, DakaoSegment, DakaoSendMessagePayload, } from './dakao.types'; @@ -16,7 +17,12 @@ const EVENT_SOURCE_DEFAULT = 'lolympus'; @Injectable() export class DakaoPublisher implements OnModuleInit { private readonly logger = new Logger(DakaoPublisher.name); - private sendMessageSubject = resolveDakaoNatsNames().subjects.chatSendMessage; + 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( @@ -35,6 +41,10 @@ export class DakaoPublisher implements OnModuleInit { 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( @@ -63,6 +73,7 @@ export class DakaoPublisher implements OnModuleInit { type: 'chat.send-message', eventSource: this.eventSource, correlationId: params.correlationId, + resultSubjects: this.resultSubjects, payload, }; await this.outboxService.enqueueAndPublish({ diff --git a/apps/api/src/modules/dakao/dakao.subscriber.spec.ts b/apps/api/src/modules/dakao/dakao.subscriber.spec.ts new file mode 100644 index 00000000..ebf8e425 --- /dev/null +++ b/apps/api/src/modules/dakao/dakao.subscriber.spec.ts @@ -0,0 +1,107 @@ +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: '스타', + }); + }); +}); diff --git a/apps/api/src/modules/dakao/dakao.subscriber.ts b/apps/api/src/modules/dakao/dakao.subscriber.ts index 2a73644b..c875cbff 100644 --- a/apps/api/src/modules/dakao/dakao.subscriber.ts +++ b/apps/api/src/modules/dakao/dakao.subscriber.ts @@ -11,6 +11,7 @@ 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'; @@ -20,6 +21,13 @@ 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, @@ -33,6 +41,7 @@ export class DakaoSubscriber implements OnModuleInit { private readonly matchJoinHandler: MatchJoinHandler, private readonly matchCancelHandler: MatchCancelHandler, private readonly preferredPositionRegisterHandler: PreferredPositionRegisterHandler, + private readonly primaryAccountChangeHandler: PrimaryAccountChangeHandler, ) {} async onModuleInit() { @@ -126,6 +135,15 @@ export class DakaoSubscriber implements OnModuleInit { 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, @@ -256,9 +274,9 @@ export class DakaoSubscriber implements OnModuleInit { const text = ((): string => { switch (err.code) { case 'unknown_command': - return ` 알 수 없는 명령어입니다. 사용법: !내전 일정, !내전 계정등록 <게임명>#<태그>, !내전 선호포지션등록 미드,정글, !내전 신청 [코드] [게임명#태그] [포지션1,포지션2], !내전 취소 <코드>`; + return ` 알 수 없는 명령어입니다.\n`; case 'usage': - return ` 사용법: !내전 일정, !내전 계정등록 <게임명>#<태그>, !내전 선호포지션등록 미드,정글, !내전 신청 [코드] [게임명#태그] [포지션1,포지션2], !내전 취소 <코드>`; + return ` 내전 명령어 사용법\n`; case 'invalid_match_id': return ` 매치 ID 형식이 올바르지 않습니다 (${err.detail ?? ''}).`; case 'invalid_riot_id': @@ -269,6 +287,22 @@ export class DakaoSubscriber implements OnModuleInit { 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, + ]); + } } diff --git a/apps/api/src/modules/dakao/dakao.types.ts b/apps/api/src/modules/dakao/dakao.types.ts index 251d5c5f..ee634807 100644 --- a/apps/api/src/modules/dakao/dakao.types.ts +++ b/apps/api/src/modules/dakao/dakao.types.ts @@ -75,12 +75,18 @@ export interface DakaoSendMessagePayload { silence?: boolean; } +export interface DakaoResultSubjects { + succeeded: string; + failed: string; +} + export interface DakaoCommandEnvelope { schema: 'dakao.command.v1'; eventId: string; type: string; eventSource: string; correlationId?: string; + resultSubjects?: DakaoResultSubjects; payload: TPayload; } diff --git a/apps/api/src/modules/dakao/handlers/match-list.handler.spec.ts b/apps/api/src/modules/dakao/handlers/match-list.handler.spec.ts index abc73a83..855b25a6 100644 --- a/apps/api/src/modules/dakao/handlers/match-list.handler.spec.ts +++ b/apps/api/src/modules/dakao/handlers/match-list.handler.spec.ts @@ -1,11 +1,28 @@ 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; + urlShortener?: Partial; +}): 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 and compact KST dates', async () => { + it('prints short codes, compact KST dates, and short links', async () => { const match = { _id: objectId('333333333333333333333333'), title: '토요 내전', @@ -17,8 +34,13 @@ describe('MatchListHandler', () => { const matchService = { list: jest.fn().mockResolvedValue([match]), ensureShortCode: jest.fn().mockResolvedValue(match), - } as unknown as MatchService; - const handler = new MatchListHandler(matchService); + }; + const urlShortener = { + shortenMatchLink: jest + .fn() + .mockResolvedValue('https://go.dahyeon.us/lmtpAB12'), + }; + const handler = makeHandler({ matchService, urlShortener }); const segments = await handler.handle({ communityId: objectId('111111111111111111111111'), @@ -27,6 +49,10 @@ describe('MatchListHandler', () => { }); 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'), @@ -35,6 +61,10 @@ describe('MatchListHandler', () => { 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'), @@ -43,5 +73,50 @@ describe('MatchListHandler', () => { 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', + ), + }); }); }); diff --git a/apps/api/src/modules/dakao/handlers/match-list.handler.ts b/apps/api/src/modules/dakao/handlers/match-list.handler.ts index 0d019957..438c8fdc 100644 --- a/apps/api/src/modules/dakao/handlers/match-list.handler.ts +++ b/apps/api/src/modules/dakao/handlers/match-list.handler.ts @@ -1,11 +1,18 @@ -import { Injectable } from '@nestjs/common'; +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 { - constructor(private readonly matchService: MatchService) {} + private readonly logger = new Logger(MatchListHandler.name); + + constructor( + private readonly matchService: MatchService, + private readonly urlShortener: DakaoUrlShortenerService, + ) {} public async handle(params: { communityId: mongoose.Types.ObjectId; @@ -33,12 +40,16 @@ export class MatchListHandler { matches.map((match) => this.matchService.ensureShortCode(match)), ); - const lines = matchesWithCodes.map((m, i) => { - const filled = m.participants.length; - const cap = m.maxParticipants; - const time = formatScheduledAt(m.scheduledAt); - return `\n${i + 1}. ${m.title} (${filled}/${cap}) ${time}\n 코드: ${m.shortCode}`; - }); + 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 [ { @@ -48,10 +59,29 @@ export class MatchListHandler { }, { kind: 'text', - text: ` 모집 중인 내전 ${matches.length}건${lines.join('')}\n계정등록: !내전 계정등록 <닉네임>#<태그>\n선호포지션등록: !내전 선호포지션등록 미드,정글\n신청: !내전 신청 <코드> [닉네임#태그] [포지션1,포지션2]\n취소: !내전 취소 <코드>\n계정/선호포지션을 등록해두면 !내전 신청 <코드> 로 신청할 수 있습니다.`, + text: ` 모집 중인 내전 ${matches.length}건${lines.join('')}`, }, ]; } + + private async createShortUrl( + match: MatchDocument, + ): Promise { + 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 { diff --git a/apps/api/src/modules/dakao/handlers/primary-account-change.handler.spec.ts b/apps/api/src/modules/dakao/handlers/primary-account-change.handler.spec.ts new file mode 100644 index 00000000..23225bdc --- /dev/null +++ b/apps/api/src/modules/dakao/handlers/primary-account-change.handler.spec.ts @@ -0,0 +1,73 @@ +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) { + 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('먼저 !내전 계정등록'), + }), + ]); + }); +}); diff --git a/apps/api/src/modules/dakao/handlers/primary-account-change.handler.ts b/apps/api/src/modules/dakao/handlers/primary-account-change.handler.ts new file mode 100644 index 00000000..8a265a4e --- /dev/null +++ b/apps/api/src/modules/dakao/handlers/primary-account-change.handler.ts @@ -0,0 +1,81 @@ +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 { + 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 '라이엇 계정 조회 중 오류가 발생했습니다. 잠시 후 다시 시도해주세요.'; + } + } +} diff --git a/apps/api/src/modules/dakao/parsers/command.parser.spec.ts b/apps/api/src/modules/dakao/parsers/command.parser.spec.ts index edfd8d73..baa233d5 100644 --- a/apps/api/src/modules/dakao/parsers/command.parser.spec.ts +++ b/apps/api/src/modules/dakao/parsers/command.parser.spec.ts @@ -121,6 +121,25 @@ describe('parseCommand', () => { }); }); + 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( @@ -136,6 +155,10 @@ describe('parseCommand', () => { 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/); }); diff --git a/apps/api/src/modules/dakao/parsers/command.parser.ts b/apps/api/src/modules/dakao/parsers/command.parser.ts index f7d699c9..92d7ced0 100644 --- a/apps/api/src/modules/dakao/parsers/command.parser.ts +++ b/apps/api/src/modules/dakao/parsers/command.parser.ts @@ -12,6 +12,11 @@ export type DakaoCommand = gameName: string; tagLine: string; } + | { + kind: 'primary-account-change'; + gameName: string; + tagLine: string; + } | { kind: 'match-join'; matchAndRiotId: string; @@ -70,6 +75,8 @@ export function parseCommand(rawMessage: string): DakaoCommand { return parseCancelArgs(args); case '계정등록': return parseAccountRegisterArgs(args); + case '대표계정변경': + return parsePrimaryAccountChangeArgs(args); case '선호포지션등록': case '포지션등록': return parsePreferredPositionRegisterArgs(args); @@ -79,6 +86,24 @@ export function parseCommand(rawMessage: string): DakaoCommand { } 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'); } @@ -94,11 +119,7 @@ function parseAccountRegisterArgs(args: string): DakaoCommand { throw new CommandParseError('invalid_riot_id', args); } - return { - kind: 'account-register', - gameName, - tagLine, - }; + return { gameName, tagLine }; } function parseCancelArgs(args: string): DakaoCommand { diff --git a/apps/api/src/modules/global/database/schema.ts b/apps/api/src/modules/global/database/schema.ts index 9aef3702..e7a0807b 100644 --- a/apps/api/src/modules/global/database/schema.ts +++ b/apps/api/src/modules/global/database/schema.ts @@ -350,6 +350,10 @@ export interface DakaoOutboxMessage extends MongooseTimestamps { type: string; subject: string; correlationId?: string; + resultSubjects?: { + succeeded: string; + failed: string; + }; payload: Record; state: DakaoOutboxMessageState; publishAttempts: number; @@ -589,6 +593,7 @@ export interface AuctionPlayerSnapshot { profileIconId: number; preferredPositions: PositionPreference[]; tiers: TierInfo[]; + tierHistory: TierHistoryEntry[]; masteries: ChampionMasteryEntry[]; recentStatsSummary?: RiotRecentStatsSummary; passCount: number; @@ -614,6 +619,14 @@ export interface AuctionBid { timestamp: Date; } +export interface AuctionChatMessage { + id: string; + userId?: mongoose.Types.ObjectId; + displayName: string; + message: string; + sentAt: Date; +} + export interface Auction extends MongooseTimestamps { matchId: mongoose.Types.ObjectId; phase: AuctionPhase; @@ -631,6 +644,7 @@ export interface Auction extends MongooseTimestamps { initialPoints: number; topTierThreshold: AuctionTopTierThreshold; manualTopTierUserIds: mongoose.Types.ObjectId[]; + chatMessages: AuctionChatMessage[]; startedAt?: Date; completedAt?: Date; } @@ -960,6 +974,10 @@ export const DakaoOutboxMessageSchema = new Schema( type: { type: String, required: true }, subject: { type: String, required: true }, correlationId: { type: String }, + resultSubjects: { + succeeded: { type: String }, + failed: { type: String }, + }, payload: { type: Schema.Types.Mixed, required: true }, state: { type: String, @@ -1514,6 +1532,11 @@ const AuctionPlayerSnapshotSubSchema = new Schema( default: [], }, tiers: { type: [TierInfoSubSchema], required: true, default: [] }, + tierHistory: { + type: [TierHistoryEntrySubSchema], + required: true, + default: [], + }, masteries: { type: [ChampionMasteryEntrySubSchema], required: true, @@ -1558,6 +1581,17 @@ const AuctionBidSubSchema = new Schema( { _id: false }, ); +const AuctionChatMessageSubSchema = new Schema( + { + id: { type: String, required: true }, + userId: { type: Schema.Types.ObjectId, ref: 'user', required: false }, + displayName: { type: String, required: true }, + message: { type: String, required: true }, + sentAt: { type: Date, required: true, default: Date.now }, + }, + { _id: false }, +); + export const AuctionSchema = new Schema( { matchId: { @@ -1604,6 +1638,11 @@ export const AuctionSchema = new Schema( required: true, default: [], }, + chatMessages: { + type: [AuctionChatMessageSubSchema], + required: true, + default: [], + }, startedAt: { type: Date, required: false }, completedAt: { type: Date, required: false }, }, diff --git a/apps/api/src/modules/global/garnet/garnet.service.ts b/apps/api/src/modules/global/garnet/garnet.service.ts index c79b30d9..2b50df91 100644 --- a/apps/api/src/modules/global/garnet/garnet.service.ts +++ b/apps/api/src/modules/global/garnet/garnet.service.ts @@ -1,9 +1,4 @@ -import { - Inject, - Injectable, - Logger, - OnModuleDestroy, -} from '@nestjs/common'; +import { Inject, Injectable, Logger, OnModuleDestroy } from '@nestjs/common'; import type { createClient } from 'redis'; import { GARNET_CLIENT } from './garnet.constants'; @@ -203,6 +198,13 @@ export class GarnetService implements OnModuleDestroy { return this.client.xAck(key, group, ids); } + public async deleteStreamEntries( + key: string, + ids: string | string[], + ): Promise { + return this.client.xDel(key, ids); + } + public async streamLength(key: string): Promise { return this.client.xLen(key); } diff --git a/apps/api/src/modules/match-history/match-history.service.ts b/apps/api/src/modules/match-history/match-history.service.ts index 2ff34648..895689f8 100644 --- a/apps/api/src/modules/match-history/match-history.service.ts +++ b/apps/api/src/modules/match-history/match-history.service.ts @@ -99,6 +99,18 @@ export class MatchHistoryService { losses: tier.losses, fetchedAt: tier.fetchedAt.toISOString(), })), + tierHistory: [...context.account.tierHistory] + .sort((left, right) => left.recordedAt.getTime() - right.recordedAt.getTime()) + .map((entry) => ({ + queueType: entry.queueType, + tier: entry.tier, + rank: entry.rank, + leaguePoints: entry.leaguePoints, + wins: entry.wins, + losses: entry.losses, + recordedAt: entry.recordedAt.toISOString(), + season: entry.season, + })), season: context.season, seasons: this.resolveSeasons(context.community), lastFetchedAt: lastFetchedAt?.toISOString() ?? null, diff --git a/apps/api/src/modules/match-history/match-history.types.ts b/apps/api/src/modules/match-history/match-history.types.ts index e5aeafb8..92727c11 100644 --- a/apps/api/src/modules/match-history/match-history.types.ts +++ b/apps/api/src/modules/match-history/match-history.types.ts @@ -27,6 +27,16 @@ export interface UserHistoryProfileResponse { losses: number; fetchedAt: string; }>; + tierHistory: Array<{ + queueType: string; + tier: string; + rank?: string; + leaguePoints?: number; + wins?: number; + losses?: number; + recordedAt: string; + season?: string; + }>; season: HistorySeasonDto; seasons: HistorySeasonDto[]; lastFetchedAt: string | null; diff --git a/apps/api/src/modules/match/dto/create-match.dto.ts b/apps/api/src/modules/match/dto/create-match.dto.ts index a2757c73..7fe6ee55 100644 --- a/apps/api/src/modules/match/dto/create-match.dto.ts +++ b/apps/api/src/modules/match/dto/create-match.dto.ts @@ -173,6 +173,14 @@ export class UpdateMatchDto { schedule?: MatchScheduleItemDto[]; } +export class UpdateParticipantDto { + @IsEnum(POSITIONS) + mainPosition!: Position; + + @IsEnum(POSITIONS) + subPosition!: Position; +} + export class JoinMatchDto { @IsArray() @ArrayMinSize(1) diff --git a/apps/api/src/modules/match/match.controller.ts b/apps/api/src/modules/match/match.controller.ts index c581dbdc..81e2a985 100644 --- a/apps/api/src/modules/match/match.controller.ts +++ b/apps/api/src/modules/match/match.controller.ts @@ -27,6 +27,7 @@ import { CreateMatchDto, JoinMatchDto, UpdateMatchDto, + UpdateParticipantDto, } from './dto/create-match.dto'; import { MatchService } from './match.service'; @@ -71,16 +72,27 @@ export class MatchController { communityId: mongoose.Types.ObjectId, @Query('status') status?: MatchStatus, @Query('limit') limit?: string, + @Query('page') page?: string, + @Query('offset') offset?: string, + @Query('scheduledFrom') scheduledFrom?: string, + @Query('scheduledTo') scheduledTo?: string, + @Query('sort') sort?: 'asc' | 'desc', ) { - const matches = await this.matchService.list({ + const result = await this.matchService.listPage({ communityId, status, - limit: limit ? Number(limit) : undefined, + limit: this.toOptionalNumber(limit), + page: this.toOptionalNumber(page), + offset: this.toOptionalNumber(offset), + scheduledFrom: this.toOptionalDate(scheduledFrom), + scheduledTo: this.toOptionalDate(scheduledTo), + sort, }); - if (!currentUser) return { matches }; + if (!currentUser) return result; const myId = currentUser._id; return { - matches: matches.map((m) => this.annotateJoined(m, myId)), + ...result, + matches: result.matches.map((m) => this.annotateJoined(m, myId)), }; } @@ -137,6 +149,49 @@ export class MatchController { }); } + // 관리자 전용 — 참가자 주/부 포지션 변경. + @Patch(':matchId/participants/:userId') + @Roles('admin', 'owner') + @UseGuards(RolesGuard) + public async updateParticipant( + @CurrentUser() currentUser: UserDocument, + @Param('communityId', ParseObjectIdPipe) + communityId: mongoose.Types.ObjectId, + @Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId, + @Param('userId', ParseObjectIdPipe) userId: mongoose.Types.ObjectId, + @Body() body: UpdateParticipantDto, + ) { + this.assertSameCommunity(currentUser, communityId); + const match = await this.matchService.updateParticipantPositions({ + matchId, + communityId, + targetUserId: userId, + mainPosition: body.mainPosition, + subPosition: body.subPosition, + }); + return this.matchService.serialize(match); + } + + // 관리자 전용 — 참가자 강제 제외. + @Delete(':matchId/participants/:userId') + @Roles('admin', 'owner') + @UseGuards(RolesGuard) + @HttpCode(HttpStatus.NO_CONTENT) + public async removeParticipant( + @CurrentUser() currentUser: UserDocument, + @Param('communityId', ParseObjectIdPipe) + communityId: mongoose.Types.ObjectId, + @Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId, + @Param('userId', ParseObjectIdPipe) userId: mongoose.Types.ObjectId, + ) { + this.assertSameCommunity(currentUser, communityId); + await this.matchService.removeParticipant({ + matchId, + communityId, + targetUserId: userId, + }); + } + private resolveJoinerUserId( currentUser: UserDocument | undefined, bodyUserId?: string, @@ -167,4 +222,15 @@ export class MatchController { throw new BadRequestException('Different community.'); } } + + private toOptionalNumber(value?: string): number | undefined { + const numberValue = Number(value); + return Number.isFinite(numberValue) ? numberValue : undefined; + } + + private toOptionalDate(value?: string): Date | undefined { + if (!value) return undefined; + const date = new Date(value); + return Number.isNaN(date.getTime()) ? undefined : date; + } } diff --git a/apps/api/src/modules/match/match.service.spec.ts b/apps/api/src/modules/match/match.service.spec.ts index a846a29f..337f8599 100644 --- a/apps/api/src/modules/match/match.service.spec.ts +++ b/apps/api/src/modules/match/match.service.spec.ts @@ -36,6 +36,135 @@ describe('MatchService', () => { }; } + function createServiceWithListModel() { + const exec = jest.fn().mockResolvedValue([{ title: 'second page' }]); + const limit = jest.fn().mockReturnValue({ exec }); + const skip = jest.fn().mockReturnValue({ limit }); + const sort = jest.fn().mockReturnValue({ skip }); + const find = jest.fn().mockReturnValue({ sort }); + const countExec = jest.fn().mockResolvedValue(12); + const countDocuments = jest.fn().mockReturnValue({ exec: countExec }); + const MatchModel = { + find, + countDocuments, + }; + const connectionService = { + getModel: jest.fn().mockImplementation(async (name: string) => { + if (name === 'match') return MatchModel; + return {}; + }), + }; + const tournamentCodeService = { + buildSlots: jest.fn().mockResolvedValue([]), + releaseFromMatch: jest.fn().mockResolvedValue(undefined), + }; + const communityStatsService = { + invalidateCommunity: jest.fn().mockResolvedValue(undefined), + }; + const matchStatsService = { + buildAndUpsert: jest.fn().mockResolvedValue(undefined), + removeByMatch: jest.fn().mockResolvedValue(undefined), + }; + + return { + service: new MatchService( + connectionService as never, + tournamentCodeService as never, + communityStatsService as never, + matchStatsService as never, + ), + MatchModel, + sort, + skip, + limit, + }; + } + + it('returns a paginated match list with total count', async () => { + const communityId = new mongoose.Types.ObjectId(); + const { service, MatchModel, sort, skip, limit } = + createServiceWithListModel(); + + const page = await service.listPage({ + communityId, + page: 2, + limit: 5, + }); + + expect(MatchModel.find).toHaveBeenCalledWith({ communityId }); + expect(MatchModel.countDocuments).toHaveBeenCalledWith({ communityId }); + expect(sort).toHaveBeenCalledWith({ scheduledAt: -1 }); + expect(skip).toHaveBeenCalledWith(5); + expect(limit).toHaveBeenCalledWith(5); + expect(page).toEqual({ + matches: [{ title: 'second page' }], + total: 12, + page: 2, + limit: 5, + }); + }); + + it('applies offset before page-based pagination', async () => { + const communityId = new mongoose.Types.ObjectId(); + const { service, skip } = createServiceWithListModel(); + + const page = await service.listPage({ + communityId, + offset: 4, + page: 2, + limit: 5, + }); + + expect(skip).toHaveBeenCalledWith(9); + expect(page.total).toBe(8); + }); + + it('filters future matches and sorts oldest first for upcoming sections', async () => { + const communityId = new mongoose.Types.ObjectId(); + const scheduledFrom = new Date('2026-06-08T12:00:00.000Z'); + const { service, MatchModel, sort } = createServiceWithListModel(); + + await service.listPage({ + communityId, + scheduledFrom, + sort: 'asc', + limit: 4, + }); + + expect(MatchModel.find).toHaveBeenCalledWith({ + communityId, + scheduledAt: { $gte: scheduledFrom }, + }); + expect(MatchModel.countDocuments).toHaveBeenCalledWith({ + communityId, + scheduledAt: { $gte: scheduledFrom }, + }); + expect(sort).toHaveBeenCalledWith({ scheduledAt: 1 }); + }); + + it('filters past matches and keeps newest first for history sections', async () => { + const communityId = new mongoose.Types.ObjectId(); + const scheduledTo = new Date('2026-06-08T12:00:00.000Z'); + const { service, MatchModel, sort } = createServiceWithListModel(); + + await service.listPage({ + communityId, + scheduledTo, + sort: 'desc', + limit: 10, + }); + + expect(MatchModel.find).toHaveBeenCalledWith({ + communityId, + scheduledAt: { $lt: scheduledTo }, + }); + expect(MatchModel.countDocuments).toHaveBeenCalledWith({ + communityId, + scheduledAt: { $lt: scheduledTo }, + }); + expect(sort).toHaveBeenCalledWith({ scheduledAt: -1 }); + }); + it('clears game schedule when a built match returns to recruiting', async () => { const communityId = new mongoose.Types.ObjectId(); const match = { diff --git a/apps/api/src/modules/match/match.service.ts b/apps/api/src/modules/match/match.service.ts index 1bf6b3b6..a3db4a51 100644 --- a/apps/api/src/modules/match/match.service.ts +++ b/apps/api/src/modules/match/match.service.ts @@ -13,6 +13,7 @@ import { MatchDocument, MatchSeriesResult, MatchStatus, + Position, PositionPreference, TierInfo, } from '../global/database/schema'; @@ -22,6 +23,8 @@ import { TournamentCodeService } from '../tournament-code/tournament-code.servic const MATCH_SHORT_CODE_ALPHABET = 'ABCDEFGHJKLMNPQRSTUVWXYZ23456789'; const MATCH_SHORT_CODE_LENGTH = 4; const MATCH_SHORT_CODE_GENERATION_ATTEMPTS = 20; +const DEFAULT_MATCH_LIST_LIMIT = 50; +const MAX_MATCH_LIST_LIMIT = 200; interface CreateMatchParams { communityId: mongoose.Types.ObjectId; @@ -39,6 +42,23 @@ interface ListMatchesQuery { communityId: mongoose.Types.ObjectId; status?: MatchStatus; limit?: number; + scheduledFrom?: Date; + scheduledTo?: Date; + sort?: 'asc' | 'desc'; +} + +interface ListMatchesPageQuery extends ListMatchesQuery { + page?: number; + offset?: number; +} + +interface MatchListFilter { + communityId: mongoose.Types.ObjectId; + status?: MatchStatus; + scheduledAt?: { + $gte?: Date; + $lt?: Date; + }; } interface JoinMatchParams { @@ -54,6 +74,20 @@ interface CancelMatchJoinParams { userId: mongoose.Types.ObjectId; } +interface RemoveParticipantParams { + matchId: mongoose.Types.ObjectId; + communityId: mongoose.Types.ObjectId; + targetUserId: mongoose.Types.ObjectId; +} + +interface UpdateParticipantPositionsParams { + matchId: mongoose.Types.ObjectId; + communityId: mongoose.Types.ObjectId; + targetUserId: mongoose.Types.ObjectId; + mainPosition: Position; + subPosition: Position; +} + @Injectable() export class MatchService { constructor( @@ -86,19 +120,42 @@ export class MatchService { public async list(query: ListMatchesQuery): Promise { const MatchModel = await this.connectionService.getModel('match'); - const filter: { - communityId: mongoose.Types.ObjectId; - status?: MatchStatus; - } = { - communityId: query.communityId, - }; - if (query.status) filter.status = query.status; + const filter = this.buildListFilter(query); return MatchModel.find(filter) - .sort({ scheduledAt: -1 }) - .limit(Math.min(query.limit ?? 50, 200)) + .sort(this.buildListSort(query.sort)) + .limit(this.normalizeListLimit(query.limit)) .exec(); } + public async listPage(query: ListMatchesPageQuery): Promise<{ + matches: MatchDocument[]; + total: number; + page: number; + limit: number; + }> { + const MatchModel = await this.connectionService.getModel('match'); + const filter = this.buildListFilter(query); + const page = this.normalizeListPage(query.page); + const limit = this.normalizeListLimit(query.limit); + const offset = this.normalizeListOffset(query.offset); + const skip = offset + (page - 1) * limit; + const [matches, rawTotal] = await Promise.all([ + MatchModel.find(filter) + .sort(this.buildListSort(query.sort)) + .skip(skip) + .limit(limit) + .exec(), + MatchModel.countDocuments(filter).exec(), + ]); + + return { + matches, + total: Math.max(rawTotal - offset, 0), + page, + limit, + }; + } + public async ensureShortCode(match: MatchDocument): Promise { if (match.shortCode) return match; @@ -276,6 +333,86 @@ export class MatchService { return match; } + // 관리자 전용 — 특정 참가자를 강제로 제외한다. + public async removeParticipant( + params: RemoveParticipantParams, + ): Promise { + const match = await this.loadRecruitingMatch( + params.matchId, + params.communityId, + ); + const participantIndex = match.participants.findIndex((participant) => + participant.userId.equals(params.targetUserId), + ); + if (participantIndex === -1) { + throw new NotFoundException('Participant not found.'); + } + match.participants.splice(participantIndex, 1); + await match.save(); + return match; + } + + // 관리자 전용 — 참가자의 주/부 포지션(선호 우선순위 1·2)을 교체한다. + public async updateParticipantPositions( + params: UpdateParticipantPositionsParams, + ): Promise { + const match = await this.loadRecruitingMatch( + params.matchId, + params.communityId, + ); + const participant = match.participants.find((entry) => + entry.userId.equals(params.targetUserId), + ); + if (!participant) { + throw new NotFoundException('Participant not found.'); + } + participant.preferredPositions = this.reorderPreferredPositions( + params.mainPosition, + params.subPosition, + participant.preferredPositions, + ); + match.markModified('participants'); + await match.save(); + return match; + } + + private async loadRecruitingMatch( + matchId: mongoose.Types.ObjectId, + communityId: mongoose.Types.ObjectId, + ): Promise { + const MatchModel = await this.connectionService.getModel('match'); + const match = await MatchModel.findById(matchId); + if (!match) throw new NotFoundException('Match not found.'); + if (!match.communityId.equals(communityId)) { + throw new BadRequestException('Different community.'); + } + if (match.status !== 'recruiting') { + throw new BadRequestException('Match is not recruiting.'); + } + return match; + } + + // 주/부 포지션을 priority 1·2로 올리고 기존 나머지 선호는 뒤로 보존한다. + private reorderPreferredPositions( + mainPosition: Position, + subPosition: Position, + current: PositionPreference[], + ): PositionPreference[] { + const ordered: Position[] = [mainPosition]; + if (subPosition !== mainPosition) ordered.push(subPosition); + for (const preference of [...current].sort( + (left, right) => left.priority - right.priority, + )) { + if (!ordered.includes(preference.position)) { + ordered.push(preference.position); + } + } + return ordered.map((position, index) => ({ + position, + priority: index + 1, + })); + } + private selectParticipantTier(tiers: TierInfo[]): TierInfo | undefined { const tier = tiers.find((entry) => entry.queueType === 'RANKED_SOLO_5x5') ?? tiers[0]; @@ -299,6 +436,44 @@ export class MatchService { }; } + private buildListFilter(query: ListMatchesQuery): MatchListFilter { + const filter: MatchListFilter = { + communityId: query.communityId, + }; + if (query.status) filter.status = query.status; + if (query.scheduledFrom || query.scheduledTo) { + filter.scheduledAt = {}; + if (query.scheduledFrom) filter.scheduledAt.$gte = query.scheduledFrom; + if (query.scheduledTo) filter.scheduledAt.$lt = query.scheduledTo; + } + return filter; + } + + private buildListSort(sort?: 'asc' | 'desc'): { scheduledAt: 1 | -1 } { + return { scheduledAt: sort === 'asc' ? 1 : -1 }; + } + + private normalizeListLimit(limit?: number): number { + if (!Number.isFinite(limit) || !limit || limit < 1) { + return DEFAULT_MATCH_LIST_LIMIT; + } + return Math.min(Math.floor(limit), MAX_MATCH_LIST_LIMIT); + } + + private normalizeListPage(page?: number): number { + if (!Number.isFinite(page) || !page || page < 1) { + return 1; + } + return Math.floor(page); + } + + private normalizeListOffset(offset?: number): number { + if (!Number.isFinite(offset) || !offset || offset < 1) { + return 0; + } + return Math.floor(offset); + } + private async generateUniqueShortCode( MatchModel: mongoose.Model, communityId: mongoose.Types.ObjectId, diff --git a/apps/api/src/modules/riot-background-refresh/background-refresh.scheduler.spec.ts b/apps/api/src/modules/riot-background-refresh/background-refresh.scheduler.spec.ts index 01b88226..fa0d8196 100644 --- a/apps/api/src/modules/riot-background-refresh/background-refresh.scheduler.spec.ts +++ b/apps/api/src/modules/riot-background-refresh/background-refresh.scheduler.spec.ts @@ -1,4 +1,3 @@ -import { ConfigService } from '@nestjs/config'; import mongoose from 'mongoose'; import { GarnetService } from '../global/garnet/garnet.service'; import { RiotAccountEnrichmentService } from '../riot/riot-account-enrichment.service'; @@ -30,7 +29,7 @@ function candidate(puuid: string): StaleAccountCandidate { }; } -function makeScheduler(enabled = true) { +function makeScheduler() { const rawClient = { sendCommand: jest.fn().mockResolvedValue(1), }; @@ -42,7 +41,7 @@ function makeScheduler(enabled = true) { raw: jest.fn().mockReturnValue(rawClient), } as unknown as jest.Mocked & { raw: jest.Mock }; const rateLimiter = { - acquireBackground: jest.fn().mockResolvedValue(undefined), + isRefreshWindowOpen: jest.fn().mockResolvedValue(true), } as unknown as jest.Mocked; const enrichmentService = { markRefreshRequested: jest.fn().mockResolvedValue(undefined), @@ -51,16 +50,11 @@ function makeScheduler(enabled = true) { const staleAccountRepository = { findStaleAccounts: jest.fn().mockResolvedValue([]), } as unknown as jest.Mocked; - const config = { - get: jest.fn().mockReturnValue(enabled ? 'true' : 'false'), - } as unknown as ConfigService; - const scheduler = new BackgroundRefreshScheduler( garnet, rateLimiter, enrichmentService, staleAccountRepository, - config, ) as SchedulerInternals; return { @@ -79,19 +73,40 @@ describe('BackgroundRefreshScheduler', () => { jest.restoreAllMocks(); }); - it('does not schedule ticks when disabled', () => { + it('schedules ticks without requiring RIOT_BG_REFRESH_ENABLED', () => { jest.useFakeTimers(); const setIntervalSpy = jest.spyOn(global, 'setInterval'); - const { scheduler } = makeScheduler(false); + const { scheduler } = makeScheduler(); scheduler.onModuleInit(); - expect(setIntervalSpy).not.toHaveBeenCalled(); + expect(setIntervalSpy).toHaveBeenCalledTimes(2); + scheduler.onModuleDestroy(); }); - it('does not query stale accounts outside the KST window', async () => { + it('uses the dawn refresh gate ratio inside the KST background window', async () => { + jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z')); + const { scheduler, rateLimiter } = makeScheduler(); + + await scheduler.tick(); + + expect(rateLimiter.isRefreshWindowOpen).toHaveBeenCalledWith(0.8); + }); + + it('uses the opportunistic refresh gate ratio outside the KST background window', async () => { jest.useFakeTimers().setSystemTime(new Date('2026-05-02T17:59:59.000Z')); - const { scheduler, staleAccountRepository } = makeScheduler(); + const { scheduler, rateLimiter, staleAccountRepository } = makeScheduler(); + + await scheduler.tick(); + + expect(rateLimiter.isRefreshWindowOpen).toHaveBeenCalledWith(0.5); + expect(staleAccountRepository.findStaleAccounts).toHaveBeenCalledTimes(1); + }); + + it('does not query stale accounts when the refresh gate is closed', async () => { + jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z')); + const { scheduler, rateLimiter, staleAccountRepository } = makeScheduler(); + rateLimiter.isRefreshWindowOpen.mockResolvedValue(false); await scheduler.tick(); @@ -108,21 +123,15 @@ describe('BackgroundRefreshScheduler', () => { expect(staleAccountRepository.findStaleAccounts).not.toHaveBeenCalled(); }); - it('marks and enriches each stale candidate with background rate tokens', async () => { + it('marks and enriches each stale candidate without background precharge', async () => { jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z')); - const { - scheduler, - rateLimiter, - enrichmentService, - staleAccountRepository, - } = makeScheduler(); + const { scheduler, enrichmentService, staleAccountRepository } = + makeScheduler(); const candidates = [candidate('puuid-1'), candidate('puuid-2')]; staleAccountRepository.findStaleAccounts.mockResolvedValue(candidates); await scheduler.tick(); - expect(rateLimiter.acquireBackground).toHaveBeenCalledTimes(2); - expect(rateLimiter.acquireBackground).toHaveBeenCalledWith(8); expect(enrichmentService.markRefreshRequested).toHaveBeenCalledTimes(2); expect(enrichmentService.markRefreshRequested).toHaveBeenNthCalledWith( 1, @@ -136,6 +145,28 @@ describe('BackgroundRefreshScheduler', () => { }); }); + it('stops the candidate loop when the refresh gate closes mid-tick', async () => { + jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z')); + const { + scheduler, + rateLimiter, + enrichmentService, + staleAccountRepository, + } = makeScheduler(); + staleAccountRepository.findStaleAccounts.mockResolvedValue([ + candidate('puuid-1'), + candidate('puuid-2'), + ]); + rateLimiter.isRefreshWindowOpen + .mockResolvedValueOnce(true) + .mockResolvedValueOnce(true) + .mockResolvedValueOnce(false); + + await scheduler.tick(); + + expect(enrichmentService.enrichRiotAccount).toHaveBeenCalledTimes(1); + }); + it('continues after a candidate throws and records a failure counter', async () => { jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z')); const { scheduler, rawClient, enrichmentService, staleAccountRepository } = @@ -162,13 +193,8 @@ describe('BackgroundRefreshScheduler', () => { it('skips candidates already in failure backoff', async () => { jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z')); - const { - scheduler, - garnet, - rateLimiter, - enrichmentService, - staleAccountRepository, - } = makeScheduler(); + const { scheduler, garnet, enrichmentService, staleAccountRepository } = + makeScheduler(); staleAccountRepository.findStaleAccounts.mockResolvedValue([ candidate('skip-me'), ]); @@ -179,7 +205,6 @@ describe('BackgroundRefreshScheduler', () => { await scheduler.tick(); - expect(rateLimiter.acquireBackground).not.toHaveBeenCalled(); expect(enrichmentService.markRefreshRequested).not.toHaveBeenCalled(); expect(enrichmentService.enrichRiotAccount).not.toHaveBeenCalled(); }); diff --git a/apps/api/src/modules/riot-background-refresh/background-refresh.scheduler.ts b/apps/api/src/modules/riot-background-refresh/background-refresh.scheduler.ts index 730f3e1d..82dc3936 100644 --- a/apps/api/src/modules/riot-background-refresh/background-refresh.scheduler.ts +++ b/apps/api/src/modules/riot-background-refresh/background-refresh.scheduler.ts @@ -4,7 +4,6 @@ import { OnModuleDestroy, OnModuleInit, } from '@nestjs/common'; -import { ConfigService } from '@nestjs/config'; import { type EnrichResult, RiotAccountEnrichmentService, @@ -20,11 +19,17 @@ const LEADER_TTL_SECONDS = 90; const LEADER_RENEW_INTERVAL_MS = 30_000; const STALE_THRESHOLD_MS = 6 * 60 * 60 * 1000; const PER_TICK_CANDIDATE_LIMIT = 20; -const ENRICH_COST_TOKENS = 8; +const DAWN_USAGE_RATIO = 0.8; +const OPPORTUNISTIC_USAGE_RATIO = 0.5; const FAILURE_BACKOFF_KEY_PREFIX = 'riot:bg:fail'; const FAILURE_BACKOFF_THRESHOLD = 3; const FAILURE_BACKOFF_TTL_SECONDS = 24 * 60 * 60; +interface RefreshGatePolicy { + mode: 'dawn' | 'opportunistic'; + usageRatio: number; +} + @Injectable() export class BackgroundRefreshScheduler implements OnModuleInit, OnModuleDestroy @@ -34,26 +39,15 @@ export class BackgroundRefreshScheduler private leaderRenewTimer?: NodeJS.Timeout; private tickInProgress = false; private readonly consumer = `${process.pid}:${Math.random().toString(36).slice(2)}`; - private readonly enabled: boolean; constructor( private readonly garnet: GarnetService, private readonly rateLimiter: RiotRateLimiterService, private readonly enrichmentService: RiotAccountEnrichmentService, private readonly staleAccountRepository: StaleAccountRepository, - config: ConfigService, - ) { - this.enabled = config.get('RIOT_BG_REFRESH_ENABLED') === 'true'; - } + ) {} public onModuleInit(): void { - if (!this.enabled) { - this.logger.log( - 'Background Riot refresh is disabled (RIOT_BG_REFRESH_ENABLED).', - ); - return; - } - this.tickTimer = setInterval(() => void this.safeTick(), TICK_INTERVAL_MS); this.leaderRenewTimer = setInterval( () => void this.renewLeaderIfHeld(), @@ -87,7 +81,11 @@ export class BackgroundRefreshScheduler } private async tick(): Promise { - if (!isInKstBackgroundWindow()) return; + const initialGate = this.currentRefreshGatePolicy(); + if (!(await this.rateLimiter.isRefreshWindowOpen(initialGate.usageRatio))) { + return; + } + const isLeader = await this.tryBecomeLeader(); if (!isLeader) return; @@ -101,15 +99,20 @@ export class BackgroundRefreshScheduler let processed = 0; let failed = 0; let skipped = 0; + let currentGate = initialGate; for (const candidate of candidates) { - if (!isInKstBackgroundWindow()) break; + currentGate = this.currentRefreshGatePolicy(); + if ( + !(await this.rateLimiter.isRefreshWindowOpen(currentGate.usageRatio)) + ) { + break; + } if (await this.isInFailureBackoff(candidate.puuid)) { skipped += 1; continue; } - await this.rateLimiter.acquireBackground(ENRICH_COST_TOKENS); await this.enrichmentService.markRefreshRequested( candidate.userId, candidate.puuid, @@ -142,10 +145,18 @@ export class BackgroundRefreshScheduler } this.logger.debug( - `Background refresh tick: processed=${processed} failed=${failed} skipped=${skipped} candidates=${candidates.length}`, + `Background refresh tick: processed=${processed} failed=${failed} skipped=${skipped} candidates=${candidates.length} mode=${currentGate.mode} ratio=${currentGate.usageRatio}`, ); } + private currentRefreshGatePolicy(): RefreshGatePolicy { + const isDawn = isInKstBackgroundWindow(); + return { + mode: isDawn ? 'dawn' : 'opportunistic', + usageRatio: isDawn ? DAWN_USAGE_RATIO : OPPORTUNISTIC_USAGE_RATIO, + }; + } + private async tryBecomeLeader(): Promise { const current = await this.garnet.getString(LEADER_KEY); if (current === this.consumer) { diff --git a/apps/api/src/modules/riot-job-queue/riot-job-worker.service.spec.ts b/apps/api/src/modules/riot-job-queue/riot-job-worker.service.spec.ts new file mode 100644 index 00000000..cca7bc82 --- /dev/null +++ b/apps/api/src/modules/riot-job-queue/riot-job-worker.service.spec.ts @@ -0,0 +1,154 @@ +import mongoose from 'mongoose'; +import { ConnectionService } from '../global/database/connection.service'; +import { GarnetService } from '../global/garnet/garnet.service'; +import { LegacyImportService } from '../legacy-import/legacy-import.service'; +import { RiotAccountEnrichmentService } from '../riot/riot-account-enrichment.service'; +import { RiotRecentMatchesService } from '../riot/riot-recent-matches.service'; +import { TournamentResultService } from '../tournament-result/tournament-result.service'; +import { RIOT_JOB_GROUP, RiotRefreshSubJob } from './riot-job-queue.types'; +import { RiotJobQueueService } from './riot-job-queue.service'; +import { RiotJobWorkerService } from './riot-job-worker.service'; +import { RiotRefreshGateway } from './riot-refresh.gateway'; + +function execResult(value: T) { + return { exec: jest.fn().mockResolvedValue(value) }; +} + +function makeWorker() { + const garnetService = { + acknowledgeStream: jest.fn().mockResolvedValue(undefined), + deleteStreamEntries: jest.fn().mockResolvedValue(undefined), + } as unknown as jest.Mocked; + const jobQueueService = { + markProcessing: jest.fn().mockResolvedValue(undefined), + markCompleted: jest.fn().mockResolvedValue({ + parentJobId: 'parent-1', + jobId: 'job-1', + queueGroup: 'summoners-rift', + puuid: 'puuid-1', + state: 'completed', + }), + markFailed: jest.fn(), + } as unknown as jest.Mocked; + const recentMatchesService = { + ensureFreshForQueue: jest.fn().mockResolvedValue(undefined), + } as unknown as jest.Mocked; + const userModel = { + updateOne: jest.fn().mockReturnValue(execResult({ modifiedCount: 1 })), + }; + const connectionService = { + getModel: jest.fn().mockResolvedValue(userModel), + } as unknown as jest.Mocked; + const refreshGateway = { + broadcastRefreshEvent: jest.fn(), + } as unknown as jest.Mocked; + const tournamentResultService = { + processPollJob: jest.fn(), + } as unknown as jest.Mocked; + const legacyImportService = { + processMemberJob: jest.fn(), + } as unknown as jest.Mocked; + const enrichmentService = { + refreshLeagueEntries: jest.fn().mockResolvedValue('updated'), + } as unknown as jest.Mocked; + + const worker = new RiotJobWorkerService( + garnetService, + jobQueueService, + recentMatchesService, + connectionService, + refreshGateway, + tournamentResultService, + legacyImportService, + enrichmentService, + ); + + return { + worker, + garnetService, + jobQueueService, + recentMatchesService, + connectionService, + refreshGateway, + enrichmentService, + }; +} + +describe('RiotJobWorkerService', () => { + it('acknowledges and deletes invalid stream entries', async () => { + const { worker, garnetService } = makeWorker(); + + await ( + worker as unknown as { + processEntry: ( + stream: string, + entry: { id: string; message: Record }, + ) => Promise; + } + ).processEntry('riot:queue:high', { + id: 'bad-1', + message: { job: 'not-json' }, + }); + + expect(garnetService.acknowledgeStream).toHaveBeenCalledWith( + 'riot:queue:high', + RIOT_JOB_GROUP, + 'bad-1', + ); + expect(garnetService.deleteStreamEntries).toHaveBeenCalledWith( + 'riot:queue:high', + 'bad-1', + ); + }); + + it('refreshes league entries while processing user history refresh jobs', async () => { + const { worker, enrichmentService, recentMatchesService, garnetService } = + makeWorker(); + const userId = new mongoose.Types.ObjectId().toString(); + const job: RiotRefreshSubJob = { + jobId: 'job-1', + parentJobId: 'parent-1', + userId, + puuid: 'puuid-1', + region: 'asia', + platform: 'kr', + queueGroup: 'summoners-rift', + queueIds: [420, 430], + requestedAt: Date.now(), + priority: 'high', + }; + + await ( + worker as unknown as { + processEntry: ( + stream: string, + entry: { id: string; message: Record }, + ) => Promise; + } + ).processEntry('riot:queue:high', { + id: '1-0', + message: { job: JSON.stringify(job) }, + }); + + expect(recentMatchesService.ensureFreshForQueue).toHaveBeenCalledTimes(2); + expect(enrichmentService.refreshLeagueEntries).toHaveBeenCalledWith({ + userId: expect.any(mongoose.Types.ObjectId), + puuid: 'puuid-1', + platform: 'kr', + }); + expect(garnetService.acknowledgeStream).toHaveBeenCalledWith( + 'riot:queue:high', + RIOT_JOB_GROUP, + '1-0', + ); + expect(garnetService.deleteStreamEntries).toHaveBeenCalledWith( + 'riot:queue:high', + '1-0', + ); + expect( + garnetService.acknowledgeStream.mock.invocationCallOrder[0], + ).toBeLessThan( + garnetService.deleteStreamEntries.mock.invocationCallOrder[0], + ); + }); +}); diff --git a/apps/api/src/modules/riot-job-queue/riot-job-worker.service.ts b/apps/api/src/modules/riot-job-queue/riot-job-worker.service.ts index a543d8cb..8ed9ebc6 100644 --- a/apps/api/src/modules/riot-job-queue/riot-job-worker.service.ts +++ b/apps/api/src/modules/riot-job-queue/riot-job-worker.service.ts @@ -9,7 +9,10 @@ import { ConnectionService } from '../global/database/connection.service'; import { GarnetService, StreamEntry } from '../global/garnet/garnet.service'; import { LegacyImportService } from '../legacy-import/legacy-import.service'; import type { LegacyImportMemberJob } from '../legacy-import/legacy-import.types'; +import { RiotAccountEnrichmentService } from '../riot/riot-account-enrichment.service'; import { RiotRecentMatchesService } from '../riot/riot-recent-matches.service'; +import { TournamentResultService } from '../tournament-result/tournament-result.service'; +import type { PollTournamentResultJob } from '../tournament-result/tournament-result.types'; import { RIOT_JOB_GROUP, RIOT_JOB_HIGH_STREAM, @@ -19,8 +22,6 @@ import { } from './riot-job-queue.types'; import { RiotJobQueueService } from './riot-job-queue.service'; import { RiotRefreshGateway } from './riot-refresh.gateway'; -import { TournamentResultService } from '../tournament-result/tournament-result.service'; -import type { PollTournamentResultJob } from '../tournament-result/tournament-result.types'; const LEADER_KEY = 'riot:worker:leader'; const LEADER_TTL_SECONDS = 60; @@ -39,6 +40,7 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy { private readonly refreshGateway: RiotRefreshGateway, private readonly tournamentResultService: TournamentResultService, private readonly legacyImportService: LegacyImportService, + private readonly enrichmentService: RiotAccountEnrichmentService, ) {} public async onModuleInit() { @@ -77,10 +79,13 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy { } } - private async processEntry(stream: string, entry: StreamEntry): Promise { + private async processEntry( + stream: string, + entry: StreamEntry, + ): Promise { const job = this.parseJob(entry); if (!job) { - await this.garnetService.acknowledgeStream(stream, RIOT_JOB_GROUP, entry.id); + await this.acknowledgeAndDelete(stream, entry.id); return; } @@ -102,6 +107,7 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy { queueId, }); } + await this.refreshLeagueEntries(job); await this.markUserFetchedAt(job); const event = await this.jobQueueService.markCompleted(job); this.refreshGateway.broadcastRefreshEvent(event); @@ -131,7 +137,50 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy { }`, ); } finally { - await this.garnetService.acknowledgeStream(stream, RIOT_JOB_GROUP, entry.id); + await this.acknowledgeAndDelete(stream, entry.id); + } + } + + private async acknowledgeAndDelete( + stream: string, + id: string, + ): Promise { + await this.garnetService.acknowledgeStream(stream, RIOT_JOB_GROUP, id); + await this.deleteAcknowledgedEntry(stream, id); + } + + private async deleteAcknowledgedEntry( + stream: string, + id: string, + ): Promise { + try { + await this.garnetService.deleteStreamEntries(stream, id); + } catch (error) { + this.logger.warn( + `Failed to delete acknowledged Riot job stream entry ${stream} ${id}: ${ + error instanceof Error ? error.message : error + }`, + ); + } + } + + private async refreshLeagueEntries(job: RiotRefreshSubJob): Promise { + try { + const result = await this.enrichmentService.refreshLeagueEntries({ + userId: new mongoose.Types.ObjectId(job.userId), + puuid: job.puuid, + platform: job.platform, + }); + if (result !== 'failed') return; + this.logger.warn( + `Riot league refresh failed ${job.jobId}: puuid=${job.puuid}`, + ); + } catch (error) { + this.logger.warn( + `Riot league refresh failed ${job.jobId}: ${ + error instanceof Error ? error.message : error + }`, + ); } } @@ -169,9 +218,7 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy { return job.kind === 'poll-tournament-result'; } - private isLegacyImportJob( - job: RiotJobPayload, - ): job is LegacyImportMemberJob { + private isLegacyImportJob(job: RiotJobPayload): job is LegacyImportMemberJob { return job.kind === 'legacy-import-member'; } @@ -196,7 +243,8 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy { try { await this.garnetService.createConsumerGroup(stream, RIOT_JOB_GROUP); } catch (error) { - const message = error instanceof Error ? error.message : String(error); + const message = + error instanceof Error ? error.message : String(error); if (!message.includes('BUSYGROUP')) throw error; } }), diff --git a/apps/api/src/modules/riot/riot-account-enrichment.service.spec.ts b/apps/api/src/modules/riot/riot-account-enrichment.service.spec.ts index 7dc5035e..0b379dca 100644 --- a/apps/api/src/modules/riot/riot-account-enrichment.service.spec.ts +++ b/apps/api/src/modules/riot/riot-account-enrichment.service.spec.ts @@ -70,9 +70,11 @@ function makeAccount(overrides: Partial = {}): FakeAccount { function makeUser(account: FakeAccount) { const _id = new mongoose.Types.ObjectId(); + const communityId = new mongoose.Types.ObjectId(); const save = jest.fn().mockResolvedValue(undefined); return { _id, + communityId, riotAccounts: [account], save, }; @@ -86,6 +88,7 @@ function makeService(overrides?: { mastery?: Partial; recentMatches?: Partial; recentStats?: Partial; + match?: any; }) { const user = overrides?.user; const userFindById = jest.fn().mockReturnValue({ @@ -98,10 +101,15 @@ function makeService(overrides?: { Promise.resolve({ riotPlatform: 'kr', riotRegion: 'asia', - }), + }), }), }), }); + const matchUpdateManyExec = jest.fn().mockResolvedValue({ modifiedCount: 0 }); + const matchModel = { + updateMany: jest.fn().mockReturnValue({ exec: matchUpdateManyExec }), + ...overrides?.match, + }; const connectionService = { getModel: jest.fn().mockImplementation(async (modelName: string) => { if (modelName === 'user') { @@ -110,6 +118,9 @@ function makeService(overrides?: { if (modelName === 'community') { return { findById: communityFindById }; } + if (modelName === 'match') { + return matchModel; + } throw new Error(`Unexpected model: ${modelName}`); }), } as unknown as ConnectionService; @@ -160,6 +171,8 @@ function makeService(overrides?: { masteryService, recentMatchesService, recentStatsService, + matchModel, + matchUpdateManyExec, }; } @@ -370,6 +383,273 @@ describe('RiotAccountEnrichmentService', () => { expect(user.save).not.toHaveBeenCalled(); }); + it('refreshes league entries without refreshing recent matches', async () => { + const recent = new Date(Date.now() - 60_000); + const account = makeAccount({ + revisionDate: Date.now() - 60_000, + tiers: [ + { + leagueId: 'L1', + queueType: 'RANKED_SOLO_5x5', + tier: 'GOLD', + rank: 'II', + puuid: 'puuid-1', + leaguePoints: 1, + wins: 1, + losses: 1, + fetchedAt: recent, + }, + ], + recentStatsFetchedAt: recent, + recentStatsSummary: createEmptyRiotRecentStatsSummary(), + }); + const user = makeUser(account); + const { service, leagueService, recentMatchesService } = makeService({ + user, + league: { + getEntriesByPuuid: jest.fn().mockResolvedValue([ + { + leagueId: 'L2', + queueType: 'RANKED_SOLO_5x5', + tier: 'PLATINUM', + rank: 'IV', + puuid: 'puuid-1', + leaguePoints: 20, + wins: 10, + losses: 8, + }, + ]), + } as Partial, + }); + + const result = await service.refreshLeagueEntries({ + userId: user._id, + puuid: 'puuid-1', + platform: 'kr', + }); + + expect(result).toBe('updated'); + expect(leagueService.getEntriesByPuuid).toHaveBeenCalledWith('puuid-1', { + platform: 'kr', + }); + expect(recentMatchesService.syncRecentMatches).not.toHaveBeenCalled(); + expect(account.tiers).toHaveLength(1); + expect(account.tiers[0]).toMatchObject({ + leagueId: 'L2', + queueType: 'RANKED_SOLO_5x5', + tier: 'PLATINUM', + rank: 'IV', + leaguePoints: 20, + }); + expect(account.tierHistory.at(-1)).toMatchObject({ + queueType: 'RANKED_SOLO_5x5', + tier: 'PLATINUM', + rank: 'IV', + leaguePoints: 20, + }); + expect(user.save).toHaveBeenCalledTimes(1); + }); + + it('appends tier history when LP changes without tier or rank changes', async () => { + const recent = new Date(Date.now() - 60_000); + const account = makeAccount({ + revisionDate: Date.now() - 60_000, + tiers: [ + { + leagueId: 'L1', + queueType: 'RANKED_SOLO_5x5', + tier: 'GOLD', + rank: 'II', + puuid: 'puuid-1', + leaguePoints: 10, + wins: 20, + losses: 12, + fetchedAt: recent, + }, + ], + tierHistory: [ + { + queueType: 'RANKED_SOLO_5x5', + tier: 'GOLD', + rank: 'II', + leaguePoints: 10, + wins: 20, + losses: 12, + recordedAt: recent, + }, + ], + recentStatsFetchedAt: recent, + recentStatsSummary: createEmptyRiotRecentStatsSummary(), + }); + const user = makeUser(account); + const { service } = makeService({ + user, + league: { + getEntriesByPuuid: jest.fn().mockResolvedValue([ + { + leagueId: 'L1', + queueType: 'RANKED_SOLO_5x5', + tier: 'GOLD', + rank: 'II', + puuid: 'puuid-1', + leaguePoints: 44, + wins: 21, + losses: 12, + }, + ]), + } as Partial, + }); + + await service.refreshLeagueEntries({ + userId: user._id, + puuid: 'puuid-1', + platform: 'kr', + }); + + expect(account.tierHistory).toHaveLength(2); + expect(account.tierHistory.at(-1)).toMatchObject({ + queueType: 'RANKED_SOLO_5x5', + tier: 'GOLD', + rank: 'II', + leaguePoints: 44, + wins: 21, + losses: 12, + }); + }); + + it('syncs refreshed league tier into active match participant snapshots', async () => { + const recent = new Date(Date.now() - 60_000); + const account = makeAccount({ + revisionDate: Date.now() - 60_000, + tiers: [ + { + leagueId: 'L1', + queueType: 'RANKED_SOLO_5x5', + tier: 'GOLD', + rank: 'II', + puuid: 'puuid-1', + leaguePoints: 1, + wins: 1, + losses: 1, + fetchedAt: recent, + }, + ], + recentStatsFetchedAt: recent, + recentStatsSummary: createEmptyRiotRecentStatsSummary(), + }); + const user = makeUser(account); + const { service, matchModel } = makeService({ + user, + league: { + getEntriesByPuuid: jest.fn().mockResolvedValue([ + { + leagueId: 'L2', + queueType: 'RANKED_SOLO_5x5', + tier: 'PLATINUM', + rank: 'IV', + puuid: 'puuid-1', + leaguePoints: 20, + wins: 10, + losses: 8, + }, + ]), + } as Partial, + }); + + await service.refreshLeagueEntries({ + userId: user._id, + puuid: 'puuid-1', + platform: 'kr', + }); + + expect(matchModel.updateMany).toHaveBeenCalledWith( + { + status: { $in: ['recruiting', 'team-built', 'in-progress'] }, + participants: { + $elemMatch: { + userId: user._id, + puuid: 'puuid-1', + }, + }, + }, + { + $set: { + 'participants.$[participant].tier': expect.objectContaining({ + leagueId: 'L2', + queueType: 'RANKED_SOLO_5x5', + tier: 'PLATINUM', + rank: 'IV', + leaguePoints: 20, + }), + }, + }, + { + arrayFilters: [ + { + 'participant.userId': user._id, + 'participant.puuid': 'puuid-1', + }, + ], + }, + ); + }); + + it('clears active match participant tier when refreshed league entries are empty', async () => { + const recent = new Date(Date.now() - 60_000); + const account = makeAccount({ + revisionDate: Date.now() - 60_000, + tiers: [ + { + leagueId: 'L1', + queueType: 'RANKED_SOLO_5x5', + tier: 'GOLD', + rank: 'II', + puuid: 'puuid-1', + leaguePoints: 1, + wins: 1, + losses: 1, + fetchedAt: recent, + }, + ], + recentStatsFetchedAt: recent, + recentStatsSummary: createEmptyRiotRecentStatsSummary(), + }); + const user = makeUser(account); + const { service, matchModel } = makeService({ + user, + league: { + getEntriesByPuuid: jest.fn().mockResolvedValue([]), + } as Partial, + }); + + await service.refreshLeagueEntries({ + userId: user._id, + puuid: 'puuid-1', + platform: 'kr', + }); + + expect(matchModel.updateMany).toHaveBeenCalledWith( + { + status: { $in: ['recruiting', 'team-built', 'in-progress'] }, + participants: { + $elemMatch: { + userId: user._id, + puuid: 'puuid-1', + }, + }, + }, + { $unset: { 'participants.$[participant].tier': '' } }, + { + arrayFilters: [ + { + 'participant.userId': user._id, + 'participant.puuid': 'puuid-1', + }, + ], + }, + ); + }); + it('records failed for individual failing fetches but updates the rest', async () => { const account = makeAccount(); const user = makeUser(account); diff --git a/apps/api/src/modules/riot/riot-account-enrichment.service.ts b/apps/api/src/modules/riot/riot-account-enrichment.service.ts index 1f9ac2a8..c697551a 100644 --- a/apps/api/src/modules/riot/riot-account-enrichment.service.ts +++ b/apps/api/src/modules/riot/riot-account-enrichment.service.ts @@ -3,6 +3,7 @@ import mongoose from 'mongoose'; import { ConnectionService } from '../global/database/connection.service'; import { ChampionMasteryEntry, + MatchStatus, RiotAccount, TierInfo, } from '../global/database/schema'; @@ -33,6 +34,11 @@ const DEFAULT_SUMMONER_TTL_MS = 24 * 60 * 60 * 1000; // 24h const DEFAULT_LEAGUE_TTL_MS = 60 * 60 * 1000; // 1h const DEFAULT_MASTERY_TTL_MS = 6 * 60 * 60 * 1000; // 6h const DEFAULT_RECENT_MATCHES_TTL_MS = 6 * 60 * 60 * 1000; // 6h +const ACTIVE_MATCH_STATUSES: MatchStatus[] = [ + 'recruiting', + 'team-built', + 'in-progress', +]; export interface EnrichOptions { platform?: RiotPlatformRoute; @@ -52,6 +58,8 @@ export interface EnrichResult { account: RiotAccount | null; } +export type RefreshLeagueEntriesResult = 'updated' | 'failed'; + @Injectable() export class RiotAccountEnrichmentService { private readonly logger = new Logger(RiotAccountEnrichmentService.name); @@ -95,6 +103,34 @@ export class RiotAccountEnrichmentService { return promise; } + public async refreshLeagueEntries(params: { + userId: mongoose.Types.ObjectId; + puuid: string; + platform?: RiotPlatformRoute; + }): Promise { + const UserModel = await this.connectionService.getModel('user'); + const user = await UserModel.findById(params.userId).exec(); + if (!user) return 'failed'; + + const account = user.riotAccounts.find((a) => a.puuid === params.puuid); + if (!account) return 'failed'; + + const outcome = await this.fetchLeagueSafe( + params.puuid, + params.platform ?? DEFAULT_PLATFORM, + ); + if (outcome.status !== 'updated' || !outcome.dto) return 'failed'; + + this.applyLeagueEntries(account, outcome.dto); + await user.save(); + await this.syncActiveMatchParticipantTier( + user._id, + params.puuid, + account.tiers, + ); + return 'updated'; + } + private async doEnrichRiotAccount(params: { userId: mongoose.Types.ObjectId; puuid: string; @@ -218,6 +254,13 @@ export class RiotAccountEnrichmentService { ) { await user.save(); } + if (leagueOutcome.status === 'updated') { + await this.syncActiveMatchParticipantTier( + user._id, + params.puuid, + account.tiers, + ); + } return { summoner: summonerOutcome.status, @@ -400,7 +443,10 @@ export class RiotAccountEnrichmentService { const changed = !last || last.tier !== entry.tier || - (last.rank ?? '') !== (entry.rank ?? ''); + (last.rank ?? '') !== (entry.rank ?? '') || + last.leaguePoints !== entry.leaguePoints || + last.wins !== entry.wins || + last.losses !== entry.losses; if (!changed) continue; account.tierHistory.push({ @@ -438,6 +484,62 @@ export class RiotAccountEnrichmentService { account.matchIdsFetchedAt = fetchedAt; } + private async syncActiveMatchParticipantTier( + userId: mongoose.Types.ObjectId, + puuid: string, + tiers: TierInfo[], + ): Promise { + const MatchModel = await this.connectionService.getModel('match'); + const tier = this.selectParticipantTier(tiers); + const update = tier + ? { $set: { 'participants.$[participant].tier': tier } } + : { $unset: { 'participants.$[participant].tier': '' } }; + + await MatchModel.updateMany( + { + status: { $in: ACTIVE_MATCH_STATUSES }, + participants: { + $elemMatch: { + userId, + puuid, + }, + }, + }, + update, + { + arrayFilters: [ + { + 'participant.userId': userId, + 'participant.puuid': puuid, + }, + ], + }, + ).exec(); + } + + private selectParticipantTier(tiers: TierInfo[]): TierInfo | undefined { + const tier = + tiers.find((entry) => entry.queueType === 'RANKED_SOLO_5x5') ?? tiers[0]; + if (!tier) return undefined; + + return { + leagueId: tier.leagueId, + queueType: tier.queueType, + tier: tier.tier, + rank: tier.rank, + puuid: tier.puuid, + leaguePoints: tier.leaguePoints, + wins: tier.wins, + losses: tier.losses, + veteran: tier.veteran, + inactive: tier.inactive, + freshBlood: tier.freshBlood, + hotStreak: tier.hotStreak, + miniSeries: tier.miniSeries, + fetchedAt: tier.fetchedAt, + }; + } + private tiersOldestAt(tiers: TierInfo[]): number { if (tiers.length === 0) return 0; let oldest = Infinity; diff --git a/apps/api/src/modules/riot/riot-league.service.spec.ts b/apps/api/src/modules/riot/riot-league.service.spec.ts new file mode 100644 index 00000000..43158d91 --- /dev/null +++ b/apps/api/src/modules/riot/riot-league.service.spec.ts @@ -0,0 +1,47 @@ +import { RiotClientService } from './riot.client.service'; +import { RiotLeagueService } from './riot-league.service'; +import type { RiotLeagueEntryDto, RiotResponseParser } from './riot.types'; + +describe('RiotLeagueService', () => { + it('accepts Riot league entries without optional leagueId', async () => { + const client = { + get: jest.fn( + async ( + _path: string, + _options: unknown, + parser?: RiotResponseParser, + ) => + parser + ? parser([ + { + queueType: 'RANKED_SOLO_5x5', + tier: 'EMERALD', + rank: 'I', + puuid: 'puuid-1', + leaguePoints: 75, + wins: 160, + losses: 148, + }, + ]) + : ([] as T), + ), + } as unknown as RiotClientService; + const service = new RiotLeagueService(client); + + const result = await service.getEntriesByPuuid('puuid-1', { + platform: 'kr', + }); + + expect(result).toEqual([ + { + queueType: 'RANKED_SOLO_5x5', + tier: 'EMERALD', + rank: 'I', + puuid: 'puuid-1', + leaguePoints: 75, + wins: 160, + losses: 148, + }, + ]); + }); +}); diff --git a/apps/api/src/modules/riot/riot-league.service.ts b/apps/api/src/modules/riot/riot-league.service.ts index a8c4614c..3c3003d1 100644 --- a/apps/api/src/modules/riot/riot-league.service.ts +++ b/apps/api/src/modules/riot/riot-league.service.ts @@ -36,7 +36,10 @@ function parseEntry(value: unknown, index: number): RiotLeagueEntryDto { throw new TypeError(`leagueEntries[${index}] must be an object.`); } return { - leagueId: requireString(value.leagueId, `leagueEntries[${index}].leagueId`), + leagueId: optionalString( + value.leagueId, + `leagueEntries[${index}].leagueId`, + ), queueType: requireString( value.queueType, `leagueEntries[${index}].queueType`, @@ -71,6 +74,11 @@ function requireString(value: unknown, path: string): string { return value; } +function optionalString(value: unknown, path: string): string | undefined { + if (value === undefined || value === null) return undefined; + return requireString(value, path); +} + function requireNumber(value: unknown, path: string): number { if (typeof value !== 'number' || !Number.isFinite(value)) { throw new TypeError(`${path} must be a finite number.`); diff --git a/apps/api/src/modules/riot/riot-rate-limiter.service.spec.ts b/apps/api/src/modules/riot/riot-rate-limiter.service.spec.ts index af91d290..67023ba6 100644 --- a/apps/api/src/modules/riot/riot-rate-limiter.service.spec.ts +++ b/apps/api/src/modules/riot/riot-rate-limiter.service.spec.ts @@ -3,63 +3,156 @@ import { RiotRateLimiterService } from './riot-rate-limiter.service'; function makeService(sendCommand = jest.fn().mockResolvedValue(0)) { const garnet = { + getString: jest.fn().mockResolvedValue(null), raw: jest.fn().mockReturnValue({ sendCommand }), - } as unknown as GarnetService; + setString: jest.fn().mockResolvedValue(undefined), + } as unknown as jest.Mocked; return { service: new RiotRateLimiterService(garnet), + garnet, sendCommand, }; } -describe('RiotRateLimiterService background limiter', () => { +function observedState(params: { + count120: number; + limit120?: number; + observedAt: number; + windowStartAt: number; +}) { + return JSON.stringify({ + count120: params.count120, + limit120: params.limit120 ?? 100, + observedAt: params.observedAt, + windowStartAt: params.windowStartAt, + }); +} + +describe('RiotRateLimiterService', () => { afterEach(() => { jest.restoreAllMocks(); }); - it('uses the background key namespace and passes cost to the Lua script', async () => { + it('uses global app rate keys and passes cost to the Lua script', async () => { jest.spyOn(Date, 'now').mockReturnValue(1_000); const { service, sendCommand } = makeService(); - await service.acquireBackground(8); + await service.acquire('asia', 3); expect(sendCommand).toHaveBeenCalledTimes(1); const command = sendCommand.mock.calls[0][0] as string[]; expect(command[0]).toBe('EVAL'); expect(command[2]).toBe('2'); - expect(command[3]).toBe('riot:bg:rl:1000'); - expect(command[4]).toBe('riot:bg:rl:120000'); + expect(command[3]).toBe('riot:rl:app:1000'); + expect(command[4]).toBe('riot:rl:app:120000'); expect(command[5]).toBe('1000'); - expect(command[7]).toBe('8'); + expect(command[7]).toBe('3'); }); - it('reads cleaned background usage for both windows', async () => { - jest.spyOn(Date, 'now').mockReturnValue(200_000); - const sendCommand = jest - .fn() - .mockImplementation(async (command: string[]) => { - if (command[0] === 'ZREMRANGEBYSCORE') return 0; - if (command[1] === 'riot:bg:rl:1000') return 3; - if (command[1] === 'riot:bg:rl:120000') return 24; - return 0; - }); - const { service } = makeService(sendCommand); + it('records the 120 second app rate observation from Riot headers', async () => { + jest.spyOn(Date, 'now').mockReturnValue(1_000_000); + const { service, garnet } = makeService(); - await expect(service.getBackgroundUsage()).resolves.toEqual({ - used1s: 3, - used2m: 24, + await service.recordAppRateLimitObservation('47:120,3:1', '100:120,20:1'); + + expect(garnet.setString).toHaveBeenCalledTimes(1); + const [key, raw, ttl] = garnet.setString.mock.calls[0]; + expect(key).toBe('riot:app:rl:observed'); + expect(ttl).toBe(300); + expect(JSON.parse(raw)).toEqual({ + count120: 47, + limit120: 100, + observedAt: 1_000_000, + windowStartAt: 1_000_000, + }); + }); + + it('resets the inferred window when Riot count decreases or observation is stale', async () => { + const { service, garnet } = makeService(); + + jest.spyOn(Date, 'now').mockReturnValue(1_060_000); + garnet.getString.mockResolvedValueOnce( + observedState({ + count120: 80, + observedAt: 1_050_000, + windowStartAt: 1_000_000, + }), + ); + + await service.recordAppRateLimitObservation('2:120', null); + + expect(JSON.parse(garnet.setString.mock.calls[0][1])).toMatchObject({ + count120: 2, + windowStartAt: 1_060_000, }); - expect(sendCommand).toHaveBeenCalledWith([ - 'ZREMRANGEBYSCORE', - 'riot:bg:rl:1000', - '-inf', - '199000', - ]); - expect(sendCommand).toHaveBeenCalledWith([ - 'ZREMRANGEBYSCORE', - 'riot:bg:rl:120000', - '-inf', - '80000', - ]); + jest.spyOn(Date, 'now').mockReturnValue(1_240_000); + garnet.getString.mockResolvedValueOnce( + observedState({ + count120: 20, + observedAt: 1_120_000, + windowStartAt: 1_000_000, + }), + ); + + await service.recordAppRateLimitObservation('25:120', null); + + expect(JSON.parse(garnet.setString.mock.calls[1][1])).toMatchObject({ + count120: 25, + windowStartAt: 1_240_000, + }); + }); + + it('opens the refresh gate when there is no active observation', async () => { + const { service, garnet } = makeService(); + + await expect(service.isRefreshWindowOpen(0.5)).resolves.toBe(true); + + garnet.getString.mockResolvedValueOnce( + observedState({ + count120: 90, + observedAt: 1_000_000, + windowStartAt: 900_000, + }), + ); + jest.spyOn(Date, 'now').mockReturnValue(1_120_000); + + await expect(service.isRefreshWindowOpen(0.5)).resolves.toBe(true); + }); + + it.each([ + { ratio: 0.5, count120: 49, expected: true }, + { ratio: 0.5, count120: 50, expected: false }, + { ratio: 0.8, count120: 79, expected: true }, + { ratio: 0.8, count120: 80, expected: false }, + ])( + 'checks tail headroom for refresh gate ratio=$ratio count=$count120', + async ({ ratio, count120, expected }) => { + jest.spyOn(Date, 'now').mockReturnValue(1_070_000); + const { service, garnet } = makeService(); + garnet.getString.mockResolvedValue( + observedState({ + count120, + observedAt: 1_069_000, + windowStartAt: 1_000_000, + }), + ); + + await expect(service.isRefreshWindowOpen(ratio)).resolves.toBe(expected); + }, + ); + + it('keeps the refresh gate closed before the 120 second window tail', async () => { + jest.spyOn(Date, 'now').mockReturnValue(1_050_000); + const { service, garnet } = makeService(); + garnet.getString.mockResolvedValue( + observedState({ + count120: 10, + observedAt: 1_049_000, + windowStartAt: 1_000_000, + }), + ); + + await expect(service.isRefreshWindowOpen(0.8)).resolves.toBe(false); }); }); diff --git a/apps/api/src/modules/riot/riot-rate-limiter.service.ts b/apps/api/src/modules/riot/riot-rate-limiter.service.ts index a26dde07..a7d39e99 100644 --- a/apps/api/src/modules/riot/riot-rate-limiter.service.ts +++ b/apps/api/src/modules/riot/riot-rate-limiter.service.ts @@ -7,11 +7,19 @@ const APP_LIMITS = [ { windowMs: 120_000, max: 90 }, ] as const; -const BACKGROUND_LIMITS = [ - { windowMs: 1_000, max: 6 }, - { windowMs: 120_000, max: 36 }, -] as const; -const BACKGROUND_KEY_PREFIX = 'riot:bg:rl'; +const APP_KEY_PREFIX = 'riot:rl:app'; +const APP_WINDOW_MS = 120_000; +const TAIL_MS = 60_000; +const APP_OBSERVED_KEY = 'riot:app:rl:observed'; +const APP_OBSERVED_TTL_SECONDS = 300; +const DEFAULT_APP_LIMIT_120 = 100; + +interface AppRateObservation { + count120: number; + limit120: number; + observedAt: number; + windowStartAt: number; +} const ACQUIRE_SCRIPT = ` local now = tonumber(ARGV[1]) @@ -81,85 +89,78 @@ export class RiotRateLimiterService { public async acquire( route: RiotRegionalRoute | RiotPlatformRoute, + cost = 1, ): Promise { - for (;;) { - const now = Date.now(); - const waitMs = await this.checkAndAdd(route, now, 1); - if (waitMs <= 0) return; - - if (waitMs >= 100) { - this.logger.warn( - `Riot API throttle waiting ${waitMs}ms for route=${route}.`, - ); - } - await sleep(waitMs); - } - } - - public async acquireBackground(cost = 1): Promise { const normalizedCost = normalizeCost(cost); for (;;) { const now = Date.now(); - const waitMs = await this.checkAndAddBackground(now, normalizedCost); + const waitMs = await this.checkAndAdd(now, normalizedCost); if (waitMs <= 0) return; if (waitMs >= 100) { this.logger.warn( - `Background Riot throttle waiting ${waitMs}ms (cost=${normalizedCost}).`, + `Riot API throttle waiting ${waitMs}ms for route=${route} cost=${normalizedCost}.`, ); } await sleep(waitMs); } } - public async getBackgroundUsage(): Promise<{ - used1s: number; - used2m: number; - }> { - const client = this.garnet.raw(); - const now = Date.now(); - const usages = await Promise.all( - BACKGROUND_LIMITS.map(async (limit) => { - const key = `${BACKGROUND_KEY_PREFIX}:${limit.windowMs}`; - await client.sendCommand([ - 'ZREMRANGEBYSCORE', - key, - '-inf', - String(now - limit.windowMs), - ]); - const response = await client.sendCommand(['ZCARD', key]); - const count = Number(response ?? 0); - return Number.isFinite(count) && count > 0 ? count : 0; - }), - ); + public async recordAppRateLimitObservation( + countHeader: string | null, + limitHeader?: string | null, + ): Promise { + const count120 = parseRateLimitHeader(countHeader, 120); + if (count120 === null) return; - return { - used1s: usages[0] ?? 0, - used2m: usages[1] ?? 0, + const limit120 = + parseRateLimitHeader(limitHeader ?? null, 120) ?? DEFAULT_APP_LIMIT_120; + const now = Date.now(); + const previous = await this.getAppRateObservation(); + const windowStartAt = + !previous || + now - previous.observedAt >= APP_WINDOW_MS || + count120 < previous.count120 + ? now + : previous.windowStartAt; + + const observation: AppRateObservation = { + count120, + limit120, + observedAt: now, + windowStartAt, }; + + // Concurrent responses can race here. This observation is advisory, so + // last-writer-wins is acceptable and self-corrects on the next Riot header. + await this.garnet.setString( + APP_OBSERVED_KEY, + JSON.stringify(observation), + APP_OBSERVED_TTL_SECONDS, + ); } - private async checkAndAdd( - route: RiotRegionalRoute | RiotPlatformRoute, - now: number, - cost: number, - ): Promise { + public async isRefreshWindowOpen( + usageRatio: number, + now = Date.now(), + ): Promise { + const observation = await this.getAppRateObservation(); + if (!observation) return true; + if (now - observation.observedAt >= APP_WINDOW_MS) return true; + + const ratio = Number.isFinite(usageRatio) ? usageRatio : 0; + const headroomOk = observation.count120 < observation.limit120 * ratio; + const inTail = now >= observation.windowStartAt + APP_WINDOW_MS - TAIL_MS; + return headroomOk && inTail; + } + + private async checkAndAdd(now: number, cost: number): Promise { const keys = APP_LIMITS.map( - (limit) => `riot:rl:${route}:${limit.windowMs}`, + (limit) => `${APP_KEY_PREFIX}:${limit.windowMs}`, ); return this.checkAndAddWithLimits(keys, APP_LIMITS, now, cost); } - private async checkAndAddBackground( - now: number, - cost: number, - ): Promise { - const keys = BACKGROUND_LIMITS.map( - (limit) => `${BACKGROUND_KEY_PREFIX}:${limit.windowMs}`, - ); - return this.checkAndAddWithLimits(keys, BACKGROUND_LIMITS, now, cost); - } - private async checkAndAddWithLimits( keys: string[], limits: ReadonlyArray<{ windowMs: number; max: number }>, @@ -187,6 +188,32 @@ export class RiotRateLimiterService { if (!Number.isFinite(waitMs) || waitMs < 0) return 0; return waitMs; } + + private async getAppRateObservation(): Promise { + const raw = await this.garnet.getString(APP_OBSERVED_KEY); + if (!raw) return null; + + try { + const parsed = JSON.parse(raw) as Partial; + if ( + typeof parsed.count120 !== 'number' || + typeof parsed.limit120 !== 'number' || + typeof parsed.observedAt !== 'number' || + typeof parsed.windowStartAt !== 'number' + ) { + return null; + } + + return { + count120: parsed.count120, + limit120: parsed.limit120, + observedAt: parsed.observedAt, + windowStartAt: parsed.windowStartAt, + }; + } catch { + return null; + } + } } function normalizeCost(cost: number): number { @@ -194,6 +221,24 @@ function normalizeCost(cost: number): number { return Math.max(1, Math.floor(cost)); } +function parseRateLimitHeader( + header: string | null, + windowSeconds: number, +): number | null { + if (!header) return null; + + for (const rawEntry of header.split(',')) { + const [rawCount, rawWindow] = rawEntry.trim().split(':'); + const count = Number(rawCount); + const window = Number(rawWindow); + if (window === windowSeconds && Number.isFinite(count) && count >= 0) { + return count; + } + } + + return null; +} + function sleep(ms: number): Promise { return new Promise((resolve) => setTimeout(resolve, ms)); } diff --git a/apps/api/src/modules/riot/riot.client.service.spec.ts b/apps/api/src/modules/riot/riot.client.service.spec.ts new file mode 100644 index 00000000..479a6b52 --- /dev/null +++ b/apps/api/src/modules/riot/riot.client.service.spec.ts @@ -0,0 +1,43 @@ +import { SecretService } from '../global/secret/secret.service'; +import { RiotClientService } from './riot.client.service'; +import { RiotRateLimiterService } from './riot-rate-limiter.service'; + +describe('RiotClientService', () => { + const originalFetch = global.fetch; + + afterEach(() => { + global.fetch = originalFetch; + jest.restoreAllMocks(); + }); + + it('records Riot app rate limit headers after a response', async () => { + const secretService = { + get: jest.fn().mockResolvedValue('riot-key'), + } as unknown as jest.Mocked; + const rateLimiter = { + acquire: jest.fn().mockResolvedValue(undefined), + recordAppRateLimitObservation: jest.fn().mockResolvedValue(undefined), + } as unknown as jest.Mocked; + global.fetch = jest.fn().mockResolvedValue({ + headers: { + get: jest.fn((name: string) => { + if (name === 'X-App-Rate-Limit-Count') return '47:120,3:1'; + if (name === 'X-App-Rate-Limit') return '100:120,20:1'; + return null; + }), + }, + json: jest.fn().mockResolvedValue({ ok: true }), + ok: true, + status: 200, + } as unknown as Response); + const service = new RiotClientService(secretService, rateLimiter); + + await service.get('/lol/status/v4/platform-data', { platform: 'kr' }); + + expect(rateLimiter.acquire).toHaveBeenCalledWith('kr'); + expect(rateLimiter.recordAppRateLimitObservation).toHaveBeenCalledWith( + '47:120,3:1', + '100:120,20:1', + ); + }); +}); diff --git a/apps/api/src/modules/riot/riot.client.service.ts b/apps/api/src/modules/riot/riot.client.service.ts index 9c8e3225..c8c0ecd9 100644 --- a/apps/api/src/modules/riot/riot.client.service.ts +++ b/apps/api/src/modules/riot/riot.client.service.ts @@ -140,16 +140,18 @@ export class RiotClientService { }); const appRateLimitCount = response.headers.get('X-App-Rate-Limit-Count'); + const appRateLimit = response.headers.get('X-App-Rate-Limit'); + void this.rateLimiter.recordAppRateLimitObservation( + appRateLimitCount, + appRateLimit, + ); if (appRateLimitCount && Math.random() < 0.05) { this.logger.debug(`Riot rate usage ${routeKey}: ${appRateLimitCount}`); } if (!response.ok) { const error = await this.createApiError(response, url); - if ( - error.status === 429 && - attempt === 0 - ) { + if (error.status === 429 && attempt === 0) { await sleep((error.retryAfterSeconds ?? 1) * 1000); return this.fetchWithRetry( url, diff --git a/apps/api/src/modules/riot/riot.types.ts b/apps/api/src/modules/riot/riot.types.ts index dd7df8d1..fa890349 100644 --- a/apps/api/src/modules/riot/riot.types.ts +++ b/apps/api/src/modules/riot/riot.types.ts @@ -89,7 +89,7 @@ export interface RiotSummonerDto { // League-V4 entries by-puuid 응답 export interface RiotLeagueEntryDto { - leagueId: string; + leagueId?: string; queueType: string; tier: string; rank: string; diff --git a/apps/web/index.html b/apps/web/index.html index ae9502bc..77cbd64a 100644 --- a/apps/web/index.html +++ b/apps/web/index.html @@ -1,5 +1,5 @@ - + @@ -7,6 +7,21 @@ 롤림푸스 - 내전 관리 +
diff --git a/apps/web/package.json b/apps/web/package.json index 09296fec..8d9b78b5 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -5,6 +5,8 @@ "type": "module", "scripts": { "dev": "vite", + "start:dev": "vite --mode development", + "start:staging": "vite --mode staging", "build": "tsc -b && vite build", "build:staging": "tsc -b && vite build --mode staging", "build:prod": "tsc -b && vite build --mode production", @@ -23,6 +25,7 @@ "react": "^19.2.4", "react-dom": "^19.2.4", "react-router": "^7.14.0", + "recharts": "^3.8.1", "socket.io-client": "^4.8.3" }, "devDependencies": { diff --git a/apps/web/src/App.tsx b/apps/web/src/App.tsx index 93ff7eab..ed8d4b43 100644 --- a/apps/web/src/App.tsx +++ b/apps/web/src/App.tsx @@ -1,7 +1,9 @@ import { BrowserRouter, Link, Route, Routes } from "react-router"; +import type { ReactNode } from "react"; import { useMsal } from "@azure/msal-react"; +import { Moon, Sun } from "lucide-react"; import DevAuthSwitcher from "./components/DevAuthSwitcher"; -import { DEFAULT_COMMUNITY_ID } from "./config"; +import { DEFAULT_COMMUNITY_ID, setTheme, useTheme } from "./config"; import { useCommunity } from "./api/hooks"; import { isMsalConfigured } from "./lib/auth/msal.config"; import AuthCallbackPage from "./pages/AuthCallback"; @@ -24,7 +26,10 @@ function MsalHeaderActions() { if (!account) { return ( - + 로그인 ); @@ -33,80 +38,187 @@ function MsalHeaderActions() { return ( ); } +function ThemeToggle() { + const theme = useTheme(); + const nextTheme = theme === "light" ? "dark" : "light"; + const label = nextTheme === "dark" ? "다크 테마로 전환" : "라이트 테마로 전환"; + const Icon = nextTheme === "dark" ? Moon : Sun; + + return ( + + + + ); +} + +function AppFooter() { + return ( +
+
+ +

+ © 2026 LOLYMPUS. LOLYMPUS is not endorsed by Riot Games and + does not reflect the views or opinions of Riot Games or anyone + officially involved in producing or managing League of Legends. + League of Legends and Riot Games are trademarks or registered + trademarks of Riot Games, Inc. League of Legends © Riot Games, Inc. +

+
+
+ ); +} + +function LegalPage({ + title, + children, +}: { + title: string; + children: ReactNode; +}) { + return ( +
+ + ← 홈으로 + +

{title}

+
+ {children} +
+
+ ); +} + function App() { const communityQuery = useCommunity(DEFAULT_COMMUNITY_ID); const communityLabel = communityQuery.data?.name ?? "LOLYMPUS"; return ( -
+
- - } /> - } /> - } /> - } /> - } - /> - } /> - } /> - } - /> - } - /> - } - /> - } - /> - } - /> - } - /> - +
+ + } /> + } /> + } /> + } /> + } + /> + } /> + } /> + } + /> + } + /> + } + /> + } + /> + } + /> + } + /> + +

+ This service is provided for community tournament support, + including match scheduling, participation management, team + organization, and related statistics. +

+

+ By using this service, users agree not to interfere with + service operation, misuse community data, or submit content + that violates applicable laws or community rules. +

+ + } + /> + +

+ This service processes account, profile, match + participation, team, and authentication data only as needed + to operate community tournament features. +

+

+ Users may request access, correction, or deletion of their + personal data through the service administrator, subject to + records that must be retained for service integrity or legal + obligations. +

+ + } + /> +
+
+
diff --git a/apps/web/src/api/hooks.ts b/apps/web/src/api/hooks.ts index 8546bf22..6857fd41 100644 --- a/apps/web/src/api/hooks.ts +++ b/apps/web/src/api/hooks.ts @@ -50,6 +50,11 @@ const DDRAGON_MANIFEST_STALE_MS = 24 * 60 * 60 * 1000; interface MatchesQueryOptions { status?: MatchStatus; limit?: number; + page?: number; + offset?: number; + scheduledFrom?: string; + scheduledTo?: string; + sort?: 'asc' | 'desc'; } export interface UserHistoryFilters { @@ -74,6 +79,11 @@ function createMatchesPath( const searchParams = new URLSearchParams(); if (options.status) searchParams.set('status', options.status); if (options.limit) searchParams.set('limit', String(options.limit)); + if (options.page) searchParams.set('page', String(options.page)); + if (options.offset) searchParams.set('offset', String(options.offset)); + if (options.scheduledFrom) searchParams.set('scheduledFrom', options.scheduledFrom); + if (options.scheduledTo) searchParams.set('scheduledTo', options.scheduledTo); + if (options.sort) searchParams.set('sort', options.sort); const queryString = searchParams.toString(); return `/communities/${communityId}/matches${queryString ? `?${queryString}` : ''}`; @@ -93,7 +103,17 @@ export function useMatches( communityId = DEFAULT_COMMUNITY_ID, ) { return useQuery({ - queryKey: ['matches', communityId, options.status ?? null, options.limit ?? null], + queryKey: [ + 'matches', + communityId, + options.status ?? null, + options.limit ?? null, + options.page ?? null, + options.offset ?? null, + options.scheduledFrom ?? null, + options.scheduledTo ?? null, + options.sort ?? null, + ], queryFn: async () => { const response = await apiFetch( createMatchesPath(communityId, options), @@ -105,6 +125,31 @@ export function useMatches( }); } +export function useMatchesPage( + options: MatchesQueryOptions, + communityId = DEFAULT_COMMUNITY_ID, +) { + return useQuery({ + queryKey: [ + 'matches-page', + communityId, + options.status ?? null, + options.limit ?? null, + options.page ?? null, + options.offset ?? null, + options.scheduledFrom ?? null, + options.scheduledTo ?? null, + options.sort ?? null, + ], + queryFn: () => + apiFetch(createMatchesPath(communityId, options), { + auth: 'none', + }), + enabled: Boolean(communityId), + placeholderData: (previousData) => previousData, + }); +} + export function useMatch(matchId: string | undefined, communityId = DEFAULT_COMMUNITY_ID) { return useQuery({ queryKey: ['match', communityId, matchId ?? null], @@ -171,6 +216,15 @@ export function useUndoAuction(communityId = DEFAULT_COMMUNITY_ID) { }); } +export function useResetAuction(communityId = DEFAULT_COMMUNITY_ID) { + return useMutation({ + mutationFn: ({ matchId }: { matchId: string }) => + apiFetch(`/communities/${communityId}/matches/${matchId}/auction`, { + method: 'DELETE', + }), + }); +} + export function useCreateMatch(communityId = DEFAULT_COMMUNITY_ID) { return useMutation({ mutationFn: (body: MatchMutationRequest) => @@ -216,6 +270,7 @@ function createUserHistoryPath( export function useUserHistoryProfile( userId: string | undefined, communityId = DEFAULT_COMMUNITY_ID, + enabled = true, ) { return useQuery({ queryKey: ['user-history-profile', communityId, userId ?? null], @@ -224,7 +279,7 @@ export function useUserHistoryProfile( `/communities/${communityId}/users/${userId}/history-profile`, { auth: 'none' }, ), - enabled: Boolean(communityId && userId), + enabled: enabled && Boolean(communityId && userId), retry: false, }); } diff --git a/apps/web/src/api/mappers.ts b/apps/web/src/api/mappers.ts index 3cb9c491..98710038 100644 --- a/apps/web/src/api/mappers.ts +++ b/apps/web/src/api/mappers.ts @@ -7,6 +7,7 @@ import type { ApiPositionPreference, ApiRiotLaneStats, ApiRiotRecentStatsSummary, + ApiTierHistoryEntry, ApiTierInfo, MatchStatus, Position, @@ -91,6 +92,7 @@ export interface AuctionPlayerView extends ParticipantView { level: number; points: number; }[]; + tierHistory: ApiTierHistoryEntry[]; recentStats: { overall: ApiRiotLaneStats; byLane: Partial>; @@ -236,6 +238,7 @@ function mapAuctionPlayerToView( summonerName: player.gameName, tag: player.tagLine, tier: selectPrimaryTier(player.tiers), + tierHistory: player.tierHistory ?? [], mainPosition, subPosition, profileIconId: player.profileIconId, @@ -288,12 +291,14 @@ function mapAuctionTeamToView( ...participant, passCount: 0, masteries: [], + tierHistory: [], recentStats: createEmptyRecentStatsView(), } : { ...createFallbackParticipant(member.userId), passCount: 0, masteries: [], + tierHistory: [], recentStats: createEmptyRecentStatsView(), }); diff --git a/apps/web/src/api/types.ts b/apps/web/src/api/types.ts index e349c1c9..d65f0211 100644 --- a/apps/web/src/api/types.ts +++ b/apps/web/src/api/types.ts @@ -78,7 +78,7 @@ export interface ApiRiotAccount { summonerLevel: number; isPrimary: boolean; tiers: ApiTierInfo[]; - tierHistory: unknown[]; + tierHistory: ApiTierHistoryEntry[]; matchIds: string[]; championMasteries: ApiChampionMasteryEntry[]; championRecords: Record>; @@ -247,6 +247,7 @@ export interface ApiAuctionPlayerSnapshot { profileIconId: number; preferredPositions: ApiPositionPreference[]; tiers: ApiTierInfo[]; + tierHistory: ApiTierHistoryEntry[]; masteries: ApiChampionMasteryEntry[]; recentStatsSummary?: ApiRiotRecentStatsSummary; passCount: number; @@ -272,6 +273,14 @@ export interface ApiAuctionBid { timestamp: string; } +export interface ApiAuctionChatMessage { + id: string; + userId?: string; + displayName: string; + message: string; + sentAt: string; +} + export interface ApiAuction { _id: string; matchId: string; @@ -290,6 +299,7 @@ export interface ApiAuction { initialPoints: number; topTierThreshold: AuctionTopTierThreshold; manualTopTierUserIds: string[]; + chatMessages?: ApiAuctionChatMessage[]; startedAt?: string; completedAt?: string; createdAt: string; @@ -330,6 +340,9 @@ export interface MeResponse { export interface MatchesResponse { matches: ApiMatch[]; + total: number; + page: number; + limit: number; } export interface MatchMutationRequest { @@ -451,11 +464,23 @@ export interface ApiUserHistoryProfile { profileIconId: number; summonerLevel: number; tiers: ApiTierInfo[]; + tierHistory: ApiTierHistoryEntry[]; season: ApiHistorySeason; seasons: ApiHistorySeason[]; lastFetchedAt: string | null; } +export interface ApiTierHistoryEntry { + queueType: string; + tier: string; + rank?: string; + leaguePoints?: number; + wins?: number; + losses?: number; + recordedAt: string; + season?: string; +} + export interface ApiChampionStatsRow { championId: number; games: number; diff --git a/apps/web/src/api/useAuctionSocket.ts b/apps/web/src/api/useAuctionSocket.ts index 49cef7ed..6bc32f9f 100644 --- a/apps/web/src/api/useAuctionSocket.ts +++ b/apps/web/src/api/useAuctionSocket.ts @@ -2,7 +2,7 @@ import { useEffect, useRef, useState } from 'react'; import { io, type Socket } from 'socket.io-client'; import { API_BASE_URL, useAuthUserId } from '../config'; import { acquireAccessToken } from '../lib/auth/token-provider'; -import type { ApiAuction, Position } from './types'; +import type { ApiAuction, ApiAuctionChatMessage, Position } from './types'; type ConnectionStatus = | 'idle' @@ -17,18 +17,47 @@ interface BidPayload { bidderUserId?: string; } +interface ChatMessagePayload { + displayName?: string; + message: string; +} + +interface ChatHistoryPayload { + messages?: ApiAuctionChatMessage[]; +} + +interface ResetPayload { + matchId?: string; +} + +const MAX_CHAT_MESSAGES = 200; + +function mergeChatMessages( + current: ApiAuctionChatMessage[], + incoming: ApiAuctionChatMessage[], +) { + const byId = new Map(current.map((message) => [message.id, message])); + for (const message of incoming) { + byId.set(message.id, message); + } + + return [...byId.values()] + .sort((left, right) => Date.parse(left.sentAt) - Date.parse(right.sentAt)) + .slice(-MAX_CHAT_MESSAGES); +} + export function useAuctionSocket(matchId: string | undefined) { const authUserId = useAuthUserId(); const socketRef = useRef(null); const [auction, setAuction] = useState(null); + const [chatMessages, setChatMessages] = useState([]); + const [resetAt, setResetAt] = useState(null); const [connectionStatus, setConnectionStatus] = useState('idle'); const [error, setError] = useState(null); useEffect(() => { if (!matchId) { - setAuction(null); - setConnectionStatus('idle'); return; } @@ -65,9 +94,28 @@ export function useAuctionSocket(matchId: string | undefined) { socket.on('state', (nextAuction: ApiAuction) => { setAuction(nextAuction); + if (nextAuction.chatMessages) { + setChatMessages(mergeChatMessages([], nextAuction.chatMessages)); + } setError(null); }); + socket.on('chat-history', (payload: ChatHistoryPayload) => { + setChatMessages(mergeChatMessages([], payload.messages ?? [])); + }); + + socket.on('chat-message', (message: ApiAuctionChatMessage) => { + setChatMessages((current) => mergeChatMessages(current, [message])); + }); + + socket.on('reset', (payload: ResetPayload) => { + if (payload.matchId && payload.matchId !== matchId) return; + setAuction(null); + setChatMessages([]); + setResetAt(Date.now()); + setError('경매가 취소되었습니다.'); + }); + socket.on('error', (payload: { message?: string }) => { setConnectionStatus('error'); setError(payload.message ?? '실시간 경매 연결 중 오류가 발생했습니다.'); @@ -101,9 +149,16 @@ export function useAuctionSocket(matchId: string | undefined) { socket.emit(eventName, payload); } + const visibleAuction = auction?.matchId === matchId ? auction : null; + const visibleConnectionStatus: ConnectionStatus = matchId + ? connectionStatus + : 'idle'; + return { - auction, - connectionStatus, + auction: visibleAuction, + chatMessages: visibleAuction ? chatMessages : [], + resetAt, + connectionStatus: visibleConnectionStatus, error, placeBid(payload: BidPayload) { emit('bid', payload); @@ -117,5 +172,8 @@ export function useAuctionSocket(matchId: string | undefined) { next() { emit('next', {}); }, + sendChatMessage(payload: ChatMessagePayload) { + emit('chat-message', payload); + }, }; } diff --git a/apps/web/src/components/DevAuthSwitcher.tsx b/apps/web/src/components/DevAuthSwitcher.tsx index 29f25143..b631cb1c 100644 --- a/apps/web/src/components/DevAuthSwitcher.tsx +++ b/apps/web/src/components/DevAuthSwitcher.tsx @@ -22,10 +22,10 @@ export default function DevAuthSwitcher() { return (
-
+
Dev Auth
-
+
X-Auth-User-Id
-
+
현재값: {authUserId ?? '없음'}
diff --git a/apps/web/src/components/RankBadge.tsx b/apps/web/src/components/RankBadge.tsx new file mode 100644 index 00000000..a62bd1df --- /dev/null +++ b/apps/web/src/components/RankBadge.tsx @@ -0,0 +1,122 @@ +import type { ApiTierInfo } from "../api/types"; + +type RankBadgeSize = "sm" | "md"; +type RankBadgeTooltipPlacement = "left" | "bottom"; + +const TIER_NAMES: Record = { + IRON: "아이언", + BRONZE: "브론즈", + SILVER: "실버", + GOLD: "골드", + PLATINUM: "플래티넘", + EMERALD: "에메랄드", + DIAMOND: "다이아몬드", + MASTER: "마스터", + GRANDMASTER: "그랜드마스터", + CHALLENGER: "챌린저", +}; + +const SIZE_CLASSES: Record = { + sm: "h-[17px] min-w-[18px]", + md: "h-[18px] min-w-[20px]", +}; + +const TOOLTIP_CLASSES: Record = { + left: "tooltip-left", + bottom: "tooltip-bottom", +}; + +function normalizeRank(rank: string | undefined) { + switch (rank) { + case "I": + return "1"; + case "II": + return "2"; + case "III": + return "3"; + case "IV": + return "4"; + default: + return rank; + } +} + +function rankBadgeClass(tier: ApiTierInfo | undefined) { + switch (tier?.tier) { + case "CHALLENGER": + return "border-amber-500/60 bg-amber-100 text-amber-900 dark:border-amber-400/40 dark:bg-amber-400/20 dark:text-amber-200"; + case "GRANDMASTER": + return "border-red-500/60 bg-red-100 text-red-800 dark:border-red-400/40 dark:bg-red-400/20 dark:text-red-200"; + case "MASTER": + return "border-fuchsia-500/60 bg-fuchsia-100 text-fuchsia-800 dark:border-fuchsia-400/40 dark:bg-fuchsia-400/20 dark:text-fuchsia-200"; + case "DIAMOND": + return "border-cyan-500/60 bg-cyan-100 text-cyan-800 dark:border-cyan-400/40 dark:bg-cyan-400/20 dark:text-cyan-200"; + case "EMERALD": + return "border-emerald-500/60 bg-emerald-100 text-emerald-800 dark:border-emerald-400/40 dark:bg-emerald-400/20 dark:text-emerald-200"; + case "PLATINUM": + return "border-teal-500/60 bg-teal-100 text-teal-800 dark:border-teal-400/40 dark:bg-teal-400/20 dark:text-teal-200"; + case "GOLD": + return "border-amber-500/70 bg-amber-100 text-amber-900 dark:border-yellow-400/40 dark:bg-yellow-400/20 dark:text-yellow-200"; + case "SILVER": + return "border-slate-400/60 bg-slate-100 text-slate-700 dark:border-slate-300/40 dark:bg-slate-300/15 dark:text-slate-200"; + case "BRONZE": + return "border-orange-600/60 bg-orange-100 text-orange-800 dark:border-orange-500/40 dark:bg-orange-500/20 dark:text-orange-200"; + case "IRON": + return "border-stone-500/60 bg-stone-100 text-stone-700 dark:border-stone-400/40 dark:bg-stone-400/15 dark:text-stone-300"; + default: + return "border-base-content/30 bg-transparent text-base-content/50"; + } +} + +export function formatRankBadge(tier: ApiTierInfo | undefined) { + if (!tier) return "U"; + const tierInitial = + tier.tier === "GRANDMASTER" ? "GM" : tier.tier.slice(0, 1); + const rank = normalizeRank(tier.rank); + return rank ? `${tierInitial}${rank}` : tierInitial; +} + +export function formatRankDetail(tier: ApiTierInfo | undefined) { + if (!tier) return "랭크 정보 없음"; + const tierName = TIER_NAMES[tier.tier] ?? tier.tier; + const rank = normalizeRank(tier.rank); + const label = rank ? `${tierName} ${rank}` : tierName; + return `${label} - ${tier.leaguePoints} LP`; +} + +export function RankBadge({ + tier, + size = "md", + tooltipPlacement = "bottom", +}: { + tier?: ApiTierInfo; + size?: RankBadgeSize; + tooltipPlacement?: RankBadgeTooltipPlacement; +}) { + const tooltip = formatRankDetail(tier); + + return ( + + + {formatRankBadge(tier)} + + + ); +} + +export function ResponsiveTierLabel({ tier }: { tier?: ApiTierInfo }) { + return ( + + + + {formatRankDetail(tier)} + + + ); +} diff --git a/apps/web/src/components/TierHistoryChart.tsx b/apps/web/src/components/TierHistoryChart.tsx new file mode 100644 index 00000000..220ab749 --- /dev/null +++ b/apps/web/src/components/TierHistoryChart.tsx @@ -0,0 +1,597 @@ +import { useMemo, useState } from "react"; +import { + CartesianGrid, + Line, + LineChart, + ReferenceDot, + ReferenceLine, + ResponsiveContainer, + Tooltip, + XAxis, + YAxis, +} from "recharts"; +import type { ApiTierHistoryEntry } from "../api/types"; + +const TIER_NAMES: Record = { + IRON: "아이언", + BRONZE: "브론즈", + SILVER: "실버", + GOLD: "골드", + PLATINUM: "플래티넘", + EMERALD: "에메랄드", + DIAMOND: "다이아몬드", + MASTER: "마스터", + GRANDMASTER: "그랜드마스터", + CHALLENGER: "챌린저", +}; + +// 낮은 티어 → 높은 티어. 인덱스가 사다리값의 기준이 된다. +const TIER_ORDER = [ + "IRON", + "BRONZE", + "SILVER", + "GOLD", + "PLATINUM", + "EMERALD", + "DIAMOND", + "MASTER", + "GRANDMASTER", + "CHALLENGER", +]; + +const APEX_TIERS = new Set(["MASTER", "GRANDMASTER", "CHALLENGER"]); + +// 한 티어 = 400, 한 디비전(랭크) = 100, LP는 그대로 더한다. +const TIER_SPAN = 400; +const RANK_SPAN = 100; + +const RANK_INDEX: Record = { IV: 0, III: 1, II: 2, I: 3 }; +const RANK_BY_INDEX = ["IV", "III", "II", "I"]; + +const QUEUE_LABELS: Record = { + RANKED_SOLO_5x5: "솔로랭크", + RANKED_FLEX_SR: "자유랭크", +}; + +const TIER_COMPACT_NAMES: Record = { + IRON: "I", + BRONZE: "B", + SILVER: "S", + GOLD: "G", + PLATINUM: "P", + EMERALD: "E", + DIAMOND: "D", + MASTER: "M", + GRANDMASTER: "GM", + CHALLENGER: "C", +}; + +type PeriodKey = "30" | "90" | "all"; +type SummaryVariant = "footer" | "inline"; +type SummaryDirection = "up" | "down" | "flat"; + +const PERIOD_OPTIONS: { key: PeriodKey; label: string; days: number | null }[] = + [ + { key: "30", label: "최근 30일", days: 30 }, + { key: "90", label: "최근 90일", days: 90 }, + { key: "all", label: "전체", days: null }, + ]; + +function tierIndex(tier: string) { + const index = TIER_ORDER.indexOf(tier); + return index === -1 ? 0 : index; +} + +// 티어/랭크/LP를 단일 연속 스칼라(사다리값)로 환산한다. +function ladderValue(entry: { + tier: string; + rank?: string; + leaguePoints?: number; +}) { + const base = tierIndex(entry.tier) * TIER_SPAN; + const lp = entry.leaguePoints ?? 0; + if (APEX_TIERS.has(entry.tier)) { + return base + lp; + } + const rankIdx = RANK_INDEX[entry.rank ?? "IV"] ?? 0; + return base + rankIdx * RANK_SPAN + lp; +} + +function normalizeRank(rank: string | undefined) { + switch (rank) { + case "I": + return "1"; + case "II": + return "2"; + case "III": + return "3"; + case "IV": + return "4"; + default: + return rank ?? ""; + } +} + +function formatTierLabel(entry: { + tier: string; + rank?: string; + leaguePoints?: number; +}) { + const name = TIER_NAMES[entry.tier] ?? entry.tier; + if (APEX_TIERS.has(entry.tier)) { + return `${name} ${entry.leaguePoints ?? 0}LP`; + } + const rank = normalizeRank(entry.rank); + return `${name}${rank ? ` ${rank}` : ""} · ${entry.leaguePoints ?? 0}LP`; +} + +function formatTierCompactLabel(entry: { + tier: string; + rank?: string; + leaguePoints?: number; +}) { + const tier = TIER_COMPACT_NAMES[entry.tier] ?? entry.tier; + const lp = entry.leaguePoints ?? 0; + if (APEX_TIERS.has(entry.tier)) { + return `${tier} ${lp}LP`; + } + const rank = normalizeRank(entry.rank); + return `${tier}${rank} ${lp}LP`; +} + +function formatTierShort(tier: string) { + return TIER_NAMES[tier] ?? tier; +} + +function formatPeriodChange(summary: { + first: ChartPoint; + last: ChartPoint; + direction: SummaryDirection; +}) { + const marker = + summary.direction === "up" + ? "▲" + : summary.direction === "down" + ? "▼" + : "·"; + return `${formatTierShort(summary.first.tier)} ${marker} ${formatTierShort(summary.last.tier)}`; +} + +function formatDate(ms: number) { + return new Intl.DateTimeFormat("ko-KR", { + month: "numeric", + day: "numeric", + }).format(new Date(ms)); +} + +type ChartPoint = { + ts: number; + value: number; + tier: string; + rank?: string; + leaguePoints?: number; + wins?: number; + losses?: number; +}; + +type YGuide = { + value: number; + label: string; +}; + +function isSamePoint(left: ChartPoint, right: ChartPoint) { + return left.ts === right.ts && left.value === right.value; +} + +function nearestApexPoint(value: number, points: ChartPoint[]) { + const apexPoints = points.filter((point) => APEX_TIERS.has(point.tier)); + if (apexPoints.length === 0) return null; + + return apexPoints.reduce((best, point) => + Math.abs(point.value - value) < Math.abs(best.value - value) ? point : best, + ); +} + +function compactEntryFromLadderValue(value: number, points: ChartPoint[]) { + const rounded = Math.max(0, Math.round(value)); + const masterBase = tierIndex("MASTER") * TIER_SPAN; + + if (rounded >= masterBase) { + const apexPoint = nearestApexPoint(rounded, points); + const apexTier = apexPoint?.tier ?? "MASTER"; + const apexBase = tierIndex(apexTier) * TIER_SPAN; + if (rounded >= apexBase) { + return { + tier: apexTier, + leaguePoints: rounded - apexBase, + }; + } + + return { + tier: "MASTER", + leaguePoints: rounded - masterBase, + }; + } + + const tierIdx = Math.min( + TIER_ORDER.length - 1, + Math.floor(rounded / TIER_SPAN), + ); + const tier = TIER_ORDER[tierIdx]; + const withinTier = rounded - tierIdx * TIER_SPAN; + const rankIdx = Math.min(3, Math.floor(withinTier / RANK_SPAN)); + + return { + tier, + rank: RANK_BY_INDEX[rankIdx], + leaguePoints: withinTier - rankIdx * RANK_SPAN, + }; +} + +function buildAdaptiveYGuides(points: ChartPoint[]): YGuide[] { + if (points.length === 0) return []; + + const min = Math.min(...points.map((point) => point.value)); + const max = Math.max(...points.map((point) => point.value)); + const paddedMin = min - 60; + const paddedMax = max + 60; + const steps = [50, 100, 200, 400, 800, 1200]; + + for (const step of steps) { + const start = Math.ceil(paddedMin / step) * step; + const end = Math.floor(paddedMax / step) * step; + const count = Math.floor((end - start) / step) + 1; + + if (count >= 2 && count <= 4) { + return Array.from({ length: count }, (_, index) => { + const value = start + index * step; + return { + value, + label: formatTierCompactLabel( + compactEntryFromLadderValue(value, points), + ), + }; + }); + } + } + + const center = Math.round(((min + max) / 2) / 50) * 50; + return [center - 50, center + 50].map((value) => ({ + value, + label: formatTierCompactLabel(compactEntryFromLadderValue(value, points)), + })); +} + +function TierTooltip({ + active, + payload, +}: { + active?: boolean; + payload?: Array<{ payload: ChartPoint }>; +}) { + if (!active || !payload?.length) return null; + const point = payload[0].payload; + const games = + point.wins !== undefined && point.losses !== undefined + ? ` · ${point.wins}승 ${point.losses}패` + : ""; + return ( +
+
{formatTierLabel(point)}
+
+ {new Intl.DateTimeFormat("ko-KR", { + year: "numeric", + month: "long", + day: "numeric", + }).format(new Date(point.ts))} + {games} +
+
+ ); +} + +export default function TierHistoryChart({ + entries, + className = "border border-base-content/10 bg-base-100 mb-5 overflow-hidden", + summaryVariant = "footer", + height = 220, + showHeader = true, +}: { + entries: ApiTierHistoryEntry[]; + className?: string; + summaryVariant?: SummaryVariant; + height?: number; + showHeader?: boolean; +}) { + // 데이터에 존재하는 큐 목록 (솔로 우선) + const availableQueues = useMemo(() => { + const queues = new Set(entries.map((entry) => entry.queueType)); + return ["RANKED_SOLO_5x5", "RANKED_FLEX_SR"].filter((queue) => + queues.has(queue), + ); + }, [entries]); + + const [queue, setQueue] = useState( + availableQueues[0] ?? "RANKED_SOLO_5x5", + ); + const [period, setPeriod] = useState("all"); + + const activeQueue = availableQueues.includes(queue) + ? queue + : (availableQueues[0] ?? "RANKED_SOLO_5x5"); + + const points = useMemo(() => { + const periodDays = + PERIOD_OPTIONS.find((option) => option.key === period)?.days ?? null; + const cutoff = + periodDays === null ? 0 : Date.now() - periodDays * 24 * 60 * 60 * 1000; + + return entries + .filter((entry) => entry.queueType === activeQueue) + .map((entry) => ({ + ts: new Date(entry.recordedAt).getTime(), + value: ladderValue(entry), + tier: entry.tier, + rank: entry.rank, + leaguePoints: entry.leaguePoints, + wins: entry.wins, + losses: entry.losses, + })) + .filter((point) => point.ts >= cutoff) + .sort((left, right) => left.ts - right.ts); + }, [entries, activeQueue, period]); + + // 티어 경계(가로 점선) 후보 — 데이터 범위 안에 드는 티어 floor만. + const tierLines = useMemo(() => { + if (points.length === 0) return []; + const min = Math.min(...points.map((point) => point.value)); + const max = Math.max(...points.map((point) => point.value)); + return TIER_ORDER.map((tier, index) => ({ + tier, + value: index * TIER_SPAN, + })).filter((line) => line.value >= min - TIER_SPAN && line.value <= max); + }, [points]); + + const adaptiveYGuides = useMemo(() => { + return summaryVariant === "inline" ? buildAdaptiveYGuides(points) : []; + }, [points, summaryVariant]); + + const summary = useMemo(() => { + if (points.length === 0) return null; + const first = points[0]; + const last = points[points.length - 1]; + const peak = points.reduce((best, point) => + point.value > best.value ? point : best, + ); + const direction: SummaryDirection = + last.value > first.value + ? "up" + : last.value < first.value + ? "down" + : "flat"; + return { first, last, peak, direction }; + }, [points]); + + const xDomain = useMemo(() => { + if (summaryVariant !== "inline" || points.length < 2) { + return ["dataMin", "dataMax"] as const; + } + + const min = points[0].ts; + const max = points[points.length - 1].ts; + const span = Math.max(1, max - min); + const padding = Math.max(span * 0.18, 24 * 60 * 60 * 1000); + return [min - padding, max + padding] as const; + }, [points, summaryVariant]); + + const header = ( +
+

+ 티어 변동 +

+
+ {availableQueues.length > 1 && + availableQueues.map((option) => ( + + ))} + +
+
+ ); + + return ( +
+ {showHeader && header} + {points.length < 2 ? ( +
+ 티어 변동 기록이 아직 부족해요. +
+ 정보를 갱신할수록 변화가 쌓여 그래프로 보여드릴게요. +
+ ) : ( + <> +
+ + + + {summaryVariant === "inline" + ? adaptiveYGuides.map((guide) => ( + + )) + : tierLines.map((line) => ( + + ))} + + + } + cursor={{ + stroke: "currentColor", + strokeDasharray: "3 3", + className: "text-base-content/20", + }} + /> + {summaryVariant === "inline" && summary && ( + <> + {!isSamePoint(summary.peak, summary.last) && ( + + )} + + + )} + + + +
+ {summary && summaryVariant === "footer" && ( +
+ + 현재{" "} + + {formatTierLabel(summary.last)} + + + + 최고{" "} + + {formatTierLabel(summary.peak)} + + + + 기간 변동{" "} + + {formatPeriodChange(summary)} + + +
+ )} + + )} +
+ ); +} diff --git a/apps/web/src/config.ts b/apps/web/src/config.ts index 2e0381ca..bad4ac61 100644 --- a/apps/web/src/config.ts +++ b/apps/web/src/config.ts @@ -3,8 +3,12 @@ import { useSyncExternalStore } from 'react'; const AUTH_USER_ID_STORAGE_KEY = 'lolympus.authUserId'; const DEV_CAPTAIN_TEAM_INDEX_STORAGE_KEY = 'lolympus.devCaptainTeamIndex'; const LEGACY_DEV_CAPTAIN_SIDE_STORAGE_KEY = 'lolympus.devCaptainSide'; +const THEME_STORAGE_KEY = 'lolympus.theme'; const AUTH_USER_CHANGED_EVENT = 'lolympus:auth-user-changed'; const CAPTAIN_SIDE_CHANGED_EVENT = 'lolympus:captain-side-changed'; +const THEME_CHANGED_EVENT = 'lolympus:theme-changed'; + +export type AppTheme = 'light' | 'dark'; export const API_BASE_URL = ( import.meta.env.VITE_API_BASE_URL ?? 'http://localhost:3000' @@ -80,6 +84,40 @@ export function setDevCaptainTeamIndex(teamIndex: number | null) { dispatchWindowEvent(CAPTAIN_SIDE_CHANGED_EVENT); } +function normalizeTheme(value: string | null | undefined): AppTheme { + return value === 'dark' ? 'dark' : 'light'; +} + +function applyTheme(theme: AppTheme) { + if (typeof document === 'undefined') return; + document.documentElement.dataset.theme = theme; + document.documentElement.style.colorScheme = theme; +} + +export function getTheme(): AppTheme { + if (typeof window === 'undefined') return 'light'; + try { + return normalizeTheme(window.localStorage.getItem(THEME_STORAGE_KEY)); + } catch { + return 'light'; + } +} + +export function setTheme(theme: AppTheme) { + if (typeof window === 'undefined') return; + try { + window.localStorage.setItem(THEME_STORAGE_KEY, theme); + } catch { + // Keep applying the in-memory document theme even if persistence is blocked. + } + applyTheme(theme); + dispatchWindowEvent(THEME_CHANGED_EVENT); +} + +export function initializeTheme() { + applyTheme(getTheme()); +} + export function useAuthUserId(): string | null { return useSyncExternalStore( (callback) => subscribeToWindowChanges(AUTH_USER_CHANGED_EVENT, callback), @@ -95,3 +133,11 @@ export function useDevCaptainTeamIndex(): number | null { () => null, ); } + +export function useTheme(): AppTheme { + return useSyncExternalStore( + (callback) => subscribeToWindowChanges(THEME_CHANGED_EVENT, callback), + getTheme, + () => 'light', + ); +} diff --git a/apps/web/src/index.css b/apps/web/src/index.css index 45ade146..6466857d 100644 --- a/apps/web/src/index.css +++ b/apps/web/src/index.css @@ -1,10 +1,15 @@ @import url("https://fonts.googleapis.com/css2?family=Asta+Sans:wght@300..800&family=Gamja+Flower&display=swap"); @import "tailwindcss"; +@custom-variant dark (&:where([data-theme=dark], [data-theme=dark] *)); @plugin "daisyui" { themes: light --default, - dark --prefersdark; + dark; +} + +html { + scrollbar-gutter: stable; } body { @@ -24,8 +29,97 @@ body { "Segoe UI Emoji", "Segoe UI Symbol", sans-serif; - font-size: 14px; - line-height: 1.5; + font-size: 15px; + line-height: 1.55; +} + +/* ── 가독성 개선: 의미 기반 텍스트 대비 토큰 ── + 폰트 크기는 표준 스케일 토큰(text-xs=12px / text-sm=14px …)을 사용한다. + 새 코드에서는 text-content-subtle/muted/disabled를 우선 사용한다. */ +:root, +[data-theme="light"] { + --lts-text-subtle-strength: 66%; + --lts-text-muted-strength: 72%; + --lts-text-disabled-strength: 50%; + --lts-content-subtle: color-mix( + in oklab, + var(--color-base-content) var(--lts-text-subtle-strength), + transparent + ); + --lts-content-muted: color-mix( + in oklab, + var(--color-base-content) var(--lts-text-muted-strength), + transparent + ); + --lts-content-disabled: color-mix( + in oklab, + var(--color-base-content) var(--lts-text-disabled-strength), + transparent + ); +} + +[data-theme="dark"] { + --lts-text-subtle-strength: 66%; + --lts-text-muted-strength: 76%; + --lts-text-disabled-strength: 52%; +} + +@theme inline { + --color-content-subtle: var(--lts-content-subtle); + --color-content-muted: var(--lts-content-muted); + --color-content-disabled: var(--lts-content-disabled); +} + +@layer utilities { + /* 기존 text-base-content/nn 알파 클래스 호환 shim. + hover/focus 상태 유틸이 specificity로 이길 수 있도록 !important를 쓰지 않는다. */ + .text-base-content\/15, + .text-base-content\/20, + .text-base-content\/25, + .text-base-content\/30, + .text-base-content\/35 { + color: var(--lts-content-subtle); + } + + .text-base-content\/40, + .text-base-content\/45, + .text-base-content\/50, + .text-base-content\/55 { + color: var(--lts-content-muted); + } +} + +/* ════════════════════════════════════════════════════════════ + 🎛️ 튜닝 패널 (실험용) — 값만 바꾸면 dev에서 즉시 반영(HMR). + 확정되면 element로 전환한 뒤 이 블록을 통째로 제거할 것. + 색은 oklch(밝기% 채도 색상) 형식. + ════════════════════════════════════════════════════════════ */ +[data-theme="light"] { + /* ── 포인트 4색 (primary 주 액션 / secondary 강조 / accent 하이라이트 / info 정보·보조) ── */ + + /* 코랄레드 — primary 117곳 즉시 반영 */ + --color-primary: oklch(0.708008 0.234375 24); + --color-primary-content: oklch(98% 0 0); /* 흰 글자 */ + + /* 바이올렛 — 버튼·뱃지·보더용 */ + --color-secondary: oklch(0.481934 0.285938 285); + --color-secondary-content: oklch(98% 0 0); /* 흰 글자 */ + + /* 골드 — 배경·보더·아이콘만. 텍스트색(text-accent)으론 쓰지 말 것 */ + --color-accent: oklch(0.853027 0.2 90); + --color-accent-content: oklch(22% 0.03 80); /* 어두운 글자 */ + + /* 시안 — 정보·링크·보조 강조. L70이라 흰배경 텍스트는 약함 → 배경/보더 위주 */ + --color-info: oklch(70% 0.14523 200); + --color-info-content: oklch(24% 0.03 215); /* 어두운 글자 */ + + /* 텍스트 기본 진하기 (회색 알파의 기준색). 낮출수록 전체가 진해짐 */ + --color-base-content: oklch(21% 0.006 285.885); + + /* 표면 톤 */ + --color-base-100: oklch(100% 0 0); /* 페이지/카드 배경 */ + --color-base-200: oklch(98% 0 0); /* 살짝 들어간 표면 */ + --color-base-300: oklch(95% 0 0); /* 구분선/보더 */ } /* poro.gg style: 모든 모서리 각지게 */ @@ -44,3 +138,9 @@ body { .btn { border-radius: 0 !important; } + +/* daisyUI 버튼의 흰색 inset 하이라이트 제거 — 색 위에 흰색을 6% 얹어 + 채도를 깎던 주범(P3/쨍한 색일수록 도드라짐). drop shadow(입체감)는 유지. */ +.btn { + box-shadow: var(--btn-shadow) !important; +} diff --git a/apps/web/src/main.tsx b/apps/web/src/main.tsx index 5487c4df..af11ac47 100644 --- a/apps/web/src/main.tsx +++ b/apps/web/src/main.tsx @@ -4,6 +4,9 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; import './index.css'; import App from './App.tsx'; import { MsalAppProvider } from './lib/auth/MsalAppProvider.tsx'; +import { initializeTheme } from './config.ts'; + +initializeTheme(); const queryClient = new QueryClient({ defaultOptions: { diff --git a/apps/web/src/pages/AuctionPage.tsx b/apps/web/src/pages/AuctionPage.tsx index 8a65828f..ee137279 100644 --- a/apps/web/src/pages/AuctionPage.tsx +++ b/apps/web/src/pages/AuctionPage.tsx @@ -1,13 +1,25 @@ -import { useEffect, useMemo, useRef, useState } from 'react'; +import { + lazy, + Suspense, + useEffect, + useMemo, + useRef, + useState, + type FormEvent, + type KeyboardEvent, +} from 'react'; import { useQueryClient } from '@tanstack/react-query'; -import { Link, useLocation, useParams } from 'react-router'; +import { AlertTriangle, SendHorizontal } from 'lucide-react'; +import { Link, useLocation, useNavigate, useParams } from 'react-router'; import { useAuction, useAuctionHistory, useDdragonManifest, useMatch, useMe, + useResetAuction, useUndoAuction, + useUserHistoryProfile, } from '../api/hooks'; import { mapApiAuctionToAuctionState, @@ -32,30 +44,21 @@ import { teamIndexColorClasses, teamIndexLabel, } from '../lib/league'; +import { RankBadge, ResponsiveTierLabel } from '../components/RankBadge'; import type { ApiAuction, + ApiAuctionChatMessage, ApiRiotLaneStats, - ApiTierInfo, + ApiUser, Position, } from '../api/types'; +const TierHistoryChart = lazy(() => import('../components/TierHistoryChart')); + type CaptainRole = { teamIndex: number; }; -const TIER_NAMES: Record = { - IRON: '아이언', - BRONZE: '브론즈', - SILVER: '실버', - GOLD: '골드', - PLATINUM: '플래티넘', - EMERALD: '에메랄드', - DIAMOND: '다이아몬드', - MASTER: '마스터', - GRANDMASTER: '그랜드마스터', - CHALLENGER: '챌린저', -}; - function formatPoints(value: number) { return value.toLocaleString(); } @@ -73,88 +76,29 @@ function relativeTime(dateLike: string) { return `${Math.floor(hours / 24)}일 전`; } -function normalizeRank(rank: string | undefined) { - switch (rank) { - case 'I': - return '1'; - case 'II': - return '2'; - case 'III': - return '3'; - case 'IV': - return '4'; - default: - return rank; +function formatChatTime(dateLike: string) { + return new Intl.DateTimeFormat('ko-KR', { + hour: '2-digit', + minute: '2-digit', + }).format(new Date(dateLike)); +} + +function resolveChatSenderLabel( + currentUser: ApiUser | null, + captainRole: CaptainRole | null, +) { + const primaryRiotAccount = + currentUser?.riotAccounts.find((entry) => entry.isPrimary) ?? + currentUser?.riotAccounts[0]; + if (primaryRiotAccount?.gameName) { + return primaryRiotAccount.tagLine + ? `${primaryRiotAccount.gameName}#${primaryRiotAccount.tagLine}` + : primaryRiotAccount.gameName; } -} - -function formatRankBadge(tier: ApiTierInfo | undefined) { - if (!tier) return 'U'; - const tierInitial = - tier.tier === 'GRANDMASTER' ? 'GM' : tier.tier.slice(0, 1); - const rank = normalizeRank(tier.rank); - return rank ? `${tierInitial}${rank}` : tierInitial; -} - -function formatRankDetail(tier: ApiTierInfo | undefined) { - if (!tier) return '랭크 정보 없음'; - const tierName = TIER_NAMES[tier.tier] ?? tier.tier; - const rank = normalizeRank(tier.rank); - const label = rank ? `${tierName} ${rank}` : tierName; - return `${label} - ${tier.leaguePoints} LP`; -} - -function rankBadgeClass(tier: ApiTierInfo | undefined) { - switch (tier?.tier) { - case 'CHALLENGER': - return 'border-amber-500/60 bg-amber-100 text-amber-900 dark:border-amber-400/40 dark:bg-amber-400/20 dark:text-amber-200'; - case 'GRANDMASTER': - return 'border-red-500/60 bg-red-100 text-red-800 dark:border-red-400/40 dark:bg-red-400/20 dark:text-red-200'; - case 'MASTER': - return 'border-fuchsia-500/60 bg-fuchsia-100 text-fuchsia-800 dark:border-fuchsia-400/40 dark:bg-fuchsia-400/20 dark:text-fuchsia-200'; - case 'DIAMOND': - return 'border-cyan-500/60 bg-cyan-100 text-cyan-800 dark:border-cyan-400/40 dark:bg-cyan-400/20 dark:text-cyan-200'; - case 'EMERALD': - return 'border-emerald-500/60 bg-emerald-100 text-emerald-800 dark:border-emerald-400/40 dark:bg-emerald-400/20 dark:text-emerald-200'; - case 'PLATINUM': - return 'border-teal-500/60 bg-teal-100 text-teal-800 dark:border-teal-400/40 dark:bg-teal-400/20 dark:text-teal-200'; - case 'GOLD': - return 'border-amber-500/70 bg-amber-100 text-amber-900 dark:border-yellow-400/40 dark:bg-yellow-400/20 dark:text-yellow-200'; - case 'SILVER': - return 'border-slate-400/60 bg-slate-100 text-slate-700 dark:border-slate-300/40 dark:bg-slate-300/15 dark:text-slate-200'; - case 'BRONZE': - return 'border-orange-600/60 bg-orange-100 text-orange-800 dark:border-orange-500/40 dark:bg-orange-500/20 dark:text-orange-200'; - case 'IRON': - return 'border-stone-500/60 bg-stone-100 text-stone-700 dark:border-stone-400/40 dark:bg-stone-400/15 dark:text-stone-300'; - default: - return 'border-base-content/30 bg-transparent text-base-content/50'; - } -} - -function RankBadge({ tier }: { tier?: ApiTierInfo }) { - const tooltip = formatRankDetail(tier); - - return ( - - - {formatRankBadge(tier)} - - - ); -} - -function ResponsiveTierLabel({ tier }: { tier?: ApiTierInfo }) { - return ( - - - - {formatRankDetail(tier)} - - - ); + if (currentUser?.kakaoTalkNickname) return currentUser.kakaoTalkNickname; + if (currentUser?.discordNickname) return currentUser.discordNickname; + if (captainRole) return `${teamIndexLabel(captainRole.teamIndex)} 팀장`; + return '관전자'; } function isCurrentBidder( @@ -192,7 +136,7 @@ const POSITION_TO_RIOT_LANE = { function PosBadge({ pos }: { pos: Position }) { return ( - + {positionLabel[pos]} @@ -238,10 +182,10 @@ function RecentSoloStats({ if (!primaryStats) { return (
-

+

최근 솔로랭크

-
+
최근 솔로랭크 기록이 없습니다
@@ -255,15 +199,15 @@ function RecentSoloStats({
-

+

최근 솔로랭크

- + {positionLabel[player.mainPosition]} {player.recentStats.primarySource === 'overall' ? ( - + 전체 기준 ) : null} @@ -278,15 +222,15 @@ function RecentSoloStats({
- 전적 - + 전적 + {primaryStats.wins}W{' '} {primaryStats.losses}L
- KDA - + KDA + {primaryStats.avgKills}/{primaryStats.avgDeaths}/{primaryStats.avgAssists} = 3 ? 'text-emerald-400' : 'text-base-content/50'}`} @@ -296,8 +240,8 @@ function RecentSoloStats({
- 분당 CS - + 분당 CS + {primaryStats.avgCsPerMin}
@@ -312,7 +256,7 @@ function RecentSoloStats({ return (
{positionLabel[position]} @@ -360,10 +304,10 @@ function TeamPanel({
- + {teamIndexLabel(team.teamIndex, team.name)} - + 팀장: {team.captainName}
@@ -371,7 +315,7 @@ function TeamPanel({ {formatPoints(team.points)}P
-
+
팀장 포함 {teamSize}/{AUCTION_MAX_TEAM_SIZE} @@ -381,7 +325,7 @@ function TeamPanel({
{team.members.length === 0 ? ( -
+
아직 멤버가 없습니다
) : ( @@ -405,15 +349,15 @@ function TeamPanel({
- + {member.summonerName}
- + {positionLabel[member.assignedPosition]} - + {member.cost}
@@ -428,7 +372,7 @@ function TeamPanel({ className="px-3 py-1.5 h-[34px] flex items-center" >
- — + —
))}
@@ -445,7 +389,16 @@ function PlayerSpotlight({ }) { const { data: ddragon } = useDdragonManifest(); const player = state.currentPlayer; + const historyProfileQuery = useUserHistoryProfile( + player?.userId, + DEFAULT_COMMUNITY_ID, + Boolean(player && player.tierHistory.length === 0), + ); if (!player) return null; + const tierHistory = + player.tierHistory.length > 0 + ? player.tierHistory + : (historyProfileQuery.data?.tierHistory ?? []); return (
@@ -471,16 +424,16 @@ function PlayerSpotlight({ > {player.summonerName} - + #{player.tag}
-
+
- +
+ {tierHistory.length > 0 && ( + + } + > + + + )} +
-

+

숙련도 높은 챔피언

@@ -518,10 +487,10 @@ function PlayerSpotlight({ ) : null}
-
+
{displayName}
-
+
Lv.{mastery.level} · {(mastery.points / 1000).toFixed(0)}K
@@ -529,7 +498,7 @@ function PlayerSpotlight({ ); }) ) : ( -
+
숙련도 데이터가 없습니다.
)} @@ -542,13 +511,13 @@ function PlayerSpotlight({ {(state.phase === 'bidding' || state.phase === 'sold') && (
- + {state.phase === 'sold' ? '낙찰가' : '현재 입찰가'}
{state.currentBidder && ( {teamIndexLabel(state.currentBidder.teamIndex)} @@ -615,7 +584,7 @@ function BidControls({ key={preset} onClick={() => setBidAmount(Math.max(minBid, preset))} disabled={isActiveTeamFull} - className={`text-[11px] px-2.5 py-1 border transition-colors ${ + className={`text-xs px-2.5 py-1 border transition-colors ${ bidAmount === preset ? 'border-primary/40 bg-primary/10 text-primary' : 'border-base-content/10 text-base-content/40 hover:border-base-content/20' @@ -666,13 +635,13 @@ function BidLog({ bids }: { bids: AuctionStateView['bids'] }) { return (
- + 입찰 기록
{bids.map((bid, index) => ( -
+
@@ -693,6 +662,7 @@ function BidLog({ bids }: { bids: AuctionStateView['bids'] }) { export default function AuctionPage() { const { id } = useParams(); const location = useLocation(); + const navigate = useNavigate(); const queryClient = useQueryClient(); const meQuery = useMe(); const currentUser = @@ -712,17 +682,42 @@ export default function AuctionPage() { refetchInterval: 3000, }); const undoMutation = useUndoAuction(DEFAULT_COMMUNITY_ID); + const resetAuctionMutation = useResetAuction(DEFAULT_COMMUNITY_ID); const socket = useAuctionSocket(id); const captainTeamIndex = useDevCaptainTeamIndex(); const [now, setNow] = useState(() => Date.now()); const [assignedPosition, setAssignedPosition] = useState('MID'); + const [showCancelModal, setShowCancelModal] = useState(false); + const [cancelConfirmText, setCancelConfirmText] = useState(''); + const cancelConfirmInputRef = useRef(null); const historyBackTo = `${location.pathname}${location.search}${location.hash}`; + const canConfirmAuctionCancel = cancelConfirmText.trim() === '예'; + + async function invalidateAuctionData() { + if (!id) return; + await Promise.all([ + queryClient.invalidateQueries({ + queryKey: ['auction', DEFAULT_COMMUNITY_ID, id], + }), + queryClient.invalidateQueries({ + queryKey: ['auction-history', DEFAULT_COMMUNITY_ID, id], + }), + queryClient.invalidateQueries({ + queryKey: ['match', DEFAULT_COMMUNITY_ID, id], + }), + ]); + } useEffect(() => { const timer = window.setInterval(() => setNow(Date.now()), 1000); return () => window.clearInterval(timer); }, []); + useEffect(() => { + if (!showCancelModal) return; + cancelConfirmInputRef.current?.focus(); + }, [showCancelModal]); + const liveAuction = pickLatestAuction(socket.auction, auctionQuery.data); const auctionState = liveAuction && matchQuery.data @@ -738,6 +733,7 @@ export default function AuctionPage() { : { teamIndex: captainTeamIndex, }; + const chatSenderLabel = resolveChatSenderLabel(currentUser, captainRole); useEffect(() => { if (auctionState?.currentPlayer) { @@ -752,6 +748,13 @@ export default function AuctionPage() { } }, [availableTeamIndexes, captainTeamIndex]); + useEffect(() => { + if (!socket.resetAt || !id) return; + void invalidateAuctionData().finally(() => { + navigate(`/match/${id}`, { replace: true }); + }); + }, [id, navigate, socket.resetAt]); + if (!DEFAULT_COMMUNITY_ID) { return (
@@ -826,12 +829,27 @@ export default function AuctionPage() { ); } + function handleResetAuction() { + if (!id || !canConfirmAuctionCancel) return; + resetAuctionMutation.mutate( + { matchId: id }, + { + onSuccess: async () => { + setShowCancelModal(false); + setCancelConfirmText(''); + await invalidateAuctionData(); + navigate(`/match/${id}`, { replace: true }); + }, + }, + ); + } + const undoPanel = canManageAuction ? (
-
+
되돌리기 (Undo)
-
+
{historyQuery.data?.length ? ( historyQuery.data.map((entry) => ( @@ -894,12 +912,18 @@ export default function AuctionPage() {
)} + {resetAuctionMutation.error instanceof Error && ( +
+ {resetAuctionMutation.error.message} +
+ )} +

경매 팀빌딩

-

+

{Math.min(auctionState.currentPlayerIndex + 1, Math.max(auctionState.totalPlayers, 1))} /{' '} {auctionState.totalPlayers} 선수

@@ -907,7 +931,7 @@ export default function AuctionPage() {
결과 확인 @@ -1021,7 +1045,7 @@ export default function AuctionPage() { {canManageAuction && (
-
+
Auction Controls
{auctionState.phase === 'presenting' && ( @@ -1065,6 +1089,23 @@ export default function AuctionPage() { 다음 선수 )} +
+ +

+ 경매 데이터와 진행 기록을 삭제하고 내전을 모집 상태로 되돌립니다. +

+
)} {undoPanel} @@ -1073,9 +1114,114 @@ export default function AuctionPage() {
+ +
+ + socket.sendChatMessage({ + displayName: chatSenderLabel, + message, + }) + } + className="h-[420px]" + /> +
+ + {showCancelModal && ( +
+
+
+ + + +
+

+ 경매 진행 취소 +

+

+ 정말 경매를 취소하고 모집 상태로 되돌리시겠습니까? + 경매 데이터, 입찰 기록, 팀 배정 정보가 삭제됩니다. +

+
+
+ + + setCancelConfirmText(event.target.value)} + onKeyDown={(event) => { + if (event.key === 'Escape') { + setShowCancelModal(false); + setCancelConfirmText(''); + } + if (event.key === 'Enter' && canConfirmAuctionCancel) { + handleResetAuction(); + } + }} + className="mt-2 h-10 w-full border border-base-content/15 bg-base-100 px-3 text-sm text-base-content outline-none transition-colors focus:border-red-400/60" + placeholder="예" + /> + +
+ + +
+
+
+ )}
); } @@ -1145,7 +1291,7 @@ function PoolPanel({ state }: { state: AuctionStateView }) {
{activePool.length === 0 ? ( -
+
{tab === 'waiting' ? '대기 중인 유저가 없습니다' : '유찰된 유저가 없습니다'} @@ -1183,14 +1329,14 @@ function PoolTabButton({ role="tab" type="button" onClick={onClick} - className={`relative px-1 pt-3 pb-2.5 mr-5 text-[12px] font-semibold transition-colors ${ + className={`relative px-1 pt-3 pb-2.5 mr-5 text-xs font-semibold transition-colors ${ active ? 'text-base-content' : 'text-base-content/40 hover:text-base-content/70' }`} > {label} - + {count} {active ? ( @@ -1217,12 +1363,12 @@ function PoolListItem({ className="w-7 h-7 shrink-0 rounded-sm border border-base-content/10 object-cover" />
- + {player.summonerName} {showPassCount && player.passCount > 0 ? ( - + {player.passCount}회 유찰 ) : null} @@ -1231,37 +1377,120 @@ function PoolListItem({ ); } -function ChatPanel() { +function ChatPanel({ + messages, + connectionStatus, + senderLabel, + onSend, + className = '', +}: { + messages: ApiAuctionChatMessage[]; + connectionStatus: ReturnType['connectionStatus']; + senderLabel: string; + onSend: (message: string) => void; + className?: string; +}) { + const [draft, setDraft] = useState(''); + const messagesEndRef = useRef(null); + const trimmedDraft = draft.trim(); + const isConnected = connectionStatus === 'connected'; + const canSend = isConnected && trimmedDraft.length > 0; + + useEffect(() => { + messagesEndRef.current?.scrollIntoView({ block: 'end' }); + }, [messages.length]); + + function handleSubmit(event: FormEvent) { + event.preventDefault(); + if (!canSend) return; + onSend(trimmedDraft); + setDraft(''); + } + + function handleKeyDown(event: KeyboardEvent) { + if (event.key !== 'Enter' || event.shiftKey) return; + event.preventDefault(); + if (!canSend) return; + onSend(trimmedDraft); + setDraft(''); + } + + const statusLabel = + connectionStatus === 'connected' + ? '실시간' + : connectionStatus === 'connecting' + ? '연결 중' + : '오프라인'; + return ( -
+
-
+
채팅
- - 곧 활성화됩니다 + + {statusLabel}
-
- 아직 메시지가 없습니다 +
+ {messages.length === 0 ? ( +
+ 아직 메시지가 없습니다 +
+ ) : ( +
    + {messages.map((message) => ( +
  1. +
    + + {message.displayName} + + +
    +

    + {message.message} +

    +
  2. + ))} +
+ )} +
-
+
+
+ {senderLabel} + {draft.length}/300 +