dotCMS#32152 trying a defensive map to avoid to save the file assets contai… (dotCMS#32153)

trying a defensive map to avoid to save the file assets container or
template in favor of contentlet

Author: jdotcms

dotCMS/src/main/java/com/dotmarketing/beans/Permission.java

@@ -1,5 +1,8 @@
 package com.dotmarketing.beans;
 
+import com.dotmarketing.portlets.containers.model.FileAssetContainer;
+import com.dotmarketing.portlets.contentlet.model.Contentlet;
+import com.dotmarketing.portlets.templates.model.FileAssetTemplate;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonSetter;
@@ -173,6 +176,13 @@ public void setType ( String type ) {
              */
             type = IHTMLPage.class.getCanonicalName();
         }
+
+		if ( type != null && (type.equals( FileAssetContainer.class.getCanonicalName())
+				|| type.equals( FileAssetTemplate.class.getCanonicalName() )) ) {
+            // file asset container/template are contentlets, so we have to map to contentlet
+			type = Contentlet.class.getCanonicalName();
+		}
+
         this.type = type;
     }
 

dotCMS/src/main/java/com/dotmarketing/portlets/containers/model/FileAssetContainer.java

@@ -10,6 +10,7 @@
 import com.dotmarketing.exception.DotSecurityException;
 import com.dotmarketing.portlets.contentlet.model.Contentlet;
 import com.dotmarketing.portlets.fileassets.business.FileAsset;
+import com.dotmarketing.portlets.templates.model.Template;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.vavr.control.Try;
 
@@ -97,6 +98,12 @@ public void setContainerStructuresAssets(List<FileAsset> containerStructuresAsse
         this.containerStructuresAssets = containerStructuresAssets.stream().map(f->f.getInode()).filter(Objects::nonNull).collect(Collectors.toList());
     }
 
+    // we override it, in order to do the permissionable behind a contentlet object
+    @Override
+    public String getPermissionType() {
+        return Contentlet.class.getCanonicalName();
+    }
+
     public void addMetaData(final String key, final Object value) {
 
         this.metaDataMap.put (key, value);

dotCMS/src/main/java/com/dotmarketing/portlets/containers/model/SystemContainer.java

@@ -43,6 +43,12 @@ public SystemContainer() {
         super.setMaxContentlets(DEFAULT_MAX_CONTENTS);
     }
 
+    // we override it, in order to do the permissionable behind a container object
+    @Override
+    public String getPermissionType() {
+        return Container.class.getCanonicalName();
+    }
+
     @Override
     public void setIdentifier(String identifier) {
         Logger.debug(this, () -> "System Container ID cannot be overridden.");

dotCMS/src/main/java/com/dotmarketing/portlets/templates/model/FileAssetTemplate.java

@@ -7,6 +7,7 @@
 import com.dotmarketing.business.Versionable;
 import com.dotmarketing.exception.DotDataException;
 import com.dotmarketing.exception.DotSecurityException;
+import com.dotmarketing.portlets.contentlet.model.Contentlet;
 import com.dotmarketing.portlets.fileassets.business.FileAsset;
 import com.dotmarketing.portlets.templates.business.FileAssetTemplateUtil;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -41,6 +42,12 @@ public FileAssetTemplate() {
         this.metaDataMap = new HashMap<>();
     }
 
+    // we override it, in order to do the permissionable behind a contentlet object
+    @Override
+    public String getPermissionType() {
+        return Contentlet.class.getCanonicalName();
+    }
+    
     @JsonIgnore
     public FileAsset getBodyAsset() {
         return body;

dotCMS/src/main/java/com/dotmarketing/portlets/templates/model/SystemTemplate.java

@@ -4,6 +4,7 @@
 import com.dotmarketing.beans.Host;
 import com.dotmarketing.business.APILocator;
 import com.dotmarketing.business.Theme;
+import com.dotmarketing.portlets.containers.model.Container;
 import com.dotmarketing.util.Logger;
 
 import java.util.Date;
@@ -39,6 +40,12 @@ public SystemTemplate() {
 		super.setDrawed(true);
     }
 
+	// we override it, in order to do the permissionable behind a template object
+	@Override
+	public String getPermissionType() {
+		return Template.class.getCanonicalName();
+	}
+
 	@Override
 	public void setIdentifier(String identifier) {
 		Logger.debug(this, () -> "System Template ID cannot be overridden.");

dotcms-postman/src/main/resources/postman/GraphQLTests.json

@@ -1,10 +1,10 @@
 {
 	"info": {
-		"_postman_id": "c3b5b111-fcba-47b0-96d8-dc6415d12098",
+		"_postman_id": "2a46e009-62aa-4844-883c-646ab8123846",
 		"name": "GraphQL",
 		"description": "This suite verifies that the GraphQL REST Endpoint is working as expected.\n\n[GraphQL](https://graphql.org/) is an open query language which allows you to perform real-type dynamic queries which specify exactly what data you want, and in what order. The dotCMS GraphQL content delivery API has a number of advantages over querying content via REST:\n\n- A single endpoint to query all content: `api/v1/graphql`.\n    \n- Self documenting via schema introspection.\n    \n- No over-fetching of data (e.g. unneeded fields).\n    \n- No need for multiple requests to get combined data.\n    \n- Client control over both the query and the data received.",
 		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",
-		"_exporter_id": "5403727"
+		"_exporter_id": "781456"
 	},
 	"item": [
 		{
@@ -2155,7 +2155,7 @@
 											"    pm.expect(container1.parentPermissionable.hostName, 'FAILED:[container1.parentPermissionable.hostName]').equal(\"demo.dotcms.com\");",
 											"    pm.expect(container1.path, 'FAILED:[container1.path]').equal(\"//demo.dotcms.com/application/containers/default/\");",
 											"    pm.expect(container1.permissionId, 'FAILED:[container1.permissionId]').equal(\"69b3d24d-7e80-4be6-b04a-d352d16493ee\");",
-											"    pm.expect(container1.permissionType, 'FAILED:[container1.permissionType]').equal(\"com.dotmarketing.portlets.containers.model.FileAssetContainer\");",
+											"    pm.expect(container1.permissionType, 'FAILED:[container1.permissionType]').equal(\"com.dotmarketing.portlets.contentlet.model.Contentlet\");",
 											"    pm.expect(container1.postLoop, 'FAILED:[container1.postLoop]').equal(\"#dotParse(\\\"//demo.dotcms.com/application/containers/default/postloop.vtl\\\")\");",
 											"    pm.expect(container1.preLoop, 'FAILED:[container1.preLoop]').equal(\"#dotParse(\\\"//demo.dotcms.com/application/containers/default/preloop.vtl\\\")\");",
 											"    pm.expect(container1.showOnMenu, 'FAILED:[container1.showOnMenu]').equal(false);",
@@ -2324,7 +2324,7 @@
 											"    pm.expect(container1.parentPermissionable.hostName, 'FAILED:[container1.parentPermissionable.hostName]').equal(\"demo.dotcms.com\");",
 											"    pm.expect(container1.path, 'FAILED:[container1.path]').equal(\"//demo.dotcms.com/application/containers/default/\");",
 											"    pm.expect(container1.permissionId, 'FAILED:[container1.permissionId]').equal(\"69b3d24d-7e80-4be6-b04a-d352d16493ee\");",
-											"    pm.expect(container1.permissionType, 'FAILED:[container1.permissionType]').equal(\"com.dotmarketing.portlets.containers.model.FileAssetContainer\");",
+											"    pm.expect(container1.permissionType, 'FAILED:[container1.permissionType]').equal(\"com.dotmarketing.portlets.contentlet.model.Contentlet\");",
 											"    pm.expect(container1.postLoop, 'FAILED:[container1.postLoop]').equal(\"#dotParse(\\\"//demo.dotcms.com/application/containers/default/postloop.vtl\\\")\");",
 											"    pm.expect(container1.preLoop, 'FAILED:[container1.preLoop]').equal(\"#dotParse(\\\"//demo.dotcms.com/application/containers/default/preloop.vtl\\\")\");",
 											"    pm.expect(container1.showOnMenu, 'FAILED:[container1.showOnMenu]').equal(false);",