almost there; datomic works for everything except http routes and import.

This commit is contained in:
BC
2018-09-20 23:34:57 -07:00
parent 4a237a8224
commit 951f8ceaea
10 changed files with 17 additions and 49 deletions

View File

@@ -1,9 +1,6 @@
(ns auto-ap.background.mail
(:require [amazonica.aws.s3 :as s3]
[amazonica.aws.sqs :as sqs]
[auto-ap.db.companies :as companies]
[auto-ap.db.vendors :as vendors]
[auto-ap.db.invoices :as invoices]
[auto-ap.parse :as parse]
[clojure-mail.message :as message]
[clojure.data.json :as json]
@@ -14,7 +11,7 @@
(javax.mail.internet MimeMessage)))
(defn process-sqs []
#_(defn process-sqs []
(try
(println "Fetching messages from sqs...")
(let [companies (companies/get-all)
@@ -43,6 +40,6 @@
(catch Exception e
(println e))))
(defn always-process-sqs []
#_(defn always-process-sqs []
(while (not (Thread/interrupted))
(process-sqs)))

View File

@@ -1,13 +1,10 @@
(ns auto-ap.graphql.transactions
(:require [auto-ap.graphql.utils :refer [->graphql <-graphql]]
[auto-ap.datomic.transactions :as d-transactions]
[com.walmartlabs.lacinia :refer [execute]]
[com.walmartlabs.lacinia.executor :as executor]
[com.walmartlabs.lacinia.resolve :as resolve]
[auto-ap.db.checks :as checks]
[auto-ap.utils :refer [by]]
[auto-ap.db.companies :as companies]
[auto-ap.time :refer [parse normal-date]]))
(defn get-transaction-page [context args value]

View File

@@ -10,7 +10,6 @@
[auto-ap.routes.events :as events]
[auto-ap.routes.checks :as checks]
[auto-ap.routes.exports :as exports]
[auto-ap.db.utils :as u]
[buddy.auth.backends.token :refer [jws-backend]]
[buddy.auth.middleware :refer [wrap-authentication
wrap-authorization]]
@@ -48,13 +47,7 @@
(defn wrap-transaction [handler]
(fn [request]
(jdbc/with-db-transaction [t (u/get-conn)]
(binding [u/current-conn t]
(try
(handler (assoc request :db-conn t))
(catch Exception e
(jdbc/db-set-rollback-only! t)
(throw e)))))))
(handler request)))
(def app-routes
(routes

View File

@@ -1,5 +1,5 @@
(ns auto-ap.routes.companies
(:require [auto-ap.db.companies :as companies]
(:require [auto-ap.datomic.clients :as clients]
[auto-ap.graphql.utils :refer [can-see-company? assert-can-see-company]]
[auto-ap.routes.utils :refer [wrap-secure wrap-spec]]
[auto-ap.entities.companies :as entity]
@@ -10,11 +10,7 @@
(defroutes routes
(wrap-routes
(context "/companies" []
(GET "/" r
{:status 200
:body (pr-str (filter #(can-see-company? (:identity r) (:id %)) (companies/get-all)))
:headers {"Content-Type" "application/edn"}})
(wrap-spec
#_(wrap-spec
(PUT "/:id" {{:keys [address email locations new-bank-accounts]} :edn-params :keys [edn-params] {:keys [id ]} :route-params :as r}
(assert-can-see-company (:identity r) id)
(let [id (Integer/parseInt id)
@@ -22,12 +18,12 @@
updated-company (merge company {:address address
:email email
:locations locations})]
(companies/upsert id updated-company)
(doseq [bank-account new-bank-accounts]
#_(companies/upsert id updated-company)
#_(doseq [bank-account new-bank-accounts]
(companies/add-bank-account id bank-account))
{:status 200
:body (pr-str (companies/get-by-id id))
:body (pr-str (clients/get-by-id id))
:headers {"Content-Type" "application/edn"}}))
::entity/company))
wrap-secure))

View File

@@ -1,8 +1,5 @@
(ns auto-ap.routes.events
(:require
[auto-ap.db.reminders :as reminders]
[auto-ap.db.vendors :as vendors]
[auto-ap.routes.utils :refer [wrap-secure]]
(:require [auto-ap.routes.utils :refer [wrap-secure]]
[auto-ap.yodlee.import :as yodlee-import]
[config.core :refer [env]]
[clj-http.client :as http]

View File

@@ -1,21 +1,14 @@
(ns auto-ap.routes.exports
(:require
[auto-ap.db.invoices :as invoices]
[auto-ap.db.checks :as checks]
[auto-ap.db.transactions :as transactions]
[auto-ap.db.companies :as companies]
[auto-ap.datomic.clients :as d-clients]
[auto-ap.datomic.vendors :as d-vendors]
[auto-ap.datomic.transactions :as d-transactions]
[auto-ap.db.vendors :as vendors]
[auto-ap.db.utils :refer [query]]
[auto-ap.utils :refer [by]]
[auto-ap.parse :as parse]
[auto-ap.graphql :as graphql]
[auto-ap.graphql.utils :refer [<-graphql ->graphql assert-admin]]
[auto-ap.routes.utils :refer [wrap-secure]]
[clj-time.coerce :refer [to-date]]
[auto-ap.db.invoices-expense-accounts :as expense-accounts]
[ring.middleware.json :refer [wrap-json-response]]
[compojure.core :refer [GET POST context defroutes wrap-routes]]
[clojure.string :as str]

View File

@@ -1,7 +1,5 @@
(ns auto-ap.routes.graphql
(:require [auto-ap.db.companies :as companies]
[auto-ap.routes.utils :refer [wrap-secure wrap-spec]]
[auto-ap.entities.companies :as entity]
(:require [auto-ap.routes.utils :refer [wrap-secure wrap-spec]]
[auto-ap.graphql :as ql]
[buddy.auth :refer [throw-unauthorized]]
[clojure.edn :as edn]

View File

@@ -1,7 +1,5 @@
(ns auto-ap.routes.reminders
(:require
[auto-ap.db.reminders :as reminders]
[auto-ap.db.vendors :as vendors]
[auto-ap.routes.utils :refer [wrap-secure]]
[auto-ap.graphql.utils :refer [assert-admin]]
[config.core :refer [env]]
@@ -15,14 +13,14 @@
wrap-routes]])
(:import (org.joda.time DateTime)))
(defn next-sunday []
#_(defn next-sunday []
(let [sunday (->> (p/periodic-seq (time/plus (time/today) (time/days 1)) (time/days 1))
(filter pred/sunday?)
first)]
(time/from-time-zone (time/date-time (time/year sunday) (time/month sunday) (time/day sunday))
(time/time-zone-for-id "America/Los_Angeles"))))
(defn schedule-reminders []
#_(defn schedule-reminders []
(let [vendors (vendors/find-with-reminders)
future-reminders (reminders/find-future (map :id vendors))
has-reminder-scheduled? (set (map :vendor-id future-reminders))
@@ -37,14 +35,14 @@
:email primary-email
:scheduled (next-sunday))))))
(defn find-ready-reminders []
#_(defn find-ready-reminders []
(let [vendors (vendors/get-all)
ready-reminders (reminders/get-ready)]
ready-reminders))
(defn replace-joda [x]
#_(defn replace-joda [x]
(into {} (map (fn [[k v]]
[k (if (instance? DateTime v)
(c/to-date v)
@@ -54,7 +52,7 @@
(defroutes routes
(context "/reminders" []
(POST "/send" {:keys [query-params headers body] :as x}
#_(POST "/send" {:keys [query-params headers body] :as x}
(let [notification-type (get headers "x-amz-sns-message-type")]
(println "Received notification " notification-type)
(if (= "SubscriptionConfirmation" notification-type)
@@ -72,7 +70,7 @@
{:status 200
:body "{}"
:headers {"Content-Type" "application/edn"}})
(wrap-routes
#_(wrap-routes
(PUT "/:id" {:keys [ edn-params] {:keys [id] } :route-params identity :identity}
(assert-admin identity)
(let [id (if (int? id)

View File

@@ -1,5 +1,5 @@
(ns auto-ap.routes.vendors
(:require [auto-ap.db.vendors :as vendors]
(:require [auto-ap.db.vendors :as vendors]
[auto-ap.entities.vendors :as entity]
[auto-ap.graphql.utils :refer [assert-admin]]
[auto-ap.routes.utils :refer [wrap-secure wrap-spec]]

View File

@@ -7,7 +7,6 @@
[auto-ap.graphql.utils :refer [->graphql assert-admin]]
[auto-ap.routes.utils :refer [wrap-secure]]
[clj-time.coerce :refer [to-date]]
[auto-ap.db.invoices-expense-accounts :as expense-accounts]
[ring.middleware.json :refer [wrap-json-response]]
[compojure.core :refer [GET POST context defroutes wrap-routes]]
[clojure.string :as str]