Merge pull request #1670 from Opetushallitus/OK-745-kk-payment-translations-and-fixes

OK-745 kk payment translations and fixes

Author: vaeinoe

resources/less/virkailija-application.less

@@ -1006,6 +1006,8 @@ i.arkistoitu {
 .application-handling__review-header--eligibility-state,
 .application-handling__review-header--payment-obligation {
   .light;
+  max-width: 145px;
+  word-wrap: break-word;
 }
 
 .application-handling__review-header--points {

spec/ataru/virkailija/virkailija_routes_spec.clj

@@ -751,7 +751,7 @@
           (after-all
             (db/nuke-kk-payment-data))
 
-          (it "should return payment information and history for an application"
+          (it "should return payment information for an application"
               (let [application-id (db/init-db-fixture fixtures/payment-exemption-test-form
                                                        application-fixtures/application-without-hakemusmaksu-exemption
                                                        nil)
@@ -763,14 +763,12 @@
                     status (:status resp)
                     body (:body resp)
                     payment-data (:kk-payment body)
-                    state (get-in payment-data [:payment :state])
-                    history (sort-by :modified-at (:history payment-data))]
+                    form-payment (get-in body [:form :properties :payment])
+                    state (get-in payment-data [:payment :state])]
                 (should= 200 status)
                 (should-not-be-nil payment-data)
-                (should= (:paid payment/all-states) state)
-                (should= 2 (count history))
-                (should= [(:not-required payment/all-states) (:awaiting payment/all-states)]
-                         (map :state history)))))
+                (should= {:type "payment-type-kk", :processing-fee "100.00", :decision-fee nil} form-payment)
+                (should= (:paid payment/all-states) state))))
 
 (defn- init-and-get-kk-fixtures []
   (let [person-oid "1.2.3.4.5.303"

src/clj/ataru/applications/application_service.clj

@@ -6,6 +6,7 @@
     [ataru.applications.excel-export :as excel]
     [ataru.config.core :refer [config]]
     [ataru.email.application-email-jobs :as email]
+    [ataru.forms.form-payment-info :as payment-info]
     [ataru.forms.form-store :as form-store]
     [ataru.hakija.hakija-form-service :as hakija-form-service]
     [ataru.information-request.information-request-store :as information-request-store]
@@ -78,9 +79,10 @@
    (application-store/get-application-attachment-reviews application-key)))
 
 (defn- populate-form-fields
-  [form koodisto-cache tarjonta-info]
+  [form koodisto-cache tarjonta-info tarjonta-service]
   (-> (koodisto/populate-form-koodisto-fields koodisto-cache form)
       (populate-hakukohde-answer-options tarjonta-info)
+      (payment-info/populate-form-with-payment-info tarjonta-service (:tarjonta tarjonta-info))
       (hakija-form-service/populate-can-submit-multiple-applications tarjonta-info)))
 
 (defn fields-equal? [[new-in-left new-in-right]]
@@ -492,18 +494,20 @@
             newest-form           (form-store/fetch-by-key (:key form-in-application))
             form                  (populate-form-fields (if with-newest-form?
                                                           newest-form
-                                                          form-in-application) koodisto-cache tarjonta-info)
+                                                          form-in-application)
+                                                        koodisto-cache tarjonta-info tarjonta-service)
             forms-differ?         (and (not with-newest-form?)
                                        (forms-differ? application tarjonta-info form
-                                                      (populate-form-fields newest-form koodisto-cache tarjonta-info)))
+                                                      (populate-form-fields newest-form
+                                                                            koodisto-cache tarjonta-info tarjonta-service)))
             alternative-form      (some-> (when forms-differ?
                                             newest-form)
                                           (assoc :content [])
                                           (dissoc :organization-oid))
             hakukohde-reviews     (future (parse-application-hakukohde-reviews application-key))
             attachment-reviews    (future (parse-application-attachment-reviews application-key))
             events                (future (get-application-events organization-service application-key))
-            kk-payment-state      (future (kk-application-payment/get-kk-payment-state application true))
+            kk-payment-state      (future (kk-application-payment/get-kk-payment-state application false))
             review                (future (application-store/get-application-review application-key))
             review-notes          (future (map (partial enrich-virkailija-organizations organization-service)
                                                (application-store/get-application-review-notes application-key)))

src/clj/ataru/hakija/hakija_application_service.clj

@@ -717,7 +717,7 @@
                                      (application-store/application-exists-with-secret? secret))
         application-in-processing? (util/application-in-processing? (:application-hakukohde-reviews application))
         inactivated?               (is-inactivated? application)
-        kk-payment                 (future (kk-application-payment/get-kk-payment-state application true))
+        kk-payment                 (future (kk-application-payment/get-kk-payment-state application false))
         lang-override              (when (or secret-expired? inactivated?) (application-store/get-application-language-by-secret secret))
         field-deadlines            (or (some->> application
                                                 :key

src/clj/ataru/kk_application_payment/kk_application_payment.clj

@@ -305,20 +305,27 @@
 (defn- set-payment
   [new-state state-change-fn {:keys [application payment]}]
   (let [current-state   (:state payment)
-        application-key (:key application)]
+        application-key (:key application)
+        person-oid      (:person-oid application)]
     (cond
       (= current-state new-state)
-      (log/info "Application" application-key "already has kk payment status" current-state ", not changing state")
+      (log/info "Application" application-key "with person-oid" person-oid "already has kk payment status" current-state
+                ", not changing kk application payment state")
 
       (= current-state (:paid all-states))
-      (log/info "Application" application-key "already has kk payment paid, not changing state")
+      (log/info "Application" application-key "with person-oid" person-oid
+                "already has payment paid, not changing kk application payment state")
 
       ; N.B. even if you pay an another application, if a previous application is overdue, the state must not change.
       (= current-state (:overdue all-states))
-      (log/info "Application" application-key "is already overdue, not changing state")
+      (log/info "Application" application-key "with person-oid" person-oid
+                "is already overdue, not changing kk application payment state")
 
       :else
-      (state-change-fn (:key application) payment))))
+      (do
+       (log/info "Changing kk application payment state for application" application-key
+                 "with person-oid" person-oid "to" new-state)
+       (state-change-fn (:key application) payment)))))
 
 (defn- update-payments-for-applications
   [applications-payments is-finnish-citizen? has-exemption? has-existing-payment?]
@@ -347,22 +354,31 @@
                           (application-store/get-latest-applications-for-kk-payment-processing aliases valid-haku-oids))]
     (when (get-in config [:kk-application-payments :enabled?])
       (if (= 0 (count applications))
-        []
-        (let [payment-by-application (into {}
-                                           (map (fn [payment] [(:application-key payment) payment]))
-                                           (get-raw-payments (map :key applications)))
-              applications-payments  (map (fn [application]
-                                            {:application application
-                                             :payment     (get payment-by-application (:key application))})
-                                          applications)
-              payment-state-set      (->> (vals payment-by-application) (map :state) set)
-              is-finnish-citizen?    (is-finnish-citizen? person)
-              has-exemption?         (some true? (map exemption-in-application? applications))
-              has-existing-payment?  (contains? payment-state-set (:paid all-states))]
-          {:person            person
-           :existing-payments applications-payments
-           :modified-payments (update-payments-for-applications
-                                applications-payments is-finnish-citizen? has-exemption? has-existing-payment?)})))))
+        (do
+          (log/info "Not updating kk payment status for person" person-oid "term" term "year" year
+                    "with all person aliases" aliases "because no matching applications were found.")
+          {})
+        (do
+          (log/info "Updating kk payment status for person" person-oid "term" term "year" year
+                    "with all person aliases" aliases "and application keys" (map :key applications))
+          (let [payment-by-application (into {}
+                                             (map (fn [payment] [(:application-key payment) payment]))
+                                             (get-raw-payments (map :key applications)))
+                applications-payments  (map (fn [application]
+                                              {:application application
+                                               :payment     (get payment-by-application (:key application))})
+                                            applications)
+                payment-state-set      (->> (vals payment-by-application) (map :state) set)
+                is-finnish-citizen?    (is-finnish-citizen? person)
+                has-exemption?         (some true? (map exemption-in-application? applications))
+                has-existing-payment?  (contains? payment-state-set (:paid all-states))]
+            (log/info "Updating application level kk application payment status for person" person-oid "term" term "year" year
+                      "is-finnish-citizen?" (boolean is-finnish-citizen?) "has-exemption?" (boolean has-exemption?)
+                      "has-existing-payment?" (boolean has-existing-payment?))
+            {:person            person
+             :existing-payments applications-payments
+             :modified-payments (update-payments-for-applications
+                                  applications-payments is-finnish-citizen? has-exemption? has-existing-payment?)}))))))
 
 (defn get-kk-payment-state
   "Returns higher education application fee related info to single application.

src/clj/ataru/kk_application_payment/kk_application_payment_maksut_poller_job.clj

@@ -20,7 +20,7 @@
                                payments))
         ; TODO: the amount of open payments may be quite large at a given moment, should we partition the API queries here?
         maksut    (maksut-protocol/list-lasku-statuses maksut-service (keys keys-states))]
-    (log/debug "Received statuses for" (count maksut) "kk payment invoices")
+    (log/info "Received statuses for" (count maksut) "kk payment invoices")
     (let [terminal (filter #(some #{(:status %)} '(:paid :overdue)) maksut)
           raw      (map (fn [{:keys [reference status origin]}]
                           (when-let [key-match (get keys-states reference)]
@@ -30,7 +30,7 @@
                              :origin origin}))
                         terminal)
           items    (filter some? raw)]
-      (log/debug "Out of which in terminal-state are" (count terminal) "invoices")
+      (log/info "Out of which in terminal-state are" (count terminal) "invoices")
       (log/debug (pr-str "Invoices" items))
       (doseq [item items]
         (let [{:keys [origin ataru-status maksut-status ataru-data]} item
@@ -61,9 +61,9 @@
       ; TODO: we should probably also handle awaiting payments without maksut information (in case something has gone wrong)
       (if-let [payments (seq (store/get-awaiting-kk-application-payments))]
         (do
-          (log/debug "Found " (count payments) " open kk application payments, checking maksut status")
+          (log/info "Found " (count payments) " open kk application payments, checking maksut status")
           (poll-payments job-runner maksut-service payments))
-        (log/debug "No kk application payments in need of maksut polling found"))
+        (log/info "No kk application payments in need of maksut polling found"))
       (catch Exception e
         (log/error e "Maksut polling failed")))))
 

src/clj/ataru/kk_application_payment/kk_application_payment_status_updater_job.clj

@@ -97,6 +97,7 @@
 (defn- send-reminder-email-and-mark-sent
   [job-runner payment-data application]
   (let [application-key (:application-key payment-data)]
+    (log/info "Scheduling kk application payment reminder e-mail for application" application-key)
     (start-payment-email-job job-runner application (:maksut-secret payment-data) payment-reminder-email-params "reminder")
     (payment/mark-reminder-sent application-key)))
 
@@ -144,7 +145,10 @@
               (payment/update-payments-for-person-term-and-year person-service tarjonta-service
                                                                 koodisto-cache get-haut-cache
                                                                 person-oid application-term application-year)]
-          (log/info "Update kk payment status hander for" person-oid application-term application-year)
+          (log/info "Update kk application payment status handler for"
+                    person-oid application-term application-year
+                    "returned" (count existing-payments) "created or modified payments and"
+                    (count modified-payments) "existing payments before creating / modifying.")
           (doseq [payment modified-payments]
             (let [new-state (:state payment)]
               (cond
@@ -157,8 +161,11 @@
                 (needs-reminder-sent? payment)
                 (send-reminder-email-and-mark-sent job-runner payment application))))
 
-          (invalidate-maksut-payments-if-needed maksut-service modified-payments))
-        (log/debug "Application id" application_id "not in haku with kk application payments")))))
+          (invalidate-maksut-payments-if-needed maksut-service modified-payments)
+          (log/info "Update kk payment status handler for" person-oid application-term application-year "finished."))
+        (log/warn "Update kk payment status handler not run for params"
+                  person_oid term year application_id application_key
+                  "because no valid payment info was found.")))))
 
 (defn start-update-kk-payment-status-for-person-job
   [job-runner person-oid term year]
@@ -204,8 +211,8 @@
   (let [haku-oid (:oid haku)
         term (:alkamiskausi haku)
         year (:alkamisvuosi haku)
-        person-oids (application-store/get-application-person-oids-for-haku haku-oid)]
-    (log/info "Found" (count person-oids) "oids for haku" haku-oid "- updating kk application payment statuses.")
+        person-oids (distinct (application-store/get-application-person-oids-for-haku haku-oid))]
+    (log/info "Found" (count person-oids) "distinct oids for haku" haku-oid "- updating kk application payment statuses.")
     (doseq [person-oid person-oids]
       (start-update-kk-payment-status-for-person-job job-runner person-oid term year))))
 

src/cljc/ataru/application/review_states.cljc

@@ -164,8 +164,8 @@
    ["awaiting" (:awaiting state-translations)]
    ["ok-by-proxy" (:ok-by-proxy state-translations)]
    ["paid" (:paid state-translations)]
-   ["overdue" (:overdue state-translations)]
-   ["not-checked" (:not-checked state-translations)]])
+   ["overdue" (:kk-payment-overdue state-translations)]
+   ["not-checked" (:kk-payment-not-checked state-translations)]])
 
 (def hakukohde-review-types
   [[:processing-state (:processing-state state-translations) application-hakukohde-processing-states]

src/cljc/ataru/schema/form_schema.cljc

@@ -523,7 +523,7 @@
 
 (s/defschema KkPaymentState
   {(s/optional-key :payment) PaymentStatus
-   (s/optional-key :history) [PaymentStatus]})
+   (s/optional-key :history) (s/maybe [PaymentStatus])})
 
 (s/defschema ApplicationWithPerson
   (-> Application