Merge pull request #284 from jomendez/orderby-function-called-more-th…

…an-once
wovalle · Nov 11, 2021 · 3732cf1 · 3732cf1
2 parents 10d78dd + f94aa04
commit 3732cf1
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 3 deletions.
diff --git a/src/BaseFirestoreRepository.spec.ts b/src/BaseFirestoreRepository.spec.ts
@@ -126,7 +126,24 @@ describe('BaseFirestoreRepository', () => {
           albumsSubColl.orderByAscending('releaseDate').orderByDescending('releaseDate');
         }).toThrow();
       });
+
+      it('must throw an Error if an orderBy* function is called more than once in the same expression ascending', async () => {
+        const pt = await bandRepository.findById('porcupine-tree');
+        const albumsSubColl = pt.albums;
+        expect(() => {
+          albumsSubColl.orderByAscending('releaseDate').orderByAscending('releaseDate');
+        }).toThrow();
+      });
+
+      it('must succeed when orderBy* function is called more than once in the same expression with different fields', async () => {
+        const pt = await bandRepository.findById('porcupine-tree');
+        const albumsSubColl = pt.albums;
+        expect(() => {
+          albumsSubColl.orderByAscending('releaseDate').orderByDescending('name');
+        }).not.toThrow();
+      });
     });
+  });
 
     describe('orderByDescending', () => {
       it('must order repository objects', async () => {
@@ -164,8 +181,39 @@ describe('BaseFirestoreRepository', () => {
           albumsSubColl.orderByAscending('releaseDate').orderByDescending('releaseDate');
         }).toThrow();
       });
+
+      it('must throw an Error if an orderBy* function is called more than once in the same expression descending', async () => {
+        const pt = await bandRepository.findById('porcupine-tree');
+        const albumsSubColl = pt.albums;
+        expect(() => {
+          albumsSubColl.orderByDescending('releaseDate').orderByDescending('releaseDate');
+        }).toThrow();
+      });
+
+      it('must succeed when orderBy* function is called more than once in the same expression with different fields', async () => {
+        const pt = await bandRepository.findById('porcupine-tree');
+        const albumsSubColl = pt.albums;
+        expect(() => {
+          albumsSubColl.orderByAscending('releaseDate').orderByDescending('name');
+        }).not.toThrow();
+      });
+
+      it('must succeed when orderBy* function is called more than once in the same expression with different fields ascending', async () => {
+        const pt = await bandRepository.findById('porcupine-tree');
+        const albumsSubColl = pt.albums;
+        expect(() => {
+          albumsSubColl.orderByAscending('releaseDate').orderByAscending('name');
+        }).not.toThrow();
+      });
+
+      it('must succeed when orderBy* function is called more than once in the same expression with different fields descending', async () => {
+        const pt = await bandRepository.findById('porcupine-tree');
+        const albumsSubColl = pt.albums;
+        expect(() => {
+          albumsSubColl.orderByDescending('releaseDate').orderByDescending('name');
+        }).not.toThrow();
+      });
     });
-  });
 
   describe('findById', () => {
     it('must find by id', async () => {

diff --git a/src/QueryBuilder.ts b/src/QueryBuilder.ts
@@ -17,6 +17,7 @@ export class QueryBuilder<T extends IEntity> implements IQueryBuilder<T> {
   protected limitVal: number;
   protected orderByObj: IOrderByParams;
   protected customQueryFunction?: ICustomQuery<T>;
+  protected orderByFields: Set<string> = new Set();
 
   constructor(protected executor: IQueryExecutor<T>) {}
 
@@ -144,12 +145,19 @@ export class QueryBuilder<T extends IEntity> implements IQueryBuilder<T> {
   }
 
   orderByAscending(prop: IWherePropParam<T>) {
-    if (this.orderByObj) {
+    const fieldProp: string = typeof prop == 'string' ? prop : '';
+    const alreadyOrderedByField = this.orderByFields.has(fieldProp);
+
+    if (this.orderByObj && alreadyOrderedByField) {
       throw new Error(
         'An orderBy function cannot be called more than once in the same query expression'
       );
     }
 
+    if (!alreadyOrderedByField && fieldProp) {
+      this.orderByFields.add(fieldProp);
+    }
+
     this.orderByObj = {
       fieldPath: this.extractWhereParam(prop),
       directionStr: 'asc',
@@ -159,12 +167,19 @@ export class QueryBuilder<T extends IEntity> implements IQueryBuilder<T> {
   }
 
   orderByDescending(prop: IWherePropParam<T>) {
-    if (this.orderByObj) {
+    const fieldProp: string = typeof prop == 'string' ? prop : '';
+    const alreadyOrderedByField = this.orderByFields.has(fieldProp);
+
+    if (this.orderByObj && alreadyOrderedByField) {
       throw new Error(
         'An orderBy function cannot be called more than once in the same query expression'
       );
     }
 
+    if (!alreadyOrderedByField && fieldProp) {
+      this.orderByFields.add(fieldProp);
+    }
+
     this.orderByObj = {
       fieldPath: this.extractWhereParam(prop),
       directionStr: 'desc',