simon/adl-support
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

More unit tests. Sigh.

Browse source
This commit is contained in:
Simon Brooke 2018-08-01 22:22:12 +01:00
parent d0d3c24e5c
commit 3b539c6ec8
2 changed files with 84 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/adl_support/utils.clj
View file

@ -313,7 +313,7 @@
;; from its entity name. This isn't actually likely, but...
(safe-name (or (-> o :attrs :table) (-> o :attrs :name)) :sql)
(element? o)
(safe-name (:name (:attrs o)))
(safe-name (:name (:attrs o)) convention)
true
(let [string (str o)]
(case convention
@ -324,19 +324,34 @@
(apply str (cons (Character/toLowerCase (first camel)) (rest camel))))
(safe-name string))))))
;; (safe-name "address-id" :sql)
;; (safe-name {:tag :property :attrs {:name "address-id"}} :sql)
(defmacro list-related-query-name
"Return the canonical name of the HugSQL query to return all records on
`farside` which match a given record on `nearside`, where `nearide` and
`farside` are both entities."
[nearside farside]
[property nearside farside]
`(if
(and (entity? ~nearside) (entity? ~farside))
(str
"list-"
(safe-name ~farside :sql)
"-by-"
(singularise (safe-name ~nearside :sql)))
(and
(property? ~property)
(entity? ~nearside)
(entity? ~farside))
(case (-> ~property :attrs :type)
"link" (str "list-"
(safe-name ~property :sql) "-by-"
(singularise (safe-name ~nearside :sql)))
"list" (str "list-"
(safe-name ~farside :sql) "-by-"
(singularise (safe-name ~nearside :sql)))
"entity" (str "list-"
(safe-name ~nearside :sql) "-by-"
(singularise (safe-name ~farside :sql)))
;; default
(str "ERROR-bad-property-type-"
(-> ~property :attrs :type) "-of-"
(-> ~property :attrs :name)))
(do
(*warn* "Argument passed to `list-related-query-name` was a non-entity")
nil)))

62
test/adl_support/utils_test.clj
View file

@ -366,8 +366,68 @@
[{:tag :prompt,
:attrs {:locale "en_GB.UTF-8", :prompt "Gender"},
:content nil}]}]}
property (child e1 #(= (-> % :attrs :name) "gender"))
expected "list-electors-by-gender"
actual (list-related-query-name e1 e2)]
actual (list-related-query-name property e2 e1)]
(is (= expected actual) "just checking..."))))
(deftest list-related-query-name-tests
(testing "list-related-query-name"
(let [e1 {:tag :entity
:attrs {:name "dwellings"}
:content [{:tag :key
:content [{:tag :property
:attrs {:name "id" :type "integer" :distinct "system"}}]}
{:tag :property
:attrs {:name "address" :type "entity" :entity "addresses"}}]}
e2 {:tag :entity
:attrs {:name "addresses"}
:content [{:tag :key
:content [{:tag :property
:attrs {:name "id" :type "integer" :distinct "system"}}]}
{:tag :property
:attrs {:name "dwellings" :type "list" :entity "dwellings"}}]}]
(let [property {:tag :property
:attrs {:name "address" :type "entity" :entity "addresses"}}
expected "list-dwellings-by-address"
actual (list-related-query-name property e1 e2)]
(is (= expected actual) "Entity property"))
(let [property {:tag :property
:attrs {:name "dwellings" :type "list" :entity "dwellings"}}
expected "list-dwellings-by-address"
actual (list-related-query-name property e2 e1)]
(is (= expected actual) "List property")))
(let [e1 {:tag :entity
:attrs {:name "teams"}
:content [{:tag :key
:content [{:tag :property
:attrs {:name "id" :type "integer" :distinct "system"}}]}
{:tag :property
:attrs {:name "members" :type "link" :entity "canvassers"}}
{:tag :property
:attrs {:name "organisers" :type "link" :entity "canvassers"}}]}
e2 {:tag :entity
:attrs {:name "canvassers"}
:content [{:tag :key
:content [{:tag :property
:attrs {:name "id" :type "integer" :distinct "system"}}]}
{:tag :property
:attrs {:name "memberships" :type "link" :entity "teams"}}]}]
(let [property {:tag :property
:attrs {:name "members" :type "link" :entity "canvassers"}}
expected "list-members-by-team"
actual (list-related-query-name property e1 e2)]
(is (= actual expected) "Link property - members"))
(let [property {:tag :property
:attrs {:name "organisers" :type "link" :entity "canvassers"}}
expected "list-organisers-by-team"
actual (list-related-query-name property e1 e2)]
(is (= actual expected) "Link property - organisers"))
(let [property {:tag :property
:attrs {:name "memberships" :type "link" :entity "teams"}}
expected "list-memberships-by-canvasser"
actual (list-related-query-name property e2 e1)]
(is (= actual expected) "Link property - membersips")))))