fix: allow multiple spaces in item name (#2091)

Author: spaenleh

src/schemas/regex.spec.ts

@@ -1,39 +1,19 @@
 import { describe, expect, it } from 'vitest';
 
-import { EMPTY_OR_SPACED_WORDS_REGEX, ITEM_NAME_REGEX } from './regex';
+import { ITEM_NAME_REGEX } from './regex';
 
 describe('Globals', () => {
   describe('Item name regex', () => {
     it('Name regex accepts words with spaces', () => {
       expect(new RegExp(ITEM_NAME_REGEX).test('Course')).toBeTruthy();
       expect(new RegExp(ITEM_NAME_REGEX).test('My Course')).toBeTruthy();
       expect(new RegExp(ITEM_NAME_REGEX).test('My Course from yesterday')).toBeTruthy();
+      // double space is allowed (users have created content with it already)
+      expect(new RegExp(ITEM_NAME_REGEX).test('My  Course')).toBeTruthy();
     });
     it('Name regex rejects string ending with spaces', () => {
       expect(new RegExp(ITEM_NAME_REGEX).test('My Course from yesterday ')).toBeFalsy();
       expect(new RegExp(ITEM_NAME_REGEX).test(' Course')).toBeFalsy();
-      expect(new RegExp(ITEM_NAME_REGEX).test('My  Course')).toBeFalsy();
-    });
-  });
-
-  describe('Empty or spaced words regex', () => {
-    it('Regex accepts words separated with one space', () => {
-      expect(new RegExp(EMPTY_OR_SPACED_WORDS_REGEX).test('Bob')).toBeTruthy();
-      expect(new RegExp(EMPTY_OR_SPACED_WORDS_REGEX).test('Bob and Alice')).toBeTruthy();
-      expect(new RegExp(EMPTY_OR_SPACED_WORDS_REGEX).test('Bob and Alice')).toBeTruthy();
-    });
-    it('Regex accepts empty string', () => {
-      expect(new RegExp(EMPTY_OR_SPACED_WORDS_REGEX).test('')).toBeTruthy();
-    });
-    it('Regex rejects string ending with spaces', () => {
-      expect(new RegExp(EMPTY_OR_SPACED_WORDS_REGEX).test('Bob ')).toBeFalsy();
-    });
-    it('Regex rejects string starting with spaces', () => {
-      expect(new RegExp(EMPTY_OR_SPACED_WORDS_REGEX).test(' Bob')).toBeFalsy();
-    });
-    it('Regex rejects words separated with multiple spaces', () => {
-      expect(new RegExp(EMPTY_OR_SPACED_WORDS_REGEX).test('Bob  Alice')).toBeFalsy();
-      expect(new RegExp(EMPTY_OR_SPACED_WORDS_REGEX).test('Bob   Alice')).toBeFalsy();
     });
   });
 });

src/schemas/regex.ts

@@ -1,3 +1,2 @@
-export const ITEM_NAME_REGEX = '^\\S+( \\S+)*$';
-// allow empty strings or words separated by one space
-export const EMPTY_OR_SPACED_WORDS_REGEX = /^(\S+( \S+)*)?$/;
+// allows words separated by spaces (any number), but not starting or ending with space
+export const ITEM_NAME_REGEX = '^\\S+( *\\S+)*$';

src/services/item/item.controller.ts

@@ -168,10 +168,11 @@ const plugin: FastifyPluginAsyncTypebox = async (fastify) => {
     '/:id/children',
     { schema: getChildren, preHandler: optionalIsAuthenticated },
     async ({ user, params: { id }, query: { types, keywords } }) => {
-      return itemService.getPackedChildren(db, user?.account, id, {
+      const children = await itemService.getPackedChildren(db, user?.account, id, {
         types,
         keywords,
       });
+      return children;
     },
   );