@mac777/project-pinecone-models 1.1.24 → 1.1.25

package/dist/Event.js

@@ -288,33 +288,47 @@ eventSchema.pre('save', async function (next) {
     if (this.isModified('title') && !this.slug) {
         if (this.title) {
             // Convert to lowercase, replace spaces with hyphens, remove special characters
-            let slug = this.title
+            let baseSlug = this.title
                 .toLowerCase()
+                .trim()
                 .replace(/[^\w\s-]/g, '') // Remove special characters except spaces and hyphens
                 .replace(/\s+/g, '-') // Replace spaces with hyphens
                 .replace(/-+/g, '-') // Replace multiple hyphens with single hyphen
-                .trim();
-            // Ensure slug is not empty and add random suffix if needed
-            if (!slug)
-                slug = 'event';
-            // Add timestamp suffix to ensure uniqueness
-            const timestamp = Date.now().toString(36);
-            slug = `${slug}-${timestamp}`;
+                .replace(/^-+|-+$/g, ''); // Remove leading/trailing hyphens
+            // Ensure slug is not empty
+            if (!baseSlug)
+                baseSlug = 'event';
+            // Truncate to reasonable length (50 chars) to keep URLs clean
+            if (baseSlug.length > 50) {
+                baseSlug = baseSlug.substring(0, 50).replace(/-+$/, ''); // Remove trailing hyphen after truncation
+            }
+            // Try base slug first
+            let slug = baseSlug;
+            let counter = 1;
+            let isUnique = false;
+            // Check uniqueness and add counter if needed
+            while (!isUnique && counter < 100) {
+                const existingEvent = await mongoose_1.default.models.Event.findOne({
+                    slug: slug,
+                    _id: { $ne: this._id }
+                });
+                if (!existingEvent) {
+                    isUnique = true;
+                }
+                else {
+                    // Add counter suffix for uniqueness
+                    slug = `${baseSlug}-${counter}`;
+                    counter++;
+                }
+            }
+            // Fallback: if still not unique after 100 attempts, add random suffix
+            if (!isUnique) {
+                const randomSuffix = Math.random().toString(36).substring(2, 8);
+                slug = `${baseSlug}-${randomSuffix}`;
+            }
             this.slug = slug;
         }
     }
-    // Ensure slug uniqueness
-    if (this.slug) {
-        const existingEvent = await mongoose_1.default.models.Event.findOne({
-            slug: this.slug,
-            _id: { $ne: this._id }
-        });
-        if (existingEvent) {
-            // Add random suffix to make it unique
-            const randomSuffix = Math.random().toString(36).substring(2, 8);
-            this.slug = `${this.slug}-${randomSuffix}`;
-        }
-    }
     this.updatedAt = new Date();
     next();
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mac777/project-pinecone-models",
-  "version": "1.1.24",
+  "version": "1.1.25",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {

package/src/Event.ts

@@ -378,38 +378,53 @@ eventSchema.pre('save', async function(next) {
   if (this.isModified('title') && !this.slug) {
     if (this.title) {
       // Convert to lowercase, replace spaces with hyphens, remove special characters
-      let slug = this.title
+      let baseSlug = this.title
         .toLowerCase()
+        .trim()
         .replace(/[^\w\s-]/g, '') // Remove special characters except spaces and hyphens
         .replace(/\s+/g, '-') // Replace spaces with hyphens
         .replace(/-+/g, '-') // Replace multiple hyphens with single hyphen
-        .trim();
-
-      // Ensure slug is not empty and add random suffix if needed
-      if (!slug) slug = 'event';
-
-      // Add timestamp suffix to ensure uniqueness
-      const timestamp = Date.now().toString(36);
-      slug = `${slug}-${timestamp}`;
+        .replace(/^-+|-+$/g, ''); // Remove leading/trailing hyphens
+
+      // Ensure slug is not empty
+      if (!baseSlug) baseSlug = 'event';
+
+      // Truncate to reasonable length (50 chars) to keep URLs clean
+      if (baseSlug.length > 50) {
+        baseSlug = baseSlug.substring(0, 50).replace(/-+$/, ''); // Remove trailing hyphen after truncation
+      }
+
+      // Try base slug first
+      let slug = baseSlug;
+      let counter = 1;
+      let isUnique = false;
+
+      // Check uniqueness and add counter if needed
+      while (!isUnique && counter < 100) {
+        const existingEvent = await mongoose.models.Event.findOne({
+          slug: slug,
+          _id: { $ne: this._id }
+        });
+
+        if (!existingEvent) {
+          isUnique = true;
+        } else {
+          // Add counter suffix for uniqueness
+          slug = `${baseSlug}-${counter}`;
+          counter++;
+        }
+      }
+
+      // Fallback: if still not unique after 100 attempts, add random suffix
+      if (!isUnique) {
+        const randomSuffix = Math.random().toString(36).substring(2, 8);
+        slug = `${baseSlug}-${randomSuffix}`;
+      }
 
       this.slug = slug;
     }
   }
 
-  // Ensure slug uniqueness
-  if (this.slug) {
-    const existingEvent = await mongoose.models.Event.findOne({
-      slug: this.slug,
-      _id: { $ne: this._id }
-    });
-
-    if (existingEvent) {
-      // Add random suffix to make it unique
-      const randomSuffix = Math.random().toString(36).substring(2, 8);
-      this.slug = `${this.slug}-${randomSuffix}`;
-    }
-  }
-
   this.updatedAt = new Date();
   next();
 });