Skip to content
Snippets Groups Projects
Commit 2790d731 authored by MinJae Kwon's avatar MinJae Kwon
Browse files

fix: events and crews not returned properly

parent 870dd21e
No related branches found
No related tags found
1 merge request!47fix: events and crews not returned properly
...@@ -328,19 +328,35 @@ exports.listUserCrews = async (req, res) => { ...@@ -328,19 +328,35 @@ exports.listUserCrews = async (req, res) => {
{ {
model: Crew, model: Crew,
attributes: [ attributes: [
'crewID', 'name', 'createdDate', 'regionID', 'sportTypeId', 'crewID',
'capacity', 'fee_krw', 'description', 'name',
'createdDate',
'regionID',
'sportTypeId',
'capacity',
'fee_krw',
'description',
],
include: [
{
model: UserCrew,
attributes: [],
},
],
},
],
attributes: {
include: [
[ [
sequelize.literal(`( sequelize.literal(`(
SELECT COUNT(*) SELECT COUNT(*)
FROM UserCrew AS uc FROM UserCrew AS uc
WHERE uc.crewID = Crew.crewID WHERE uc.crewID = UserCrew.crewID
)`), )`),
'memberCount', 'memberCount',
], ],
], ],
}, },
],
limit: listItemsPerPage, limit: listItemsPerPage,
offset: parseInt(page, 10) * listItemsPerPage, offset: parseInt(page, 10) * listItemsPerPage,
}); });
...@@ -366,6 +382,8 @@ exports.listUserEvents = async (req, res) => { ...@@ -366,6 +382,8 @@ exports.listUserEvents = async (req, res) => {
const page = req.query.page || 0; const page = req.query.page || 0;
console.log(userID);
try { try {
const user = await User.findByPk(userID); const user = await User.findByPk(userID);
...@@ -379,19 +397,35 @@ exports.listUserEvents = async (req, res) => { ...@@ -379,19 +397,35 @@ exports.listUserEvents = async (req, res) => {
{ {
model: Event, model: Event,
attributes: [ attributes: [
'eventID', 'name', 'eventDate', 'regionID', 'sportTypeId', 'eventID',
'capacity', 'feeCondition', 'createdDate', 'name',
'eventDate',
'regionID',
'sportTypeId',
'capacity',
'feeCondition',
'createdDate',
],
include: [
{
model: EventParticipants,
attributes: [],
},
],
},
],
attributes: {
include: [
[ [
sequelize.literal(`( sequelize.literal(`(
SELECT COUNT(*) SELECT COUNT(*)
FROM EventParticipants AS ep FROM EventParticipants AS ep
WHERE ep.eventID = Event.eventID WHERE ep.eventID = EventParticipants.eventID
)`), )`),
'participantCount', 'participantCount',
], ],
], ],
}, },
],
limit: listItemsPerPage, limit: listItemsPerPage,
offset: parseInt(page, 10) * listItemsPerPage, offset: parseInt(page, 10) * listItemsPerPage,
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment