From a64c3b4b723520902062bb3a86d9cef8fc1f022b Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Wed, 2 Sep 2020 12:32:25 -0400
Subject: [PATCH] IDL SQUASH

IDL change for contacts

IDL mark required fields as required in IDL for provider addresses

IDL Mark required fields on the provider-contact object

IDL change for holdings subfields

IDL mark required fields in IDL for acqpro

IDL Add link from provider to attributes

IDL update IDL to link acqpro => acqedi

IDL LP#XXX: mark acqpro.name as not translatable

Providers don't tend to vary their names by locale, so
this seems unnecessary.

IDL mark acq.edi_account columns as required in IDL

IDL mark more fields as required in the IDL (LH#20)

IDL for contact addresses
---
 Open-ILS/examples/fm_IDL.xml | 68 +++++++++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 29 deletions(-)

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 44455db884..842eae9f29 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -8785,10 +8785,10 @@ SELECT  usr,
 	<class id="acqpro" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="acq::provider" oils_persist:tablename="acq.provider" reporter:label="Provider">
 		<fields oils_persist:primary="id" oils_persist:sequence="acq.provider_id_seq">
 			<field reporter:label="Provider ID" name="id" reporter:datatype="id" reporter:selector='code'/>
-			<field reporter:label="Provider Name" name="name" reporter:datatype="text" oils_persist:i18n="true" />
-			<field reporter:label="Owner" name="owner" reporter:datatype="org_unit" />
-			<field reporter:label="Currency" name="currency_type" oils_persist:primitive="string" reporter:datatype="link" />
-			<field reporter:label="Code" name="code" reporter:datatype="text" />
+			<field reporter:label="Provider Name" name="name" reporter:datatype="text" oils_obj:required="true"/>
+			<field reporter:label="Owner" name="owner" reporter:datatype="org_unit" oils_obj:required="true"/>
+			<field reporter:label="Currency" name="currency_type" oils_persist:primitive="string" reporter:datatype="link" oils_obj:required="true"/>
+			<field reporter:label="Code" name="code" reporter:datatype="text" oils_obj:required="true"/>
 			<field reporter:label="Holdings Tag" name="holding_tag" reporter:datatype="text" />
 			<field reporter:label="Addresses" name="addresses" oils_persist:virtual="true" reporter:datatype="link" />
 			<field reporter:label="SAN" name="san" reporter:datatype="text" />
@@ -8801,15 +8801,23 @@ SELECT  usr,
 			<field reporter:label="Fax Phone" name="fax_phone" reporter:datatype="text" />
 			<field reporter:label="Default Claim Policy" name="default_claim_policy" reporter:datatype="link" />
 			<field reporter:label="Default # Copies" name="default_copy_count" reporter:datatype="int" />
+			<field reporter:label="Contacts" name="contacts" oils_persist:virtual="true" reporter:datatype="link" />
 			<field reporter:label="Notes" name="provider_notes" oils_persist:virtual="true" reporter:datatype="link" />
+			<field reporter:label="Holdings Subfields" name="holdings_subfields" oils_persist:virtual="true" reporter:datatype="link" />
+			<field reporter:label="Attribute Definitions" name="attributes" oils_persist:virtual="true" reporter:datatype="link" />
+			<field reporter:label="EDI Accounts" name="edi_accounts" oils_persist:virtual="true" reporter:datatype="link" />
 		</fields>
 		<links>
 			<link field="currency_type" reltype="has_a" key="code" map="" class="acqct"/>
 			<link field="owner" reltype="has_a" key="id" map="" class="aou"/>
             <link field="addresses" reltype="has_many" map="" key="provider" class="acqpa"/>
+            <link field="contacts" reltype="has_many" map="" key="provider" class="acqpc"/>
             <link field="edi_default" reltype="has_a" map="" key="id" class="acqedi"/>
 			<link field="default_claim_policy" reltype="has_a" map="" key="id" class="acqclp"/>
 			<link field="provider_notes" reltype="has_many" map="" key="provider" class="acqpron"/>
+			<link field="holdings_subfields" reltype="has_many" map="" key="provider" class="acqphsm"/>
+			<link field="attributes" reltype="has_many" map="" key="provider" class="acqlipad"/>
+			<link field="edi_accounts" reltype="has_many" map="" key="provider" class="acqedi"/>
 		</links>
         <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
             <actions>
@@ -8974,14 +8982,14 @@ SELECT  usr,
 	<class id="acqpa" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="acq::provider_address" oils_persist:tablename="acq.provider_address" reporter:label="Provider Address">
 		<fields oils_persist:primary="id" oils_persist:sequence="acq.provider_address_id_seq">
 			<field reporter:label="Address Type" name="address_type"  reporter:datatype="text"/>
-			<field reporter:label="City" name="city"  reporter:datatype="text"/>
-			<field reporter:label="Country" name="country"  reporter:datatype="text"/>
+			<field reporter:label="City" name="city"  reporter:datatype="text" oils_obj:required="true"/>
+			<field reporter:label="Country" name="country"  reporter:datatype="text" oils_obj:required="true"/>
 			<field reporter:label="County" name="county"  reporter:datatype="text"/>
 			<field reporter:label="ID" name="id" reporter:datatype="id"/>
 			<field reporter:label="Provider" name="provider" reporter:datatype="link"/>
-			<field reporter:label="Post Code" name="post_code"  reporter:datatype="text"/>
-			<field reporter:label="State" name="state"  reporter:datatype="text"/>
-			<field reporter:label="Street 1" name="street1"  reporter:datatype="text"/>
+			<field reporter:label="Post Code" name="post_code"  reporter:datatype="text" oils_obj:required="true"/>
+			<field reporter:label="State" name="state"  reporter:datatype="text" oils_obj:required="true"/>
+			<field reporter:label="Street 1" name="street1"  reporter:datatype="text" oils_obj:required="true"/>
 			<field reporter:label="Street 2" name="street2"  reporter:datatype="text"/>
 			<field reporter:label="Is Valid?" name="valid" reporter:datatype="bool"/>
 			<field reporter:label="Fax Phone" name="fax_phone" reporter:datatype="text"/>
@@ -9010,13 +9018,15 @@ SELECT  usr,
 	<class id="acqpc" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="acq::provider_contact" oils_persist:tablename="acq.provider_contact" reporter:label="Provider Contact">
 		<fields oils_persist:primary="id" oils_persist:sequence="acq.provider_contact_id_seq">
 			<field reporter:label="ID" name="id" reporter:datatype="id"/>
-			<field reporter:label="Provider" name="provider" reporter:datatype="link"/>
-			<field reporter:label="Name" name="name" reporter:datatype="text"/>
+			<field reporter:label="Provider" name="provider" reporter:datatype="link" oils_obj:required="true"/>
+			<field reporter:label="Name" name="name" reporter:datatype="text" oils_obj:required="true"/>
 			<field reporter:label="Role" name="role" reporter:datatype="text"/>
 			<field reporter:label="Email" name="email" reporter:datatype="text"/>
 			<field reporter:label="Phone" name="phone" reporter:datatype="text"/>
+			<field reporter:label="Addresses" name="addresses" oils_persist:virtual="true" reporter:datatype="link"/>
         </fields>
 		<links>
+			<link field="addresses" reltype="has_many" key="contact" map="" class="acqpca"/>
 			<link field="provider" reltype="has_a" key="id" map="" class="acqpro"/>
 		</links>
         <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
@@ -9039,15 +9049,15 @@ SELECT  usr,
 	<class id="acqpca" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="acq::provider_contact_address" oils_persist:tablename="acq.provider_contact_address" reporter:label="Provider Contact Address">
 		<fields oils_persist:primary="id" oils_persist:sequence="acq.provider_contact_address_id_seq">
 			<field reporter:label="Type" name="address_type"  reporter:datatype="text"/>
-			<field reporter:label="City" name="city"  reporter:datatype="text"/>
-			<field reporter:label="Country" name="country"  reporter:datatype="text"/>
+			<field reporter:label="City" name="city"  reporter:datatype="text" oils_obj:required="true"/>
+			<field reporter:label="Country" name="country"  reporter:datatype="text" oils_obj:required="true"/>
 			<field reporter:label="County" name="county"  reporter:datatype="text"/>
 			<field reporter:label="Address ID" name="id" reporter:datatype="id" />
-			<field reporter:label="Postal Code" name="post_code" reporter:datatype="text"/>
-			<field reporter:label="State" name="state"  reporter:datatype="text"/>
-			<field reporter:label="Street (1)" name="street1"  reporter:datatype="text"/>
+			<field reporter:label="Postal Code" name="post_code" reporter:datatype="text" oils_obj:required="true"/>
+			<field reporter:label="State" name="state"  reporter:datatype="text" oils_obj:required="true"/>
+			<field reporter:label="Street (1)" name="street1"  reporter:datatype="text" oils_obj:required="true"/>
 			<field reporter:label="Street (2)" name="street2"  reporter:datatype="text"/>
-			<field reporter:label="Contact" name="contact" reporter:datatype="link"/>
+			<field reporter:label="Contact" name="contact" reporter:datatype="link" oils_obj:required="true"/>
 			<field reporter:label="Valid Address?" name="valid" reporter:datatype="bool"/>
 			<field reporter:label="Fax Phone" name="fax_phone" reporter:datatype="text"/>
 		</fields>
@@ -10026,10 +10036,10 @@ SELECT  usr,
 	<class id="acqlipad" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="acq::lineitem_provider_attr_definition" oils_persist:tablename="acq.lineitem_provider_attr_definition" reporter:label="Line Item Provider Attribute Definition">
 	    <fields oils_persist:primary="id" oils_persist:sequence="acq.lineitem_attr_definition_id_seq">
 		<field reporter:label="Definition ID" name="id" reporter:datatype="id" />
-		<field reporter:label="Code" name="code" reporter:datatype="text" />
-		<field reporter:label="Description" name="description" reporter:datatype="text" oils_persist:i18n="true" />
-		<field reporter:label="XPath" name="xpath" reporter:datatype="text" />
-		<field reporter:label="Provider" name="provider" reporter:datatype="link" />
+		<field reporter:label="Code" name="code" reporter:datatype="text"  oils_obj:required="true" />
+		<field reporter:label="Description" name="description" reporter:datatype="text" oils_persist:i18n="true" oils_obj:required="true" />
+		<field reporter:label="XPath" name="xpath" reporter:datatype="text" oils_obj:required="true" />
+		<field reporter:label="Provider" name="provider" reporter:datatype="link" oils_obj:required="true" />
 		<field reporter:label="Is Identifier?" name="ident" reporter:datatype="bool"/>
         <field reporter:label="Remove" name="remove" reporter:datatype="text" />
 
@@ -10058,9 +10068,9 @@ SELECT  usr,
 	<class id="acqphsm" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="acq::provider_holding_subfield_map" oils_persist:tablename="acq.provider_holding_subfield_map" reporter:label="Provider Holding Subfield Map">
 	    <fields oils_persist:primary="id" oils_persist:sequence="acq.provider_holding_subfield_map_id_seq">
 		<field reporter:label="ID" name="id" reporter:datatype="id" />
-		<field reporter:label="Provider" name="provider" reporter:datatype="link" />
-		<field reporter:label="Name" name="name" reporter:datatype="text" />
-		<field reporter:label="Subfield" name="subfield" reporter:datatype="text" />
+		<field reporter:label="Provider" name="provider" reporter:datatype="link" oils_obj:required="true" />
+		<field reporter:label="Name" name="name" reporter:datatype="text" oils_obj:required="true" />
+		<field reporter:label="Subfield" name="subfield" reporter:datatype="text" oils_obj:required="true" />
 	    </fields>
 	    <links>
 		<link field="provider" reltype="has_a" key="id" map="" class="acqpro"/>
@@ -10096,20 +10106,20 @@ SELECT  usr,
 	<class id="acqedi" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="acq::edi_account" oils_persist:tablename="acq.edi_account" reporter:label="EDI Account">
 		<fields oils_persist:primary="id" oils_persist:sequence="config.remote_account_id_seq"><!-- edi_account inherits from config.remote_account, hence the seq -->
 			<field name="id"            reporter:datatype="id"        reporter:label="EDI Account ID" reporter:selector="label"/>
-			<field name="label"         reporter:datatype="text"      reporter:label="Label"/>
-			<field name="host"          reporter:datatype="text"      reporter:label="Host"/>
+			<field name="label"         reporter:datatype="text"      reporter:label="Label" oils_obj:required="true"/>
+			<field name="host"          reporter:datatype="text"      reporter:label="Host" oils_obj:required="true"/>
 			<field name="username"      reporter:datatype="text"      reporter:label="Username"/>
 			<field name="password"      reporter:datatype="text"      reporter:label="Password"/>
 			<field name="account"       reporter:datatype="text"      reporter:label="Account"/>
 			<field name="path"          reporter:datatype="text"      reporter:label="Path"/>
-			<field name="owner"         reporter:datatype="link"      reporter:label="Owner"/>
+			<field name="owner"         reporter:datatype="link"      reporter:label="Owner" oils_obj:required="true"/>
 			<field name="last_activity" reporter:datatype="timestamp" reporter:label="Last Activity"/>
-			<field name="provider"      reporter:datatype="link"      reporter:label="Provider"/>
+			<field name="provider"      reporter:datatype="link"      reporter:label="Provider" oils_obj:required="true"/>
 			<field name="in_dir"        reporter:datatype="text"      reporter:label="Incoming Directory"/>
 			<field name="vendacct"      reporter:datatype="text"      reporter:label="Vendor Account Number"/>
 			<field name="vendcode"      reporter:datatype="text"      reporter:label="Vendor Assigned Code"/>
 			<field name="attr_set"      reporter:datatype="link"      reporter:label="EDI Attribute Set"/>
-			<field name="use_attrs"     reporter:datatype="bool"      reporter:label="Use EDI Attributes"/>
+			<field name="use_attrs"     reporter:datatype="bool"      reporter:label="Use EDI Attributes" oils_obj:required="true"/>
 		</fields>
 		<links>
 			<link field="provider" reltype="has_a" key="id" map="" class="acqpro"/>
-- 
2.11.0