Changeset 2433

Timestamp:

07/03/20 09:49:38 (4 years ago)

Author:

nanardon

Message:

Fix search results with opFilter

Location:

trunk/LATMOS-Accounts

Files:

• lib/LATMOS/Accounts/Bases/Sql/User.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Bases/Sql/objects.pm (modified) (4 diffs)
• live-test/10_sql.t (modified) (2 diffs)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm

@@ -1834 +1834 @@
 
     if (%changes) {
-        if (my $cres += $self->set_fields(%changes)) {
+        if (my $cres += $self->set_fields(%changes) || 0) {
             $res += $cres;
             $self->base->log(LA_NOTICE, "Updating user %s to match unemployment", $self->id);

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm

@@ -1106 +1106 @@
     # foo=1 bar=1 => foo =1 and bar = 2
     my $results = {};
+    my @attrsKeys = ();
     my $noalias = 0;
 
@@ -1146 +1147 @@
             }
         }
-        my $attrKey = $attr;
+
+        $OpFilter ||= '';
+        my $attrKey = $OpFilter . $attr;
 
         if ($attrref) {
@@ -1180 +1183 @@
         }
 
+        unshift(@attrsKeys, { key => $attrKey, op => $OpFilter || '' }) unless($results->{$attrKey});
+        $results->{$attrKey} ||= {};
         if ($OpFilter eq '-') {
             # Filter result to filter from attribute result
-            $results->{$attrKey} ||= {};
             $results->{$attrKey}{$_} = -1 foreach (@results);
         } elsif ($OpFilter eq '+') {
             # Filter result to filter from attribute result
-            $results->{$attrKey} ||= {};
-            $results->{$attrKey}{$_} = 1 foreach (@results);
+            $results->{$attrKey}{$_} = 2 foreach (@results);
         } else {
-            $results->{$attrKey} ||= {};
             $results->{$attrKey}{$_} ||=  1 foreach (@results);
         }
@@ -1195 +1197 @@
 
     # Merging filter result
-
-    my %mresults = map { $_ => 1 } $base->list_objects($class->type);
-
-    foreach my $attr (keys %{ $results }) {
-        my @values = keys %mresults;
-        foreach my $value (sort(@values)) {
-            my $v = $results->{$attr}{$value} || 0;
-            if ( $v < 1 ) {
-               delete($mresults{$value});
+    my @Results;
+
+    {
+        my @allObjects = $base->list_objects($class->type);
+
+        foreach my $obj (sort @allObjects) {
+            my $retain = 1;
+            foreach my $attrInfo (@attrsKeys) {
+                my $attr = $attrInfo->{key};
+                my $v = $results->{$attr}{$obj} || 0;
+                if ( $v < 0 ) {
+                    $retain = -1;
+                    last;
+                } elsif ( $v == 0 ) {
+                    $retain = 0 if ($retain == 1 && $attrInfo->{op} ne '+');
+                } elsif ( $v >= 2 ) {
+                    $retain = 2;
+                    last;
+                }
             }
-
+            push(@Results, $obj) if ($retain > 0);
         }
     }
 
     # We add to result aliases pointing to these object:
-    if(scalar(keys %mresults) && !$noalias) {
-        my @alias = $class->_search_uniq_filter($base, 'oalias', '=', join('||', keys %mresults));
-        foreach(@alias) {
-            $mresults{$_} = 1;
-        }
-    }
-
-    return(sort keys %mresults);
+    if(scalar(@Results) && !$noalias) {
+        my @alias = $class->_search_uniq_filter($base, 'oalias', '=', join('||', @Results));
+        push(@Results, sort(@alias));
+    }
+
+    return(@Results);
 }
 

trunk/LATMOS-Accounts/live-test/10_sql.t

@@ -18 +18 @@
     plan skip_all => 'No SQL base defined';
 } else {
-    plan tests => 107; # Number of test
+    plan tests => 110; # Number of test
 }
 
@@ -360 +360 @@
     ), 'Can search using ~ operator');
 
+    diag('Testing filter operator');
+
+    ok(eq_set(
+        [ $base->search_objects('user', 'givenName=Firstnameb', '+memberOf=searchga') ],
+        [ qw(searchuaa searchuab searchuba searchubb) ]
+    ), 'Can search using filter operator +');
+    ok(eq_set(
+        [ $base->search_objects('user', 'givenName=Firstnameb', '-memberOf=searchgb') ],
+        [ ]
+    ), 'Can search using filter operator -');
+    ok(eq_set(
+        [ $base->search_objects('user', 'memberOf=searchga', '!memberOf=searchgb') ],
+        [ qw(searchuba) ]
+    ), 'Can search using filter operator !');
+
     ok($base->delete_object('user', 'searchuaa'), "deleting user searchuaa");
     ok($base->delete_object('user', 'searchuna'), "deleting user searchuna");