Unqualified Locatable in containment cannot be used in containment expression

[chevalleyc]

Steps to reproduce

For an AQL expression such as:

select
q/items[at0024]/value/defining_code/code_string as ErregerBEZK,
x/items[at0015]/value as Datetime
from EHR e
contains COMPOSITION c
contains OBSERVATION v[openEHR-EHR-OBSERVATION.laboratory_test_result.v1]
contains ( 
CLUSTER h[openEHR-EHR-CLUSTER.laboratory_test_panel.v0] and
CLUSTER x[openEHR-EHR-CLUSTER.specimen.v1] and
CLUSTER q[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1])
where
c/name/value='Mikrobiologischer Befund' 

It seems there is no way to build a containment expression which specifies explicitly COMPOSITION c to used here in the WHERE clause (but it could also be f.e. c/uid/value in SELECT).

We can write the containment expression as:

        ContainmentExpression containmentExpression =
                befundObservationContainment.contains(
                        kulturClusterContainment.and(
                                probeClusterContainment.and(proVirusClusterContainment))
                );

But it results as the following AQL as expected:

Select ...
 from EHR e
  contains OBSERVATION o1[openEHR-EHR-OBSERVATION.laboratory_test_result.v1] 
    contains (CLUSTER c2[openEHR-EHR-CLUSTER.laboratory_test_panel.v0]
                   and (CLUSTER c3[openEHR-EHR-CLUSTER.specimen.v1]
                        and CLUSTER c0[openEHR-EHR-CLUSTER.laboratory_test_analyte.v1])) ...

Expected result

There should be a generic way to specify an unqualified containment on a Locatable (or a workaround if applicable)

Success criteria

• The defect has been fixed
• The defect is checked by an unit or an integration test (Robot)
• Merge Request approved
• Unit tests passed
• Build without errors
• Release notes prepared
• Runtime warnings