From 1aa984b7eb6a966a7ce83a365ff46f5e22c573cd Mon Sep 17 00:00:00 2001
From: Linksehat Staging Server <it.dev@linksehat.com>
Date: Fri, 29 Dec 2023 17:47:11 +0700
Subject: [PATCH] update

---
 Modules/Internal/Services/MemberEnrollmentService.php | 11 +++++------
 app/Helpers/Helper.php                                |  5 +++--
 app/Models/Person.php                                 |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Modules/Internal/Services/MemberEnrollmentService.php b/Modules/Internal/Services/MemberEnrollmentService.php
index a771d61f..a6a7874c 100644
--- a/Modules/Internal/Services/MemberEnrollmentService.php
+++ b/Modules/Internal/Services/MemberEnrollmentService.php
@@ -699,7 +699,6 @@ class MemberEnrollmentService
                         //     $query->where('corporate_id', $corporate->id);
                         // })
                         ->first();
-
                     // Validate If Exist Member
                     if ($member) {
                         $person = Person::updateOrCreate(
@@ -710,7 +709,7 @@ class MemberEnrollmentService
                                 'name' => $row['name'] ?? null,
                                 // 'birth_date' => $this->dateParser($row['date_of_birth']),
                                 'birth_date' => $row['date_of_birth'],
-                                'gender' => Helper::genderPerson($row['sex']),
+                                'gender' => Helper::genderNormalization($row['sex']),
                                 'language' => $row['language'] ?? null,
                                 'race' => $row['race'] ?? null,
                                 'phone' => $row['telephone_mobile'] ?? null
@@ -764,18 +763,17 @@ class MemberEnrollmentService
                         DB::beginTransaction();
                         $member->fill($member_data);
                         if ($member->save()) {
-
                             $person = Person::create([
                                 'name' => $row['name'],
                                 'birth_date' => $row['date_of_birth'],
-                                'gender' => Helper::genderPerson($row['sex']),
+                                'gender' => Helper::genderNormalization($row['sex']),
                                 'language' => $row['language'] ?? null,
                                 'race' => $row['race'] ?? null,
                                 'phone' => $row['telephone_mobile'],
                             ]);
-                            $member->person_id = $person->id;
-                            $member->save();
 
+                            $member->person_id = $person->id;
+                            
                             $memberPolicy = new MemberPolicy();
                             $memberPolicy->fill([
                                 'member_id' => $member->member_id,
@@ -784,6 +782,7 @@ class MemberEnrollmentService
                                 'end' => $this->dateParser($row['member_expiry_date']),
                                 'status' => 'active'
                             ]);
+                            
                             $memberPolicy->save();
 
                             if (!empty($row['division_name'])) {
diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index 12eb9f96..79b956cd 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -15,6 +15,7 @@ class Helper
 {
     public static function genderNormalization($anyGenderCode)
     {
+       
         if ($anyGenderCode == 'M') {
             return 'Male';
         } else if ($anyGenderCode == 'F') {
@@ -24,7 +25,7 @@ class Helper
         } else if ($anyGenderCode == 'U') {
             return 'Unknown';
         } else {
-            return null;
+            return '-';
         }
     }
 
@@ -52,7 +53,7 @@ class Helper
         } else if ($anyGenderCode == 'U') {
             return 'unknown';
         } else {
-            return null;
+            return '-';
         }
     }
 
diff --git a/app/Models/Person.php b/app/Models/Person.php
index f3a6c944..81ac542d 100644
--- a/app/Models/Person.php
+++ b/app/Models/Person.php
@@ -151,6 +151,6 @@ class Person extends Model
 
     public function updatePerson()
     {
-        $this -> update ( $data );
+        $this-> update ( $data );
     }
 }