honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bugs in graphql generation

This commit is contained in:
Grahame Grieve 2022-10-05 21:17:52 +11:00
parent ae8bc3502f
commit efd8e07b9d
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/GraphQLSchemaGenerator.java
View File

@ -103,6 +103,9 @@ public class GraphQLSchemaGenerator {
if (sd.getKind() == StructureDefinitionKind.COMPLEXTYPE && sd.getDerivation() == TypeDerivationRule.SPECIALIZATION) { if (sd.getKind() == StructureDefinitionKind.COMPLEXTYPE && sd.getDerivation() == TypeDerivationRule.SPECIALIZATION) {
tl.put(sd.getName(), sd); tl.put(sd.getName(), sd);
} }
if (sd.getKind() == StructureDefinitionKind.RESOURCE && sd.getDerivation() != TypeDerivationRule.CONSTRAINT && sd.getAbstract()) {
tl.put(sd.getName(), sd);
}
} }
writer.write("# FHIR GraphQL Schema. Version " + version + "\r\n\r\n"); writer.write("# FHIR GraphQL Schema. Version " + version + "\r\n\r\n");
writer.write("# FHIR Defined Primitive types\r\n"); writer.write("# FHIR Defined Primitive types\r\n");
@ -290,16 +293,17 @@ public class GraphQLSchemaGenerator {
} }
private void generateType(Map<String, String> existingTypeNames, Writer writer, StructureDefinition sd, EnumSet<FHIROperationType> operations) throws IOException { private void generateType(Map<String, String> existingTypeNames, Writer writer, StructureDefinition sd, EnumSet<FHIROperationType> operations) throws IOException {
if (sd.getAbstract()) {
return;
}
if (operations.contains(FHIROperationType.READ) || operations.contains(FHIROperationType.SEARCH)) { if (operations.contains(FHIROperationType.READ) || operations.contains(FHIROperationType.SEARCH)) {
List<StringBuilder> list = new ArrayList<>(); List<StringBuilder> list = new ArrayList<>();
StringBuilder b = new StringBuilder(); StringBuilder b = new StringBuilder();
list.add(b); list.add(b);
b.append("type "); b.append("type ");
b.append(sd.getName()); b.append(sd.getName());
StructureDefinition sdp = context.fetchResource(StructureDefinition.class, sd.getBaseDefinition());
if (sdp != null) {
b.append(" implements ");
b.append(sdp.getType());
}
b.append(" {\r\n"); b.append(" {\r\n");
ElementDefinition ed = sd.getSnapshot().getElementFirstRep(); ElementDefinition ed = sd.getSnapshot().getElementFirstRep();
generateProperties(existingTypeNames, list, b, sd.getName(), sd, ed, "type", ""); generateProperties(existingTypeNames, list, b, sd.getName(), sd, ed, "type", "");
@ -370,7 +374,13 @@ public class GraphQLSchemaGenerator {
if (suffix) if (suffix)
b.append(Utilities.capitalize(typeDetails.getWorkingCode())); b.append(Utilities.capitalize(typeDetails.getWorkingCode()));
b.append(": "); b.append(": ");
b.append(n); if (!child.getMax().equals("1")) {
b.append("[");
b.append(n);
b.append("]");
} else {
b.append(n);
}
if (!child.getPath().endsWith(".id")) { if (!child.getPath().endsWith(".id")) {
b.append(" _"); b.append(" _");
b.append(tail(child.getPath(), suffix)); b.append(tail(child.getPath(), suffix));