From 236fb97d866ae6d9e7bb8a0ac3b64b99a0ea0de9 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Fri, 27 Dec 2019 17:03:16 +0100
Subject: [PATCH] Bug 23893: Remove Overloaded method from Koha::Patron

That way we are dealing with any date fields for any Koha::Object

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
---
 Koha/Object.pm | 15 ++++++++++-----
 Koha/Patron.pm | 25 -------------------------
 2 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/Koha/Object.pm b/Koha/Object.pm
index 42524f274d..766cdd801a 100644
--- a/Koha/Object.pm
+++ b/Koha/Object.pm
@@ -479,14 +479,19 @@ sub attributes_from_api {
     my $from_api_mapping = $self->from_api_mapping;
 
     my $params;
+    my $columns_info = $self->_result->result_source->columns_info;
 
     while (my ($key, $value) = each %{ $from_api_params } ) {
-        if ( exists $from_api_mapping->{$key} ) {
-            $params->{$from_api_mapping->{$key}} = $value;
-        }
-        else {
-            $params->{$key} = $value;
+        my $koha_field_name =
+          exists $from_api_mapping->{$key}
+          ? $from_api_mapping->{$key}
+          : $key;
+
+        if ( _date_or_datetime_column_type( $columns_info->{$koha_field_name}->{data_type} ) ) {
+            $value = dt_from_string($value, 'rfc3339');
         }
+
+        $params->{$koha_field_name} = $value;
     }
 
     return $params;
diff --git a/Koha/Patron.pm b/Koha/Patron.pm
index 775ccd6d85..46a5bd4bca 100644
--- a/Koha/Patron.pm
+++ b/Koha/Patron.pm
@@ -1570,31 +1570,6 @@ sub to_api {
     return $json_patron;
 }
 
-=head3 attributes_from_api
-
-    my $attrs = $patron->attributes_from_api( $attrs );
-
-Overloaded method that implement specific data transformations after
-calling the original Koha::Object->attributes_from_api method.
-
-=cut
-
-sub attributes_from_api {
-    my ( $self, $attrs ) = @_;
-
-    $attrs = $self->SUPER::attributes_from_api( $attrs );
-
-    if ( exists $attrs->{lastseen} ) {
-        $attrs->{lastseen} = dt_from_string($attrs->{lastseen}, 'rfc3339');
-    }
-
-    if ( exists $attrs->{updated_on} ) {
-        $attrs->{updated_on} = dt_from_string($attrs->{updated_on}, 'rfc3339');
-    }
-
-    return $attrs;
-}
-
 =head3 to_api_mapping
 
 This method returns the mapping for representing a Koha::Patron object
-- 
2.39.5