streamlined address and availability

backend/models/User.js

@@ -74,6 +74,30 @@ const User = sequelize.define('User', {
   isVerified: {
     type: DataTypes.BOOLEAN,
     defaultValue: false
+  },
+  defaultAvailableAfter: {
+    type: DataTypes.STRING,
+    defaultValue: '09:00'
+  },
+  defaultAvailableBefore: {
+    type: DataTypes.STRING,
+    defaultValue: '17:00'
+  },
+  defaultSpecifyTimesPerDay: {
+    type: DataTypes.BOOLEAN,
+    defaultValue: false
+  },
+  defaultWeeklyTimes: {
+    type: DataTypes.JSONB,
+    defaultValue: {
+      sunday: { availableAfter: "09:00", availableBefore: "17:00" },
+      monday: { availableAfter: "09:00", availableBefore: "17:00" },
+      tuesday: { availableAfter: "09:00", availableBefore: "17:00" },
+      wednesday: { availableAfter: "09:00", availableBefore: "17:00" },
+      thursday: { availableAfter: "09:00", availableBefore: "17:00" },
+      friday: { availableAfter: "09:00", availableBefore: "17:00" },
+      saturday: { availableAfter: "09:00", availableBefore: "17:00" }
+    }
   }
 }, {
   hooks: {

backend/models/UserAddress.js

@@ -0,0 +1,54 @@
+const { DataTypes } = require('sequelize');
+const sequelize = require('../config/database');
+
+const UserAddress = sequelize.define('UserAddress', {
+  id: {
+    type: DataTypes.UUID,
+    defaultValue: DataTypes.UUIDV4,
+    primaryKey: true
+  },
+  userId: {
+    type: DataTypes.UUID,
+    allowNull: false,
+    references: {
+      model: 'Users',
+      key: 'id'
+    }
+  },
+  address1: {
+    type: DataTypes.STRING,
+    allowNull: false
+  },
+  address2: {
+    type: DataTypes.STRING
+  },
+  city: {
+    type: DataTypes.STRING,
+    allowNull: false
+  },
+  state: {
+    type: DataTypes.STRING,
+    allowNull: false
+  },
+  zipCode: {
+    type: DataTypes.STRING,
+    allowNull: false
+  },
+  country: {
+    type: DataTypes.STRING,
+    allowNull: false,
+    defaultValue: 'US'
+  },
+  latitude: {
+    type: DataTypes.DECIMAL(10, 8)
+  },
+  longitude: {
+    type: DataTypes.DECIMAL(11, 8)
+  },
+  isPrimary: {
+    type: DataTypes.BOOLEAN,
+    defaultValue: false
+  }
+});
+
+module.exports = UserAddress;

backend/models/index.js

@@ -5,6 +5,7 @@ const Rental = require('./Rental');
 const Message = require('./Message');
 const ItemRequest = require('./ItemRequest');
 const ItemRequestResponse = require('./ItemRequestResponse');
+const UserAddress = require('./UserAddress');
 
 User.hasMany(Item, { as: 'ownedItems', foreignKey: 'ownerId' });
 Item.belongsTo(User, { as: 'owner', foreignKey: 'ownerId' });
@@ -33,6 +34,9 @@ ItemRequestResponse.belongsTo(User, { as: 'responder', foreignKey: 'responderId'
 ItemRequestResponse.belongsTo(ItemRequest, { as: 'itemRequest', foreignKey: 'itemRequestId' });
 ItemRequestResponse.belongsTo(Item, { as: 'existingItem', foreignKey: 'existingItemId' });
 
+User.hasMany(UserAddress, { as: 'addresses', foreignKey: 'userId' });
+UserAddress.belongsTo(User, { as: 'user', foreignKey: 'userId' });
+
 module.exports = {
   sequelize,
   User,
@@ -40,5 +44,6 @@ module.exports = {
   Rental,
   Message,
   ItemRequest,
-  ItemRequestResponse
+  ItemRequestResponse,
+  UserAddress
 };