Canvas - addShape

src/main/java/cz/cvut/fit/tjv/vectorSandbox_api/service/CanvasService.java

@@ -3,4 +3,6 @@ package cz.cvut.fit.tjv.vectorSandbox_api.service;
 import cz.cvut.fit.tjv.vectorSandbox_api.domain.Canvas;
 public interface CanvasService extends CrudService<Canvas,String> {
+
+    void addShape ( String canvasId, long shapeId ) ;
 }

src/main/java/cz/cvut/fit/tjv/vectorSandbox_api/service/CanvasServiceImpl.java

 package cz.cvut.fit.tjv.vectorSandbox_api.service;
 import cz.cvut.fit.tjv.vectorSandbox_api.domain.Canvas;
+import cz.cvut.fit.tjv.vectorSandbox_api.domain.Shape;
 import cz.cvut.fit.tjv.vectorSandbox_api.repository.CanvasRepository;
+import cz.cvut.fit.tjv.vectorSandbox_api.repository.ShapeRepository;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Component;
+import java.util.Optional;
+
+@Component
 public class CanvasServiceImpl extends  CrudServiceImpl<Canvas, String >implements  CanvasService
 {
     private CanvasRepository canvasRepository;
-    public CanvasServiceImpl ( CanvasRepository canvasRepository) { this.canvasRepository = canvasRepository;}
+    private ShapeRepository shapeRepository;
+
+    public CanvasServiceImpl ( CanvasRepository canvasRepository, ShapeRepository shapeRepository)
+    { this.canvasRepository = canvasRepository;
+    this.shapeRepository = shapeRepository;}
+
+    @Override
+    public void addShape (String canvasId, long shapeId )
+    {
+        Optional<Canvas> optCanvas = canvasRepository.findById(canvasId);
+        Optional<Shape> optShape = shapeRepository.findById(shapeId);
+
+        if ( optCanvas.isEmpty() || optShape.isEmpty())
+            throw  new IllegalArgumentException("invalid ID");
+
+        Canvas canvas = optCanvas.get();
+        Shape shape = optShape.get();
+
+        if ( canvas.getShapes().stream().anyMatch(s -> s.getDefinition().equals(shape.getDefinition())))
+            throw new IllegalArgumentException ( "Canvas already contains shape with exact definition!");
+
+        canvas.getShapes().add(shape);
+    }
     @Override
     protected CrudRepository<Canvas,String> getRepository() {return  canvasRepository;}