Publish binary resources #194
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,16 +12,12 @@ | |
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.io.InputStreamReader; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.nio.file.Paths; | ||
| import java.text.SimpleDateFormat; | ||
| import java.util.*; | ||
| import net.jimblackler.jsonschemafriend.GenerationException; | ||
| import net.jimblackler.jsonschemafriend.ValidationException; | ||
| import org.apache.http.HttpResponse; | ||
|
|
@@ -98,6 +94,12 @@ public class PublishFhirResourcesCommand implements Runnable { | |
| required = false) | ||
| String validateResource = "true"; | ||
|
|
||
| @CommandLine.Option( | ||
| names = {"-c", "--composition"}, | ||
| description = "path of the composition configuration file", | ||
| required = false) | ||
| String compositionFilePath; | ||
|
|
||
| @Override | ||
| public void run() { | ||
| long start = System.currentTimeMillis(); | ||
|
|
@@ -111,7 +113,11 @@ public void run() { | |
| } | ||
| } | ||
| try { | ||
| if (compositionFilePath != null) { | ||
| ArrayList<JSONObject> resourceObjects = buildBinaries(compositionFilePath, projectFolder); | ||
| buildBundle(resourceObjects); | ||
| } | ||
| buildResources(); | ||
| stateManagement(); | ||
| } catch (IOException | ValidationException | GenerationException e) { | ||
| throw new RuntimeException(e); | ||
|
|
@@ -171,32 +177,98 @@ void setProperties(Properties properties) { | |
| } | ||
| } | ||
|
|
||
| String getFileName(String name) { | ||
| if ((name.endsWith("Register")) || (name.endsWith("Profile"))) { | ||
| String regex = "([a-z])([A-Z]+)"; | ||
| String replacer = "$1_$2"; | ||
| name = name.replaceAll(regex, replacer).toLowerCase(); | ||
| } | ||
| if (name.startsWith("strings")) { | ||
| name = name + "_config.properties"; | ||
| } else { | ||
| name = name + "_config.json"; | ||
| } | ||
| return name; | ||
| } | ||
|
|
||
| HashMap<String, String> getDetails(JSONObject jsonObject) { | ||
| JSONObject focus = jsonObject.getJSONObject("focus"); | ||
| String reference = focus.getString("reference"); | ||
| JSONObject identifier = focus.getJSONObject("identifier"); | ||
| String name = identifier.getString("value"); | ||
|
|
||
| HashMap<String, String> map = new HashMap<>(); | ||
| map.put("reference", reference); | ||
| map.put("name", getFileName(name)); | ||
| return map; | ||
| } | ||
|
|
||
| String getBinaryContent(String fileName, String projectFolder) throws IOException { | ||
| String pathToFile; | ||
| if (fileName.contains("register")) { | ||
| pathToFile = projectFolder + "/registers/" + fileName; | ||
|
There was a problem hiding this comment. assuming we're always using this agreed on file/folder structure There was a problem hiding this comment. yea seems reasonable, on that note, should we to the validation checker (and later the app content from template creator) something to verify the repo follows file structure? There was a problem hiding this comment. sure, created an issue here #195 |
||
| } else if (fileName.contains("profile")) { | ||
| pathToFile = projectFolder + "/profiles/" + fileName; | ||
| } else if (fileName.startsWith("strings_")) { | ||
| pathToFile = projectFolder + "/translations/" + fileName; | ||
| } else { | ||
| pathToFile = projectFolder + "/" + fileName; | ||
| } | ||
|
|
||
| String fileContent = FctUtils.readFile(pathToFile).getContent(); | ||
| return Base64.getEncoder().encodeToString(fileContent.getBytes(StandardCharsets.UTF_8)); | ||
| } | ||
|
|
||
| ArrayList<JSONObject> buildBinaries(String compositionFilePath, String projectFolder) | ||
| throws IOException { | ||
| FctFile compositionFile = FctUtils.readFile(compositionFilePath); | ||
| JSONObject compositionResource = new JSONObject(compositionFile.getContent()); | ||
| List<Map<String, String>> mapList = new ArrayList<>(); | ||
| Map<String, String> detailsMap = new HashMap<>(); | ||
| ArrayList<JSONObject> resourceObjects = new ArrayList<>(); | ||
|
|
||
| if (compositionResource.has("section")) { | ||
| JSONArray compositionObjects = compositionResource.getJSONArray("section"); | ||
|
|
||
| for (Object obj : compositionObjects) { | ||
| JSONObject jsonObject = new JSONObject(obj.toString()); | ||
| if (jsonObject.has("section")) { | ||
| JSONArray section = jsonObject.getJSONArray("section"); | ||
| for (Object subObj : section) { | ||
| JSONObject jo = new JSONObject(subObj.toString()); | ||
| detailsMap = getDetails(jo); | ||
| } | ||
| } else { | ||
| detailsMap = getDetails(jsonObject); | ||
| } | ||
| mapList.add(detailsMap); | ||
| } | ||
|
|
||
| for (Map<String, String> e : mapList) { | ||
| String filename = e.get("name"); | ||
| String binaryContent = getBinaryContent(filename, projectFolder); | ||
| String contentType; | ||
|
|
||
| if (filename.startsWith("strings_")) { | ||
| contentType = "text/plain"; | ||
| } else { | ||
| contentType = "application/json"; | ||
| } | ||
|
|
||
| JSONObject binaryResourceObject = new JSONObject(); | ||
| binaryResourceObject.put("resourceType", "Binary"); | ||
| binaryResourceObject.put("id", e.get("reference").substring(7)); | ||
| binaryResourceObject.put("contentType", contentType); | ||
| binaryResourceObject.put("data", binaryContent); | ||
|
|
||
| JSONObject finalResourceObject = buildResourceObject(binaryResourceObject.toString()); | ||
| resourceObjects.add(finalResourceObject); | ||
| } | ||
| } | ||
| return resourceObjects; | ||
| } | ||
|
|
||
| String getToken() { | ||
| if (accessToken == null || accessToken.isBlank()) { | ||
| if (clientId == null || clientId.isBlank()) { | ||
| throw new IllegalArgumentException( | ||
|
|
@@ -217,7 +289,38 @@ void publishResources() throws IOException, ValidationException, GenerationExcep | |
| accessToken = | ||
| getAccessToken(clientId, clientSecret, accessTokenUrl, grantType, username, password); | ||
| } | ||
| return accessToken; | ||
| } | ||
|
|
||
| void buildBundle(ArrayList<JSONObject> resourceObjects) throws IOException { | ||
| JSONObject bundle = new JSONObject(); | ||
| bundle.put("resourceType", "Bundle"); | ||
| bundle.put("type", "transaction"); | ||
| bundle.put("entry", resourceObjects); | ||
| FctUtils.printToConsole("Full Payload to POST: "); | ||
| FctUtils.printToConsole(bundle.toString()); | ||
|
|
||
| postRequest(bundle.toString(), getToken()); | ||
| } | ||
|
|
||
| void buildResources() throws IOException, ValidationException, GenerationException { | ||
| ArrayList<String> resourceFiles = getResourceFiles(projectFolder); | ||
| ArrayList<JSONObject> resourceObjects = new ArrayList<>(); | ||
| boolean validateResourceBoolean = Boolean.parseBoolean(validateResource); | ||
|
|
||
| for (String f : resourceFiles) { | ||
| if (validateResourceBoolean) { | ||
| FctUtils.printInfo(String.format("Validating file \u001b[35m%s\u001b[0m", f)); | ||
| ValidateFhirResourcesCommand.validateFhirResources(f); | ||
| } else { | ||
| FctUtils.printInfo(String.format("Publishing \u001b[35m%s\u001b[0m Without Validation", f)); | ||
| } | ||
|
|
||
| FctFile inputFile = FctUtils.readFile(f); | ||
| JSONObject resourceObject = buildResourceObject(inputFile.getContent()); | ||
| resourceObjects.add(resourceObject); | ||
| } | ||
| buildBundle(resourceObjects); | ||
| } | ||
|
|
||
| static ArrayList<String> getResourceFiles(String pathToFolder) throws IOException { | ||
|
|
@@ -259,8 +362,8 @@ private static void addFhirResource(String filePath, List<String> filesArray) { | |
| } | ||
| } | ||
|
|
||
| JSONObject buildResourceObject(String fileContent) { | ||
| JSONObject resource = new JSONObject(fileContent); | ||
| String resourceType = null; | ||
| String resourceID; | ||
| if (resource.has("resourceType")) { | ||
|
|
||
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
assuming here that we are always converting from camel case
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you add that to a docstring for this function?