gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 33028: (follow-up) Rewrite database update 

This rewrite the database update with some things in mind:

* We now use a positive value list of allowed characters to check
  This makes sure that all of those are recognized:
  1,00
  1.00€
  abc
* Instead of dying after finding one wrong value, we loop through
  all values first, building up an error string
* When we have errors... we die and print the full list of things
  that need fixing.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Katrin Fischer 2023-06-16 17:01:52 +00:00 committed by Tomas Cohen Arazi
parent 3c2d40bb4a
commit 0199f5fbbb
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
1 changed files with 17 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
installer/data/mysql/atomicupdate/fix_calc_fines_fr-currency_21-11-MT39815.pl
View File

@ -1,52 +1,32 @@
use Modern::Perl;
return {
bug_number => "BUG_33028",
description =>
"Fix calculations around fines and values with comma as decimal separator",
bug_number => "33028",
description => "Fix wrongly formatted values for monetary values in circulation rules",
up => sub {
my ($args) = @_;
my ( $dbh, $out ) = @$args{qw(dbh out)};
my ($dbh, $out) = @$args{qw(dbh out)};
my $rules = $dbh->selectall_arrayref(
q|select * from circulation_rules where rule_name IN ('fine', 'overduefinescap')|,
q|SELECT * FROM circulation_rules WHERE rule_name IN ('fine', 'overduefinescap', 'recall_overdue_fine', 'article_request_fee')|,
{ Slice => {} }
);
my $query = $dbh->prepare(
"UPDATE circulation_rules SET rule_value = ? where id = ?");
"UPDATE circulation_rules SET rule_value = ? WHERE id = ?");
foreach my $rule ( @{$rules} ) {
my $rule_id = $rule->{'id'};
my $rule_value = $rule->{'rule_value'};
if ( $rule_value =~ /[a-zA-Z]/ ) {
die(
sprintf(
'No only numbers in rule id %s ("%s") - fix it before restart this update',
$rule_id, $rule_value
)
);
my $error;
for my $rule ( @{$rules} ) {
my $library = defined($rule->{'branchcode'}) ? $rule->{'branchcode'} : "All";
my $category = defined($rule->{'categorycode'}) ? $rule->{'categorycode'} : "All";
my $itemtype = defined($rule->{'itemtype'}) ? $rule->{'itemtype'} : "All";
if ( !( $rule->{'rule_value'} =~ /^[0-9.]*$/ )) {
$error .= "Rule ID: $rule->{'id'} ($library-$category-$itemtype) \tRule: $rule->{'rule_name'}\tValue: $rule->{'rule_value'}\n";
}
else {
if ( $rule_value =~ /,/ ) {
if ( $rule_value !~ /,.*?,/ ) {
$rule_value =~ s/,/./;
$rule_value =~ s/\.0+$//;
$query->execute( $rule_value, $rule_id );
}
else {
die(
sprintf(
'Many commas in rule id %s ("%s") - fix it before restart this update',
$rule_id, $rule_value
)
);
}
}
}
}
say $out
"BUG_33028 - Patch applied";
if ( $error ) {
die("Circulation rules contain invalid monetary values:\n$error\nPlease fix these before you restart the update.");
}
say $out "Circulation rules have been validated. All circulation rule values are correctly formatted.";
},
}
};