notid/integreat
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

more specs.

Browse Source
This commit is contained in:
Bryce Covert
2018-04-09 16:27:03 -07:00
parent f7dea19d2e
commit 5e7add409f
25 changed files with 246 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/clj/auto_ap/background/mail.clj
View File

@@ -1,25 +1,16 @@
(ns auto-ap.background.mail
(:require [amazonica.aws.sqs :as sqs]
[amazonica.aws.s3 :as s3]
[clojure.data.json :as json]
[clojure-mail.message :as message]
[clojure.string :as str]
[clojure.java.io :as io]
[config.core :refer [env]]
[auto-ap.parse :as parse]
[auto-ap.db.invoices :as invoices]
(:require [amazonica.aws.s3 :as s3]
[amazonica.aws.sqs :as sqs]
[auto-ap.db.companies :as companies]
)
(:import [java.util Properties]
[java.util UUID]
[javax.mail.search FlagTerm]
[java.io FileInputStream File]
[javax.mail.internet MimeMessage]
[javax.mail Session
Folder
Flags
Flags$Flag AuthenticationFailedException]
(com.sun.mail.imap IMAPStore)))
[auto-ap.db.invoices :as invoices]
[auto-ap.parse :as parse]
[clojure-mail.message :as message]
[clojure.data.json :as json]
[clojure.java.io :as io]
[config.core :refer [env]])
(:import (java.util Properties UUID)
(javax.mail Session)
(javax.mail.internet MimeMessage)))
(defn process-sqs []

13
src/clj/auto_ap/db/companies.clj
View File

@@ -1,14 +1,17 @@
(ns auto-ap.db.companies
(:require [clojure.java.jdbc :as j]
[auto-ap.db.utils :refer [clj->db db->clj get-conn]]
[clojure.edn :as edn]))
(:require [auto-ap.db.utils :refer [clj->db db->clj get-conn assign-namespace]]
[auto-ap.entities.companies :as entity]
[clojure.edn :as edn]
[clojure.java.jdbc :as j]))
(defn merge-data [{:keys [data] :as x}]
(defn merge-data [{:keys [::entity/data] :as x}]
(merge x (edn/read-string data)))
(defn parse [x]
(-> x
(db->clj)
(assign-namespace "auto-ap.entities.companies")
merge-data
))
@@ -20,4 +23,4 @@
(defn upsert [id data]
(j/update! (get-conn) :companies (clj->db data) ["id = ?" (Integer/parseInt id)] )
(merge-data (db->clj (first (j/query (get-conn) ["SELECT * FROM companies WHERE id = ?" (Integer/parseInt id)])))))
(parse (first (j/query (get-conn) ["SELECT * FROM companies WHERE id = ?" (Integer/parseInt id)]))))

7
src/clj/auto_ap/db/invoices.clj
View File

@@ -1,7 +1,8 @@
(ns auto-ap.db.invoices
(:require [clojure.java.jdbc :as j]
(:require [auto-ap.db.utils :refer [clj->db db->clj get-conn]]
[auto-ap.parse :as parse]
[auto-ap.db.utils :refer [clj->db db->clj get-conn]]))
[auto-ap.entities.companies :as company]
[clojure.java.jdbc :as j]))
(defn insert-multi! [rows]
(j/insert-multi! (get-conn)
@@ -34,6 +35,6 @@
(do
(println row)
(assoc row
:company-id (:id (parse/best-match companies customer-identifier))
:company-id (::company/id (parse/best-match companies customer-identifier))
:imported false
:potential-duplicate false)))))

6
src/clj/auto_ap/db/reminders.clj
View File

@@ -1,9 +1,7 @@
(ns auto-ap.db.reminders
(:require [clojure.java.jdbc :as j]
[auto-ap.parse :as parse]
[auto-ap.db.utils :refer [clj->db db->clj get-conn]]
[clj-time.jdbc]
(:require [auto-ap.db.utils :refer [clj->db db->clj get-conn]]
[clj-time.core :as time]
[clojure.java.jdbc :as j]
[clojure.string :as str]))
(defn insert [row]

4
src/clj/auto_ap/db/users.clj
View File

@@ -1,7 +1,7 @@
(ns auto-ap.db.users
(:require [clojure.java.jdbc :as j]
(:require [auto-ap.db.utils :refer [get-conn]]
[clojure.edn :as edn]
[auto-ap.db.utils :refer [clj->db db->clj get-conn]]))
[clojure.java.jdbc :as j]))
(defn find-or-insert! [row]
(let [user (first (j/find-by-keys (get-conn)

15
src/clj/auto_ap/db/utils.clj
View File

@@ -1,6 +1,6 @@
(ns auto-ap.db.utils
(:require [config.core :refer [env]])
(:require [clojure.string :as str]))
(:require [clojure.string :as str]
[config.core :refer [env]]))
(defn snake->kebab [s]
(str/replace s #"_" "-"))
@@ -34,3 +34,14 @@
:user "ap"
:password "fifteen-invoices-imported!"}))
(defn assign-namespace [x n]
(reduce-kv
(fn [x k v]
(assoc x (if (and (keyword? k)
(not (qualified-keyword? k)))
(keyword n (name k))
k)
v))
{}
x))

17
src/clj/auto_ap/db/vendors.clj
View File

@@ -1,23 +1,12 @@
(ns auto-ap.db.vendors
(:require [clojure.java.jdbc :as j]
[auto-ap.db.utils :refer [clj->db db->clj get-conn]]
(:require [auto-ap.db.utils :refer [clj->db db->clj get-conn assign-namespace]]
[auto-ap.entities.vendors :as entities]
[clojure.edn :as edn]))
[clojure.edn :as edn]
[clojure.java.jdbc :as j]))
(defn merge-data [{:keys [data] :as x}]
(merge x (edn/read-string data)))
(defn assign-namespace [x n]
(reduce-kv
(fn [x k v]
(assoc x (if (and (keyword? k)
(not (qualified-keyword? k)))
(keyword n (name k))
k)
v))
{}
x))
(defn parse [x]
(-> x
(db->clj)

31
src/clj/auto_ap/handler.clj
View File

@@ -1,26 +1,21 @@
(ns auto-ap.handler
(:require [compojure.core :refer :all]
[compojure.route :as route]
[clojure.java.io :as io]
[clojure.string :as str]
(:require [amazonica.core :refer [defcredential]]
[auto-ap.routes.auth :as auth]
[auto-ap.routes.companies :as companies]
[auto-ap.routes.invoices :as invoices]
[auto-ap.db.users :as users]
[auto-ap.routes.reminders :as reminders]
[auto-ap.routes.vendors :as vendors]
[buddy.auth.backends.token :refer [jws-backend]]
[buddy.auth.middleware :refer [wrap-authentication
wrap-authorization]]
[compojure.core :refer :all]
[compojure.route :as route]
[config.core :refer [env]]
[ring.middleware.edn :refer [wrap-edn-params]]
[ring.middleware.multipart-params :as mp]
[ring.util.response :as response]
[ring.middleware.defaults :refer [wrap-defaults site-defaults]]
[ring.middleware.params :refer [wrap-params]]
[ring.middleware.reload :refer [wrap-reload]]
[ring.middleware.edn :refer [wrap-edn-params]]
[clojure.java.jdbc :as j]
[config.core :refer [env]]
[buddy.auth.backends.token :refer [jws-backend]]
[buddy.auth.middleware :refer [wrap-authorization wrap-authentication]]
[auto-ap.routes.companies :as companies]
[auto-ap.routes.vendors :as vendors]
[auto-ap.routes.reminders :as reminders]
[auto-ap.routes.auth :as auth]
[amazonica.core :refer [defcredential]]))
[ring.util.response :as response]))
(defcredential (:aws-access-key-id env) (:aws-secret-access-key env) (:aws-region env))

9
src/clj/auto_ap/parse.clj
View File

@@ -1,11 +1,9 @@
(ns auto-ap.parse
(:require [clojure.java.io :as io]
[clojure.string :as str]
[clojure.java.shell :as sh]
[auto-ap.parse.excel :as excel]
(:require [auto-ap.parse.excel :as excel]
[auto-ap.parse.templates :as t]
[clj-fuzzy.metrics :as m]
))
[clojure.java.shell :as sh]
[clojure.string :as str]))
@@ -54,6 +52,7 @@
(excel/parse-file file filename))
(defn best-match [companies company-identifier]
(println companies)
(->> companies
(map (fn [company]
[company (apply min (map #(m/jaccard (.toLowerCase company-identifier) %) (:matches company)))]))

6
src/clj/auto_ap/parse/excel.clj
View File

@@ -1,8 +1,8 @@
(ns auto-ap.parse.excel
(:import [org.apache.poi.ss.util CellAddress])
(:require [dk.ative.docjure.spreadsheet :as d]
(:require [auto-ap.parse.templates :as t]
[clojure.string :as str]
[auto-ap.parse.templates :as t]))
[dk.ative.docjure.spreadsheet :as d])
(:import (org.apache.poi.ss.util CellAddress)))

13
src/clj/auto_ap/routes/auth.clj
View File

@@ -1,11 +1,10 @@
(ns auto-ap.routes.auth
(:require
[compojure.core :refer [defroutes GET ]]
[auto-ap.db.users :as users]
[buddy.sign.jwt :as jwt]
[clj-http.client :as http]
[config.core :refer [env]]
[clj-time.core :as time]))
(:require [auto-ap.db.users :as users]
[buddy.sign.jwt :as jwt]
[clj-http.client :as http]
[clj-time.core :as time]
[compojure.core :refer [GET defroutes]]
[config.core :refer [env]]))
(def google-client-id "264081895820-0nndcfo3pbtqf30sro82vgq5r27h8736.apps.googleusercontent.com")
(def google-client-secret "OC-WemHurPXYpuIw5cT-B90g")

20
src/clj/auto_ap/routes/companies.clj
View File

@@ -1,7 +1,11 @@
(ns auto-ap.routes.companies
(:require [compojure.core :refer [context GET PUT defroutes wrap-routes]]
[auto-ap.db.companies :as companies]
[auto-ap.routes.utils :refer [wrap-secure]]))
(:require [auto-ap.db.companies :as companies]
[auto-ap.routes.utils :refer [wrap-secure wrap-spec]]
[auto-ap.entities.companies :as entity]
[clojure.spec.alpha :as s]
[compojure.core :refer [GET PUT context defroutes
wrap-routes]]))
(defroutes routes
(wrap-routes
@@ -10,8 +14,10 @@
{:status 200
:body (pr-str (companies/get-all))
:headers {"Content-Type" "application/edn"}})
(PUT "/:id" {:keys [edn-params] {:keys [id]} :route-params :as r}
{:status 200
:body (pr-str (companies/upsert id edn-params))
:headers {"Content-Type" "application/edn"}}))
(wrap-spec
(PUT "/:id" {:keys [edn-params] {:keys [id]} :route-params :as r}
{:status 200
:body (pr-str (companies/upsert id edn-params))
:headers {"Content-Type" "application/edn"}})
::entity/company))
wrap-secure))

7
src/clj/auto_ap/routes/invoices.clj
View File

@@ -1,9 +1,10 @@
(ns auto-ap.routes.invoices
(:require [compojure.core :refer [context GET PUT POST defroutes wrap-routes]]
(:require [auto-ap.db.companies :as companies]
[auto-ap.db.invoices :as invoices]
[auto-ap.db.companies :as companies]
[auto-ap.parse :as parse]
[auto-ap.routes.utils :refer [wrap-secure]]))
[auto-ap.routes.utils :refer [wrap-secure]]
[compojure.core :refer [GET POST context defroutes
wrap-routes]]))
(defroutes routes
(wrap-routes

21
src/clj/auto_ap/routes/reminders.clj
View File

@@ -1,20 +1,17 @@
(ns auto-ap.routes.reminders
(:require [compojure.core :refer [context GET POST defroutes wrap-routes]]
[auto-ap.db.vendors :as vendors]
(:require [amazonica.aws.simpleemail :as ses]
[auto-ap.db.reminders :as reminders]
[auto-ap.db.vendors :as vendors]
[auto-ap.routes.utils :refer [wrap-secure]]
[amazonica.aws.simpleemail :as ses]
[clj-time.core :as time]
[clj-time.coerce :as c]
[clj-time.predicates :as pred]
[clj-time.periodic :as p]
[clj-time.local :as l]
[clj-time.jdbc]
[clj-http.client :as http]
[clj-time.coerce :as c]
[clj-time.core :as time]
[clj-time.periodic :as p]
[clj-time.predicates :as pred]
[clojure.data.json :as json]
[ring.middleware.json :refer [wrap-json-body]]
)
(:import [org.joda.time DateTime]))
[compojure.core :refer [GET POST context defroutes
wrap-routes]])
(:import (org.joda.time DateTime)))
(defn next-sunday []
(let [sunday (->> (p/periodic-seq (time/plus (time/today) (time/days 1)) (time/days 1))

11
src/clj/auto_ap/routes/utils.clj
View File

@@ -1,5 +1,6 @@
(ns auto-ap.routes.utils
(:require [buddy.auth :refer [authenticated?]]))
(:require [clojure.spec.alpha :as s]
[buddy.auth :refer [authenticated?]]))
(defn wrap-secure [handler]
(fn [request]
@@ -7,3 +8,11 @@
(handler request)
{:status 401
:body "not authenticated"})))
(defn wrap-spec [handler spec]
(fn [request]
(if (not (s/valid? spec (:edn-params request)))
{:status 400
:body (pr-str (s/explain-data spec (:edn-params request)))
:headers {"Content-Type" "application/edn"}}
(handler request))))

32
src/clj/auto_ap/routes/vendors.clj
View File

@@ -1,9 +1,10 @@
(ns auto-ap.routes.vendors
(:require [compojure.core :refer [context GET PUT POST defroutes wrap-routes]]
[auto-ap.db.vendors :as vendors]
[auto-ap.routes.utils :refer [wrap-secure]]
(:require [auto-ap.db.vendors :as vendors]
[auto-ap.routes.utils :refer [wrap-secure wrap-spec]]
[auto-ap.entities.vendors :as entity]
[clojure.spec.alpha :as s]))
[clojure.spec.alpha :as s]
[compojure.core :refer [GET POST PUT context defroutes
wrap-routes]]))
(defroutes routes
(wrap-routes
@@ -12,16 +13,17 @@
{:status 200
:body (pr-str (vendors/get-all))
:headers {"Content-Type" "application/edn"}})
(PUT "/:id" {:keys [edn-params] {:keys [id]} :route-params :as r}
(println edn-params)
(println (s/valid? ::entity/vendor edn-params))
(println (s/explain ::entity/vendor edn-params))
{:status 200
:body (pr-str (vendors/upsert id edn-params))
:headers {"Content-Type" "application/edn"}})
(POST "/" {:keys [edn-params] :as r}
(println (s/valid? ::entity/vendor edn-params))
(wrap-spec
(PUT "/:id" {:keys [edn-params] {:keys [id]} :route-params :as r}
{:status 200
:body (pr-str (vendors/insert edn-params))
:headers {"Content-Type" "application/edn"}}))
:body (pr-str (vendors/upsert id edn-params))
:headers {"Content-Type" "application/edn"}})
::entity/vendor)
(wrap-spec
(POST "/" {:keys [edn-params] :as r}
{:status 200
:body (pr-str (vendors/insert edn-params))
:headers {"Content-Type" "application/edn"}})
::entity/vendor))
wrap-secure))

4
src/clj/auto_ap/server.clj
View File

@@ -1,6 +1,6 @@
(ns auto-ap.server
(:require [auto-ap.handler :refer [app]]
[auto-ap.background.mail :refer [always-process-sqs]]
(:require [auto-ap.background.mail :refer [always-process-sqs]]
[auto-ap.handler :refer [app]]
[config.core :refer [env]]
[ring.adapter.jetty :refer [run-jetty]])
(:gen-class))