🚧 finished adding front matter entities

Author: carbontwelve

src/Entities/File.php

@@ -4,7 +4,6 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
-use Tapestry\Modules\Content\FrontMatter as TapestryFrontMatter;
 
 /**
  * @Entity
@@ -84,7 +83,7 @@ class File
 
     /**
      * @var Collection|FrontMatter[]
-     * @OneToMany(targetEntity="FrontMatter", mappedBy="file_id")
+     * @OneToMany(targetEntity="FrontMatter", mappedBy="file")
      */
     private $frontMatter;
 
@@ -97,37 +96,6 @@ public function __construct()
         $this->frontMatter = new ArrayCollection();
     }
 
-    /**
-     * File Hydration.
-     *
-     * @param \Tapestry\Entities\File $file
-     * @param Environment|null $environment
-     */
-    public function hydrate(\Tapestry\Entities\File $file, Environment $environment = null)
-    {
-        $this->setUid($file->getUid());
-        $this->setLastModified($file->getLastModified());
-        $this->setFilename($file->getFilename());
-        $this->setExt($file->getExt());
-        $this->setPath($file->getPath());
-        $this->setToCopy($file->isToCopy());
-
-        if (! $file->isToCopy()) {
-            $frontMatter = new TapestryFrontMatter($file->getFileContent());
-            $this->setContent($frontMatter->getContent());
-            foreach($frontMatter->getData() as $key => $value) {
-                $fmRecord = new FrontMatter();
-                $fmRecord->setName($key);
-                $fmRecord->setValue($value);
-                $this->addFrontMatter($fmRecord);
-            }
-        }
-
-        if (!is_null($environment)) {
-            $this->setEnvironment($environment);
-        }
-    }
-
     //
     // Relationships
     //
@@ -154,6 +122,7 @@ public function addFrontMatter(FrontMatter $frontMatter) {
         }
 
         $this->frontMatter->add($frontMatter);
+        $frontMatter->setFile($this);
     }
 
     /**

src/Exporter.php

@@ -14,6 +14,7 @@
 use TapestryCloud\Database\Entities\File;
 use TapestryCloud\Database\Synchronizes\ContentTypes;
 use TapestryCloud\Database\Synchronizes\Files;
+use TapestryCloud\Database\Hydrators\File as FileHydrator;
 
 class Exporter {
 
@@ -71,7 +72,7 @@ public function export(Project $project) {
             $this->entityManager->flush();
         }
 
-        $fileSync = new Files($this->entityManager);
+        $fileSync = new Files($this->entityManager, new FileHydrator($this->entityManager));
         $fileSync->sync($files, $environment);
 
         $contentTypeSync = new ContentTypes($this->entityManager);

src/Hydrators/File.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace TapestryCloud\Database\Hydrators;
+
+use Tapestry\Modules\Content\FrontMatter as TapestryFrontMatter;
+use TapestryCloud\Database\Entities\Environment;
+use TapestryCloud\Database\Entities\FrontMatter;
+use TapestryCloud\Database\Entities\File as Model;
+
+
+class File extends Hydrator
+{
+
+    /**
+     * File Hydration.
+     *
+     * @param Model $model
+     * @param \Tapestry\Entities\File $file
+     * @param Environment|null $environment
+     */
+    public function hydrate(Model $model,  \Tapestry\Entities\File $file, Environment $environment = null)
+    {
+        $model->setUid($file->getUid());
+        $model->setLastModified($file->getLastModified());
+        $model->setFilename($file->getFilename());
+        $model->setExt($file->getExt());
+        $model->setPath($file->getPath());
+        $model->setToCopy($file->isToCopy());
+
+        if (! $file->isToCopy()) {
+            $frontMatter = new TapestryFrontMatter($file->getFileContent());
+            $model->setContent($frontMatter->getContent());
+            foreach($frontMatter->getData() as $key => $value) {
+                $fmRecord = new FrontMatter();
+                $fmRecord->setName($key);
+                $fmRecord->setValue(json_encode($value));
+                $model->addFrontMatter($fmRecord);
+
+                $this->entityManager->persist($fmRecord);
+            }
+        }
+
+        if (!is_null($environment)) {
+            $model->setEnvironment($environment);
+        }
+    }
+
+}

src/Hydrators/Hydrator.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace TapestryCloud\Database\Hydrators;
+
+use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
+
+class Hydrator
+{
+    /**
+     * @var EntityManagerInterface|EntityManager
+     */
+    protected $entityManager;
+
+
+    /**
+     * File constructor.
+     * @param EntityManagerInterface $entityManager
+     */
+    public function __construct(EntityManagerInterface $entityManager)
+    {
+        $this->entityManager = $entityManager;
+    }
+}

src/Synchronizes/Files.php

@@ -7,6 +7,7 @@
 use Tapestry\Entities\File as TapestryFile;
 use TapestryCloud\Database\Entities\Environment;
 use TapestryCloud\Database\Entities\File;
+use TapestryCloud\Database\Hydrators\File as FileHydrator;
 
 class Files
 {
@@ -15,13 +16,20 @@ class Files
      */
     private $em;
 
+    /**
+     * @var FileHydrator
+     */
+    private $fileHydrator;
+
     /**
      * ContentTypes constructor.
      * @param EntityManagerInterface $em
+     * @param FileHydrator $fileHydrator
      */
-    public function __construct(EntityManagerInterface $em)
+    public function __construct(EntityManagerInterface $em, FileHydrator $fileHydrator)
     {
         $this->em = $em;
+        $this->fileHydrator = $fileHydrator;
     }
 
     public function sync(FlatCollection $files, Environment $environment) {
@@ -30,12 +38,10 @@ public function sync(FlatCollection $files, Environment $environment) {
         foreach ($files as $file) {
 
             if (!$record = $this->em->getRepository(File::class)->findOneBy(['uid' => $file->getuid(), 'environment' => $environment->getId()])) {
-                // INSERT
                 $record = new File();
-                $record->hydrate($file, $environment);
             }
 
-            // UPDATE
+            $this->fileHydrator->hydrate($record, $file, $environment);
             $this->em->persist($record);
         }