Delete PTV ServiceLocation from PTV site tab

lipas-liikuntapaikat · Dec 2, 2024 · 3da3c96 · 3da3c96
1 parent af6bcf0
commit 3da3c96
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 15 deletions.
diff --git a/webapp/src/clj/lipas/backend/core.clj b/webapp/src/clj/lipas/backend/core.clj
@@ -532,7 +532,8 @@
        ;; Note: if site status or something is updated in Lipas, so that the site is no longer candidate,
        ;; that doesn't trigger update if sync-enabled is false.
        (if (and (not draft?)
-                (:sync-enabled (:ptv resp))
+                (or (:sync-enabled (:ptv resp))
+                    (:delete-existing (:ptv resp)))
                 ;; TODO: Check privilage :ptv/basic or such
                 (or (ptv-data/ptv-candidate? resp)
                     (ptv-data/is-sent-to-ptv? resp)))

diff --git a/webapp/src/clj/lipas/backend/ptv/core.clj b/webapp/src/clj/lipas/backend/ptv/core.clj
@@ -139,7 +139,8 @@
                                 :service-channel-ids [(:id ptv-resp)])
                          (cond->
                            archive? (dissoc :source-id
-                                            :service-channel-ids)))]
+                                            :service-channel-ids
+                                            :delete-existing)))]
 
     (log/infof "Upserted (Lipas status: %s, updated: %s) service-location %s: %s" (:status site) (boolean id) data new-ptv-data)
 
@@ -205,7 +206,8 @@
           ;; a candidate, mark for it archival.
           ;; The other function will mark the document Deleted when archive flag is true
           to-archive? (and previous-sent?
-                           (not candidate-now?))
+                           (or (not candidate-now?)
+                               (:delete-existing ptv)))
 
           type-code-changed? (not= type-code (:previous-type-code ptv))
           ptv  (if type-code-changed?

diff --git a/webapp/src/clj/lipas/backend/ptv/handler.clj b/webapp/src/clj/lipas/backend/ptv/handler.clj
@@ -18,6 +18,7 @@
    {:closed true}
    [:org-id :string]
    [:sync-enabled :boolean]
+   [:delete-existing {:optional true} :boolean]
 
    ;; These options aren't used now:
    ;; TODO: Remove

diff --git a/webapp/src/cljc/lipas/schema/core.cljc b/webapp/src/cljc/lipas/schema/core.cljc
@@ -1480,6 +1480,7 @@
 (s/def :lipas.sports-site.ptv/last-sync string?)
 (s/def :lipas.sports-site.ptv/org-id string?)
 (s/def :lipas.sports-site.ptv/sync-enabled boolean?)
+(s/def :lipas.sports-site.ptv/delete-existing boolean?)
 (s/def :lipas.sports-site.ptv/source-id string?)
 (s/def :lipas.sports-site.ptv/publishing-status string?)
 (s/def :lipas.sports-site.ptv/previous-type-code int?)
@@ -1527,6 +1528,8 @@
                    :lipas.sports-site.ptv/service-ids
                    :lipas.sports-site.ptv/languages
 
+                   :lipas.sports-site.ptv/delete-existing
+
                    ;; Added on sync - removed when archived
                    :lipas.sports-site.ptv/source-id
                    :lipas.sports-site.ptv/service-channel-ids

diff --git a/webapp/src/cljs/lipas/ui/ptv/site_view.cljs b/webapp/src/cljs/lipas/ui/ptv/site_view.cljs
@@ -126,7 +126,7 @@
 
         ;; _ (js/console.log edit-data sports-site)
 
-        {:keys [org-id sync-enabled last-sync publishing-status]} (:ptv site)
+        {:keys [org-id sync-enabled delete-existing last-sync publishing-status]} (:ptv site)
         org-languages (ptv-data/org-id->languages org-id)
 
         ;; _ (js/console.log org-id)
@@ -233,12 +233,14 @@
             (and previous-sent? candidate-now? ready?)
             (if sync-enabled
               ($ Alert {:severity "success"} "PTV-integraatio on käytössä")
-              ($ Alert {:severity "success"} "PTV-integraatio on käytössä, mutta liikuntapaikan synkronointi PTV:hen on kytketty pois päältä."))
+              (if delete-existing
+                 ($ Alert {:severity "success"} "Liikuntapaikka poistetaan PTV:stä tallennuksen yhteydessä")
+                 ($ Alert {:severity "success"} "PTV-integraatio on käytössä, mutta liikuntapaikan synkronointi PTV:hen on kytketty pois päältä.")))
 
             (and previous-sent? (not candidate-now?))
             ($ Alert {:severity "warning"} "Liikuntapaikka on viety aiemmin PTV:hen, mutta tietoja on muutettu siten, että tietoja ei enää viedä. PTV-palvelupaikka tullaan arkistoimaan tallennuksen yhteydessä.")
 
-            (and candidate-now? ready?)
+            (and candidate-now? ready? sync-enabled)
             ($ Alert {:severity "info"} "Liikuntapaikkaa ei ole aiemmin viety PTV:hen. Uusi palvelupaikka tullaan luomaan tallennuksen yhteydessä.")
 
             (and candidate-now? (not ready?))
@@ -274,14 +276,24 @@
              :org-id org-id
              :service (first missing-services)}))
 
-       ($ FormControlLabel
-          {:label "Synkronoi PTV:hen"
-           :control ($ Switch
-                       {:disabled read-only?
-                        :checked sync-enabled
-                        :on-change (fn [_e v]
-                                     (js/console.log _e v)
-                                     (rf/dispatch [:lipas.ui.sports-sites.events/edit-field lipas-id [:ptv :sync-enabled] v]))})})
+       ($ Stack
+          {:direction "row"}
+          ($ FormControlLabel
+             {:label "Synkronoi PTV:hen"
+              :control ($ Switch
+                          {:disabled read-only?
+                           :checked sync-enabled
+                           :on-change (fn [_e v]
+                                         (rf/dispatch [:lipas.ui.sports-sites.events/edit-field lipas-id [:ptv :sync-enabled] v]))})})
+          (when (and (not sync-enabled)
+                     previous-sent?)
+             ($ FormControlLabel
+                {:label "Poista jo luotu paikka PTV:stä"
+                 :control ($ Switch
+                             {:disabled read-only?
+                              :checked (or delete-existing false)
+                              :on-change (fn [_e v]
+                                            (rf/dispatch [:lipas.ui.sports-sites.events/edit-field lipas-id [:ptv :delete-existing] v]))})})))
 
        ($ Stack
           {:sx #js {:position "relative"}}

diff --git a/webapp/src/cljs/lipas/ui/sports_sites/events.cljs b/webapp/src/cljs/lipas/ui/sports_sites/events.cljs
@@ -34,7 +34,11 @@
                        (let [org-langs (ptv-data/org-id->languages (:org-id v))]
                          (merge (:default-settings (:ptv db))
                                 {:languages org-langs}
-                                v)))))))
+                                v))))
+
+        (and (:sync-enabled (:ptv sports-site))
+             (:delete-existing (:ptv sports-site)))
+        (update :ptv dissoc :delete-existing))))
 
 (rf/reg-event-db ::calc-derived-fields
   (fn [db [_ lipas-id sports-site]]