Bulk duplicate

src/main/angular/src/app/api/bulk/BulkService.ts

@@ -66,6 +66,10 @@ export class BulkService implements ISearchService {
     this.api.getReturnItem("bulk/run/" + bulk.id, _ => _, next);
   }
 
+  duplicate(bulk: Bulk, next: (item: Bulk) => void): void {
+    this.api.getReturnItem("bulk/duplicate/" + bulk.id, _ => _, next);
+  }
+
   setEntry(entry: BulkEntry, key: string, value: any, next: (result: BulkEntry) => void = NO_OP): void {
     this.api.putReturnItem("BulkEntry/" + entry.id + "/set/" + key, value, next);
   }

src/main/angular/src/app/pages/bulk/list/bulk-list.component.html

@@ -8,6 +8,7 @@
     <th>Bezeichnung</th>
     <th>&nbsp;</th>
     <th>&nbsp;</th>
+    <th>&nbsp;</th>
   </tr>
   <tr *ngFor="let bulk of bulks.sort(Bulk.compareName); trackBy: Bulk.trackBy">
 
@@ -24,6 +25,10 @@
       <fa-icon title="Ausführen" [icon]="faPlay"></fa-icon>
     </td>
 
+    <td class="duplicate" (click)="duplicate(bulk)">
+      <fa-icon title="Duplizieren" [icon]="faCopy"></fa-icon>
+    </td>
+
     <td class="delete" (click)="delete(bulk)">
       <fa-icon title="Löschen" [icon]="faTimes"></fa-icon>
     </td>

src/main/angular/src/app/pages/bulk/list/bulk-list.component.ts

@@ -1,7 +1,7 @@
 import {Component, OnInit} from '@angular/core';
 import {BulkService} from "../../../api/bulk/BulkService";
 import {Bulk} from "../../../api/bulk/Bulk";
-import {faCheckCircle, faCircle, faPlayCircle, faTimesCircle} from "@fortawesome/free-regular-svg-icons";
+import {faCheckCircle, faCircle, faCopy, faPlayCircle, faTimesCircle} from "@fortawesome/free-regular-svg-icons";
 
 @Component({
   selector: 'app-bulk-list',
@@ -60,10 +60,15 @@ export class BulkListComponent implements OnInit {
     }
   }
 
+  duplicate(bulk: Bulk): void {
+    this.bulkService.duplicate(bulk, bulk => this.addOrReplace(bulk));
+  }
+
   delete(bulk: Bulk): void {
     if (confirm("Zeitplan \"" + bulk.name + "\" wirklich löschen?")) {
       this.bulkService.delete(bulk, () => this.remove(bulk));
     }
   }
 
+  protected readonly faCopy = faCopy;
 }

src/main/angular/src/environments/environment.ts

@@ -4,7 +4,7 @@
 
 import {getBaseUrl} from "./UrlHelper";
 
-const PROD: boolean = true;
+const PROD: boolean = false;
 
 export const environment = {
   production: false,

src/main/java/de/ph87/homeautomation/bulk/Bulk.java

@@ -1,14 +1,10 @@
 package de.ph87.homeautomation.bulk;
 
-import de.ph87.homeautomation.bulk.entry.BulkEntry;
+import de.ph87.homeautomation.bulk.entry.*;
-import lombok.Getter;
+import lombok.*;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
 
 import javax.persistence.*;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
 
 @Entity
 @Getter
@@ -40,6 +36,12 @@ public class Bulk {
     return entries.size();
   }
   
+  public Bulk(final Bulk original, final String name) {
+    this.enabled = original.isEnabled();
+    this.name = name;
+    this.entries = original.getEntries().stream().map(BulkEntry::new).toList();
+  }
+  
   public Bulk(final BulkCreateDto dto) {
     this.enabled = dto.isEnabled();
     this.name = dto.getName();

src/main/java/de/ph87/homeautomation/bulk/BulkController.java

@@ -1,12 +1,11 @@
 package de.ph87.homeautomation.bulk;
 
-import de.ph87.homeautomation.shared.ISearchController;
+import de.ph87.homeautomation.shared.*;
-import de.ph87.homeautomation.shared.SearchResult;
+import lombok.*;
-import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.*;
-import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
+import java.util.*;
 
 @RestController
 @RequestMapping("bulk")
@@ -37,6 +36,11 @@ public class BulkController implements ISearchController {
     bulkWriter.run(id);
   }
   
+  @GetMapping("duplicate/{id}")
+  public BulkDto duplicate(@PathVariable final long id) {
+    return bulkWriter.duplicate(id);
+  }
+  
   @PostMapping("set/{id}/name")
   public BulkDto name(@PathVariable final long id, @RequestBody final String name) {
     return bulkWriter.set(id, bulk -> bulk.setName(name));

src/main/java/de/ph87/homeautomation/bulk/BulkRepository.java

@@ -1,11 +1,9 @@
 package de.ph87.homeautomation.bulk;
 
-import de.ph87.homeautomation.property.Property;
+import de.ph87.homeautomation.property.*;
-import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.*;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
-import java.util.List;
+import java.util.*;
-import java.util.Optional;
 
 public interface BulkRepository extends JpaRepository<Bulk, Long>, JpaSpecificationExecutor<Bulk> {
   
@@ -16,4 +14,6 @@ public interface BulkRepository extends JpaRepository<Bulk, Long>, JpaSpecificat
   
   List<Bulk> findDistinctByEntries_Property(Property property);
   
+  boolean existsByName(String name);
+  
 }

src/main/java/de/ph87/homeautomation/bulk/BulkWriter.java

@@ -1,11 +1,11 @@
 package de.ph87.homeautomation.bulk;
 
-import lombok.RequiredArgsConstructor;
+import lombok.*;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.slf4j.*;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.*;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.annotation.*;
 
-import java.util.function.Consumer;
+import java.util.function.*;
 
 @Slf4j
 @Service
@@ -38,6 +38,19 @@ public class BulkWriter {
     bulkExecutor.execute(bulk);
   }
   
+  public BulkDto duplicate(final long id) {
+    final Bulk original = bulkReader.getById(id);
+    int number = 1;
+    while (true) {
+      final String copyName = original.getName() + " Kopie " + number;
+      if (!bulkRepository.existsByName(copyName)) {
+        final Bulk copy = bulkRepository.save(new Bulk(original, copyName));
+        log.info("Bulk duplicated: {}", copy);
+        return bulkMapper.toDto(copy);
+      }
+    }
+  }
+  
   public BulkDto set(final long id, final Consumer<Bulk> consumer) {
     final Bulk bulk = bulkReader.getById(id);
     consumer.accept(bulk);

src/main/java/de/ph87/homeautomation/bulk/entry/BulkEntry.java

@@ -1,10 +1,7 @@
 package de.ph87.homeautomation.bulk.entry;
 
-import de.ph87.homeautomation.property.Property;
+import de.ph87.homeautomation.property.*;
-import lombok.Getter;
+import lombok.*;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
 
 import javax.persistence.*;
 
@@ -41,4 +38,11 @@ public class BulkEntry {
     this.value = dto.getValue();
   }
   
+  @SuppressWarnings("CopyConstructorMissesField")
+  public BulkEntry(final BulkEntry original) {
+    this.position = original.getPosition();
+    this.property = original.getProperty();
+    this.value = original.getValue();
+  }
+  
 }