FINERACT-2169: Refactor document management api and update swagger doc;
This commit is contained in:
committed by
Adam Saghy
parent
a0ffaa1c0b
commit
ac8f62db51
+1
-1
@@ -87,7 +87,7 @@ public class BulkImportApiResource {
|
||||
public String retriveOutputTemplateLocation(@QueryParam("importDocumentId") final String importDocumentId) {
|
||||
this.context.authenticatedUser().validateHasReadPermission(RESOURCE_NAME_FOR_PERMISSION);
|
||||
final DocumentData documentData = this.bulkImportWorkbookService.getOutputTemplateLocation(importDocumentId);
|
||||
return this.toApiJsonSerializer.serialize(documentData.fileLocation());
|
||||
return this.toApiJsonSerializer.serialize(documentData.getLocation());
|
||||
}
|
||||
|
||||
@GET
|
||||
|
||||
+3
-3
@@ -260,8 +260,8 @@ public class BulkImportWorkbookServiceImpl implements BulkImportWorkbookService
|
||||
}
|
||||
|
||||
private Response buildResponse(DocumentData documentData) {
|
||||
String fileName = "Output" + documentData.fileName();
|
||||
String fileLocation = documentData.fileLocation();
|
||||
String fileName = "Output" + documentData.getFileName();
|
||||
String fileLocation = documentData.getLocation();
|
||||
File file = new File(fileLocation);
|
||||
final Response.ResponseBuilder response = Response.ok(file);
|
||||
response.header("Content-Disposition", "attachment; filename=\"" + fileName + "\"");
|
||||
@@ -282,7 +282,7 @@ public class BulkImportWorkbookServiceImpl implements BulkImportWorkbookService
|
||||
public DocumentData mapRow(ResultSet rs, @SuppressWarnings("unused") int rowNum) throws SQLException {
|
||||
final String location = rs.getString("location");
|
||||
final String fileName = rs.getString("file_name");
|
||||
return new DocumentData(null, null, null, null, fileName, null, null, null, location, null);
|
||||
return new DocumentData(null, null, null, null, fileName, null, null, location, null, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user