fix(AutoPublishJob): Prevent publishing if errors were found.

Author: binh-dam-ibigroup

src/main/java/com/conveyal/datatools/manager/jobs/AutoPublishJob.java

@@ -43,19 +43,21 @@ protected void innerJobLogic() throws Exception {
         // Validate and check for blocking issues in the feed version to deploy.
         if (latestFeedVersion.hasBlockingIssuesForPublishing()) {
             status.fail("Could not publish this feed version because it contains blocking errors.");
-        }
-
-        try {
-            GtfsPlusValidation gtfsPlusValidation = GtfsPlusValidation.validate(latestFeedVersion.id);
-            if (!gtfsPlusValidation.issues.isEmpty()) {
-                status.fail("Could not publish this feed version because it contains GTFS+ blocking errors.");
+        } else {
+            try {
+                GtfsPlusValidation gtfsPlusValidation = GtfsPlusValidation.validate(latestFeedVersion.id);
+                if (!gtfsPlusValidation.issues.isEmpty()) {
+                    status.fail("Could not publish this feed version because it contains GTFS+ blocking errors.");
+                }
+            } catch(Exception e) {
+                status.fail("Could not read GTFS+ zip file", e);
             }
-        } catch(Exception e) {
-            status.fail("Could not read GTFS+ zip file", e);
         }
 
         // If validation successful, just execute the feed updating process.
-        FeedVersionController.publishToExternalResource(latestFeedVersion);
-        LOG.info("Auto-published feed source {} to external resource.", feedSource.id);
+        if (!status.error) {
+            FeedVersionController.publishToExternalResource(latestFeedVersion);
+            LOG.info("Auto-published feed source {} to external resource.", feedSource.id);
+        }
     }
 }

src/test/java/com/conveyal/datatools/manager/jobs/AutoPublishJobTest.java

@@ -88,10 +88,11 @@ public static void tearDown() {
     @MethodSource("createPublishFeedCases")
     void shouldProcessFeed(String resourceName, boolean isError, String errorMessage) throws IOException {
         // Add the version to the feed source
+        FeedVersion originalFeedVersion;
         if (resourceName.endsWith(".zip")) {
-            createFeedVersionFromGtfsZip(feedSource, resourceName);
+            originalFeedVersion = createFeedVersionFromGtfsZip(feedSource, resourceName);
         } else {
-            createFeedVersion(feedSource, zipFolderFiles(resourceName));
+            originalFeedVersion = createFeedVersion(feedSource, zipFolderFiles(resourceName));
         }
 
         // Create the job
@@ -108,6 +109,10 @@ void shouldProcessFeed(String resourceName, boolean isError, String errorMessage
 
         if (isError) {
             assertEquals(errorMessage, autoPublishJob.status.message);
+
+            // In case of error, the sentToExternalPublisher flag should not be set.
+            FeedVersion updatedFeedVersion = Persistence.feedVersions.getById(originalFeedVersion.id);
+            assertNull(updatedFeedVersion.sentToExternalPublisher);
         }
     }