entity changelog fixes 4

euu-rocks · Sep 26, 2023 · 81abde8 · 81abde8
1 parent a14b70f
commit 81abde8
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 16 deletions.
diff --git a/src/main/java/org/seed/core/entity/EntityChangeLogBuilder.java b/src/main/java/org/seed/core/entity/EntityChangeLogBuilder.java
@@ -885,7 +885,7 @@ private void addRelationConstraints(EntityRelation relation) {
 		addJoinConstraintChange.setBaseTableName(getTableName(relation, false));
 		addJoinConstraintChange.setBaseColumnNames(relation.getJoinColumnName());
 		addJoinConstraintChange.setReferencedColumnNames(SystemField.ID.columName);
-		addJoinConstraintChange.setReferencedTableName(relation.getEntity().getEffectiveTableName());
+		addJoinConstraintChange.setReferencedTableName(relation.getEntityTableName());
 		addChange(addJoinConstraintChange);
 
 		// inverse join column fk

diff --git a/src/main/java/org/seed/core/entity/EntityRelation.java b/src/main/java/org/seed/core/entity/EntityRelation.java
@@ -162,28 +162,28 @@ public EntityRelation createDescendantRelation(Entity descendantEntity) {
 		return createRelation(descendantEntity, relatedEntity);
 	}
 
-	void setDerivedEntity(Entity derivedEntity) {
-		this.derivedEntity = derivedEntity;
-	}
-
-	private Entity getDerivedEntity() {
-		Assert.stateAvailable(derivedEntity, "derived entity");
-
-		return derivedEntity;
-	}
-
 	boolean isEntityAudited() {
 		return entity.isGeneric()
 				? getDerivedEntity().isAudited()
 				: entity.isAudited();
 	}
 
-	private String getEntityTableName() {
+	String getEntityTableName() {
 		return entity.isGeneric()
 				? getDerivedEntity().getEffectiveTableName()
 				: entity.getEffectiveTableName();
 	}
 
+	void setDerivedEntity(Entity derivedEntity) {
+		this.derivedEntity = derivedEntity;
+	}
+
+	private Entity getDerivedEntity() {
+		Assert.stateAvailable(derivedEntity, "derived entity");
+
+		return derivedEntity;
+	}
+
 	private static EntityRelation createRelation(Entity entity, Entity relatedEntity) {
 		final var relation = new EntityRelation();
 		relation.setEntity(entity);

diff --git a/src/test/java/org/seed/test/integration/entity/CreateGenericEntityTest.java b/src/test/java/org/seed/test/integration/entity/CreateGenericEntityTest.java
@@ -109,4 +109,18 @@ void testAddFieldConstraint() {
 		saveEntity(tabpanel);
 	}
 
+	@Test
+	@Order(6)
+	void testAddRelation() {
+		WebElement tabpanel = showEntity("generictest");
+		assertEquals("Beziehungen", findTab(tabpanel, "relations").getText());
+		clickTab(tabpanel, "relations");
+		WebElement tabpanelRelations = findTabpanel(tabpanel, "relations");
+		clickButton(tabpanelRelations, "new");
+
+		findOptionCombobox(tabpanelRelations, "relationentity").sendKeys("TransferableTest");
+		clickTab(tabpanel, "relations"); // lose focus
+		saveEntity(tabpanel);
+	}
+
 }
diff --git a/src/test/java/org/seed/test/integration/entity/DeleteEntityTest.java b/src/test/java/org/seed/test/integration/entity/DeleteEntityTest.java
@@ -167,6 +167,18 @@ void testRemoveFieldGroup() {
 
 	@Test
 	@Order(12)
+	void testRemoveGenericRelation() {
+		WebElement tabpanel = showEntity("generictest");
+		assertEquals("Entitäten: GenericTest", findTab("entitaeten").getText());
+		clickTab(tabpanel, "relations");
+		WebElement tabpanelRelations = findTabpanel(tabpanel, "relations");
+		clickListItem(tabpanelRelations, "transferabletest");
+		clickButton(tabpanelRelations, "remove");
+		saveEntity(tabpanel);
+	}
+
+	@Test
+	@Order(13)
 	void testDeleteDerivedEntity() {
 		WebElement tabpanel = showEntity("derivedtest");
 		assertEquals("Entitäten: DerivedTest", findTab("entitaeten").getText());
@@ -178,7 +190,7 @@ void testDeleteDerivedEntity() {
 	}
 
 	@Test
-	@Order(13)
+	@Order(14)
 	void testDeleteGenericEntity() {
 		WebElement tabpanel = showEntity("generictest");
 		assertEquals("Entitäten: GenericTest", findTab("entitaeten").getText());
@@ -190,7 +202,7 @@ void testDeleteGenericEntity() {
 	}
 
 	@Test
-	@Order(14)
+	@Order(15)
 	void testDeleteTransferableEntity() {
 		WebElement tabpanel = showEntity("transferabletestnew");
 		assertEquals("Entitäten: TransferableTestNew", findTab("entitaeten").getText());
@@ -202,7 +214,7 @@ void testDeleteTransferableEntity() {
 	}
 
 	@Test
-	@Order(15)
+	@Order(16)
 	void testDeleteNestedEntity() {
 		WebElement tabpanel = showEntity("nestedtest");
 		assertEquals("Entitäten: NestedTest", findTab("entitaeten").getText());
@@ -214,7 +226,7 @@ void testDeleteNestedEntity() {
 	}
 
 	@Test
-	@Order(16)
+	@Order(17)
 	void testDeleteEntity() {
 		WebElement tabpanel = showEntity("integrationtest");
 		assertEquals("Entitäten: IntegrationTest", findTab("entitaeten").getText());