diff --git a/app/Helpers/Collector/Extensions/MetaCollection.php b/app/Helpers/Collector/Extensions/MetaCollection.php index 5c1ad48277..352c76ccdb 100644 --- a/app/Helpers/Collector/Extensions/MetaCollection.php +++ b/app/Helpers/Collector/Extensions/MetaCollection.php @@ -167,6 +167,7 @@ trait MetaCollection $this->joinMetaDataTables(); $this->query->where('journal_meta.name', '=', 'external_id'); $this->query->where('journal_meta.data', '!=', sprintf('%s', json_encode($externalId))); + $this->query->whereNull('journal_meta.deleted_at'); return $this; } @@ -405,7 +406,7 @@ trait MetaCollection $this->joinMetaDataTables(); $this->query->where('journal_meta.name', '=', 'internal_reference'); $this->query->whereLike('journal_meta.data', sprintf('%%%s%%', $internalReference)); - + $this->query->whereNull('journal_meta.deleted_at'); return $this; } @@ -417,7 +418,7 @@ trait MetaCollection $this->joinMetaDataTables(); $this->query->where('journal_meta.name', '=', 'internal_reference'); $this->query->whereNotLike('journal_meta.data', sprintf('%%%s%%', $internalReference)); - + $this->query->whereNull('journal_meta.deleted_at'); return $this; } @@ -429,7 +430,7 @@ trait MetaCollection $this->joinMetaDataTables(); $this->query->where('journal_meta.name', '=', 'internal_reference'); $this->query->whereNotLike('journal_meta.data', sprintf('%%%s"', $internalReference)); - + $this->query->whereNull('journal_meta.deleted_at'); return $this; } @@ -441,7 +442,7 @@ trait MetaCollection $this->joinMetaDataTables(); $this->query->where('journal_meta.name', '=', 'internal_reference'); $this->query->whereLike('journal_meta.data', sprintf('"%s%%', $internalReference)); - + $this->query->whereNull('journal_meta.deleted_at'); return $this; } @@ -453,7 +454,7 @@ trait MetaCollection $this->joinMetaDataTables(); $this->query->where('journal_meta.name', '=', 'internal_reference'); $this->query->whereLike('journal_meta.data', sprintf('%%%s"', $internalReference)); - + $this->query->whereNull('journal_meta.deleted_at'); return $this; } @@ -465,7 +466,7 @@ trait MetaCollection $this->joinMetaDataTables(); $this->query->where('journal_meta.name', '=', 'internal_reference'); $this->query->whereLike('journal_meta.data', sprintf('"%s%%', $internalReference)); - + $this->query->whereNull('journal_meta.deleted_at'); return $this; } @@ -697,7 +698,7 @@ trait MetaCollection $this->joinMetaDataTables(); $this->query->where('journal_meta.name', '=', 'external_id'); $this->query->where('journal_meta.data', '=', sprintf('%s', json_encode($externalId))); - + $this->query->whereNull('journal_meta.deleted_at'); return $this; } @@ -706,7 +707,7 @@ trait MetaCollection $this->joinMetaDataTables(); $this->query->where('journal_meta.name', '=', 'external_url'); $this->query->where('journal_meta.data', '=', json_encode($url)); - + $this->query->whereNull('journal_meta.deleted_at'); return $this; } @@ -718,7 +719,7 @@ trait MetaCollection $this->joinMetaDataTables(); $this->query->where('journal_meta.name', '=', 'internal_reference'); $this->query->where('journal_meta.data', '=', sprintf('%s', json_encode($internalReference))); - + $this->query->whereNull('journal_meta.deleted_at'); return $this; } @@ -727,7 +728,7 @@ trait MetaCollection $this->joinMetaDataTables(); $this->query->where('journal_meta.name', '=', 'recurrence_id'); $this->query->where('journal_meta.data', '=', sprintf('%s', json_encode($recurringId))); - + $this->query->whereNull('journal_meta.deleted_at'); return $this; } @@ -862,6 +863,7 @@ trait MetaCollection $this->joinMetaDataTables(); $this->query->where('journal_meta.name', '=', 'external_id'); $this->query->whereNotNull('journal_meta.data'); + $this->query->whereNull('journal_meta.deleted_at'); return $this; } @@ -871,6 +873,7 @@ trait MetaCollection $this->joinMetaDataTables(); $this->query->where('journal_meta.name', '=', 'external_url'); $this->query->whereNotNull('journal_meta.data'); + $this->query->whereNull('journal_meta.deleted_at'); return $this; } @@ -915,10 +918,13 @@ trait MetaCollection $q1->where(static function (Builder $q2): void { $q2->where('journal_meta.name', '=', 'external_id'); $q2->whereNull('journal_meta.data'); + $q2->whereNull('journal_meta.deleted_at'); })->orWhere(static function (Builder $q3): void { $q3->where('journal_meta.name', '!=', 'external_id'); + $q3->whereNull('journal_meta.deleted_at'); })->orWhere(static function (Builder $q4): void { $q4->whereNull('journal_meta.name'); + $q4->whereNull('journal_meta.deleted_at'); }); }); @@ -933,10 +939,13 @@ trait MetaCollection $q1->where(static function (Builder $q2): void { $q2->where('journal_meta.name', '=', 'external_url'); $q2->whereNull('journal_meta.data'); + $q2->whereNull('journal_meta.deleted_at'); })->orWhere(static function (Builder $q3): void { $q3->where('journal_meta.name', '!=', 'external_url'); + $q3->whereNull('journal_meta.deleted_at'); })->orWhere(static function (Builder $q4): void { $q4->whereNull('journal_meta.name'); + $q4->whereNull('journal_meta.deleted_at'); }); });