-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #377 from com-pas/feat/RSR-924_remove_validation_w…
…hen_specific_DOI_and_DAI_does_not_exists feat(#378): remove validation when DOI(Mod) and DAI(stVal) does not exists
- Loading branch information
Showing
13 changed files
with
1,042 additions
and
131 deletions.
There are no files selected for viewing
46 changes: 46 additions & 0 deletions
46
sct-commons/src/main/java/org/lfenergy/compas/sct/commons/DataTypeTemplatesService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| // SPDX-FileCopyrightText: 2024 RTE FRANCE | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package org.lfenergy.compas.sct.commons; | ||
|
|
||
| import org.lfenergy.compas.scl2007b4.model.*; | ||
|
|
||
| import static org.lfenergy.compas.sct.commons.util.CommonConstants.MOD_DO_NAME; | ||
| import static org.lfenergy.compas.sct.commons.util.CommonConstants.STVAL_DA_NAME; | ||
|
|
||
| public class DataTypeTemplatesService { | ||
|
|
||
| final LnodeTypeService lnodeTypeService = new LnodeTypeService(); | ||
| final DoTypeService doTypeService = new DoTypeService(); | ||
| final DoService doService = new DoService(); | ||
|
|
||
| /** | ||
| * verify if DO(name=Mod)/DA(name=stVal) exists in DataTypeTemplate | ||
| * @param dtt TDataTypeTemplates where Data object and Data attribute exists | ||
| * @param lNodeTypeId LNode Type ID where Data object exists | ||
| * DataTypeTemplates model : | ||
| * <DataTypeTemplates> | ||
| * <LNodeType lnClass="LNodeTypeClass" id="LNodeTypeID"> | ||
| * <DO name="Mod" type="DOModTypeID" ../> | ||
| * </LNodeType> | ||
| * ... | ||
| * <DOType cdc="DOTypeCDC" id="DOModTypeID"> | ||
| * <DA name="stVal" ../> | ||
| * </DOType> | ||
| * </DataTypeTemplates> | ||
| * @return true if the Data Object (Mod) and Data attribute (stVal) present, false otherwise | ||
| */ | ||
| public boolean isDoModAndDaStValExist(TDataTypeTemplates dtt, String lNodeTypeId) { | ||
| return lnodeTypeService.findLnodeType(dtt, lNodeType -> lNodeTypeId.equals(lNodeType.getId())) | ||
| .map(lNodeType -> doService.findDo(lNodeType, tdo -> MOD_DO_NAME.equals(tdo.getName())) | ||
| .map(tdo -> doTypeService.findDoType(dtt, doType -> tdo.getType().equals(doType.getId())) | ||
| .map(doType -> doType.getSDOOrDA().stream() | ||
| .filter(sdoOrDa -> sdoOrDa.getClass().equals(TDA.class)) | ||
| .map(TDA.class::cast) | ||
| .anyMatch(tda -> STVAL_DA_NAME.equals(tda.getName()))) | ||
| .orElse(false)) | ||
| .orElse(false)) | ||
| .orElse(false); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
140 changes: 140 additions & 0 deletions
140
sct-commons/src/test/java/org/lfenergy/compas/sct/commons/DataTypeTemplatesServiceTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,140 @@ | ||
| // SPDX-FileCopyrightText: 2024 RTE FRANCE | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package org.lfenergy.compas.sct.commons; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import org.lfenergy.compas.scl2007b4.model.*; | ||
|
|
||
| import static org.assertj.core.api.AssertionsForClassTypes.assertThat; | ||
|
|
||
| class DataTypeTemplatesServiceTest { | ||
|
|
||
| @Test | ||
| void isDoModAndDaStValExist_when_LNodeType_not_exist_should_return_false() { | ||
| //Given | ||
| SCL scl = new SCL(); | ||
| TDataTypeTemplates dtt = new TDataTypeTemplates(); | ||
| scl.setDataTypeTemplates(dtt); | ||
| //When | ||
| DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService(); | ||
| boolean result = dataTypeTemplatesService.isDoModAndDaStValExist(dtt, "lnodeTypeId"); | ||
| //Then | ||
| assertThat(result).isFalse(); | ||
| } | ||
|
|
||
|
|
||
| @Test | ||
| void isDoModAndDaStValExist_when_Do_not_exist_should_return_false() { | ||
| //Given | ||
| SCL scl = new SCL(); | ||
| TDataTypeTemplates dtt = new TDataTypeTemplates(); | ||
| TLNodeType tlNodeType = new TLNodeType(); | ||
| tlNodeType.setId("lnodeTypeId"); | ||
| dtt.getLNodeType().add(tlNodeType); | ||
| scl.setDataTypeTemplates(dtt); | ||
| //When | ||
| DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService(); | ||
| boolean result = dataTypeTemplatesService.isDoModAndDaStValExist(dtt, "lnodeTypeId"); | ||
| //Then | ||
| assertThat(result).isFalse(); | ||
| } | ||
|
|
||
| @Test | ||
| void isDoModAndDaStValExist_when_DoType_not_exist_should_return_false() { | ||
| //Given | ||
| SCL scl = new SCL(); | ||
| TDataTypeTemplates dtt = new TDataTypeTemplates(); | ||
| TLNodeType tlNodeType = new TLNodeType(); | ||
| tlNodeType.setId("lnodeTypeId"); | ||
| TDO tdo = new TDO(); | ||
| tdo.setType("doTypeId"); | ||
| tdo.setName("Mod"); | ||
| tlNodeType.getDO().add(tdo); | ||
| dtt.getLNodeType().add(tlNodeType); | ||
| //When | ||
| DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService(); | ||
| boolean result = dataTypeTemplatesService.isDoModAndDaStValExist(dtt, "lnodeTypeId"); | ||
| //Then | ||
| assertThat(result).isFalse(); | ||
| } | ||
|
|
||
|
|
||
| @Test | ||
| void isDoModAndDaStValExist_when_Da_Mod_not_exist_should_return_false() { | ||
| //Given | ||
| SCL scl = new SCL(); | ||
| TDataTypeTemplates dtt = new TDataTypeTemplates(); | ||
| TLNodeType tlNodeType = new TLNodeType(); | ||
| tlNodeType.setId("lnodeTypeId"); | ||
| TDO tdo = new TDO(); | ||
| tdo.setType("doTypeId"); | ||
| tdo.setName("Mod"); | ||
| tlNodeType.getDO().add(tdo); | ||
| dtt.getLNodeType().add(tlNodeType); | ||
| TDOType tdoType = new TDOType(); | ||
| tdoType.setId("doTypeId"); | ||
| dtt.getDOType().add(tdoType); | ||
| scl.setDataTypeTemplates(dtt); | ||
| //When | ||
| DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService(); | ||
| boolean result = dataTypeTemplatesService.isDoModAndDaStValExist(dtt, "lnodeTypeId"); | ||
| //Then | ||
| assertThat(result).isFalse(); | ||
| } | ||
|
|
||
|
|
||
| @Test | ||
| void isDoModAndDaStValExist_when_Da_stVal_not_found_should_return_false() { | ||
| //Given | ||
| SCL scl = new SCL(); | ||
| TDataTypeTemplates dtt = new TDataTypeTemplates(); | ||
| TLNodeType tlNodeType = new TLNodeType(); | ||
| tlNodeType.setId("lnodeTypeId"); | ||
| TDO tdo = new TDO(); | ||
| tdo.setType("doTypeId"); | ||
| tdo.setName("Mod"); | ||
| tlNodeType.getDO().add(tdo); | ||
| dtt.getLNodeType().add(tlNodeType); | ||
| TDOType tdoType = new TDOType(); | ||
| tdoType.setId("doTypeId"); | ||
| TDA tda = new TDA(); | ||
| tda.setName("daName"); | ||
| tdoType.getSDOOrDA().add(tda); | ||
| dtt.getDOType().add(tdoType); | ||
| scl.setDataTypeTemplates(dtt); | ||
| //When | ||
| DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService(); | ||
| boolean result = dataTypeTemplatesService.isDoModAndDaStValExist(dtt, "lnodeTypeId"); | ||
| //Then | ||
| assertThat(result).isFalse(); | ||
| } | ||
|
|
||
|
|
||
| @Test | ||
| void isDoModAndDaStValExist_when_DO_Mod_And_DA_stVal_exist_return_true() { | ||
| //Given | ||
| SCL scl = new SCL(); | ||
| TDataTypeTemplates dtt = new TDataTypeTemplates(); | ||
| TLNodeType tlNodeType = new TLNodeType(); | ||
| tlNodeType.setId("lnodeTypeId"); | ||
| TDO tdo = new TDO(); | ||
| tdo.setType("doTypeId"); | ||
| tdo.setName("Mod"); | ||
| tlNodeType.getDO().add(tdo); | ||
| dtt.getLNodeType().add(tlNodeType); | ||
| TDOType tdoType = new TDOType(); | ||
| tdoType.setId("doTypeId"); | ||
| TDA tda = new TDA(); | ||
| tda.setName("stVal"); | ||
| tdoType.getSDOOrDA().add(tda); | ||
| dtt.getDOType().add(tdoType); | ||
| scl.setDataTypeTemplates(dtt); | ||
| //When | ||
| DataTypeTemplatesService dataTypeTemplatesService = new DataTypeTemplatesService(); | ||
| boolean result = dataTypeTemplatesService.isDoModAndDaStValExist(dtt, "lnodeTypeId"); | ||
| //Then | ||
| assertThat(result).isTrue(); | ||
| } | ||
| } |
Oops, something went wrong.