Issue 26170 show more than 20 items for bundles

dotCMS/src/curl-test/Bundle_Resource.postman_collection.json

@@ -1291,6 +1291,83 @@
 							},
 							"response": []
 						},
+						{
+							"name": "get assets uploaded bundle",
+							"event": [
+								{
+									"listen": "test",
+									"script": {
+										"exec": [
+											"pm.test(\"Bundle uploaded sucessfully\", function () {",
+											"    pm.response.to.have.status(200);",
+											"",
+											"    var jsonData = pm.response.json();",
+											"    pm.expect(4).to.eq(jsonData.length);",
+											"",
+											"    jsonData.forEach(item => {",
+											"        if (item.type === \"contentlet\" && item.isHtmlPage){",
+											"            pm.expect(\"Page Asset\").to.eq(item.content_type_name);",
+											"            pm.expect(\"892662d008a2cdfcfdd4f00e138df6fe\").to.eq(item.asset);",
+											"            pm.expect(\"page_test\").to.eq(item.title);",
+											"            pm.expect(true).to.eq(item.isHtmlPage);",
+											"            pm.collectionVariables.set(\"bundleHtmlPageId\", item.asset);",
+											"        } else if (item.type === \"contentlet\") {",
+											"            pm.expect(\"type_1\").to.eq(item.content_type_name);",
+											"            pm.expect(\"ad7551b54313c244e7110608c0cda9fe\").to.eq(item.asset);",
+											"            pm.expect(\"Testing\").to.eq(item.title);",
+											"            pm.collectionVariables.set(\"bundleContentItemId\", item.asset);",
+											"        } else if (item.type === \"contenttype\"){",
+											"            pm.expect(\"type_1\").to.eq(item.title);",
+											"            pm.collectionVariables.set(\"bundleTypeId\", item.asset);",
+											"        } else if (item.type === \"language\"){",
+											"            pm.expect(\"Language\").to.eq(item.content_type_name);",
+											"            pm.expect(\"TE\").to.eq(item.country_code);",
+											"            pm.expect(\"te\").to.eq(item.language_code);",
+											"            pm.expect(\"te(TE)\").to.eq(item.title);",
+											"            pm.collectionVariables.set(\"bundleLanguageId\", item.asset);",
+											"        } else {",
+											"            px.eq(true, false);",
+											"        }",
+											"    });",
+											"});"
+										],
+										"type": "text/javascript"
+									}
+								}
+							],
+							"request": {
+								"auth": {
+									"type": "basic",
+									"basic": [
+										{
+											"key": "password",
+											"value": "admin",
+											"type": "string"
+										},
+										{
+											"key": "username",
+											"value": "admin@dotcms.com",
+											"type": "string"
+										}
+									]
+								},
+								"method": "GET",
+								"header": [],
+								"url": {
+									"raw": "{{serverURL}}/api/bundle/get_asset_test/assets",
+									"host": [
+										"{{serverURL}}"
+									],
+									"path": [
+										"api",
+										"bundle",
+										"get_asset_test",
+										"assets"
+									]
+								}
+							},
+							"response": []
+						},
 						{
 							"name": "Add Content type to Bundle",
 							"event": [
@@ -1349,7 +1426,7 @@
 									"formdata": []
 								},
 								"url": {
-									"raw": "{{serverURL}}/DotAjaxDirector/com.dotcms.publisher.ajax.RemotePublishAjaxAction/cmd/addToBundle?assetIdentifier=39fc9a9713a3cf42984923925f538d87&bundleName=test_assets",
+									"raw": "{{serverURL}}/DotAjaxDirector/com.dotcms.publisher.ajax.RemotePublishAjaxAction/cmd/addToBundle?assetIdentifier={{bundleTypeId}}&bundleName=test_assets",
 									"host": [
 										"{{serverURL}}"
 									],
@@ -1362,7 +1439,7 @@
 									"query": [
 										{
 											"key": "assetIdentifier",
-											"value": "39fc9a9713a3cf42984923925f538d87"
+											"value": "{{bundleTypeId}}"
 										},
 										{
 											"key": "bundleName",
@@ -1428,7 +1505,7 @@
 									"formdata": []
 								},
 								"url": {
-									"raw": "{{serverURL}}/DotAjaxDirector/com.dotcms.publisher.ajax.RemotePublishAjaxAction/cmd/addToBundle?assetIdentifier=2f4be139df2ed53b349eb4beae23d3dd&bundleName=test_assets",
+									"raw": "{{serverURL}}/DotAjaxDirector/com.dotcms.publisher.ajax.RemotePublishAjaxAction/cmd/addToBundle?assetIdentifier={{bundleContentItemId}}&bundleName=test_assets",
 									"host": [
 										"{{serverURL}}"
 									],
@@ -1441,7 +1518,7 @@
 									"query": [
 										{
 											"key": "assetIdentifier",
-											"value": "2f4be139df2ed53b349eb4beae23d3dd"
+											"value": "{{bundleContentItemId}}"
 										},
 										{
 											"key": "bundleName",
@@ -1508,7 +1585,7 @@
 									"formdata": []
 								},
 								"url": {
-									"raw": "{{serverURL}}/DotAjaxDirector/com.dotcms.publisher.ajax.RemotePublishAjaxAction/cmd/addToBundle?assetIdentifier=5098127&bundleName=test_assets",
+									"raw": "{{serverURL}}/DotAjaxDirector/com.dotcms.publisher.ajax.RemotePublishAjaxAction/cmd/addToBundle?assetIdentifier={{bundleLanguageId}}&bundleName=test_assets",
 									"host": [
 										"{{serverURL}}"
 									],
@@ -1521,7 +1598,7 @@
 									"query": [
 										{
 											"key": "assetIdentifier",
-											"value": "5098127"
+											"value": "{{bundleLanguageId}}"
 										},
 										{
 											"key": "bundleName",
@@ -1588,7 +1665,7 @@
 									"formdata": []
 								},
 								"url": {
-									"raw": "{{serverURL}}/DotAjaxDirector/com.dotcms.publisher.ajax.RemotePublishAjaxAction/cmd/addToBundle?assetIdentifier=892662d008a2cdfcfdd4f00e138df6fe&bundleName=test_assets",
+									"raw": "{{serverURL}}/DotAjaxDirector/com.dotcms.publisher.ajax.RemotePublishAjaxAction/cmd/addToBundle?assetIdentifier={{bundleHtmlPageId}}&bundleName=test_assets",
 									"host": [
 										"{{serverURL}}"
 									],
@@ -1601,7 +1678,7 @@
 									"query": [
 										{
 											"key": "assetIdentifier",
-											"value": "892662d008a2cdfcfdd4f00e138df6fe"
+											"value": "{{bundleHtmlPageId}}"
 										},
 										{
 											"key": "bundleName",
@@ -1613,7 +1690,7 @@
 							"response": []
 						},
 						{
-							"name": "get assets",
+							"name": "get assets generated bundle",
 							"event": [
 								{
 									"listen": "test",
@@ -1672,14 +1749,14 @@
 								"method": "GET",
 								"header": [],
 								"url": {
-									"raw": "{{serverURL}}/api/bundle/get_asset_test/assets",
+									"raw": "{{serverURL}}/api/bundle/{{bundleId}}/assets",
 									"host": [
 										"{{serverURL}}"
 									],
 									"path": [
 										"api",
 										"bundle",
-										"get_asset_test",
+										"{{bundleId}}",
 										"assets"
 									]
 								}
@@ -1811,6 +1888,22 @@
 		{
 			"key": "bundleId",
 			"value": "01FPJVAJE4MHGF9QDDC66SBH9N"
+		},
+		{
+			"key": "bundleTypeId",
+			"value": ""
+		},
+		{
+			"key": "bundleContentItemId",
+			"value": ""
+		},
+		{
+			"key": "bundleLanguageId",
+			"value": ""
+		},
+		{
+			"key": "bundleHtmlPageId",
+			"value": ""
 		}
 	]
 }

dotCMS/src/main/java/com/dotcms/rest/BundleResource.java

@@ -136,12 +136,14 @@ public Response getPublishQueueElements(@PathParam("bundleId") final String bund
                 .init();
 
         try {
-
             PublishAuditStatus publishAuditStatus = PublishAuditAPI.getInstance()
                     .getPublishAuditStatus(bundleId, 0);
 
-            if (publishAuditStatus == null) {
-                throw new NotFoundException(String.format("Bundle %s not exists", bundleId));
+            if (!UtilMethods.isSet(publishAuditStatus)) {
+                final Bundle bundle = APILocator.getBundleAPI().getBundleById(bundleId);
+                if (!UtilMethods.isSet(bundle)) {
+                    throw new NotFoundException(String.format("Bundle %s not exists", bundleId));
+                }
             }
 
             final List<PublishQueueElement> queueElements = PublisherAPIImpl.getInstance()
@@ -156,10 +158,14 @@ public Response getPublishQueueElements(@PathParam("bundleId") final String bund
                 publishAuditStatus = PublishAuditAPI.getInstance()
                         .getPublishAuditStatus(bundleId, limit);
 
-                final Map<String, String> assets = publishAuditStatus.getStatusPojo().getAssets();
-                detailedAssets = assets.entrySet().stream()
-                        .map(entry -> publishQueueElementTransformer.getMap(entry.getKey(), entry.getValue()))
-                        .collect(Collectors.toList());
+                if (!UtilMethods.isSet(publishAuditStatus)) {
+                    detailedAssets = ImmutableList.of();
+                } else {
+                    final Map<String, String> assets = publishAuditStatus.getStatusPojo().getAssets();
+                    detailedAssets = assets.entrySet().stream()
+                            .map(entry -> publishQueueElementTransformer.getMap(entry.getKey(), entry.getValue()))
+                            .collect(Collectors.toList());
+                }
             }
 
             return Response.ok(detailedAssets).build();