fixed slug creation when overwrite = true

Author: appinteractive

server/helper/get-unique-slug.js

@@ -1,21 +1,28 @@
-const getUniqueSlug = (service, slug, count) => {
+const getUniqueSlug = (service, slug, count, id) => {
   return new Promise(resolve => {
-    const testslug = count?slug+count:slug;
+    const testSlug = count ? slug + count : slug;
 
     // Test if we already have data with this slug
+    const query = {
+      slug: testSlug
+    };
+    // ignore entry with given id (if set)
+    if (id) {
+      query._id = {
+        $ne: id
+      };
+    }
     service.find({
-      query: {
-        slug: testslug
-      }
+      query
     }).then((result) => {
-      if(result.data.length > 0) {
-        count = count?count+1:1;
+      if (result.data.length > 0) {
+        count = count ? count + 1 : 1;
         resolve(getUniqueSlug(service, slug, count));
       } else {
-        resolve(testslug);
+        resolve(testSlug);
       }
     });
   });
 };
 
-module.exports = getUniqueSlug;
+module.exports = getUniqueSlug;

server/hooks/create-slug.js

@@ -1,27 +1,26 @@
 // https://www.npmjs.com/package/slug
 const slug = require('slug');
 const getUniqueSlug = require('../helper/get-unique-slug');
-const _ = require('lodash');
+const { isEmpty } = require('lodash');
 
 module.exports = function (options = { field: null, overwrite: false }) {
   return function (hook) {
-    if(!options.field || !hook.data[options.field]) return hook;
+    if (!options.field || !hook.data[options.field]) return hook;
 
     // do not overwrite existing slug
     // TODO: we should make that possible and relying on ids for routing instead only on slugs
     // the slug should be there for seo reasons but the id should be what counts
-    if (!_.isEmpty(hook.data.slug) && options.overwrite !== false) return hook;
+    if (!isEmpty(hook.data.slug) && options.overwrite !== true) return hook;
 
     return new Promise(resolve => {
-
-      const titleslug = slug(hook.data[options.field], {
+      const titleSlug = slug(hook.data[options.field], {
         lower: true
       });
-
-      getUniqueSlug(hook.service, titleslug).then((uniqueslug) => {
-        hook.data.slug = uniqueslug;
-        resolve(hook);
-      });
+      getUniqueSlug(hook.service, titleSlug, null, hook.id)
+        .then((uniqueSlug) => {
+          hook.data.slug = uniqueSlug;
+          resolve(hook);
+        });
     });
   };
 };