Added contact documents upload and fixed profile without avatar

Controller/CompletionController.php

@@ -21,6 +21,8 @@
  */
 class CompletionController extends AbstractController
 {
+    use SaveMediaTrait;
+
     const TYPE = Configuration::TYPE_COMPLETION;
 
     /**
@@ -54,6 +56,8 @@ public function indexAction(Request $request)
         if ($form->isSubmitted() && $form->isValid()) {
             $user = $form->getData();
 
+            $this->saveMediaFields($form, $user, $request->getLocale());
+
             // Completion User
             $communityManager->completion($user);
 

Controller/ProfileController.php

@@ -16,7 +16,6 @@
 use Sulu\Bundle\ContactBundle\Entity\AddressType;
 use Sulu\Bundle\ContactBundle\Entity\ContactAddress;
 use Sulu\Bundle\ContactBundle\Entity\Note;
-use Sulu\Bundle\MediaBundle\Api\Media;
 use Sulu\Bundle\SecurityBundle\Entity\User;
 use Symfony\Component\Form\Form;
 use Symfony\Component\HttpFoundation\Request;
@@ -27,6 +26,8 @@
  */
 class ProfileController extends AbstractController
 {
+    use SaveMediaTrait;
+
     const TYPE = Configuration::TYPE_PROFILE;
 
     /**
@@ -61,7 +62,7 @@ public function indexAction(Request $request)
                 $user->setLocale($request->getLocale());
             }
 
-            $this->saveAvatar($form, $user, $request->getLocale());
+            $this->saveMediaFields($form, $user, $request->getLocale());
 
             // Register User
             $communityManager->saveProfile($user);
@@ -86,44 +87,6 @@ public function indexAction(Request $request)
         );
     }
 
-    /**
-     * Save media and set avatar on user.
-     *
-     * @param Form $form
-     * @param User $user
-     * @param string $locale
-     *
-     * @return Media|null
-     */
-    protected function saveAvatar(Form $form, User $user, $locale)
-    {
-        $uploadedFile = $form->get('contact')->get('avatar')->getData();
-        if (null === $uploadedFile) {
-            return null;
-        }
-
-        $systemCollectionManager = $this->get('sulu_media.system_collections.manager');
-        $mediaManager = $this->get('sulu_media.media_manager');
-
-        $collection = $systemCollectionManager->getSystemCollection('sulu_contact.contact');
-        $avatar = $user->getContact()->getAvatar();
-
-        $apiMedia = $mediaManager->save(
-            $uploadedFile,
-            [
-                'id' => (null !== $avatar ? $avatar->getId() : null),
-                'locale' => $locale,
-                'title' => $user->getUsername(),
-                'collection' => $collection,
-            ],
-            $user->getId()
-        );
-
-        $user->getContact()->setAvatar($apiMedia->getEntity());
-
-        return $apiMedia;
-    }
-
     /**
      * {@inheritdoc}
      *

Controller/RegistrationController.php

@@ -21,6 +21,8 @@
  */
 class RegistrationController extends AbstractController
 {
+    use SaveMediaTrait;
+
     const TYPE = Configuration::TYPE_REGISTRATION;
 
     /**
@@ -53,6 +55,8 @@ public function indexAction(Request $request)
                 $user->setLocale($request->getLocale());
             }
 
+            $this->saveMediaFields($form, $user, $request->getLocale());
+
             // Register User
             $user = $communityManager->register($user);
 

Controller/SaveMediaTrait.php

@@ -0,0 +1,119 @@
+<?php
+
+/*
+ * This file is part of Sulu.
+ *
+ * (c) MASSIVE ART WebServices GmbH
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Sulu\Bundle\CommunityBundle\Controller;
+
+use Sulu\Bundle\MediaBundle\Media\Manager\MediaManagerInterface;
+use Sulu\Bundle\SecurityBundle\Entity\User;
+use Sulu\Component\Media\SystemCollections\SystemCollectionManagerInterface;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+
+trait SaveMediaTrait
+{
+    private function saveMediaFields(FormInterface $form, User $user, $locale)
+    {
+        $this->saveAvatar($form, $user, $locale);
+        $this->saveDocuments($form, $user, $locale);
+    }
+
+    private function saveDocuments(FormInterface $form, User $user, $locale)
+    {
+        if (!$form->has('contact') || !$form->get('contact')->has('medias')) {
+            return;
+        }
+
+        $uploadedFiles = $form->get('contact')->get('medias')->getData();
+
+        if (empty($uploadedFiles)) {
+            return null;
+        }
+
+        if (!is_array($uploadedFiles)) {
+            $uploadedFiles = [$uploadedFiles];
+        }
+
+        $contact = $user->getContact();
+        $apiMedias = [];
+
+        foreach ($uploadedFiles as $uploadedFile) {
+            $apiMedia = $this->saveMedia($uploadedFile, null, $locale, $user->getId());
+            $contact->addMedia($apiMedia->getEntity());
+            $apiMedias[] = $apiMedia;
+        }
+
+        return $apiMedias;
+    }
+
+    protected function saveAvatar(FormInterface $form, User $user, $locale)
+    {
+        if (!$form->has('contact') || !$form->get('contact')->has('avatar')) {
+            return;
+        }
+
+        $uploadedFile = $form->get('contact')->get('avatar')->getData();
+        if (null === $uploadedFile) {
+            return null;
+        }
+
+        $avatar = $user->getContact()->getAvatar();
+
+        $apiMedia = $this->saveMedia($uploadedFile, (null !== $avatar ? $avatar->getId() : null), $locale, $user->getId());
+
+        $user->getContact()->setAvatar($apiMedia->getEntity());
+
+        return $apiMedia;
+    }
+
+    private function saveMedia(UploadedFile $uploadedFile, $id, $locale, $userId)
+    {
+        return $this->getMediaManager()->save(
+            $uploadedFile,
+            [
+                'id' => $id,
+                'locale' => $locale,
+                'title' => $uploadedFile->getClientOriginalName(),
+                'collection' => $this->getContactMediaCollection(),
+            ],
+            $userId
+        );
+    }
+
+    /**
+     * Get system collection manager.
+     *
+     * @return SystemCollectionManagerInterface
+     */
+    private function getSystemCollectionManager()
+    {
+        return $this->get('sulu_media.system_collections.manager');
+    }
+
+    /**
+     * Get media manager.
+     *
+     * @return MediaManagerInterface
+     */
+    private function getMediaManager()
+    {
+        return $this->get('sulu_media.media_manager');
+    }
+
+    /**
+     * Get contact media collection.
+     *
+     * @return int
+     */
+    private function getContactMediaCollection()
+    {
+        return $this->getSystemCollectionManager()->getSystemCollection('sulu_contact.contact');
+    }
+}