From bb8ac3bb872b4641bed9ddc00382fa18775c299a Mon Sep 17 00:00:00 2001
From: xmajdan <xmajdan@fi.muni.cz>
Date: Wed, 14 Aug 2024 13:22:56 +0200
Subject: [PATCH] Remove training instance by pool id endpoint
---
VERSION.txt | 2 +-
.../TrainingInstancesRestController.java | 26 -------------------
.../facade/TrainingInstanceFacade.java | 12 ---------
.../training/TrainingInstanceService.java | 11 --------
4 files changed, 1 insertion(+), 50 deletions(-)
diff --git a/VERSION.txt b/VERSION.txt
index 4d89c4b..87a4e62 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1,4 +1,4 @@
-2.3.0 Add training access tokens to sandbox api calls. Add access token endpoints.
+2.3.0 Add training access tokens to sandbox api calls. Add access token endpoint.
2.2.10 Fix user ref creation failing on parallel requests.
2.2.9 Add check to prevent reviving an expired training instance.
2.2.8 Add check for training definition being in use when trying to add, remove and update tasks.
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/TrainingInstancesRestController.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/TrainingInstancesRestController.java
index 6384e86..b6c2432 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/TrainingInstancesRestController.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/controller/TrainingInstancesRestController.java
@@ -86,32 +86,6 @@ public class TrainingInstancesRestController {
return ResponseEntity.ok(trainingInstanceResource);
}
- /**
- * Get requested Training Instance by pool id.
- *
- * @param poolId id of the assigned pool.
- * @return Requested Training Instance by pool id.
- */
- @ApiOperation(httpMethod = "GET",
- value = "Get training instance by pool id.",
- response = TrainingInstanceDTO.class,
- nickname = "findTrainingInstanceByPoolId",
- notes = "Returns training instance by pool id.",
- produces = MediaType.APPLICATION_JSON_VALUE
- )
- @ApiResponses(value = {
- @ApiResponse(code = 200, message = "The training instance has been found", response = TrainingInstanceDTO.class),
- @ApiResponse(code = 404, message = "The training instance has not been found.", response = ApiError.class),
- @ApiResponse(code = 500, message = "Unexpected condition was encountered.", response = ApiError.class)
- })
- @GetMapping(path = "/pool/{poolId}", produces = MediaType.APPLICATION_JSON_VALUE)
- public ResponseEntity<Object> findTrainingInstanceByPoolId(
- @ApiParam(value = "Pool ID", required = true)
- @PathVariable("poolId") Long poolId) {
- TrainingInstanceDTO trainingInstanceResource = trainingInstanceFacade.findByPoolId(poolId);
- return ResponseEntity.ok(trainingInstanceResource);
- }
-
/**
* Get Training instance access token by pool id.
*
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingInstanceFacade.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingInstanceFacade.java
index 5e45f53..60e6689 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingInstanceFacade.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingInstanceFacade.java
@@ -106,18 +106,6 @@ public class TrainingInstanceFacade {
return trainingInstanceMapper.mapToDTO(trainingInstanceService.findByIdIncludingDefinition(id));
}
- /**
- * Finds specific Training Instance by pool id
- *
- * @param poolId ID of a pool
- * @return specific {@link TrainingInstanceDTO} by pool id
- */
- @IsOrganizerOrAdmin
- @TransactionalRO
- public TrainingInstanceDTO findByPoolId(Long poolId) {
- return trainingInstanceMapper.mapToDTO(trainingInstanceService.findByPoolId(poolId));
- }
-
/**
* Get Training instance access token by pool id.
*
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/training/TrainingInstanceService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/training/TrainingInstanceService.java
index e1345ce..ea7b53d 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/training/TrainingInstanceService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/training/TrainingInstanceService.java
@@ -74,17 +74,6 @@ public class TrainingInstanceService {
.orElseThrow(() -> new EntityNotFoundException(new EntityErrorDetail(TrainingInstance.class, "id", instanceId.getClass(), instanceId)));
}
- /**
- * Find specific Training instance by pool id.
- *
- * @param poolId the pool id
- * @return the {@link TrainingInstance}
- */
- public TrainingInstance findByPoolId(Long poolId) {
- return trainingInstanceRepository.findByPoolId(poolId)
- .orElseThrow(() -> new EntityNotFoundException(new EntityErrorDetail(TrainingInstance.class, "poolId", poolId.getClass(), poolId)));
- }
-
/**
* Find Training instance access token by pool id if exists.
*
--
GitLab