#24738 feedback

dotCMS · Jun 28, 2023 · ee84636 · ee84636
1 parent b3df45b
commit ee84636
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/...src/integration-test/java/com/dotcms/rest/api/v1/asset/WebAssetHelperIntegrationTest.java b/...src/integration-test/java/com/dotcms/rest/api/v1/asset/WebAssetHelperIntegrationTest.java
@@ -23,6 +23,7 @@
 import com.dotmarketing.exception.DotSecurityException;
 import com.dotmarketing.portlets.contentlet.model.Contentlet;
 import com.dotmarketing.portlets.fileassets.business.FileAsset;
+import com.dotmarketing.portlets.fileassets.business.FileAssetAPI;
 import com.dotmarketing.portlets.folders.model.Folder;
 import com.dotmarketing.portlets.languagesmanager.model.Language;
 import com.dotmarketing.util.FileUtil;
@@ -458,13 +459,16 @@ public void Test_Retrieve_All_Versions()
         Assert.assertTrue(singleVersionedAsset.live());
         Assert.assertTrue(singleVersionedAsset.working());
 
-        //Now we create a new version
+        //Now we create a new version with a brand-new file different from the previous one
+        final File testFile3 = FileUtil.createTemporaryFile("new-lol", ".txt", RandomStringUtils.random(1000));
         final Contentlet checkout = ContentletDataGen.checkout(contentlet);
         checkout.getMap().put(Contentlet.TITTLE_KEY, "new title");
+        checkout.getMap().put(FileAssetAPI.BINARY_FIELD,testFile3);
 
         final String newInode = UUIDGenerator.generateUuid();
         checkout.setInode(newInode);
-        ContentletDataGen.checkin(checkout);
+        final Contentlet checkin = ContentletDataGen.checkin(checkout);
+        System.out.println(checkin);
 
         final AssetVersionsView withMultipleVersions = (AssetVersionsView) webAssetHelper.getAssetInfo(path, APILocator.systemUser());
         Assert.assertEquals(2, withMultipleVersions.versions().size());

diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/asset/WebAssetResource.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/asset/WebAssetResource.java
@@ -1,6 +1,7 @@
 package com.dotcms.rest.api.v1.asset;
 
 import com.dotcms.rest.InitDataObject;
+import com.dotcms.rest.ResponseEntityBooleanView;
 import com.dotcms.rest.WebResource;
 import com.dotcms.rest.annotation.NoCache;
 import com.dotcms.rest.api.v1.asset.view.WebAssetEntityView;
@@ -172,7 +173,7 @@ public Response deleteAsset(
         helper.deleteAsset(form.assetPath(), user);
         Logger.info(this,
                 String.format("User [%s] deleted asset for path [%s] ", user.getUserId(), form.assetPath()));
-        return Response.ok().build();
+        return Response.ok(new ResponseEntityBooleanView(true)).build();
     }
 
 
@@ -207,7 +208,7 @@ public Response archiveAsset(
         helper.archiveAsset(form.assetPath(), user);
         Logger.info(this,
                 String.format("User [%s] deleted asset for path [%s] ", user.getUserId(), form.assetPath()));
-        return Response.ok().build();
+        return Response.ok(new ResponseEntityBooleanView(true)).build();
     }
 
 
@@ -244,7 +245,7 @@ public Response deleteFolder(
                 String.format("User [%s] deleted foldr for path [%s]. ",
                         user.getUserId(), form.assetPath()
                 ));
-        return Response.ok().build();
+        return Response.ok(new ResponseEntityBooleanView(true)).build();
     }