Skip to content

Add publishedVersionId to FeedSourceSummary #653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
binh-dam-ibigroup merged 2 commits into from
Jun 11, 2026
+50 −37
Merged

Add publishedVersionId to FeedSourceSummary #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba60959
fix(FeedSourceSummary): Add publishedVersionId.
binh-dam-ibigroup Jun 4, 2026
92a11c7
test(FeedSourceController): Test for new field.
binh-dam-ibigroup Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/main/java/com/conveyal/datatools/manager/models/FeedSourceSummary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ public class FeedSourceSummary {

public FeedValidationResultSummary publishedValidationSummary;

public String publishedVersionId;

public PublishState publishState;

@JsonInclude(JsonInclude.Include.NON_NULL)
Expand All @@ -113,6 +115,7 @@ public FeedSourceSummary(String projectId, String organizationId, Document feedS
// Convert to local date type for consistency.
lastUpdated = getLocalDateFromDate(feedSourceDocument.getDate("lastUpdated"));
url = feedSourceDocument.getString("url");
publishedVersionId = feedSourceDocument.getString("publishedVersionId");
// Get optional filename.
filename = feedSourceDocument.getString("filename");
// Optional external properties, if enabled by config.
Expand Down Expand Up @@ -180,7 +183,8 @@ public static List<FeedSourceSummary> getFeedSourceSummaries(String projectId, S
"labelIds",
"url",
"filename",
"noteIds"
"noteIds",
"publishedVersionId"
)
),
sort(Sorts.ascending("name"))
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/mongo/getFeedSourceSummaries.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ db.getCollection('FeedSource').aggregate([
"labelIds": 1,
"url": 1,
"filename": 1,
"noteIds": 1
"noteIds": 1,
"publishedVersionId": 1
}
},
{
Expand Down
78 changes: 43 additions & 35 deletions src/test/java/com/conveyal/datatools/manager/controllers/api/FeedSourceControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import com.conveyal.datatools.manager.models.FeedRetrievalMethod;
import com.conveyal.datatools.manager.models.FeedSource;
import com.conveyal.datatools.manager.models.FeedSourceSummary;
import com.conveyal.datatools.manager.models.FeedValidationResultSummary;
import com.conveyal.datatools.manager.models.FeedVersion;
import com.conveyal.datatools.manager.models.FeedVersionSummary;
import com.conveyal.datatools.manager.models.FetchFrequency;
Expand Down Expand Up @@ -374,25 +375,28 @@ void canRetrieveDeployedFeedVersionFromLatestDeployment() throws IOException {
);

assertNotNull(feedSourceSummaries);
assertEquals(feedSourceWithLatestDeploymentFeedVersion.id, feedSourceSummaries.get(0).id);
assertEquals(feedSourceWithLatestDeploymentFeedVersion.projectId, feedSourceSummaries.get(0).projectId);
assertEquals(feedSourceWithLatestDeploymentFeedVersion.labelIds, feedSourceSummaries.get(0).labelIds);
assertEquals(feedSourceWithLatestDeploymentFeedVersion.url.toString(), feedSourceSummaries.get(0).url);
assertEquals(feedSourceWithLatestDeploymentFeedVersion.noteIds, feedSourceSummaries.get(0).noteIds);
assertEquals(feedSourceWithLatestDeploymentFeedVersion.organizationId(), feedSourceSummaries.get(0).organizationId);
assertEquals(feedVersionFromLatestDeploymentVersion2.id, feedSourceSummaries.get(0).deployedFeedVersionId);
assertEquals(feedVersionFromLatestDeploymentVersion2.validationSummary().startDate, feedSourceSummaries.get(0).deployedFeedVersionStartDate);
assertEquals(feedVersionFromLatestDeploymentVersion2.validationSummary().endDate, feedSourceSummaries.get(0).deployedFeedVersionEndDate);
assertEquals(feedVersionFromLatestDeploymentVersion2.validationSummary().errorCount, feedSourceSummaries.get(0).deployedFeedVersionIssues);
assertEquals(feedVersionFromLatestDeploymentVersion2.id, feedSourceSummaries.get(0).latestValidation.feedVersionId);
assertEquals(feedVersionFromLatestDeploymentVersion2.validationSummary().startDate, feedSourceSummaries.get(0).latestValidation.startDate);
assertEquals(feedVersionFromLatestDeploymentVersion2.validationSummary().endDate, feedSourceSummaries.get(0).latestValidation.endDate);
assertEquals(feedVersionFromLatestDeploymentVersion2.validationSummary().errorCount, feedSourceSummaries.get(0).latestValidation.errorCount);
assertEquals(feedVersionFromLatestDeploymentVersion2.sentToExternalPublisher, feedSourceSummaries.get(0).latestSentToExternalPublisher);
assertEquals(PublishState.PUBLISH_BLOCKED, feedSourceSummaries.get(0).publishState);
assertEquals(feedVersionPublishedFromLatestDeployment.validationResult.errorCount, feedSourceSummaries.get(0).publishedValidationSummary.errorCount);
assertEquals(feedVersionPublishedFromLatestDeployment.validationResult.firstCalendarDate, feedSourceSummaries.get(0).publishedValidationSummary.startDate);
assertEquals(feedVersionPublishedFromLatestDeployment.validationResult.lastCalendarDate, feedSourceSummaries.get(0).publishedValidationSummary.endDate);
FeedSourceSummary firstSummary = feedSourceSummaries.get(0);
FeedValidationResultSummary expectedValidationSummary = feedVersionFromLatestDeploymentVersion2.validationSummary();
assertEquals(feedSourceWithLatestDeploymentFeedVersion.id, firstSummary.id);
assertEquals(feedSourceWithLatestDeploymentFeedVersion.projectId, firstSummary.projectId);
assertEquals(feedSourceWithLatestDeploymentFeedVersion.labelIds, firstSummary.labelIds);
assertEquals(feedSourceWithLatestDeploymentFeedVersion.url.toString(), firstSummary.url);
assertEquals(feedSourceWithLatestDeploymentFeedVersion.noteIds, firstSummary.noteIds);
assertEquals(feedSourceWithLatestDeploymentFeedVersion.organizationId(), firstSummary.organizationId);
assertEquals(feedVersionFromLatestDeploymentVersion2.id, firstSummary.deployedFeedVersionId);
assertEquals(expectedValidationSummary.startDate, firstSummary.deployedFeedVersionStartDate);
assertEquals(expectedValidationSummary.endDate, firstSummary.deployedFeedVersionEndDate);
assertEquals(expectedValidationSummary.errorCount, firstSummary.deployedFeedVersionIssues);
assertEquals(feedVersionFromLatestDeploymentVersion2.id, firstSummary.latestValidation.feedVersionId);
assertEquals(expectedValidationSummary.startDate, firstSummary.latestValidation.startDate);
assertEquals(expectedValidationSummary.endDate, firstSummary.latestValidation.endDate);
assertEquals(expectedValidationSummary.errorCount, firstSummary.latestValidation.errorCount);
assertEquals(feedVersionFromLatestDeploymentVersion2.sentToExternalPublisher, firstSummary.latestSentToExternalPublisher);
assertEquals(PublishState.PUBLISH_BLOCKED, firstSummary.publishState);
assertEquals(feedSourceWithLatestDeploymentFeedVersion.publishedVersionId, firstSummary.publishedVersionId);
assertEquals(feedVersionPublishedFromLatestDeployment.validationResult.errorCount, firstSummary.publishedValidationSummary.errorCount);
assertEquals(feedVersionPublishedFromLatestDeployment.validationResult.firstCalendarDate, firstSummary.publishedValidationSummary.startDate);
assertEquals(feedVersionPublishedFromLatestDeployment.validationResult.lastCalendarDate, firstSummary.publishedValidationSummary.endDate);
}

@Test
Expand All @@ -413,22 +417,26 @@ void canRetrieveDeployedFeedVersionFromPinnedDeployment() throws IOException {
FeedSourceSummary.class
);
assertNotNull(feedSourceSummaries);
assertEquals(feedSourceWithPinnedDeploymentFeedVersion.id, feedSourceSummaries.get(0).id);
assertEquals(feedSourceWithPinnedDeploymentFeedVersion.projectId, feedSourceSummaries.get(0).projectId);
assertEquals(feedSourceWithPinnedDeploymentFeedVersion.labelIds, feedSourceSummaries.get(0).labelIds);
assertEquals(feedSourceWithPinnedDeploymentFeedVersion.url.toString(), feedSourceSummaries.get(0).url);
assertEquals(feedSourceWithPinnedDeploymentFeedVersion.noteIds, feedSourceSummaries.get(0).noteIds);
assertEquals(feedSourceWithPinnedDeploymentFeedVersion.organizationId(), feedSourceSummaries.get(0).organizationId);
assertEquals(feedVersionFromPinnedDeployment.id, feedSourceSummaries.get(0).deployedFeedVersionId);
assertEquals(feedVersionFromPinnedDeployment.validationSummary().startDate, feedSourceSummaries.get(0).deployedFeedVersionStartDate);
assertEquals(feedVersionFromPinnedDeployment.validationSummary().endDate, feedSourceSummaries.get(0).deployedFeedVersionEndDate);
assertEquals(feedVersionFromPinnedDeployment.validationSummary().errorCount, feedSourceSummaries.get(0).deployedFeedVersionIssues);
assertEquals(feedVersionFromPinnedDeployment.id, feedSourceSummaries.get(0).latestValidation.feedVersionId);
assertEquals(feedVersionFromPinnedDeployment.validationSummary().startDate, feedSourceSummaries.get(0).latestValidation.startDate);
assertEquals(feedVersionFromPinnedDeployment.validationSummary().endDate, feedSourceSummaries.get(0).latestValidation.endDate);
assertEquals(feedVersionFromPinnedDeployment.validationSummary().errorCount, feedSourceSummaries.get(0).latestValidation.errorCount);
assertEquals(feedVersionFromPinnedDeployment.sentToExternalPublisher, feedSourceSummaries.get(0).latestSentToExternalPublisher);
assertEquals(PublishState.PUBLISH_BLOCKED, feedSourceSummaries.get(0).publishState);
FeedSourceSummary firstSummary = feedSourceSummaries.get(0);
FeedValidationResultSummary expectedValidationSummary = feedVersionFromPinnedDeployment.validationSummary();

assertEquals(feedSourceWithPinnedDeploymentFeedVersion.id, firstSummary.id);
assertEquals(feedSourceWithPinnedDeploymentFeedVersion.projectId, firstSummary.projectId);
assertEquals(feedSourceWithPinnedDeploymentFeedVersion.labelIds, firstSummary.labelIds);
assertEquals(feedSourceWithPinnedDeploymentFeedVersion.url.toString(), firstSummary.url);
assertEquals(feedSourceWithPinnedDeploymentFeedVersion.noteIds, firstSummary.noteIds);
assertEquals(feedSourceWithPinnedDeploymentFeedVersion.organizationId(), firstSummary.organizationId);
assertEquals(feedVersionFromPinnedDeployment.id, firstSummary.deployedFeedVersionId);
assertEquals(expectedValidationSummary.startDate, firstSummary.deployedFeedVersionStartDate);
assertEquals(expectedValidationSummary.endDate, firstSummary.deployedFeedVersionEndDate);
assertEquals(expectedValidationSummary.errorCount, firstSummary.deployedFeedVersionIssues);
assertEquals(feedVersionFromPinnedDeployment.id, firstSummary.latestValidation.feedVersionId);
assertEquals(expectedValidationSummary.startDate, firstSummary.latestValidation.startDate);
assertEquals(expectedValidationSummary.endDate, firstSummary.latestValidation.endDate);
assertEquals(expectedValidationSummary.errorCount, firstSummary.latestValidation.errorCount);
assertEquals(feedVersionFromPinnedDeployment.sentToExternalPublisher, firstSummary.latestSentToExternalPublisher);
assertEquals(PublishState.PUBLISH_BLOCKED, firstSummary.publishState);
assertEquals(feedSourceWithPinnedDeploymentFeedVersion.publishedVersionId, firstSummary.publishedVersionId);
}

@ParameterizedTest
Expand Down
Loading