fix: added more importModes to program rule variable names validator …

…[DHIS2-11273] (dhis2#8155) * fix: added more importModes to program rule variable names validator * tests: added a specific test case * style: fix sonarcloud warning * style: changed List for Set for better performances
davidhuser · Jun 9, 2021 · a752e32 · a752e32
1 parent 8303051
commit a752e32
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/...a/org/hisp/dhis/dxf2/metadata/objectbundle/hooks/ProgramRuleVariableObjectBundleHook.java b/...a/org/hisp/dhis/dxf2/metadata/objectbundle/hooks/ProgramRuleVariableObjectBundleHook.java
@@ -29,6 +29,7 @@
 
 import static org.hisp.dhis.dxf2.Constants.PROGRAM_RULE_VARIABLE_NAME_INVALID_KEYWORDS;
 
+import java.util.Set;
 import java.util.function.Consumer;
 import java.util.stream.IntStream;
 
@@ -44,6 +45,7 @@
 import org.springframework.stereotype.Component;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 
 /**
  * @author Zubair Asghar.
@@ -60,6 +62,12 @@ public class ProgramRuleVariableObjectBundleHook extends AbstractObjectBundleHoo
         .put( ProgramRuleVariableSourceType.TEI_ATTRIBUTE, this::processTEA )
         .build();
 
+    private static final Set<ImportStrategy> UPDATE_STRATEGIES = ImmutableSet.of(
+        ImportStrategy.UPDATE,
+        ImportStrategy.CREATE_AND_UPDATE,
+        ImportStrategy.NEW_AND_UPDATES,
+        ImportStrategy.UPDATES );
+
     private static final String FROM_PROGRAM_RULE_VARIABLE = " from ProgramRuleVariable prv where prv.name = :name and prv.program.uid = :programUid";
 
     private final String PROGRAM_RULE_VARIABLE_NAME_INVALID_KEYWORDS_REGEX;
@@ -88,7 +96,7 @@ private void validateUniqueProgramRuleName( ObjectBundle bundle,
     {
         Query<ProgramRuleVariable> query = getProgramRuleVariableQuery( programRuleVariable );
 
-        int allowedCount = bundle.getImportMode() == ImportStrategy.UPDATE ? 1 : 0;
+        int allowedCount = UPDATE_STRATEGIES.contains( bundle.getImportMode() ) ? 1 : 0;
 
         if ( query.getResultList().size() > allowedCount )
         {

diff --git a/...g/hisp/dhis/dxf2/metadata/objectbundle/hooks/ProgramRuleVariableObjectBundleHookTest.java b/...g/hisp/dhis/dxf2/metadata/objectbundle/hooks/ProgramRuleVariableObjectBundleHookTest.java
@@ -121,6 +121,19 @@ public void shouldFailValidationInvalidCount()
         assertTrue( errorReports.stream().anyMatch( e -> e.getErrorCode().equals( E4051 ) ) );
     }
 
+    @Test
+    public void shouldNotFailValidationInvalidCount()
+    {
+        when( programRuleVariable.getProgram() ).thenReturn( program );
+        when( objectBundle.getImportMode() ).thenReturn( ImportStrategy.CREATE_AND_UPDATE );
+        when( query.getResultList() ).thenReturn( Collections.singletonList( new ProgramRuleVariable() ) );
+
+        when( programRuleVariable.getName() ).thenReturn( "word" );
+        List<ErrorReport> errorReports = programRuleVariableObjectBundleHook.validate( programRuleVariable,
+            objectBundle );
+        assertEquals( 0, errorReports.size() );
+    }
+
     @Test
     public void shouldFailValidationInvalidCountAndInvalidName()
     {