From be422d69c8a034d39936720df300747fdd2ac629 Mon Sep 17 00:00:00 2001
From: miiton <468745+miiton@users.noreply.github.com>
Date: Tue, 14 Apr 2020 14:32:40 +0900
Subject: [PATCH] =?UTF-8?q?No=E3=80=81=E5=B8=82=E5=8C=BA=E7=94=BA=E6=9D=91?=
 =?UTF-8?q?=E5=90=8D=E3=80=81=E5=85=AC=E8=A1=A8=5F=E5=B9=B4=E6=9C=88?=
 =?UTF-8?q?=E6=97=A5=E3=81=8C=E7=A9=BA=E6=AC=84=E3=82=84=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E3=81=AA=E5=80=A4=E3=81=AE=E5=A0=B4=E5=90=88=E3=81=AF=E3=81=9D?=
 =?UTF-8?q?=E3=81=AE=E8=A1=8C=E3=81=A7=E5=87=A6=E7=90=86=E3=82=92=E5=81=9C?=
 =?UTF-8?q?=E6=AD=A2=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 model/patients.go | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/model/patients.go b/model/patients.go
index 9aa4953..4778417 100644
--- a/model/patients.go
+++ b/model/patients.go
@@ -25,6 +25,7 @@ type Patient struct {
 }
 
 func FetchPatients(svc *sheets.Service, spreadsheetID string) (*Patients, error) {
+	var err error
 	sheetRange := os.Getenv("COVID19_JSON2CSV_SHEET_RANGE_PATIENTS")
 	call := svc.Spreadsheets.Values.Get(spreadsheetID, sheetRange)
 	values, err := call.Do()
@@ -39,17 +40,20 @@ func FetchPatients(svc *sheets.Service, spreadsheetID string) (*Patients, error)
 			p.No, err = strconv.Atoi(val)
 			if err != nil {
 				log.Println(err)
-				return nil, err
+				break
 			}
 		}
 		if val, ok := v[3].(string); ok {
+			if val == "" {
+				break
+			}
 			p.Residence = val
 		}
 		if val, ok := v[4].(string); ok {
 			p.AnnouncementDate, err = time.Parse("2006-01-02", val)
 			if err != nil {
 				log.Println(err)
-				return nil, err
+				break
 			}
 		}
 		if val, ok := v[7].(string); ok {
@@ -60,7 +64,7 @@ func FetchPatients(svc *sheets.Service, spreadsheetID string) (*Patients, error)
 		}
 		ps.Data = append(ps.Data, p)
 	}
-	return &ps, nil
+	return &ps, err
 }
 
 func setSummaryData(cur time.Time, kv map[string]int) int {