Remove legacy api

.gitignore

@@ -27,3 +27,5 @@ webapp/.lsp/.cache
 webapp/out
 webapp/.shadow-cljs
 webapp/.lein-repl-history
+.clj-kondo
+.lsp

webapp/src/clj/lipas/backend/handler.clj

@@ -1,25 +1,25 @@
 (ns lipas.backend.handler
-  (:require
-   [clojure.java.io :as io]
-   [clojure.spec.alpha :as s]
-   [lipas.backend.core :as core]
-   [lipas.backend.jwt :as jwt]
-   [lipas.backend.middleware :as mw]
-   [lipas.roles :as roles]
-   [lipas.schema.core]
-   [lipas.utils :as utils]
-   [muuntaja.core :as m]
-   [reitit.coercion.spec]
-   [reitit.ring :as ring]
-   [reitit.ring.coercion :as coercion]
-   [reitit.ring.middleware.exception :as exception]
-   [reitit.ring.middleware.multipart :as multipart]
-   [reitit.ring.middleware.muuntaja :as muuntaja]
-   [reitit.swagger :as swagger]
-   [reitit.swagger-ui :as swagger-ui]
-   [ring.middleware.params :as params]
-   [ring.util.io :as ring-io]
-   [taoensso.timbre :as log]))
+  (:require [clojure.java.io :as io]
+            [clojure.spec.alpha :as s]
+            [lipas.backend.core :as core]
+            [lipas.backend.jwt :as jwt]
+            [lipas.backend.legacy.api :as legacy.api]
+            [lipas.backend.middleware :as mw]
+            [lipas.roles :as roles]
+            [lipas.schema.core]
+            [lipas.utils :as utils]
+            [muuntaja.core :as m]
+            [reitit.coercion.spec]
+            [reitit.ring :as ring]
+            [reitit.ring.coercion :as coercion]
+            [reitit.ring.middleware.exception :as exception]
+            [reitit.ring.middleware.multipart :as multipart]
+            [reitit.ring.middleware.muuntaja :as muuntaja]
+            [reitit.swagger :as swagger]
+            [reitit.swagger-ui :as swagger-ui]
+            [ring.middleware.params :as params]
+            [ring.util.io :as ring-io]
+            [taoensso.timbre :as log]))
 
 (defn exception-handler
   ([status type]
@@ -40,7 +40,6 @@
    :user-not-found     (exception-handler 404 :user-not-found)
    :email-not-found    (exception-handler 404 :email-not-found)
    :reminder-not-found (exception-handler 404 :reminder-not-found)
-
    :qbits.spandex/response-exception (exception-handler 500 :internal-server-error :print-stack)
 
    ;; Return 500 and print stack trace for exceptions that are not
@@ -57,7 +56,6 @@
   [{:keys [db emailer search mailchimp aws]}]
   (ring/ring-handler
    (ring/router
-
     [["/favicon.ico"
       {:get
        {:no-doc true
@@ -774,7 +772,45 @@
          :handler
          (fn [{:keys [body-params identity]}]
            {:status 200
-            :body   (core/save-ptv-integration-definitions db search identity body-params)})}}]]]
+            :body   (core/save-ptv-integration-definitions db search identity body-params)})}}]]
+
+     ;; legacy routes
+     ["/v1/api"
+      ["/swagger.json"
+       {:get
+        {:no-doc  true
+         :swagger {:id ::legacy
+                   :info {:title "Lipas-API (legacy) v1"}}
+         :handler (swagger/create-swagger-handler)}}]
+      ["/sports-place-types"
+       {:swagger {:id ::legacy}
+        :parameters {:query (s/keys :opt-un [:lipas.api/lang])}
+        :get
+        {:handler
+         (fn [req]
+           (let [locale  (or (-> req :parameters :query :lang keyword) :en)]
+             {:status     200
+              :body       (legacy.api/sports-place-types locale)}))}}]
+      ["/sports-place-types/:type-code"
+       {:swagger {:id ::legacy}
+        :parameters {:query (s/keys :opt-un [:lipas.api/lang])
+                     :path {:type-code int?}}
+        :get
+        {:handler
+         (fn [req]
+           (let [locale  (or (-> req :parameters :query :lang keyword) :en)
+                 type-code (-> req :parameters :path :type-code)]
+             {:status     200
+              :body       (legacy.api/sports-place-by-type-code locale type-code)}))}}]
+      ["/categories"
+       {:swagger {:id ::legacy}
+        :parameters {:query (s/keys :opt-un [:lipas.api/lang])}
+        :get
+        {:handler
+         (fn [req]
+           (let [locale  (or (-> req :parameters :query :lang keyword) :en)]
+             {:status     200
+              :body       (legacy.api/categories locale)}))}}]]]
 
     {:data
      {:coercion   reitit.coercion.spec/coercion
@@ -800,4 +836,5 @@
                    mw/privilege-middleware]}})
    (ring/routes
     (swagger-ui/create-swagger-ui-handler {:path "/api/swagger-ui" :url "/api/swagger.json"})
+    (swagger-ui/create-swagger-ui-handler {:path "/v1/api/swagger-ui" :url "/v1/api/swagger.json"})
     (ring/create-default-handler))))

webapp/src/clj/lipas/backend/legacy/api.clj

@@ -0,0 +1,68 @@
+(ns lipas.backend.legacy.api
+  (:require
+   [lipas.data.prop-types :as prop-types]
+   [lipas.data.types :as types]
+   [lipas.utils :as utils]))
+
+(def keys-vec [:type-code :name :description :geometry-type :sub-category])
+
+(defn fill-properties [m]
+  (reduce (fn [acc k] (assoc-in acc [:props k] (prop-types/all k)))
+          m
+          (-> m :props keys)))
+
+
+(defn localize-properties [m locale]
+  (reduce (fn [acc k]
+            (-> acc
+                (update-in [:props k :description] locale)
+                (update-in [:props k :name] locale))) m (-> m :props keys)))
+
+(defn- localize [m lang]
+  (-> m
+      (update :name lang)
+      (update :description lang)))
+
+
+(defn- ->legacy-api-with-properties [m lang]
+  (-> m
+      (fill-properties)
+      (select-keys (conj keys-vec :props))
+      (update :props #(-> % (dissoc :schoolUse? :freeUse?)))
+      (localize-properties lang)
+      (localize lang)
+      utils/->camel-case-keywords))
+
+(defn- ->legacy-api [m lang]
+  (-> m
+      (select-keys keys-vec)
+      (localize lang)
+      utils/->camel-case-keywords))
+
+(defn sports-place-types [locale]
+  (->>  (vals types/all)
+        (map #(->legacy-api % locale))))
+
+(defn sports-place-by-type-code [locale type-code]
+  (-> (types/all type-code)
+      (->legacy-api-with-properties locale)))
+
+(defn collect-sport-place-types [sub-category-type-code] 
+  (->> (vals types/all)
+       (filter #(= (% :sub-category) sub-category-type-code))
+       (map :type-code)))
+
+(defn- collect-subcategories [type-code locale] 
+  (->>
+   (vals types/sub-categories)
+   (filter #(= (% :main-category) (str type-code)))
+   (map (fn [x] 
+          {:typeCode (x :type-code)
+           :name (-> x :name locale)
+           :sportsPlaceTypes (collect-sport-place-types (x :type-code))}))))
+
+(defn categories [locale]
+  (mapv (fn [cat] {:name (-> cat :name locale)
+                   :typeCode (cat :type-code)
+                   :subCategories (collect-subcategories (cat :type-code) locale)}) 
+        (vals types/main-categories)))

webapp/src/cljc/lipas/schema/core_legacy.cljc

@@ -0,0 +1,16 @@
+(ns lipas.schema.core-legacy
+  (:require [clojure.spec.alpha :as s]
+            [lipas.schema.core]))
+
+(s/def :lipas-legacy.api.parameter/lang :lipas.api/lang)
+
+(s/def :lipas-legacy.api.response/sports-place-types
+  (s/keys :req-un [:lipas-legacy.sports-site/typeCode
+                :lipas.sports-site/name
+                :lipas.sports-site/description
+                :lipas-legacy.sports-site/geometryType
+                :lipas-legacy.sports-site/subCategory]))
+
+(s/def :lipas-legacy.sports-site/geometryType #{"Point"  "LineString"})
+(s/def :lipas-legacy.sports-site/typeCode (s/int-in 1 5000))
+(s/def :lipas-legacy.sports-site/subCategory (s/int-in 1 5000))