Merge pull request #24 from ocni-dtu/chrk/6_ilcd_test_cases

Chrk/6 ilcd test cases

.github/workflows/cicd.yaml

@@ -56,15 +56,15 @@ jobs:
     uses: ./.github/workflows/release_docs.yaml
 
   publishPython:
-    if: (github.event_name != 'pull_request') && ${{ needs.createRelease.outputs.version != '' }}
+    if: github.event_name != 'pull_request' && ${{ needs.createRelease.outputs.version != '' }}
     uses: ./.github/workflows/publish_python.yaml
     needs:
       - createRelease
     secrets:
       pypi_token: ${{ secrets.PYPI_TOKEN }}
 
   publishJavascript:
-    if: (github.event_name != 'pull_request') && ${{ needs.createRelease.outputs.version != '' }}
+    if: github.event_name != 'pull_request' && ${{ needs.createRelease.outputs.version != '' }}
     uses: ./.github/workflows/publish_javascript.yaml
     needs:
       - createRelease

.github/workflows/release_docs.yaml

@@ -3,11 +3,8 @@ on:
   workflow_call:
 
 jobs:
-  deployDocs:
+  buildDocs:
     runs-on: ubuntu-latest
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
     steps:
       - uses: actions/checkout@v3
 
@@ -41,9 +38,6 @@ jobs:
           name: changelog
           path: docs/
 
-      - name: Setup Pages
-        uses: actions/configure-pages@v3
-
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
@@ -64,8 +58,24 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v1
         with:
+          name: 'docs'
           path: './site'
 
+  deployDocs:
+    runs-on: ubuntu-latest
+    if: github.event_name != 'pull_request'
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    steps:
+      - name: Setup Pages
+        uses: actions/configure-pages@v3
+
+      - name: Download artifact from build job
+        uses: actions/download-artifact@v3
+        with:
+          name: 'docs'
+
       - name: Deploy to GitHub Pages
         if: github.event_name != 'pull_request'
         id: deployment

Cargo.toml

@@ -36,6 +36,7 @@ schemars = { version = "0.8.16", features = ["chrono"] }
 serde = { version = "1.0.195", features = ["derive"] }
 serde_json = "1.0.111"
 pyo3 = { version = "0.20.2", features = ["abi3-py310"], optional = true }
+pkg-version = "1.0.0"
 
 # The `console_error_panic_hook` crate provides better debugging of panics by
 # logging them with `console.error`. This is great for development, but requires

src/ilcd.rs

@@ -1,5 +1,6 @@
 #[allow(dead_code)]
 use serde::{Deserialize};
+use serde::Serialize;
 
 
 #[derive(Deserialize)]
@@ -24,7 +25,7 @@ pub struct Exchanges {
 #[serde(rename_all = "camelCase")]
 pub struct Exchange {
     pub reference_to_flow_data_set: ReferenceToDescription,
-    pub mean_amount: f64,
+    pub mean_amount: Option<f64>,
     pub resulting_amount: Option<f64>,
     #[serde(alias = "dataSetInternalID")]
     pub data_set_internal_id: Option<u32>,
@@ -52,13 +53,13 @@ pub struct FlowProperty {
     pub unit_group_uuid: Option<String>
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct MaterialProperty {
     pub name: String,
     pub value: String,
     pub unit: String,
-    pub unit_description: String,
+    pub unit_description: Option<String>,
 }
 
 #[derive(Deserialize)]
@@ -87,7 +88,7 @@ pub struct ReferenceToDescription {
     pub short_description: Vec<ValueLang>,
     pub _type: String,
     pub ref_object_id: String,
-    pub version: String
+    pub version: Option<String>
 }