refactor: streamline person data handling and organization creation

Author: amit-webkul

packages/Webkul/Admin/src/Http/Controllers/Contact/Persons/PersonController.php

@@ -54,7 +54,7 @@ public function store(AttributeForm $request): RedirectResponse|JsonResponse
     {
         Event::dispatch('contacts.person.create.before');
 
-        $person = $this->personRepository->create($this->sanitizeRequestedPersonData($request->all()));
+        $person = $this->personRepository->create($request->all());
 
         Event::dispatch('contacts.person.create.after', $person);
 
@@ -97,7 +97,7 @@ public function update(AttributeForm $request, int $id): RedirectResponse|JsonRe
     {
         Event::dispatch('contacts.person.update.before', $id);
 
-        $person = $this->personRepository->update($this->sanitizeRequestedPersonData($request->all()), $id);
+        $person = $this->personRepository->update($request->all(), $id);
 
         Event::dispatch('contacts.person.update.after', $person);
 
@@ -174,27 +174,4 @@ public function massDestroy(MassDestroyRequest $massDestroyRequest): JsonRespons
             'message' => trans('admin::app.contacts.persons.index.delete-success'),
         ]);
     }
-
-    /**
-     * Sanitize requested person data and return the clean array.
-     */
-    private function sanitizeRequestedPersonData(array $data): array
-    {
-        if (
-            array_key_exists('organization_id', $data)
-            && empty($data['organization_id'])
-        ) {
-            $data['organization_id'] = null;
-        }
-
-        $data['unique_id'] = $data['user_id'].'|'.$data['organization_id'].'|'.$data['emails'][0]['value'];
-
-        if (isset($data['contact_numbers'])) {
-            $data['contact_numbers'] = collect($data['contact_numbers'])->filter(fn ($number) => ! is_null($number['value']))->toArray();
-
-            $data['unique_id'] .= '|'.$data['contact_numbers'][0]['value'];
-        }
-
-        return $data;
-    }
 }

packages/Webkul/Contact/src/Repositories/PersonRepository.php

@@ -55,11 +55,18 @@ public function model()
      */
     public function create(array $data)
     {
-        if (isset($data['organization_name'])) {
+        $data = $this->sanitizeRequestedPersonData($data);
+
+        if (
+            isset($data['organization_name'])
+            && ! empty($data['organization_name'])
+        ) {
             $organization = self::createOrganization($data);
 
             $data['organization_id'] = $organization->id;
 
+            $data['user_id'] = $organization->user_id;
+
             unset($data['organization_name']);
         }
 
@@ -83,9 +90,14 @@ public function create(array $data)
      */
     public function update(array $data, $id, $attributes = [])
     {
+        $data = $this->sanitizeRequestedPersonData($data);
+
         $data['user_id'] = empty($data['user_id']) ? null : $data['user_id'];
 
-        if (isset($data['organization_name'])) {
+        if (
+            isset($data['organization_name'])
+            && ! empty($data['organization_name'])
+        ) {
             $organization = self::createOrganization($data);
 
             $data['organization_id'] = $organization->id;
@@ -136,20 +148,55 @@ public function getCustomerCount($startDate, $endDate)
             ->count();
     }
 
+    /**
+     * Sanitize requested person data and return the clean array.
+     */
+    private function sanitizeRequestedPersonData(array $data): array
+    {
+        if (
+            array_key_exists('organization_id', $data)
+            && empty($data['organization_id'])
+        ) {
+            $data['organization_id'] = null;
+        }
+
+        $uniqueIdParts = array_filter([
+            $data['user_id'] ?? null,
+            $data['organization_id'] ?? null,
+            $data['emails'][0]['value'] ?? null,
+        ]);
+
+        $data['unique_id'] = implode('|', $uniqueIdParts);
+
+        if (isset($data['contact_numbers'])) {
+            $data['contact_numbers'] = collect($data['contact_numbers'])->filter(fn ($number) => ! is_null($number['value']))->toArray();
+
+            $data['unique_id'] .= '|'.$data['contact_numbers'][0]['value'];
+        }
+
+        return $data;
+    }
+
     /**
      * Create a organization.
      */
     public function createOrganization(array $data)
     {
-        $userId = empty($data['user_id']) ? null : $data['user_id'];
-
-        return $this->organizationRepository->create(
-            array_merge($data, [
-                'name'        => $data['organization_name'],
-                'entity_type' => 'organization',
-                'address'     => [],
-                'user_id'     => $userId,
-            ])
-        );
+        $organization = $this->organizationRepository->findOneWhere([
+            'name' => $data['organization_name'],
+        ]);
+
+        return $organization ?: $this->organizationRepository->create([
+            'name'        => $data['organization_name'],
+            'entity_type' => 'organization',
+            'address'     => [
+                "address"  => "",
+                "country"  => "",
+                "state"    => "",
+                "city"     => "",
+                "postcode" => ""
+            ],
+            'user_id'     => 1,
+        ]);
     }
 }