tighten up the logic of fuzzy search to eliminate redundant matches

Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm

@@ -279,19 +279,23 @@ sub search_fuzzy {
       unless $q;
     $q = "\%$q\%" if $q !~ m/\%/;
 
-    # basic IP check is a string match
+    # basic check is a string match
-    my $ip_clause = [
+    my @ip_clause = (
-        'me.ip::text'  => { '-ilike' => $q },
+        'me.name'     => { '-ilike' => $q },
+        'me.dns'      => { '-ilike' => $q },
+        'me.ip::text' => { '-ilike' => $q },
+        'device_ips.dns' => { '-ilike' => $q },
         'device_ips.alias::text' => { '-ilike' => $q },
-    ];
+    );
 
     # but also allow prefix search
     (my $qc = $q) =~ s/\%//g;
     if (my $ip = NetAddr::IP::Lite->new($qc)) {
-        $ip_clause = [
+        @ip_clause = (
+            # exclude check on name and dns fields
             'me.ip'  => { '<<=' => $ip->cidr },
             'device_ips.alias' => { '<<=' => $ip->cidr },
-        ];
+        );
     }
 
     return $rs->search(
@@ -300,17 +304,12 @@ sub search_fuzzy {
           'me.contact'  => { '-ilike' => $q },
           'me.serial'   => { '-ilike' => $q },
           'me.location' => { '-ilike' => $q },
-          'me.name'     => { '-ilike' => $q },
           'me.description' => { '-ilike' => $q },
-          -or => [
+          @ip_clause,
-            'me.dns'      => { '-ilike' => $q },
-            'device_ips.dns' => { '-ilike' => $q },
-          ],
-          -or => $ip_clause,
         ],
       },
       {
-        order_by => [qw/ me.dns me.ip /],
+        order_by => { -desc => 'me.creation' },
         join => 'device_ips',
         distinct => 1,
       }