Merge pull request #146 from kbss-cvut/fix/fta-fmea-ui-541-fix-renami…

…ng-fault-trees Fix and allow renaming only non fha based fault trees
kbss-cvut · Aug 9, 2024 · f9a4120 · f9a4120
2 parents fcc5cd0 + 55f1dc4
commit f9a4120
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 8 deletions.
diff --git a/ontology-generator/ontology/fta-fmea-model.ttl b/ontology-generator/ontology/fta-fmea-model.ttl
@@ -540,6 +540,9 @@ fta-fmea:system-name rdf:type owl:DatatypeProperty ;
     fta-fmea:status rdf:type owl:DatatypeProperty ;
                       rdfs:label "status" .
 
+###  http://onto.fel.cvut.cz/ontologies/fta-fmea-application/auxiliary
+    fta-fmea:auxiliary rdf:type owl:DatatypeProperty ;
+                      rdfs:label "auxiliary" .
 
 #################################################################
 #    Classes

diff --git a/src/main/java/cz/cvut/kbss/analysis/dao/FaultTreeDao.java b/src/main/java/cz/cvut/kbss/analysis/dao/FaultTreeDao.java
@@ -118,6 +118,9 @@ public Query getSummariesQuery() {
                                     OPTIONAL{
                                         ?rootEvent fta:probability ?calculatedFailureRate.
                                     }
+                                    OPTIONAL{
+                                        ?rootEventType fta:auxiliary ?auxiliary.
+                                    }
                                     OPTIONAL{
                                         ?rootEventType fta:has-failure-rate ?failureRate.
                                         ?failureRate fta:has-requirement ?failureRateRequirement.

diff --git a/src/main/java/cz/cvut/kbss/analysis/model/FaultEventType.java b/src/main/java/cz/cvut/kbss/analysis/model/FaultEventType.java
@@ -21,6 +21,9 @@ public class FaultEventType extends Event{
     @OWLDataProperty(iri = Vocabulary.s_p_fault_event_type)
     private String eventType;
 
+    @OWLDataProperty(iri = Vocabulary.s_p_auxiliary)
+    private Boolean auxiliary;
+
     @Override
     public void setAs(NamedEntity namedEntity) {
         if(namedEntity instanceof FaultEventTypeSummary)

diff --git a/src/main/java/cz/cvut/kbss/analysis/model/FaultTreeSummary.java b/src/main/java/cz/cvut/kbss/analysis/model/FaultTreeSummary.java
@@ -51,6 +51,8 @@ public class FaultTreeSummary extends ManagedEntity{
     @OWLDataProperty(iri = Vocabulary.s_p_fha_based_failure_rate)
     protected Double fhaBasedFailureRate;
 
+    @OWLDataProperty(iri = Vocabulary.s_p_auxiliary)
+    protected Boolean auxiliary;
 
     public void copyTo(FaultTree faultTree){
         super.copyTo(faultTree);
@@ -63,6 +65,7 @@ public void copyTo(FaultTree faultTree){
                 rootType.setUri(this.getRootEventType());
                 root.setSupertypes(new HashSet<>());
                 root.getSupertypes().add(rootType);
+                rootType.setAuxiliary(auxiliary);
             }
         }
         if(this.getSystemUri() != null){

diff --git a/src/main/java/cz/cvut/kbss/analysis/service/FaultTreeRepositoryService.java b/src/main/java/cz/cvut/kbss/analysis/service/FaultTreeRepositoryService.java
@@ -101,6 +101,7 @@ public void createTree(FaultTree faultTree){
         // load and persist supertypes
         if(faultTree.getManifestingEvent().getSupertypes() == null || faultTree.getManifestingEvent().getSupertypes().isEmpty()) {
             FHAEventType evt = new FHAEventType();
+            evt.setAuxiliary(true);
             evt.setName(faultTree.getManifestingEvent().getName());
             faultTree.getManifestingEvent().setSupertypes(Collections.singleton(evt));
         }
@@ -202,14 +203,19 @@ public Status getInferedStatus(FaultTree faultTree ){
     }
 
     public FaultTree update(FaultTree instance) {
-        if(instance.getManifestingEvent() == null && instance.getUri() != null){
-            FaultTree managedInstance = getPrimaryDao().find(instance.getUri()).orElse(null);
-            if(managedInstance == null)
-                throw EntityNotFoundException.create("Could find instance to update", instance.getUri());
-            managedInstance.setName(instance.getName());
-            instance = managedInstance;
-        }
-        return super.update(instance);
+        if(instance.getUri() == null)
+            throw new IllegalArgumentException("Cannot updated fault tree, fault tree uri is not set.");
+        if(!Optional.ofNullable(instance.getManifestingEvent())
+                .map(e -> e.getSupertypes())
+                .filter(s -> !s.isEmpty()).map(s -> s.iterator().next()).map(et -> ((FaultEventType)et).getAuxiliary()).orElse(false))
+            throw new IllegalArgumentException("Cannot updated name of fault tree connected to FHA event type.");
+
+        FaultTree managedInstance = getPrimaryDao().find(instance.getUri()).orElse(null);
+        if(managedInstance == null)
+            throw EntityNotFoundException.create("Could find instance to update", instance.getUri());
+        managedInstance.setName(instance.getName());
+
+        return super.update(managedInstance);
     }
 
     @Override