Skip to content
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

Jump to bottom

Filter measurements by branch #382

Merged
merged 3 commits into from
May 19, 2024
Merged

Filter measurements by branch #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3465bcb
Filter measurements by branch
Ndacyayisenga-droid May 16, 2024
fd36966
Merge branch 'main' into filterbybranch
Jexsie May 17, 2024
7c9080b
Update MeasurementEndpoint.java
Ndacyayisenga-droid May 17, 2024
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
12 changes: 7 additions & 5 deletions ...src/main/java/com/openelements/benchscape/server/store/endpoints/MeasurementEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,7 @@
import java.util.Optional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

@CrossOrigin
@RestController
Expand Down Expand Up @@ -123,4 +119,10 @@ List<Measurement> findByQuery(@RequestParam final String benchmarkId,
return measurements;
}
}

@GetMapping("/{benchmarkId}/branches")
public List<String> getGitBranchesForBenchmark(@PathVariable String benchmarkId) {
return measurementService.getBranchesForBenchmark(benchmarkId);
}
}

4 changes: 4 additions & 0 deletions ...ain/java/com/openelements/benchscape/server/store/repositories/MeasurementRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,8 @@ public interface MeasurementRepository extends EntityWithTenantRepository<Measur
@NonNull
@Query("SELECT m FROM Measurement m WHERE m.benchmarkId = ?1 ORDER BY m.timestamp DESC limit 1")
Optional<MeasurementEntity> findLast(final UUID benchmarkId);

@NonNull
@Query("SELECT DISTINCT m.metadata.gitBranch FROM Measurement m WHERE m.benchmarkId = ?1")
List<String> findDistinctBranchesByBenchmarkId(UUID benchmarkId);
}
6 changes: 6 additions & 0 deletions ...r/src/main/java/com/openelements/benchscape/server/store/services/MeasurementService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,4 +186,10 @@ public DateTimePeriode getPeriode(@NonNull final UUID benchmarkId) {
.orElseThrow(() -> new IllegalArgumentException("No measurement for benchmark " + benchmarkId));
return DateTimePeriode.between(start, end);
}

@NonNull
public List<String> getBranchesForBenchmark(@NonNull final String benchmarkId) {
Objects.requireNonNull(benchmarkId, "benchmarkId must not be null");
return measurementRepository.findDistinctBranchesByBenchmarkId(UUID.fromString(benchmarkId));
}
}
Loading