Skip to content

Commit

Permalink
feat: refactor version queries, remove platform download table
Browse files Browse the repository at this point in the history
  • Loading branch information
@MiniDigger
MiniDigger committed Jan 11, 2025
1 parent 74a3e73 commit 876589b
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 156 deletions.
40 changes: 3 additions & 37 deletions ...o/papermc/hangar/db/dao/internal/table/versions/downloads/ProjectVersionDownloadsDAO.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@

import io.papermc.hangar.model.common.Platform;
import io.papermc.hangar.model.db.versions.downloads.ProjectVersionDownloadTable;
import io.papermc.hangar.model.db.versions.downloads.ProjectVersionDownloadTableWithPlatform;
import io.papermc.hangar.model.db.versions.downloads.ProjectVersionPlatformDownloadTable;
import java.util.Collection;
import java.util.List;
import org.apache.commons.lang3.tuple.Pair;
import org.jdbi.v3.core.enums.EnumByOrdinal;
import org.jdbi.v3.spring.JdbiRepository;
import org.jdbi.v3.sqlobject.config.RegisterConstructorMapper;
Expand All @@ -17,19 +14,14 @@
import org.jdbi.v3.sqlobject.statement.SqlUpdate;

@JdbiRepository
@RegisterConstructorMapper(ProjectVersionPlatformDownloadTable.class)
@RegisterConstructorMapper(ProjectVersionDownloadTable.class)
@RegisterConstructorMapper(ProjectVersionDownloadTableWithPlatform.class)
public interface ProjectVersionDownloadsDAO {

@SqlBatch("INSERT INTO project_version_platform_downloads (version_id, platform, download_id) VALUES (:versionId, :platform, :downloadId)")
void insertPlatformDownloads(@BindBean Collection<ProjectVersionPlatformDownloadTable> projectVersionPlatformDownloadTables);

@SqlUpdate("UPDATE project_version_downloads SET hash = :hash WHERE id = :id")
void updateHash(long id, String hash);

@GetGeneratedKeys
@SqlBatch("INSERT INTO project_version_downloads (version_id, file_size, hash, file_name, external_url) VALUES (:versionId, :fileSize, :hash, :fileName, :externalUrl)")
@SqlBatch("INSERT INTO project_version_downloads (version_id, file_size, hash, file_name, external_url, platform, download_platform) VALUES (:versionId, :fileSize, :hash, :fileName, :externalUrl, :platform, :downloadPlatform)")
List<ProjectVersionDownloadTable> insertDownloads(@BindBean Collection<ProjectVersionDownloadTable> projectVersionDownloadTables);

@SqlQuery("SELECT * FROM project_version_downloads WHERE version_id = :versionId")
Expand All @@ -38,35 +30,9 @@ public interface ProjectVersionDownloadsDAO {
@SqlQuery("SELECT * FROM project_version_downloads")
List<ProjectVersionDownloadTable> getDownloads();

@SqlQuery("SELECT * FROM project_version_platform_downloads WHERE version_id = :versionId")
List<ProjectVersionPlatformDownloadTable> getPlatformDownloads(long versionId);

@SqlQuery("SELECT pvpd.*, pvd.file_size, pvd.hash, pvd.file_name, pvd.external_url FROM project_version_platform_downloads pvpd " +
"JOIN project_version_downloads pvd ON pvd.id = pvpd.download_id " +
"WHERE pvpd.version_id = :versionId")
List<Pair<ProjectVersionPlatformDownloadTable, ProjectVersionDownloadTable>> getPlatformDownloadsFull(long versionId);

@SqlQuery("SELECT * FROM project_version_platform_downloads WHERE version_id = :versionId AND download_id = :downloadId")
List<ProjectVersionPlatformDownloadTable> getPlatformDownloads(long versionId, long downloadId);

@SqlQuery("SELECT * FROM project_version_platform_downloads WHERE version_id = :versionId AND platform = :platform")
ProjectVersionPlatformDownloadTable getPlatformDownload(long versionId, @EnumByOrdinal Platform platform);
@SqlQuery("SELECT * FROM project_version_downloads WHERE version_id = :versionId AND platform = :platform")
ProjectVersionDownloadTable getDownloadByPlatform(long versionId, @EnumByOrdinal Platform platform);

@SqlQuery("SELECT * FROM project_version_downloads WHERE version_id = :versionId AND id = :downloadId")
ProjectVersionDownloadTable getDownload(long versionId, long downloadId);

// we need to find the first version platform download for the given download ID, since only that is being uploaded to object storage
// see comment in VersionFactory#processPendingVersionFile
@SqlQuery("""
SELECT pvd.*,
(SELECT platform
FROM project_version_platform_downloads first
WHERE first.download_id = pvpd.download_id
LIMIT 1) AS platform
FROM project_version_downloads pvd
JOIN project_version_platform_downloads pvpd ON pvd.id = pvpd.download_id
WHERE pvpd.version_id = :versionId
AND pvpd.platform = :platform;
""")
ProjectVersionDownloadTableWithPlatform getDownloadByPlatform(long versionId, @EnumByOrdinal Platform platform);
}
22 changes: 20 additions & 2 deletions .../main/java/io/papermc/hangar/model/db/versions/downloads/ProjectVersionDownloadTable.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package io.papermc.hangar.model.db.versions.downloads;

import io.papermc.hangar.model.common.Platform;
import io.papermc.hangar.model.db.Table;
import org.jdbi.v3.core.enums.EnumByOrdinal;
import org.jdbi.v3.core.mapper.reflect.JdbiConstructor;

public class ProjectVersionDownloadTable extends Table {
Expand All @@ -10,23 +12,29 @@ public class ProjectVersionDownloadTable extends Table {
private final String hash;
private final String fileName;
private final String externalUrl;
private final Platform platform;
private final Platform downloadPlatform;

public ProjectVersionDownloadTable(final long versionId, final Long fileSize, final String hash, final String fileName, final String externalUrl) {
public ProjectVersionDownloadTable(final long versionId, final Long fileSize, final String hash, final String fileName, final String externalUrl, final Platform platform, final Platform downloadPlatform) {
this.versionId = versionId;
this.fileSize = fileSize;
this.hash = hash;
this.fileName = fileName;
this.externalUrl = externalUrl;
this.platform = platform;
this.downloadPlatform = downloadPlatform;
}

@JdbiConstructor
public ProjectVersionDownloadTable(final long id, final long versionId, final Long fileSize, final String hash, final String fileName, final String externalUrl) {
public ProjectVersionDownloadTable(final long id, final long versionId, final Long fileSize, final String hash, final String fileName, final String externalUrl, final @EnumByOrdinal Platform platform, final Platform downloadPlatform) {
super(id);
this.versionId = versionId;
this.fileSize = fileSize;
this.hash = hash;
this.fileName = fileName;
this.externalUrl = externalUrl;
this.platform = platform;
this.downloadPlatform = downloadPlatform;
}

public long getVersionId() {
Expand All @@ -49,6 +57,14 @@ public String getExternalUrl() {
return this.externalUrl;
}

public Platform getPlatform() {
return platform;
}

public Platform getDownloadPlatform() {
return downloadPlatform;
}

@Override
public String toString() {
return "ProjectVersionDownloadTable{" +
Expand All @@ -57,6 +73,8 @@ public String toString() {
", hash='" + hash + '\'' +
", fileName='" + fileName + '\'' +
", externalUrl='" + externalUrl + '\'' +
", platform='" + platform + '\'' +
", downloadPlatform='" + downloadPlatform + '\'' +
", id=" + id +
'}';
}
Expand Down
17 changes: 0 additions & 17 deletions ...o/papermc/hangar/model/db/versions/downloads/ProjectVersionDownloadTableWithPlatform.java
View file

This file was deleted.

40 changes: 0 additions & 40 deletions ...va/io/papermc/hangar/model/db/versions/downloads/ProjectVersionPlatformDownloadTable.java
View file

This file was deleted.

29 changes: 7 additions & 22 deletions backend/src/main/java/io/papermc/hangar/service/internal/versions/DownloadService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,13 @@
import io.papermc.hangar.model.db.projects.ProjectTable;
import io.papermc.hangar.model.db.versions.ProjectVersionTable;
import io.papermc.hangar.model.db.versions.downloads.ProjectVersionDownloadTable;
import io.papermc.hangar.model.db.versions.downloads.ProjectVersionDownloadTableWithPlatform;
import io.papermc.hangar.model.db.versions.downloads.ProjectVersionPlatformDownloadTable;
import io.papermc.hangar.service.internal.file.FileService;
import io.papermc.hangar.service.internal.file.S3FileService;
import io.papermc.hangar.service.internal.projects.ProjectService;
import io.papermc.hangar.service.internal.uploads.ProjectFiles;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.tuple.Pair;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
Expand All @@ -45,28 +41,17 @@ public DownloadService(final ProjectFiles projectFiles, final ProjectVersionDown

public Map<Platform, PlatformVersionDownload> getDownloads(final String user, final String project, final String version, final long versionId) {
final Map<Platform, PlatformVersionDownload> versionDownloadsMap = new EnumMap<>(Platform.class);
final List<Pair<ProjectVersionPlatformDownloadTable, ProjectVersionDownloadTable>> platformDownloadsFull = this.downloadsDAO.getPlatformDownloadsFull(versionId);
final Map<Long, PlatformVersionDownload> downloads = new HashMap<>();
for (final Pair<ProjectVersionPlatformDownloadTable, ProjectVersionDownloadTable> platformDownloadPair : platformDownloadsFull) {
final ProjectVersionPlatformDownloadTable platformDownload = platformDownloadPair.getLeft();
PlatformVersionDownload download = downloads.get(platformDownload.getDownloadId());
if (download != null) {
versionDownloadsMap.put(platformDownload.getPlatform(), download);
continue;
}

final ProjectVersionDownloadTable downloadTable = platformDownloadPair.getRight();
final FileInfo fileInfo = downloadTable.getFileName() != null ? new FileInfo(downloadTable.getFileName(), downloadTable.getFileSize(), downloadTable.getHash()) : null;
final String downloadUrl = fileInfo != null ? this.fileService.getVersionDownloadUrl(user, project, version, platformDownload.getPlatform(), fileInfo.getName()) : null;
download = new PlatformVersionDownload(fileInfo, downloadTable.getExternalUrl(), downloadUrl);
downloads.put(platformDownload.getDownloadId(), download);
versionDownloadsMap.put(platformDownload.getPlatform(), download);
final List<ProjectVersionDownloadTable> downloads = this.downloadsDAO.getDownloads(versionId);
for (final ProjectVersionDownloadTable download : downloads) {
final FileInfo fileInfo = download.getFileName() != null ? new FileInfo(download.getFileName(), download.getFileSize(), download.getHash()) : null;
final String downloadUrl = fileInfo != null ? this.fileService.getVersionDownloadUrl(user, project, version, download.getDownloadPlatform(), fileInfo.getName()) : null;
versionDownloadsMap.put(download.getPlatform(), new PlatformVersionDownload(fileInfo, download.getExternalUrl(), downloadUrl));
}
return versionDownloadsMap;
}

public ResponseEntity<?> downloadVersion(final ProjectTable project, final ProjectVersionTable version, final Platform platform) {
final ProjectVersionDownloadTableWithPlatform download = this.downloadsDAO.getDownloadByPlatform(version.getVersionId(), platform);
final ProjectVersionDownloadTable download = this.downloadsDAO.getDownloadByPlatform(version.getVersionId(), platform);
if (download == null) {
throw new HangarApiException(HttpStatus.NOT_FOUND);
}
Expand All @@ -75,7 +60,7 @@ public ResponseEntity<?> downloadVersion(final ProjectTable project, final Proje
if (StringUtils.hasText(download.getExternalUrl())) {
return ResponseEntity.status(301).header("Location", download.getExternalUrl()).build();
} else if (this.fileService instanceof S3FileService){
return ResponseEntity.status(301).header("Location", this.fileService.getVersionDownloadUrl(ownerName, project.getName(), version.getName(), download.getPlatform(), download.getFileName())).build();
return ResponseEntity.status(301).header("Location", this.fileService.getVersionDownloadUrl(ownerName, project.getName(), version.getName(), download.getDownloadPlatform(), download.getFileName())).build();
} else {
final String path = this.projectFiles.getVersionDir(ownerName, project.getName(), version.getName(), platform, download.getFileName());
if (!this.fileService.exists(path)) {
Expand Down
12 changes: 3 additions & 9 deletions backend/src/main/java/io/papermc/hangar/service/internal/versions/JarScanningService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import io.papermc.hangar.model.db.versions.JarScanResultTable;
import io.papermc.hangar.model.db.versions.ProjectVersionTable;
import io.papermc.hangar.model.db.versions.downloads.ProjectVersionDownloadTable;
import io.papermc.hangar.model.db.versions.downloads.ProjectVersionPlatformDownloadTable;
import io.papermc.hangar.model.internal.versions.JarScanResult;
import io.papermc.hangar.scanner.HangarJarScanner;
import io.papermc.hangar.scanner.check.Check;
Expand Down Expand Up @@ -179,23 +178,18 @@ public Severity scanPlatform(final VersionToScan versionToScan, final Platform p

private NamedResource getFile(final VersionToScan version, final Platform platform) {
final long versionId = version.versionId();
final ProjectVersionPlatformDownloadTable platformDownload = this.downloadsDAO.getPlatformDownload(versionId, platform);
final ProjectVersionDownloadTable platformDownload = this.downloadsDAO.getDownloadByPlatform(versionId, platform);
// TODO Why can platformDownload be null at this stage
if (platformDownload == null) {
throw new RuntimeException("Couldn't find a download for version " + version + " in platform " + platform);
}

final ProjectVersionDownloadTable download = this.downloadsDAO.getDownload(versionId, platformDownload.getDownloadId());
if (download.getFileName() == null) {
throw new RuntimeException("Couldn't find a file for version " + version + " in download " + download);
}

final ProjectTable project = this.projectsDAO.getById(version.projectId());
final String path = this.projectFiles.getVersionDir(project.getOwnerName(), project.getSlug(), version.versionString(), platform, download.getFileName());
final String path = this.projectFiles.getVersionDir(project.getOwnerName(), project.getSlug(), version.versionString(), platform, platformDownload.getFileName());
if (!this.fileService.exists(path)) {
throw new RuntimeException("Couldn't find a file for version " + version + " in path " + path);
}
return new NamedResource(this.fileService.getResource(path), download.getFileName());
return new NamedResource(this.fileService.getResource(path), platformDownload.getFileName());
}

public @Nullable JarScanResult getLastResult(final long versionId, final Platform platform) {
Expand Down
Loading

0 comments on commit 876589b

Please sign in to comment.