streamlined address and availability

backend/routes/users.js

@@ -1,5 +1,5 @@
 const express = require('express');
-const { User } = require('../models'); // Import from models/index.js to get models with associations
+const { User, UserAddress } = require('../models'); // Import from models/index.js to get models with associations
 const { authenticateToken } = require('../middleware/auth');
 const { uploadProfileImage } = require('../middleware/upload');
 const fs = require('fs').promises;
@@ -17,6 +17,105 @@ router.get('/profile', authenticateToken, async (req, res) => {
   }
 });
 
+// Address routes (must come before /:id route)
+router.get('/addresses', authenticateToken, async (req, res) => {
+  try {
+    const addresses = await UserAddress.findAll({
+      where: { userId: req.user.id },
+      order: [['isPrimary', 'DESC'], ['createdAt', 'ASC']]
+    });
+    res.json(addresses);
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
+router.post('/addresses', authenticateToken, async (req, res) => {
+  try {
+    const address = await UserAddress.create({
+      ...req.body,
+      userId: req.user.id
+    });
+    res.status(201).json(address);
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
+router.put('/addresses/:id', authenticateToken, async (req, res) => {
+  try {
+    const address = await UserAddress.findByPk(req.params.id);
+    
+    if (!address) {
+      return res.status(404).json({ error: 'Address not found' });
+    }
+    
+    if (address.userId !== req.user.id) {
+      return res.status(403).json({ error: 'Unauthorized' });
+    }
+    
+    await address.update(req.body);
+    res.json(address);
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
+router.delete('/addresses/:id', authenticateToken, async (req, res) => {
+  try {
+    const address = await UserAddress.findByPk(req.params.id);
+    
+    if (!address) {
+      return res.status(404).json({ error: 'Address not found' });
+    }
+    
+    if (address.userId !== req.user.id) {
+      return res.status(403).json({ error: 'Unauthorized' });
+    }
+    
+    await address.destroy();
+    res.status(204).send();
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
+// User availability routes (must come before /:id route)
+router.get('/availability', authenticateToken, async (req, res) => {
+  try {
+    const user = await User.findByPk(req.user.id, {
+      attributes: ['defaultAvailableAfter', 'defaultAvailableBefore', 'defaultSpecifyTimesPerDay', 'defaultWeeklyTimes']
+    });
+    res.json({
+      generalAvailableAfter: user.defaultAvailableAfter,
+      generalAvailableBefore: user.defaultAvailableBefore,
+      specifyTimesPerDay: user.defaultSpecifyTimesPerDay,
+      weeklyTimes: user.defaultWeeklyTimes
+    });
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
+router.put('/availability', authenticateToken, async (req, res) => {
+  try {
+    const { generalAvailableAfter, generalAvailableBefore, specifyTimesPerDay, weeklyTimes } = req.body;
+    
+    await User.update({
+      defaultAvailableAfter: generalAvailableAfter,
+      defaultAvailableBefore: generalAvailableBefore,
+      defaultSpecifyTimesPerDay: specifyTimesPerDay,
+      defaultWeeklyTimes: weeklyTimes
+    }, {
+      where: { id: req.user.id }
+    });
+
+    res.json({ message: 'Availability updated successfully' });
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
 router.get('/:id', async (req, res) => {
   try {
     const user = await User.findByPk(req.params.id, {