Merge branch 'revert-to-avatar-page-paginate'

singharaj-usai · Oct 16, 2024 · 1ef0a27 · 1ef0a27
2 parents 5b41e69 + 27a92a5
commit 1ef0a27
Showing 1 changed file with 31 additions and 0 deletions.
diff --git a/server/functions/api/routes/shirt.js b/server/functions/api/routes/shirt.js
@@ -87,17 +87,27 @@ router.get('/user', authenticateToken, async (req, res) => {
 
       // Fetch shirts created by user
       const createdShirts = await Asset.find({
+<<<<<<< HEAD
           creator: user.userId, 
           AssetType: 'Shirt',
       });
+=======
+          creator: user._id, 
+          AssetType: 'Shirt',
+      }).populate('creator', 'username');
+>>>>>>> revert-to-avatar-page-paginate
 
       console.log('Created shirts found:', createdShirts.length);
 
       // Fetch shirts owned by user
       const ownedShirts = await Asset.find({
           _id: { $in: user.inventory },
           AssetType: 'Shirt',
+<<<<<<< HEAD
       });
+=======
+      }).populate('creator', 'username');
+>>>>>>> revert-to-avatar-page-paginate
 
       console.log('Owned shirts found:', ownedShirts.length);
 
@@ -132,6 +142,7 @@ router.get('/user', authenticateToken, async (req, res) => {
 router.get('/:id', async (req, res) => {
   try {
     const id = req.params.id;
+<<<<<<< HEAD
     const shirt = await Asset.findOne({ assetId: id, AssetType: 'Shirt' });
     if (!shirt) {
       return res.status(404).json({ error: 'Shirt not found' });
@@ -145,6 +156,21 @@ router.get('/:id', async (req, res) => {
   } catch (error) {
     console.error('Error fetching shirt:', error);
     res.status(500).json({ error: 'Error fetching shirt', details: error.message });
+=======
+    const shirt = await Asset.findOne({ _id: id, AssetType: 'Shirt' }).populate(
+      'creator',
+      'username'
+    );
+    if (!shirt) {
+      return res.status(404).json({ error: 'Shirt not found' });
+    }
+    res.json(shirt);
+  } catch (error) {
+    console.error('Error fetching shirt:', error);
+    res
+      .status(500)
+      .json({ error: 'Error fetching shirt', details: error.message });
+>>>>>>> revert-to-avatar-page-paginate
   }
 });
 
@@ -267,8 +293,13 @@ router.post(
 
       await thumbnailQueue.addToQueue(shirtassetId, 'Shirt');
 
+<<<<<<< HEAD
       await User.findOneAndUpdate({ userId: req.user.userId }, {
         $push: { shirts: shirt.assetId },
+=======
+      await User.findByIdAndUpdate(req.user._id, {
+        $push: { shirts: shirt._id },
+>>>>>>> revert-to-avatar-page-paginate
       });
 
       res.status(201).json({ shirtId: shirt.assetId, assetId: shirt.assetId });