ParseFilter: Komplexe Methoden ermöglichen, die auch den Key ändern

diff --git a/SL/Controller/Helper/ParseFilter.pm b/SL/Controller/Helper/ParseFilter.pm
index 699011d01753bb8841f38ff944244206f76b7d29..2ff97987c727fef8b0520b4edd1add46a711201a 100644 (file)
--- a/SL/Controller/Helper/ParseFilter.pm
+++ b/SL/Controller/Helper/ParseFilter.pm
@@ -12,6 +12,14 @@ use SL::MoreCommon qw(listify);
 use Data::Dumper;
 use Text::ParseWords;
 
 use Data::Dumper;
 use Text::ParseWords;
 

+sub _lazy_bool_eq {
+  my ($key, $value) = @_;
+
+  return ()                                   if ($value // '') eq '';
+  return (or => [ $key => undef, $key => 0 ]) if !$value;
+  return ($key => 1);
+}
+

 my %filters = (
   date    => sub { DateTime->from_lxoffice($_[0]) },
   number  => sub { $::form->parse_amount(\%::myconfig, $_[0]) },
 my %filters = (
   date    => sub { DateTime->from_lxoffice($_[0]) },
   number  => sub { $::form->parse_amount(\%::myconfig, $_[0]) },


@@ -32,6 +40,10 @@ my %methods = (
   } qw(similar match imatch regex regexp like ilike rlike is is_not ne eq lt gt le ge),
 );
 
   } qw(similar match imatch regex regexp like ilike rlike is is_not ne eq lt gt le ge),
 );
 

+my %complex_methods = (
+  lazy_bool_eq => \&_lazy_bool_eq,
+);
+

 sub parse_filter {
   my ($filter, %params) = @_;
 
 sub parse_filter {
   my ($filter, %params) = @_;
 


@@ -99,12 +111,13 @@ sub _parse_filter {
 
   $flattened = _collapse_indirect_filters($flattened);
 
 
   $flattened = _collapse_indirect_filters($flattened);
 

-  my $all_filters = { %filters, %{ $params{filters} || {} } };
-  my $all_methods = { %methods, %{ $params{methods} || {} } };
+  my $all_filters = { %filters,         %{ $params{filters}         || {} } };
+  my $all_methods = { %methods,         %{ $params{methods}         || {} } };
+  my $all_complex = { %complex_methods, %{ $params{complex_methods} || {} } };

 
   my @result;
   for (my $i = 0; $i < scalar @$flattened; $i += 2) {
 
   my @result;
   for (my $i = 0; $i < scalar @$flattened; $i += 2) {

-    my (@args, @filters, @methods);
+    my (@args, @filters, $method);

 
     my ($key, $value) = ($flattened->[$i], $flattened->[$i+1]);
     my ($type, $op)   = $key =~ m{:(.+)::(.+)};
 
     my ($key, $value) = ($flattened->[$i], $flattened->[$i+1]);
     my ($type, $op)   = $key =~ m{:(.+)::(.+)};


@@ -112,7 +125,7 @@ sub _parse_filter {
     my $is_multi      = $key =~ s/:multi//;
     my @value_tokens  = $is_multi ? parse_line('\s+', 0, $value) : ($value);
 
     my $is_multi      = $key =~ s/:multi//;
     my @value_tokens  = $is_multi ? parse_line('\s+', 0, $value) : ($value);
 

-    ($key, @methods)  = split m{::}, $key;
+    ($key, $method)   = split m{::}, $key, 2;

     ($key, @filters)  = split m{:},  $key;
 
     my $orig_key      = $key;
     ($key, @filters)  = split m{:},  $key;
 
     my $orig_key      = $key;


@@ -121,7 +134,8 @@ sub _parse_filter {
       $key                 = $orig_key;
 
       $value_token         = _apply($value_token, $_, $all_filters) for @filters;
       $key                 = $orig_key;
 
       $value_token         = _apply($value_token, $_, $all_filters) for @filters;

-      $value_token         = _apply($value_token, $_, $all_methods) for @methods;
+      $value_token         = _apply($value_token, $method, $all_methods)                                 if $method && exists $all_methods->{$method};
+      ($key, $value_token) = _apply_complex($key, $value_token, $method, $all_complex)                   if $method && exists $all_complex->{$method};

       ($key, $value_token) = _dispatch_custom_filters($params{class}, $with_objects, $key, $value_token) if $params{class};
       ($key, $value_token) = _apply_value_filters($key, $value_token, $type, $op);
 
       ($key, $value_token) = _dispatch_custom_filters($params{class}, $with_objects, $key, $value_token) if $params{class};
       ($key, $value_token) = _apply_value_filters($key, $value_token, $type, $op);
 


@@ -246,6 +260,12 @@ sub _apply {
   return $filters->{$name}->($value);
 }
 
   return $filters->{$name}->($value);
 }
 

+sub _apply_complex {
+  my ($key, $value, $name, $filters) = @_;
+  return $key, $value unless $name && $filters->{$name};
+  return $filters->{$name}->($key, $value);
+}
+

 1;
 
 __END__
 1;
 
 __END__


@@ -445,6 +465,13 @@ standard SQL C<=> operator.
 
 All these are recognized like the L<Rose::DB::Object> methods.
 
 
 All these are recognized like the L<Rose::DB::Object> methods.
 

+=item lazu_bool_eq
+
+If the value is undefined or an empty string then this parameter will
+be completely removed from the query. Otherwise a falsish filter value
+will match for C<NULL> and C<FALSE>; trueish values will only match
+C<TRUE>.
+

 =back
 
 =head1 BUGS AND CAVEATS
 =back
 
 =head1 BUGS AND CAVEATS

diff --git a/t/controllers/helpers/parse_filter.t b/t/controllers/helpers/parse_filter.t
index aa8856ab42d83af5372e45855ef3a7daea4cabc1..2c10d036b79f22ca7c6357ca36f491c9d7dfc74f 100644 (file)
--- a/t/controllers/helpers/parse_filter.t
+++ b/t/controllers/helpers/parse_filter.t
@@ -1,6 +1,6 @@
 use lib 't';
 
 use lib 't';
 

-use Test::More tests => 37;
+use Test::More tests => 38;

 use Test::Deep;
 use Data::Dumper;
 
 use Test::Deep;
 use Data::Dumper;
 


@@ -405,3 +405,18 @@ test {
     'orderitems.part.test' => { 'what', { ilike => '%2%' } },
   ]
 }, 'relationship + additional tokens + filters + methods', class => 'SL::DB::Manager::Order';
     'orderitems.part.test' => { 'what', { ilike => '%2%' } },
   ]
 }, 'relationship + additional tokens + filters + methods', class => 'SL::DB::Manager::Order';

+
+test {
+  part => {
+    'obsolete::lazy_bool_eq' => '0',
+  },
+}, {
+  query => [
+      or => [
+        'part.obsolete' => undef,
+        'part.obsolete' => 0
+      ],
+  ],
+  with_objects => [ 'part' ],
+}, 'complex methods modifying the key';
+