feat(#453): de-constructing #447 RSR-1116

Signed-off-by: massifben <[email protected]>
com-pas · Jan 21, 2025 · 578e0a6 · 578e0a6
1 parent afdabad
commit 578e0a6
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 601 deletions.
diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/DataTypeTemplatesService.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/DataTypeTemplatesService.java
@@ -149,6 +149,20 @@ public Optional<DoLinkedToDa> findDoLinkedToDa(TDataTypeTemplates dtt, String lN
                         ));
     }
 
+    public Stream<String> getEnumValues(TDataTypeTemplates dataTypeTemplates, String lnType, DoLinkedToDaFilter doLinkedToDaFilter) {
+        return findDoLinkedToDa(dataTypeTemplates, lnType, doLinkedToDaFilter)
+                .map(DoLinkedToDa::dataAttribute)
+                .filter(dataAttribute -> TPredefinedBasicTypeEnum.ENUM.equals(dataAttribute.getBType()))
+                .map(DataAttribute::getType)
+                .flatMap(enumId ->
+                        dataTypeTemplates.getEnumType().stream()
+                                .filter(tEnumType -> tEnumType.getId().equals(enumId))
+                                .findFirst())
+                .stream()
+                .flatMap(tEnumType -> tEnumType.getEnumVal().stream())
+                .map(TEnumVal::getValue);
+    }
+
     private Optional<TDAType> getDATypeByDaName(TDataTypeTemplates dtt, TDOType tdoType, String daName) {
         return sdoOrDAService.findDA(tdoType, tda -> tda.getName().equals(daName))
                 .flatMap(tda -> daTypeService.findDaType(dtt, tda.getType()));

diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/LNodeStatusService.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/LNodeStatusService.java
diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/domain/DoLinkedToDaFilter.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/domain/DoLinkedToDaFilter.java
@@ -19,32 +19,33 @@ public DoLinkedToDaFilter(String doName, List<String> sdoNames, String daName, L
         this.daName = StringUtils.isBlank(daName) ? null : daName;
         this.bdaNames = bdaNames == null ? Collections.emptyList() : List.copyOf(bdaNames);
     }
-    public DoLinkedToDaFilter(){
-        this(null,null,null,null);
-    }
 
     public static DoLinkedToDaFilter from(String doNames, String daNames) {
         String doName = null;
         List<String> sdoNames = null;
         String daName = null;
         List<String> bdaNames = null;
-        if (StringUtils.isNotBlank(doNames)){
+        if (StringUtils.isNotBlank(doNames)) {
             doName = doNames.split("\\.")[0];
             sdoNames = Arrays.stream(doNames.split("\\.")).skip(1).toList();
         }
-        if (StringUtils.isNotBlank(daNames)){
+        if (StringUtils.isNotBlank(daNames)) {
             daName = daNames.split("\\.")[0];
             bdaNames = Arrays.stream(daNames.split("\\.")).skip(1).toList();
         }
         return new DoLinkedToDaFilter(doName, sdoNames, daName, bdaNames);
     }
 
-public String getDoRef() {
-    return doName + (sdoNames().isEmpty() ? StringUtils.EMPTY : "." + String.join(".", sdoNames()));
-}
+    public String getDoRef() {
+        return doName + (sdoNames().isEmpty() ? StringUtils.EMPTY : "." + String.join(".", sdoNames()));
+    }
 
-public String getDaRef() {
-    return daName + (bdaNames().isEmpty() ? StringUtils.EMPTY : "." + String.join(".", bdaNames()));
-}
+    public String getDaRef() {
+        return daName + (bdaNames().isEmpty() ? StringUtils.EMPTY : "." + String.join(".", bdaNames()));
+    }
 
+    @Override
+    public String toString() {
+        return getDoRef() + "." + getDaRef();
+    }
 }