removed unneeded original name fields

src/Controller/APIController.php

@@ -127,13 +127,13 @@ class APIController extends AbstractController
             $em->flush();
 
             $zipLocation = $this->getParameter('temp_path').DIRECTORY_SEPARATOR;
-            $zipName = $result->getSRTBOriginalName().".zip";
+            $zipName = $result->getFileReference().".zip";
 
             $zip = new \ZipArchive;
             $zip->open($zipLocation.$zipName, \ZipArchive::CREATE);
-            $zip->addFile($this->getParameter('srtb_path').DIRECTORY_SEPARATOR.$result->getFileReference().".srtb", $result->getSRTBOriginalName());
-            $zip->addFile($this->getParameter('cover_path').DIRECTORY_SEPARATOR.$result->getFileReference().".png", "AlbumArt".DIRECTORY_SEPARATOR.$result->getCoverOriginalName());
-            $zip->addFile($this->getParameter('audio_path').DIRECTORY_SEPARATOR.$result->getFileReference().".ogg", "AudioClips".DIRECTORY_SEPARATOR.$result->getAudioOriginalName());
+            $zip->addFile($this->getParameter('srtb_path').DIRECTORY_SEPARATOR.$result->getFileReference().".srtb", $result->getFileReference().".srtb");
+            $zip->addFile($this->getParameter('cover_path').DIRECTORY_SEPARATOR.$result->getFileReference().".png", "AlbumArt".DIRECTORY_SEPARATOR.$result->getFileReference().".png");
+            $zip->addFile($this->getParameter('audio_path').DIRECTORY_SEPARATOR.$result->getFileReference().".ogg", "AudioClips".DIRECTORY_SEPARATOR.$result->getFileReference().".ogg");
             $zip->close();
 
             $response = new Response(file_get_contents($zipLocation.$zipName));

src/Entity/Song.php

@@ -41,38 +41,23 @@ class Song
      */
     private $fileReference;
 
-    /**
-     * @ORM\Column(type="string", length=255, nullable=true)
-     */
-    private $srtbOriginalName;
-
-    /**
-     * @ORM\Column(type="string", length=255, nullable=true)
-     */
-    private $coverOriginalName;
-
-    /**
-     * @ORM\Column(type="string", length=255, nullable=true)
-     */
-    private $audioOriginalName;
-
     /**
      * @ORM\Column(type="string", length=255, nullable=true)
      */
     private $tags;
 
     /**
-     * @ORM\Column(type="integer")
+     * @ORM\Column(type="integer", nullable=true)
      */
     private $views;
 
     /**
-     * @ORM\Column(type="integer")
+     * @ORM\Column(type="integer", nullable=true)
      */
     private $downloads;
 
     /**
-     * @ORM\Column(type="boolean")
+     * @ORM\Column(type="boolean", nullable=true, options={"default": false})
      */
     private $isExplicit;
 
@@ -141,42 +126,6 @@ class Song
         return $this;
     }
 
-    public function getSRTBOriginalName(): ?string
-    {
-        return $this->srtbOriginalName;
-    }
-
-    public function setSRTBOriginalName(?string $srtbOriginalName): self
-    {
-        $this->srtbOriginalName = $srtbOriginalName;
-
-        return $this;
-    }
-
-    public function getCoverOriginalName(): ?string
-    {
-        return $this->coverOriginalName;
-    }
-
-    public function setCoverOriginalName(?string $coverOriginalName): self
-    {
-        $this->coverOriginalName = $coverOriginalName;
-
-        return $this;
-    }
-
-    public function getAudioOriginalName(): ?string
-    {
-        return $this->audioOriginalName;
-    }
-
-    public function setAudioOriginalName(?string $audioOriginalName): self
-    {
-        $this->audioOriginalName = $audioOriginalName;
-
-        return $this;
-    }
-
     public function getTags(): ?string
     {
         return $this->tags;