From ea1fbdcd728c93a8a036cf94b651256877670c0c Mon Sep 17 00:00:00 2001
From: philipp lang <philipp@aweos.de>
Date: Thu, 18 Nov 2021 00:34:53 +0100
Subject: [PATCH] Fixed: Country is not required for sync

---
 app/Initialize/InitializeMembers.php                      | 2 +-
 .../migrations/2020_04_12_223230_create_members_table.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Initialize/InitializeMembers.php b/app/Initialize/InitializeMembers.php
index a2e58a22..b4ee361a 100644
--- a/app/Initialize/InitializeMembers.php
+++ b/app/Initialize/InitializeMembers.php
@@ -67,7 +67,7 @@ class InitializeMembers {
                         'gender_id' => optional(Gender::firstWhere('nami_id', $member->gender_id ?: -1))->id,
                         'confession_id' => optional(Confession::firstWhere('nami_id', $member->confession_id ?: -1))->id,
                         'region_id' => optional(Region::firstWhere('nami_id', $member->region_id ?: -1))->id,
-                        'country_id' => Country::where('nami_id', $member->country_id)->firstOrFail()->id,
+                        'country_id' => optional(Country::where('nami_id', $member->country_id)->first())->id,
                         'subscription_id' => $this->getSubscriptionId($member),
                         'nationality_id' => Nationality::where('nami_id', $member->nationality_id)->firstOrFail()->id,
                         'version' => $member->version,
diff --git a/database/migrations/2020_04_12_223230_create_members_table.php b/database/migrations/2020_04_12_223230_create_members_table.php
index da1a9224..5be8d6f1 100644
--- a/database/migrations/2020_04_12_223230_create_members_table.php
+++ b/database/migrations/2020_04_12_223230_create_members_table.php
@@ -1,9 +1,9 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
 use App\Bill\BillKind;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateMembersTable extends Migration
 {
@@ -28,7 +28,7 @@ class CreateMembersTable extends Migration
             $table->string('lastname');
             $table->string('nickname')->nullable();
             $table->foreignId('gender_id')->nullable()->constrained();
-            $table->foreignId('country_id')->constrained();
+            $table->foreignId('country_id')->nullable()->constrained();
             $table->string('other_country')->nullable();
             $table->foreignId('confession_id')->nullable()->constrained();
             $table->date('birthday');