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

Deprecate ReservationUnitPricing fields #1317

Merged

matti-lamppu merged 11 commits into main from reservation-unit-pricing-status

Oct 25, 2024

Collaborator

ranta commented Sep 4, 2024 •

edited by jira bot

Loading

🛠️ Changelog

Deprecate ReservationUnitPricing.status field
Deprecate ReservationUnitPricing.pricing_type field
Add ReservationUnitPricing.is_activated_on_begins field
Block publishing a reservation unit with invalid pricings

🧪 Test plan

Automated tests

🚧 Dependencies

None

🎫 Tickets

TILA-3486

ranta requested review from vergama and matti-lamppu

September 4, 2024 18:54

ranta added fix refactor breaking labels

ranta self-assigned this

matti-lamppu reviewed

View reviewed changes

api/graphql/types/reservation_unit/serializers.py Outdated Show resolved Hide resolved

matti-lamppu reviewed

View reviewed changes

api/graphql/types/reservation_unit/serializers.py Outdated Show resolved Hide resolved

matti-lamppu reviewed

View reviewed changes

api/graphql/types/reservation_unit/serializers.py Outdated Show resolved Hide resolved

matti-lamppu reviewed

View reviewed changes

reservation_units/migrations/0105_refactor_pricing_state.py Outdated Show resolved Hide resolved

matti-lamppu reviewed

View reviewed changes

reservation_units/migrations/0105_refactor_pricing_state.py Outdated Show resolved Hide resolved

matti-lamppu requested changes

View reviewed changes

Collaborator

matti-lamppu left a comment

Check comments

ranta force-pushed the reservation-unit-pricing-status branch 2 times, most recently from 39f895b to aa2b77c Compare

September 6, 2024 17:00

City-of-Helsinki deleted a comment from github-actions bot

ranta force-pushed the reservation-unit-pricing-status branch from aa2b77c to 5aaba1f Compare

September 10, 2024 08:40

ranta requested a review from matti-lamppu

September 10, 2024 08:40

matti-lamppu approved these changes

View reviewed changes

vergama reviewed

View reviewed changes

reservation_units/tasks.py Outdated Show resolved Hide resolved

vergama reviewed

View reviewed changes

api/graphql/types/reservation/serializers/confirm_serializers.py Outdated Show resolved Hide resolved

vergama reviewed

View reviewed changes

api/graphql/types/reservation_unit/serializers.py Outdated Show resolved Hide resolved

vergama reviewed

View reviewed changes

actions/reservation_unit.py Outdated Show resolved Hide resolved

ranta force-pushed the reservation-unit-pricing-status branch 4 times, most recently from b78a58c to a7b8a6d Compare

September 17, 2024 12:03

matti-lamppu changed the base branch from main to generate-reservation-series-holidays

September 18, 2024 05:07

matti-lamppu force-pushed the reservation-unit-pricing-status branch from a7b8a6d to 6cb92be Compare

September 18, 2024 05:07

Base automatically changed from generate-reservation-series-holidays to ical

September 18, 2024 11:05

Base automatically changed from ical to main

September 18, 2024 11:14

joonatank added a commit to City-of-Helsinki/tilavarauspalvelu-ui that referenced this pull request


          refactor: pricing API change in core

ed8aaba

core branch: City-of-Helsinki/tilavarauspalvelu-core#1317

refs: TILA-3525

joonatank added a commit to City-of-Helsinki/tilavarauspalvelu-ui that referenced this pull request


          refactor: pricing API change in core

2c2e583

core branch: City-of-Helsinki/tilavarauspalvelu-core#1317

refs: TILA-3525

joonatank added a commit to City-of-Helsinki/tilavarauspalvelu-ui that referenced this pull request


          refactor: pricing API change in core

9d06220

core branch: City-of-Helsinki/tilavarauspalvelu-core#1317

refs: TILA-3525

joonatank mentioned this pull request

Refactor backend pricing changes City-of-Helsinki/tilavarauspalvelu-ui#1458

Merged

joonatank added a commit to City-of-Helsinki/tilavarauspalvelu-ui that referenced this pull request


          refactor: pricing API change in core

33b2d18

core branch: City-of-Helsinki/tilavarauspalvelu-core#1317

refs: TILA-3525

joonatank added a commit to City-of-Helsinki/tilavarauspalvelu-ui that referenced this pull request


          refactor: pricing API change in core

6f674a5

core branch: City-of-Helsinki/tilavarauspalvelu-core#1317

refs: TILA-3525

joonatank added a commit to City-of-Helsinki/tilavarauspalvelu-ui that referenced this pull request


          refactor: pricing API change in core

30b5115

core branch: City-of-Helsinki/tilavarauspalvelu-core#1317

refs: TILA-3525

joonatank added a commit to City-of-Helsinki/tilavarauspalvelu-ui that referenced this pull request


          refactor: pricing API change in core

4468ccd

core branch: City-of-Helsinki/tilavarauspalvelu-core#1317

refs: TILA-3525

joonatank added a commit to City-of-Helsinki/tilavarauspalvelu-ui that referenced this pull request


          refactor: pricing API change in core

503b0c2

core branch: City-of-Helsinki/tilavarauspalvelu-core#1317

refs: TILA-3525

joonatank added a commit to City-of-Helsinki/tilavarauspalvelu-ui that referenced this pull request


          refactor: pricing API change in core

core branch: City-of-Helsinki/tilavarauspalvelu-core#1317

refs: TILA-3525

matti-lamppu force-pushed the reservation-unit-pricing-status branch from 3d715e1 to 1580980 Compare

October 22, 2024 09:07

ranta and others added 11 commits

October 24, 2024 12:50


          Remove task for updating pricing statuses

81327ad


          Deprecate ReservationUnitPricing.status field

912caa7

- Add `is_activated_on_begins` field
- Refactor codebase to figure out the active price from the `begins`-field
- Block publishing a reservation unit with invalid pricings


          Deprecate ReservationUnitPricing.pricing_type field

ab87d5b

- Refactor codebase to figure out the pricing type from the `highest_price`-field


          Split removing duplicate date pricings to a separate migration

83ed070


          Handle reservation unit pricings in a single transaction

d9dac0b


          Extend company code exclusion to units in tax percentage update task

6fa5d6b


          Use Unit's PaymentAccounting only if ReservationUnit does not have one

1df0c16


          Simplify get_active_pricing queryset conditions

b072c61


          Prevent deletion of past pricings when omitting them from the request

0c89b7d

- Pricings that became active today are also prevented from deletion, but not prevented from modification


          Django Admin: Remove deprecated ReservationUnitPricing fields

a8f52dd


          Fix issues after rebase

930e2ab

matti-lamppu force-pushed the reservation-unit-pricing-status branch from 1580980 to 930e2ab Compare

October 24, 2024 10:08

sonarcloud bot commented Oct 24, 2024

Quality Gate passed

Issues
2 New issues
0 Accepted issues

Measures
0 Security Hotspots
90.7% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

joonatank added a commit to City-of-Helsinki/tilavarauspalvelu-ui that referenced this pull request


          refactor: pricing API change in core

0ae0ea0

core branch: City-of-Helsinki/tilavarauspalvelu-core#1317

refs: TILA-3525

joonatank added a commit to City-of-Helsinki/tilavarauspalvelu-ui that referenced this pull request


          refactor: pricing API change in core

ba9a178

core branch: City-of-Helsinki/tilavarauspalvelu-core#1317

refs: TILA-3525

joonatank added a commit to City-of-Helsinki/tilavarauspalvelu-ui that referenced this pull request


          refactor: pricing API change in core

d2a6513

core branch: City-of-Helsinki/tilavarauspalvelu-core#1317

refs: TILA-3525

matti-lamppu merged commit 702e716 into main

6 checks passed

matti-lamppu deleted the reservation-unit-pricing-status branch

October 25, 2024 10:44

joonatank added a commit to City-of-Helsinki/tilavarauspalvelu-ui that referenced this pull request


          refactor: pricing API change in core

e73d0a4

core branch: City-of-Helsinki/tilavarauspalvelu-core#1317

refs: TILA-3525

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

breaking fix refactor