Adds data value set rule SQL scripts.

fhir/src/main/java/org/dhis2/fhir/adapter/fhir/metadata/model/DataValueSetRule.java

@@ -37,8 +37,6 @@
 import javax.annotation.Nonnull;
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
@@ -68,8 +66,9 @@ public DataValueSetRule()
     //TODO: Not sure about scripts yet - BEGIN
 
     @JsonCacheId
-    @ManyToOne
-    @JoinColumn( name = "org_lookup_script_id" )
+    // @ManyToOne
+    // @JoinColumn( name = "org_lookup_script_id" )
+    @Transient
     public ExecutableScript getOrgUnitLookupScript()
     {
         return orgUnitLookupScript;
@@ -81,8 +80,9 @@ public void setOrgUnitLookupScript( ExecutableScript orgUnitLookupScript )
     }
 
     @JsonCacheId
-    @ManyToOne
-    @JoinColumn( name = "loc_lookup_script_id" )
+    // @ManyToOne
+    // @JoinColumn( name = "loc_lookup_script_id" )
+    @Transient
     public ExecutableScript getLocationLookupScript()
     {
         return locationLookupScript;

fhir/src/main/resources/db/migration/production/V1.1.0.44_0_0__Data_Value_Set_Rule.sql

@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2004-2019, University of Oslo
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *  Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *
+ *  Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation
+ *  and/or other materials provided with the distribution.
+ *  Neither the name of the HISP project nor the names of its contributors may
+ *  be used to endorse or promote products derived from this software without
+ *  specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED. IN NO PROGRAM_STAGE_EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ *  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+-- @formatter:off
+CREATE TABLE IF NOT EXISTS fhir_data_value_set_rule (
+  id                              UUID         NOT NULL,
+  CONSTRAINT fhir_data_value_set_rule_pk PRIMARY KEY (id),
+  CONSTRAINT fhir_data_value_set_rule_fk1 FOREIGN KEY (id) REFERENCES fhir_rule (id) ON DELETE CASCADE
+);
+COMMENT ON TABLE fhir_data_value_set_rule IS 'Contains rules for DHIS2 Data Value Set Resource Types.';
+COMMENT ON COLUMN fhir_data_value_set_rule.id IS 'References the rule to which this Data Value Set rule belongs to.';
+