⚡ Include also data of last request

n8n-io · Oct 31, 2023 · 005914d · 005914d
1 parent f758af6
commit 005914d
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 9 deletions.
diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
@@ -2683,9 +2683,18 @@ const getRequestHelperFunctions = (
 					hashData.previousLength = contentLength;
 				}
 
+				responseData.push(tempResponseData);
+
 				additionalKeys.$response = newResponse;
 				additionalKeys.$count = additionalKeys.$count + 1;
 
+				if (
+					paginationOptions.maxRequests &&
+					additionalKeys.$count >= paginationOptions.maxRequests
+				) {
+					break;
+				}
+
 				makeAdditionalRequest = getResolvedValue(
 					paginationOptions.continue,
 					itemIndex,
@@ -2727,15 +2736,6 @@ const getRequestHelperFunctions = (
 							},
 						);
 					}
-
-					responseData.push(tempResponseData);
-				}
-
-				if (
-					paginationOptions.maxRequests &&
-					additionalKeys.$count >= paginationOptions.maxRequests
-				) {
-					break;
 				}
 			} while (makeAdditionalRequest);
 

diff --git a/packages/nodes-base/nodes/HttpRequest/test/node/workflow.pagination.json b/packages/nodes-base/nodes/HttpRequest/test/node/workflow.pagination.json
@@ -1015,6 +1015,11 @@
 				"json": {
 					"data": "[{\"id\":12},{\"id\":13},{\"id\":14}]"
 				}
+			},
+			{
+				"json": {
+					"data": "[]"
+				}
 			}
 		],
 		"Response Empty Next with Max Pages": [
@@ -1123,6 +1128,17 @@
 					"statusCode": 200,
 					"statusMessage": null
 				}
+			},
+			{
+				"json": {
+					"data": "[]",
+					"headers": {
+						"content-type": "application/json",
+						"next-url": "https://dummyjson.com/users?skip=20&limit=4"
+					},
+					"statusCode": 404,
+					"statusMessage": null
+				}
 			}
 		],
 		"Complete Expression - JSON": [
@@ -1327,6 +1343,11 @@
 				"json": {
 					"data": "[{\"id\":12},{\"id\":13},{\"id\":14}]"
 				}
+			},
+			{
+				"json": {
+					"data": "[]"
+				}
 			}
 		],
 		"Response Empty - Include Full Response1": [
@@ -1373,6 +1394,17 @@
 					"statusCode": 200,
 					"statusMessage": null
 				}
+			},
+			{
+				"json": {
+					"data": "[]",
+					"headers": {
+						"content-type": "text/plain",
+						"next-url": "https://dummyjson.com/users?skip=20&limit=4"
+					},
+					"statusCode": 404,
+					"statusMessage": null
+				}
 			}
 		]
 	},