WIP

alchemy-fr · Oct 17, 2023 · 7a5391c · 7a5391c
1 parent 014add7
commit 7a5391c
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 47 deletions.
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -59,10 +59,6 @@ services:
       - ./expose/api:/srv/app
       - ./expose/api/docker/supervisor:/etc/supervisor.d
 
-  expose-cron:
-    volumes:
-      - ./expose/api:/srv/app
-
   uploader-api-php:
     environment:
       - XDEBUG_ENABLED

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -533,11 +533,6 @@ services:
     extra_hosts:
       - zippy-svc.${PHRASEA_DOMAIN}:${PS_GATEWAY_IP}
 
-  expose-cron:
-    extends:
-      service: expose-worker
-    command: ['/srv/app/docker/cron/start-cron.sh']
-
   expose-api-nginx:
     profiles:
       - expose

diff --git a/expose/api/Dockerfile b/expose/api/Dockerfile
@@ -44,7 +44,4 @@ RUN apk add --no-cache \
 
 COPY docker/supervisor/* /etc/supervisor.d/
 
-RUN touch /var/log/cron.log \
-    && chmod 755 /srv/app/docker/cron/scripts/*.sh
-
 CMD ["/bin/sh", "-c", "/usr/bin/supervisord -n"]
diff --git a/expose/api/docker/cron/app-crontab b/expose/api/docker/cron/app-crontab
diff --git a/expose/api/docker/cron/scripts/matomo-sync-phraseanet.sh b/expose/api/docker/cron/scripts/matomo-sync-phraseanet.sh
diff --git a/expose/api/docker/cron/start-cron.sh b/expose/api/docker/cron/start-cron.sh
diff --git a/expose/api/src/Matomo/PhraseanetClient.php b/expose/api/src/Matomo/PhraseanetClient.php
@@ -33,31 +33,67 @@ public function patchField(array $stat): void
         unset($stat['idsubdatatable']);
 
         try {
-            $res = $this->client->request('PATCH', sprintf('/api/v3/records/%s/%s/', $baseId, $recordId), [
+            $data = $this->client->request('GET', sprintf('/api/v3/records/%s/%s/', $baseId, $recordId), [
                 'headers' => [
                     'Authorization' => 'OAuth '.$this->authToken,
+                    'Accept' => 'application/vnd.phraseanet.record-extended+json',
                 ],
-                'json' => [
-                    'metadatas' => [
-                        [
-                            'field_name' => 'MatomoMediaMetrics',
-                            'value' => \GuzzleHttp\json_encode($stat)
-                        ]
-                    ]
-                ]
-            ]);
-            $code = $res->getStatusCode();
-            if (in_array($code, [200, 404], true)) {
-                return;
-            }
-
-            throw new \Exception(sprintf('Got invalid HTTP response code %d: %s', $code, $res->getContent(false)));
+            ])->toArray();
         } catch (HttpExceptionInterface $e) {
-            if (404 !== $e->getResponse()->getStatusCode()) {
+            if (404 === $e->getResponse()->getStatusCode()) {
                 return;
             }
 
             throw $e;
         }
+
+        $currentAttr = [];
+        foreach ($data['response']['metadata'] as $meta) {
+            if ('MatomoMediaMetrics' === $meta['name']) {
+                $currentAttr = json_decode($meta['value']['value'], true);
+                break;
+            }
+        }
+
+        if (!shouldUpdate($currentAttr, $stat)) {
+            return;
+        }
+
+        $res = $this->client->request('PATCH', sprintf('/api/v3/records/%s/%s/', $baseId, $recordId), [
+            'headers' => [
+                'Authorization' => 'OAuth '.$this->authToken,
+            ],
+            'json' => [
+                'metadatas' => [
+                    [
+                        'field_name' => 'MatomoMediaMetrics',
+                        'value' => \GuzzleHttp\json_encode($stat)
+                    ]
+                ]
+            ]
+        ]);
+
+        $code = $res->getStatusCode();
+        if (200 !== $code) {
+            throw new \Exception(sprintf('Got invalid HTTP response code %d: %s', $code, $res->getContent(false)));
+        }
+    }
+}
+
+function shouldUpdate(array $current, array $new): bool {
+    if (empty($current)) {
+        return true;
     }
+
+    if (count($new) !== count($current)) {
+        return true;
+    }
+
+    foreach ($new as $k => $v) {
+        if (!isset($current[$k]) || $current[$k] !== $v) {
+            return true;
+        }
+    }
+
+    return false;
 }
diff --git a/expose/api/src/Storage/AssetManager.php b/expose/api/src/Storage/AssetManager.php
@@ -48,6 +48,10 @@ public function createAsset(
             $asset->setSlug($options['slug']);
         }
 
+        if (isset($options['title'])) {
+            $asset->setTitle($options['title']);
+        }
+
         if (isset($options['description'])) {
             $asset->setDescription($options['description']);
         }