diff --git a/game_links.txt b/game_links.txt index bf3837d..bfbfd25 100644 --- a/game_links.txt +++ b/game_links.txt @@ -6,19 +6,17 @@ game_drawing_v3 /drawing/v3/?id= drawing_phonics /drawing/drawing_phonics/?id= game_tick_variant1 /tick/v1/?id= game_tick_variant2 /tick/v2/?id= -game_tick_variant3 /tick/v3/?id= +game_tick_varient3 /tick/v3/?id= game_cross_varient1 /cross/v1/?id= game_cross_varient2 /cross/v2/?id= game_cross_varient3 /cross/v3/?id= game_drag /drag/?id= game_drag_v2 /drag/v2/?id= -game_drag_v3 /drag/v3/?id= +game_drag_v3 /drag/v3/?id= // we do't use this version game_drag_v4 /drag/v4/?id= game_tick_v3_phonics /tick/tick_phonics_v1/?id= tick_phonics_option_6 /tick/tick_phonics_v2/?id= tick_phonics_option_9 /tick/tick_phonics_v3/?id= drag_drop_phonics /drag/dragdrop_phonics/?id= -/drag/match_phonics/?id= -/cross/cross_phonics_v2/?id= - -, , , , , , , , , , , , , , , , , \ No newline at end of file +drag_phonics /drag/match_phonics/?id= +cross_phonics_option_9 /cross/cross_phonics_v2/?id= \ No newline at end of file diff --git a/src/routes/api/getGameInfo.js b/src/routes/api/getGameInfo.js index 5401ca5..1855a2c 100644 --- a/src/routes/api/getGameInfo.js +++ b/src/routes/api/getGameInfo.js @@ -35,30 +35,92 @@ const pool = mariadb.createPool({ } // Query both game1 and game2 tables - const query1 = `SELECT * FROM game_cross_varient1 WHERE ${queryCondition}`; - const query2 = `SELECT * FROM game_cross_varient2 WHERE ${queryCondition}`; + const query1 = `SELECT * FROM game_drawing WHERE ${queryCondition}`; + const query2 = `SELECT * FROM game_drawing_v2 WHERE ${queryCondition}`; + const query3 = `SELECT * FROM game_drawing_v3 WHERE ${queryCondition}`; + const query4 = `SELECT * FROM drawing_phonics WHERE ${queryCondition}`; + const query5 = `SELECT * FROM game_tick_variant1 WHERE ${queryCondition}`; + const query6 = `SELECT * FROM game_tick_variant2 WHERE ${queryCondition}`; + const query7 = `SELECT * FROM game_tick_varient3 WHERE ${queryCondition}`; + const query8 = `SELECT * FROM game_cross_varient1 WHERE ${queryCondition}`; + const query9 = `SELECT * FROM game_cross_varient2 WHERE ${queryCondition}`; + const query10 = `SELECT * FROM game_cross_varient3 WHERE ${queryCondition}`; + const query11 = `SELECT * FROM game_drag WHERE ${queryCondition}`; + const query12 = `SELECT * FROM game_drag_v2 WHERE ${queryCondition}`; + const query13 = `SELECT * FROM game_drag_v4 WHERE ${queryCondition}`; + const query14 = `SELECT * FROM game_tick_v3_phonics WHERE ${queryCondition}`; + const query15 = `SELECT * FROM tick_phonics_option_6 WHERE ${queryCondition}`; + const query16 = `SELECT * FROM tick_phonics_option_9 WHERE ${queryCondition}`; + const query17 = `SELECT * FROM drag_drop_phonics WHERE ${queryCondition}`; + const query18 = `SELECT * FROM drag_phonics WHERE ${queryCondition}`; + const query19 = `SELECT * FROM cross_phonics_option_9 WHERE ${queryCondition}`; - const [game_cross_varient1, game_cross_varient2] = await Promise.all([ + const [game_drawing, game_drawing_v2, game_drawing_v3, drawing_phonics, game_tick_variant1, game_tick_variant2, game_tick_varient3, game_cross_varient1, game_cross_varient2, game_cross_varient3, game_drag, game_drag_v2, game_drag_v4, game_tick_v3_phonics, tick_phonics_option_6, tick_phonics_option_9, drag_drop_phonics, drag_phonics, cross_phonics_option_9 ] = await Promise.all([ connection.query(query1, [queryValue]), connection.query(query2, [queryValue]), + connection.query(query3, [queryValue]), + connection.query(query4, [queryValue]), + connection.query(query5, [queryValue]), + connection.query(query6, [queryValue]), + connection.query(query7, [queryValue]), + connection.query(query8, [queryValue]), + connection.query(query9, [queryValue]), + connection.query(query10, [queryValue]), + connection.query(query11, [queryValue]), + connection.query(query12, [queryValue]), + connection.query(query13, [queryValue]), + connection.query(query14, [queryValue]), + connection.query(query15, [queryValue]), + connection.query(query16, [queryValue]), + connection.query(query17, [queryValue]), + connection.query(query18, [queryValue]), + connection.query(query19, [queryValue]) ]); // const domain = 'https://domain.com/gamelink/?id='; const domain = process.env.GAME_DOMAIN; - const formattedGame1 = game_cross_varient1.map(game => ({ - ...game, - game_link: `${domain}sdfs${game.id}`, - })); - const formattedGame2 = game_cross_varient2.map(({ status, ...game }) => ({ - ...game, - game_link: `${domain}${game.id}`, - })); + const formattedGame1 = game_drawing.map(game => ({ ...game, game_link: `${domain}sdfs${game.id}`, })); + const formattedGame2 = game_drawing_v2.map(({ status, ...game }) => ({ ...game, game_link: `${domain}${game.id}`, })); + const formattedGame3 = game_drawing_v3.map(({ status, ...game }) => ({ ...game, game_link: `${domain}${game.id}`, })); + const formattedGame4 = drawing_phonics.map(({ status, ...game }) => ({ ...game, game_link: `${domain}${game.id}`, })); + const formattedGame5 = game_tick_variant1.map(({ status, ...game }) => ({ ...game, game_link: `${domain}${game.id}`, })); + const formattedGame6 = game_tick_variant2.map(({ status, ...game }) => ({ ...game, game_link: `${domain}${game.id}`, })); + const formattedGame7 = game_tick_varient3.map(({ status, ...game }) => ({ ...game, game_link: `${domain}${game.id}`, })); + const formattedGame8 = game_cross_varient1.map(({ status, ...game }) => ({ ...game, game_link: `${domain}${game.id}`, })); + const formattedGame9 = game_cross_varient2.map(({ status, ...game }) => ({ ...game, game_link: `${domain}${game.id}`, })); + const formattedGame10 = game_cross_varient3.map(({ status, ...game }) => ({ ...game, game_link: `${domain}${game.id}`, })); + const formattedGame11 = game_drag.map(({ status, ...game }) => ({ ...game, game_link: `${domain}${game.id}`, })); + const formattedGame12 = game_drag_v2.map(({ status, ...game }) => ({ ...game, game_link: `${domain}${game.id}`, })); + const formattedGame13 = game_drag_v4.map(({ status, ...game }) => ({ ...game, game_link: `${domain}${game.id}`, })); + const formattedGame14 = game_tick_v3_phonics.map(({ status, ...game }) => ({ ...game, game_link: `${domain}${game.id}`, })); + const formattedGame15 = tick_phonics_option_6.map(({ status, ...game }) => ({ ...game, game_link: `${domain}${game.id}`, })); + const formattedGame16 = tick_phonics_option_9.map(({ status, ...game }) => ({ ...game, game_link: `${domain}${game.id}`, })); + const formattedGame17 = drag_drop_phonics.map(({ status, ...game }) => ({ ...game, game_link: `${domain}${game.id}`, })); + const formattedGame18 = drag_phonics.map(({ status, ...game }) => ({ ...game, game_link: `${domain}${game.id}`, })); + const formattedGame19 = cross_phonics_option_9.map(({ status, ...game }) => ({ ...game, game_link: `${domain}${game.id}`, })); + - // Combine results from both tables const combinedResults = { - game_cross_varient1: formattedGame1, - game_cross_varient2: formattedGame2, + game_drawing: formattedGame1, + game_drawing_v2: formattedGame2, + game_drawing_v3: formattedGame3, + drawing_phonics: formattedGame4, + game_tick_variant1: formattedGame5, + game_tick_variant2: formattedGame6, + game_tick_varient3: formattedGame7, + game_cross_varient1: formattedGame8, + game_cross_varient2: formattedGame9, + game_cross_varient3: formattedGame10, + game_drag: formattedGame11, + game_drag_v2: formattedGame12, + game_drag_v4: formattedGame13, + game_tick_v3_phonics: formattedGame14, + tick_phonics_option_6: formattedGame15, + tick_phonics_option_9: formattedGame16, + drag_drop_phonics: formattedGame17, + drag_phonics: formattedGame18, + cross_phonics_option_9: formattedGame19 }; res.status(200).send(combinedResults);