fix: CreateEntity will now correctly use default, even on optional

equinor · Nov 14, 2023 · a3adfe9 · a3adfe9
1 parent 8668212
commit a3adfe9
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 3 deletions.
diff --git a/src/features/entity/use_cases/instantiate_entity_use_case/create_entity.py b/src/features/entity/use_cases/instantiate_entity_use_case/create_entity.py
@@ -72,7 +72,7 @@ def _get_entity(self, blueprint: Blueprint, entity: dict):
         for attr in blueprint.attributes:
             if attr.attribute_type == BuiltinDataTypes.BINARY.value:
                 continue
-            if attr.is_optional:
+            if attr.is_optional and not attr.default:
                 # skip attribute if it is optional
                 continue
             if attr.attribute_type in PRIMITIVES:

diff --git a/src/home/system/SIMOS/Blueprint.json b/src/home/system/SIMOS/Blueprint.json
@@ -48,7 +48,8 @@
         {
           "name": "name",
           "type": "dmss://system/SIMOS/BlueprintAttribute",
-          "attributeType": "string"
+          "attributeType": "string",
+          "optional": true
         },
         {
           "name": "type",
@@ -58,7 +59,8 @@
         {
           "name": "description",
           "type": "dmss://system/SIMOS/BlueprintAttribute",
-          "attributeType": "string"
+          "attributeType": "string",
+          "optional": true
         }
       ],
       "contained": true,

diff --git a/src/tests/unit/use_cases/instantiate_entity_use_case/test_create_entity.py b/src/tests/unit/use_cases/instantiate_entity_use_case/test_create_entity.py
@@ -15,6 +15,7 @@ def setUp(self):
             "dmss://system/SIMOS/BlueprintAttribute",
             "dmss://system/SIMOS/Entity",
             "dmss://system/SIMOS/NamedEntity",
+            "dmss://system/SIMOS/Blueprint",
         ]
         mock_blueprint_folder = "src/tests/unit/use_cases/instantiate_entity_use_case/mock_data/"
         mock_blueprints_and_file_names = {
@@ -55,10 +56,43 @@ def test_blueprint_entity(self):
             "intValues": [1, 5, 4, 2],
             "boolValues": [True, False, True],
             "stringValues": ["one", "two", "three"],
+            "engine3": {
+                "name": "default engine",
+                "type": "EngineTest",
+                "fuelPump": {"name": "fuelPump", "type": "FuelPumpTest", "description": "A standard fuel pump"},
+                "power": 9,
+            },
         }
 
         entity = CreateEntity(blueprint_provider=self.mock_document_service.get_blueprint, type="CarTest").entity
 
+        self.assertDictEqual(expected_entity, entity)
+
+    def test_create_default_blueprint(self):
+        expected_entity = {
+            "type": "dmss://system/SIMOS/Blueprint",
+            "name": "",
+            "attributes": [
+                {
+                    "name": "name",
+                    "type": "dmss://system/SIMOS/BlueprintAttribute",
+                    "attributeType": "string",
+                    "optional": True,
+                },
+                {"name": "type", "type": "dmss://system/SIMOS/BlueprintAttribute", "attributeType": "string"},
+                {
+                    "name": "description",
+                    "type": "dmss://system/SIMOS/BlueprintAttribute",
+                    "attributeType": "string",
+                    "optional": True,
+                },
+            ],
+        }
+
+        entity = CreateEntity(
+            blueprint_provider=self.mock_document_service.get_blueprint, type="dmss://system/SIMOS/Blueprint"
+        ).entity
+
         self.assertEqual(expected_entity, entity)
 
     def test_is_not_json(self):