Merge branch 'fix-crew-event-list' into 'main'

fix: events and crews not returned properly

See merge request !47

webapp/backend/apiserver/controllers/userController.js

@@ -328,19 +328,35 @@ exports.listUserCrews = async (req, res) => {
                 {
                     model: Crew,
                     attributes: [
-                        'crewID', 'name', 'createdDate', 'regionID', 'sportTypeId',
-                        'capacity', 'fee_krw', 'description',
+                        'crewID',
+                        'name',
+                        'createdDate',
+                        'regionID',
+                        'sportTypeId',
+                        'capacity',
+                        'fee_krw',
+                        'description',
+                    ],
+                    include: [
+                        {
+                            model: UserCrew,
+                            attributes: [],
+                        },
+                    ],
+                },
+            ],
+            attributes: {
+                include: [
                     [
                         sequelize.literal(`(
                           SELECT COUNT(*)
                           FROM UserCrew AS uc
-                                WHERE uc.crewID = Crew.crewID
+                          WHERE uc.crewID = UserCrew.crewID
                         )`),
                         'memberCount',
                     ],
                 ],
             },
-            ],
             limit: listItemsPerPage,
             offset: parseInt(page, 10) * listItemsPerPage,
         });
@@ -366,6 +382,8 @@ exports.listUserEvents = async (req, res) => {
 
     const page = req.query.page || 0;
 
+    console.log(userID);
+
     try {
         const user = await User.findByPk(userID);
 
@@ -379,19 +397,35 @@ exports.listUserEvents = async (req, res) => {
                 {
                     model: Event,
                     attributes: [
-                        'eventID', 'name', 'eventDate', 'regionID', 'sportTypeId',
-                        'capacity', 'feeCondition', 'createdDate',
+                        'eventID',
+                        'name',
+                        'eventDate',
+                        'regionID',
+                        'sportTypeId',
+                        'capacity',
+                        'feeCondition',
+                        'createdDate',
+                    ],
+                    include: [
+                        {
+                            model: EventParticipants,
+                            attributes: [],
+                        },
+                    ],
+                },
+            ],
+            attributes: {
+                include: [
                     [
                         sequelize.literal(`(
                             SELECT COUNT(*)
                             FROM EventParticipants AS ep
-                                WHERE ep.eventID = Event.eventID
+                            WHERE ep.eventID = EventParticipants.eventID
                         )`),
                         'participantCount',
                     ],
                 ],
             },
-            ],
             limit: listItemsPerPage,
             offset: parseInt(page, 10) * listItemsPerPage,
         });