database-connector 2.4.18 → 2.5.0

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## [Unreleased]
 
+### Changed
+- **Categorization Hierarchy Restructure**: Refactored category models to implement new hierarchy: StoreCategory → Rayon → Sub-rayon → Category → Sub-category
+  - **StoreCategory Model**: Removed `rayonId` field as StoreCategory is now the top-level category
+  - **Rayon Model**: Added `storeCategoryId` field (required) to associate rayons with store categories
+  - **Category Model**: Added `rayonId` field (required) to associate categories with rayons or sub-rayons
+  - **Product Model**: Maintains `storeCategoryId`, `categoryId`, `subCategoryId`, `rayonId`, and `subRayonId` for full hierarchy tracking
+  - Updated Swagger documentation for all affected models
+  - Updated DATABASE_SCHEMA.md to reflect new relationships in ER diagram
+
 ### Added
 - **PlanType Model**: Created new `PlanType` model for plan categorization and feature management
   - Schema includes `name` (unique, required), `endDate` (optional, nullable), `active` (boolean, default: true), and `features` (Map of string keys to Mixed values - boolean or number)

package/models/Category.js

@@ -15,6 +15,9 @@ const mongoose = require('mongoose');
  *         storeCategoryId:
  *           type: string
  *           description: Reference to store category
+ *         rayonId:
+ *           type: string
+ *           description: Reference to rayon or sub-rayon (ObjectId)
  *         name:
  *           type: string
  *           description: Category name
@@ -51,6 +54,10 @@ const categorySchema = new mongoose.Schema(
 			type: mongoose.Schema.Types.ObjectId,
 			ref: 'StoreCategory',
 		},
+		rayonId: {
+			type: mongoose.Schema.Types.ObjectId,
+			default: null,
+		},
 		name: {
 			type: String,
 			required: true,

package/models/Rayon.js

@@ -12,6 +12,9 @@ const mongoose = require('mongoose');
  *         id:
  *           type: string
  *           description: The rayon identifier
+ *         storeCategoryId:
+ *           type: string
+ *           description: Reference to store category
  *         name:
  *           type: string
  *           description: Rayon name
@@ -54,6 +57,11 @@ const mongoose = require('mongoose');
  */
 const rayonSchema = new mongoose.Schema(
 	{
+		storeCategoryId: {
+			type: mongoose.Schema.Types.ObjectId,
+			ref: 'StoreCategory',
+			required: true,
+		},
 		name: {
 			type: String,
 			required: true,

package/models/StoreCategory.js

@@ -19,10 +19,6 @@ const mongoose = require('mongoose');
  *           type: boolean
  *           default: false
  *           description: Whether the category is confirmed
- *         rayonId:
- *           type: string
- *           nullable: true
- *           description: Reference to rayon or sub-rayon (ObjectId)
  *         createdAt:
  *           type: string
  *           format: date-time
@@ -43,10 +39,6 @@ const storeCategorySchema = new mongoose.Schema(
 			required: true
 		},
 		confirmed: { type: Boolean, default: false },
-		rayonId: {
-			type: mongoose.Schema.Types.ObjectId,
-			default: null,
-		},
 	},
 	{ timestamps: true, toJSON: { virtuals: true } }
 );

package/models/User.js

@@ -232,6 +232,8 @@ const userSchema = new mongoose.Schema(
 		},
 		policy: policySchema,
 		shippingAdress: {
+			latitude: { type: Number },
+			longitude: { type: Number },
 			countryCode: { type: String },
 			country: { type: String },
 			city: { type: String },
@@ -384,6 +386,5 @@ userSchema.index({ email: 1 }, { sparse: true });
 userSchema.index({ phone: 1 }, { sparse: true });
 userSchema.index({ role: 1 });
 userSchema.index({ storeSubs: 1 });
-userSchema.index({ 'addresses.deliveryLocation': '2dsphere' });
 
 module.exports = mongoose.model('User', userSchema);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "database-connector",
-  "version": "2.4.18",
+  "version": "2.5.0",
   "description": "MongoDB models package with Mongoose schemas for e-commerce applications. Includes User, Product, Store, Order and more with built-in validation and virtual properties.",
   "main": "models/index.js",
   "scripts": {