diff --git a/server/models/order.js b/server/models/order.js index d2e766d..06d60a2 100644 --- a/server/models/order.js +++ b/server/models/order.js @@ -7,18 +7,10 @@ const OrderSchema = new Schema( type: Schema.Types.ObjectId, ref: 'cart' }, - user: { - type: Schema.Types.ObjectId, - ref: 'user' - }, - total: { - type: Number, - default: 0 - }, - updated: Date, - created: { - type: Date, - default: Date.now + status: { + type: String, + default: 'Not processed', + enum: ['Not processed', 'Processing', 'Shipped', 'Delivered', 'Cancelled'] }, }, { timestamps: true } diff --git a/server/models/user.js b/server/models/user.js index 6de9de8..b2cd919 100644 --- a/server/models/user.js +++ b/server/models/user.js @@ -30,7 +30,7 @@ const userSchema = new Schema( type: String, requied: true }, - address: AddressSchema, + address: [AddressSchema], isAdmin: { type: Boolean, default: false diff --git a/server/routes/api/addressAPI.js b/server/routes/api/addressAPI.js deleted file mode 100644 index 74df942..0000000 --- a/server/routes/api/addressAPI.js +++ /dev/null @@ -1,65 +0,0 @@ -const express = require('express'); -const router = express.Router(); -const User = require('../../models/user.js'); -const { verify, verifyAndAuthorization, verifyAndAdmin } = require('../verifyToken') - -router.get('/address/:id', verifyAndAuthorization, async (req, res) => { - try { - const userAddress = await User.findById(req.params.id).address; - res.status(200).json(userAddress); - } - catch (err) { - res.status(500).json({ Message: 'there was an ERROR fetching address', Error: err }); - } -}) - -router.post('/create', async (req, res) => { - try { - const newAddress = new User.address = ({ - address: req.body.address, - city: req.body.city, - country: req.body.country, - }); - await newAddress.save() - res.status(201).json.apply(newAddress) - } catch (err) { - res.status(500).json({ Message: 'there was an ERROR adding address', Error: err }); - } -}) - -router.delete('/delete/:id', async (req, res) => { - try { - const removed = await User.updateOne( - { _id: req.params.id }, - { - $set: { - address: null - } - } - ); - res.status(200).json(removed); - } catch (err) { - res.status(500).json({ Message: "the address hasn't been deleted", Error: err }); - } -}) - -router.put('/update', async (req, res) => { - try { - const updated = await User.updateOne( - { _id: req.params.id }, - { - $set: { - address: { - address: req.body.address, - city: req.body.city, - country: req.body.country, - } - } - }); - responce.status(201).json(updated); - } catch (err) { - res.status(500).json({ Message: `There was an ERROR Updating the user address : ${request.params.id}`, Error: err }); - } -}) - -module.exports = router; \ No newline at end of file