From 1c6be8aff3d641c4d07d46e68b8bf6b4f9d40b0f Mon Sep 17 00:00:00 2001
From: Al S <xee5ch.gh.al@il5.in>
Date: Wed, 24 Aug 2022 12:40:22 -0400
Subject: [PATCH] Address PR feedback to wrap up.

https://github.com/usnistgov/OSCAL/pull/1052#pullrequestreview-1079613752
https://github.com/usnistgov/OSCAL/pull/1052#discussion_r950777018
---
 src/metaschema/oscal_metadata_metaschema.xml | 29 +++++++++-----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/metaschema/oscal_metadata_metaschema.xml b/src/metaschema/oscal_metadata_metaschema.xml
index e2f11825a2..848123ac94 100644
--- a/src/metaschema/oscal_metadata_metaschema.xml
+++ b/src/metaschema/oscal_metadata_metaschema.xml
@@ -770,14 +770,6 @@
             <formal-name>Action Universally Unique Identifier</formal-name>
             <description>A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.</description>
         </define-flag>
-        <define-flag name="role-id" as-type="token" required="yes">
-            <formal-name>Action Responsible Role Identifier</formal-name>
-            <description>Identifier of the approving role in the responsible party.</description>
-        </define-flag>
-        <define-flag name="party-uuid" as-type="token" required="yes">
-            <formal-name>Action Party Universally Unique Identifier</formal-name>
-            <description>The universally unique identifier of the party responsible for the action.</description>
-        </define-flag>
         <define-flag name="date" as-type="dateTime-with-timezone">
             <formal-name>Action Occurrence Date</formal-name>
             <description>The date and time when the action occurred.</description>
@@ -793,11 +785,6 @@
                 <p>Provides a means to segment the value space for the <code>type</code>, so that different organizations and individuals can assert control over the allowed <code>action</code>'s <code>type</code>. This allows the semantics associated with a given <code>type</code> to be defined on an organization-by-organization basis.</p>
                 <p>An organization MUST use a URI that they have control over. e.g., a domain registered to the organization in a URI, a registered uniform resource names (URN) namespace.</p>
             </remarks>
-            <constraint>
-               <allowed-values allow-other="yes">
-                  <enum value="http://csrc.nist.gov/ns/oscal">This value identifies action types defined in the NIST OSCAL namespace.</enum>
-               </allowed-values>
-            </constraint>
          </define-flag>
         <model>
             <assembly ref="property" max-occurs="unbounded">
@@ -806,15 +793,25 @@
             <assembly ref="link" max-occurs="unbounded">
                 <group-as name="links" in-json="ARRAY"/>
             </assembly>
+            <assembly ref="responsible-party" max-occurs="unbounded">
+                <group-as name="responsible-parties" in-json="ARRAY"/>
+            </assembly>
             <field ref="remarks" in-xml="WITH_WRAPPER"/>
         </model>
         <constraint>
-            <index-has-key name="index-metadata-role-id" target=".">
+            <index-has-key name="index-metadata-role-id" target="responsible-party">
                 <key-field target="@role-id"/>
             </index-has-key>
-            <index-has-key name="index-metadata-party-uuid" target=".">
-                <key-field target="@party-uuid"/>
+            <index-has-key name="index-metadata-party-uuid" target="responsible-party">
+                <key-field target="party-uuid"/>
             </index-has-key>
+            <allowed-values target="./system/@value" allow-other="yes">
+                <enum value="http://csrc.nist.gov/ns/oscal">This value identifies action types defined in the NIST OSCAL namespace.</enum>
+             </allowed-values>
+             <allowed-values target="./type[has-oscal-namespace('http://csrc.nist.gov/ns/oscal')]/@value">
+                <enum value="approval">An approval of a document instance's content.</enum>
+                <enum value="request-changes">A request from the responisble party or parties to change the content.</enum>
+            </allowed-values>
         </constraint>
     </define-assembly>