feat: negotiate local files in DMAssetResource SDK-40

entrecode · Apr 6, 2018 · d7b8381 · d7b8381
1 parent 8ac7b5d
commit d7b8381
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 21 deletions.
diff --git a/src/resources/publicAPI/DMAssetResource.ts b/src/resources/publicAPI/DMAssetResource.ts
@@ -143,6 +143,20 @@ class DMAssetResource extends Resource {
   getFileVariant(size?: number, thumb: boolean = false): Promise<string> {
     return Promise.resolve()
       .then(() => {
+        if (!size || !thumb) {
+          return this.file.url;
+        }
+
+        let file;
+        if (thumb) {
+          file = this.thumbnails.find(t => t.dimension === size);
+        } else {
+          file = this.fileVariants.find(v => Math.max(v.resolution.width, v.resolution.height) === size);
+        }
+        if (file) {
+          return file.url;
+        }
+
         const request = this.newRequest();
         if (thumb) {
           request.follow('ec:dm-asset/thumbnail');
@@ -154,10 +168,10 @@ class DMAssetResource extends Resource {
           templateParams.size = size;
         }
         request.withTemplateParameters(templateParams);
-        return get(this[environmentSymbol], request);
-      })
-      .then(([res]) => {
-        return res.url;
+        return get(this[environmentSymbol], request)
+          .then(([res]) => {
+            return res.url;
+          });
       });
   }
 

diff --git a/test/publicAPI/DMAssetResource.test.js b/test/publicAPI/DMAssetResource.test.js
@@ -27,9 +27,9 @@ describe('DMAsset ListResource', () => {
         return resolve(JSON.parse(res));
       });
     })
-    .then((json) => {
-      listJson = json;
-    });
+      .then((json) => {
+        listJson = json;
+      });
   });
   beforeEach(() => {
     list = new DMAssetList(listJson);
@@ -60,9 +60,9 @@ describe('DMAsset Resource', () => {
         return resolve(JSON.parse(res));
       });
     })
-    .then((json) => {
-      resourceJson = json;
-    });
+      .then((json) => {
+        resourceJson = json;
+      });
   });
   beforeEach(() => {
     resource = new DMAssetResource(resourceJson);
@@ -81,20 +81,19 @@ describe('DMAsset Resource', () => {
   });
   it('should get original file', () => {
     resource.getOriginalFile().should.deep.equal({
-      "url": "https://cdn1.entrecode.de/beefbeef/test1/7mGEhlUXvdxuoCf0vQWtLNQW.jpg",
-      "size": 3644378,
-      "resolution": {
-        "width": 2736,
-        "height": 4864
+      url: 'https://cdn1.entrecode.de/beefbeef/test1/7mGEhlUXvdxuoCf0vQWtLNQW.jpg',
+      size: 3644378,
+      resolution: {
+        width: 2736,
+        height: 4864,
       },
     });
   });
   it('should get image variant', () => {
     const stub = sinon.stub(helper, 'get');
     stub.returns(resolver('dm-asset-bestfile.json'));
-
     return resource.getImageUrl(500)
-    .should.eventually.equal('https://cdn1.buffalo.entrecode.de/ab5047fc/test1/7mGEhlUXvdxuoCf0vQWtLNQW.jpg')
+    .should.eventually.equal('https://cdn1.entrecode.de/beefbeef/test1/7mGEhlUXvdxuoCf0vQWtLNQW.jpg')
     .notify(() => {
       stub.restore();
     });
@@ -104,10 +103,10 @@ describe('DMAsset Resource', () => {
     stub.returns(resolver('dm-asset-bestfile.json'));
 
     return resource.getImageThumbUrl(50)
-    .should.eventually.equal('https://cdn1.buffalo.entrecode.de/ab5047fc/test1/7mGEhlUXvdxuoCf0vQWtLNQW.jpg')
-    .notify(() => {
-      stub.restore();
-    });
+      .should.eventually.equal('https://cdn1.buffalo.entrecode.de/ab5047fc/test1/7mGEhlUXvdxuoCf0vQWtLNQW.jpg')
+      .notify(() => {
+        stub.restore();
+      });
   });
 
   const dateGetter = ['created', 'modified'];