From 11f9adf11a0703f7b4b64df13796cb8b6b7d03a3 Mon Sep 17 00:00:00 2001 From: Deon George Date: Tue, 19 Sep 2023 17:28:25 +1000 Subject: [PATCH] Fix seenby sort order, with flatten domains --- app/Models/Address.php | 8 ++++++++ app/Models/Echomail.php | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/Models/Address.php b/app/Models/Address.php index 277f187..981560b 100644 --- a/app/Models/Address.php +++ b/app/Models/Address.php @@ -80,6 +80,14 @@ class Address extends Model ->orderBy('point_id'); } + public function scopeFTN2DOrder($query) + { + return $query + ->orderBy('host_id') + ->orderBy('node_id') + ->orderBy('point_id'); + } + /* RELATIONS */ /** diff --git a/app/Models/Echomail.php b/app/Models/Echomail.php index 43a2b55..37c9994 100644 --- a/app/Models/Echomail.php +++ b/app/Models/Echomail.php @@ -138,7 +138,7 @@ final class Echomail extends Model implements Packet public function seenby() { return $this->belongsToMany(Address::class,'echomail_seenby') - ->ftnOrder(); + ->FTN2DOrder(); } public function path()