Bugzilla – Attachment 157115 Details for
Bug 23260
Anonymize (remove) patron data from items_last_borrower
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23260: (follow-up) Add anonymise_last_borrowers method to Patrons.pm
Bug-23260-follow-up-Add-anonymiselastborrowers-met.patch (text/plain), 7.07 KB, created by
Nick Clemens (kidclamp)
on 2023-10-13 15:32:22 UTC
(
hide
)
Description:
Bug 23260: (follow-up) Add anonymise_last_borrowers method to Patrons.pm
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2023-10-13 15:32:22 UTC
Size:
7.07 KB
patch
obsolete
>From 6a240cf9a22c7d7083b81f6c17237db032d19d9b Mon Sep 17 00:00:00 2001 >From: Agustin Moyano <agustinmoyano@theke.io> >Date: Fri, 30 Oct 2020 13:18:16 -0300 >Subject: [PATCH] Bug 23260: (follow-up) Add anonymise_last_borrowers method to > Patrons.pm > >This patch adds the method anonymise_last_borrowers in Patrons.pm. > >To test: >1) apply this patch and the previous ones >2) perl installer/data/mysql/updatedatabase.pl >3) set StoreLastBorrower preference to Allow. >4) set AnonymousPatron preference to a valid patron id >5) Create a Check out followed by a Check in. >CHECK => a row should appear in items_last_borrower table with the borrower and the item number. >6) In mysql, update created_on of items_last_borrower and returndate of old_issues to two days earlier. >7) perl misc/cronjobs/anonymise_last_borrowers.pl >CHECK => borrower number in items_last_borrower is not anonymised yet. >8) Repeat step 5 and 6 but instead of two days earlier, set the new entry in items_last_borrower to three days eralier. >9) set AnonymiseLastBorrower to 'Anonymise' and AnonymiseLastBorrowerDays to 2 days. >10) perl misc/cronjobs/anonymise_last_borrowers.pl >SUCCESS => borrower number in items_last_borrower changed to AnonymousPatron id >11) repeat step 8 >12) set AnonymousPatron preference to 0 >13) perl misc/cronjobs/anonymise_last_borrowers.pl >SUCCESS => borrower number in items_last_borrower changed to null >14) prove t/db_dependent/Koha/Patrons.t >--- > Koha/Patrons.pm | 114 +++++++++++++++++++++++++++++------------------- > 1 file changed, 69 insertions(+), 45 deletions(-) > >diff --git a/Koha/Patrons.pm b/Koha/Patrons.pm >index 40defcff5d..d2fd2980fb 100644 >--- a/Koha/Patrons.pm >+++ b/Koha/Patrons.pm >@@ -28,6 +28,7 @@ use Koha::ArticleRequests; > use Koha::Patron; > use Koha::Exceptions::Patron; > use Koha::Patron::Categories; >+use Date::Calc qw( Today Add_Delta_Days); > > use base qw(Koha::Objects); > >@@ -162,11 +163,9 @@ sub search_patrons_to_anonymise { > > Koha::Patrons->search->anonymise_issue_history( { [ before => $older_than_date ] } ); > >-Anonymise issue history (old_issues and items_last_borrowers) for all issues older >-than the given date (optional). >- >+Anonymise issue history (old_issues) for all patrons older than the given date (optional). > To make sure all the conditions are met, the caller has the responsibility to >-call search_patrons_to_anonymise to filter the Koha::Patrons set. >+call search_patrons_to_anonymise to filter the Koha::Patrons set > > =cut > >@@ -177,13 +176,6 @@ sub anonymise_issue_history { > > $older_than_date = dt_from_string $older_than_date if $older_than_date; > >- my $filter_damaged = >- C4::Context->preference("KeepDamagedCheckouts") || 0; >- my $filter_lost = >- C4::Context->preference("KeepLostCheckouts") || 0; >- my $filter_withdrawn = >- C4::Context->preference("KeepWithdrawnCheckouts") || 0; >- > # The default of 0 does not work due to foreign key constraints > # The anonymisation should not fail quietly if AnonymousPatron is not a valid entry > # Set it to undef (NULL) >@@ -191,47 +183,79 @@ sub anonymise_issue_history { > my $nb_rows = 0; > while ( my $patron = $self->next ) { > my $old_issues_to_anonymise = $patron->old_checkouts->search( >- { >- ( >- $older_than_date >- ? ( returndate => >- { '<' => $dtf->format_datetime($older_than_date) } ) >- : () >- ), >- ( $filter_damaged ? ( "itemnumber.damaged" => 0 ) : () ), >- ( $filter_lost ? ( "itemnumber.itemlost" => 0 ) : () ), >- ( $filter_withdrawn ? ( "itemnumber.withdrawn" => 0 ) : () ) >- }, >- { >- join => ['itemnumber'] >- } >+ { >+ ( >+ $older_than_date >+ ? ( returndate => >+ { '<' => $dtf->format_datetime($older_than_date) } ) >+ : () >+ ) >+ } > ); >- >- my $last_borrowers_to_anonymise = >- $patron->_result->items_last_borrowers->search( >- { >- ( >- $older_than_date >- ? ( created_on => >- { '<' => $dtf->format_datetime($older_than_date) } ) >- : (), >- ), >- ( $filter_damaged ? ( "itemnumber.damaged" => 0 ) : () ), >- ( $filter_lost ? ( "itemnumber.itemlost" => 0 ) : () ), >- ( $filter_withdrawn ? ( "itemnumber.withdrawn" => 0 ) : () ) >- }, >- { >- join => ['itemnumber'] >- } >- ); >- > my $anonymous_patron = C4::Context->preference('AnonymousPatron') || undef; > $nb_rows += $old_issues_to_anonymise->update( { 'old_issues.borrowernumber' => $anonymous_patron } ); >- $last_borrowers_to_anonymise->update( { 'items_last_borrower.borrowernumber' => $anonymous_patron } ); > } > return $nb_rows; > } > >+ >+=head3 anonymise_last_borrowers >+ >+ Koha::Patrons->search->anonymise_last_borrowers(); >+ >+ Anonymise items last borrower for all items_last_borrower older >+ than AnonymiseLastBorrowerDays. >+ >+=cut >+ >+sub anonymise_last_borrowers { >+ my ( $self, $params ) = @_; >+ >+ return unless C4::Context->preference("AnonymiseLastBorrower"); >+ my $days = C4::Context->preference("AnonymiseLastBorrowerDays") || 0; >+ my ($year,$month,$day) = Today(); >+ my ($newyear,$newmonth,$newday) = Add_Delta_Days ($year,$month,$day,(-1)*$days); >+ my $older_than_date = dt_from_string(sprintf "%4d-%02d-%02d",$newyear,$newmonth,$newday); >+ >+ my $anonymous_patron = C4::Context->preference('AnonymousPatron') || undef; >+ >+ my $dtf = Koha::Database->new->schema->storage->datetime_parser; >+ my $rs = $self->_resultset->search( >+ { created_on => { '<' => $dtf->format_datetime($older_than_date), }, >+ 'items_last_borrowers.borrowernumber' => { 'not' => undef }, # Keep forever >+ ( $anonymous_patron ? ( 'items_last_borrowers.borrowernumber' => { '!=' => $anonymous_patron } ) : () ), >+ }, >+ { join => ["items_last_borrowers"], >+ distinct => 1, >+ } >+ ); >+ my $patrons = Koha::Patrons->_new_from_dbic($rs); >+ >+ my $nb_rows = 0; >+ while ( my $patron = $patrons->next ) { >+ my $last_borrowers_to_anonymise = >+ $patron->_result->items_last_borrowers->search( >+ { >+ ( >+ $older_than_date >+ ? ( created_on => >+ { '<' => $dtf->format_datetime($older_than_date) } ) >+ : (), >+ "itemnumber.damaged" => 0, >+ "itemnumber.itemlost" => 0, >+ "itemnumber.withdrawn" => 0, >+ ), >+ }, >+ { >+ join => ['itemnumber'] >+ } >+ ); >+ $nb_rows += $last_borrowers_to_anonymise->update( { 'items_last_borrower.borrowernumber' => $anonymous_patron } ); >+ } >+ >+ return $nb_rows; >+} >+ > =head3 delete > > Koha::Patrons->search({ some filters here })->delete({ move => 1 }); >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 23260
:
92863
|
92864
|
93052
|
94858
|
94859
|
95033
|
95457
|
95458
|
95459
|
95460
|
95651
|
95698
|
95699
|
95700
|
95701
|
95769
|
95770
|
95771
|
95772
|
96791
|
97841
|
97842
|
98044
|
98053
|
98054
|
98064
|
98282
|
98349
|
98352
|
112734
|
112735
|
112736
|
112737
|
112738
|
112739
|
112740
|
112741
|
112742
|
112743
|
117974
|
117975
|
117976
|
117977
|
117978
|
117979
|
117980
|
117981
|
117982
|
117983
|
120522
|
120523
|
120524
|
120525
|
120526
|
120527
|
120528
|
120529
|
120530
|
120531
|
122963
|
122964
|
122965
|
122966
|
122967
|
122968
|
122969
|
122970
|
122971
|
122972
|
145175
|
145176
|
145177
|
145178
|
145179
|
145180
|
145181
|
145182
|
145183
|
145184
|
157106
|
157107
|
157108
|
157109
|
157110
|
157111
|
157112
|
157113
|
157114
|
157115
|
157116
|
159291
|
159292
|
159293
|
159294
|
159298
|
159299
|
159300
|
159301
|
164129
|
164130
|
164131
|
164132
|
164133