From 002002ec1cac1f2bcc0ae340423369eb883cf711 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <p.gawron@atcomp.pl>
Date: Fri, 7 Mar 2025 10:30:22 +0100
Subject: [PATCH] don't remove layer together with line
---
.../java/lcsb/mapviewer/model/graphics/PolylineData.java | 2 +-
.../project/map/layer/line/NewLayerLineControllerTest.java | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/model/src/main/java/lcsb/mapviewer/model/graphics/PolylineData.java b/model/src/main/java/lcsb/mapviewer/model/graphics/PolylineData.java
index df794aa0f..68ed11663 100644
--- a/model/src/main/java/lcsb/mapviewer/model/graphics/PolylineData.java
+++ b/model/src/main/java/lcsb/mapviewer/model/graphics/PolylineData.java
@@ -125,7 +125,7 @@ public class PolylineData implements MinervaEntity, Drawable {
@JsonIgnore
private long entityVersion;
- @Cascade({CascadeType.ALL})
+ @Cascade({CascadeType.DETACH})
@ManyToOne(fetch = FetchType.LAZY)
@JoinTable(
name = "layer_table_lines",
diff --git a/web/src/test/java/lcsb/mapviewer/web/api/project/map/layer/line/NewLayerLineControllerTest.java b/web/src/test/java/lcsb/mapviewer/web/api/project/map/layer/line/NewLayerLineControllerTest.java
index 46889163e..ea0072fc7 100644
--- a/web/src/test/java/lcsb/mapviewer/web/api/project/map/layer/line/NewLayerLineControllerTest.java
+++ b/web/src/test/java/lcsb/mapviewer/web/api/project/map/layer/line/NewLayerLineControllerTest.java
@@ -7,6 +7,7 @@ import lcsb.mapviewer.model.graphics.PolylineData;
import lcsb.mapviewer.model.map.layout.graphics.Layer;
import lcsb.mapviewer.persist.dao.graphics.PolylineDataProperty;
import lcsb.mapviewer.services.interfaces.ILayerLineService;
+import lcsb.mapviewer.services.interfaces.ILayerService;
import lcsb.mapviewer.services.interfaces.IMinervaJobService;
import lcsb.mapviewer.services.interfaces.IProjectService;
import lcsb.mapviewer.web.ControllerIntegrationTest;
@@ -46,6 +47,9 @@ public class NewLayerLineControllerTest extends ControllerIntegrationTest {
@Autowired
private ILayerLineService layerLineService;
+ @Autowired
+ private ILayerService layerService;
+
@Autowired
private IProjectService projectService;
@@ -242,6 +246,7 @@ public class NewLayerLineControllerTest extends ControllerIntegrationTest {
.andExpect(status().isOk());
assertNull(layerLineService.getById(lineId));
+ assertNotNull(layerService.getById(layerId));
}
@Test
--
GitLab