development: updated subject and object search for Relationship and A…

…ctions
CosmicMind · Nov 13, 2016 · 172290e · 172290e
1 parent 5bc0d48
commit 172290e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/Sources/Action.swift b/Sources/Action.swift
@@ -581,7 +581,9 @@ extension Array where Element: Action {
     public func subject(types: [String]) -> [Entity] {
         var s = Set<Entity>()
         forEach { [types = types] (a) in
-            s.insert(a.suject(types: types))
+            a.subject(types: types).forEach {
+                s.insert($0)
+            }
         }
         return [Entity](s)
     }
@@ -605,7 +607,9 @@ extension Array where Element: Action {
     public func object(types: [String]) -> [Entity] {
         var s = Set<Entity>()
         forEach { [types = types] (a) in
-            s.insert(a.object(types: types))
+            a.object(types: types).forEach {
+                s.insert($0)
+            }
         }
         return [Entity](s)
     }

diff --git a/Sources/Relationship.swift b/Sources/Relationship.swift
@@ -448,7 +448,15 @@ extension Array where Element: Relationship {
     public func subject(types: [String]) -> [Entity] {
         var s = Set<Entity>()
         forEach { [types = types] (r) in
-            s.insert(r.subject(types: types))
+            guard let e = r.subject else {
+                return
+            }
+
+            guard types.contains(e.type) else {
+                return
+            }
+
+            s.insert(e)
         }
         return [Entity](s)
     }
@@ -472,7 +480,15 @@ extension Array where Element: Relationship {
     public func object(types: [String]) -> [Entity] {
         var s = Set<Entity>()
         forEach { [types = types] (r) in
-            s.insert(r.object(types: types))
+            guard let e = r.subject else {
+                return
+            }
+
+            guard types.contains(e.type) else {
+                return
+            }
+
+            s.insert(e)
         }
         return [Entity](s)
     }