Merge pull request #13 from acdh-oeaw/link-instance-author

Link instance author

apis_ontology/models.py

@@ -98,18 +98,18 @@ def citation(self):
     @cached_property
     def work(self):
         try:
-            WORK_REL = Property.objects.get(name="has as an instance")
-            work = Triple.objects.filter(prop=WORK_REL, obj=self)
-            return work[0].subj
+            work_has_as_instance = WorkHasAsAnInstanceInstance.objects.filter(obj=self)
+            return work_has_as_instance[0].subj
         except Exception as e:
+            print("Error while fetching work associated with instance:", e)
             return
 
     @cached_property
     def author(self):
         try:
-            return self.work.author
+            return Work.objects.get(id=self.work.id).author
         except Exception as e:
-            print(e)
+            print("Error while getting author info for instance", e)
             return
 
 
@@ -168,9 +168,7 @@ class Work(TempEntityClass):
     @cached_property
     def author(self):
         try:
-            # TODO: Should this be within property?
-            AUTHOR_REL = Property.objects.get(name="author of")
-            author = Triple.objects.filter(prop=AUTHOR_REL, obj=self)
+            author = PersonAuthorOfWork.objects.filter(obj=self)
             return author[0].subj
         except Exception as e:
             print(e)