From 5dbd32b99b1792794aa5ab9947510167f86cacfd Mon Sep 17 00:00:00 2001 From: CambodianCoder Date: Sat, 15 Feb 2020 08:37:49 -0700 Subject: [PATCH 1/3] added http-post and handler-with-http reg-event-fx --- src/cljs/ZZZZ/events.cljs | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/src/cljs/ZZZZ/events.cljs b/src/cljs/ZZZZ/events.cljs index eb2167b..bdba707 100644 --- a/src/cljs/ZZZZ/events.cljs +++ b/src/cljs/ZZZZ/events.cljs @@ -49,3 +49,40 @@ (validate-spec ::db/app-db) (fn [db [_ m]] (assoc db :current-page m))) + +(rfc/reg-event-fx + :handler-with-http + (fn handler-with-http [db [_ {:keys [uri params on-success-kvec]}]] + {:http-xhrio {:method :get + :uri uri + ; :headers {"Access-Control-Allow-Origin" "http://localhost:3030"} + :params params + :timeout 8000 + :response-format (ajax/json-response-format {:keywords? true}) + :on-success on-success-kvec + :on-failure [:on-failure]}})) + +(rfc/reg-event-fx + :http-post + (fn http-post [db [_ {:keys [uri params on-success-kvec]}]] + {:http-xhrio {:method :post + :uri uri + :params params + :headers {"X-CSRF-Token" js/csrfToken} + :timeout 5000 + :format (ajax/json-request-format) + :response-format (ajax/json-response-format {:keywords? true}) + :on-success on-success-kvec + :on-failure [:on-failure]}})) + +(rfc/reg-event-db + :on-success + (validate-spec ::db/api-result) + (fn on-success [db [_ result]] + (assoc db :api-result result))) + +(rfc/reg-event-db + :on-failure + (validate-spec ::db/api-error-result) + (fn on-failure [db [_ result]] + (assoc db :api-error-result result))) From 96a92c9aacbf6eaa94dfef867eecaeb4111534f1 Mon Sep 17 00:00:00 2001 From: CambodianCoder <35553625+CambodianCoder@users.noreply.github.com> Date: Mon, 15 Feb 2021 19:15:30 -0700 Subject: [PATCH 2/3] cleanup --- test/clj/unit/ZZZZ/db/test_data.clj | 219 ---------------------------- 1 file changed, 219 deletions(-) delete mode 100644 test/clj/unit/ZZZZ/db/test_data.clj diff --git a/test/clj/unit/ZZZZ/db/test_data.clj b/test/clj/unit/ZZZZ/db/test_data.clj deleted file mode 100644 index 161b9d8..0000000 --- a/test/clj/unit/ZZZZ/db/test_data.clj +++ /dev/null @@ -1,219 +0,0 @@ -(ns ZZZZ.db.test-data - "Entry database testing namespace, testing basic functions and providing functions for testing" - (:require [ZZZZ.db.test-util :as tu] - [ZZZZ.handler :refer[app]] - [mount.core])) - -(tu/basic-transaction-fixtures - (mount.core/start #'ZZZZ.handler/app)) - -(def capability-map - {:id 999999, - :name "add test", - :deleted nil, - :info nil, - :created #inst "2019-08-30T18:20:32.360-00:00", - :updated #inst "2019-08-30T18:20:32.360-00:00", - :updated-by 12}) - -(def capability-link-map {:id 999999, :capability-id 999999, :user-id 999999}) - -(def category-map - {:id 999999, - :name "Test core.clj ", - :description "delete me", - :deleted nil, - :info nil, - :created #inst "2019-08-30T18:20:05.570-00:00", - :updated #inst "2019-08-30T18:20:05.570-00:00", - :updated-by 12}) - -(def category-link-map - {:id 999999, :job-id 999999, :category-id 999999}) - -(def client-map - {:deleted nil, - :department-id 999999, - :email "test", - :last-name "test", - :building "test", - :phone "", - :updated #inst "2019-09-03T16:46:19.089-00:00", - :created #inst "2019-09-03T16:46:19.089-00:00", - :first-name "test", - :title "test", - :updated-by nil, - :id 999999, - :info nil, - :room "0000", - :memo ""}) - -(def department-map - {:deleted nil, - :short-name "Test", - :password "", - :updated #inst "2019-09-03T16:46:19.037-00:00", - :name "Test", - :created #inst "2019-09-03T16:46:19.037-00:00", - :login "", - :updated-by nil, - :id 999999, - :info nil}) - -(def device-map - {:access-device nil, - :deleted nil, - :serial-number "", - :make "Dell", - :client-id 999999, - :service-code "", - :updated #inst "2019-09-03T16:46:19.252-00:00", - :purchase-requisition "124320", - :created #inst "2019-09-03T16:46:19.252-00:00", - :updated-by nil, - :id 999999, - :purchase-order "999999", - :info nil, - :surplused #inst "2001-01-01T07:00:00.000-00:00", - :available true, - :purchase-date #inst "2001-05-01T06:00:00.000-00:00", - :icn "999999", - :memo "", - :model "test"}) - -(def email-addresses-map - {:id 999999, - :email-address "scott.griffin1700@byu.edu", - :deleted nil, - :info nil, - :created #inst "2019-09-03T16:47:00.184-00:00", - :updated #inst "2019-09-03T16:47:00.184-00:00", - :updated-by nil}) - -(def email-links-map - {:id 999999, - :client-id 999999, - :created #inst "2019-09-03T16:47:00.300-00:00", - :email-addresses-id 999999, - :updated #inst "2019-09-03T16:47:00.300-00:00", - :updated-by nil, - :deleted nil}) - -(def email-logs - {:deleted nil, - :updated #inst "2019-07-30T15:55:45.000-00:00", - :created #inst "2019-07-30T15:55:45.000-00:00", - :recipients ["scott.griffin@byu.edu" "Scott.griffin@byu.net"], - :updated-by 12, - :sent-date #inst "2019-07-30T15:55:45.000-00:00", - :id 999999, - :sender "scott.griffin1700@gmail.com", - :info nil, - :subject "email testing", - :message "This is the initial test of sending emails."}) - -(def email-templates - {:id 999999, - :subject "Device Due Date Reminder", - :email-content - "(DAY OF WEEK, MONTH, DAY, YEAR)\n\nOFFICE OF DIGITAL HUMANITIES\n\n(Client First-name) (Client Last-name)\n(Client Room Number)\n(Building)\n(Phone Number)\n\n\n\n\nDEVICE DUE DATE REMINDER:\nOffice of Digital Humanites Device Circulation\ncsr-email@byu.edu\n\nPlease return or renew the following items by the listed due date. Renew online\n(https://odh-devices.byu.edu/account/) or at the ODH Device Circulation desk. (801-422-9999)\n\nBe aware some items cannot be renewed.\n\nThank you.\n\nODH Device Circulation\n\n1 due: mm/dd/yyyy,hh:mm am/pm\nMake: ()\nModel: ()\nICN: ()\nBarcode: ()\nSerial-Number: ()\nMemo: ()", - :deleted nil, - :info nil, - :created #inst "2019-09-03T16:47:00.239-00:00", - :updated #inst "2019-09-03T16:47:00.239-00:00", - :updated-by nil}) - -(def history-map - {:deleted nil, - :job-id 999999, - :updated #inst "2019-09-03T16:46:51.438-00:00", - :created #inst "2019-09-03T16:46:51.438-00:00", - :user-id 999999, - :title "hotel", - :id 999999, - :info nil, - :time-stamp #inst "2004-07-26T21:33:44.000-00:00", - :memo "his hotel denies his access"}) - -(def job-map - {:deleted nil, - :exclusive false, - :web-team false, - :client-id 999999, - :device-id 999999, - :updated #inst "2019-09-03T16:46:20.555-00:00", - :created #inst "2019-09-03T16:46:20.555-00:00", - :user-id 999999, - :resolved true, - :title "Extensity", - :updated-by nil, - :priority "normal", - :id 999999, - :info nil, - :kbmember false, - :time-stamp #inst "2004-07-26T21:18:57.000-00:00", - :memo "needs help using mels system for extensity", - :complete-stamp #inst "2004-07-29T18:49:56.000-00:00"}) - -(def memo-map - {:deleted nil, - :from-id 999999, - :unread true, - :updated #inst "2019-09-03T16:46:36.361-00:00", - :created #inst "2019-09-03T16:46:36.361-00:00", - :user-id 999999, - :updated-by 999999, - :priority "Low", - :id 999999, - :info nil, - :reply-to "Devin Asay ", - :time-stamp #inst "2007-05-11T14:46:53.000-00:00", - :subject "College primary web server back online", - :memo - "The primary web server has been returned to service."}) - -(def permission-map - {:id 999999, - :name "Device", - :description "", - :deleted nil, - :info nil, - :created #inst "2019-09-03T16:46:51.274-00:00", - :updated-by 999999, - :updated #inst "2019-09-03T16:46:51.274-00:00"}) - -(def user-map - {:deleted nil, - :email "test@byu.edu", - :last-name "testing", - :retired true, - :phone "000000", - :updated #inst "2019-09-03T16:46:18.480-00:00", - :name "test", - :created #inst "2019-09-03T16:46:18.480-00:00", - :first-name "Tester", - :updated-by nil, - :id 999999, - :info nil, - :access-level "User", - :memo "Tester", - :user-group-id 999999}) - -(def user-groups-map - {:id 999999, - :name "Administrators", - :description "", - :deleted nil, - :info nil, - :created #inst "2019-09-03T16:46:18.439-00:00", - :updated #inst "2019-09-03T16:46:18.439-00:00"}) - -(def work-map - {:id 999999, - :clock-in #inst "2004-06-08T20:00:40.000-00:00", - :clock-out #inst "2004-06-08T22:23:55.000-00:00", - :memo "test driven", - :deleted nil, - :info nil, - :created #inst "2019-09-03T16:46:51.398-00:00", - :updated #inst "2019-09-03T16:46:51.398-00:00"}) From 26dc46a5006cac7bfbb603cf0cb1703bbdfa41c5 Mon Sep 17 00:00:00 2001 From: CambodianCoder <35553625+CambodianCoder@users.noreply.github.com> Date: Mon, 15 Feb 2021 19:15:54 -0700 Subject: [PATCH 3/3] Update core_test.clj --- test/clj/unit/ZZZZ/db/core_test.clj | 1 - 1 file changed, 1 deletion(-) diff --git a/test/clj/unit/ZZZZ/db/core_test.clj b/test/clj/unit/ZZZZ/db/core_test.clj index 5c9b8cf..de5052e 100644 --- a/test/clj/unit/ZZZZ/db/core_test.clj +++ b/test/clj/unit/ZZZZ/db/core_test.clj @@ -4,7 +4,6 @@ [ZZZZ.db.test-util :as tcore] [ZZZZ.handler :refer [app]] [mount.core] - [ZZZZ.db.test-data :as td] [clojure.test :refer [deftest is testing]])) (tcore/basic-transaction-fixtures