Skip to content

Commit e5433c0

Browse files
authored
Merge pull request #905 from amvanbaren/bugfix/batch-file-urls
Add missing fields
2 parents 06a2c1a + 0bdf656 commit e5433c0

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

server/src/main/java/org/eclipse/openvsx/repositories/ExtensionVersionJooqRepository.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,6 +673,7 @@ public List<ExtensionVersion> findLatest(Namespace namespace) {
673673
latestQuery.addSelect(
674674
EXTENSION_VERSION.ID,
675675
EXTENSION_VERSION.VERSION,
676+
EXTENSION_VERSION.TARGET_PLATFORM,
676677
EXTENSION_VERSION.TIMESTAMP,
677678
EXTENSION_VERSION.DISPLAY_NAME,
678679
EXTENSION_VERSION.DESCRIPTION,
@@ -691,6 +692,7 @@ public List<ExtensionVersion> findLatest(Namespace namespace) {
691692
EXTENSION.DOWNLOAD_COUNT,
692693
latest.field(EXTENSION_VERSION.ID),
693694
latest.field(EXTENSION_VERSION.VERSION),
695+
latest.field(EXTENSION_VERSION.TARGET_PLATFORM),
694696
latest.field(EXTENSION_VERSION.TIMESTAMP),
695697
latest.field(EXTENSION_VERSION.DISPLAY_NAME),
696698
latest.field(EXTENSION_VERSION.DESCRIPTION),
@@ -715,6 +717,7 @@ public List<ExtensionVersion> findLatest(Namespace namespace) {
715717
var extVersion = new ExtensionVersion();
716718
extVersion.setId(record.get(latest.field(EXTENSION_VERSION.ID)));
717719
extVersion.setVersion(record.get(latest.field(EXTENSION_VERSION.VERSION)));
720+
extVersion.setTargetPlatform(record.get(latest.field(EXTENSION_VERSION.TARGET_PLATFORM)));
718721
extVersion.setTimestamp(record.get(latest.field(EXTENSION_VERSION.TIMESTAMP)));
719722
extVersion.setDisplayName(record.get(latest.field(EXTENSION_VERSION.DISPLAY_NAME)));
720723
extVersion.setDescription(record.get(latest.field(EXTENSION_VERSION.DESCRIPTION)));
@@ -775,6 +778,7 @@ public List<ExtensionVersion> findLatest(UserData user) {
775778
EXTENSION.DOWNLOAD_COUNT,
776779
EXTENSION.PUBLISHED_DATE,
777780
EXTENSION.LAST_UPDATED_DATE,
781+
EXTENSION.ACTIVE,
778782
latest.field(EXTENSION_VERSION.ID),
779783
latest.field(EXTENSION_VERSION.VERSION),
780784
latest.field(EXTENSION_VERSION.TARGET_PLATFORM),
@@ -815,7 +819,12 @@ public List<ExtensionVersion> findLatest(UserData user) {
815819
query.addJoin(PERSONAL_ACCESS_TOKEN, JoinType.LEFT_OUTER_JOIN, PERSONAL_ACCESS_TOKEN.ID.eq(latest.field(EXTENSION_VERSION.PUBLISHED_WITH_ID)));
816820
query.addJoin(USER_DATA, USER_DATA.ID.eq(PERSONAL_ACCESS_TOKEN.USER_DATA));
817821
query.addConditions(PERSONAL_ACCESS_TOKEN.USER_DATA.eq(user.getId()));
818-
return query.fetch(record -> toExtensionVersionFull(record, null, new TableFieldMapper(latest)));
822+
return query.fetch(record -> {
823+
var extVersion = toExtensionVersionFull(record, null, new TableFieldMapper(latest));
824+
extVersion.getExtension().getNamespace().setDisplayName(record.get(NAMESPACE.DISPLAY_NAME));
825+
extVersion.getExtension().setActive(record.get(EXTENSION.ACTIVE));
826+
return extVersion;
827+
});
819828
}
820829

821830
public ExtensionVersion findLatestForAllUrls(

0 commit comments

Comments
 (0)