From 742daf2ada3538078a37e4d3f09a10bb347c9391 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Wed, 6 May 2020 11:20:54 +0200
Subject: [PATCH] EHN: get_properties also works with property instances
---
release.sh | 1 +
setup.py | 2 +-
src/caosdb/common/models.py | 8 ++++++++
unittests/test_property.py | 10 ++++++++++
4 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/release.sh b/release.sh
index dd469f3a..a5f36542 100755
--- a/release.sh
+++ b/release.sh
@@ -1,3 +1,4 @@
#!/bin/bash
+rm -r dist/ build/ .eggs/
python setup.py sdist bdist_wheel
python -m twine upload -s dist/*
diff --git a/setup.py b/setup.py
index 9e090d6e..cfdf462c 100755
--- a/setup.py
+++ b/setup.py
@@ -49,7 +49,7 @@ MAJOR = 0
MINOR = 3
MICRO = 1
PRE = "" # e.g. rc0, alpha.1, 0.beta-23
-ISRELEASED = False
+ISRELEASED = True
if PRE:
VERSION = "{}.{}.{}-{}".format(MAJOR, MINOR, MICRO, PRE)
diff --git a/src/caosdb/common/models.py b/src/caosdb/common/models.py
index 77638589..d5a56257 100644
--- a/src/caosdb/common/models.py
+++ b/src/caosdb/common/models.py
@@ -538,6 +538,14 @@ class Entity(object):
return self.properties
def get_property(self, key):
+ result = None
+ if hasattr(key, "name"):
+ result = self.get_property(key.name)
+ if result is None and hasattr(key, "id"):
+ result = self.get_property(key.id)
+ if result is not None:
+ return result
+
if isinstance(key, int):
for p in self.properties:
if p.id is not None and int(p.id) == int(key):
diff --git a/unittests/test_property.py b/unittests/test_property.py
index 76ebe805..7d8d238e 100644
--- a/unittests/test_property.py
+++ b/unittests/test_property.py
@@ -72,3 +72,13 @@ def test_list_of_references_with_null():
def test_role():
prop = Property()
assert prop.role == "Property"
+
+
+def test_get_property_with_entity():
+ p = Property(name="Prop")
+ r = Record().add_property("Prop", "blub")
+ assert r.get_property(p).value == "blub"
+
+ p = Property(id=1234)
+ r.add_property(id=1234, value="bla")
+ assert r.get_property(p).value == "bla"
--
GitLab