Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Kalenteri: Tieto jos muokattu lapsen tulo/lähtöaikaa henkilökunnan toimesta #6122

Merged
merged 10 commits into from
Jan 7, 2025
Merged

Kalenteri: Tieto jos muokattu lapsen tulo/lähtöaikaa henkilökunnan toimesta #6122

merged 10 commits into from
Jan 7, 2025

Conversation

kechpaja-at-gofore
Copy link
Collaborator

@kechpaja-at-gofore kechpaja-at-gofore commented Dec 13, 2024 •
edited
Loading

2024-12-19-125457_259x226_scrot
2024-12-19-125514_423x274_scrot
2024-12-19-125528_391x322_scrot

@kechpaja-at-gofore kechpaja-at-gofore force-pushed the attendance-reservation-metadata branch 3 times, most recently from 4e157d4 to ccf84d4 Compare December 19, 2024 07:38
@kechpaja-at-gofore kechpaja-at-gofore changed the title Attendance reservation metadata Kalenteri: Tieto jos muokattu lapsen tulo/lähtöaikaa henkilökunnan toimesta Dec 19, 2024
@kechpaja-at-gofore kechpaja-at-gofore force-pushed the attendance-reservation-metadata branch from d4a9e79 to 5da36be Compare December 19, 2024 12:08
@kechpaja-at-gofore kechpaja-at-gofore marked this pull request as ready for review December 19, 2024 12:08
@kechpaja-at-gofore kechpaja-at-gofore requested review from akheron, Joosakur, Gekkio, reynders and Wnt and removed request for akheron and Joosakur December 19, 2024 12:08
@kechpaja-at-gofore kechpaja-at-gofore added the enhancement Uusi toiminnallisuus tai parannus label Dec 19, 2024
Wnt
Wnt reviewed Dec 20, 2024
View reviewed changes
service/src/main/kotlin/fi/espoo/evaka/reservations/AttendanceReservationController.kt
@@ -957,22 +963,31 @@ private data class ReservationTimesForDate(
val date: LocalDate,
val startTime: LocalTime?,
val endTime: LocalTime?,
val createdAt: HelsinkiDateTime,
val createdBy: EvakaUser, // TODO should these be modified_by instead?
val staffCreated: Boolean,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tämä erillinen staffCreated flagin tulisi poistaa varauksien ja poissaolomerkintöjen API palautuksista nyt kun front-endiin asti tulee tieto EvakaUserista. Sitten tämän aikaisemmin SQL:ässä tehdyn vertailun 'staffCreated', eu.type <> 'CITIZEN' voisi tehdä frontissa:
staffModified -> modifiedBy.type != 'CITIZEN'

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tai sitten jos halutaan, että pystytään erottamaan kuntalaisen luoma, mutta henkilökunnan muokkaama merkintä sellaisesta merkinnästä joka on henkilökunnan luoma, niin nuo createdBy ja createdAt voisi muuttaa modified*

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm.

Voisin kyllä muuttaa createdAt ja createdBy modified-kentiksi.

Tuon staffCreated-muutoksen suhteen pitää kuitenkin ehkä miettiä, onko se oikeasti muuttamisen arvoista, erityisesti tämän vetopyynnön osana. Olen samaa mieltä, että sen olisi voinut tehdä eri tavalla alun perin, mutta on myös se argumentti, että nyt kun se on noin, pitää olla konservatiivinen sen suhteen, tai ainakin erottaa muutoksia tosi huolellisesti.

@kechpaja-at-gofore kechpaja-at-gofore force-pushed the attendance-reservation-metadata branch from 1bd8055 to d70433a Compare January 7, 2025 09:01
@kechpaja-at-gofore kechpaja-at-gofore requested a review from Wnt January 7, 2025 09:52
Wnt
Wnt approved these changes Jan 7, 2025
View reviewed changes
Copy link
Contributor

@Wnt Wnt left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tuon yhden ylimääräisen staffModifiedflagin voisi vielä poistaa, muuten OK

@kechpaja-at-gofore kechpaja-at-gofore merged commit 89d3851 into master Jan 7, 2025
29 checks passed
@kechpaja-at-gofore kechpaja-at-gofore deleted the attendance-reservation-metadata branch January 7, 2025 12:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Wnt Wnt Wnt approved these changes

@akheron akheron Awaiting requested review from akheron

@Gekkio Gekkio Awaiting requested review from Gekkio

@reynders reynders Awaiting requested review from reynders

@Joosakur Joosakur Awaiting requested review from Joosakur

Assignees
No one assigned
Labels
enhancement Uusi toiminnallisuus tai parannus
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kechpaja-at-gofore @Wnt