Exclude draft form definitions from Central list

getodk · Oct 26, 2020 · 663627f · 663627f
1 parent b55a171
commit 663627f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/org/opendatakit/briefcase/reused/transfer/CentralServer.java b/src/org/opendatakit/briefcase/reused/transfer/CentralServer.java
@@ -231,6 +231,7 @@ public Request<List<RemoteFormDefinition>> getFormsListRequest(String token) {
         .withPath("/v1/projects/" + projectId + "/forms")
         .withHeader("Authorization", "Bearer " + token)
         .withResponseMapper(list -> list.stream()
+            .filter(json -> json.get("publishedAt") != null)
             .map(json -> new RemoteFormDefinition(
                 (String) json.get("name"),
                 (String) json.get("xmlFormId"),

diff --git a/test/java/org/opendatakit/briefcase/reused/transfer/TransferTestHelpers.java b/test/java/org/opendatakit/briefcase/reused/transfer/TransferTestHelpers.java
@@ -27,6 +27,9 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -247,11 +250,13 @@ public static String listOfFormsResponseFromCentral(FormStatus... forms) {
                     "\t{\n" +
                     "\t  \"xmlFormId\": \"%s\",\n" +
                     "\t  \"name\": \"%s\",\n" +
-                    "\t  \"version\": %s\n" +
+                    "\t  \"version\": %s\n," +
+                    "\t  \"publishedAt\": \"%s\"\n" +
                     "\t}",
                 form.getFormId(),
                 form.getFormName(),
-                form.getFormDefinition().getVersionString() == null ? "null" : "\"" + form.getFormDefinition().getVersionString() + "\""
+                form.getFormDefinition().getVersionString() == null ? "null" : "\"" + form.getFormDefinition().getVersionString() + "\"",
+                ZonedDateTime.now( ZoneOffset.UTC ).format( DateTimeFormatter.ISO_INSTANT )
             ))
             .collect(joining(",\n"))
         + "\n]";