JEAN BAPTISTE ZIADE Acc/Decu/Target_PROD

.github/actions/maven-build/action.yml

@@ -0,0 +1,23 @@
+name: Maven Build
+description: Run a Maven Build
+
+inputs:
+  run-tests:
+    description: Whether or not to run tests. The default is true.
+    required: false
+    # type: boolean  - This is not supported (yet). All inputs are of type `string`. See https://github.com/actions/runner/issues/2238.
+    default: 'true'
+
+runs:
+  using: "composite"
+  steps:
+    - name: Set up JDK 11 for x64
+      uses: actions/setup-java@v4
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+        architecture: x64
+        cache: maven
+    - name: Build with Maven
+      shell: bash
+      run: mvn -B -U clean package${{ inputs.run-tests == 'false' && ' -DskipTests' || '' }}

.github/workflows/cve-scanning.yml

@@ -3,6 +3,8 @@ name: CVE Scanning for Maven
 on:
   workflow_dispatch:
   push:
+    branches:
+      - master
     paths:
       - 'pom.xml'
       - 'allow-list.xml'
@@ -14,19 +16,29 @@ on:
       - '.github/workflows/cve-scanning.yml'
 
 jobs:
-  build:
+  depcheck:
 
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 11
-      uses: actions/setup-java@v3
+    - uses: ./.github/actions/maven-build
       with:
-        java-version: '11'
-        distribution: 'temurin'
-        cache: maven
-    - name: Build with Maven
-      run: mvn clean install -DskipTests
+        run-tests: false
     - name: CVE scanning
-      run: mvn org.owasp:dependency-check-maven:check -DfailBuildOnCVSS=7 -DsuppressionFile="allow-list.xml"
+      uses: dependency-check/[email protected]
+      env:
+        JAVA_HOME: /opt/jdk
+      with:
+        project: 'Common Domain Model'
+        path: '.'
+        format: 'HTML'
+        out: 'reports'
+        args: >
+          --suppression allow-list.xml
+          --failOnCVSS 7
+    - name: Upload results
+      uses: actions/upload-artifact@v3
+      with:
+        name: CVE Scan Report
+        path: ${{github.workspace}}/reports

.github/workflows/license-scanning.yml

@@ -3,6 +3,12 @@ name: License Scanning for Maven
 on:
   workflow_dispatch:
   push:
+    branches:
+      - master
+    paths:
+      - 'pom.xml'
+      - '.github/workflows/license-scanning.yml'
+  pull_request:
     paths:
       - 'pom.xml'
       - '.github/workflows/license-scanning.yml'
@@ -16,19 +22,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        module-folder: ["./", "./examples", "./rosetta-source", "./rosetta-project", "./distribution"]
+        module-folder: ["./", "./examples", "./rosetta-source", "./rosetta-project"]
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 11
-      uses: actions/setup-java@v3
-      with:
-        java-version: 11
-        cache: maven
-        distribution: 'adopt'
     - name: Install XQ
       run: pip install xq
-    - name: Build with Maven
-      run: mvn clean install -DskipTests
+    - uses: ./.github/actions/maven-build
+      with:
+        run-tests: false
     - name: License XML report
       run: mvn org.codehaus.mojo:license-maven-plugin:2.0.0:download-licenses
     - name: Validate XML report

.github/workflows/windows-build.yml

@@ -1,17 +1,12 @@
 name: CDM Build on Windows machine
 
-on: [workflow_dispatch, push, pull_request]
+on:
+  workflow_dispatch:
+  pull_request:
 
 jobs:
   build:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-          cache: maven
-      - name: Maven install
-        run: mvn install
+      - uses: ./.github/actions/maven-build

.gitignore

@@ -58,4 +58,7 @@ venv/
 # Docusaurus website
 website/.docusaurus
 website/build
-website/node_modules
+website/node_modules
+
+# CVE scan reports
+/reports/

RELEASE.md

@@ -1,65 +1,64 @@
-# _Event Model - Qualification Functions - Enhancements for the Contract Formation qualification function_
-
-_Background_
-
-The current Contract Formation qualification function does not allow the inclusion of the inception premium. The latter can be transferred as part of the trade execution. This change allows a transfer instruction to be part of the representation of the business event.
-
+# _Infrastructure - Dependency Update_
 
 _What is being released?_
 
-The logical expression for the `Qualify_ContractFormation` function is enhanced to allow for the presence of a transfer instruction.
-
+This release updates the rune dependencies to version `11.24.2`. This update includes support for visualising the `Choice Type` elements in the Rosetta User Interface.
 
 _Review directions_
 
-In the CDM Portal, select the Textual Browser and inspect the function mentioned above.
-
-Changes can be reviewed in PR: https://github.com/finos/common-domain-model/pull/2544
+The changes can be reviewed in PR: [#3255](https://github.com/finos/common-domain-model/pull/3255)
 
-# _Event Model - CounterpartyPositionBusinessEvent - Cardinality of the After state_
+# _Mapping Update - InterestRateForwardDebtPriceMappingProcessor updated to handle 'Percentage' quoteUnits_
 
 _Background_
 
-Following the release of counterparty position in the Common Domain Model, a modelling update is required. The cardinality of the attribute `after` of type `CounterpartyPositionBusinessEvent` has been relaxed to unbounded list `(0..*)`. This change will support the cases when multiple `after` position states are generated as a result of a _partial option exercise_ event being applied to the position.
-
+The price of bond forwards is captured as a monetary value whereas it should be a decimal/percentage. Even if the value in FpML was 'Percentage', the CDM representation value did not accurately represent this, causing misinterpretations.
 
 _What is being released?_
 
-- The cardinality of the `after` position state within `CounterpartyPositionBusinessEvent`is relaxed to unbounded list.
-
-_Data types_
+- An update to the **InterestRateForwardDebtPriceMappingProcessor** code to fix the described issue. This change, would correct the interpretation by dividing the current monetary value by 100, when the *quoteUnits* corresponds to the XML value '*Percentage*'.
+- The **bond-fwd-generic-ex01.xml** and **bond-fwd-generic-ex02.xml** samples have been updated as the files were using the value 'Percent' but the correct value according to the enum should be 'Percentage'
 
-- `after` attribute of type `CounterpartyPositionState` updated to multiple cardinality.
 
 _Review directions_
 
-In the CDM Portal, select the Textual Browser and inspect each of the changes listed above.
+In Rosetta, select the Textual Browser and inspect each of the changes identified above.
+
+The changes can be reviewed in PR: [#3244](https://github.com/finos/common-domain-model/pull/3244)
 
-Changes can be reviewed in PR: https://github.com/finos/common-domain-model/pull/2539
+# _CDM Model - CapacityUnit Enum_
 
-# *Event / Product Model - FpML 5.13 Schema*
+_Background_
+In has been seen that in the ExternalUnitOfMeasure1Code from the 2Q2024 ISO External CodeSets v1, the unity Joule is supported in the Enum. However, in CDM this is not the case, as it does not appear anywhere in the CapacityUnitEnum. Therefore, the Joule unit of measure will be added to the CapacityUnitEnum for completeness and to align with 2Q2024 ISO External CodeSets v1, for versions 5 and 6 of CDM.
 
 _What is being released?_
 
-This release updates the FpML schema used for FpML to CDM ingestion. The version has been updated from `5.13 Second Working Draft` to `5.13 Third Working Draft`.  For further details, visit https://www.fpml.org/spec/fpml-5-13-3-wd-3/.
+- Updated `CapacityUnitEnum` in cdm.base.math
+
+_Enumerations_
 
-_Review Directions_
+- Updated `CapacityUnitEnum` by adding 'J' to support Joule unit
 
-This change has no impact on the model or test expectations. The changes can be reviewed in PR [2542](https://github.com/finos/common-domain-model/pull/2542).
+The changes can be reviewed in PR: [#3197](https://github.com/finos/common-domain-model/pull/3197)
 
-# *Infrastructure - Dependency Update*
+# _Infrastructure - Dependency Update_
 
 _What is being released?_
 
-This release updates the `rosetta-dsl` dependency.
+This release updates the rune dependencies.
 
 Version updates include:
-- `rosetta-dsl` 9.1.0: this release fixes several code generation issues such as [when assigning a Rosetta int to a Rosetta number](https://github.com/REGnosys/rosetta-dsl/issues/579). For further details see DSL release notes: https://github.com/REGnosys/rosetta-dsl/releases/tag/9.1.0.
-
-The issue brought to light a bug in the model having to do with the `CashPriceQuantityNoOfUnitsTriangulation` function, which has been resolved.
+- DSL 9.22.0: handle null for `min` and `max` operations. For further details see DSL release notes: https://github.com/finos/rune-dsl/releases/tag/9.22.0
+- FpML Coding Scheme `11.25.1`: support for latest version (v2.20).
 
 _Review directions_
 
-Test expectations remain the same.
+In Rosetta, select the Textual Browser and inspect changes due to the FpML code scheme update:
+- `FloatingRateIndexEnum` has values added:
+  - `EUR_EuroSTR_ICE_Swap_Rate`
+  - `IDR_INDONIA`
+  - `IDR_INDONIA_OIS_Compound`
+  - `PHP_ORR`
+  - `USD_SOFR_ICE_Swap_Rate_Spreads`
 
-The changes can be reviewed in PR [#2533](https://github.com/finos/common-domain-model/pull/2533).
+The changes can be reviewed in PR: [#3260](https://github.com/finos/common-domain-model/pull/3260)

rosetta-source/src/test/python/semantics/test_cardinality.py → cdm-python/test/semantics/test_cardinality.py

@@ -1,35 +1,37 @@
-import pytest
+'''testing cardinality enforcement'''
 import datetime
+import pytest
 from cdm.base.datetime.DateList import DateList
 from rosetta.runtime.utils import ConditionViolationError
 
 
 def test_1_many_fail():
+    '''DateList cannot be empty'''
     dl = DateList(date=[])
     with pytest.raises(ConditionViolationError):
         dl.validate_conditions()
 
 
-def test_1_many_fail_nopar():
+def test_1_many_fail_empty_constructor():
+    '''DateList cannot be empty'''
     dl = DateList()
     with pytest.raises(ConditionViolationError):
         dl.validate_conditions()
 
 
 def test_1_many_pass():
+    '''Valid DateList'''
     dl = DateList(date=[datetime.date(2020, 1, 1)])
     dl.validate_conditions()
 
 
 if __name__ == "__main__":
-	print("first one")
-	test_1_many_pass()
-	print("second one")
-	test_1_many_fail()
-	print("third one")
-	test_1_many_fail_nopar()
-
-
-# EOF
+    print("test_1_many_pass")
+    test_1_many_pass()
+    print("test_1_many_fail")
+    test_1_many_fail()
+    print("test_1_many_fail_empty_constructor")
+    test_1_many_fail_empty_constructor()
 
 
+# EOF

rosetta-source/src/test/python/semantics/test_conditions.py → cdm-python/test/semantics/test_conditions.py

@@ -1,40 +1,50 @@
+'''Full attribute validation - pydantic and constraints'''
 import pytest
 from pydantic import ValidationError
 from rosetta.runtime.utils import ConditionViolationError
 from cdm.base.math.NonNegativeQuantity import NonNegativeQuantity
 from cdm.base.math.UnitType import UnitType
+from cdm.base.datetime.Frequency import Frequency
+from cdm.base.datetime.PeriodExtendedEnum import PeriodExtendedEnum
 
-'''
-def test_recursive_conds():
-    unit = UnitType(currency='EUR')
-    mq = NonNegativeQuantity(value=10, unit=unit)
-    mq.validate_model()
 
-'''
-
-def test_recursive_conds_base_fail():
+def test_recursive_conditions_base_fail():
+    '''condition_0_AmountOnlyExists violation'''
     unit = UnitType(currency='EUR')
     mq = NonNegativeQuantity(unit=unit)
     with pytest.raises(ConditionViolationError):
         mq.validate_model()
 
-def test_recursive_conds_direct_fail():
+
+def test_recursive_conditions_direct_fail():
+    '''Negative quantity condition violation'''
     unit = UnitType(currency='EUR')
     mq = NonNegativeQuantity(value=-10, unit=unit)
     with pytest.raises(ConditionViolationError):
         mq.validate_model()
 
 
-def test_attrib_validity():
+def test_bad_attrib_validation():
+    '''Invalid attribute assigned'''
     unit = UnitType(currency='EUR')
     mq = NonNegativeQuantity(value=10, unit=unit)
     mq.frequency = 'Blah'
     with pytest.raises(ValidationError):
         mq.validate_model()
 
+
+def test_correct_attrib_validation():
+    '''Valid attribute assigned'''
+    unit = UnitType(currency='EUR')
+    mq = NonNegativeQuantity(value=10, unit=unit)
+    mq.frequency = Frequency(periodMultiplier=1, period=PeriodExtendedEnum.M)
+    mq.validate_model()
+
+
 if __name__ == "__main__":
-	test_recursive_conds_base_fail()
-	test_recursive_conds_direct_fail()
-	test_attrib_validity()
+    test_recursive_conditions_base_fail()
+    test_recursive_conditions_direct_fail()
+    test_bad_attrib_validation()
+    test_correct_attrib_validation()
 
 # EOF