merge fixes
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
(:require
|
(:require
|
||||||
[amazonica.aws.s3 :as s3]
|
[amazonica.aws.s3 :as s3]
|
||||||
[iol-ion.tx :refer [propose-invoice]]
|
[iol-ion.tx :refer [propose-invoice]]
|
||||||
[auto-ap.datomic :refer [conn]]
|
[auto-ap.datomic :refer [conn audit-transact]]
|
||||||
[auto-ap.jobs.core :refer [execute]]
|
[auto-ap.jobs.core :refer [execute]]
|
||||||
[auto-ap.logging :as log]
|
[auto-ap.logging :as log]
|
||||||
[auto-ap.parse :as parse]
|
[auto-ap.parse :as parse]
|
||||||
@@ -244,7 +244,7 @@
|
|||||||
(mark-error k)
|
(mark-error k)
|
||||||
[]))))
|
[]))))
|
||||||
(into []))]
|
(into []))]
|
||||||
(transact-with-ledger transaction {:user/name "sysco importer" :user/role "admin"})
|
(audit-transact transaction {:user/name "sysco importer" :user/role "admin"})
|
||||||
(log/info ::success
|
(log/info ::success
|
||||||
:count (count transaction)
|
:count (count transaction)
|
||||||
:sample (take 3 transaction)))
|
:sample (take 3 transaction)))
|
||||||
|
|||||||
@@ -142,9 +142,8 @@
|
|||||||
(= job "restore-from-backup")
|
(= job "restore-from-backup")
|
||||||
(job-restore-from-backup/-main)
|
(job-restore-from-backup/-main)
|
||||||
|
|
||||||
(comment
|
;; (= job "export-backup")
|
||||||
(= job "export-backup")
|
;; (backup/-main)
|
||||||
(backup/-main))
|
|
||||||
|
|
||||||
:else
|
:else
|
||||||
(do
|
(do
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
(:require [auto-ap.jobs.ntg :as sut]
|
(:require [auto-ap.jobs.ntg :as sut]
|
||||||
[auto-ap.integration.util :refer [wrap-setup admin-token setup-test-data test-vendor test-account dissoc-id]]
|
[auto-ap.integration.util :refer [wrap-setup admin-token setup-test-data test-vendor test-account dissoc-id]]
|
||||||
[clojure.test :as t :refer [deftest is testing use-fixtures]]
|
[clojure.test :as t :refer [deftest is testing use-fixtures]]
|
||||||
[datomic.api :as d]
|
|
||||||
[clojure.java.io :as io]))
|
[clojure.java.io :as io]))
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user