Merge pull request #37 from MadeHQ/fix-for-multiple-public-id-fields

Fix for multiple public id fields
MadeHQ · Feb 8, 2019 · 77fd9f0 · 77fd9f0
2 parents 5e7ffb1 + 16322de
commit 77fd9f0
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 14 deletions.
diff --git a/_config/config.yml b/_config/config.yml
@@ -49,6 +49,9 @@ SilverStripe\ORM\DatabaseAdmin:
         File: MadeHQ\Cloudinary\Model\File
         Image: MadeHQ\Cloudinary\Model\Image
 
+SilverStripe\Assets\File:
+    extensions:
+        - MadeHQ\Cloudinary\Extensions\FileExtension
 
 ---
 Name: silverstripecloudinary-assetadmin-campaigns

diff --git a/src/Controllers/APIController.php b/src/Controllers/APIController.php
@@ -6,11 +6,8 @@
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\Queries\SQLUpdate;
 use SilverStripe\Core\Config\Config;
-use SilverStripe\Control\Controller;
-use SilverStripe\Control\HTTPRequest;
-use SilverStripe\Control\HTTPResponse;
-use SilverStripe\Security\Permission;
-use SilverStripe\Security\PermissionProvider;
+use SilverStripe\Control\{ Controller, Director, HTTPRequest, HTTPResponse };
+use SilverStripe\Security\{ Permission, PermissionProvider };
 use SilverStripe\Core\Config\Configurable;
 use SilverStripe\Core\Convert;
 use SilverStripe\Versioned\Versioned;
@@ -156,6 +153,7 @@ public function sync(HTTPRequest $request)
                     } else {
                         $data = false;
                     }
+
                 }
             }
 
@@ -166,14 +164,28 @@ public function sync(HTTPRequest $request)
                 ]
             ]);
         } catch (CloudinaryApiError $e) {
+            if (Director::isDev()) {
+                return $this->output([
+                    'status' => 'error',
+                    'description' => sprintf('Error occurred with the Cloudinary API: %s', $e->getMessage()),
+                    'trace' => $e->getTrace(),
+                ], 500);
+            }
             return $this->output([
                 'status' => 'error',
-                'description' => sprintf('Error occurred with the Cloudinary API: %s', $e->getMessage()),
+                'description' => 'Error occurred with the Cloudinary API',
             ], 500);
         } catch (\Exception $e) {
+            if (Director::isDev()) {
+                return $this->output([
+                    'status' => 'error',
+                    'description' => sprintf('Unhandled error occurred: %s', $e->getMessage()),
+                    'trace' => $e->getTrace(),
+                ], 500);
+            }
             return $this->output([
                 'status' => 'error',
-                'description' => sprintf('Unhandled error occurred: %s', $e->getMessage()),
+                'description' => 'Unhandled error occurred',
             ], 500);
         }
     }

diff --git a/src/Extensions/FileExtension.php b/src/Extensions/FileExtension.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace MadeHQ\Cloudinary\Extensions;
+
+use SilverStripe\ORM\DataExtension;
+
+class FileExtension extends DataExtension
+{
+    private static $db = [
+        'PublicID' => 'Varchar(255)',
+    ];
+
+    private static $indexes = [
+        'PublicID' => [
+            'type' => 'unique',
+        ],
+    ];
+}
diff --git a/src/Traits/CloudinaryFileTrait.php b/src/Traits/CloudinaryFileTrait.php
@@ -20,7 +20,6 @@ trait CloudinaryFileTrait
 {
     private static $db = [
         'LastUpdatedFromCloudinary' => 'DBDatetime',
-        'PublicID' => 'Varchar(255)',
         'SecureURL' => 'Varchar(1000)',
         'ResourceType' => 'Varchar',
         'Description' => 'Text',
@@ -30,12 +29,6 @@ trait CloudinaryFileTrait
         'RemoteData' => 'Text',
     ];
 
-    private static $indexes = [
-        'PublicID' => [
-            'type' => 'unique',
-        ],
-    ];
-
     public static function getOneByPublicId($publicId)
     {
         return static::get_one(static::class, [