diff --git a/gemp-lotr/db/award-packs.sql b/gemp-lotr/db/award-packs.sql new file mode 100644 index 000000000..c9293034f --- /dev/null +++ b/gemp-lotr/db/award-packs.sql @@ -0,0 +1,76 @@ +SELECT * +FROM player p +WHERE name = 'Neilpie' + +SELECT * +FROM deck d +INNER JOIN player p + ON p.id = d.player_id +WHERE p.name = 'Neilpie' + +SELECT * +FROM game_history gh +WHERE winner = 'Neilpie' OR loser = 'Neilpie' + + + +SELECT * +FROM deck d +INNER JOIN player p + ON p.id = d.player_id +WHERE p.name IN ('Axter', 'balrog69', 'bign19', 'CoS', 'dstaley', 'enolen', 'fnlgroove', 'GeriGeli', 'Icarus', 'johnec', 'LukasSchor', 'MockingbirdME', 'neergreve', 'olga06', 'Pokec', 'Raelag', 'rbranco', 'Ringbearer', 'stephan77', 'talial', 'thedast7', 'Tonio', 'Yk1030') +AND contents LIKE '%1_382%' + +SELECT * +FROM transfer t +WHERE collection LIKE '%1_382%' +ORDER BY id DESC + + +SELECT * +FROM collection c +INNER JOIN collection_entries ce + ON ce.collection_id = c.id +INNER JOIN player p + ON p.id = c.player_id +WHERE #p.name = 'Chadwick537' AND + product IN('1_382', '1_382*') + AND p.name IN ('Axter', 'balrog69', 'bign19', 'CoS', 'dstaley', 'enolen', 'fnlgroove', 'GeriGeli', 'Icarus', 'johnec', 'LukasSchor', 'MockingbirdME', 'neergreve', 'olga06', 'Pokec', 'Raelag', 'rbranco', 'Ringbearer', 'stephan77', 'talial', 'thedast7', 'Tonio', 'Yk1030') + AND ce.created_date <> ce.modified_date + AND (c.type <> 'trophy') +ORDER BY p.name, ce.modified_date, ce.created_date DESC + +-- INSERT INTO gemp_db.collection_entries +-- (collection_id, quantity, product_type, product_variant, product, source, created_date, modified_date, notes) +-- VALUES +-- (38751, 4, 'CARD', NULL, '1_386', 'Manual Administrator action', current_timestamp(), NULL, 'Fixing the 2023 WC Goblin Runner / FA Enquea collision'), +-- (63570, 4, 'CARD', NULL, '1_386', 'Manual Administrator action', current_timestamp(), NULL, 'Fixing the 2023 WC Goblin Runner / FA Enquea collision'), +-- (22671, 4, 'CARD', NULL, '1_386', 'Manual Administrator action', current_timestamp(), NULL, 'Fixing the 2023 WC Goblin Runner / FA Enquea collision'), +-- (64330, 4, 'CARD', NULL, '1_386', 'Manual Administrator action', current_timestamp(), NULL, 'Fixing the 2023 WC Goblin Runner / FA Enquea collision'), +-- (167019, 4, 'CARD', NULL, '1_386', 'Manual Administrator action', current_timestamp(), NULL, 'Fixing the 2023 WC Goblin Runner / FA Enquea collision'), +-- (55829, 4, 'CARD', NULL, '1_386', 'Manual Administrator action', current_timestamp(), NULL, 'Fixing the 2023 WC Goblin Runner / FA Enquea collision'), +-- (167461, 4, 'CARD', NULL, '1_386', 'Manual Administrator action', current_timestamp(), NULL, 'Fixing the 2023 WC Goblin Runner / FA Enquea collision'), +-- (103237, 4, 'CARD', NULL, '1_386', 'Manual Administrator action', current_timestamp(), NULL, 'Fixing the 2023 WC Goblin Runner / FA Enquea collision'), +-- (65411, 4, 'CARD', NULL, '1_386', 'Manual Administrator action', current_timestamp(), NULL, 'Fixing the 2023 WC Goblin Runner / FA Enquea collision'), +-- (59343, 4, 'CARD', NULL, '1_386', 'Manual Administrator action', current_timestamp(), NULL, 'Fixing the 2023 WC Goblin Runner / FA Enquea collision'), +-- (62630, 4, 'CARD', NULL, '1_386', 'Manual Administrator action', current_timestamp(), NULL, 'Fixing the 2023 WC Goblin Runner / FA Enquea collision'), +-- (94793, 4, 'CARD', NULL, '1_386', 'Manual Administrator action', current_timestamp(), NULL, 'Fixing the 2023 WC Goblin Runner / FA Enquea collision'), +-- (58444, 4, 'CARD', NULL, '1_386', 'Manual Administrator action', current_timestamp(), NULL, 'Fixing the 2023 WC Goblin Runner / FA Enquea collision'), +-- (273741, 4, 'CARD', NULL, '1_386', 'Manual Administrator action', current_timestamp(), NULL, 'Fixing the 2023 WC Goblin Runner / FA Enquea collision'), +-- (59369, 4, 'CARD', NULL, '1_386', 'Manual Administrator action', current_timestamp(), NULL, 'Fixing the 2023 WC Goblin Runner / FA Enquea collision'), +-- (23215, 4, 'CARD', NULL, '1_386', 'Manual Administrator action', current_timestamp(), NULL, 'Fixing the 2023 WC Goblin Runner / FA Enquea collision') +-- ; + + +-- UPDATE collection_entries +-- SET quantity = quantity - 4 +-- WHERE product = '1_382' +-- AND collection_id IN (38751, 63570, 22671, 64330, 167019, 55829, 167461, 103237, 65411, 59343, 62630, 94793, 58444, 273741, 59369, 23215) + + +#SELECT * +#FROM collection_entries ce +WHERE collection_id = 199929 AND product = '1_383' + + + diff --git a/gemp-lotr/db/yuletide-games.sql b/gemp-lotr/db/yuletide-games.sql new file mode 100644 index 000000000..d24db930e --- /dev/null +++ b/gemp-lotr/db/yuletide-games.sql @@ -0,0 +1,32 @@ + + +-- SELECT * +-- FROM game_history gh +-- WHERE tournament LIKE '%Yuletide%' +-- AND (winner = 'm_scarpato' OR loser = 'm_scarpato') +-- + +# Get IDs from the appropriate yuletide leagues: + +SELECT * +FROM league l +WHERE name LIKE '%Yuletide%' +ORDER BY id DESC; + + +# Stick those IDs in both of these clauses: + +SELECT player, count(*) AS matches +FROM ( + SELECT winner AS player + FROM league_match w + WHERE w.league_type IN ('1702871717631', '1702871696832', '1702871668557') + + UNION ALL + + SELECT loser AS player + FROM league_match l + WHERE l.league_type IN ('1702871717631', '1702871696832', '1702871668557') +) players +GROUP BY players.player +ORDER BY COUNT(*) DESC \ No newline at end of file diff --git a/gemp-lotr/docker/readme.md b/gemp-lotr/docker/readme.md index 916bbf5b1..4d0411f98 100644 --- a/gemp-lotr/docker/readme.md +++ b/gemp-lotr/docker/readme.md @@ -70,6 +70,12 @@ gemp_app is slightly more complicated. Gemp is a Java server, is built using Ma At this point, editing the code is a matter of changing the files on your local machine and either re-running step 9, or re-compiling the code base in your IDE of choice. - +Run the following commands to ensure that you don't have local configuration showing up in your commits: + +1. `git update-index --assume-unchanged ./logs/nohup.out` +2. `git update-index --assume-unchanged ./gemp-lotr/docker/docker-compose.yml` +3. `git update-index --assume-unchanged ./gemp-lotr/docker/gemp_app.Dockerfile` + +(If you do indeed need to alter those files, repeat the above commands but use the `--no-assume-unchanged` flag instead.) diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/GempukkuHttpRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/GempukkuHttpRequestHandler.java index 2af7508e6..5189dedde 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/GempukkuHttpRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/GempukkuHttpRequestHandler.java @@ -93,12 +93,11 @@ public class GempukkuHttpRequestHandler extends SimpleChannelInboundHandler
After: " + after); } + private void clearCache() throws SQLException, IOException { + _leagueService.clearCache(); + _tournamentService.clearCache(); + _cacheManager.clearCaches(); + _hallServer.cleanup(true); + } + private void validateAdmin(HttpRequest request) throws HttpProcessingException { Player player = getResourceOwnerSafely(request, null); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/chat/ChatRoomMediator.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/chat/ChatRoomMediator.java index f695adc1f..2f5af8ff9 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/chat/ChatRoomMediator.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/chat/ChatRoomMediator.java @@ -34,11 +34,11 @@ public class ChatRoomMediator { this.welcomeMessage = welcomeMessage; } - public ChatRoomMediator(IgnoreDAO ignoreDAO, PlayerDAO playerDAO, String roomName, boolean muteJoinPartMessages, int secondsTimeoutPeriod, Set allowedPlayers, - boolean allowIncognito) { + public ChatRoomMediator(IgnoreDAO ignoreDAO, PlayerDAO playerDAO, String roomName, boolean muteJoinPartMessages, + int secondsTimeoutPeriod, Set allowedPlayers, boolean allowIncognito) { this.ignoreDAO = ignoreDAO; this.playerDAO = playerDAO; - _logger = Logger.getLogger("chat."+roomName); + _logger = LogManager.getLogger("chat."+roomName); _allowedPlayers = allowedPlayers; _channelInactivityTimeoutPeriod = 1000 * secondsTimeoutPeriod; _chatRoom = new ChatRoom(muteJoinPartMessages, allowIncognito); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/chat/ChatServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/chat/ChatServer.java index 4ea34d62f..7a3bc0238 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/chat/ChatServer.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/chat/ChatServer.java @@ -19,7 +19,8 @@ public class ChatServer extends AbstractServer { this.playerDAO = playerDAO; } - public ChatRoomMediator createChatRoom(String name, boolean muteJoinPartMessages, int secondsTimeoutPeriod, boolean allowIncognito, String welcomeMessage) { + public ChatRoomMediator createChatRoom(String name, boolean muteJoinPartMessages, int secondsTimeoutPeriod, + boolean allowIncognito, String welcomeMessage) { ChatRoomMediator chatRoom = new ChatRoomMediator(ignoreDAO, playerDAO, name, muteJoinPartMessages, secondsTimeoutPeriod, allowIncognito, welcomeMessage); try { chatRoom.sendMessage("System", "Welcome to room: " + name, true); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/GenericCardTestHelper.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/GenericCardTestHelper.java index 8a2ceefa4..38bb03cf7 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/GenericCardTestHelper.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/GenericCardTestHelper.java @@ -32,7 +32,7 @@ public class GenericCardTestHelper extends AbstractAtTest { put("site3", "1_337"); put("site4", "1_343"); put("site5", "1_349"); - put("site6", "1_350"); + put("site6", "1_351"); put("site7", "1_353"); put("site8", "1_356"); put("site9", "1_360");