From ab7f19dc17e7b454748e37ab1b22059ab81c9ed6 Mon Sep 17 00:00:00 2001 From: R Date: Thu, 8 Dec 2022 14:14:46 +0700 Subject: [PATCH] Fix Duplicate Division --- Modules/Client/Transformers/MemberResources.php | 2 +- Modules/Internal/Services/MemberEnrollmentService.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Modules/Client/Transformers/MemberResources.php b/Modules/Client/Transformers/MemberResources.php index 6a25d1fd..f841ae84 100644 --- a/Modules/Client/Transformers/MemberResources.php +++ b/Modules/Client/Transformers/MemberResources.php @@ -17,7 +17,7 @@ class MemberResources extends JsonResource return [ 'memberId' => $this->member_id, 'fullName' => $this->full_name, - 'division' => $this->division->name, + 'division' => $this->division->name ?? '', 'limit' => [ 'current' => 2000000, 'total' => 4000000, diff --git a/Modules/Internal/Services/MemberEnrollmentService.php b/Modules/Internal/Services/MemberEnrollmentService.php index b7b7e33b..daf94fe4 100755 --- a/Modules/Internal/Services/MemberEnrollmentService.php +++ b/Modules/Internal/Services/MemberEnrollmentService.php @@ -467,7 +467,9 @@ class MemberEnrollmentService $corporateCode = substr($row['division_name'], 0, 1); } - $division = CorporateDivision::query()->create([ + $division = CorporateDivision::updateOrCreate([ + 'code' => $corporateCode + ], [ 'corporate_id' => $corporate->id, 'name' => $row['division_name'], 'code' => $corporateCode,