improvement(Updated feed source summary): Added published version id

Author: br648

src/main/java/com/conveyal/datatools/manager/models/FeedSourceSummary.java

@@ -81,6 +81,8 @@ public class FeedSourceSummary {
 
     public GtfsPlusValidation latestGtfsPlusValidation;
 
+    public String latestPublishedVersionId;
+
     public FeedSourceSummary() {
     }
 
@@ -124,6 +126,7 @@ public void setFeedVersion(FeedVersionSummary feedVersionSummary, boolean isDepl
                 this.latestProcessedByExternalPublisher = feedVersionSummary.processedByExternalPublisher;
                 this.latestSentToExternalPublisher = feedVersionSummary.sentToExternalPublisher;
                 this.latestGtfsPlusValidation = feedVersionSummary.gtfsPlusValidation;
+                this.latestPublishedVersionId = feedVersionSummary.publishedVersionId;
             }
         }
     }
@@ -215,6 +218,7 @@ public static Map<String, FeedVersionSummary> getLatestFeedVersionForFeedSources
                 {
                     $group: {
                         _id: "$_id",
+                        publishedVersionId: { $first: "$publishedVersionId" },
                         doc: {
                             $max: {
                                 version: "$feedVersions.version",
@@ -239,6 +243,7 @@ public static Map<String, FeedVersionSummary> getLatestFeedVersionForFeedSources
             unwind("$feedVersions"),
             group(
                 "$_id",
+                Accumulators.first("publishedVersionId", "$publishedVersionId"),
                 Accumulators.last("feedVersionId", "$feedVersions._id"),
                 Accumulators.last("firstCalendarDate", "$feedVersions.validationResult.firstCalendarDate"),
                 Accumulators.last("lastCalendarDate", "$feedVersions.validationResult.lastCalendarDate"),
@@ -486,6 +491,7 @@ private static Map<String, FeedVersionSummary> extractFeedVersionSummaries(
             feedVersionSummary.processedByExternalPublisher = feedVersionDocument.getDate("processedByExternalPublisher");
             feedVersionSummary.sentToExternalPublisher = feedVersionDocument.getDate("sentToExternalPublisher");
             feedVersionSummary.gtfsPlusValidation = getGtfsPlusValidation(feedVersionDocument);
+            feedVersionSummary.publishedVersionId = feedVersionDocument.getString("publishedVersionId");
             feedVersionSummary.validationResult = getValidationResult(hasChildValidationResultDocument, feedVersionDocument);
             feedVersionSummaries.put(feedVersionDocument.getString(feedSourceKey), feedVersionSummary);
         }

src/main/java/com/conveyal/datatools/manager/models/FeedVersionSummary.java

@@ -32,6 +32,7 @@ public class FeedVersionSummary extends Model implements Serializable {
     public Date processedByExternalPublisher;
     public Date sentToExternalPublisher;
     public GtfsPlusValidation gtfsPlusValidation;
+    public String publishedVersionId;
 
     public PartialValidationSummary getValidationSummary() {
         if (validationSummary == null) {

src/test/java/com/conveyal/datatools/manager/controllers/api/FeedSourceControllerTest.java

@@ -403,7 +403,7 @@ void canRetrieveDeployedFeedVersionFromLatestDeployment() throws IOException {
         assertEquals(feedVersionFromLatestDeployment.sentToExternalPublisher, feedSourceSummaries.get(0).latestSentToExternalPublisher);
         assertEquals(feedVersionFromLatestDeployment.gtfsPlusValidation.issues.size(), feedSourceSummaries.get(0).latestGtfsPlusValidation.issues.size());
         assertEquals(feedVersionFromLatestDeployment.gtfsPlusValidation.published, feedSourceSummaries.get(0).latestGtfsPlusValidation.published);
-
+        assertEquals(feedSourceWithLatestDeploymentFeedVersion.publishedVersionId, feedSourceSummaries.get(0).latestPublishedVersionId);
     }
 
     @Test
@@ -442,6 +442,7 @@ void canRetrieveDeployedFeedVersionFromPinnedDeployment() throws IOException {
         assertEquals(feedVersionFromPinnedDeployment.sentToExternalPublisher, feedSourceSummaries.get(0).latestSentToExternalPublisher);
         assertEquals(feedVersionFromPinnedDeployment.gtfsPlusValidation.issues.size(), feedSourceSummaries.get(0).latestGtfsPlusValidation.issues.size());
         assertEquals(feedVersionFromPinnedDeployment.gtfsPlusValidation.published, feedSourceSummaries.get(0).latestGtfsPlusValidation.published);
+        assertEquals(feedSourceWithPinnedDeploymentFeedVersion.publishedVersionId, feedSourceSummaries.get(0).latestPublishedVersionId);
     }
 
     private static FeedSource createFeedSource(String name, URL url, Project project) {
@@ -472,6 +473,7 @@ private static FeedSource createFeedSource(
         feedSource.projectId = project.id;
         feedSource.retrievalMethod = FeedRetrievalMethod.FETCHED_AUTOMATICALLY;
         feedSource.url = url;
+        feedSource.publishedVersionId = "published-version-id-1";
         if (labels != null) feedSource.labelIds = labels;
         if (notes != null) feedSource.noteIds = notes;
         if (persist) Persistence.feedSources.create(feedSource);