use the same timestring for all backups created by bulk backup creation

Author: mucsi96

server/src/main/java/io/github/mucsi96/postgresbackuptool/controller/BackupController.java

@@ -3,6 +3,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.time.Instant;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Optional;
 
@@ -34,22 +35,27 @@
 public class BackupController {
     private final BackupService backupService;
     private final DatabaseService databaseService;
+    private final DateTimeFormatter dateTimeFormatter;
 
     @PreAuthorize("hasAuthority('APPROLE_DatabaseBackupCreator') and hasAuthority('SCOPE_createBackup')")
     @PostMapping("/backup")
     @ResponseBody
     void create(
             @RequestParam("retention_period") @Min(1) @Max(356) int retentionPeriod)
             throws IOException, InterruptedException {
+
+        String timeString = dateTimeFormatter.format(Instant.now());
         databaseService.getDatabases().forEach(databaseConfiguration -> {
             try {
                 createDump(retentionPeriod, databaseConfiguration.getName(),
                         databaseConfiguration.getPrefix(),
-                        databaseConfiguration.getDumpFormat().getValue());
+                        databaseConfiguration.getDumpFormat().getValue(),
+                        timeString);
 
                 if (databaseConfiguration.isCreatePlainDump()) {
                     createDump(retentionPeriod, databaseConfiguration.getName(),
-                            databaseConfiguration.getPrefix(), "plain");
+                            databaseConfiguration.getPrefix(), "plain",
+                            timeString);
                 }
             } catch (IOException | InterruptedException e) {
                 throw new RuntimeException(e);
@@ -58,9 +64,10 @@ void create(
     }
 
     private void createDump(int retentionPeriod, String name, String prefix,
-            String dumpFormat) throws IOException, InterruptedException {
+            String dumpFormat, String timeString)
+            throws IOException, InterruptedException {
         File dumpFile = databaseService.createDump(name, retentionPeriod,
-                dumpFormat);
+                dumpFormat, timeString);
         backupService.createBackup(prefix, dumpFile);
 
         dumpFile.delete();

server/src/main/java/io/github/mucsi96/postgresbackuptool/service/DatabaseService.java

@@ -3,8 +3,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Paths;
-import java.time.Instant;
-import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -28,18 +26,15 @@
 
 @Service
 public class DatabaseService {
-    private final DateTimeFormatter dateTimeFormatter;
     private final List<DatabaseConfiguration> databases;
 
     public DatabaseService(
-            @Value("${databasesConfigPath}") String databasesConfigPath,
-            DateTimeFormatter dateTimeFormatter)
+            @Value("${databasesConfigPath}") String databasesConfigPath)
             throws StreamReadException, DatabindException, IOException {
         this.databases = Arrays
                 .asList(new ObjectMapper().registerModule(new Jdk8Module())
                         .readValue(Paths.get(databasesConfigPath).toFile(),
                                 DatabaseConfiguration[].class));
-        this.dateTimeFormatter = dateTimeFormatter;
     }
 
     public List<DatabaseConfiguration> getDatabases() {
@@ -84,10 +79,9 @@ public DatabaseInfo getDatabaseInfo(String databaseName) {
     }
 
     public File createDump(String databaseName, int retentionPeriod,
-            String format) throws IOException, InterruptedException {
+            String format, String timeString) throws IOException, InterruptedException {
         DatabaseConfiguration databaseConfiguration = getDatabaseConfiguration(
                 databaseName);
-        String timeString = dateTimeFormatter.format(Instant.now());
         String filename = String.format("%s.%s.%s.%s", timeString,
                 getDatabaseInfo(databaseName).getTotalRowCount(),
                 retentionPeriod, "plain".equals(format) ? "sql" : "pgdump");