updates the categories broaders handling

epos-eu · Aug 29, 2023 · ba9e3b5 · ba9e3b5
1 parent 96f0429
commit ba9e3b5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/src/main/java/org/epos/handler/dbapi/dbapiimplementation/CategoryDBAPI.java b/src/main/java/org/epos/handler/dbapi/dbapiimplementation/CategoryDBAPI.java
@@ -57,15 +57,14 @@ public LinkedEntity save(Category eposDataModelObject, EntityManager em, String
 		}
 
 		if (eposDataModelObject.getBroader() != null) {
+
+			System.out.println(eposDataModelObject.getBroader());
 
 			for (String categoryName : eposDataModelObject.getBroader()) {
 				EDMCategory edmCategory = getOneFromDB(em, EDMCategory.class, "EDMCategory.findByUid",
 						"UID", categoryName);
 
-				boolean exists = true;
-
 				if (edmCategory == null) {
-					exists = false;
 					edmCategory = new EDMCategory();
 					edmCategory.setScheme(edmCategoryScheme.getId());
 					edmCategory.setUid(categoryName);
@@ -78,9 +77,8 @@ public LinkedEntity save(Category eposDataModelObject, EntityManager em, String
 				edmIspartOfCategory.setCategoryByCategory1Id(edmCategory);
 				edmIspartOfCategory.setCategory2Id(edmInstanceId);
 				edmIspartOfCategory.setCategoryByCategory2Id(edmObject);
-
-				if(exists)em.merge(edmIspartOfCategory);
-				else em.persist(edmIspartOfCategory);
+
+				em.persist(edmIspartOfCategory);
 			}
 		}
 
@@ -89,10 +87,7 @@ public LinkedEntity save(Category eposDataModelObject, EntityManager em, String
 				EDMCategory edmCategory = getOneFromDB(em, EDMCategory.class, "EDMCategory.findByUid",
 						"UID", categoryName);
 
-				boolean exists = true;
-
 				if (edmCategory == null) {
-					exists = false;
 					edmCategory = new EDMCategory();
 					edmCategory.setScheme(edmCategoryScheme.getId());
 					edmCategory.setUid(categoryName);
@@ -107,8 +102,7 @@ public LinkedEntity save(Category eposDataModelObject, EntityManager em, String
 				edmIspartOfCategory.setCategory1Id(edmInstanceId);
 				edmIspartOfCategory.setCategoryByCategory1Id(edmObject);
 
-				if(exists)em.merge(edmIspartOfCategory);
-				else em.persist(edmIspartOfCategory);
+				em.persist(edmIspartOfCategory);
 			}
 
 		}

diff --git a/src/test/java/tests/APITests.java b/src/test/java/tests/APITests.java
@@ -47,12 +47,20 @@ public static void main(String[] args) {
 		tsunamidata.setNarrower(Arrays.asList("category:sealevelstatimitgfacilitydatavliz"));
 		catAPI.save(tsunamidata);
 
+		Category tsunamitest = new Category();
+		tsunamitest.setUid("category:tsunamitest");
+		tsunamitest.setName("Tsunami Test");
+		tsunamitest.setDescription("TCS Subdomain");
+		tsunamitest.setInScheme("category:tsunami");
+		tsunamitest.setNarrower(Arrays.asList("category:sealevelstatimitgfacilitydatavliz"));
+		catAPI.save(tsunamidata);
+
 		Category sealevelstatimitgfacilitydatavliz = new Category();
 		sealevelstatimitgfacilitydatavliz.setUid("category:sealevelstatimitgfacilitydatavliz");
 		sealevelstatimitgfacilitydatavliz.setName("Tsunami Data");
 		sealevelstatimitgfacilitydatavliz.setDescription("TCS Subdomain");
 		sealevelstatimitgfacilitydatavliz.setInScheme("category:tsunami");
-		sealevelstatimitgfacilitydatavliz.setBroader(Arrays.asList("category:tsunamidata"));
+		sealevelstatimitgfacilitydatavliz.setBroader(Arrays.asList("category:tsunamidata","category:tsunamitest"));
 		catAPI.save(sealevelstatimitgfacilitydatavliz);
 	}