@francesco_ksh/app-ksh-mgd-schemas 1.2.6 → 1.2.8

package/models/AdminReview.js

@@ -1,28 +1,31 @@
 const mongoose = require('mongoose');
 const Schema = mongoose.Schema;
 
-const adminReviewSchema = new Schema({
-	authorName: {
-		type: String,
-		required: true,
+const adminReviewSchema = new Schema(
+	{
+		authorName: {
+			type: String,
+			required: true,
+		},
+		authorDescription: {
+			type: String,
+		},
+		authorReview: {
+			type: String,
+		},
+		picture: {
+			type: String,
+		},
+		rating: {
+			type: Number,
+			required: true,
+		},
+		date: {
+			type: Date,
+			default: Date.now,
+		},
 	},
-	authorDescription: {
-		type: String,
-	},
-	authorReview: {
-		type: String,
-	},
-	picture: {
-		type: String,
-	},
-	rating: {
-		type: Number,
-		required: true,
-	},
-	date: {
-		type: Date,
-		default: Date.now,
-	},
-});
+	{ supressReservedKeysWarning: true }
+);
 
 module.exports = adminReviewSchema;

package/models/Article.js

@@ -1,38 +1,41 @@
 const mongoose = require('mongoose');
 const Schema = mongoose.Schema;
 
-const articlesSchema = new Schema({
-	title: {
-		type: String,
-	},
-	picture: {
-		type: String,
-	},
-	content: {
-		type: Array,
-	},
-	author: {
-		type: Schema.Types.ObjectId,
-		ref: 'User',
-		required: true,
-	},
-	tags: {
-		type: Array,
-	},
-	teaser: {
-		type: String,
-	},
-	views: {
-		type: Number,
-		default: 20,
-	},
-	date: {
-		type: Date,
-		default: Date.now,
-	},
-	sellerId: {
-		type: String,
-	},
-});
+const articlesSchema = new Schema(
+	{
+		title: {
+			type: String,
+		},
+		picture: {
+			type: String,
+		},
+		content: {
+			type: Array,
+		},
+		author: {
+			type: Schema.Types.ObjectId,
+			ref: 'User',
+			required: true,
+		},
+		tags: {
+			type: Array,
+		},
+		teaser: {
+			type: String,
+		},
+		views: {
+			type: Number,
+			default: 20,
+		},
+		date: {
+			type: Date,
+			default: Date.now,
+		},
+		sellerId: {
+			type: String,
+		},
+	},
+	{ supressReservedKeysWarning: true }
+);
 
 module.exports = articlesSchema;

package/models/Brand.js

@@ -1,20 +1,23 @@
 const mongoose = require('mongoose');
 const Schema = mongoose.Schema;
 
-const brandSchema = new Schema({
-	brand: {
-		type: String,
+const brandSchema = new Schema(
+	{
+		brand: {
+			type: String,
+		},
+		link: {
+			type: String,
+		},
+		ranking: {
+			type: Number,
+			default: 0,
+		},
+		clones: {
+			type: Array,
+		},
 	},
-	link: {
-		type: String,
-	},
-	ranking: {
-		type: Number,
-		default: 0,
-	},
-	clones: {
-		type: Array,
-	},
-});
+	{ supressReservedKeysWarning: true }
+);
 
 module.exports = brandSchema;

package/models/CSVUpload.js

@@ -1,25 +1,28 @@
 const mongoose = require('mongoose');
 const Schema = mongoose.Schema;
 
-const CSVUploadSchema = new Schema({
-	data: {
-		type: Array,
+const CSVUploadSchema = new Schema(
+	{
+		data: {
+			type: Array,
+		},
+		user: {
+			type: Schema.Types.ObjectId,
+			ref: 'User',
+		},
+		storeId: {
+			type: Schema.Types.ObjectId,
+			ref: 'Store',
+		},
+		fileName: {
+			type: String,
+		},
+		date: {
+			type: Date,
+			default: Date.now,
+		},
 	},
-	user: {
-		type: Schema.Types.ObjectId,
-		ref: 'User',
-	},
-	storeId: {
-		type: Schema.Types.ObjectId,
-		ref: 'Store',
-	},
-	fileName: {
-		type: String,
-	},
-	date: {
-		type: Date,
-		default: Date.now,
-	},
-});
+	{ supressReservedKeysWarning: true }
+);
 
 module.exports = CSVUploadSchema;

package/models/Carrier.js

@@ -1,111 +1,114 @@
 const mongoose = require('mongoose');
 const Schema = mongoose.Schema;
 
-const carrierSchema = new Schema({
-	name: {
-		type: String,
-		required: true,
-	},
-	email: {
-		type: String,
-		required: true,
-		// unique: true,
-	},
-	phone: {
-		type: String,
-	},
-	company: {
-		type: String,
-	},
-	picture: {
-		type: String,
-	},
-	driversLicenseBack: {
-		type: String,
-	},
-	driversLicenseFront: {
-		type: String,
-	},
-	headShot: {
-		type: String,
-	},
-	password: {
-		type: String,
-		required: true,
-	},
-	isAdmin: {
-		type: Boolean,
-		default: false,
-	},
-	accountBalance: {
-		type: Number,
-		default: 0,
-	},
-	notifications: [
-		{
-			type: Schema.Types.ObjectId,
-			ref: 'Notification',
+const carrierSchema = new Schema(
+	{
+		name: {
+			type: String,
+			required: true,
 		},
-	],
-	balances: [
-		{
-			type: {
-				type: String,
-			},
-			order: {
+		email: {
+			type: String,
+			required: true,
+			// unique: true,
+		},
+		phone: {
+			type: String,
+		},
+		company: {
+			type: String,
+		},
+		picture: {
+			type: String,
+		},
+		driversLicenseBack: {
+			type: String,
+		},
+		driversLicenseFront: {
+			type: String,
+		},
+		headShot: {
+			type: String,
+		},
+		password: {
+			type: String,
+			required: true,
+		},
+		isAdmin: {
+			type: Boolean,
+			default: false,
+		},
+		accountBalance: {
+			type: Number,
+			default: 0,
+		},
+		notifications: [
+			{
 				type: Schema.Types.ObjectId,
-				ref: 'Order',
-			},
-			amount: {
-				type: 'Number',
+				ref: 'Notification',
 			},
-			balance: {
-				type: 'Number',
+		],
+		balances: [
+			{
+				type: {
+					type: String,
+				},
+				order: {
+					type: Schema.Types.ObjectId,
+					ref: 'Order',
+				},
+				amount: {
+					type: 'Number',
+				},
+				balance: {
+					type: 'Number',
+				},
+				date: {
+					type: Date,
+					default: Date.now,
+				},
 			},
-			date: {
-				type: Date,
-				default: Date.now,
-			},
-		},
-	],
+		],
 
-	payoutAccounts: {
-		venmo: {
-			venmoHandle: {
-				type: String,
+		payoutAccounts: {
+			venmo: {
+				venmoHandle: {
+					type: String,
+				},
+				venmoPhone: {
+					type: String,
+				},
 			},
-			venmoPhone: {
-				type: String,
+			payPal: {
+				paypalHandle: {
+					type: String,
+				},
+				paypalUserName: {
+					type: String,
+				},
 			},
-		},
-		payPal: {
-			paypalHandle: {
-				type: String,
-			},
-			paypalUserName: {
-				type: String,
+			bankTransfer: {
+				fullName: {
+					type: String,
+				},
+				accountNumber: {
+					type: String,
+				},
+				routingNumber: {
+					type: String,
+				},
 			},
 		},
-		bankTransfer: {
-			fullName: {
-				type: String,
-			},
-			accountNumber: {
-				type: String,
-			},
-			routingNumber: {
-				type: String,
-			},
+		date: {
+			type: Date,
+			default: Date.now,
+		},
+		lastLogin: {
+			type: Date,
+			default: Date.now,
 		},
 	},
-	date: {
-		type: Date,
-		default: Date.now,
-	},
-	lastLogin: {
-		type: Date,
-		default: Date.now,
-	},
-});
+	{ supressReservedKeysWarning: true }
+);
 
 module.exports = carrierSchema;

package/models/CarrierPortalOrder.js

@@ -1,129 +1,89 @@
 const mongoose = require('mongoose');
 const Schema = mongoose.Schema;
 const moment = require('moment');
-const carrierPortalOrderSchema = new Schema({
-	buyer: {
-		type: Schema.Types.ObjectId,
-		ref: 'User',
-	},
-	seller: {
-		type: Schema.Types.ObjectId,
-		ref: 'User',
-	},
-	carrier: {
-		price: {
-			type: Number,
-		},
-		accepted: {
-			type: Boolean,
-			default: false,
-		},
-		carrier: {
+const carrierPortalOrderSchema = new Schema(
+	{
+		buyer: {
 			type: Schema.Types.ObjectId,
-			ref: 'Carrier',
-		},
-		dropOffDate: {
-			type: Date,
+			ref: 'User',
 		},
-		pickupPictures: {
-			type: Array,
-		},
-		dropOffPictures: {
-			type: Array,
+		seller: {
+			type: Schema.Types.ObjectId,
+			ref: 'User',
 		},
-		questions: [
-			{
-				question: {
-					type: String,
-				},
-				date: {
-					type: Date,
-				},
-				sender: {
-					type: Schema.Types.ObjectId,
-					ref: 'Carrier',
-				},
+		carrier: {
+			price: {
+				type: Number,
 			},
-		],
-	},
-
-	approved: {
-		type: Boolean,
-	},
-
-	listings: [
-		{
-			listing: {
+			accepted: {
+				type: Boolean,
+				default: false,
+			},
+			carrier: {
 				type: Schema.Types.ObjectId,
-				ref: 'Listing',
+				ref: 'Carrier',
 			},
-			quantity: {
-				type: Number,
+			dropOffDate: {
+				type: Date,
 			},
-			listingPrice: {
-				type: Number,
+			pickupPictures: {
+				type: Array,
 			},
-			carrierNotes: {
-				type: String,
+			dropOffPictures: {
+				type: Array,
 			},
+			questions: [
+				{
+					question: {
+						type: String,
+					},
+					date: {
+						type: Date,
+					},
+					sender: {
+						type: Schema.Types.ObjectId,
+						ref: 'Carrier',
+					},
+				},
+			],
 		},
-	],
-	type: {
-		type: String,
-	},
-	deliveryType: {
-		type: String,
-	},
 
-	status: {
-		type: String,
-	},
-	delivery: {
-		carrier: {
-			name: {
-				type: String,
-			},
-			phone: {
-				type: String,
-			},
-			email: {
-				type: String,
-			},
+		approved: {
+			type: Boolean,
 		},
-		trackingLink: {
+
+		listings: [
+			{
+				listing: {
+					type: Schema.Types.ObjectId,
+					ref: 'Listing',
+				},
+				quantity: {
+					type: Number,
+				},
+				listingPrice: {
+					type: Number,
+				},
+				carrierNotes: {
+					type: String,
+				},
+			},
+		],
+		type: {
 			type: String,
 		},
-		bolLink: {
+		deliveryType: {
 			type: String,
 		},
-		durationEstimate: {
-			type: Object,
-		},
-		price: {
-			type: Number,
-		},
-		storeDelivers: {
-			type: Boolean,
-		},
-		storeDeliveryCost: {
-			type: Number,
-		},
-		productSKUs: {
+
+		status: {
 			type: String,
 		},
-
-		buyer: {
-			address: {
-				type: Object,
-			},
-			location: {
-				type: Object,
-			},
-
-			elevator: {
-				type: Boolean,
-			},
-			contact: {
+		delivery: {
+			carrier: {
+				name: {
+					type: String,
+				},
 				phone: {
 					type: String,
 				},
@@ -131,25 +91,68 @@ const carrierPortalOrderSchema = new Schema({
 					type: String,
 				},
 			},
-			flights: {
+			trackingLink: {
 				type: String,
 			},
-			otherInfo: {
+			bolLink: {
 				type: String,
 			},
-			coordinates: {
+			durationEstimate: {
 				type: Object,
 			},
+			price: {
+				type: Number,
+			},
+			storeDelivers: {
+				type: Boolean,
+			},
+			storeDeliveryCost: {
+				type: Number,
+			},
+			productSKUs: {
+				type: String,
+			},
+
+			buyer: {
+				address: {
+					type: Object,
+				},
+				location: {
+					type: Object,
+				},
+
+				elevator: {
+					type: Boolean,
+				},
+				contact: {
+					phone: {
+						type: String,
+					},
+					email: {
+						type: String,
+					},
+				},
+				flights: {
+					type: String,
+				},
+				otherInfo: {
+					type: String,
+				},
+				coordinates: {
+					type: Object,
+				},
+			},
+		},
+		date: {
+			type: Date,
+			default: Date.now,
+		},
+		expirationDate: {
+			type: Date,
+			default: moment().add(3, 'days'),
 		},
 	},
-	date: {
-		type: Date,
-		default: Date.now,
-	},
-	expirationDate: {
-		type: Date,
-		default: moment().add(3, 'days'),
-	},
-});
+	{ supressReservedKeysWarning: true }
+);
 
 module.exports = carrierPortalOrderSchema;