feat(api): add order by for computer search and exclude groups from r…

…esult
OCSInventory-NG · Mar 18, 2024 · 689c8d5 · 689c8d5
1 parent f215b40
commit 689c8d5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/Api/Ocsinventory/Restapi/ApiCommon.pm b/Api/Ocsinventory/Restapi/ApiCommon.pm
@@ -269,10 +269,14 @@ sub get_item_main_table_informations{
 
 sub execute_custom_request{
 
-    my ($query, $start, $limit, @args) = @_;
+    my ($query, $start, $limit, $orderby, @args) = @_;
 
     my $database = api_database_connect();
 
+    if($orderby ne "") {
+        $query .= $orderby;
+    }
+
     if($start ne "" && $limit ne ""){
         $start =~ s/\D//g;
         $limit =~ s/\D//g;
@@ -299,14 +303,19 @@ sub format_query_for_computer_search{
   my @args;
   my $start = "";
   my $limit = "";
-
+  my $orderby = "";
 
   foreach my $hash_ref (@args_array) {
       foreach (keys %{$hash_ref}) {
         if(lc($_) eq "limit"){
           $limit = ${$hash_ref}{$_};
         }elsif (lc($_) eq "start"){
           $start = ${$hash_ref}{$_};
+        }elsif (lc($_) eq "orderby"){
+            my ($field, $order) = split /;/, ${$hash_ref}{$_};
+            $field =~ tr/a-zA-Z//dc ;
+            $order =~ tr/a-zA-Z//dc ;
+            $orderby = " ORDER BY $field $order ";
         }elsif (${$hash_ref}{$_} eq "null"){
           $field_name = $_;
           $field_name =~ tr/a-zA-Z//dc ;
@@ -320,9 +329,13 @@ sub format_query_for_computer_search{
       }
   }
 
+  # Exclude group from the result
+  $query_string .= " deviceid <> ? AND";
+  push @args, "_SYSTEMGROUP_";
+
   $query_string = substr($query_string, 0, -3);
 
-  return execute_custom_request($query_string, $start, $limit, @args);
+  return execute_custom_request($query_string, $start, $limit, $orderby, @args);
 
 }
 

diff --git a/Api/Ocsinventory/Restapi/Ipdiscover/Get/IpdiscoverNetwork.pm b/Api/Ocsinventory/Restapi/Ipdiscover/Get/IpdiscoverNetwork.pm
@@ -20,7 +20,7 @@ sub get_ipdiscover_network{
 
     my @args = ($network);
 
-    my $netmaps = Api::Ocsinventory::Restapi::ApiCommon::execute_custom_request($query, "", "", @args);
+    my $netmaps = Api::Ocsinventory::Restapi::ApiCommon::execute_custom_request($query, "", "", "", @args);
 
     return to_json($netmaps);
 }

diff --git a/Api/Ocsinventory/Restapi/Ipdiscover/Get/IpdiscoverTag.pm b/Api/Ocsinventory/Restapi/Ipdiscover/Get/IpdiscoverTag.pm
@@ -19,7 +19,7 @@ sub get_ipdiscover_tag{
     my $query = "SELECT * from `netmap` WHERE TAG = ?";
     my @args = ($tag);
 
-    my $netmaps = Api::Ocsinventory::Restapi::ApiCommon::execute_custom_request($query, "", "", @args);
+    my $netmaps = Api::Ocsinventory::Restapi::ApiCommon::execute_custom_request($query, "", "", "", @args);
 
     return to_json($netmaps);
 }