initial steps to use postgres for all stages

Author: jgmize

Procfile

@@ -1 +1 @@
-web: lein with-profile production trampoline ring server
+web: lein with-profile production trampoline ring server-headless

devserver

@@ -0,0 +1,2 @@
+#!/bin/bash
+lein with-profile dev trampoline ring server-headless

project.clj

@@ -22,9 +22,6 @@
                  ;; Database
                  [korma                     "0.3.0-RC6"]
 
-                 ;; JSON
-                 [cheshire                  "5.2.0"]
-
                  ;; REST architecture
                  [liberator                 "0.10.0"]
 
@@ -51,21 +48,47 @@
          :init    patronage.handler/init
          :destroy patronage.handler/destroy}
 
-  :profiles {:production
-             {:dependencies [[org.postgresql/postgresql        "9.3-1100-jdbc41"]]
+  :profiles {:dev
+             {:dependencies [[org.clojure/tools.trace   "0.7.6"]
+                             [ring-mock                 "0.1.5"]
+                             [ring/ring-devel           "1.2.1"]
+                             [com.h2database/h2       "1.3.174"]]
               :ring {:open-browser? false
-                     :stacktraces?  false
-                     :auto-reload?  false}}
-
-             :dev
+                     :nrepl {:start? true}}
+              :env {:db-spec "h2://localhost/site.db"}}
+;;                             {:classname   "org.h2.Driver"
+;;                              :subprotocol "h2"
+;;                              :subname     "site.db"
+;;                              :user        "sa"
+;;                              :password    ""
+;;                              :naming      {:keys clojure.string/lower-case
+;;                                            :fields clojure.string/upper-case}}}}
+
+             :dev-ssl
              {:dependencies [[org.clojure/tools.trace "0.7.6"]
                              [ring-mock               "0.1.5"]
                              [ring/ring-devel         "1.2.1"]
                              [com.h2database/h2       "1.3.174"]]
               :ring {:adapter {:ssl-port     3443
                                :keystore     "codesykeystore"
                                :key-password "codesy"}
-                     :nrepl   {:start?       true}}}}
+                     :nrepl   {:start?       true}}}
+
+             :dev-pg
+             {:dependencies [[org.clojure/tools.trace "0.7.6"]
+                             [ring-mock               "0.1.5"]
+                             [ring/ring-devel         "1.2.1"]
+                             [org.postgresql/postgresql "9.3-1100-jdbc41"]]
+              :ring {:open-browser? false
+                     :nrepl {:start? true}}}
+
+             :production
+             {:dependencies [[org.postgresql/postgresql        "9.3-1100-jdbc41"]]
+              :ring {:open-browser? false
+                     :stacktraces?  false
+                     :auto-reload?  false}}}
+
+
 
   :plugins [[lein-ring      "0.8.8"]
             [lein-environ   "0.4.0"]]

runserver

@@ -0,0 +1,2 @@
+#!/bin/bash
+lein with-profile production trampoline ring server-headless

src/patronage/auth.clj

@@ -12,7 +12,7 @@
 (def client-config
   {:client-id     (env :github-oauth-client-id)
    :client-secret (env :github-oauth-client-secret)
-   :callback {:domain "https://localhost:3443" :path "/auth/github"}})
+   :callback {:domain "https://localhost:3443" :path "/auth/github"}}) ;; TODO factor this out into an envvar
 
 (def uri-config
   {:authentication-uri

src/patronage/handler.clj

@@ -5,6 +5,7 @@
             [compojure.handler         :as    handler]
             [compojure.route           :as    route]
             [patronage.auth            :refer :all]
+            [patronage.models.schema   :refer [create-tables]]
             [patronage.routes.api      :refer [api-routes]]
             [ring.util.response        :as    response]
             [taoensso.timbre           :as    timbre]))
@@ -28,6 +29,7 @@
                       {:path     "patronage.log"
                        :max-size (* 512 1024)
                        :backlog  10})
+  (create-tables)
   (timbre/info "patronage started successfully"))
 
 (defn destroy

src/patronage/models/schema.clj

@@ -1,46 +1,35 @@
 (ns patronage.models.schema
-  (:require [clojure.java.jdbc :as sql]
-            [patronage.util    :as util]))
+  (:require [clojure.java.jdbc   :as    sql]
+            [environ.core        :refer [env]]
+            [korma.db            :refer :all ]
+            [patronage.util      :as    util]))
 
-(def db-store "site.db")
-
-(def db-spec {:classname   "org.h2.Driver"
-              :subprotocol "h2"
-              :subname     (str (util/resource-path) db-store)
-              :user        "sa"
-              :password    ""
-              :naming      {:keys clojure.string/lower-case
-                            :fields clojure.string/upper-case}})
-
-(defn initialized?
-  "checks to see if the database schema is present"
-  []
-  (.exists (new java.io.File (str (util/resource-path) db-store ".h2.db"))))
+(def db-spec (env :database-url))
 
 (defn create-users-table
   []
   (sql/with-connection db-spec
     (sql/create-table
-     :users
-     [:id                 "integer PRIMARY KEY AUTO_INCREMENT"]
-     [:first_name         "varchar(30)"]
-     [:last_name          "varchar(30)"]
-     [:email              "varchar(30)"]
-     [:admin              :boolean]
-     [:current_sign_in_at :time]
-     [:last_sign_in_at    :time]
-     [:password           "varchar(100)"])))
+       :users
+       [:id                 "serial PRIMARY KEY"]
+       [:first_name         "varchar(30)"]
+       [:last_name          "varchar(30)"]
+       [:email              "varchar(30)"]
+       [:admin              :boolean]
+       [:current_sign_in_at :time]
+       [:last_sign_in_at    :time]
+       [:password           "varchar(100)"])))
 
 (defn create-bids-table
   []
   (sql/with-connection db-spec
     (sql/create-table
-     :bids
-     [:id       "integer PRIMARY KEY AUTO_INCREMENT"]
-     [:url      "varchar(2000)"]
-     [:offer    "bigint"]
-     [:ask      "bigint"]
-     [:user_id "integer NOT NULL"])))
+       :bids
+       [:id       "serial PRIMARY KEY"]
+       [:url      "varchar(2000)"]
+       [:offer    "bigint"]
+       [:ask      "bigint"]
+       [:user_id "integer NOT NULL"])))
 
 (defn create-tables
   "creates the database tables used by the application"

src/patronage/routes/api.clj

@@ -57,6 +57,6 @@
 
 (defroutes api-routes
   (ANY ["/bids/:id" :id #".*"] [id]
-       (friend/authenticated (bid id)))
+       (bid id))
   (ANY "/bids" []
-       (friend/authenticated bids)))
+       bids))

test/patronage/routes/api_test.clj

@@ -17,11 +17,11 @@
                :offer 5.0
                :ask   50.0}]]
     (with-redefs [db/get-all-bids (fn [] bids)
-                  db/create-bid   (fn [bid] {::id 1})
+                  db/create-bid!  (fn [bid] {::id 1})
                   db/get-bid      (fn [id] (assoc bid :id 1))
-                  db/update-bid   (fn [id new-bid]
+                  db/update-bid!  (fn [id new-bid]
                                     (merge bid new-bid))
-                  db/delete-bid   (fn [id] nil)]
+                  db/delete-bid!  (fn [id] nil)]
       (testing "listing all bids"
         (let [response (-> (request :get "/bids")
                            api-routes)]