This repository has been archived by the owner on Feb 7, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Create a service for Palveluväylä to make the codebase a bit clearer. Separate parsing languages into a function. Clean up the test code a bit. Comment language discrimination in pdf search.
- Loading branch information
1 parent
f4a4a4c
commit 67b55f0
Showing
2 changed files
with
57 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
etp-backend/src/main/clj/solita/etp/service/palveluvayla.clj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
(ns solita.etp.service.palveluvayla | ||
(:require [solita.etp.service.energiatodistus :as service.energiatodistus] | ||
[solita.etp.service.energiatodistus-pdf :as service.energiatodistus-pdf] | ||
[solita.etp.service.energiatodistus-search :as service.energiatodistus-search])) | ||
|
||
(def i-am-paakayttaja {:rooli 2}) | ||
|
||
(defn find-first-existing-pdf | ||
"Return the first language version that exists if any. If language-preference-order is not given, [fi sv] is used." | ||
[id language-preference-order db aws-s3-client] | ||
(some identity (->> (or language-preference-order ["fi" "sv"]) | ||
(map #(service.energiatodistus-pdf/find-energiatodistus-pdf db | ||
aws-s3-client | ||
i-am-paakayttaja | ||
id | ||
%))))) | ||
|
||
(defn search-by-rakennustunnus | ||
"Search for energiatodistus by rakennustunnus as pääkäyttäjä and coerce into schema" | ||
[rakennustunnus schema db & [versio]] | ||
(service.energiatodistus-search/search | ||
db | ||
i-am-paakayttaja | ||
{:where [(-> [["=" "energiatodistus.perustiedot.rakennustunnus" rakennustunnus]] | ||
(into (when versio [["=" "energiatodistus.versio" versio]])))]} | ||
schema)) | ||
|
||
(defn- drop-wrong-version | ||
"Return nil if the energiatodistus is not the given version" | ||
[et version] | ||
(if (= (:versio et) version) | ||
et | ||
nil)) | ||
|
||
(defn get-by-id | ||
"Get energiatodistus by id as pääkäyttäjä. If version is not given, the result is mapped EnertiatoistusForAnyLaatija schema." | ||
([id db] | ||
(service.energiatodistus/find-energiatodistus-any-laatija db id)) | ||
([id db version] | ||
(-> (service.energiatodistus/find-energiatodistus db id) | ||
(#(drop-wrong-version % version))))) |