Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ app.use(function(err, req, res, next) {
app.set("port",process.env.PORT || 8080);

app.get("/",(req,res) => {
res.send("Welcome")
res.send("Welcome!!~!!")
})

app.listen(app.get("port"),()=>{
Expand Down
29 changes: 29 additions & 0 deletions controllers/exercise/recentExerciseGET.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
const { getRecentExercises } = require('../../models/exerciseQuery');
const authenticateToken = require("../../authenticateToken");

module.exports = async (req, res) => {
try {
const authHeader = req.headers.authorization;
const token = authHeader.split(' ')[1];
const userID = await authenticateToken(token);

console.log('User ID:', userID); // 사용자 ID 로그

const today = new Date();
const endDate = today.toISOString().split('T')[0];
const startDate = new Date();
startDate.setDate(today.getDate() - 4);
const startDateString = startDate.toISOString().split('T')[0];

// const result = await getRecentExercises(userID, startDateString, endDate);
const result = await getRecentExercises(userID);
console.log('Recent Exercises Data:', result); // 서버 데이터 로그

res.status(200).json(result);

} catch (error) {
res.status(500).json({ message: '최근 운동 기록 조회 중 오류 발생', error });
}
}


60 changes: 60 additions & 0 deletions models/exerciseQuery.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
//시퀄라이즈 코드 작성
// models/exerciseModel.js
const db = require('./index');
const { Op } = require('sequelize'); // Sequelize Op 가져오기

const saveExercise = async (evaluation, exercise_date, start_time_hour, start_time_minute, end_time_hour, end_time_minute, exercise_type, comments, user_id) => {
try {
Expand Down Expand Up @@ -65,9 +66,68 @@ const getExercise = async (exerciseID) => {
throw error;
}
};
//추가한거--------------------------------------------------------------------
// const getRecentExercises = async (userID) => {
// try {
// const today = new Date();
// const endDate = new Date(today);
// const startDate = new Date(today);
// startDate.setDate(today.getDate() - 4);

// // 날짜 형식을 YYYY-MM-DD로 변환
// const formattedStartDate = startDate.toISOString().split('T')[0];
// const formattedEndDate = endDate.toISOString().split('T')[0];

// const result = await db.exerciseReport.findAll({
// where: {
// user_id: userID,
// exercise_date: {
// [Op.between]: [formattedStartDate, formattedEndDate]
// }
// }
// });
// // 확인: 반환하는 데이터가 배열인지
// console.log('Server Data:', result);

// return result;
// } catch (error) {
// console.error('Error in getRecentExercises:', error);
// throw error;
// }
// };
const getRecentExercises = async (userID) => {
try {
console.log('Function getRecentExercises called'); // 함수 호출 로그
console.log('UserID:', userID); // 사용자 ID 로그

const today = new Date();
const endDate = today.toISOString().split('T')[0]; // 'YYYY-MM-DD'
const startDate = new Date(today);
startDate.setDate(today.getDate() - 4);
const startDateString = startDate.toISOString().split('T')[0]; // 'YYYY-MM-DD'

console.log('Start Date:', startDateString, 'End Date:', endDate); // 날짜 로그
const result = await db.exerciseReport.findAll({
where: {
user_id: userID,
exercise_date: {
[Op.between]: [startDateString, endDate]
}
}
});

console.log('Server Data:', result); // 데이터 확인
return result;
} catch (error) {
console.error('Error in getRecentExercises:', error);
throw error;
}
};
//----------------------------------------------------------------------------

module.exports = {
saveExercise,
getExerciseByDate,
getExercise,
getRecentExercises //
};
Loading