dev#105493 websvc integration

Adding fullsize entry management

FEATURES/105493

+        '105493' =>
+            ['Label' => $this->_('utilisation dans le serveur de cache websvc'),
+             'Desc' => '',
+             'Image' => '',
+             'Video' => '',
+             'Category' => '',
+             'Right' => function($feature_description, $user) {return true;},
+             'Wiki' => '',
+             'Test' => '',
+             'Date' => '2020-07-10'],
\ No newline at end of file

VERSIONS_WIP/105493

+ - ticket #105493 : utilisation dans le serveur de cache websvc
\ No newline at end of file

conf/http_server.template.php

+<?php
+return [
+        'URL_BASE' => 'https://localhost/pellicule'
+];
+?>
\ No newline at end of file

database/2.sql

+alter table `media`
+add column `fullsize` varchar(255) null default '';

src/FileSystem.php

@@ -7,7 +7,18 @@ use \Slim\Psr7\Factory\RequestFactory;
 class FileSystem {
   use HttpClientAware;
 
-  protected static $_base_path;
+  protected static $_base_path,
+    $_base_url;
+
+
+  public static function setBaseUrl($url_base) {
+    static::$_base_url = $url_base;
+  }
+
+  public static function baseUrl(){
+    return static::$_base_url;
+  }
+
 
   public static function setBasePath($path) {
     static::$_base_path = $path;

src/Models/Media.php

@@ -34,12 +34,18 @@ class Media extends ModelAbstract {
     return array_intersect_key($this->getRawAttributes(),
                                ['type'       => 1,
                                 'url'        => 1,
+                                'fullsize'   => 1,
                                 'provider'   => 1,
                                 'created_at' => 1,
                                 'updated_at' => 1]);
   }
 
 
+  public function beforeSave() {
+    $this->setFullsize( \Pellicule\FileSystem::baseUrl() . $this->getFilePath());
+  }
+
+
   public function afterSave() {
     if (!$this->fileExists())
       $this->getFileSystem()->download($this->getUrl(), $this->getFilePath());

tests/MediaTest.php

@@ -18,7 +18,9 @@ class MediaLocalRecordTest extends TestCase {
   public function setUp(){
     parent::setUp();
 
-    Media::setFileSystem($this->mock()->whenCalled('fileExists')->answers(true));
+    Media::setFileSystem($this->mock()
+                         ->whenCalled('fileExists')->answers(true)
+                         ->whenCalled('baseUrl')->answers('https://localhost/pellicule/'));
 
     $this->fixture(Record::class,
                    ['id' => 1,
@@ -63,6 +65,7 @@ class MediaLocalRecordTest extends TestCase {
     $expected = [ 'media'=>
                  [
                   [ 'url' => 'http://image.org/city.jpg',
+                   'fullsize' => FileSystem::baseUrl() . Media::find(135)->getFilePath(),
                     'provider' => 'Me',
                    'created_at' => '2020-01-13 08:00:00',
                    'updated_at' => '2020-01-16 08:00:00',
@@ -70,6 +73,7 @@ class MediaLocalRecordTest extends TestCase {
                   [ 'url' => 'http://image.org/cityback.jpg',
                    'type' => 'back_cover',
                     'provider' => 'Me',
+                   'fullsize' => FileSystem::baseUrl() . Media::find(147)->getFilePath(),
                     'created_at' => '2020-01-21 08:00:00',
                     'updated_at' => '2020-02-14 08:00:00'
                   ]
@@ -143,9 +147,11 @@ abstract class MediaWithElectreTestCase extends TestCase {
       [ 'media' => [
                     ['url'=> 'http://image.org/city.jpg',
                      'provider' => 'Electre',
+                     'fullsize' => '',
                      'type' => 'cover'],
                     ['url' => 'http://image.org/cityback.jpg',
                      'provider' => 'Electre',
+                     'fullsize' => '',
                      'type' => 'back_cover']
         ]
       ];
@@ -167,6 +173,7 @@ class MediaWithElectreOnIsbnTest extends MediaWithElectreTestCase {
 
     $headers = ['Authorization' => ['Pellicule ' . $payload]];
 
+
     $this->_response = $this->httpGet('/1.0/media/isbn/2259228194', $headers);
   }
 
@@ -183,6 +190,7 @@ class MediaWithElectreOnIsbnTest extends MediaWithElectreTestCase {
 class MediaWithElectreOnEanTest extends MediaWithElectreTestCase {
   public function setUp() {
     parent::setUp();
+
     $this->_response = $this->httpGet('/1.0/media/ean/2259228194',
                                       ['Authorization' => ['Pellicule ' . base64_encode(json_encode(['provider'=> 'electre',
                                                                                                      'client_secret'=>'leeloo',
@@ -203,6 +211,7 @@ class MediaWithElectreWithSearchError extends TestCase {
   public function setUp(){
     parent::setUp();
 
+    Media::setFileSystem($this->mock()->whenCalled('fileExists')->answers(true));
     $this->_http_client
       ->whenCalled('post')
       ->answers($this->_forgePSR7Response(['content' => '{"access_token":"MyPr3ttyT0k3n","expires_in":3600,"token_type":"Bearer"}']))
@@ -239,6 +248,7 @@ class MediaWithElectreWithInvalidCredentialsTest extends TestCase {
   public function setUp(){
     parent::setUp();
 
+    Media::setFileSystem($this->mock()->whenCalled('fileExists')->answers(true));
     $this->_http_client
       ->whenCalled('post')
       ->answers($this->_forgePSR7Response(['status'=> '400', 'content' => '{"error": "invalid_client"}']));
@@ -408,6 +418,7 @@ abstract class MediaWithOrbTestCase extends TestCase {
       [ 'media' => [
                     ['url'=> 'https://products-images.di-static.com/image/orb-9162f416a0b7b2e64a1f5480db8d4394/2259228234-475x500-1.jpg',
                      'provider' => 'Orb',
+                     'fullsize' => '',
                      'type' => 'cover']
 
         ]