-- adding a create-account helper function

Author: Timothy Washington

src/bkell/domain/account.clj

@@ -4,7 +4,8 @@
             [bkell.domain.helper :as hlp]))
 
 
-(declare find-account-by-name)
+(declare find-account-by-name
+         add-account)
 
 (defn no-duplicate-account? [ds group-name account]
   (let [a (find-account-by-name ds group-name (:name account))]
@@ -18,6 +19,20 @@
 
     (every? true? results)))
 
+(def account-type-mappings {:expense :debit
+                            :revenue :credit
+                            :liability :credit
+                            :asset :debit
+                            :capital :credit})
+
+(defn create-account [ds group-name aname atype]
+  {:pre [(some #{atype} (keys account-type-mappings))]}
+
+  (let [account {:name aname
+                 :type atype
+                 :counterWeight (atype account-type-mappings)}]
+    (add-account ds group-name account)))
+
 (defn add-account [ds group-name account]
   {:pre [(no-duplicate-account? ds group-name account)]}
 
@@ -67,6 +82,14 @@
                     :group/name gname}}}))
 
 
+(defn update-account [ds id account]
+
+  ;; can only update if no other entries point to it
+  ;; can only update :name or :type (:counterWeight is automatically changed)
+
+  )
+
+
 (comment
 
   (acc/find-account-by-id ds "webkell" 123)

src/bkell/domain/helper.clj

@@ -3,8 +3,16 @@
             [clojure.set :as set]
             [slingshot.slingshot :refer [try+ throw+]]))
 
-(defn find-by-id [ds id]
-  (adi/select ds id :first))
+(defn find-core [args]
+  (apply adi/select args))
+
+(defn find-by-id
+  ([ds id] (find-by-id ds id [:first]))
+  ([ds id opts]
+     (let [args [ds id]
+           argsF (set/union args opts)]
+
+       (find-core argsF))))
 
 (defn find-country-by-code
   ([ds code]
@@ -14,7 +22,7 @@
      (let [args [ds {:country {:id code}}]
            argsF (set/union args opts)]
 
-       (apply adi/select argsF))))
+       (find-core argsF))))
 
 (defn find-currency-by-code
   ([ds code]
@@ -24,7 +32,7 @@
      (let [args [ds {:currency {:id code}}]
            argsF (set/union args opts)]
 
-       (apply adi/select argsF))))
+       (find-core argsF))))
 
 (defn generate-nominal-group [ds gname uname country currency]
 

test/bkell/domain/account_test.clj

@@ -19,10 +19,10 @@
 
 (defn account-generator []
   (gen/hash-map :name gen/string-ascii
-                :type (gen/elements [:asset :liability :revenue :expense])
+                :type (gen/elements [:asset :liability :revenue :expense :capital])
                 :counterWeight (gen/elements [:debit :credit])))
 
-(defspec test-add-an-account
+(defspec test-add-account
   10
   (prop/for-all [account (account-generator)]
 
@@ -36,6 +36,38 @@
 
                        (-> result nil? not)))))
 
+(defspec test-create-account
+  5
+  (prop/for-all [_ gen/int]
+
+                (let [group-name "webkell"
+                      ds (hlp/setup-db!)
+
+                      aname "fubar"
+                      atype :asset
+                      result (acc/create-account ds group-name aname atype)]
+
+                  (and (set/subset? #{:counterWeight :name :type}
+                                    (-> result first :book :accounts first keys set))
+
+                       (-> result nil? not)))))
+
+(defspec test-create-account-bad-type
+  5
+  (prop/for-all [_ gen/int]
+
+                (let [group-name "webkell"
+                      ds (hlp/setup-db!)
+
+                      aname "fubar"
+                      atype :fubar
+                      result (try+ (acc/create-account ds group-name aname atype)
+                                   (catch AssertionError e &throw-context))]
+
+                  (= '(:cause :message :object :stack-trace :throwable)
+                     (sort (keys result))))))
+
+
 (defspec test-restrict-duplicate-account
   10
   (prop/for-all [account (account-generator)]