From f8a93fdf454d7b970aad296f143f52ef48b008de Mon Sep 17 00:00:00 2001
From: shibafu <shibafu528@gmail.com>
Date: Sat, 1 Aug 2020 17:26:38 +0900
Subject: [PATCH] =?UTF-8?q?Metadata=E8=A7=A3=E6=B1=BA=E5=87=A6=E7=90=86?=
 =?UTF-8?q?=E3=82=92=E3=83=88=E3=83=A9=E3=83=B3=E3=82=B6=E3=82=AF=E3=82=B7?=
 =?UTF-8?q?=E3=83=A7=E3=83=B3=E5=86=85=E3=81=A7=E5=AE=9F=E8=A1=8C=E3=81=99?=
 =?UTF-8?q?=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/MetadataResolveService.php | 49 +++++++++++++------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/app/Services/MetadataResolveService.php b/app/Services/MetadataResolveService.php
index e622813..48a4246 100644
--- a/app/Services/MetadataResolveService.php
+++ b/app/Services/MetadataResolveService.php
@@ -8,6 +8,7 @@ use App\MetadataResolver\MetadataResolver;
 use App\Tag;
 use App\Utilities\Formatter;
 use GuzzleHttp\Exception\TransferException;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 
 class MetadataResolveService
@@ -33,32 +34,34 @@ class MetadataResolveService
             throw new DeniedHostException($url);
         }
 
-        // 無かったら取得
-        // TODO: ある程度古かったら再取得とかありだと思う
-        $metadata = Metadata::find($url);
-        if ($metadata == null || ($metadata->expires_at !== null && $metadata->expires_at < now())) {
-            try {
-                $resolved = $this->resolver->resolve($url);
-                $metadata = Metadata::updateOrCreate(['url' => $url], [
-                    'title' => $resolved->title,
-                    'description' => $resolved->description,
-                    'image' => $resolved->image,
-                    'expires_at' => $resolved->expires_at
-                ]);
+        return DB::transaction(function () use ($url) {
+            // 無かったら取得
+            // TODO: ある程度古かったら再取得とかありだと思う
+            $metadata = Metadata::find($url);
+            if ($metadata == null || ($metadata->expires_at !== null && $metadata->expires_at < now())) {
+                try {
+                    $resolved = $this->resolver->resolve($url);
+                    $metadata = Metadata::updateOrCreate(['url' => $url], [
+                        'title' => $resolved->title,
+                        'description' => $resolved->description,
+                        'image' => $resolved->image,
+                        'expires_at' => $resolved->expires_at
+                    ]);
 
-                $tagIds = [];
-                foreach ($resolved->normalizedTags() as $tagName) {
-                    $tag = Tag::firstOrCreate(['name' => $tagName]);
-                    $tagIds[] = $tag->id;
+                    $tagIds = [];
+                    foreach ($resolved->normalizedTags() as $tagName) {
+                        $tag = Tag::firstOrCreate(['name' => $tagName]);
+                        $tagIds[] = $tag->id;
+                    }
+                    $metadata->tags()->sync($tagIds);
+                } catch (TransferException $e) {
+                    // 何らかの通信エラーによってメタデータの取得に失敗した時、とりあえずエラーログにURLを残す
+                    Log::error(self::class . ': メタデータの取得に失敗 URL=' . $url);
+                    throw $e;
                 }
-                $metadata->tags()->sync($tagIds);
-            } catch (TransferException $e) {
-                // 何らかの通信エラーによってメタデータの取得に失敗した時、とりあえずエラーログにURLを残す
-                Log::error(self::class . ': メタデータの取得に失敗 URL=' . $url);
-                throw $e;
             }
-        }
 
-        return $metadata;
+            return $metadata;
+        });
     }
 }