Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/72 add api to fetch fha event summary #91

Merged
merged 3 commits into from
May 15, 2024
Merged

Feature/72 add api to fetch fha event summary #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d05cff
[Fix #72] Extend jopa model with fault event type summary
kostobog May 9, 2024
434fbdb
[Fix #72] Implement dao layer methods to fetch FHA and sns component …
kostobog May 9, 2024
a4647ad
[Fix #72] Implement fault event summary API for FHA and SNS failure e…
kostobog May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/main/java/cz/cvut/kbss/analysis/controller/FaultEventController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import cz.cvut.kbss.analysis.model.FailureMode;
import cz.cvut.kbss.analysis.model.FaultEvent;
import cz.cvut.kbss.analysis.model.FaultEventType;
import cz.cvut.kbss.analysis.model.diagram.Rectangle;
import cz.cvut.kbss.analysis.service.FaultEventRepositoryService;
import cz.cvut.kbss.analysis.service.IdentifierService;
Expand Down Expand Up @@ -73,6 +74,20 @@ public FailureMode getFailureMode(@PathVariable(name = "faultEventFragment") Str
return repositoryService.getFailureMode(faultEventUri);
}

@GetMapping(value = "/top-fault-events/{systemFragment}", produces = {MediaType.APPLICATION_JSON_VALUE, JsonLd.MEDIA_TYPE})
public List<FaultEventType> getTopFaultEvents(@PathVariable String systemFragment){
log.info("> getFaultEventTypes - {}", systemFragment);
URI systemUri = identifierService.composeIdentifier(Vocabulary.s_c_system, systemFragment);
return repositoryService.getTopFaultEvents(systemUri);
}

@GetMapping(value = "/all-fault-events/{systemFragment}", produces = {MediaType.APPLICATION_JSON_VALUE, JsonLd.MEDIA_TYPE})
public List<FaultEventType> getAllFaultEvents(@PathVariable String systemFragment){
log.info("> getFaultEventTypes - {}", systemFragment);
URI systemUri = identifierService.composeIdentifier(Vocabulary.s_c_system, systemFragment);
return repositoryService.getAllFaultEvents(systemUri);
}

@ResponseStatus(HttpStatus.CREATED)
@PostMapping(value = "/{faultEventFragment}/failureMode", consumes = {MediaType.APPLICATION_JSON_VALUE, JsonLd.MEDIA_TYPE})
public FailureMode addFailureMode(@PathVariable(name = "faultEventFragment") String faultEventFragment, @RequestBody FailureMode failureMode) {
Expand Down
70 changes: 70 additions & 0 deletions src/main/java/cz/cvut/kbss/analysis/dao/FaultEventDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import cz.cvut.kbss.analysis.exception.PersistenceException;
import cz.cvut.kbss.analysis.model.FaultEvent;
import cz.cvut.kbss.analysis.model.FaultEventReference;
import cz.cvut.kbss.analysis.model.FaultEventType;
import cz.cvut.kbss.analysis.model.FaultEventTypeSummary;
import cz.cvut.kbss.analysis.model.diagram.Rectangle;
import cz.cvut.kbss.analysis.service.IdentifierService;
import cz.cvut.kbss.analysis.util.Vocabulary;
Expand Down Expand Up @@ -94,4 +96,72 @@ public List<FaultEventReference> getFaultEventRootWithSupertype(URI supertype){
throw new PersistenceException(e);
}
}

public List<FaultEventType> getTopFaultEvents(URI systemUri) {
try{
List<FaultEventTypeSummary> ret = em.createNativeQuery("""
PREFIX fta: <http://onto.fel.cvut.cz/ontologies/fta-fmea-application/>
SELECT ?uri ?name ?componentName ?eventType {
?uri a fta:fha-fault-event ;
fta:name ?name ;
fta:is-manifestation-of/fta:has-component/((^fta:has-part-component)+) ?system ;
fta:is-derived-from ?generalEvent .

FILTER NOT EXISTS{
?system1 fta:has-part-component ?system.
}

?generalEvent fta:is-manifestation-of ?fm .
?fm fta:has-component ?component .

?component fta:name ?componentLabel ;
fta:ata-code ?code .
BIND(CONCAT(str(?code), " - ", str(?componentLabel)) as ?componentName)
BIND("INTERMEDIATE" as ?eventType)
}
""", "FaultEventSummary")
.setParameter("system", systemUri)
.getResultList();
List<FaultEventType> ret1 = ret.stream().map(fe -> fe.asEntity(FaultEventType.class)).toList();
return ret1;
}catch (RuntimeException e){
throw new PersistenceException(e);
}
}

public List<FaultEventType> getAllFaultEvents(URI systemUri) {
try{
List<FaultEventTypeSummary> ret = em.createNativeQuery("""
PREFIX fta: <http://onto.fel.cvut.cz/ontologies/fta-fmea-application/>
SELECT ?uri ?name ?componentName ?eventType {
?uri a ?eventClass.
FILTER(?eventClass in (fta:fha-fault-event, fta:fault-event-type))
?uri fta:name ?name ;
fta:is-manifestation-of/fta:has-component/((^fta:has-part-component)+) ?system ;
fta:is-derived-from ?generalEvent .


FILTER NOT EXISTS{
?system1 fta:has-part-component ?system.
}

?generalEvent fta:is-manifestation-of ?fm .
?fm fta:has-component ?component .

?component fta:name ?componentLabel ;
fta:ata-code ?code .
BIND(CONCAT(str(?code), " - ", str(?componentLabel)) as ?componentName)

BIND(IF(?eventClass = fta:fha-fault-event, "INTERMEDIATE", "BASIC") as ?eventType)
}
""", "FaultEventSummary")
.setParameter("system", systemUri)
.getResultList();

List<FaultEventType> ret1 = ret.stream().map(fe -> fe.asEntity(FaultEventType.class)).toList();
return ret1;
}catch (RuntimeException e){
throw new PersistenceException(e);
}
}
}
21 changes: 17 additions & 4 deletions src/main/java/cz/cvut/kbss/analysis/model/FaultEventType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
package cz.cvut.kbss.analysis.model;

import cz.cvut.kbss.analysis.util.Vocabulary;
import cz.cvut.kbss.jopa.model.annotations.CascadeType;
import cz.cvut.kbss.jopa.model.annotations.FetchType;
import cz.cvut.kbss.jopa.model.annotations.OWLClass;
import cz.cvut.kbss.jopa.model.annotations.OWLObjectProperty;
import cz.cvut.kbss.jopa.model.annotations.*;
import lombok.Getter;
import lombok.Setter;

Expand All @@ -16,4 +13,20 @@ public class FaultEventType extends Event{
@OWLObjectProperty(iri = Vocabulary.s_p_has_failure_rate, cascade = CascadeType.ALL, fetch = FetchType.EAGER)
private FailureRate failureRate;

@Transient
@OWLDataProperty(iri = Vocabulary.s_p_is_performed_by)
private String componentName;

@Transient
@OWLDataProperty(iri = Vocabulary.s_p_fault_event_type)
private String eventType;

@Override
public void setAs(NamedEntity namedEntity) {
if(namedEntity instanceof FaultEventTypeSummary)
((FaultEventTypeSummary)namedEntity).copyTo(this);
else
super.setAs(namedEntity);
}

}
32 changes: 32 additions & 0 deletions src/main/java/cz/cvut/kbss/analysis/model/FaultEventTypeSummary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package cz.cvut.kbss.analysis.model;

import cz.cvut.kbss.analysis.util.Vocabulary;
import cz.cvut.kbss.jopa.model.annotations.*;
import lombok.Getter;
import lombok.Setter;

@SparqlResultSetMappings(
@SparqlResultSetMapping(name="FaultEventSummary", entities = {
@EntityResult(entityClass=FaultEventTypeSummary.class)
})
)
@OWLClass(iri = Vocabulary.s_c_fault_event_type)
@Getter
@Setter
public class FaultEventTypeSummary extends NamedEntity{

@OWLDataProperty(iri = Vocabulary.s_p_is_performed_by)
private String componentName;

@OWLDataProperty(iri = Vocabulary.s_p_fault_event_type)
private String eventType;


// private

public void copyTo(FaultEventType faultEventType){
super.copyTo(faultEventType);
faultEventType.setComponentName(componentName);
faultEventType.setEventType(eventType);
}
}
1 change: 0 additions & 1 deletion src/main/java/cz/cvut/kbss/analysis/model/ava/FHAEventType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package cz.cvut.kbss.analysis.model.ava;

import cz.cvut.kbss.analysis.model.Event;
import cz.cvut.kbss.analysis.model.FaultEventType;
import cz.cvut.kbss.analysis.model.method.VerificationMethod;
import cz.cvut.kbss.analysis.util.Vocabulary;
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/cz/cvut/kbss/analysis/service/FaultEventRepositoryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,4 +191,10 @@ protected void setChange(FaultEvent instance){
faultTreeDao.setChangedByContext(context, new Date());
}

public List<FaultEventType> getTopFaultEvents(URI systemUri) {
return faultEventDao.getTopFaultEvents(systemUri);
}
public List<FaultEventType> getAllFaultEvents(URI systemUri) {
return faultEventDao.getAllFaultEvents(systemUri);
}
}
Loading