-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #29 from LabGraphTeam/refactor/improve_responses
Refactor/improve responses
- Loading branch information
Showing
23 changed files
with
321 additions
and
270 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
133 changes: 133 additions & 0 deletions
133
.../leonardo/labutilities/qualitylabpro/controllers/analytics/AnalyticsHelperController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| package leonardo.labutilities.qualitylabpro.controllers.analytics; | ||
|
|
||
| import leonardo.labutilities.qualitylabpro.dtos.analytics.AnalyticsRecord; | ||
| import leonardo.labutilities.qualitylabpro.services.analytics.AnalyticsHelperService; | ||
| import org.springframework.data.domain.Page; | ||
| import org.springframework.data.domain.Pageable; | ||
| import org.springframework.hateoas.CollectionModel; | ||
| import org.springframework.hateoas.EntityModel; | ||
| import org.springframework.hateoas.Link; | ||
| import org.springframework.http.ResponseEntity; | ||
| import org.springframework.web.bind.annotation.GetMapping; | ||
| import org.springframework.web.bind.annotation.PathVariable; | ||
| import org.springframework.web.servlet.support.ServletUriComponentsBuilder; | ||
| import org.springframework.web.util.UriComponentsBuilder; | ||
|
|
||
| import java.time.LocalDateTime; | ||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo; | ||
| import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.methodOn; | ||
| public class AnalyticsHelperController { | ||
| private final AnalyticsHelperService analyticsHelperService; | ||
|
|
||
| public AnalyticsHelperController(AnalyticsHelperService analyticsHelperService) { | ||
| this.analyticsHelperService = analyticsHelperService; | ||
| } | ||
| @GetMapping("/{id}") | ||
| public ResponseEntity<AnalyticsRecord> getAnalyticsById(@PathVariable Long id) { | ||
| return ResponseEntity.ok(analyticsHelperService.findOneById(id)); | ||
| } | ||
| public ResponseEntity<CollectionModel<EntityModel<AnalyticsRecord>>> getAllAnalyticsWithLinks(List<String> names, Pageable pageable) { | ||
| Page<AnalyticsRecord> resultsList = analyticsHelperService.findAnalyticsPagedByNameIn(names, pageable); | ||
|
|
||
| // Create EntityModel for each record with its own self link | ||
| var entityModels = resultsList.getContent().stream() | ||
| .map(record -> EntityModel.of(record, | ||
| linkTo(methodOn(getClass()).getAnalyticsById(record.id())).withSelfRel())) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| var result = addPaginationLinks(CollectionModel.of(entityModels), resultsList, pageable); | ||
| return ResponseEntity.ok(result); | ||
|
|
||
| } | ||
|
|
||
| public ResponseEntity<CollectionModel<EntityModel<AnalyticsRecord>>> | ||
| getAnalyticsByDateBetweenWithLinks | ||
| (List<String> names, LocalDateTime startDate, LocalDateTime endDate, Pageable pageable) { | ||
|
|
||
| Page<AnalyticsRecord> analyticsRecordPaged = analyticsHelperService | ||
| .findAnalyticsByNameInAndDateBetweenWithLinks(names, startDate, endDate, pageable); | ||
|
|
||
| if (analyticsRecordPaged == null) { | ||
| return ResponseEntity.noContent().build(); | ||
| } | ||
| // Create EntityModel for each record with its own self link | ||
| var entityModels = analyticsRecordPaged.getContent().stream() | ||
| .map(record -> EntityModel.of(record, | ||
| linkTo(methodOn(getClass()).getAnalyticsById(record.id())).withSelfRel())) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| // Create the collection model with the entity models | ||
| var collectionModel = CollectionModel.of(entityModels); | ||
|
|
||
|
|
||
| // Add pagination links | ||
| var result = addPaginationLinks(collectionModel, analyticsRecordPaged, pageable); | ||
|
|
||
| return ResponseEntity.ok(result); | ||
| } | ||
|
|
||
| EntityModel<AnalyticsRecord> createEntityModel(AnalyticsRecord record, Pageable pageable) { | ||
| return EntityModel.of(record, | ||
| linkTo(methodOn(getClass()).getAnalyticsById(record.id())).withSelfRel()); | ||
| } | ||
|
|
||
| private CollectionModel<EntityModel<AnalyticsRecord>> addPaginationLinks( | ||
| CollectionModel<EntityModel<AnalyticsRecord>> collectionModel, | ||
| Page<AnalyticsRecord> page, | ||
| Pageable pageable) { | ||
|
|
||
| UriComponentsBuilder uriBuilder = ServletUriComponentsBuilder.fromCurrentRequest(); | ||
|
|
||
| // Clear any existing collection-level links to prevent duplication | ||
| // collectionModel.removeLinks(); | ||
|
|
||
| // Link for the first page | ||
| collectionModel.add(Link.of(uriBuilder | ||
| .replaceQueryParam("page", 0) | ||
| .replaceQueryParam("size", pageable.getPageSize()) | ||
| .toUriString().replace("%2520", "%20")) | ||
| .withRel("first")); | ||
|
|
||
| // Link for the previous page if it exists | ||
| if (page.hasPrevious()) { | ||
| collectionModel.add(Link.of(uriBuilder | ||
| .replaceQueryParam("page", pageable.getPageNumber() - 1) | ||
| .replaceQueryParam("size", pageable.getPageSize()) | ||
| .toUriString().replace("%2520", "%20")) | ||
| .withRel("prev")); | ||
| } | ||
|
|
||
| // Link for the next page if it exists | ||
| if (page.hasNext()) { | ||
| collectionModel.add(Link.of(uriBuilder | ||
| .replaceQueryParam("page", pageable.getPageNumber() + 1) | ||
| .replaceQueryParam("size", pageable.getPageSize()) | ||
| .toUriString().replace("%2520", "%20")) | ||
| .withRel("next")); | ||
| } | ||
|
|
||
| // Link for the last page | ||
| collectionModel.add(Link.of(uriBuilder | ||
| .replaceQueryParam("page", page.getTotalPages() - 1) | ||
| .replaceQueryParam("size", pageable.getPageSize()) | ||
| .toUriString().replace("%2520", "%20")) | ||
| .withRel("last")); | ||
|
|
||
| // Add metadata about the current page | ||
| collectionModel.add(Link.of(uriBuilder | ||
| .replaceQueryParam("page", pageable.getPageNumber()) | ||
| .replaceQueryParam("size", pageable.getPageSize()) | ||
| .toUriString().replace("%2520", "%20")) | ||
| .withRel("current-page")); | ||
|
|
||
| // collectionModel.add(Link.of(String.valueOf(page.getTotalPages())).withSelfRel()); | ||
| collectionModel.add(Link.of(String.valueOf(page.getTotalPages()), "totalPages")); | ||
| collectionModel.add(Link.of(String.valueOf(page.getNumber()), "currentPage")); | ||
|
|
||
|
|
||
| return collectionModel; | ||
| } | ||
| } |
Oops, something went wrong.