From df90b486afccf2adfdc80f61df7143e64ec5940f Mon Sep 17 00:00:00 2001 From: Josha von Gizycki Date: Thu, 17 Jan 2019 15:28:07 +0100 Subject: [PATCH] move instance! to domain --- src/wanijo/instance/domain.clj | 9 +++++++++ src/wanijo/instance/routes.clj | 8 +------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/wanijo/instance/domain.clj b/src/wanijo/instance/domain.clj index 67f95fc..f5e665a 100644 --- a/src/wanijo/instance/domain.clj +++ b/src/wanijo/instance/domain.clj @@ -179,3 +179,12 @@ (defn delete-link! [uuid] (neo4j/exec-query! delete-link {:uuid uuid})) + +(defn full-instance-by-uuid! [uuid] + (assoc (find-by-uuid! uuid) + :properties + (find-properties! uuid) + :links-out + (outgoing-links! uuid) + :links-in + (incoming-links! uuid))) diff --git a/src/wanijo/instance/routes.clj b/src/wanijo/instance/routes.clj index f7b3343..c8f5a92 100644 --- a/src/wanijo/instance/routes.clj +++ b/src/wanijo/instance/routes.clj @@ -40,13 +40,7 @@ (domain-attr/find-by-instance! uuid))) (defn instance! [uuid] - (assoc (domain/find-by-uuid! uuid) - :properties - (domain/find-properties! uuid) - :links-out - (domain/outgoing-links! uuid) - :links-in - (domain/incoming-links! uuid))) + (domain/full-instance-by-uuid! uuid)) (defn show! [uuid req] (view/show! (instance! uuid) req))