fix subdocument in from_json_schema (#314)

* fix subdocument in from_json_schema

* shed the code

Author: Cheukting

terminusdb_client/tests/test_woqlSchema.py

@@ -361,6 +361,45 @@ def test_compress_data(patched, patched2, patched3, patched4):
     )
 
 
+def test_from_json_schema():
+    test_json_schema = {
+        "type": "object",
+        "properties": {
+            "first_name": {"type": "string"},
+            "last_name": {"type": "string"},
+            "birthday": {"type": "string", "format": "date"},
+            "address": {
+                "type": "object",
+                "properties": {
+                    "street_address": {"type": "string"},
+                    "city": {"type": "string"},
+                    "state": {"type": "string"},
+                    "country": {"type": "string"},
+                },
+            },
+        },
+    }
+
+    schema = WOQLSchema()
+    test_result = schema.from_json_schema("TestJSON", test_json_schema, pipe=True)
+    assert test_result == {
+        "@id": "TestJSON",
+        "@type": "Class",
+        "first_name": "xsd:string",
+        "last_name": "xsd:string",
+        "birthday": "xsd:string",
+        "address": {
+            "@id": "address",
+            "@type": "Class",
+            "@subdocument": [],
+            "street_address": "xsd:string",
+            "city": "xsd:string",
+            "state": "xsd:string",
+            "country": "xsd:string",
+        },
+    }
+
+
 # def test_schema_delete():
 #     other_schema.delete_property(Title)
 #     assert other_schema.all_obj() == {Employee, Address, Team}

terminusdb_client/woqlschema/woql_schema.py

@@ -734,7 +734,20 @@ def convert_property(prop_name, prop):
             # it's datetime
             if "format" in prop and prop["format"] == "date-time":
                 return "xsd:dataTime"
-            # it's another object
+            # it's a subdocument
+            elif prop.get("type") is not None and prop["type"] == "object":
+                if prop.get("properties") is None:
+                    raise RuntimeError(
+                        f"subdocument {prop_name} not in proper format: 'properties' is missing"
+                    )
+                sub_dict = {"@id": prop_name, "@type": "Class", "@subdocument": []}
+                for sub_prop_name, sub_prop in prop["properties"].items():
+                    sub_dict[sub_prop_name] = convert_property(sub_prop_name, sub_prop)
+                if pipe:  # end of journey for pipemode
+                    return sub_dict
+                self._contruct_class(sub_dict)
+                return prop_name
+            # it's another document
             elif prop.get("type") is None and prop.get("$ref") is not None:
                 prop_type = prop["$ref"].split("/")[-1]
                 if defs is None or prop_type not in defs: