Validate that the patched entities are all part of the patched collec…

…tion
carlobeltrame · Mar 30, 2021 · f0d7a33 · f0d7a33
1 parent 9b36f39
commit f0d7a33
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/backend/module/eCampCore/src/EntityService/AbstractEntityService.php b/backend/module/eCampCore/src/EntityService/AbstractEntityService.php
@@ -156,13 +156,14 @@ final public function patch($id, $data): BaseEntity {
     /**
      * Patches a list of entities.
      *
-     * @param mixed $data Expected in the form
+     * @param \ArrayObject $data Expected in the form
      *                    {
      *                    id: { ***patch paylod*** },
      *                    id2: { ***patch payload*** }
      *                    }
      *
      * @throws EntityNotFoundException
+     * @throws EntityValidationException
      * @throws NoAccessException
      * @throws ORMException
      * @throws OptimisticLockException
@@ -176,9 +177,16 @@ final public function patchList($data) {
         $request = $this->getEvent()->getRequest();
         $queryParams = $request->getQuery();
 
-        // TODO validate that the patched entities are all part of the patched collection URI
-        // /** @var ContentNodeCollection $allowedEntities */
-        // $allowedEntities = $this->fetchAll($queryParams);
+        // validate that the patched entities are all part of the patched collection URI
+        $ids = array_keys($data->getArrayCopy());
+        $q = $this->fetchAllQueryBuilder($queryParams)
+            ->andWhere('row.id IN (:ids)')->setParameter('ids', $ids);
+        $numEntities = intval($q->select('count(row.id)')->getQuery()->getSingleScalarResult());
+        if ($numEntities !== count($ids)) {
+            throw (new EntityValidationException())->setMessages([
+                '' => ['invalidIds' => 'Not all of the ids in the payload are part of the patched collection.']
+            ]);
+        }
 
         foreach ($data as $key => $value) {
             $entity = $this->patch($key, $value);

diff --git a/frontend/src/components/activity/content/ColumnLayout.vue b/frontend/src/components/activity/content/ColumnLayout.vue
@@ -148,7 +148,6 @@ export default {
         let position = 0
         return columnContents.map(contentNode => {
           return [contentNode.id, {
-            parentId: this.contentNode.id,
             slot: slot,
             position: position++
           }]