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

feat(lapCountResource): add lap count per source & team #131

Merged
merged 4 commits into from
Apr 14, 2024
Merged

feat(lapCountResource): add lap count per source & team #131

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b314cc5
feat(lapCountResource): add lap count per source & team
NuttyShrimp Mar 29, 2024
4ad04ca
feat(LapCount): add endpoint for count for all teams for specific lap…
NuttyShrimp Apr 3, 2024
9fffdd0
refactor(LapDao): unify getAllBeforeTime query results
NuttyShrimp Apr 4, 2024
2e8bc9a
fix(LapCountResource): make DAO attributes private
NuttyShrimp Apr 4, 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
2 changes: 1 addition & 1 deletion src/main/java/telraam/App.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public void run(AppConfiguration configuration, Environment environment) throws
jersey.register(new LapSourceSwitchoverResource(database.onDemand(LapSourceSwitchoverDAO.class)));
jersey.register(new AcceptedLapsResource());
jersey.register(new TimeResource());
jersey.register(new LapCountResource(database.onDemand(TeamDAO.class)));
jersey.register(new LapCountResource(database.onDemand(TeamDAO.class), database.onDemand(LapDAO.class)));
jersey.register(new MonitoringResource(database));
environment.healthChecks().register("template", new TemplateHealthCheck(configuration.getTemplate()));

Expand Down
20 changes: 19 additions & 1 deletion src/main/java/telraam/api/LapCountResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package telraam.api;

import telraam.database.daos.LapDAO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.ws.rs.*;
Expand All @@ -9,7 +10,10 @@
import telraam.database.models.Team;
import telraam.util.AcceptedLapsUtil;

import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;

Expand All @@ -18,9 +22,11 @@
@Produces(MediaType.APPLICATION_JSON)
public class LapCountResource {
TeamDAO teamDAO;
LapDAO lapDAO;

public LapCountResource(TeamDAO teamDAO) {
public LapCountResource(TeamDAO teamDAO, LapDAO lapDAO) {
this.teamDAO = teamDAO;
this.lapDAO = lapDAO;
}
NuttyShrimp marked this conversation as resolved.
Show resolved Hide resolved

@GET
Expand Down Expand Up @@ -53,4 +59,16 @@ public Map<String, Integer> getLapCounts() {

return perName;
}

// EndTimestamp should be a ISO formatted date timestamp
@GET
@Path("/{lapSourceId}/{teamId}")
public Integer getLapCountForLapSource(@PathParam("lapSourceId") Integer id, @PathParam("teamId") Integer teamId, @QueryParam("end") Optional<String> endTimestamp) {
LocalDateTime dateTime = LocalDateTime.now();
if (endTimestamp.isPresent()) {
dateTime = LocalDateTime.parse(endTimestamp.get());
}
List<Lap> laps = lapDAO.getAllForTeamBeforeTime(id, teamId, Timestamp.valueOf(dateTime));
return laps.size();
}
NuttyShrimp marked this conversation as resolved.
Show resolved Hide resolved
}
4 changes: 4 additions & 0 deletions src/main/java/telraam/database/daos/LapDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ public interface LapDAO extends DAO<Lap> {
@RegisterBeanMapper(Lap.class)
List<Lap> getAllBySourceSorted(@Bind("lapSourceId") Integer lapSourceId);

@SqlQuery("SELECT * FROM lap WHERE lap_source_id = :lapSourceId AND timestamp <= :timestamp AND team_id = :teamId")
@RegisterBeanMapper(Lap.class)
List<Lap> getAllForTeamBeforeTime(@Bind("lapSourceId") Integer lapSourceId, @Bind("teamId") Integer teamId, @Bind("timestamp") Timestamp timestamp);
NuttyShrimp marked this conversation as resolved.
Show resolved Hide resolved

@SqlUpdate("INSERT INTO lap (team_id, lap_source_id, timestamp) " +
"VALUES (:teamId, :lapSourceId, :timestamp)")
@GetGeneratedKeys({"id"})
Expand Down
Loading