Fix failed builds not appearing on the API (#9)

* Fix failed builds not appearing on papyrus

* better sql queries

Author: benkerllenevich

.gitignore

@@ -38,3 +38,7 @@ out/
 
 ### VS Code ###
 .vscode/
+
+
+### Java ###
+*.jar

src/main/java/org/purpurmc/papyrus/controller/v2/BuildController.java

@@ -64,7 +64,7 @@ public BuildResponse getBuild(@PathVariable("project") String projectName, @Path
         Version version = versionRepository.findByProjectAndName(project, versionName).orElseThrow(VersionNotFound::new);
         Build build = (buildName.equals("latest")
                 ? buildRepository.findLatestByVersionAndFileNotNull(version)
-                : buildRepository.findByVersionAndNameAndFileNotNull(version, buildName)
+                : buildRepository.findByVersionAndNameAndReady(version, buildName)
         ).orElseThrow(BuildNotFound::new);
         List<Commit> commits = commitRepository.findAllByBuild(build);
 

src/main/java/org/purpurmc/papyrus/controller/v2/CreationController.java

@@ -96,11 +96,20 @@ public CreateBuild createBuild(@RequestHeader(HttpHeaders.AUTHORIZATION) String
             version = versionRepository.save(new Version(project, body.version));
         }
 
-        Build build = buildRepository.save(new Build(version, body.build, body.result, body.timestamp, body.duration));
+        int ready = 0;
+        if (body.result != Build.BuildResult.SUCCESS) {
+            ready = 1;
+        }
+
+        Build build = buildRepository.save(new Build(version, body.build, body.result, body.timestamp, body.duration, ready));
         if (body.commits != null) {
             commitRepository.saveAll(body.commits.stream().map(commit -> new Commit(build, commit.author, commit.email, commit.description, commit.hash, commit.timestamp)).toList());
         }
 
+        if (ready == 1) {
+            return new CreateBuild(null);
+        }
+
         CreationState id = creationStateRepository.save(new CreationState(build, body.fileExtension));
         return new CreateBuild(id.getId().toString());
     }
@@ -134,10 +143,6 @@ public ResponseEntity<String> uploadFile(@RequestHeader(HttpHeaders.AUTHORIZATIO
             throw new FileUploadError();
         }
 
-        Build build = state.getBuild();
-        build.setHash(DigestUtils.md5DigestAsHex(bytes));
-        buildRepository.save(build);
-
         String contentType;
         try {
             Path tempFile = Files.createTempFile("papyrus", state.getId().toString());
@@ -148,6 +153,8 @@ public ResponseEntity<String> uploadFile(@RequestHeader(HttpHeaders.AUTHORIZATIO
             throw new FileUploadError();
         }
 
+        Build build = state.getBuild();
+
         File file = fileRepository.save(new File(build, contentType, state.getFileExtension()));
         try {
             Path path = Path.of(configuration.getFileStorage(), file.getId().toString());
@@ -156,6 +163,10 @@ public ResponseEntity<String> uploadFile(@RequestHeader(HttpHeaders.AUTHORIZATIO
             throw new FileUploadError();
         }
 
+        build.setHash(DigestUtils.md5DigestAsHex(bytes));
+        build.setReady(1);
+        buildRepository.save(build);
+
         creationStateRepository.delete(state);
         return ResponseEntity.ok("");
     }

src/main/java/org/purpurmc/papyrus/controller/v2/VersionController.java

@@ -46,7 +46,7 @@ public VersionController(ProjectRepository projectRepository, VersionRepository
     public ResponseEntity<?> getVersion(@PathVariable("project") String projectName, @PathVariable("version") String versionName, @RequestParam(value = "detailed", required = false) String detailed) {
         Project project = projectRepository.findByName(projectName).orElseThrow(ProjectNotFound::new);
         Version version = versionRepository.findByProjectAndName(project, versionName).orElseThrow(VersionNotFound::new);
-        List<Build> builds = buildRepository.findAllByVersionAndFileNotNullOrderByTimestampAsc(version);
+        List<Build> builds = buildRepository.findAllByVersionAndReadyOrderByTimestampAsc(version);
         Optional<Build> latest = buildRepository.findLatestByVersionAndFileNotNull(version);
 
         if (detailed != null) {

src/main/java/org/purpurmc/papyrus/db/entity/Build.java

@@ -40,6 +40,9 @@ public class Build {
     @Nullable
     private String hash;
 
+    @Nonnull
+    private int ready;
+
     @Nonnull
     @ManyToOne
     @JoinColumn(name = "VERSION_ID", referencedColumnName = "ID")
@@ -52,17 +55,18 @@ public class Build {
     public Build() {
     }
 
-    public Build(Version version, String name, BuildResult result, Long timestamp, Long duration) {
-        this(version, name, result, timestamp, duration, null);
+    public Build(Version version, String name, BuildResult result, Long timestamp, Long duration, int ready) {
+        this(version, name, result, timestamp, duration, null, ready);
     }
 
-    public Build(Version version, String name, BuildResult result, Long timestamp, Long duration, String hash) {
+    public Build(Version version, String name, BuildResult result, Long timestamp, Long duration, String hash, int ready) {
         this.version = version;
         this.name = name;
         this.result = result;
         this.timestamp = timestamp;
         this.duration = duration;
         this.hash = hash;
+        this.ready = ready;
     }
 
     public UUID getId() {
@@ -93,6 +97,14 @@ public void setHash(String hash) {
         this.hash = hash;
     }
 
+    public int getReady() {
+        return this.ready;
+    }
+
+    public void setReady(int ready) {
+        this.ready = ready;
+    }
+
     public enum BuildResult {
         SUCCESS,
         FAILURE

src/main/java/org/purpurmc/papyrus/db/repository/BuildRepository.java

@@ -15,13 +15,18 @@
 public interface BuildRepository extends JpaRepository<Build, UUID> {
     boolean existsByVersionAndName(Version version, String name);
 
-    Optional<Build> findByVersionAndNameAndFileNotNull(Version version, String name);
+    @Query("SELECT b FROM Build b WHERE b.version = :version AND b.name = :name AND b.ready = 1")
+    Optional<Build> findByVersionAndNameAndReady(@Param("version") Version version, String name);
 
-    List<Build> findAllByVersionAndFileNotNullOrderByTimestampAsc(Version version);
+    @Query("SELECT b FROM Build b WHERE b.version = :version AND b.ready = 1 ORDER BY timestamp ASC")
+    List<Build> findAllByVersionAndReadyOrderByTimestampAsc(@Param("version") Version version);
 
-    @Query("SELECT b FROM Build b WHERE b.result = 'SUCCESS' AND b.version = :version AND b.name = :name AND b.file IS NOT null")
-    Optional<Build> findByVersionAndNameAndFileNotNullAndResultIsSuccess(Version version, String name);
+    @Query("SELECT b FROM Build b WHERE b.version = :version AND b.name = :name AND b.ready = 1 AND b.result = 'SUCCESS'")
+    Optional<Build> findByVersionAndNameAndReadyAndResultIsSuccess(@Param("version") Version version, String name);
 
-    @Query("SELECT b FROM Build b WHERE b.result = 'SUCCESS' AND b.version = :version AND b.file IS NOT null ORDER BY timestamp DESC LIMIT 1")
+    @Query("SELECT b FROM Build b WHERE b.version = :version AND b.name = :name  AND b.file IS NOT null AND b.ready = 1 AND b.result = 'SUCCESS'")
+    Optional<Build> findByVersionAndNameAndFileNotNullAndResultIsSuccess(@Param("version") Version version, String name);
+
+    @Query("SELECT b FROM Build b WHERE b.version = :version AND b.file IS NOT null AND b.ready = 1 AND b.result = 'SUCCESS' ORDER BY timestamp DESC LIMIT 1")
     Optional<Build> findLatestByVersionAndFileNotNull(@Param("version") Version version);
 }

src/main/resources/db/migration/V2__build_ready.sql

@@ -0,0 +1 @@
+alter table build add column ready int not null default (1) check (ready IN (0, 1));