Merge 8490234 into 9fd5912

janis-commerce · Oct 6, 2023 · 611291b · 611291b
2 parents 9fd5912 + 8490234
commit 611291b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/lib/api-list-data.js b/lib/api-list-data.js
@@ -199,10 +199,10 @@ module.exports = class ApiListData extends API {
 
 			const { result, total } = await this.fetchData(getParams);
 
-			const rows = await this.formatRows(result);
-
-			if(this.shouldReturnBody)
+			if(this.shouldReturnBody) {
+				const rows = await this.formatRows(result);
 				this.setBody(rows);
+			}
 
 			if(this.shouldReturnTotal)
 				this.setHeader(TOTAL_HEADER, total);
@@ -226,6 +226,7 @@ module.exports = class ApiListData extends API {
 	async fetchData(getParams) {
 
 		const data = {};
+
 		if(this.shouldReturnBody) {
 
 			data.result = await this.model.get(getParams);
@@ -235,17 +236,16 @@ module.exports = class ApiListData extends API {
 				data.total = 0;
 
 				return data;
-
 			}
-		}
+		} else
+			data.result = [];
 
 
 		if(this.shouldReturnTotal) {
-
 			const { total } = await this.model.getTotals(getParams.filters);
 			data.total = total;
-
 		}
+
 		return data;
 	}
 

diff --git a/tests/api-list-data.js b/tests/api-list-data.js
@@ -2157,6 +2157,8 @@ describe('Api List Data', () => {
 			[true, 'true', '1'].forEach(value => {
 				it(`Should calculate totals when x-janis-only-totals header received as ${value} ${typeof value}`, async () => {
 
+					sinon.spy(ApiListData.prototype, 'formatRows');
+
 					const myApiList = getApiInstance(ApiListData, {
 						headers: { 'x-janis-only-totals': value }
 					});
@@ -2167,6 +2169,7 @@ describe('Api List Data', () => {
 
 					sinon.assert.calledOnce(MyModel.prototype.getTotals);
 					sinon.assert.notCalled(MyModel.prototype.get);
+					sinon.assert.notCalled(ApiListData.prototype.formatRows);
 
 					assert.deepStrictEqual(myApiList.response.headers, { 'x-janis-total': 1 });
 					assert.deepStrictEqual(myApiList.response.body, undefined);