-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into MDEXP-758
- Loading branch information
Showing
20 changed files
with
397 additions
and
10 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
16 changes: 16 additions & 0 deletions
16
src/main/java/org/folio/dataexp/client/AuthorityClient.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,16 @@ | ||
| package org.folio.dataexp.client; | ||
|
|
||
| import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; | ||
|
|
||
| import org.folio.dataexp.domain.dto.AuthorityCollection; | ||
| import org.springframework.cloud.openfeign.FeignClient; | ||
| import org.springframework.web.bind.annotation.GetMapping; | ||
| import org.springframework.web.bind.annotation.RequestParam; | ||
|
|
||
| @FeignClient(name = "authority-storage/authorities") | ||
| public interface AuthorityClient { | ||
|
|
||
| @GetMapping(produces = APPLICATION_JSON_VALUE) | ||
| AuthorityCollection getAuthorities(@RequestParam boolean idOnly, @RequestParam boolean deleted, @RequestParam String query, | ||
| @RequestParam long limit, @RequestParam long offset); | ||
| } |
27 changes: 27 additions & 0 deletions
27
src/main/java/org/folio/dataexp/controllers/DataExportAuthorityDeletedController.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,27 @@ | ||
| package org.folio.dataexp.controllers; | ||
|
|
||
| import lombok.RequiredArgsConstructor; | ||
| import lombok.extern.log4j.Log4j2; | ||
| import org.folio.dataexp.domain.dto.ExportAuthorityDeletedRequest; | ||
| import org.folio.dataexp.domain.dto.ExportAuthorityDeletedResponse; | ||
| import org.folio.dataexp.rest.resource.ExportAuthorityDeletedApi; | ||
| import org.folio.dataexp.service.ExportAuthorityDeletedService; | ||
| import org.springframework.http.HttpStatus; | ||
| import org.springframework.http.ResponseEntity; | ||
| import org.springframework.web.bind.annotation.RequestMapping; | ||
| import org.springframework.web.bind.annotation.RestController; | ||
|
|
||
| @RestController | ||
| @RequiredArgsConstructor | ||
| @Log4j2 | ||
| @RequestMapping("/data-export") | ||
| public class DataExportAuthorityDeletedController implements ExportAuthorityDeletedApi { | ||
|
|
||
| private final ExportAuthorityDeletedService exportAuthorityDeletedService; | ||
|
|
||
| @Override | ||
| public ResponseEntity<ExportAuthorityDeletedResponse> postExportDeletedAuthority(ExportAuthorityDeletedRequest request) { | ||
| var response = exportAuthorityDeletedService.postExportDeletedAuthority(request); | ||
| return new ResponseEntity<>(response, HttpStatus.OK); | ||
| } | ||
| } |
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,10 @@ | ||
| package org.folio.dataexp.domain.dto; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||
| import lombok.Data; | ||
|
|
||
| @Data | ||
| @JsonIgnoreProperties(ignoreUnknown = true) | ||
| public class Authority { | ||
| private String id; | ||
| } |
16 changes: 16 additions & 0 deletions
16
src/main/java/org/folio/dataexp/domain/dto/AuthorityCollection.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,16 @@ | ||
| package org.folio.dataexp.domain.dto; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import lombok.Data; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| @Data | ||
| @JsonIgnoreProperties(ignoreUnknown = true) | ||
| public class AuthorityCollection { | ||
|
|
||
| @JsonProperty("authorities") | ||
| private List<Authority> authorities = new ArrayList<>(); | ||
| } |
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
7 changes: 7 additions & 0 deletions
7
src/main/java/org/folio/dataexp/exception/authority/AuthorityQueryException.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,7 @@ | ||
| package org.folio.dataexp.exception.authority; | ||
|
|
||
| public class AuthorityQueryException extends RuntimeException { | ||
| public AuthorityQueryException(String msg) { | ||
| super(msg); | ||
| } | ||
| } |
57 changes: 57 additions & 0 deletions
57
src/main/java/org/folio/dataexp/service/ExportAuthorityDeletedService.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,57 @@ | ||
| package org.folio.dataexp.service; | ||
|
|
||
| import static org.folio.dataexp.util.Constants.DEFAULT_AUTHORITY_DELETED_JOB_PROFILE_ID; | ||
| import static org.folio.dataexp.util.Constants.DELETED_AUTHORITIES_FILE_NAME; | ||
|
|
||
| import lombok.RequiredArgsConstructor; | ||
| import lombok.extern.log4j.Log4j2; | ||
| import org.folio.dataexp.client.AuthorityClient; | ||
| import org.folio.dataexp.domain.dto.Authority; | ||
| import org.folio.dataexp.domain.dto.ExportAuthorityDeletedRequest; | ||
| import org.folio.dataexp.domain.dto.ExportAuthorityDeletedResponse; | ||
| import org.folio.dataexp.domain.dto.ExportRequest; | ||
| import org.folio.dataexp.domain.dto.FileDefinition; | ||
| import org.folio.dataexp.exception.authority.AuthorityQueryException; | ||
| import org.springframework.core.io.ByteArrayResource; | ||
| import org.springframework.stereotype.Service; | ||
|
|
||
| import java.util.List; | ||
| import java.util.UUID; | ||
|
|
||
| @Log4j2 | ||
| @RequiredArgsConstructor | ||
| @Service | ||
| public class ExportAuthorityDeletedService { | ||
|
|
||
| private final AuthorityClient authorityClient; | ||
|
|
||
| private final FileDefinitionsService fileDefinitionsService; | ||
| private final DataExportService dataExportService; | ||
|
|
||
| public ExportAuthorityDeletedResponse postExportDeletedAuthority(ExportAuthorityDeletedRequest request) { | ||
| log.info("POST export deleted authorities"); | ||
| try { | ||
| var authorities = authorityClient.getAuthorities(true, true, request.getQuery(), request.getLimit(), | ||
| request.getOffset()); | ||
| var fileDefinition = getFileDefinition(authorities.getAuthorities().stream().map(Authority::getId).toList()); | ||
| var exportRequest = ExportRequest.builder().fileDefinitionId(fileDefinition.getId()).jobProfileId(UUID.fromString(DEFAULT_AUTHORITY_DELETED_JOB_PROFILE_ID)) | ||
| .all(false).quick(false).idType(ExportRequest.IdTypeEnum.AUTHORITY).build(); | ||
| dataExportService.postDataExport(exportRequest); | ||
| return ExportAuthorityDeletedResponse.builder().jobExecutionId(fileDefinition.getJobExecutionId()).build(); | ||
| } catch (Exception e) { | ||
| log.error(e); | ||
| throw new AuthorityQueryException(e.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| private FileDefinition getFileDefinition(List<String> authorityIds) { | ||
| var fileContent = String.join(System.lineSeparator(), authorityIds); | ||
| var fileDefinition = new FileDefinition(); | ||
| fileDefinition.setSize(authorityIds.size()); | ||
| fileDefinition.setUploadFormat(FileDefinition.UploadFormatEnum.CSV); | ||
| fileDefinition.setFileName(DELETED_AUTHORITIES_FILE_NAME); | ||
| fileDefinition = fileDefinitionsService.postFileDefinition(fileDefinition); | ||
| fileDefinition = fileDefinitionsService.uploadFile(fileDefinition.getId(), new ByteArrayResource(fileContent.getBytes())); | ||
| return fileDefinition; | ||
| } | ||
| } |
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
Oops, something went wrong.