database-connector 1.0.6 → 1.0.7

package/models/Cart.js

@@ -1,6 +1,4 @@
 const { Schema, model } = require('mongoose');
-const Product = require('./Product');
-const User = require('./User');
 
 const itemSchema = new Schema(
 	{

package/models/Category.js

@@ -1,26 +1,23 @@
 const mongoose = require('mongoose');
-const Product = require('./Product');
 
 const categorySchema = new mongoose.Schema(
 	{
-		storeCategoryId : {
+		storeCategoryId: {
 			type: mongoose.Schema.Types.ObjectId,
 			ref: 'StoreCategory',
-		} , 
+		},
 		name: {
 			type: String,
 			required: true,
 		},
-		
-		confirmed : { type : Boolean ,  default : false } , 
-		
+		confirmed: { type: Boolean, default: false },
 		subCategories: [
 			{
 				name: {
 					type: String,
 					required: true,
 				},
-				confirmed : { type : Boolean ,  default : false } , 
+				confirmed: { type: Boolean, default: false },
 			},
 			{
 				timestamps: true,

package/models/FlashDeal.js

@@ -1,4 +1,4 @@
-const { Timestamp } = require('mongodb');
+
 const mongoose = require('mongoose');
 const FlashDealSchema = new mongoose.Schema(
 	{

package/models/Offer.js

@@ -1,6 +1,5 @@
 const { Timestamp } = require('mongodb');
 const mongoose = require('mongoose');
-const User = require('./User');
 
 const OfferSchema = new mongoose.Schema(
 	{
@@ -31,12 +30,12 @@ const OfferSchema = new mongoose.Schema(
 		},
 		offerExpiration: {
 			type: Date,
-			
+
 			default: Date.now() + 86400000,
 		},
 		offerStatus: {
 			type: String,
-			default:'active',
+			default: 'active',
 
 			enum: ['pending', 'active', 'rejected', 'expired'],
 		},
@@ -47,7 +46,7 @@ const OfferSchema = new mongoose.Schema(
 		},
 		offerName: {
 			type: String,
-			
+
 		},
 		offerImage: {
 			type: String,
@@ -55,7 +54,7 @@ const OfferSchema = new mongoose.Schema(
 		},
 		offerDescription: {
 			type: String,
-		
+
 		},
 		discountType: {
 			type: String,

package/models/Order.js

@@ -1,5 +1,4 @@
 const mongoose = require('mongoose');
-var ObjectId = require('mongodb').ObjectID;
 const Sale = require('./Sale');
 
 const { policySchema } = require('./Policy');
@@ -15,13 +14,13 @@ const orderSchema = new mongoose.Schema(
 			required: true,
 			ref: 'Store',
 		},
-		pickupPerson : {
-			type : {
-				name : {type : String, required: true } ,
-			} , 
-			default : null
-		} ,
-		deliveryLocation : {
+		pickupPerson: {
+			type: {
+				name: { type: String, required: true },
+			},
+			default: null
+		},
+		deliveryLocation: {
 			type: {
 				type: String,
 				enum: ['Point'],
@@ -35,7 +34,7 @@ const orderSchema = new mongoose.Schema(
 				},
 			],
 		},
-		deliveryAddresse : {
+		deliveryAddresse: {
 			city: {
 				type: String,
 				// required: true,
@@ -69,9 +68,9 @@ const orderSchema = new mongoose.Schema(
 				//required: true,
 			},
 		},
-		distance : {
-			type : Number , default : null 
-		} ,
+		distance: {
+			type: Number, default: null
+		},
 		items: [
 			{
 				productId: { type: String, required: true },
@@ -80,29 +79,29 @@ const orderSchema = new mongoose.Schema(
 				image: { type: String, required: true },
 				price: { type: Number, required: true },
 				discount: { type: Number, required: true },
-				reservation: { type: Number},
+				reservation: { type: Number },
 				quantity: { type: Number, required: true, default: 1 },
 				policy: policySchema,
 
-				refund : {
-					order : {
-						fixe : {type : Number ,  default : null} ,
-						percentage : {type : Number ,  default : null} ,
-					} , 
-					shipping : {
-						fixe : {type : Number ,  default : null} ,
-						percentage : {type : Number ,  default : null} ,
+				refund: {
+					order: {
+						fixe: { type: Number, default: null },
+						percentage: { type: Number, default: null },
+					},
+					shipping: {
+						fixe: { type: Number, default: null },
+						percentage: { type: Number, default: null },
 					},
-				} , 
-				
+				},
+
 			},
 			{
 				timestamps: true,
 			},
 		],
 
-		
-		return : { type : Boolean ,  default : null } , 
+
+		return: { type: Boolean, default: null },
 
 		returnItems: [
 			{
@@ -114,7 +113,7 @@ const orderSchema = new mongoose.Schema(
 				discount: { type: Number, required: true },
 				quantity: { type: Number, required: true, default: 1 },
 				orderQuantity: { type: Number, required: true, default: 1 },
-				policy: policySchema,	
+				policy: policySchema,
 			},
 			{
 				timestamps: true,
@@ -131,88 +130,91 @@ const orderSchema = new mongoose.Schema(
 				discount: { type: Number, required: true },
 				quantity: { type: Number, required: true, default: 1 },
 				orderQuantity: { type: Number, required: true, default: 1 },
-				policy: policySchema,	
+				policy: policySchema,
 			},
 			{
 				timestamps: true,
 			},
 		],
 
-		refundPaymentInfos : {
-			type : {
+		refundPaymentInfos: {
+			type: {
 				totalAmount: { type: Number, required: true },
-			} ,   
-			
-			default : null 
-		} ,
-		returnMotif :{ type: String ,  default : null },
-		
-		waitingforReturn :{ type: Boolean ,  default : null },
-		
-		returned :{ type: Boolean ,  default : null },
-		
-
-		paymentInfos : {
+			},
+
+			default: null
+		},
+		returnMotif: { type: String, default: null },
+
+		waitingforReturn: { type: Boolean, default: null },
+
+		returned: { type: Boolean, default: null },
+
+
+		paymentInfos: {
 			totalAmount: { type: Number, required: true },
 			paymentMethodeId: { type: Number, required: true, },
-			card : {
-				cardNumber : { type: String,  default : null },
-				ccv: { type: String, default : null },
-				expdate: { type: String, default : null},
+			card: {
+				cardNumber: { type: String, default: null },
+				ccv: { type: String, default: null },
+				expdate: { type: String, default: null },
 				name: { type: String, required: true },
 				phone: { type: String, required: true },
 				postalCode: { type: String, required: true },
 				address_city: { type: String, required: true },
 				address_line1: { type: String, required: true },
-				address_line2: { type: String, default: ""},
-			} ,
-		} ,
-		pickUp : { type : Boolean , required : true , default : null } , 
-		delivery : { type : Boolean , required : true , default : null } , 
-		
-		refund : { type : Boolean ,  default : null } , 
-
-		timeLimit :  { type : Number ,  default : null }  ,
-
-		canceled : { type : Boolean ,  default : null } , 
-		canceledBy : {
+				address_line2: { type: String, default: "" },
+			},
+		},
+		pickUp: { type: Boolean, required: true, default: null },
+		delivery: { type: Boolean, required: true, default: null },
+
+		refund: { type: Boolean, default: null },
+
+		timeLimit: { type: Number, default: null },
+
+		canceled: { type: Boolean, default: null },
+		canceledBy: {
 			userId: { type: mongoose.Schema.Types.ObjectId },
 			motif: { type: String },
-		} ,
-		status: { type: String, required: true, enum: [
-														'Pending', 
-														'InPreparation',  
-														'LoadingDelivery', 
-														'OnTheWay', 
-														'Delivered', 
-														'AwaitingRecovery', 
-														'Recovered', 
-														'Reserved', 
-														'WaitingForReturn', 
-														'Returned', 	
-														'UnderRefund' ,
-														'Refunded', 
-														'succeeded'
-													], default: 'Pending' }, 
+		},
+		status: {
+			type: String, required: true, enum: [
+				'Pending',
+				'InPreparation',
+				'LoadingDelivery',
+				'OnTheWay',
+				'Delivered',
+				'AwaitingRecovery',
+				'Recovered',
+				'Reserved',
+				'WaitingForReturn',
+				'Returned',
+				'UnderRefund',
+				'Refunded',
+				'succeeded'
+			], default: 'Pending'
+		},
 	},
 	{ timestamps: true }
 );
 orderSchema.post('save', async function (doc) {
 	try {
-	  // Create a new Sale document for each item in the order
-	  for (const item of doc.items) {
-		const newSale = new Sale({
-		  sellerId: doc.sellerId, // Replace with the actual sellerId
-		  storeId: doc.storeId,   // Replace with the actual storeId
-		  productId: item.productId,
-		  date: doc.createdAt,
-		  region: doc.deliveryAddresse.city} // Replace with the actual region field from the order
-		);
-  
-		await newSale.save();
-	  }
+		// Create a new Sale document for each item in the order
+		for (const item of doc.items) {
+			const newSale = new Sale({
+				sellerId: doc.sellerId, // Replace with the actual sellerId
+				storeId: doc.storeId,   // Replace with the actual storeId
+				productId: item.productId,
+				date: doc.createdAt,
+				region: doc.deliveryAddresse.city
+			} // Replace with the actual region field from the order
+			);
+
+			await newSale.save();
+		}
 	} catch (error) {
-	  console.error('Error creating sale records:', error);
+		console.error('Error creating sale records:', error);
 	}
-  });
+});
 module.exports = mongoose.model('Order', orderSchema);

package/models/Product.js

@@ -1,5 +1,5 @@
 const mongoose = require('mongoose');
-const { policySchema } = require('./Policy');
+const { policySchema } = require('database-connector/models/Policy');
 var ObjectId = require('mongodb').ObjectID;
 
 const productSchema = new mongoose.Schema(
@@ -10,11 +10,11 @@ const productSchema = new mongoose.Schema(
 		},
 		description: { type: String, required: true },
 		price: { type: Number, required: true },
-		storeCategoryId : {
+		storeCategoryId: {
 			type: mongoose.Schema.Types.ObjectId,
 			ref: 'StoreCategory',
 			required: true,
-		} , 
+		},
 		categoryId: {
 			type: mongoose.Schema.Types.ObjectId,
 			ref: 'Category',
@@ -98,24 +98,24 @@ const productSchema = new mongoose.Schema(
 			type: mongoose.Schema.Types.ObjectId,
 			ref: 'Offer',
 		},
-		
-		
+
+
 		numberOfSales: {
 			type: Number,
 			default: 0,
-		  },
-		  numberOfViews: {
+		},
+		numberOfViews: {
 			type: Number,
 			default: 0,
-		  },
-		  numberOfSearches: {
+		},
+		numberOfSearches: {
 			type: Number,
 			default: 0,
-		  },
-		  averageRating: {
+		},
+		averageRating: {
 			type: Number,
 			default: 0,
-		  },
+		},
 
 		reports: [
 			{
@@ -135,7 +135,7 @@ const productSchema = new mongoose.Schema(
 		policy: policySchema,
 	},
 	{
-		timestamp: true,
+		timestamps: true,
 		toJSON: { virtuals: true },
 	}
 );/*
@@ -172,13 +172,13 @@ productSchema.virtual('imagesss').get(function () {
 productSchema.virtual('discounted').get(function () {
 	if (this.offer) {
 		console.log('Disount')
-	
-	  return this.offer.discount;
-	  
+
+		return this.offer.discount;
+
 	} else {
-	  return this.price;
+		return this.price;
 	}
-  });
+});
 //virtual array for all the images of the variants
 productSchema.virtual('variantImages').get(function () {
 	if (this.variants != null) {

package/models/Store.js

@@ -1,7 +1,7 @@
 const mongoose = require('mongoose');
-const User = require('./User');
-const Product = require('./Product');
-const { policySchema } = require('./Policy');
+const User = require('database-connector/models/User');
+const Product = require('database-connector/models/Product');
+const { policySchema } = require('database-connector/models/Policy');
 var ObjectId = require('mongodb').ObjectID;
 
 const storeSchema = new mongoose.Schema(
@@ -237,8 +237,8 @@ const storeSchema = new mongoose.Schema(
 			ref: 'Subscription',
 		},
 	},
-	{ timestamps: true }
-	//{ timestamps: true, toJSON: { virtuals: true } }
+
+	{ timestamps: true, toJSON: { virtuals: true } }
 );
 //virtual image url
 storeSchema.virtual('imageUrl').get(function () {

package/models/User.js

@@ -1,5 +1,5 @@
 const mongoose = require('mongoose');
-const { policySchema } = require('./Policy');
+const { policySchema } = require('database-connector/models/Policy');
 var ObjectId = require('mongodb').ObjectID;
 
 const userSchema = new mongoose.Schema(
@@ -20,7 +20,7 @@ const userSchema = new mongoose.Schema(
 		},
 		role: {
 			type: String,
-			enum: ['user', 'admin', 'seller', 'paymentManager','manager','SuperManager'],
+			enum: ['user', 'admin', 'seller', 'paymentManager', 'manager', 'SuperManager'],
 			default: 'user',
 		},
 		isAdmin: { type: Boolean, default: false },
@@ -93,6 +93,12 @@ const userSchema = new mongoose.Schema(
 				ref: 'StoreCategory',
 			},
 		],
+		storeSubs: [
+			{
+				type: mongoose.Schema.Types.ObjectId,
+				ref: 'Store',
+			},
+		],
 		productCategorieIds: [
 			{
 				categoryId: {

package/models/UserAction.js

@@ -0,0 +1,33 @@
+const mongoose = require("mongoose");
+
+const UserActionSchema = new mongoose.Schema({
+    userId: {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: "User",
+        required: false
+    },
+    type: {
+        type: String,
+        required: true
+    },
+    deviceId: {
+        type: String,
+        required: false
+    },
+    sessionId: {
+        type: String,
+        required: false
+    },
+    details: {
+        type: mongoose.Schema.Types.Mixed,
+        required: false
+    },
+    timestamp: {
+        type: Date,
+        default: Date.now
+    }
+});
+
+const UserAction = mongoose.model("UserAction", UserActionSchema);
+
+module.exports = UserAction;

package/models/View.js

@@ -2,12 +2,13 @@ const mongoose = require('mongoose');
 
 const viewsSchema = new mongoose.Schema({
   sellerId: { type: mongoose.Schema.Types.ObjectId, ref: 'Seller' },
+  clientId: { type: mongoose.Schema.Types.ObjectId, ref: 'Client' },
   storeId: { type: mongoose.Schema.Types.ObjectId, ref: 'Store' },
   productId: { type: mongoose.Schema.Types.ObjectId, ref: 'Product' },
   date: { type: Date, required: true },
   region: { type: String }, // If you want to track region for each view
 });
 
-module.exports  = mongoose.model('View', viewsSchema);
+module.exports = mongoose.model('View', viewsSchema);
 
 

package/models/index.js

@@ -31,11 +31,11 @@ const SubscriptionOffer = require('./SubscriptionOffer');
 const FlashDeal = require('./FlashDeal');
 const Notification = require('./Notification');
 const PaymentType = require('./PaymentType');
-const {policySchema} = require('./Policy');
+const { policySchema } = require('./Policy');
 const ReductionOffer = require('./ReductionOffer');
 const Sale = require('./Sale');
 const StoreCategory = require('./StoreCategory');
-
+const UserAction = require('./UserAction.js');
 
 
 module.exports = {
@@ -62,5 +62,6 @@ module.exports = {
     Subscription,
     Plan,
     SubscriptionOffer,
-    ObjectId: mongoose.Types.ObjectId, 
+    UserAction,
+    ObjectId: mongoose.Types.ObjectId,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "database-connector",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "main": "models/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"