[ci] save in file and redis

Author: mat-fs

lib/Data/Validate/Sanctions/Redis.pm

@@ -5,15 +5,17 @@ use warnings;
 
 use parent 'Data::Validate::Sanctions';
 
-require Exporter;
-our @ISA       = qw(Exporter);
-our @EXPORT_OK = qw/is_sanctioned set_sanction_file get_sanction_file/;
-
 use Data::Validate::Sanctions::Fetcher;
 use Scalar::Util qw(blessed);
 use List::Util qw(max);
 use JSON::MaybeUTF8 qw(encode_json_utf8 decode_json_utf8);
 
+require Exporter;
+our @ISA       = qw(Exporter);
+our @EXPORT_OK = qw/is_sanctioned set_sanction_file get_sanction_file/;
+
+my $sanction_file = Data::Validate::Sanctions::_default_sanction_file();
+
 # VERSION
 
 my $instance;
@@ -24,7 +26,8 @@ sub new {
     return $instance if $instance;
 
     my $self = {};
-    $self->{redis_read} = $args{redis_read} or die 'Redis read connection is missing';
+    $self->{sanction_file} = $args{sanction_file} // Data::Validate::Sanctions::_default_sanction_file();
+    $self->{redis_read}  = $args{redis_read}  or die 'Redis read connection is missing';
     $self->{redis_write} = $args{redis_write} or die 'Redis write connection is missing';
 
     $self->{sources} = [keys Data::Validate::Sanctions::Fetcher::config(eu_token => 'dummy')->%*];
@@ -47,14 +50,6 @@ sub last_updated {
     }
 }
 
-sub set_sanction_file {
-    die 'Not applicable';
-}
-
-sub get_sanction_file {
-    die 'Not applicable';
-}
-
 sub get_sanctioned_info {
     my $self = blessed($_[0]) ? shift : $instance;
 
@@ -64,31 +59,31 @@ sub get_sanctioned_info {
 }
 
 sub _load_data {
-    my $self                              = shift;
-
-    $self->{last_time}                    //= 0;
-    $self->{_data}                        //= {};
-    $self->{_sanctioned_name_tokens}      //= {};
-    $self->{_token_sanctioned_names}      //= {};
-    
-    my $last_time;
+    my $self = shift;
+
+    $self->{last_time}               //= 0;
+    $self->{_data}                   //= {};
+    $self->{_sanctioned_name_tokens} //= {};
+    $self->{_token_sanctioned_names} //= {};
+
+    my $last_time = $self->{last_time};
     for my $source ($self->{sources}->@*) {
-        my $updated = $self->{redis_read}->hget("SANCTIONS::$source", 'updated') // 0;
+        my $updated = $self->{redis_read}->hget("SANCTIONS::$source", 'published') // 0;
         next if $updated <= $self->{last_time};
 
         $self->{_data}->{$source}->{content} = decode_json_utf8($self->{redis_read}->hget("SANCTIONS::$source", 'content'));
         $self->{_data}->{$source}->{updated} = $updated;
-        $last_time = $updated if $updated > $last_time;
+        $last_time                           = $updated if $updated > $last_time;
     }
-    $self->{_last_time} = $last_time;
+    $self->{last_time} = $last_time;
 
     $self->_index_data();
 
     foreach my $sanctioned_name (keys $self->{_index}->%*) {
-        my @tokens = _clean_names($sanctioned_name);
+        my @tokens = Data::Validate::Sanctions::_clean_names($sanctioned_name);
         $self->{_sanctioned_name_tokens}->{$sanctioned_name} = \@tokens;
-        foreach my $token (@tokens){
-            $self->{_token_sanctioned_names}->{$token}->{$sanctioned_name}=1;
+        foreach my $token (@tokens) {
+            $self->{_token_sanctioned_names}->{$token}->{$sanctioned_name} = 1;
         }
     }
 
@@ -98,24 +93,21 @@ sub _load_data {
 sub _save_data {
     my $self = shift;
 
-    my $now = time;
+    Data::Validate::Sanctions::_save_data($self);
+
     for my $source ($self->{sources}->@*) {
         $self->{redis_write}->hmset(
-            "SANCTIONS::$source", 
-            'updated', $self->{_data}->{$source}->{updated}, 
-            'content', encode_json_utf8($self->{_data}->{$source}->{content}),
-            'fetched', $now,
-            'error',   $self->{_data}->{$source}->{error}
+            "SANCTIONS::$source",
+            'published' => $self->{_data}->{$source}->{updated},
+            'content' => encode_json_utf8($self->{_data}->{$source}->{content}),
+             $self->{_data}->{$source}->{error}? () : ('fetched' =>  $self->{last_time}),
+            'error'   => $self->{_data}->{$source}->{error},
         );
     }
 
     return;
 }
 
-sub _default_sanction_file {
-    die 'Not applicable';
-}
-
 1;
 __END__