From bcb79e2d682b32f75603cda1774e975325815eb9 Mon Sep 17 00:00:00 2001
From: "sosuke.iwabuchi" <sosuke.iwabuchi@satellite-tech.co.jp>
Date: Mon, 2 Oct 2023 11:53:57 +0900
Subject: [PATCH] =?UTF-8?q?=E5=88=A9=E7=94=A8=E5=AE=9F=E7=B8=BECSV?=
 =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

SATE_RECEIPT-46 利用実績CSVの出力対象が運営会社でフィルターされていない。　CSVファイル名を変更したい。
---
 .../Custom/HelloTechno/UseSummaryCSVController.php    | 11 ++++++++---
 .../Custom/HelloTechno/UseSummaryRepository.php       |  2 +-
 .../Custom/HelloTechno/UseSummaryRepositoryData.php   |  1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Web/Custom/HelloTechno/UseSummaryCSVController.php b/app/Http/Controllers/Web/Custom/HelloTechno/UseSummaryCSVController.php
index b1a8c97..322700a 100644
--- a/app/Http/Controllers/Web/Custom/HelloTechno/UseSummaryCSVController.php
+++ b/app/Http/Controllers/Web/Custom/HelloTechno/UseSummaryCSVController.php
@@ -12,6 +12,7 @@ use App\Repositories\Custom\HelloTechno\ReceiptIssuingOrderRepositoryData as RDA
 use App\Repositories\Custom\HelloTechno\UseSummaryRepository;
 use App\Util\DateUtil;
 use Illuminate\Http\Request;
+use Illuminate\Support\Str;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
 class UseSummaryCSVController extends HelloTechnoController
@@ -78,10 +79,12 @@ class UseSummaryCSVController extends HelloTechnoController
         $csv->addLine([]);
         $csv->addLine($this->getSummaryHeaderLabels());
         $sortDef = array_keys($this->getSummaryHeaderLabels());
+        $customerName = "xx";
         foreach ($summaryList as $row) {
             $csv->addLine($row->toArray(), $sortDef);
+            $customerName = $row->customer_name;
         }
-        return $csv->download($this->getDownloadFileName());
+        return $csv->download($this->getDownloadFileName($customerName));
     }
     private function getReceiptIssuingOrdersLabel(): array
     {
@@ -130,12 +133,14 @@ class UseSummaryCSVController extends HelloTechnoController
         ];
     }
 
-    private function getDownloadFileName()
+    private function getDownloadFileName(string $customerName)
     {
+
+        $customerName = Str::of($customerName)->remove(" ")->remove("　")->toString();
         $param = $this->param;
         return sprintf(
             "利用実績_%s_%s_%s_%s.csv",
-            $param->customerCode,
+            $customerName,
             $param->dateFrom->format('Ymd'),
             $param->dateTo->format('Ymd'),
             DateUtil::now()->format('YmdHis')
diff --git a/app/Repositories/Custom/HelloTechno/UseSummaryRepository.php b/app/Repositories/Custom/HelloTechno/UseSummaryRepository.php
index a243200..aff8fad 100644
--- a/app/Repositories/Custom/HelloTechno/UseSummaryRepository.php
+++ b/app/Repositories/Custom/HelloTechno/UseSummaryRepository.php
@@ -22,7 +22,7 @@ class UseSummaryRepository extends BaseRepository
      * コレクションを取得する
      * 
      * @param array $condition
-     * @return Collection<UseSummaryRepositoryData>
+     * @return Collection<int, UseSummaryRepositoryData>
      */
     public function get(array $condition): Collection
     {
diff --git a/app/Repositories/Custom/HelloTechno/UseSummaryRepositoryData.php b/app/Repositories/Custom/HelloTechno/UseSummaryRepositoryData.php
index 05c08be..cb7d309 100644
--- a/app/Repositories/Custom/HelloTechno/UseSummaryRepositoryData.php
+++ b/app/Repositories/Custom/HelloTechno/UseSummaryRepositoryData.php
@@ -5,6 +5,7 @@ namespace App\Repositories\Custom\HelloTechno;
 use App\Repositories\UseSummaryRepositoryData as BaseData;
 
 /**
+ * @property string $customer_name
  */
 class UseSummaryRepositoryData extends BaseData
 {