Skip to content

Commit c807971

Browse files
authored
fix: fix import address vcard and update queue pruning commands (#7777)
1 parent 3ccb3dc commit c807971

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

app/Domains/Contact/ManageContact/Dav/ImportAddress.php

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,12 @@ private function updateAddress(Property $adr, Address $address, ?AddressType $ad
9696
'author_id' => $this->author()->id,
9797
'address_id' => $address->id,
9898
'address_type_id' => optional($addressType)->id,
99-
'line_1' => $adr->getParts()[1],
100-
'line_2' => $adr->getParts()[2],
101-
'city' => $adr->getParts()[3],
102-
'province' => $adr->getParts()[4],
103-
'postal_code' => $adr->getParts()[5],
104-
'country' => $adr->getParts()[6],
99+
'line_1' => Arr::get($adr->getParts(), 1),
100+
'line_2' => Arr::get($adr->getParts(), 2),
101+
'city' => Arr::get($adr->getParts(), 3),
102+
'province' => Arr::get($adr->getParts(), 4),
103+
'postal_code' => Arr::get($adr->getParts(), 5),
104+
'country' => Arr::get($adr->getParts(), 6),
105105
]);
106106
}
107107

@@ -110,12 +110,12 @@ private function createAddress(Contact $contact, Property $adr, ?AddressType $ad
110110
$address = Address::where([
111111
'vault_id' => $this->vault()->id,
112112
'address_type_id' => optional($addressType)->id,
113-
'line_1' => $adr->getParts()[1],
114-
'line_2' => $adr->getParts()[2],
115-
'city' => $adr->getParts()[3],
116-
'province' => $adr->getParts()[4],
117-
'postal_code' => $adr->getParts()[5],
118-
'country' => $adr->getParts()[6],
113+
'line_1' => Arr::get($adr->getParts(), 1),
114+
'line_2' => Arr::get($adr->getParts(), 2),
115+
'city' => Arr::get($adr->getParts(), 3),
116+
'province' => Arr::get($adr->getParts(), 4),
117+
'postal_code' => Arr::get($adr->getParts(), 5),
118+
'country' => Arr::get($adr->getParts(), 6),
119119
])->first();
120120

121121
if ($address === null) {
@@ -124,12 +124,12 @@ private function createAddress(Contact $contact, Property $adr, ?AddressType $ad
124124
'vault_id' => $this->vault()->id,
125125
'author_id' => $this->author()->id,
126126
'address_type_id' => optional($addressType)->id,
127-
'line_1' => $adr->getParts()[1],
128-
'line_2' => $adr->getParts()[2],
129-
'city' => $adr->getParts()[3],
130-
'province' => $adr->getParts()[4],
131-
'postal_code' => $adr->getParts()[5],
132-
'country' => $adr->getParts()[6],
127+
'line_1' => Arr::get($adr->getParts(), 1),
128+
'line_2' => Arr::get($adr->getParts(), 2),
129+
'city' => Arr::get($adr->getParts(), 3),
130+
'province' => Arr::get($adr->getParts(), 4),
131+
'postal_code' => Arr::get($adr->getParts(), 5),
132+
'country' => Arr::get($adr->getParts(), 6),
133133
]);
134134
}
135135

routes/console.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
*/
1919

2020
Schedule::command('model:prune', 'daily');
21-
Schedule::command('queue:prune-batches', 'daily');
22-
Schedule::command('queue:prune-failed', 'daily');
21+
Schedule::command('queue:prune-batches --hours=48 --unfinished=72 --cancelled=72', 'daily');
22+
Schedule::command('queue:prune-failed --hours=48', 'daily');
2323
if (config('telescope.enabled')) {
2424
Schedule::command('telescope:prune', 'daily');
2525
}

0 commit comments

Comments
 (0)