Skip to content

Commit 5085ab5

Browse files
committed
fix minor issues
1 parent 5b395b4 commit 5085ab5

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
(ns wheel.marketplace.channel
22
(:require [clojure.spec.alpha :as s]))
33

4+
(s/def ::id pos-int?)
45
(s/def ::name #{:tata-cliq :amazon :flipkart})

clojure/wheel/src/wheel/middleware/event.clj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,23 @@
77
(s/def ::parent-id ::id)
88
(s/def ::name qualified-keyword?)
99
(s/def ::level #{:info :warn :debug :error :fatal})
10-
(s/def ::type #{:domain :system})
1110
(s/def ::timestamp ::offset-date-time/ist-timestamp)
11+
(s/def ::type #{:domain :system})
1212

13-
(s/def ::channel-id integer?)
13+
(s/def ::channel-id ::channel/id)
1414
(s/def ::channel-name ::channel/name)
1515

1616
(defmulti event-type :type)
1717
(defmethod event-type :system [_]
1818
(s/keys :req-un [::id ::name ::type ::level ::timestamp]
1919
:opt-un [::parent-id]))
2020
(defmethod event-type :domain [_]
21-
(s/keys :req-un [::id ::name ::type ::level ::timestamp ::channel-id ::channel-name]
21+
(s/keys :req-un [::id ::name ::type ::level ::timestamp
22+
::channel-id ::channel-name]
2223
:opt-un [::parent-id]))
2324
(defmethod event-type :default [_]
2425
(s/keys :req-un [::type]))
26+
2527
(s/def ::event (s/multi-spec event-type :type))
2628

2729
(comment

clojure/wheel/src/wheel/offset_date_time.clj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
"+05:30")
1717
false))
1818

19-
(ist? "2007-04-05T12:30-02:00")
20-
2119
(s/def ::iso-8061-format (s/and string? iso-8061-format?))
2220
(s/def ::ist-timestamp (s/and ::iso-8061-format ist?))
21+
22+
(comment
23+
(s/valid? ::ist-timestamp "2007-04-05T12:30-02:00")
24+
(s/valid? ::ist-timestamp "2019-10-01T06:56+05:30"))

0 commit comments

Comments
 (0)