fixup! Use the dexterity machinery in api.content.create

Author: ale-rt

src/plone/api/content.py

@@ -9,7 +9,6 @@
 from plone.app.linkintegrity.exceptions import LinkIntegrityNotificationException
 from plone.app.uuid.utils import uuidToObject
 from plone.dexterity.fti import DexterityFTI
-from plone.dexterity.utils import addContentToContainer
 from plone.dexterity.utils import createContent
 from plone.uuid.interfaces import IUUID
 from Products.CMFCore.WorkflowCore import WorkflowException
@@ -69,6 +68,12 @@ def create(
         if isinstance(fti, DexterityFTI):
             # For dexterity objects we want to not use the invokeFactory
             # method because we want to have the id generated by the name chooser
+            if not fti.isConstructionAllowed(container):
+                raise ValueError(f"Cannot create {type}")
+
+            container_fti = container.getTypeInfo()
+            if container_fti is not None and not container_fti.allowType(type):
+                raise ValueError(f"Disallowed subobject type: {type}")
             constraints = IConstrainTypes(container, None)
             if constraints and fti not in constraints.allowedContentTypes():
                 raise ValueError(
@@ -78,18 +83,23 @@ def create(
                 kwargs["id"] = id
             content = createContent(type, **kwargs)
 
-            if not content.id:
-                content.id = INameChooser(container).chooseName(title, content)
-            if not safe_id:
-                content.id = INameChooser(container).chooseName(
-                    content.id or title, content
-                )
-                if id and id != content.id:
-                    raise BadRequest(
-                        "The id you provided conflicts with an existing object or it is reserved"
-                    )
-            addContentToContainer(container, content)
-            content_id = content.id
+            name_chooser = INameChooser(container)
+            if content.id:
+                # Check that the id we picked is valid
+                if not name_chooser.checkName(content.id, content):
+                    if safe_id:
+                        content.id = INameChooser(container).chooseName(
+                            content.id, content
+                        )
+                    else:
+                        raise BadRequest(
+                            "The id you provided conflicts with "
+                            "an existing object or it is reserved"
+                        )
+            else:
+                content.id = name_chooser.chooseName(title, content)
+
+            content_id = container._setObject(content.id, content)
         else:
             content_id = not safe_id and id or str(random.randint(0, 99999999))
             container.invokeFactory(type, content_id, **kwargs)

src/plone/api/tests/test_content.py

@@ -2,7 +2,6 @@
 
 from Acquisition import aq_base
 from contextlib import AbstractContextManager
-from gc import callbacks
 from OFS.CopySupport import CopyError
 from OFS.event import ObjectWillBeMovedEvent
 from OFS.interfaces import IObjectWillBeMovedEvent
@@ -13,7 +12,6 @@
 from plone.app.linkintegrity.exceptions import LinkIntegrityNotificationException
 from plone.app.textfield import RichTextValue
 from plone.indexer import indexer
-from plone.namedfile import NamedBlobFile
 from plone.uuid.interfaces import IMutableUUID
 from plone.uuid.interfaces import IUUIDGenerator
 from Products.CMFCore.interfaces import IContentish
@@ -381,6 +379,14 @@ def test_create_with_safe_id(self):
         self.assertEqual(second_page.id, "test-document-1")
         self.assertEqual(second_page.portal_type, "Document")
 
+    def test_create_with_not_lowercase_id(self):
+        obj = api.content.create(
+            container=self.portal,
+            type="Dexterity Item",
+            id="Doc1",
+        )
+        self.assertEqual(obj.id, "Doc1")
+
     def test_create_raises_unicodedecodeerror(self):
         """Test that the create method raises UnicodeDecodeErrors correctly."""
         site = getGlobalSiteManager()