-
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.
feat: Aloituskuulutuksen lataaminen kansalaisen käyttöliittymästä (#135)
- Loading branch information
1 parent
1b155c2
commit d8bb4e3
Showing
46 changed files
with
1,240 additions
and
156 deletions.
There are no files selected for viewing
66 changes: 66 additions & 0 deletions
66
backend/integrationtest/api/__snapshots__/api.test.ts.snap
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,66 @@ | ||
// Jest Snapshot v1, https://goo.gl/fbAQLP | ||
|
||
exports[`Api should search, load and save a project 1`] = ` | ||
Object { | ||
"__typename": "ProjektiJulkinen", | ||
"aloitusKuulutusJulkaisut": Array [ | ||
Object { | ||
"__typename": "AloitusKuulutusJulkaisuJulkinen", | ||
"aloituskuulutusPDFt": Object { | ||
"SUOMI": Object { | ||
"aloituskuulutusIlmoitusPDFPath": "/tiedostot/suunnitelma/1.2.246.578.5.1.2978288874.2711575506/aloituskuulutus/ILMOITUS TOIMIVALTAISEN VIRANOMAISEN KUULUTUKSESTA HASSU AUTOMAATTITESTIPROJEKTI1.pdf", | ||
"aloituskuulutusPDFPath": "/tiedostot/suunnitelma/1.2.246.578.5.1.2978288874.2711575506/aloituskuulutus/KUULUTUS SUUNNITTELUN ALOITTAMISESTA HASSU AUTOMAATTITESTIPROJEKTI1.pdf", | ||
}, | ||
"__typename": "AloitusKuulutusPDFt", | ||
}, | ||
"elyKeskus": "Pirkanmaa", | ||
"hankkeenKuvaus": Object { | ||
"RUOTSI": "På Svenska", | ||
"SAAME": "Saameksi", | ||
"SUOMI": "Lorem Ipsum", | ||
"__typename": "HankkeenKuvaukset", | ||
}, | ||
"kielitiedot": Object { | ||
"__typename": "Kielitiedot", | ||
"ensisijainenKieli": "SUOMI", | ||
}, | ||
"kuulutusPaiva": "2022-01-02", | ||
"siirtyySuunnitteluVaiheeseen": "2022-01-01", | ||
"suunnitteluSopimus": undefined, | ||
"velho": Object { | ||
"__typename": "Velho", | ||
"kunnat": Array [ | ||
"Helsinki", | ||
" Vantaa", | ||
], | ||
"nimi": "HASSU AUTOMAATTITESTIPROJEKTI1", | ||
"tilaajaOrganisaatio": "Väylävirasto", | ||
"tyyppi": "TIE", | ||
"vaylamuoto": Array [ | ||
"tie", | ||
], | ||
}, | ||
"yhteystiedot": Array [ | ||
Object { | ||
"__typename": "Yhteystieto", | ||
"etunimi": "A-tunnus1", | ||
"organisaatio": "CGI Suomi Oy", | ||
"puhelinnumero": "123", | ||
"sahkoposti": "mikko.haapamki@cgi.com", | ||
"sukunimi": "Hassu", | ||
}, | ||
Object { | ||
"__typename": "Yhteystieto", | ||
"etunimi": "Marko", | ||
"organisaatio": "Kajaani", | ||
"puhelinnumero": "0293121213", | ||
"sahkoposti": "markku.koi@koi.com", | ||
"sukunimi": "Koi", | ||
}, | ||
], | ||
}, | ||
], | ||
"euRahoitus": false, | ||
"oid": "1.2.246.578.5.1.2978288874.2711575506", | ||
} | ||
`; |
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
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
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
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
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
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 |
---|---|---|
@@ -1,18 +1,32 @@ | ||
import { LaskePaattymisPaivaQueryVariables } from "../../../common/graphql/apiModel"; | ||
import { dateToString, parseDate } from "../util/dateUtil"; | ||
import { dateTimeToString, dateToString, ISO_DATE_FORMAT, parseDate } from "../util/dateUtil"; | ||
import { Dayjs } from "dayjs"; | ||
import { bankHolidaysClient } from "./bankHolidaysClient"; | ||
import { config } from "../config"; | ||
|
||
export async function calculateEndDate({ alkupaiva }: LaskePaattymisPaivaQueryVariables) { | ||
const start = parseDate(alkupaiva); | ||
if (start.isValid()) { | ||
let endDate: Dayjs = start.add(1 + 30, "day"); | ||
const bankHolidays = await bankHolidaysClient.getBankHolidays(); | ||
while (bankHolidays.isBankHoliday(endDate)) { | ||
endDate = endDate.add(1, "day"); | ||
let start: Dayjs; | ||
// Only accept dates in prod, but allow datetimes in other environments | ||
const isDateOnly = config.isProd() || alkupaiva.length == ISO_DATE_FORMAT.length; | ||
if (isDateOnly) { | ||
start = parseDate(alkupaiva); | ||
if (!start.isValid()) { | ||
new Error("Alkupäivän pitää olla muotoa YYYY-MM-DD tai YYYY-MM-DDTHH:mm"); | ||
} | ||
} else { | ||
start = parseDate(alkupaiva); | ||
if (!start.isValid()) { | ||
new Error("Alkupäivän pitää olla muotoa YYYY-MM-DDTHH:mm"); | ||
} | ||
} | ||
let endDate: Dayjs = start.add(1 + 30, "day"); | ||
const bankHolidays = await bankHolidaysClient.getBankHolidays(); | ||
while (bankHolidays.isBankHoliday(endDate)) { | ||
endDate = endDate.add(1, "day"); | ||
} | ||
if (isDateOnly) { | ||
return dateToString(endDate); | ||
} else { | ||
throw new Error("Alkupäivän pitää olla muotoa YYYY-MM-DD"); | ||
return dateTimeToString(endDate); | ||
} | ||
} |
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
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
Oops, something went wrong.