PR feedback

Author: goekay

src/main/java/de/rwth/idsg/steve/repository/DataImportExportRepository.java

@@ -32,5 +32,7 @@ public interface DataImportExportRepository {
 
     void exportCsv(Writer writer, Table<?> table) throws IOException;
 
+    void beforeImport();
+    void afterImport();
     void importCsv(InputStream in, Table<?> table) throws IOException;
 }

src/main/java/de/rwth/idsg/steve/repository/impl/DataImportExportRepositoryImpl.java

@@ -24,11 +24,13 @@
 import org.jooq.CSVFormat;
 import org.jooq.Cursor;
 import org.jooq.DSLContext;
+import org.jooq.LoaderError;
 import org.jooq.SQLDialect;
 import org.jooq.Table;
 import org.jooq.TableField;
 import org.jooq.impl.DSL;
 import org.springframework.stereotype.Repository;
+import org.springframework.util.CollectionUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -73,6 +75,23 @@ public void exportCsv(Writer writer, Table<?> table) throws IOException {
         }
     }
 
+    @Override
+    public void beforeImport() {
+        SQLDialect dialectFamily = ctx.configuration().dialect().family();
+
+        boolean isOk = dialectFamily == SQLDialect.MYSQL || dialectFamily == SQLDialect.MARIADB;
+        if (!isOk) {
+            throw new IllegalStateException("Unsupported dialect " + dialectFamily);
+        }
+
+        ctx.execute("set foreign_key_checks=0");
+    }
+
+    @Override
+    public void afterImport() {
+        ctx.execute("set foreign_key_checks=1");
+    }
+
     /**
      * https://www.jooq.org/doc/latest/manual/sql-execution/importing/importing-api/
      * https://www.jooq.org/doc/latest/manual/sql-execution/importing/importing-sources/importing-source-csv/
@@ -89,6 +108,13 @@ public void importCsv(InputStream in, Table<?> table) throws IOException {
             .fieldsCorresponding()
             .execute();
 
+        if (!CollectionUtils.isEmpty(loader.errors())) {
+            for (LoaderError error : loader.errors()) {
+                log.error("Exception happened", error.exception());
+            }
+            throw new RuntimeException("There were errors loading data into table " + table.getName());
+        }
+
         int processed = loader.processed();
 
         log.info("Imported '{}' with processedRows={}, storedRows={}, errorCount={}, errorMessages={}",
@@ -141,13 +167,7 @@ private void resetAutoIncrement(Table<?> table) {
 
         long nextVal = ((Number) maxId).longValue() + 1;
 
-        SQLDialect dialectFamily = ctx.configuration().dialect().family();
-
-        if (dialectFamily == SQLDialect.MYSQL || dialectFamily == SQLDialect.MARIADB) {
-            ctx.execute("ALTER TABLE " + table.getName() + " AUTO_INCREMENT = " + nextVal);
-        } else {
-            log.warn("Auto increment not supported for dialect family {}", dialectFamily);
-        }
+        ctx.execute(DSL.sql("ALTER TABLE {0} AUTO_INCREMENT = {1}", table, DSL.val(nextVal)));
     }
 
 }

src/main/java/de/rwth/idsg/steve/service/DataImportExportService.java

@@ -140,6 +140,8 @@ public void exportZip(OutputStream out, ExportType exportType) throws IOExceptio
     }
 
     public void importZip(InputStream in) throws IOException {
+        dataImportExportRepository.beforeImport();
+
         try (ZipInputStream zipIn = new ZipInputStream(in)) {
             ZipEntry entry;
 
@@ -158,12 +160,16 @@ public void close() throws IOException {
                         };
 
                         dataImportExportRepository.importCsv(nonClosingStream, table);
+                    } catch (RuntimeException ex) {
+                        throw ex;
                     } catch (Exception e) {
-                        log.error(e.getMessage(), e);
+                        throw new RuntimeException(e);
                     }
                 }
                 zipIn.closeEntry();
             }
+        } finally {
+            dataImportExportRepository.afterImport();
         }
     }