From 0a53199399a7dab2cac543e0800573bfcb96b159 Mon Sep 17 00:00:00 2001
From: shibafu <shibafu528@gmail.com>
Date: Sun, 16 Feb 2020 23:21:17 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=8D=E3=82=B9=E3=83=88=E3=82=92=E3=81=A1?=
 =?UTF-8?q?=E3=82=87=E3=81=A3=E3=81=A8=E6=B8=9B=E3=82=89=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Io/CheckinCsvImporter.php | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/Io/CheckinCsvImporter.php b/app/Io/CheckinCsvImporter.php
index 5b41b6c..30d13d4 100644
--- a/app/Io/CheckinCsvImporter.php
+++ b/app/Io/CheckinCsvImporter.php
@@ -150,21 +150,20 @@ class CheckinCsvImporter
             $column = 'タグ' . $i;
             if (empty($record[$column])) {
                 break;
-            } else {
-                $tag = trim($record[$column]);
-
-                if (empty($tag)) {
-                    break;
-                }
-                if (mb_strlen($tag) > 255) {
-                    throw new CsvImportException("{$line} 行 : {$column}は255文字以内にしてください。");
-                }
-                if (strpos($tag, "\n") !== false) {
-                    throw new CsvImportException("{$line} 行 : {$column}に改行を含めることはできません。");
-                }
-
-                $tags[] = Tag::firstOrCreate(['name' => $tag]);
             }
+
+            $tag = trim($record[$column]);
+            if (empty($tag)) {
+                break;
+            }
+            if (mb_strlen($tag) > 255) {
+                throw new CsvImportException("{$line} 行 : {$column}は255文字以内にしてください。");
+            }
+            if (strpos($tag, "\n") !== false) {
+                throw new CsvImportException("{$line} 行 : {$column}に改行を含めることはできません。");
+            }
+
+            $tags[] = Tag::firstOrCreate(['name' => $tag]);
         }
 
         return $tags;