Fix Duplicate Division

2022-12-08 14:14:46 +07:00
parent 3d9dab502b
commit ab7f19dc17
2 changed files with 4 additions and 2 deletions
--- 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,
--- 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,