updated

src/Models/CRM/v5_0_2/NodeEntities/E18_Physical_Thing.py

@@ -1,4 +1,5 @@
 from neomodel import RelationshipFrom, RelationshipTo, StructuredRel
+from src.GCF.decorators.OntologyClass import ontology_class
 from src.Models.CRM.v5_0_2.NodeEntities.E6_Destruction import E6_Destruction
 from src.Models.CRM.v5_0_2.NodeEntities.E72_Legal_Object import \
     E72_Legal_Object
@@ -19,6 +20,7 @@ class P13_destroyed(StructuredRel):
     pass
 
 
+@ontology_class
 class E18_Physical_Thing(E72_Legal_Object):
     is_composed_of = RelationshipTo(
         ".E18_Physical_Thing.E18_Physical_Thing",

src/Models/DataObject/v0_0_2/Approximate.py

@@ -2,7 +2,6 @@
 
 from marshmallow import Schema, fields
 from marshmallow_jsonschema import JSONSchema
-
 from neomodel import DateTimeProperty
 from src.Models.DataObject.v0_0_2.Date import Date
 
@@ -21,6 +20,3 @@ def getSchema(self):
 
 class ApproximateSchema(Schema):
     approximateDateValue = fields.Date(required=True)
-
-
-

src/Models/DataObject/v0_0_2/DataObject.py

@@ -21,6 +21,3 @@ def getSchema(self):
 class DataObjectSchema(Schema):
     uid = fields.String()
     name = fields.String(required=True)
-
-
-

src/Models/DataObject/v0_0_2/Instant.py

@@ -20,6 +20,3 @@ def getSchema(self):
 
 class InstantSchema(Schema):
     timestamp = fields.Date(required=True)
-
-
-

src/Models/DataObject/v0_0_2/Interval.py

@@ -22,6 +22,3 @@ def getSchema(self):
 class IntervalSchema(Schema):
     startDateValue = fields.Date(required=True)
     endDateValue = fields.Date(required=True)
-
-
-

src/Models/DataObject/v0_0_2/PersonName.py

@@ -1,8 +1,8 @@
+import json
+
 from marshmallow import Schema, fields
 from marshmallow_jsonschema import JSONSchema
 from neomodel import StringProperty
-import json
-
 from src.Models.DataObject.v0_0_2.AuthorityString import AuthorityString
 
 
@@ -20,6 +20,3 @@ def getSchema(self):
 
 class PersonNameSchema(Schema):
     name = fields.String(required=True)
-
-
-

src/Models/DataObject/v0_0_2/RegexString.py

@@ -1,4 +1,5 @@
 import json
+
 from marshmallow import Schema, fields
 from marshmallow_jsonschema import JSONSchema
 from neomodel import RegexProperty
@@ -19,6 +20,3 @@ def getSchema(self):
 
 class RegexStringSchema(Schema):
     hasRegex = fields.String(required=True)
-
-
-

src/Routes/routes.py

@@ -1,20 +1,22 @@
-from json import dumps
-from flask import Flask, g, Response, request, jsonify
-from neomodel import (config)
+from flask import Flask, jsonify
+
+from neomodel import config
 from src.Models.DataObject.v0_0_2.String import String
-config.DATABASE_URL = 'bolt://neo4j:password@localhost:7687'
+
+config.DATABASE_URL = "bolt://neo4j:password@localhost:7687"
 app = Flask(__name__, static_url_path="")
 
 
-@app.route("/<uid>", methods=['GET'])
+@app.route("/<uid>", methods=["GET"])
 def view(uid):
     returned_string = String.nodes.get(uid=uid)
     return jsonify(returned_string.toJSON())
     # returned_string = String.nodes.get(uid=uid)
-    # return Response(dumps(returned_string.toJSON()), mimetype='application/json')
+    # return Response(dumps(returned_string.toJSON()),
+    # mimetype='application/json')
 
 
-@app.route("/schema/<uid>", methods=['GET'])
+@app.route("/schema/<uid>", methods=["GET"])
 def getSchema(uid):
     returned_string = String.nodes.get(uid=uid)
     return jsonify(returned_string.getSchema())

test/Unit/test_data_object.py

@@ -7,8 +7,6 @@
                       AttemptedCardinalityViolation)
 import json
 
-from src.Utils.JsonEncoder import json_merge
-
 config.DATABASE_URL = 'bolt://neo4j:password@localhost:7687'
 date = datetime.datetime.now().strftime("%H:%M:%S")
 
@@ -23,5 +21,5 @@ def test_create_update_string_Node(self):
         returned_string.save()
         change_returned_string = String.nodes.get(name=date)
         self.assertAlmostEqual(string.id, returned_string.id)
-        self.assertAlmostEqual(change_returned_string.stringValue, new_name)
+        self.assertEqual(change_returned_string.stringValue, new_name)
         self.assertAlmostEqual(string.id, change_returned_string.id)