Skip to content

Commit

Permalink
Merge pull request #113 from keboola/kacurez-fix-warnings-ST-611
Browse files Browse the repository at this point in the history
remove warnings from logs
  • Loading branch information
kacurez committed Apr 27, 2023
2 parents 5f6946f + eb3c75b commit e7af00b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 133 deletions.
2 changes: 1 addition & 1 deletion build.boot
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[semantic-csv "0.2.0"]
[org.clojure/data.csv "1.0.0"]
[org.clojure/data.json "2.4.0"]
[org.clojure/test.check "0.9.0"]
[org.clojure/test.check "1.1.0" :scope "test"]
[org.clojure/core.async "1.5.648"]
[adzerk/boot-test "1.2.0" :scope "test"]
[clj-http-fake "1.0.3"]
Expand Down
43 changes: 6 additions & 37 deletions src/keboola/facebook/api/parser.clj
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
(ns keboola.facebook.api.parser
(:require [clojure.spec.alpha :as s]
[keboola.facebook.api.specs :as ds]
[keboola.docker.runtime :refer [app-error]]
[clj-time.core :as t]
[clojure.data.json :as json]
[clj-time.format :refer [formatter unparse]]
[clojure.string :as string]))
(:require
[keboola.docker.runtime :refer [app-error]]
[clj-time.core :as t]
[clojure.data.json :as json]
[clj-time.format :refer [formatter unparse]]
[clojure.string :as string]))

(defn relative-days-timestamp [days]
(unparse (formatter "YYYY-MM-dd") (t/plus (t/now) (t/days (Integer/parseInt days)))))
Expand All @@ -14,14 +13,6 @@
(string/replace fields-str #"%%days:-?\d+%%"
#(relative-days-timestamp (re-find #"-?\d+" %))))

(s/fdef nested-object?
:args (s/cat :object (s/or :nested (s/keys :req-un [::ds/data])
:simple ::ds/fb-object))
:ret boolean?
:fn (fn [val]
(if (= :simple (-> val :args :object first))
(= false (-> val :ret))
(= true (-> val :ret)))))
(defn nested-object?
"Returns true if objet is map and contains :data keyword"
[object]
Expand All @@ -34,10 +25,6 @@
:parent-id (or (:id row) (:parent-id params))
:fb-graph-node (str (:fb-graph-node params) "_" object-name)}))

(s/fdef get-nested-objects
:args (s/cat :body-data ::ds/data
:params ::ds/keboola)
:ret (s/coll-of map? :into []))
(defn get-nested-objects
"Traverse body-data array and take out nested-object like structures.
Return array of objects with keys :name :data :parent-id :fb-graph-node "
Expand All @@ -58,11 +45,6 @@
memo))
[] body-data))

(s/fdef flatten-value-object
:args (s/cat :key1 string?
:object-value (s/or :scalar ::ds/table-value :object ::ds/simple-object))
:ret (s/* ::ds/key1-key2-value))

(defn flatten-value-object
"flattens object values and prepends and prepend key1"
[key1 object-value]
Expand All @@ -71,11 +53,6 @@
object-value)
:else (list {:key1 key1 :key2 "" :value object-value})))

(s/fdef flatten-array-value
:args (s/cat :item (s/or :scalar ::ds/table-value :object ::ds/complex-object)
:end_time ::ds/end_time)
:ret (s/* (s/merge (s/keys :req-un [::ds/end_time]) ::ds/key1-key2-value)))

(defn flatten-array-value [item end_time]
(map
#(assoc % :end_time end_time)
Expand Down Expand Up @@ -109,19 +86,11 @@
(and (= array-name :media) (empty? array)) '()
:else (app-error (str "unsuported array:" array-name array))))

(s/fdef filter-scalars
:args (s/cat :row (s/map-of keyword? (s/or :scalar ::ds/table-value
:object map?
:seq sequential?)))
:ret (s/map-of keyword? ::ds/table-value))
(defn filter-scalars [row]
(into {} (filter (fn [[k v]]
(and (-> v map? not) (-> v sequential? not)))
row)))

(s/fdef filter-flatten-objects
:args (s/cat :row ::ds/complex-object)
:ret (s/map-of keyword? ::ds/table-value))
(defn filter-flatten-objects
[row]
(let [simple-objects (filter (fn [[k v]] (and (-> v map?) (-> v nested-object? not))) row)]
Expand Down
57 changes: 0 additions & 57 deletions src/keboola/facebook/api/specs.clj

This file was deleted.

38 changes: 0 additions & 38 deletions test/keboola/facebook/api/parser_test.clj

This file was deleted.

0 comments on commit e7af00b

Please sign in to comment.