#157: fix encoding of search options, which did encode the sorting op…

…tion twice Signed-off-by: Florian Fendt <Florian.Fendt@bosch.io>
eclipse-ditto · May 27, 2021 · b4fba5a · b4fba5a
1 parent 8ae348e
commit b4fba5a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/javascript/lib/api/src/options/request.options.ts b/javascript/lib/api/src/options/request.options.ts
@@ -332,7 +332,7 @@ export class DefaultSearchOptions extends AbstractRequestOptions<DefaultSearchOp
   }
 
   public withSort(sortOperation: string): DefaultSearchOptions {
-    this.sort = `sort(${encodeURIComponent(sortOperation)})`;
+    this.sort = `sort(${sortOperation})`;
     return this.setOption();
   }
 

diff --git a/javascript/lib/api/tests/options/request.options.spec.ts b/javascript/lib/api/tests/options/request.options.spec.ts
@@ -195,22 +195,22 @@ describe('Search Options', () => {
     expect(searchOptions.getOptions().get('namespaces')).toEqual(encodeURIComponent('C,D'));
   });
   it('sets sort', () => {
-    searchOptions.withSort('A');
-    expect(searchOptions.getOptions().get('option')).toEqual(encodeURIComponent('sort(A)'));
+    searchOptions.withSort('+A');
+    expect(searchOptions.getOptions().get('option')).toEqual(encodeURIComponent('sort(+A)'));
   });
   it('overrides sort', () => {
-    searchOptions.withSort('A');
+    searchOptions.withSort('+A');
     searchOptions.withSort('B');
     expect(searchOptions.getOptions().get('option')).toEqual(encodeURIComponent('sort(B)'));
   });
   it('combines option', () => {
-    searchOptions.withLimit(1, 2).withSort('A');
-    expect(searchOptions.getOptions().get('option')).toEqual(encodeURIComponent('limit(1,2),sort(A)'));
+    searchOptions.withLimit(1, 2).withSort('+A');
+    expect(searchOptions.getOptions().get('option')).toEqual(encodeURIComponent('limit(1,2),sort(+A)'));
   });
   it('overrides combined option', () => {
-    searchOptions.withLimit(1, 2).withSort('A');
-    searchOptions.withLimit(3, 4).withSort('B');
-    expect(searchOptions.getOptions().get('option')).toEqual(encodeURIComponent('limit(3,4),sort(B)'));
+    searchOptions.withLimit(1, 2).withSort('+A');
+    searchOptions.withLimit(3, 4).withSort('-B');
+    expect(searchOptions.getOptions().get('option')).toEqual(encodeURIComponent('limit(3,4),sort(-B)'));
   });
 });