From d4bc2490ff51e287ac3ea97ab086c63851cb40c5 Mon Sep 17 00:00:00 2001
From: didier amyot <didier.amyot@gmail.com>
Date: Sun, 9 Sep 2018 15:21:54 -0400
Subject: [PATCH] smaller commit :)

---
 src/clj/skirmish/bookkeeper/bookkeeper.clj |  1 -
 src/clj/skirmish/bookkeeper/core.clj       |  1 -
 src/clj/skirmish/exchange/core.clj         |  5 ++--
 src/clj/skirmish/exchange_gateway/core.clj |  1 -
 src/clj/skirmish/ledger/accounts.clj       | 25 ++++++++++++++++++++
 src/clj/skirmish/ledger/core.clj           |  8 +++++--
 src/clj/skirmish/middleware/core.clj       |  1 -
 test/clj/skirmish/ledger/test_core.clj     | 27 ++++++++++++++--------
 8 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/src/clj/skirmish/bookkeeper/bookkeeper.clj b/src/clj/skirmish/bookkeeper/bookkeeper.clj
index 7ffd8b1..3a11522 100644
--- a/src/clj/skirmish/bookkeeper/bookkeeper.clj
+++ b/src/clj/skirmish/bookkeeper/bookkeeper.clj
@@ -7,7 +7,6 @@
             [skirmish.order]  ;; for spec side effect
             [skirmish.rest.util :refer [build-response build-response-body]]
             [clojure.spec.alpha :as s]
-            [kinsky.client]
             [slingshot.slingshot :refer [try+ throw+]]
             [clojure.core.async :refer [chan go-loop close! <! sub]]))
 
diff --git a/src/clj/skirmish/bookkeeper/core.clj b/src/clj/skirmish/bookkeeper/core.clj
index 015b95f..ef195df 100644
--- a/src/clj/skirmish/bookkeeper/core.clj
+++ b/src/clj/skirmish/bookkeeper/core.clj
@@ -2,7 +2,6 @@
   (:require [org.httpkit.server :refer [run-server]]
             [compojure.handler :refer [api]]
             [skirmish.util :refer [block-thread]]
-            [skirmish.middleware.core :refer [create-exchange-apis-for]]
             [skirmish.bookkeeper.bookkeeper :refer [create-routes-for-bookkeeper]]
             [ring.middleware.cors :refer [wrap-cors]]))
 
diff --git a/src/clj/skirmish/exchange/core.clj b/src/clj/skirmish/exchange/core.clj
index 0d3b770..914efee 100644
--- a/src/clj/skirmish/exchange/core.clj
+++ b/src/clj/skirmish/exchange/core.clj
@@ -1,9 +1,8 @@
 (ns skirmish.exchange.core
   (:require [skirmish.util :refer [block-thread]]
             [skirmish.middleware.core :refer [create-exchange-apis-for]]
-            [skirmish.exchange.exchange :refer [create-exchange-for-security empty-book]]
-            [kinsky.async]
-            [kinsky.client]))
+            [skirmish.exchange.exchange :refer [create-exchange-for-security empty-book]]))
+
 
 (defn create-exchange-for [exchange-api]
   (let [initial-book empty-book
diff --git a/src/clj/skirmish/exchange_gateway/core.clj b/src/clj/skirmish/exchange_gateway/core.clj
index 72f5fa6..202ca81 100644
--- a/src/clj/skirmish/exchange_gateway/core.clj
+++ b/src/clj/skirmish/exchange_gateway/core.clj
@@ -2,7 +2,6 @@
   (:require [org.httpkit.server :refer [run-server]]
             [compojure.handler :refer [api]]
             [skirmish.util :refer [block-thread]]
-            [skirmish.middleware.core :refer [create-exchange-apis-for]]
             [skirmish.exchange-gateway.exchange-gateway :refer [create-routes-for-exchange]]
             [ring.middleware.cors :refer [wrap-cors]]))
 
diff --git a/src/clj/skirmish/ledger/accounts.clj b/src/clj/skirmish/ledger/accounts.clj
index 91f780c..a629b27 100644
--- a/src/clj/skirmish/ledger/accounts.clj
+++ b/src/clj/skirmish/ledger/accounts.clj
@@ -48,6 +48,31 @@
     :db/cardinality :db.cardinality/one
     :db/unique :db.unique/identity
     :db/doc "The sec id."}
+   {
+    :db/ident :skirmish.security/type
+    :db/valueType :db.type/keyword
+    :db/cardinality :db.cardinality/one
+    :db/unique :db.unique/identity
+    :db/doc "The type of security.  For instance :equity or :currency."}
+
+   {
+    :db/ident :skirmish.security/description
+    :db/valueType :db.type/string
+    :db/cardinality :db.cardinality/one
+    :db/unique :db.unique/identity
+    :db/doc "The description of the currency.  Please be verbose."}
+   {
+    :db/ident :skirmish.security/emitter
+    :db/valueType :db.type/string
+    :db/cardinality :db.cardinality/one
+    :db/unique :db.unique/identity
+    :db/doc "The public key of the emmiter.  This is not yet supported."}
+   {
+    :db/ident :skirmish.security/symbol
+    :db/valueType :db.type/string
+    :db/cardinality :db.cardinality/one
+    :db/unique :db.unique/identity
+    :db/doc "The symbol of the security for pretty printing."}
    {
     :db/ident :skirmish.security/interest-rate
     :db/valueType :db.type/long
diff --git a/src/clj/skirmish/ledger/core.clj b/src/clj/skirmish/ledger/core.clj
index 32853d3..8ca8877 100644
--- a/src/clj/skirmish/ledger/core.clj
+++ b/src/clj/skirmish/ledger/core.clj
@@ -4,7 +4,6 @@
             [skirmish.util :refer [block-thread]]
             [slingshot.slingshot :refer [try+ throw+]]
             [compojure.route :refer [not-found]]
-            [skirmish.middleware.core :refer [create-exchange-apis-for]]
             [skirmish.exchange-gateway.exchange-gateway :refer [create-routes-for-exchange]]
             [skirmish.rest.util :refer [build-response get-body]]
             [skirmish.ledger.accounts]
@@ -52,7 +51,12 @@
 
 
 (s/def ::security (s/cat :sec-id keyword?
-                         :interest-rate nat-int?))
+                         :interest-rate nat-int?
+                         :type #{:equity :currency}
+                         :description string?
+                         :emitter string?
+                         :symbol (s/? string?)))
+
 
 (defn get-new-security [raw-securities]
   (if (s/valid? ::security raw-securities)
diff --git a/src/clj/skirmish/middleware/core.clj b/src/clj/skirmish/middleware/core.clj
index ef3aff9..d9bacd0 100644
--- a/src/clj/skirmish/middleware/core.clj
+++ b/src/clj/skirmish/middleware/core.clj
@@ -1,6 +1,5 @@
 (ns skirmish.middleware.core
   (:require [clojure.core.async :as async]
-            [skirmish.exchange.exchange :refer [empty-book create-exchange-for-security]] ;; remove this import.
             [kinsky.async]
             [kinsky.client]))
 
diff --git a/test/clj/skirmish/ledger/test_core.clj b/test/clj/skirmish/ledger/test_core.clj
index 12141a6..64564fa 100644
--- a/test/clj/skirmish/ledger/test_core.clj
+++ b/test/clj/skirmish/ledger/test_core.clj
@@ -34,13 +34,21 @@
 
 (def sec->hash-set #(apply hash-set %))
 
+(def mock-securities [[:sec-1 100 :equity "first equity" "rot13"]
+                      [:sec-2 200 :equity "second equity" "rot13"]
+                      [:sec-3 300 :equity "third equity" "rot13"]])
+
+(def mock-currencies [[:zimbabwean-dollar 1000000 :currency "zimbabwean dollar" "rot13" "zd"]])
+
+
+
 
 (defn create-some-securities [conn]
   (let [cs (create-security conn)
-        create-security-1 {:body (edn->stream [:sec-1 100]) :headers {"accept" "application/edn"}}
-        create-security-2 {:body (edn->stream [:sec-2 200]) :headers {"accept" "application/edn"}}
-        create-security-3 {:body (edn->stream [:sec-3 300]) :headers {"accept" "application/edn"}}
-        create-security-4 {:body (edn->stream [:zimbabwean-dollar 1000000]) :headers {"accept" "application/edn"}}]
+        create-security-1 {:body (edn->stream (get mock-securities 0)) :headers {"accept" "application/edn"}}
+        create-security-2 {:body (edn->stream (get mock-securities 1)) :headers {"accept" "application/edn"}}
+        create-security-3 {:body (edn->stream (get mock-securities 2)) :headers {"accept" "application/edn"}}
+        create-security-4 {:body (edn->stream (first mock-currencies)) :headers {"accept" "application/edn"}}]
     (->> create-security-1 cs (s/assert ::ok))
     (->> create-security-2 cs (s/assert ::ok))
     (->> create-security-3 cs (s/assert ::ok))
@@ -67,15 +75,15 @@
 (facts "about the securities"
        (fact "We should be able to create a security"
              (let [conn (create-conn)
-                   security [:new-currency 100]
+                   security [:new-currency 100 :currency "currency for test" "rot13" "NC"]
                    request {:body (edn->stream security) :headers {"accept" "application/edn"}}
                    resp ((create-security conn) request)]
                resp => (spec-check ::ok)
-               resp => (location? "/api/1/ledger/securities/new-currency"))) ;;
+               resp => (location? "/api/1/ledger/securities/new-currency")))
 
        (fact "We should not be able to create a security that already exists"
              (let [conn (create-conn)
-                   security [:new-currency 100]
+                   security [:new-currency 100 :currency "currency for test" "rot13" "NC"]
                    request {:body (edn->stream security) :headers {"accept" "application/edn"}}
                    resp-1 ((create-security conn) request)
                    resp-2 ((create-security conn) request)]
@@ -87,7 +95,7 @@
 
        (fact "we should be able to get-security if it does exists"
              (let [conn (create-conn)
-                   security [:new-currency 100]
+                   security [:new-currency 100 :currency "currency for test" "rot13" "NC"]
                    create-request {:body (edn->stream security) :headers {"accept" "application/edn"}}
                    _ ((create-security conn) create-request)
                    request {:route-params {:sec-id :new-currency} :headers {"accept" "application/edn"}}
@@ -106,7 +114,8 @@
              (let [conn (create-conn)
                    request {:route-params {} :headers {"accept" "application/edn"}}
                    empty-res ((get-available-securities conn) request)
-                   create-security-1 {:body (edn->stream [:new-currency 100]) :headers {"accept" "application/edn"}}
+                   new-currency [:new-currency 100 :currency "currency for test" "rot13" "NC"]
+                   create-security-1 {:body (edn->stream new-currency) :headers {"accept" "application/edn"}}
                    _ ((create-security conn) create-security-1)
                    one-res ((get-available-securities conn) request)]
                empty-res => (spec-check ::ok)