diff --git a/Nodejs/Gamelist.js b/Nodejs/Gamelist.js
index 24834cbc0938e45cbc4c7d3e2a596f78b495d528..5b8d82e2c8aeca50bb59b55969446b0d00e28515 100644
--- a/Nodejs/Gamelist.js
+++ b/Nodejs/Gamelist.js
@@ -26,23 +26,26 @@ router.get('/menu', (req, res) => {
let query = `
SELECT
sports.Name AS SportsType,
- arena.Stadium AS FieldName,
- times.StartTime AS StartTime,
- times.EndTime AS EndTime,
+ arena.Arena_Name,
+ stadium.Name AS Stadium,
+ times.StartTime,
+ times.EndTime,
games.Date AS GameDate,
- games.Code AS GameCode,
+ games.Game_Code AS GameCode,
games.valid,
COUNT(play_in.User_Code) AS ReservedSlots
FROM
games
INNER JOIN
- arena ON games.Ground_Name = arena.Field_Name
+ arena ON games.Arena_Name = arena.Arena_Name
INNER JOIN
- times ON games.Time_Code = times.Code
+ stadium ON arena.Arena_Name = stadium.Arena_Name
+ INNER JOIN
+ times ON games.Time_Code = times.Time_Code
INNER JOIN
sports ON arena.Sports_Type = sports.Name
LEFT JOIN
- play_in ON games.Code = play_in.Game_Code
+ play_in ON games.Game_Code = play_in.Game_Code
WHERE games.Date >= CURDATE()`;
const params = [];
@@ -56,10 +59,10 @@ router.get('/menu', (req, res) => {
if (stadium.includes(',')) {
// stadium이 쉼표로 구분된 문자열인 경우
const selectedStadiums = stadium.split(',');
- query += ' AND arena.Field_Name IN (?)';
+ query += ' AND arena.Arena_Name IN (?)';
params.push(selectedStadiums);
} else {
- query += ' AND arena.Field_Name = ?';
+ query += ' AND arena.Arena_Name = ?';
params.push(stadium);
}
}
@@ -79,7 +82,7 @@ router.get('/menu', (req, res) => {
params.push(gameDate);
}
- query += ' GROUP BY sports.Name, arena.Field_Name, games.Code, times.StartTime, times.EndTime, games.Date';
+ query += ' GROUP BY sports.Name, arena.Arena_Name, games.Game_Code, times.StartTime, times.EndTime, games.Date';
db.query(query, params, (error, results) => {
if (error) {
diff --git a/Nodejs/main.js b/Nodejs/main.js
index aa85c688117fe72eb1e8806432759073bacc081d..c83e71a1e6daa480601b5768be7ff5ea36774660 100644
--- a/Nodejs/main.js
+++ b/Nodejs/main.js
@@ -65,7 +65,7 @@ app.post('/login', (req, res) => {
const password = req.body.password;
console.log(password);
// MySQL 쿼리문 실행
- const query = `SELECT * FROM users WHERE code = ${code} AND password = '${password}'`;
+ const query = `SELECT * FROM users WHERE User_code = ${code} AND password = '${password}'`;
db.query(query, (err, result) => {
if (err) {
diff --git a/Nodejs/reser.js b/Nodejs/reser.js
index cb95b5cb112db6e6a50d45a5daed3f2fa5b67729..4c7cc19cc78d51a9bc20d842d91f5107d985fa8d 100644
--- a/Nodejs/reser.js
+++ b/Nodejs/reser.js
@@ -31,12 +31,12 @@ router.get('/reser', (req, res) => {
const checkDuplicateQuery = `
SELECT COUNT(*) AS count
FROM play_in AS p1
- JOIN games AS g1 ON p1.Game_Code = g1.Code
- JOIN times AS t1 ON g1.Time_Code = t1.Code
+ JOIN games ON p1.Game_Code = games.Game_Code
+ JOIN times ON games.Time_Code = times.Time_Code
WHERE p1.User_Code = ${userCode}
- AND g1.Date = (SELECT Date FROM games WHERE Code = ${gameCode})
- AND t1.StartTime = (SELECT StartTime FROM times WHERE Code = (SELECT Time_Code FROM games WHERE Code = ${gameCode}))
- AND t1.EndTime = (SELECT EndTime FROM times WHERE Code = (SELECT Time_Code FROM games WHERE Code = ${gameCode}))
+ AND games.Date = (SELECT Date FROM games WHERE Game_Code = ${gameCode})
+ AND times.StartTime = (SELECT StartTime FROM times WHERE Time_Code = (SELECT Time_Code FROM games WHERE Game_Code = ${gameCode}))
+ AND times.EndTime = (SELECT EndTime FROM times WHERE TIme_Code = (SELECT Time_Code FROM games WHERE Game_Code = ${gameCode}))
`;
db.query(checkDuplicateQuery, (duplicateErr, duplicateResult) => {
@@ -49,11 +49,11 @@ router.get('/reser', (req, res) => {
const isDuplicate = duplicateResult[0].count > 0;
if (!isDuplicate) {
- const MaxCheck = `SELECT MAX FROM sports, games, arena WHERE sports_type=Name and field_name=Ground_name and code=${gameCode}`;
+ const MaxCheck = `SELECT MAX FROM sports, games, arena WHERE sports_type=Name and arena.Arena_name=games.Arena_name and games.Game_code=${gameCode}`;
const CurrentPlayer = `SELECT count(*) as CurrentPlayer FROM Play_in WHERE game_code=${gameCode}`;
db.query(MaxCheck, (MAXErr, MaxResult) => {
- console.log('MAX: ', MaxResult[0].MAX);
+ console.log('MAX: ', MaxResult[0].MAX); //56번째줄
const Max = MaxResult[0].MAX;
db.query(CurrentPlayer, (Nomoreplayer, NMPResult) => {
console.log('CurrentPlayer: ', NMPResult[0].CurrentPlayer);
@@ -79,7 +79,8 @@ router.get('/reser', (req, res) => {
const query = `
SELECT
- arena.Stadium AS ArenaName,
+ arena.Arena_Name,
+ stadium.Name AS Stadium,
sports.Name AS SportsType,
times.StartTime,
times.EndTime,
@@ -88,16 +89,17 @@ router.get('/reser', (req, res) => {
sports.Max AS MaxPlayers,
manager.Name AS ManagerName,
GROUP_CONCAT(users.Name) AS PlayerName,
- GROUP_CONCAT(CASE WHEN users.Code = '${userCode}' THEN users.Name ELSE NULL END) AS ReservationName
+ GROUP_CONCAT(CASE WHEN users.User_Code = '${userCode}' THEN users.Name ELSE NULL END) AS ReservationName
FROM play_in
- JOIN games ON play_in.Game_Code = games.Code
- JOIN arena ON games.Ground_Name = arena.Field_Name
+ JOIN games ON play_in.Game_Code = games.Game_Code
+ JOIN arena ON games.Arena_Name = arena.Arena_Name
+ JOIN stadium ON arena.Arena_Name = stadium.Arena_Name
JOIN sports ON arena.Sports_Type = sports.Name
- JOIN times ON games.Time_Code = times.Code
- JOIN users ON play_in.User_Code = users.Code
- JOIN users AS manager ON arena.Mgr_Code = manager.Code
+ JOIN times ON games.Time_Code = times.Time_Code
+ JOIN users ON play_in.User_Code = users.User_Code
+ JOIN users AS manager ON arena.Mgr_Code = manager.User_Code
WHERE play_in.Game_Code = ${gameCode}
- GROUP BY arena.Field_Name, sports.Name, times.StartTime, times.EndTime, arena.Cost, sports.Min, sports.Max, manager.Name;
+ GROUP BY arena.Arena_Name, sports.Name, times.StartTime, times.EndTime, arena.Cost, sports.Min, sports.Max, manager.Name;
`;
executeQuery(query, res);
diff --git a/Nodejs/views/BBFP_List.html b/Nodejs/views/BBFP_List.html
index 5c14c52596cbe67d88f1b60f2c3d565447f6b0aa..601d9ce1d3a93ad520b8c92e9a29ed2fe77ad901 100644
--- a/Nodejs/views/BBFP_List.html
+++ b/Nodejs/views/BBFP_List.html
@@ -115,7 +115,7 @@
<%= game.SportsType %>
</td>
<td>
- <%= game.FieldName %>
+ <%= game.Stadium %>
</td>
<td>
<%= game.StartTime %>
@@ -166,7 +166,7 @@
tableRows.forEach(row => {
const rowData = {
SportsType: row.cells[0].textContent,
- FieldName: row.cells[1].textContent,
+ Stadium: row.cells[1].textContent,
StartTime: row.cells[2].textContent,
EndTime: row.cells[3].textContent,
GameDate: row.cells[4].textContent,
@@ -204,7 +204,7 @@
const row = tableBody.insertRow(); // 새로운 행 삽입
// 각 셀에 데이터 추가
row.insertCell().appendChild(document.createTextNode(game.SportsType));
- row.insertCell().appendChild(document.createTextNode(game.FieldName));
+ row.insertCell().appendChild(document.createTextNode(game.Stadium));
row.insertCell().appendChild(document.createTextNode(game.StartTime));
row.insertCell().appendChild(document.createTextNode(game.EndTime));
row.insertCell().appendChild(document.createTextNode(game.GameDate));
diff --git a/Nodejs/views/BBFP_Reservation.html b/Nodejs/views/BBFP_Reservation.html
index 77176d3127c3811c639358defdc82135fdff8a69..f27b1f4c06faee18cd381dec83292ccf9c4a5962 100644
--- a/Nodejs/views/BBFP_Reservation.html
+++ b/Nodejs/views/BBFP_Reservation.html
@@ -22,7 +22,7 @@
<h3>예약정보 확인</h3>
<div class="divider"></div>
<p>예약자 이름: <span><%= data.ReservationName %></span></p><hr>
- <p>경기장 이름: <span><%= data.ArenaName %></span></p><hr>
+ <p>경기장 이름: <span><%= data.Stadium %></span></p><hr>
<p>스포츠 종목: <span><%= data.SportsType %></span></p><hr>
<P>경기 시작 시간: <span><%= data.StartTime %></span></P><hr>
<p>경기 종료 시간: <span><%= data.EndTime %></span></p><hr>