Further work on auto-generation of components

This commit is contained in:
Simon Brooke 2018-06-14 21:33:20 +01:00
parent 706e42f483
commit bfb5a67266
43 changed files with 2254 additions and 911 deletions

View file

@ -5,8 +5,8 @@
[cheshire.core :refer [generate-string parse-string]]
[clojure.java.jdbc :as jdbc]
[conman.core :as conman]
[youyesyet.config :refer [env]]
[mount.core :refer [defstate]])
[mount.core :refer [defstate]]
[youyesyet.config :refer [env]])
(:import org.postgresql.util.PGobject
java.sql.Array
clojure.lang.IPersistentMap

View file

@ -1,20 +1,19 @@
(ns ^{:doc "Handlers for starting and stopping the webapp."
:author "Simon Brooke"}
youyesyet.handler
(:require [compojure.core :refer [routes wrap-routes]]
(:require [clojure.tools.logging :as log]
[compojure.core :refer [routes wrap-routes]]
[compojure.route :as route]
[mount.core :as mount]
[youyesyet.config :refer [env]]
[youyesyet.layout :refer [error-page]]
[youyesyet.middleware :as middleware]
[youyesyet.routes.authenticated :refer [authenticated-routes]]
[youyesyet.routes.home :refer [home-routes]]
[youyesyet.routes.oauth :refer [oauth-routes]]
[youyesyet.routes.auto-json :refer [auto-rest-routes]]
[youyesyet.routes.auto :refer [auto-selmer-routes]]
[compojure.route :as route]
[youyesyet.env :refer [defaults]]
[mount.core :as mount]
[youyesyet.middleware :as middleware]
[clojure.tools.logging :as log]
[youyesyet.db.core :as db]
[youyesyet.config :refer [env]]))
[youyesyet.env :refer [defaults]]))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;
@ -82,5 +81,5 @@
:title "page not found"})))))
(def app ;; #'app-routes)
(middleware/wrap-base #'app-routes))
(def app #'app-routes)
;; (middleware/wrap-base #'app-routes))

View file

@ -1,6 +1,6 @@
(ns
youyesyet.routes.auto
"User interface routes for Youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180611T180322.460Z"
"User interface routes for Youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180614T175643.413Z"
(:require
[noir.response :as nresponse]
[noir.util.route :as route]

View file

@ -1,6 +1,6 @@
(ns
youyesyet.routes.auto-json
"JSON routes for youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180611T180321.339Z"
"JSON routes for youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180614T175642.456Z"
(:require
[noir.response :as nresponse]
[noir.util.route :as route]
@ -24,13 +24,9 @@
create-gender!
create-intention!
create-issue!
create-issueexpertise!
create-option!
create-role!
create-rolemembership!
create-team!
create-teammembership!
create-teamorganisership!
create-visit!
delete-address!
delete-authority!
@ -44,13 +40,9 @@
delete-gender!
delete-intention!
delete-issue!
delete-issueexpertise!
delete-option!
delete-role!
delete-rolemembership!
delete-team!
delete-teammembership!
delete-teamorganisership!
delete-visit!
get-address
get-authority
@ -65,13 +57,10 @@
get-gender
get-intention
get-issue
get-issueexpertise
get-option
get-role
get-rolemembership
get-role-by-name
get-team
get-teammembership
get-teamorganisership
get-visit
list-addresses
list-addresses-by-district
@ -101,23 +90,10 @@
list-intentions-by-elector
list-intentions-by-option
list-intentions-by-visit
list-issueexpertise
list-issueexpertise-by-canvasser
list-issueexpertise-by-followupmethod
list-issueexpertise-by-issue
list-issues
list-options
list-rolememberships
list-rolememberships-by-canvasser
list-rolememberships-by-role
list-roles
list-roles-by-canvasser
list-teammemberships
list-teammemberships-by-canvasser
list-teammemberships-by-team
list-teamorganiserships
list-teamorganiserships-by-canvasser
list-teamorganiserships-by-team
list-teams
list-teams-by-canvasser
list-teams-by-district
@ -136,13 +112,9 @@
search-strings-gender
search-strings-intention
search-strings-issue
search-strings-issueexpertise
search-strings-option
search-strings-role
search-strings-rolemembership
search-strings-team
search-strings-teammembership
search-strings-teamorganisership
search-strings-visit
update-address!
update-canvasser!
@ -153,12 +125,8 @@
update-followuprequest!
update-intention!
update-issue!
update-issueexpertise!
update-role!
update-rolemembership!
update-team!
update-teammembership!
update-teamorganisership!
update-visit!)
@ -212,10 +180,6 @@
"/json/auto/create-issue"
request
(route/restricted (create-issue! request)))
(POST
"/json/auto/create-issueexpertise"
request
(route/restricted (create-issueexpertise! request)))
(POST
"/json/auto/create-option"
request
@ -224,22 +188,10 @@
"/json/auto/create-role"
request
(route/restricted (create-role! request)))
(POST
"/json/auto/create-rolemembership"
request
(route/restricted (create-rolemembership! request)))
(POST
"/json/auto/create-team"
request
(route/restricted (create-team! request)))
(POST
"/json/auto/create-teammembership"
request
(route/restricted (create-teammembership! request)))
(POST
"/json/auto/create-teamorganisership"
request
(route/restricted (create-teamorganisership! request)))
(POST
"/json/auto/create-visit"
request
@ -292,10 +244,6 @@
"/json/auto/delete-issue"
request
(route/restricted (delete-issue! request)))
(POST
"/json/auto/delete-issueexpertise"
request
(route/restricted (delete-issueexpertise! request)))
(POST
"/json/auto/delete-option"
request
@ -304,22 +252,10 @@
"/json/auto/delete-role"
request
(route/restricted (delete-role! request)))
(POST
"/json/auto/delete-rolemembership"
request
(route/restricted (delete-rolemembership! request)))
(POST
"/json/auto/delete-team"
request
(route/restricted (delete-team! request)))
(POST
"/json/auto/delete-teammembership"
request
(route/restricted (delete-teammembership! request)))
(POST
"/json/auto/delete-teamorganisership"
request
(route/restricted (delete-teamorganisership! request)))
(POST
"/json/auto/delete-visit"
request
@ -376,10 +312,6 @@
"/json/auto/get-issue"
request
(route/restricted (get-issue request)))
(POST
"/json/auto/get-issueexpertise"
request
(route/restricted (get-issueexpertise request)))
(POST
"/json/auto/get-option"
request
@ -389,21 +321,13 @@
request
(route/restricted (get-role request)))
(POST
"/json/auto/get-rolemembership"
"/json/auto/get-role-by-name"
request
(route/restricted (get-rolemembership request)))
(route/restricted (get-role-by-name request)))
(POST
"/json/auto/get-team"
request
(route/restricted (get-team request)))
(POST
"/json/auto/get-teammembership"
request
(route/restricted (get-teammembership request)))
(POST
"/json/auto/get-teamorganisership"
request
(route/restricted (get-teamorganisership request)))
(POST
"/json/auto/get-visit"
request
@ -520,22 +444,6 @@
"/json/auto/list-intentions-by-visit"
request
(route/restricted (list-intentions-by-visit request)))
(GET
"/json/auto/list-issueexpertise"
request
(route/restricted (list-issueexpertise request)))
(GET
"/json/auto/list-issueexpertise-by-canvasser"
request
(route/restricted (list-issueexpertise-by-canvasser request)))
(GET
"/json/auto/list-issueexpertise-by-followupmethod"
request
(route/restricted (list-issueexpertise-by-followupmethod request)))
(GET
"/json/auto/list-issueexpertise-by-issue"
request
(route/restricted (list-issueexpertise-by-issue request)))
(GET
"/json/auto/list-issues"
request
@ -544,18 +452,6 @@
"/json/auto/list-options"
request
(route/restricted (list-options request)))
(GET
"/json/auto/list-rolememberships"
request
(route/restricted (list-rolememberships request)))
(GET
"/json/auto/list-rolememberships-by-canvasser"
request
(route/restricted (list-rolememberships-by-canvasser request)))
(GET
"/json/auto/list-rolememberships-by-role"
request
(route/restricted (list-rolememberships-by-role request)))
(GET
"/json/auto/list-roles"
request
@ -564,30 +460,6 @@
"/json/auto/list-roles-by-canvasser"
request
(route/restricted (list-roles-by-canvasser request)))
(GET
"/json/auto/list-teammemberships"
request
(route/restricted (list-teammemberships request)))
(GET
"/json/auto/list-teammemberships-by-canvasser"
request
(route/restricted (list-teammemberships-by-canvasser request)))
(GET
"/json/auto/list-teammemberships-by-team"
request
(route/restricted (list-teammemberships-by-team request)))
(GET
"/json/auto/list-teamorganiserships"
request
(route/restricted (list-teamorganiserships request)))
(GET
"/json/auto/list-teamorganiserships-by-canvasser"
request
(route/restricted (list-teamorganiserships-by-canvasser request)))
(GET
"/json/auto/list-teamorganiserships-by-team"
request
(route/restricted (list-teamorganiserships-by-team request)))
(GET
"/json/auto/list-teams"
request
@ -660,10 +532,6 @@
"/json/auto/search-strings-issue"
request
(route/restricted (search-strings-issue request)))
(GET
"/json/auto/search-strings-issueexpertise"
request
(route/restricted (search-strings-issueexpertise request)))
(GET
"/json/auto/search-strings-option"
request
@ -672,22 +540,10 @@
"/json/auto/search-strings-role"
request
(route/restricted (search-strings-role request)))
(GET
"/json/auto/search-strings-rolemembership"
request
(route/restricted (search-strings-rolemembership request)))
(GET
"/json/auto/search-strings-team"
request
(route/restricted (search-strings-team request)))
(GET
"/json/auto/search-strings-teammembership"
request
(route/restricted (search-strings-teammembership request)))
(GET
"/json/auto/search-strings-teamorganisership"
request
(route/restricted (search-strings-teamorganisership request)))
(GET
"/json/auto/search-strings-visit"
request
@ -728,30 +584,14 @@
"/json/auto/update-issue"
request
(route/restricted (update-issue! request)))
(POST
"/json/auto/update-issueexpertise"
request
(route/restricted (update-issueexpertise! request)))
(POST
"/json/auto/update-role"
request
(route/restricted (update-role! request)))
(POST
"/json/auto/update-rolemembership"
request
(route/restricted (update-rolemembership! request)))
(POST
"/json/auto/update-team"
request
(route/restricted (update-team! request)))
(POST
"/json/auto/update-teammembership"
request
(route/restricted (update-teammembership! request)))
(POST
"/json/auto/update-teamorganisership"
request
(route/restricted (update-teamorganisership! request)))
(POST
"/json/auto/update-visit"
request
@ -830,12 +670,6 @@
[{:keys [params]}]
(do (db/create-issue! params)))
(defn
create-issueexpertise!
"Auto-generated method to insert one record to the `issueexpertise` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the keys `nil` identifying the record created."
[{:keys [params]}]
(do (db/create-issueexpertise! params)))
(defn
create-option!
"Auto-generated method to insert one record to the `options` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the keys `nil` identifying the record created."
@ -848,30 +682,12 @@
[{:keys [params]}]
(do (db/create-role! params)))
(defn
create-rolemembership!
"Auto-generated method to insert one record to the `rolememberships` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the keys `nil` identifying the record created."
[{:keys [params]}]
(do (db/create-rolemembership! params)))
(defn
create-team!
"Auto-generated method to insert one record to the `teams` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the keys `nil` identifying the record created."
[{:keys [params]}]
(do (db/create-team! params)))
(defn
create-teammembership!
"Auto-generated method to insert one record to the `teammemberships` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the keys `nil` identifying the record created."
[{:keys [params]}]
(do (db/create-teammembership! params)))
(defn
create-teamorganisership!
"Auto-generated method to insert one record to the `teamorganiserships` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the keys `nil` identifying the record created."
[{:keys [params]}]
(do (db/create-teamorganisership! params)))
(defn
create-visit!
"Auto-generated method to insert one record to the `visits` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the keys `nil` identifying the record created."
@ -962,13 +778,6 @@
(do (db/delete-issue! params))
(response/found "/"))
(defn
delete-issueexpertise!
"Auto-generated method to delete one record from the `issueexpertise` table. Expects the following key(s) to be present in `params`: ``."
[{:keys [params]}]
(do (db/delete-issueexpertise! params))
(response/found "/"))
(defn
delete-option!
"Auto-generated method to delete one record from the `options` table. Expects the following key(s) to be present in `params`: ``."
@ -983,13 +792,6 @@
(do (db/delete-role! params))
(response/found "/"))
(defn
delete-rolemembership!
"Auto-generated method to delete one record from the `rolememberships` table. Expects the following key(s) to be present in `params`: ``."
[{:keys [params]}]
(do (db/delete-rolemembership! params))
(response/found "/"))
(defn
delete-team!
"Auto-generated method to delete one record from the `teams` table. Expects the following key(s) to be present in `params`: ``."
@ -997,20 +799,6 @@
(do (db/delete-team! params))
(response/found "/"))
(defn
delete-teammembership!
"Auto-generated method to delete one record from the `teammemberships` table. Expects the following key(s) to be present in `params`: ``."
[{:keys [params]}]
(do (db/delete-teammembership! params))
(response/found "/"))
(defn
delete-teamorganisership!
"Auto-generated method to delete one record from the `teamorganiserships` table. Expects the following key(s) to be present in `params`: ``."
[{:keys [params]}]
(do (db/delete-teamorganisership! params))
(response/found "/"))
(defn
delete-visit!
"Auto-generated method to delete one record from the `visits` table. Expects the following key(s) to be present in `params`: ``."
@ -1096,12 +884,6 @@
[{:keys [params]}]
(do (db/get-issue params)))
(defn
get-issueexpertise
"Auto-generated method to select one record from the `issueexpertise` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the following keys: `(nil)`."
[{:keys [params]}]
(do (db/get-issueexpertise params)))
(defn
get-option
"Auto-generated method to select one record from the `options` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the following keys: `(nil)`."
@ -1115,10 +897,10 @@
(do (db/get-role params)))
(defn
get-rolemembership
"Auto-generated method to select one record from the `rolememberships` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the following keys: `(nil)`."
get-role-by-name
"Auto-generated method to select one record from the `roles` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the following keys: `(nil)`."
[{:keys [params]}]
(do (db/get-rolemembership params)))
(do (db/get-role-by-name params)))
(defn
get-team
@ -1126,18 +908,6 @@
[{:keys [params]}]
(do (db/get-team params)))
(defn
get-teammembership
"Auto-generated method to select one record from the `teammemberships` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the following keys: `(nil)`."
[{:keys [params]}]
(do (db/get-teammembership params)))
(defn
get-teamorganisership
"Auto-generated method to select one record from the `teamorganiserships` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the following keys: `(nil)`."
[{:keys [params]}]
(do (db/get-teamorganisership params)))
(defn
get-visit
"Auto-generated method to select one record from the `visits` table. Expects the following key(s) to be present in `params`: `nil`. Returns a map containing the following keys: `(nil)`."
@ -1295,27 +1065,6 @@
[{:keys [params]}]
(do (db/list-intentions-by-visit params)))
(defn
list-issueexpertise
"Auto-generated method to select all records from the `issueexpertise` table. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
[{:keys [params]}]
(do (db/list-issueexpertise params)))
(defn
list-issueexpertise-by-canvasser
[{:keys [params]}]
(do (db/list-issueexpertise-by-canvasser params)))
(defn
list-issueexpertise-by-followupmethod
[{:keys [params]}]
(do (db/list-issueexpertise-by-followupmethod params)))
(defn
list-issueexpertise-by-issue
[{:keys [params]}]
(do (db/list-issueexpertise-by-issue params)))
(defn
list-issues
"Auto-generated method to select all records from the `issues` table. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
@ -1328,22 +1077,6 @@
[{:keys [params]}]
(do (db/list-options params)))
(defn
list-rolememberships
"Auto-generated method to select all records from the `rolememberships` table. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
[{:keys [params]}]
(do (db/list-rolememberships params)))
(defn
list-rolememberships-by-canvasser
[{:keys [params]}]
(do (db/list-rolememberships-by-canvasser params)))
(defn
list-rolememberships-by-role
[{:keys [params]}]
(do (db/list-rolememberships-by-role params)))
(defn
list-roles
"Auto-generated method to select all records from the `roles` table. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
@ -1355,38 +1088,6 @@
[{:keys [params]}]
(do (db/list-roles-by-canvasser params)))
(defn
list-teammemberships
"Auto-generated method to select all records from the `teammemberships` table. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
[{:keys [params]}]
(do (db/list-teammemberships params)))
(defn
list-teammemberships-by-canvasser
[{:keys [params]}]
(do (db/list-teammemberships-by-canvasser params)))
(defn
list-teammemberships-by-team
[{:keys [params]}]
(do (db/list-teammemberships-by-team params)))
(defn
list-teamorganiserships
"Auto-generated method to select all records from the `teamorganiserships` table. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
[{:keys [params]}]
(do (db/list-teamorganiserships params)))
(defn
list-teamorganiserships-by-canvasser
[{:keys [params]}]
(do (db/list-teamorganiserships-by-canvasser params)))
(defn
list-teamorganiserships-by-team
[{:keys [params]}]
(do (db/list-teamorganiserships-by-team params)))
(defn
list-teams
"Auto-generated method to select all records from the `teams` table. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
@ -1491,12 +1192,6 @@
[{:keys [params]}]
(do (db/search-strings-issue params)))
(defn
search-strings-issueexpertise
"Auto-generated method to select all records from the `issueexpertise` table with any text field matching the value of the key `:pattern` which should be in the request. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
[{:keys [params]}]
(do (db/search-strings-issueexpertise params)))
(defn
search-strings-option
"Auto-generated method to select all records from the `options` table with any text field matching the value of the key `:pattern` which should be in the request. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
@ -1509,30 +1204,12 @@
[{:keys [params]}]
(do (db/search-strings-role params)))
(defn
search-strings-rolemembership
"Auto-generated method to select all records from the `rolememberships` table with any text field matching the value of the key `:pattern` which should be in the request. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
[{:keys [params]}]
(do (db/search-strings-rolemembership params)))
(defn
search-strings-team
"Auto-generated method to select all records from the `teams` table with any text field matching the value of the key `:pattern` which should be in the request. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
[{:keys [params]}]
(do (db/search-strings-team params)))
(defn
search-strings-teammembership
"Auto-generated method to select all records from the `teammemberships` table with any text field matching the value of the key `:pattern` which should be in the request. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
[{:keys [params]}]
(do (db/search-strings-teammembership params)))
(defn
search-strings-teamorganisership
"Auto-generated method to select all records from the `teamorganiserships` table with any text field matching the value of the key `:pattern` which should be in the request. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
[{:keys [params]}]
(do (db/search-strings-teamorganisership params)))
(defn
search-strings-visit
"Auto-generated method to select all records from the `visits` table with any text field matching the value of the key `:pattern` which should be in the request. If the keys `(:limit :offset)` are present in the request then they will be used to page through the data. Returns a sequence of maps each containing the following keys: `(nil)`."
@ -1602,13 +1279,6 @@
(do (db/update-issue! params))
(response/found "/"))
(defn
update-issueexpertise!
"Auto-generated method to update one record in the `issueexpertise` table. Expects the following key(s) to be present in `params`: `(nil)`."
[{:keys [params]}]
(do (db/update-issueexpertise! params))
(response/found "/"))
(defn
update-role!
"Auto-generated method to update one record in the `roles` table. Expects the following key(s) to be present in `params`: `(nil)`."
@ -1616,13 +1286,6 @@
(do (db/update-role! params))
(response/found "/"))
(defn
update-rolemembership!
"Auto-generated method to update one record in the `rolememberships` table. Expects the following key(s) to be present in `params`: `(nil)`."
[{:keys [params]}]
(do (db/update-rolemembership! params))
(response/found "/"))
(defn
update-team!
"Auto-generated method to update one record in the `teams` table. Expects the following key(s) to be present in `params`: `(nil)`."
@ -1630,20 +1293,6 @@
(do (db/update-team! params))
(response/found "/"))
(defn
update-teammembership!
"Auto-generated method to update one record in the `teammemberships` table. Expects the following key(s) to be present in `params`: `(nil)`."
[{:keys [params]}]
(do (db/update-teammembership! params))
(response/found "/"))
(defn
update-teamorganisership!
"Auto-generated method to update one record in the `teamorganiserships` table. Expects the following key(s) to be present in `params`: `(nil)`."
[{:keys [params]}]
(do (db/update-teamorganisership! params))
(response/found "/"))
(defn
update-visit!
"Auto-generated method to update one record in the `visits` table. Expects the following key(s) to be present in `params`: `(nil)`."