Vorschläge für Kontoauszüge verbessern, fall: remote_account_number

[kivitendo-erp.git] / SL / DB / CsvImportReport.pm

diff --git a/SL/DB/CsvImportReport.pm b/SL/DB/CsvImportReport.pm
index 5b7acd2..5249410 100644 (file)
--- a/SL/DB/CsvImportReport.pm
+++ b/SL/DB/CsvImportReport.pm
@@ -4,6 +4,7 @@
 package SL::DB::CsvImportReport;
 
 use strict;
+use SL::DB;
 use SL::DBUtils;
 
 use SL::DB::MetaSetup::CsvImportReport;
@@ -25,63 +26,59 @@ __PACKAGE__->meta->add_relationships(
 __PACKAGE__->meta->initialize;
 
 sub folded_rows {
-  my ($self) = @_;
-
-  $self->_fold_rows unless $self->{folded_rows};
+  my ($self, %params) = @_;
 
-  return $self->{folded_rows};
-}
-
-sub folded_status {
-  my ($self) = @_;
+  my $folded_rows = {};
 
-  $self->_fold_status unless $self->{folded_status};
+  for my $row_obj (@{ $params{rows} || $self->rows }) {
+    $folded_rows->{ $row_obj->row } ||= [];
+    $folded_rows->{ $row_obj->row }[ $row_obj->col ] = $row_obj->value;
+  }
 
-  return $self->{folded_status};
+  $folded_rows;
 }
 
-sub _fold_rows {
-  my ($self) = @_;
+sub folded_status {
+  my ($self, %params) = @_;
 
-  $self->{folded_rows} = [];
+  my $folded_status = {};
 
-  for my $row_obj (@{ $self->rows }) {
-    $self->{folded_rows}->[ $row_obj->row ] ||= [];
-    $self->{folded_rows}->[ $row_obj->row ][ $row_obj->col ] = $row_obj->value;
+  for my $status_obj (@{ $params{status} || $self->status }) {
+    $folded_status->{ $status_obj->row } ||= {};
+    $folded_status->{ $status_obj->row }{information} ||= [];
+    $folded_status->{ $status_obj->row }{errors} ||= [];
+    push @{ $folded_status->{ $status_obj->row }{ $status_obj->type } }, $status_obj->value;
   }
-}
 
-sub _fold_status {
-  my ($self) = @_;
-
-  $self->{folded_status} = [];
-
-  for my $status_obj (@{ $self->status }) {
-    $self->{folded_status}->[ $status_obj->row ] ||= {};
-    $self->{folded_status}->[ $status_obj->row ]{information} ||= [];
-    $self->{folded_status}->[ $status_obj->row ]{errors} ||= [];
-    push @{ $self->{folded_status}->[ $status_obj->row ]{ $status_obj->type } }, $status_obj->value;
-  }
+  $folded_status;
 }
 
 # implementes cascade delete as per documentation
 sub destroy {
   my ($self) = @_;
 
-  my $dbh = $self->db->dbh;
-
-  $dbh->begin_work;
-
-  do_query($::form, $dbh, 'DELETE FROM csv_import_report_status WHERE csv_import_report_id = ?', $self->id);
-  do_query($::form, $dbh, 'DELETE FROM csv_import_report_rows WHERE csv_import_report_id = ?', $self->id);
-  do_query($::form, $dbh, 'DELETE FROM csv_import_reports WHERE id = ?', $self->id);
-
-  if ($self->profile_id) {
-    do_query($::form, $dbh, 'DELETE FROM csv_import_profile_settings WHERE csv_import_profile_id = ?', $self->profile_id);
-    do_query($::form, $dbh, 'DELETE FROM csv_import_profiles WHERE id = ?', $self->profile_id);
-  }
-
-  $dbh->commit;
+  SL::DB->client->with_transaction(sub {
+    my $dbh = SL::DB->client->dbh;
+
+    do_query($::form, $dbh, 'DELETE FROM csv_import_report_status WHERE csv_import_report_id = ?', $self->id);
+    do_query($::form, $dbh, 'DELETE FROM csv_import_report_rows WHERE csv_import_report_id = ?', $self->id);
+    do_query($::form, $dbh, 'DELETE FROM csv_import_reports WHERE id = ?', $self->id);
+
+    if ($self->profile_id) {
+      my ($is_profile_used_elsewhere) = selectfirst_array_query($::form, $dbh, <<SQL, $self->profile_id);
+        SELECT id
+        FROM csv_import_reports
+        WHERE profile_id = ?
+        LIMIT 1
+SQL
+
+      if (!$is_profile_used_elsewhere) {
+        do_query($::form, $dbh, 'DELETE FROM csv_import_profile_settings WHERE csv_import_profile_id = ?', $self->profile_id);
+        do_query($::form, $dbh, 'DELETE FROM csv_import_profiles WHERE id = ?', $self->profile_id);
+      }
+    }
+    1;
+  }) or do { die SL::DB->client->error };
 }
 
 1;