Merge branch 'f-fix-circular' into 'dev'

FIX https://gitlab.com/caosdb/caosdb-crawler/-/issues/30

See merge request !58

CHANGELOG.md

@@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed ###
 
 ### Fixed ###
+* FIX: https://gitlab.com/caosdb/caosdb-crawler/-/issues/30
+
 
 ### Security ###
 

src/caoscrawler/crawl.py

@@ -500,7 +500,8 @@ class Crawler(object):
                 return True
         return False
 
-    def create_flat_list(self, ent_list: List[db.Entity], flat: List[db.Entity]):
+    @staticmethod
+    def create_flat_list(ent_list: List[db.Entity], flat: List[db.Entity]):
         """
         Recursively adds all properties contained in entities from ent_list to
         the output list flat. Each element will only be added once to the list.
@@ -516,13 +517,11 @@ class Crawler(object):
                         if isinstance(el, db.Entity):
                             if el not in flat:
                                 flat.append(el)
-                            # TODO: move inside if block?
-                            self.create_flat_list([el], flat)
+                                Crawler.create_flat_list([el], flat)
                 elif isinstance(p.value, db.Entity):
                     if p.value not in flat:
                         flat.append(p.value)
-                    # TODO: move inside if block?
-                    self.create_flat_list([p.value], flat)
+                        Crawler.create_flat_list([p.value], flat)
 
     def has_missing_object_in_references(self, record: db.Record):
         """
@@ -696,7 +695,7 @@ class Crawler(object):
         to_be_updated: List[db.Entity] = []
         flat = list(ent_list)
         # assure all entities are direct members TODO Can this be removed at some point?Check only?
-        self.create_flat_list(ent_list, flat)
+        Crawler.create_flat_list(ent_list, flat)
 
         # TODO: can the following be removed at some point
         for ent in flat:

unittests/test_tool.py

@@ -713,3 +713,9 @@ def test_security_mode(updateCacheMock, upmock, insmock, ident):
     reset_mocks([updateCacheMock, insmock, upmock])
     # restore original ident
     ident._records = deepcopy(records_backup)
+
+
+def test_create_flat_list():
+    a = db.Record()
+    a.add_property(name="a", value=a)
+    Crawler.create_flat_list([a], [])