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

POLIO-1758 Earmarked stock #1938

Open
wants to merge 38 commits into
base: main
Choose a base branch
from
Open

POLIO-1758 Earmarked stock #1938

wants to merge 38 commits into from

Conversation

mathvdh
Copy link
Collaborator

@mathvdh mathvdh commented Jan 22, 2025 •
edited
Loading

Add the possibility to Earmark Stocks, Use the earmarks or put them back to main stock.

Add the models and APIs for it.

Related JIRA tickets : POLIO-1758

Self proofreading checklist

  • Did I use eslint and black formatters
  • Is my code clear enough and well documented
  • My migrations file are included
  • Are there enough tests

Changes

Add EarmarkedStock model in polio models.
Add new urls
Add new EarmarkedStockViewSet and EarmarkedStockSerializer in stock_management APIs.
Modifications of the calculations in stock_management API to take it into consideration.
Modified the OutgoingStockMovementViewSet to add a create method that tries to see if there is a Earmarked Stock and use it when creating a new Form A.
I had some name clash in OrgUnitNestedSerializer in iaso/api/storage, I had to rename it to StorageOrgUnitNestedSerializer

How to test

Without the frontend the only way is either using django admin or via the APIs to create (see tests)

Notes

The frontend will be added in another PR

Follow the Conventional Commits specification

The merge message of a pull request must follow the Conventional Commits specification.

This convention helps to automatically generate release notes.

Use lowercase for consistency.

Example:

fix: empty instance pop up

Refs: IA-3665

Note that the Jira reference is preceded by a line break.

Both the line break and the Jira reference are entered in the Add an optional extended description… field.

@mathvdh mathvdh marked this pull request as ready for review January 22, 2025 15:26
mathvdh and others added 10 commits January 23, 2025 09:29
@mathvdh
POLIO-1758 Fix behaviour with earmarks when creating a Form A
543f017
@quang-le
POLIO-1758: add get_earmarked_stock endpoint
87171dc 
- also adapt summary endpoint
@quang-le
POLIO-1836: add earmrked stock to stocl details
756316f
@quang-le
POLIO-1758: fix earmarked stock list computation
ccbfdbd
@mathvdh
POLIO-1758 Fix calculations and add tests
f55a3a9
@quang-le @mathvdh
POLIO-1758: add get_earmarked_stock endpoint
a703568 
- also adapt summary endpoint

(cherry picked from commit 87171dc)
@quang-le @mathvdh
POLIO-1758: fix earmarked stock list computation
81058d5 
(cherry picked from commit ccbfdbd)
@mathvdh
POLIO-1758 Fix missed return
8938415
@quang-le
Merge branch 'POLIO-1758-earmarked-stock' into POLIO-1836_earmarked_s…
91537bc 
…tock_front_end
@quang-le
POLIO-1836: add Earmarked stock (front-end)
3640a0c 
- Add tab to stock details view
- Add tab in stock variation
- Add create edit Form
- Add create, update, delete hooks
- Add get and get list hooks
quang-le
quang-le requested changes Jan 23, 2025
View reviewed changes
Copy link
Member

@quang-le quang-le left a comment

Choose a reason for hiding this comment

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

See the comments. I also get a 500 when trying to edit an existing earmarked stock

Screenshot 2025-01-23 at 18 17 54

Almost there!

iaso/test.py Outdated Show resolved Hide resolved
plugins/polio/api/vaccines/stock_management.py Show resolved Hide resolved
plugins/polio/api/vaccines/stock_management.py Outdated Show resolved Hide resolved
plugins/polio/api/vaccines/stock_management.py Outdated Show resolved Hide resolved
quang-le
quang-le requested changes Feb 3, 2025
View reviewed changes
Copy link
Member

@quang-le quang-le left a comment

Choose a reason for hiding this comment

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

Used earmarked stock appears twice in unusable table: once for earmarked, once for form A

Screenshot 2025-02-03 at 16 46 01

@beygorghor beygorghor added the release Should be released in production at next deploy label Feb 6, 2025
@beygorghor beygorghor requested a review from kemar February 7, 2025 08:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@quang-le quang-le quang-le requested changes

@kemar kemar Awaiting requested review from kemar

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
release Should be released in production at next deploy
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mathvdh @quang-le @beygorghor