RESTWS-909: Condition resource fails when using a custom representati… #573
Conversation
…on of codedOrNonCoded
| } | ||
|
|
||
| throw new ConversionException("Don't know how to get " + getClass().getSimpleName() + "(" + delegate.getClass() | ||
| + ") as " + representation.getRepresentation(), null); | ||
| } | ||
|
|
||
| /** |
There was a problem hiding this comment.
This is moved to a public static method in ConversionUtil without any changes
| @@ -504,5 +505,70 @@ public static SimpleObject getAuditInfo(Object delegate) { | |||
|
|
|||
| return ret; | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
This is moved here to a public static method in ConversionUtil without any changes, previously was a private instance method on BaseDelegatingResource
| if (repDescription != null) { | ||
| return convertDelegateToRepresentation(delegate, repDescription); | ||
| } | ||
| repDescription = ConversionUtil.getCustomRepresentationDescription((CustomRepresentation) representation); |
There was a problem hiding this comment.
My IDE was telling me to change this because repDescription will never be null
| request.addParameter("patientUuid", "da7f524f-27ce-4bb2-86d6-6d1d05312bd5"); | ||
| request.addParameter("includeInactive", "true"); | ||
| request.addParameter("v", "custom:(uuid,display,clinicalStatus,onsetDate,endDate,additionalDetail,condition:(coded:(id,uuid)))"); | ||
| SimpleObject result = deserialize(handle(request)); |
There was a problem hiding this comment.
Without the fix, this test fails here. It throws an error trying to process this request.
|
|
||
| if (instance.getNonCoded() != null) { | ||
| codedOfFreeText.add("nonCoded", instance.getNonCoded()); | ||
| else { |
There was a problem hiding this comment.
I don't know why this is showing such an extensive change. All of the pre-existing code was simply moved unchanged into this else block. So the only thing I changed was to say - if the Representation is a CustomRepresentation, then process it differently. If it not a custom representation, no behavior has changed here.
| .getResourceBySupportedClass(Concept.class); | ||
| codedOfFreeText.add("coded", conceptResource.asRepresentation(instance.getCoded(), rep)); | ||
| SimpleObject codedOrFreeText = new SimpleObject(); | ||
| if (rep instanceof CustomRepresentation) { |
There was a problem hiding this comment.
I don't know why the framework doesn't automatically handle this, but it doesn't seem to. So here, I'm explicitly parsing the custom representation and using that to determine which properties of the CodedOrNonCoded to convert, and how.
| for (String propertyName : drd.getProperties().keySet()) { | ||
| DelegatingResourceDescription.Property property = drd.getProperties().get(propertyName); | ||
| Object o = ConversionUtil.getPropertyWithRepresentation(instance, propertyName, property.getRep()); | ||
| if (o != null) { |
There was a problem hiding this comment.
Not sure if this is correct - should I include this even if it is null, since it is specified in the custom rep?
There was a problem hiding this comment.
Not sure, I would guess skipping in the correct behavior. At first instinct it might made sense to do something like ' uuid:"" ' but I doubt we'd want to included a nested set of empty properties, so I think just skipping makes sense, unless someone else as an opinion otherwise.
| for (String propertyName : drd.getProperties().keySet()) { | ||
| DelegatingResourceDescription.Property property = drd.getProperties().get(propertyName); | ||
| Object o = ConversionUtil.getPropertyWithRepresentation(instance, propertyName, property.getRep()); | ||
| if (o != null) { |
There was a problem hiding this comment.
Not sure, I would guess skipping in the correct behavior. At first instinct it might made sense to do something like ' uuid:"" ' but I doubt we'd want to included a nested set of empty properties, so I think just skipping makes sense, unless someone else as an opinion otherwise.
…on of codedOrNonCoded
Issue I worked on
see https://issues.openmrs.org/browse/RESTWS-909