7285 prevent ungiving vaccinations from another store #7323

lache-melvin · 2025-04-14T20:50:15Z

👩🏻‍💻 What does this PR do?

Disables editing of vaccination data (expect comment) from other stores, once vaccination has been given.

Also adds item_link_id to vaccination, so we can see which vaccine item was given to a patient even when it was given in another store. Before, we only determined item via related stock line/invoice, which only exists for the "giving" store.

💌 Any notes for the reviewer?

Apologies, little bit of frontend refactoring, found it hard to reason about where to add conditions, will add comments

There is breaking API change in that we now expect passed in stock line and item id to match, but i don't think vaccination graphql is used externally...

🧪 Testing

📃 Documentation

Part of an epic: documentation will be completed for the feature as a whole
No documentation required: no user facing changes or a bug fix which isn't a change in behaviour
These areas should be updated or checked:
1.
2.

📃 Reviewer Checklist

The PR Reviewer(s) should fill out this section before approving the PR

Breaking Changes

No Breaking Changes in the Graphql API
Technically some Breaking Changes but not expected to impact any integrations

Issue Review

All requirements in original issue have been covered
A follow up issue(s) have been created to cover additional requirements

Tests Pass

Postgres
SQLite
Frontend

github-actions · 2025-04-14T20:55:10Z

Bundle size difference

Comparing this PR to main

Old size	New size	Diff
6.13 MB	6.13 MB	-930 B (-0.01%)

lache-melvin · 2025-04-14T20:50:43Z

client/packages/common/src/intl/locales/ar/common.json

@@ -2099,7 +2099,6 @@
  "messages.no-shipments-yet": "لم يتم إنشاء أي شحنات حتى الآن.",
  "messages.no-status-logs": "لم يتم إنشاء سجلات حالة لهذا الجهاز. انقر على زر ”تحديث الحالة“ لإنشاء سجل حالة جديد.",
  "messages.no-stock-available": "لا يوجد مخزون متاح",
-  "messages.no-transaction-other-facility": "لا يتم تسجيل معاملات المخزون للتطعيمات المعطاة في منشآت أخرى",


message no longer used, removed....

lache-melvin · 2025-04-14T20:53:13Z

client/packages/system/src/Vaccination/Components/SelectBatch.tsx

  stockLine,
  setStockLine,
 }: SelectBatchProps) => {
  const { data, isLoading } = useStockLines(itemId);

  // Auto-select if there is only one stock line (and not already selected)
  useEffect(() => {
-    if (data?.nodes?.length === 1 && !stockLine) {
+    if (data?.nodes?.length === 1 && !stockLine && isNewlyGiven) {


We had some functionality to help speed up process, auto select batch if there is only one. But this was doing some strange things on edit, showing stock line as selected even if I hadn't actually selected the stock line on my original dispensing of the vaccine. So only autoselect for new, or not given -> given

lache-melvin · 2025-04-14T20:54:47Z

client/packages/system/src/Vaccination/Components/SelectItem.tsx

+import { VaccinationDraft } from '../api';
+import { VaccinationCourseDoseFragment } from '../api/operations.generated';
+
+export const SelectItem = ({


This is identical, just pulled out into own component. Item select was tied in with stock line/invoice creation, but we want to record/manage separately

lache-melvin · 2025-04-14T20:58:04Z

client/packages/system/src/Vaccination/Components/SelectItemAndBatch.tsx

-  if (!vaccineItemOptions.length) {
-    return <InfoText>{t('messages.no-vaccine-items-configured')}</InfoText>;
-  }
+  const transactionSwitchReason = getSwitchReason(draft, vaccination);


I found it confusing, there was this SelectItemAndBatch component, but the create transaction switch display was being managed in the VaccinationModal component, even though it impacted display of components here. Was hard to follow. This component now handles display of item select, batch picker, and the toggle to create transactions.

const somethingThatDescribesThisCase = (!isHistorical || draft.createTransactions || vaccination?.stockLine)

lache-melvin · 2025-04-14T20:59:58Z

client/packages/system/src/Vaccination/Components/VaccinationModal.tsx

-    />
-  ) : null;
+  const givenAtOtherStore =
+    !!vaccination?.given && vaccination.givenStoreId !== storeId;


Used to disable most inputs if vaccination is in given status from another store

lache-melvin · 2025-04-14T21:04:46Z

client/packages/system/src/Vaccination/api/operations.generated.ts

+    item {
+      id
+      name
+    }


item info should be available on vaccination, even if stock line is not selected/is for different store

lache-melvin · 2025-04-14T21:05:53Z

server/repository/src/db_diesel/vaccine_course/vaccine_course_dose_row.rs

+allow_tables_to_appear_in_same_query!(vaccine_course_dose, name_link);
+allow_tables_to_appear_in_same_query!(vaccine_course_dose, name);
+allow_tables_to_appear_in_same_query!(vaccine_course_dose, item_link);
+allow_tables_to_appear_in_same_query!(vaccine_course_dose, item);


These were in the vaccination row file, figured they should probably live with the relevant table...

lache-melvin · 2025-04-14T21:12:01Z

server/service/src/vaccination/insert/generate.rs

        stock_line_id,
+        item_link_id: item_id,


SO I think if FINALLY have link ids in my head, when it is ok to assign item_link_id = item_id, vs when it is not.

I'll do a wiki write up asap.

But this is fine - when items & item links created, item_link_id is item id, so:

Link ID Item ID

item_a item_a

item_b item_b

Then Item A and B get merged, to just be Item A:

Link ID Item ID

item_a item_a

item_b item_a

So, conflating item_id to be item_link_id in this direction is fine - both ids continue to exist as link ids and will point back to correct item. Where we need to do lookup is where two records could have different link ids, can't just say where link ID = X, as multiple link ids could actually be pointing to same item

Thanks : #7429

lache-melvin · 2025-04-14T21:12:38Z

server/service/src/vaccination/insert/validate.rs

@@ -72,15 +73,32 @@ pub fn validate(
            return Err(InsertVaccinationError::FacilityDoesNotExist);
        }
    }
+    // If not given, reason is required
+    if !input.given {


For some reason, this check was in the "get_stock_line" function... lol?

lache-melvin · 2025-04-14T21:14:39Z

server/service/src/vaccination/update/generate.rs

        given: true,
+        given_store_id: Some(store_id.to_string()),


The bit that actually solves the PR, assigning given store ID where we mark as given - and in validate method, checking this matches the calling store id

Chris-Petty · 2025-04-15T00:11:58Z

I've run out of time! Heaven forbid it's still here but I will be back next Tuesday if it still needs review 🥲

andreievg · 2025-04-21T22:04:21Z

server/graphql/types/src/types/program/vaccination.rs

@@ -67,6 +71,19 @@ impl VaccinationNode {
        }
    }

+    pub async fn item(&self, ctx: &Context<'_>) -> Result<Option<ItemNode>> {
+        let loader = ctx.get_loader::<DataLoader<ItemLoader>>();


Hmm, at this point we don't need a join in the repository.

Yeah... or like BasicItemNode, which is only the fields from ItemRow? Bc need to use loader, to get all the fields required ItemNode...

andreievg · 2025-04-21T22:27:24Z

server/service/src/vaccination/update/validate.rs

    // If not given, reason is required
    if input.given == Some(false) {
        if input.not_given_reason.is_none() {
            return Err(UpdateVaccinationError::ReasonNotProvided);
        };
    };

+    // If selected item is changing - validate it


I was wondering if there is a description somewhere about what happens in the different use case for immunizations/vaccinations ? (like if i ungive vaccination, if vaccination is given, with stock line issued, and then item is changed etc..)

ugh not really... public docs do sort of discuss the different things you can do, but not clear set of use cases like you describe here... where would you write that up??

andreievg · 2025-04-21T22:35:37Z

server/service/src/vaccination/update/mod.rs

+            )
+            .unwrap();
+
+        assert_eq!(result.vaccination_row.given, false);


worth checking that store id was set correct, and unset in the one below

andreievg · 2025-04-21T22:45:42Z

client/packages/system/src/Vaccination/Components/SelectBatch.tsx

+          // Allow un-selecting of stock line, if don't want to record
+          // transaction
+          setStockLine={newStockLine =>
+            setStockLine(


"toggleStockLine"

andreievg · 2025-04-21T22:54:47Z

client/packages/system/src/Vaccination/Components/SelectItemAndBatch.tsx

+            disabled={givenAtOtherStore}
+            dose={dose}
+            draft={draft}
+            updateDraft={updateDraft}
          />


Almost feel like there should be explicit button to change stock line (or delegate error to server, or something like this), allowing SelectBatch to be simpler, and just displaying stock line in a different component (when it's been already set)

andreievg

Thanks Lache, there is nothing in this PR that I can see that would stop approval. I haven't thougth too deeply about use cases here, I think we need to ecourage QA to make try different use case.

thougth too deeply about use cases here

I deed think of a few use case, and all of them were covered in this PR, and I was impressed

…-another-store

lache-melvin added 19 commits April 14, 2025 10:33

update vaccination warning translation

9a90d9c

add given_store_id to vaccination row

6c3a435

check is the giving store before ungiving

fc41a69

prevent change stock line from other store

79cfb96

apply given store id

5d14f55

map error

d913a47

add item_link_id to vaccination

e92429a

add new fields to vaccination gql type

df9e797

expose item

a447ec0

remove translation

204b7e8

refactor select item and batch for readability

eb5e7a4

disable where not the giving store

42738fc

add item id to insert mutation

231c476

add item id to vaccination update

13dcaa1

add query debug

4406b20

clear reason on given

e251157

save selected item id

0f57190

only allow change item on giving store

ae39f79

item link -> item

1401c73

github-actions bot added this to the v2.7.0 milestone Apr 14, 2025

github-actions bot added Team Ruru 🦉 Roxy, Noel, Chris, Aimee, Laché Severity: High Bugs breaking core functionality or with no/unacceptable workaround. High impact. Next patch release feature: vaccine card labels Apr 14, 2025

remove comment

3192fa9

lache-melvin commented Apr 14, 2025

View reviewed changes

aimee-mcneil-melville assigned aimee-mcneil-melville and unassigned aimee-mcneil-melville Apr 14, 2025

roxy-dao linked an issue Apr 15, 2025 that may be closed by this pull request

I can un-give a vaccination from another store #7285

Closed

Base automatically changed from 7285-refactor-vax-card-update-logic to v2.7.0-RC April 15, 2025 02:31

andreievg self-assigned this Apr 17, 2025

andreievg reviewed Apr 21, 2025

View reviewed changes

andreievg mentioned this pull request Apr 21, 2025

Add example based documentation about item_link and name_link #7429

Open

andreievg reviewed Apr 21, 2025

View reviewed changes

andreievg approved these changes Apr 21, 2025

View reviewed changes

Merge branch 'v2.7.0-RC' into 7285-prevent-ungiving-vaccinations-from…

643ba3a

…-another-store

lache-melvin merged commit e596fea into v2.7.0-RC Apr 22, 2025
7 checks passed

lache-melvin deleted the 7285-prevent-ungiving-vaccinations-from-another-store branch April 22, 2025 01:25

lache-melvin mentioned this pull request Apr 22, 2025

I can un-give a vaccination from another store #7285

Closed

lache-melvin mentioned this pull request Apr 30, 2025

Vaccine dose administration: improve appearance #6758

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

7285 prevent ungiving vaccinations from another store #7323

7285 prevent ungiving vaccinations from another store #7323

lache-melvin commented Apr 14, 2025

github-actions bot commented Apr 14, 2025

lache-melvin Apr 14, 2025

lache-melvin Apr 14, 2025

lache-melvin Apr 14, 2025

lache-melvin Apr 14, 2025

andreievg Apr 21, 2025

lache-melvin Apr 14, 2025

lache-melvin Apr 14, 2025

lache-melvin Apr 14, 2025

lache-melvin Apr 14, 2025

andreievg Apr 21, 2025

lache-melvin Apr 14, 2025

lache-melvin Apr 14, 2025

Chris-Petty commented Apr 15, 2025

andreievg Apr 21, 2025

lache-melvin Apr 22, 2025

andreievg Apr 21, 2025

lache-melvin Apr 22, 2025

andreievg Apr 21, 2025

andreievg Apr 21, 2025

andreievg Apr 21, 2025

andreievg left a comment

7285 prevent ungiving vaccinations from another store #7323

7285 prevent ungiving vaccinations from another store #7323

Conversation

lache-melvin commented Apr 14, 2025

👩🏻‍💻 What does this PR do?

💌 Any notes for the reviewer?

🧪 Testing

📃 Documentation

📃 Reviewer Checklist

github-actions bot commented Apr 14, 2025

Bundle size difference

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Chris-Petty commented Apr 15, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andreievg left a comment

Choose a reason for hiding this comment