Merge pull request #1358 from dimagi/dynamicSearchSuite

retrieve dynamic search for query request

src/cli/java/org/commcare/util/screen/QueryScreen.java

@@ -59,6 +59,8 @@ public class QueryScreen extends Screen {
 
     private boolean defaultSearch;
 
+    private boolean dynamicSearch;
+
     public QueryScreen(String domainedUsername, String password, PrintStream out,
             VirtualDataInstanceStorage instanceStorage, SessionUtils sessionUtils) {
         this.domainedUsername = domainedUsername;
@@ -91,6 +93,7 @@ public void init(SessionWrapper sessionWrapper) throws CommCareSessionException
 
         mTitle = getTitleLocaleString();
         description = getDescriptionLocaleString();
+        dynamicSearch = getQueryDatum().getDynamicSearch();
     }
 
     private String getTitleLocaleString() {
@@ -211,6 +214,10 @@ public String getDescriptionText() {
         return description;
     }
 
+    public boolean getDynamicSearch() {
+        return dynamicSearch;
+    }
+
     @Override
     public boolean prompt(PrintStream out) {
         if (doDefaultSearch()) {
@@ -275,6 +282,7 @@ public boolean doDefaultSearch() {
         return remoteQuerySessionManager.doDefaultSearch();
     }
 
+
     public RemoteQueryDatum getQueryDatum() {
         return remoteQuerySessionManager.getQueryDatum();
     }

src/main/java/org/commcare/session/RemoteQuerySessionManager.java

@@ -306,6 +306,10 @@ public boolean doDefaultSearch() {
         return queryDatum.doDefaultSearch();
     }
 
+    public boolean getDynamicSearch() {
+        return queryDatum.getDynamicSearch();
+    }
+
     // Converts a string containing space separated list of choices
     // into a string array of individual choices
     public static String[] extractMultipleChoices(String answer) {

src/main/java/org/commcare/suite/model/RemoteQueryDatum.java

@@ -30,6 +30,7 @@ public class RemoteQueryDatum extends SessionDatum {
     private OrderedHashtable<String, QueryPrompt> userQueryPrompts;
     private boolean useCaseTemplate;
     private boolean defaultSearch;
+    private boolean dynamicSearch;
     private Text title;
     private Text description;
 
@@ -45,12 +46,13 @@ public RemoteQueryDatum() {
     public RemoteQueryDatum(URL url, String storageInstance,
             List<QueryData> hiddenQueryValues,
                             OrderedHashtable<String, QueryPrompt> userQueryPrompts,
-                            boolean useCaseTemplate, boolean defaultSearch, Text title, Text description) {
+                            boolean useCaseTemplate, boolean defaultSearch, boolean dynamicSearch, Text title, Text description) {
         super(storageInstance, url.toString());
         this.hiddenQueryValues = hiddenQueryValues;
         this.userQueryPrompts = userQueryPrompts;
         this.useCaseTemplate = useCaseTemplate;
         this.defaultSearch = defaultSearch;
+        this.dynamicSearch = dynamicSearch;
         this.title = title;
         this.description = description;
     }
@@ -81,6 +83,10 @@ public boolean doDefaultSearch() {
         return defaultSearch;
     }
 
+    public boolean getDynamicSearch() {
+        return dynamicSearch;
+    }
+
     public Text getTitleText() {
         return title;
     }
@@ -102,7 +108,7 @@ public void readExternal(DataInputStream in, PrototypeFactory pf)
         description = (Text) ExtUtil.read(in, new ExtWrapNullable(Text.class), pf);
         useCaseTemplate = ExtUtil.readBool(in);
         defaultSearch = ExtUtil.readBool(in);
-
+        dynamicSearch = ExtUtil.readBool(in);
     }
 
     @Override
@@ -114,6 +120,7 @@ public void writeExternal(DataOutputStream out) throws IOException {
         ExtUtil.write(out, new ExtWrapNullable(description));
         ExtUtil.writeBool(out, useCaseTemplate);
         ExtUtil.writeBool(out, defaultSearch);
+        ExtUtil.writeBool(out, dynamicSearch);
 
     }
 }

src/main/java/org/commcare/xml/SessionDatumParser.java

@@ -126,6 +126,7 @@ private RemoteQueryDatum parseRemoteQueryDatum()
         }
 
         boolean defaultSearch = "true".equals(parser.getAttributeValue(null, "default_search"));
+        boolean dynamicSearch = "true".equals(parser.getAttributeValue(null, "dynamic_search"));
         Text title = null;
         Text description = null;
         ArrayList<QueryData> hiddenQueryValues = new ArrayList<QueryData>();
@@ -144,7 +145,7 @@ private RemoteQueryDatum parseRemoteQueryDatum()
                 description = new TextParser(parser).parse();
             }
         }
-        return new RemoteQueryDatum(queryUrl, queryResultStorageInstance,
-                hiddenQueryValues, userQueryPrompts, useCaseTemplate, defaultSearch, title, description);
+        return new RemoteQueryDatum(queryUrl, queryResultStorageInstance, hiddenQueryValues,
+            userQueryPrompts, useCaseTemplate, defaultSearch, dynamicSearch, title, description);
     }
 }

src/test/java/org/commcare/backend/suite/model/test/CaseClaimModelTests.java

@@ -62,6 +62,8 @@ public void testRemoteQueryDatum() throws Exception {
 
         Text description = ((RemoteQueryDatum) datum).getDescriptionText();
         Assert.assertEquals("Description text", description.evaluate());
+
+        Assert.assertTrue(((RemoteQueryDatum)datum).getDynamicSearch());
     }
 
     @Test

src/test/resources/case_claim_example/suite.xml

@@ -61,7 +61,7 @@
     <instance id="casedb" src="jr://instance/casedb"/>
     <instance id="my-search-input" src="jr://instance/search-input/patients"/>
     <session>
-      <query url="https://www.fake.com/patient_search/" storage-instance="patients">
+      <query url="https://www.fake.com/patient_search/" storage-instance="patients" dynamic_search="true">
         <title>
           <text>
             <locale id="query.title"/>