Add submitted and cycle codes and publish 0.6.4-SNAPSHOT

Human readable proposal and cycle codes have been added. These are the codes by which proposals and cycles would be referred to by systems outside of the ones that natively "understand" proposalDM (i.e. ones that have access to the surrogate keys)

Author: pahjbo

src/main/vo-dml/proposalManagement.vo-dml.xml

@@ -9,7 +9,7 @@
       <title>Proposal Management</title>
       <author>Paul Harrison</author>
       <version>0.6</version>
-      <lastModified>2024-11-25T16:59:10Z</lastModified>
+      <lastModified>2025-07-18T10:31:54Z</lastModified>
       <import>
         <name>ivoa</name>
         <version>1.1</version>
@@ -469,6 +469,18 @@
                    <maxOccurs>1</maxOccurs>
                  </multiplicity>
                </attribute>
+               <attribute>
+                 <vodml-id>ProposalCycle.code</vodml-id>
+                 <name>code</name>
+                 <description>human readable code for the cycle</description>	    
+                 <datatype>
+                    <vodml-ref>ivoa:string</vodml-ref>
+                 </datatype>
+                 <multiplicity>
+                   <minOccurs>0</minOccurs>
+                   <maxOccurs>1</maxOccurs>
+                 </multiplicity>
+               </attribute>
                <attribute>
                  <vodml-id>ProposalCycle.instructions</vodml-id>
                  <name>instructions</name>
@@ -689,6 +701,18 @@
                <extends>
                   <vodml-ref>proposal:AbstractProposal</vodml-ref>
                </extends>
+               <attribute>
+                 <vodml-id>SubmittedProposal.proposalCode</vodml-id>
+                 <name>proposalCode</name>
+                 <description>the observatory's code for the proposal</description>	    
+                 <datatype>
+                    <vodml-ref>ivoa:string</vodml-ref>
+                 </datatype>
+                 <multiplicity>
+                   <minOccurs>1</minOccurs>
+                   <maxOccurs>1</maxOccurs>
+                 </multiplicity>
+               </attribute>
                <composition>
                  <vodml-id>SubmittedProposal.config</vodml-id>
                  <name>config</name>

src/main/vodsl/proposalManagement.vodsl

@@ -89,6 +89,7 @@
  otype ProposalCycle "Defines collection of resources and proposals for a particular observing season" {
  	observatory references Observatory  "";
  	^title: ivoa:string "a human readable description of the cycle";
+ 	code: ivoa:string @? "human readable code for the cycle";
  	instructions: ivoa:anyURI @? "pointer to more detailed instructions about the cycle";
  	submissionDeadline : ivoa:datetime @? "the date by which observing proposals must be submitted to be considered for this cycle";
  	observationSessionStart : ivoa:datetime "the start date of the observing cycle";
@@ -131,6 +132,7 @@
 
  otype SubmittedProposal -> proposal:AbstractProposal "an instance of a proposal that has been submitted" {
  //	proposal references proposal:ObservingProposal  "the proposal that was submitted"; //IMPL this is a reference - this is a slight hack as we really want a composition to "freeze" the original proposal - this messes with the original references in the proposal as then they become contained.
+    proposalCode: ivoa:string "the observatory's code for the proposal";
  	config : ObservationConfiguration @* as composition "";
  	submissionDate : ivoa:datetime "the date that the proposal was submitted";
  	successful : ivoa:boolean "the proposal can go on to allocation";

src/test/java/org/ivoa/dm/proposal/prop/BaseExample.java

@@ -89,6 +89,7 @@ protected Consumer<ProposalCycle.ProposalCycleBuilder> cycleCommonSetup() {
             c.observationSessionStart = new GregorianCalendar(2022, 6, 1).getTime();
             c.observationSessionEnd = new GregorianCalendar(2022, 9, 1).getTime();
             c.title="test cycle";
+            c.code="EM01";
             c.tac = tac;
         };
 

src/test/java/org/ivoa/dm/proposal/prop/EmerlinExample.java

@@ -125,7 +125,7 @@ public SubmittedProposal submitProposal(ObservingProposal frozenProposal) {
                 );
 
 
-        final SubmittedProposal submittedProposal = new SubmittedProposal( frozenProposal, obsConfigs,new GregorianCalendar(2022, 3, 14).getTime(),  false, new GregorianCalendar(2022, 4, 30).getTime(),  null );
+        final SubmittedProposal submittedProposal = new SubmittedProposal( frozenProposal, "EmCode",obsConfigs,new GregorianCalendar(2022, 3, 14).getTime(),  false, new GregorianCalendar(2022, 4, 30).getTime(),  null );
         cycle.setSubmittedProposals(
               makeList(submittedProposal));
 

src/test/java/org/ivoa/dm/proposal/prop/NOTexample.java

@@ -177,7 +177,7 @@ public SubmittedProposal submitProposal(ObservingProposal frozenProposal) {
                 new ObservationConfiguration(frozenProposal.getObservations(),obsModes[0])
                 );
 
-        final SubmittedProposal submittedProposal = new SubmittedProposal( frozenProposal, obsConfigs,new GregorianCalendar(2022, 3, 14).getTime(),  false, new GregorianCalendar(2022, 4, 30).getTime(),  null );
+        final SubmittedProposal submittedProposal = new SubmittedProposal( frozenProposal, "NOTcode", obsConfigs,new GregorianCalendar(2022, 3, 14).getTime(),  false, new GregorianCalendar(2022, 4, 30).getTime(),  null );
         cycle.setSubmittedProposals(
               makeList(submittedProposal));