From 84c0b06cda03ca7919dcf8b16b9c2695e7cd3686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Burak=20=C3=87ak=C4=B1rel?= Date: Sat, 16 Jan 2021 15:47:25 +0300 Subject: [PATCH 1/2] Remove pluck method from update script --- app/Listeners/Update/V21/Version210.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Listeners/Update/V21/Version210.php b/app/Listeners/Update/V21/Version210.php index 82066e0da..66fa5dd7f 100644 --- a/app/Listeners/Update/V21/Version210.php +++ b/app/Listeners/Update/V21/Version210.php @@ -134,8 +134,8 @@ class Version210 extends Listener ->where('deleted_at', $invoice->deleted_at) ->where('company_id', $invoice->company_id) ->where('type', Document::INVOICE_TYPE) - ->pluck('id') - ->first(); + ->first() + ->id; DB::table('credits_transactions') ->where('id', $invoice->credits_transactions_id)->update(['document_id' => $documentId]); @@ -159,8 +159,8 @@ class Version210 extends Listener ->where('deleted_at', $credit_note->deleted_at) ->where('company_id', $credit_note->company_id) ->where('type', self::CREDIT_NOTE_TYPE) - ->pluck('id') - ->first(); + ->first() + ->id; DB::table('credits_transactions') ->where('id', $credit_note->credits_transactions_id)->update(['document_id' => $documentId]); @@ -235,7 +235,7 @@ class Version210 extends Listener $builder->delete(); } - $documentType = DB::table($new_table)->orderBy('id')->pluck('type')->first(); + $documentType = DB::table($new_table)->orderBy('id')->first()->type; // To be able to update TYPE_id relations $this->addDocumentIdForeignKeys($documentType); @@ -243,7 +243,7 @@ class Version210 extends Listener // Update relation ids DB::table($new_table) ->orderByDesc('id') - ->increment('id', DB::table($table)->orderByDesc('id')->pluck('id')->first()); + ->increment('id', DB::table($table)->orderByDesc('id')->first()->id); } $insertColumns = collect(Schema::getColumnListing($new_table)); From ad40e1aab8f4b11546b153556296feb7170c58a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Burak=20=C3=87ak=C4=B1rel?= Date: Sat, 16 Jan 2021 16:17:46 +0300 Subject: [PATCH 2/2] Check document if exists in update script --- app/Listeners/Update/V21/Version210.php | 38 ++++++++++++++----------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/app/Listeners/Update/V21/Version210.php b/app/Listeners/Update/V21/Version210.php index 66fa5dd7f..bd32c112d 100644 --- a/app/Listeners/Update/V21/Version210.php +++ b/app/Listeners/Update/V21/Version210.php @@ -129,16 +129,18 @@ class Version210 extends Listener ); foreach ($invoices as $invoice) { - $documentId = DB::table('documents') + $document = DB::table('documents') ->where('document_number', $invoice->invoice_number) ->where('deleted_at', $invoice->deleted_at) ->where('company_id', $invoice->company_id) ->where('type', Document::INVOICE_TYPE) - ->first() - ->id; + ->first('id'); - DB::table('credits_transactions') - ->where('id', $invoice->credits_transactions_id)->update(['document_id' => $documentId]); + if ($document) { + DB::table('credits_transactions') + ->where('id', $invoice->credits_transactions_id) + ->update(['document_id' => $document->id]); + } } $credit_notes = DB::table('credits_transactions') @@ -154,16 +156,18 @@ class Version210 extends Listener ); foreach ($credit_notes as $credit_note) { - $documentId = DB::table('documents') + $document = DB::table('documents') ->where('document_number', $credit_note->credit_note_number) ->where('deleted_at', $credit_note->deleted_at) ->where('company_id', $credit_note->company_id) ->where('type', self::CREDIT_NOTE_TYPE) - ->first() - ->id; + ->first('id'); - DB::table('credits_transactions') - ->where('id', $credit_note->credits_transactions_id)->update(['document_id' => $documentId]); + if ($document) { + DB::table('credits_transactions') + ->where('id', $credit_note->credits_transactions_id) + ->update(['document_id' => $document->id]); + } } } @@ -235,15 +239,17 @@ class Version210 extends Listener $builder->delete(); } - $documentType = DB::table($new_table)->orderBy('id')->first()->type; - // To be able to update TYPE_id relations - $this->addDocumentIdForeignKeys($documentType); + $document = DB::table($new_table)->orderBy('id')->first('type'); + if ($document) { + $this->addDocumentIdForeignKeys($document->type); + } // Update relation ids - DB::table($new_table) - ->orderByDesc('id') - ->increment('id', DB::table($table)->orderByDesc('id')->first()->id); + $document = DB::table($table)->orderByDesc('id')->first('id'); + if ($document) { + DB::table($new_table)->orderByDesc('id')->increment('id', $document->id); + } } $insertColumns = collect(Schema::getColumnListing($new_table));