4513 incontinence supplies #4794

jadekstewart3 · 2024-11-20T02:00:07Z

Checklist:

X I have performed a self-review of my own code,
X I have commented my code, particularly in hard-to-understand areas,
X I have added tests that prove my fix is effective or that my feature works,
X New and existing unit tests pass locally with my changes ("bundle exec rake"),
X I acknowledge that I will not force push my branch once reviews have started.

-->

Resolves #4513

Description

Made all necessary changes to the incontinence annual survey including:

updating the total number of adult incontinence supplies to include supplies contained with in kits
add field for the number of adults assisted per month that includes adults that have been assisted with kits
updated adult incontinence supplies per month calculation

Note: when creating a kit using the current factory, it creates an extra item (with the correct base category that includes adult but was not previously included in the 'Adult incontinence supplies' list. I've added that item to the test because it is technically correct. Let me know if you would like to see a different course of action, and I will be happy to fix it :)

Type of change

Bug fix (non-breaking change which fixes an issue)

How Has This Been Tested?

I have created a kit with items and distribution to the test file to ensure that the calculations are indeed including kits and kit items

…te zero values test

… and distribution

cielf

Hey @jadekstewart3 -- the adults served isn't coming up as described in the issue. Could you take a look, please?

cielf · 2024-11-21T21:18:10Z

app/services/reports/adult_incontinence_report_service.rb

+      .merge(Item.adult_incontinence)
+      .where.not(items: {kit_id: nil})
+      .sum('line_items.quantity / COALESCE(items.distribution_quantity, 50)') / 12
+    end


Per the issue, "
The number of adults assisted with kit items is the number of kits that contain adult incontinence supplies distributed divided by the "quantity per individual" on the kit item. if there is no quantity per individual provided, assume that quantity is 1."

Quick question, also I apologize for missing that bit! Is it a safe assumption that the distribution_quantity is equal to the "quantity per individual"?

Yes. Sorry for the terminology ambiguity -- they are the same.

…ibed in issue, and update tests

cielf

Hey @jadekstewart3 - I distributed 100,000 of a kit that contained 50 - 100 of a few different AI products. The supplies distributed looks plausible, but the adults assisted per month and adult incontinence supplies per adult per month didn't budge from what they were before the distribution. That doesn't seem right.

Can you track that down?

…e accurate values

jadekstewart3 · 2024-12-11T22:03:08Z

@cielf Okay, I think I have tracked down the issue! Let me know if you run into any snags and Ill address it asap, I know we are in crunch time for this report!

cielf · 2024-12-12T19:33:10Z

I think it's not working still -- I distributed 200000 kits that had a variety of AI items in the range of about 50-100 -- similar to last time.

I got this:

cielf · 2024-12-12T19:37:27Z

app/services/reports/adult_incontinence_report_service.rb

+        .merge(Item.adult_incontinence)
+        .where.not(items: {kit_id: nil})
+        .sum('line_items.quantity / COALESCE(items.distribution_quantity, 1)')
+    end


I suspect this is giving you kits that are identified as adult_incontinence, rather than kits that have adult incontinence items in them? Though you used the same pattern as for the disposables... Huh.

cielf · 2024-12-12T20:21:57Z

Hey @jadekstewart3 There's definitely something wrong with the diapers as well. There was a change re the kits recently, so I'm wondering if that's what's going on. Stay tuned (though, for expectations, I can't work on this tomorrow)

cielf · 2024-12-12T20:36:28Z

Hey @jadekstewart3 -- One thing I notice is that this is based off a version of main from April. There have been an awful lot of changes since then. Could you rebase please?

… 4513_incontinence_supplies

… failing

…l_people_served_with_loose_supplies_per_month

…increasing in value

cielf · 2024-12-16T17:14:16Z

I should be able to look at this again tomorrow

cielf · 2024-12-18T21:14:47Z

@jadekstewart3 Taking a look now, it's still awry (I don't know what the adults assisted per month should be without calculating it, but I'm sure it's not 1)

First level of pokingat it -- the number assisted with loose looks plausible. (I added 6000 loose, and this number went up by 10. So that tradks.)

cielf · 2024-12-18T22:22:18Z

app/services/reports/adult_incontinence_report_service.rb

+        .joins(line_items: {item: :kit})
+        .merge(Item.adult_incontinence)
+        .where.not(items: {kit_id: nil})
+        .sum('line_items.quantity / COALESCE(items.distribution_quantity, 1)')


I think this is giving you the people served with items that are kits and adult incontinence both? (which would be the zero we are getting). The distinction between items that are kits and items that are in the kits is our bugbear here. We want the number of people served with kits that contain adult incontinence items.

I think we're going to need to do a SQL statement for this.

There is a problem in the initial count — with what you’re excluding. But when you have that done, I’m wondering if using the same sql query, but substituting
SELECT SUM(COALESCE(line_items.quantity / items.distribution_quantity, 1))
for
SELECT SUM(line_items.quantity * kit_line_items.quantity)
in that same SQL query would do the job. I am in no way 100% sure on this - but leave it to you to do a reasoning through. I think line items there is the number of kits in the distributions, and items is the item that represents the kit, yes?

cielf · 2024-12-19T21:01:33Z

app/services/reports/adult_incontinence_report_service.rb

+          AND LOWER(base_items.category) LIKE '%adult%'
+          AND NOT (LOWER(base_items.category) LIKE '%cloth%' OR LOWER(base_items.name) LIKE '%cloth%')
+          AND kit_line_items.itemizable_type = 'Kit';
+      SQL


This should not be excluding cloth (Adult Cloth Diapers count as AI) and should be excluding wipes. See Item.adult_incontinence.

cielf

Current state is that the number of supplies from kits needs adjusting to match the item scope adult_incontinence. I think we're going to have to go with a sql call to get the total people served with kits, and have left some thoughts to pursue on that. Good Luck!

…fiddle with total_people_served_with_supplies_from_kits_per_month to no avail, yet.

…er_month using sql

cielf · 2024-12-20T21:00:55Z

Hi @dorner. I still need to do more manual testing on this, but it's time to bring you in. Status: as of Friday late afternoon, Jade thinks this is working in real life, but is having trouble with some of the testing.

cielf

I haven't quite figured out quite what the right SQL statement for the number of adults helped is, but wanted to get some steps toward it out there before @dorner takes a look.

cielf · 2024-12-21T20:11:58Z

app/services/reports/adult_incontinence_report_service.rb

@@ -14,8 +14,9 @@ def initialize(year:, organization:)
    def report
      @report ||= { name: 'Adult Incontinence',
                    entries: {
-                      'Adult incontinence supplies distributed' => number_with_delimiter(distributed_supplies),
-                      'Adult incontinence supplies per adult per month' => monthly_supplies&.round || 0,
+                      'Adult incontinence supplies distributed' => number_with_delimiter(distributed_loose_supplies + distributed_adult_incontinence_items_from_kits),


Why is this not total_supplies_distributed?

cielf · 2024-12-21T20:33:54Z

app/services/reports/adult_incontinence_report_service.rb

+        .for_year(year)
+        .joins(line_items: :item)
+        .merge(Item.adult_incontinence)
+        .sum('line_items.quantity / COALESCE(items.distribution_quantity, 50)') / 12


This is giving you an integer for each item/distribution combo - I found that it was significantly undercounting with our seed data. Changing 50 to 50.0 gave me the value I expected in my case where I had added just enough to get to 600 AI items. But this was in a case where they were all blank distribution quantities -- I suspect you need to make sure items.distribution_quantity reads as double as well.

Aside - we may want to talk to the stakeholders about fractional people per month - because at small volumes, it's going to change the supplies per month depending on whether we do or not. We should, in any case, have how we handle it make sense to them.

cielf · 2024-12-21T20:57:59Z

app/services/reports/adult_incontinence_report_service.rb

+          AND NOT (LOWER(base_items.category) LIKE '%wipes%' OR LOWER(base_items.name) LIKE '%wipes%')
+          AND kit_line_items.itemizable_type = 'Kit';
+      SQL
+


Alas, this is not right yet. Try a case where you have 600 loose AI supplies distributed. Then add a kit with 20 supplies in it (10 each of two kinds). Then distribute 12 of those kits. If not quantities per individual have been specified, the number of people served should then be 2 (1 from the loose and 1 from the kits). It came out as 21.

The number of people served by a kit has nothing to do with the number of the AI supplies in the kit -- as long as it has any AI items in it.

And it is the item that is the line_item that we are worried about the distribution quantity on, as well -- i.e. whether the kit itself has a distribution quantity that is non-0.

So .. If I'm reading this right --

SELECT SUM(line_items.quantity * kit_line_items.quantity /
COALESCE(NULLIF(kit_items.distribution_quantity, 0), 1)) AS adults_assisted

Would become
SELECT SUM(line_items.quantity /
COALESCE(NULLIF(items.distribution_quantity, 0), 1)) AS adults_assisted

That's still not right -- I think it's counting the adult for the kit once for each different AI supply in the kit. In the case I described, above, the number of adults became 3.

I'm wondering - especially since this is going to be a relatively little used thing, if an ok approach might be to:

1/ Determine all the items-representing-kits whose kits have ai items (for the organization) That shouldn't be so hard, should it?

Caveat for the below, I don't have the tables in front of me:

Conceptually, you'd need to get the distinct itemizable_ids from the line items that have item type kit, with an item that is adult incontinence. Those itemizable ids represent the items that are kits with adult incontinence.

If that's empty, return 0. This will be the bulk of the time -- unless/until we get a lot of organizations pairing, say briefs and wipes in kits. (NDBN is still ramping up their adult incontinence programs, per our contacts there)

then
2/ use the same pattern as for the loose ai item people -- just substitute the result for #1 in for Item.adult_incontinence.

@dorner - is this a reasonable approach? I think it might be more maintainable than the raw SQL, and this is not going to be frequently used (it's the annual report, after all)

If this is run yearly, I definitely don't care much about performance. Multiple queries should be fine.

…incontinence_items_from_kits still noodling total_kits_with_adult_incontinence_items_distributed

…istributed kits being returned. Taking another look at report calculations to ensure accuracy

…ions accordingly

jadekstewart3 added 2 commits October 29, 2024 12:26

Begin working calculations for new feild addtions for report and upda…

1d93dcd

…te zero values test

Created kits in spec to ensure report values update with kit creation…

7ec4f2d

… and distribution

cielf requested changes Nov 21, 2024

View reviewed changes

Update total_people_served_with_supplies_from_kits_per_month as descr…

607bec6

…ibed in issue, and update tests

jadekstewart3 force-pushed the 4513_incontinence_supplies branch from e64abc5 to 607bec6 Compare November 27, 2024 20:11

Remove commented text

ffa5b51

cielf self-requested a review November 28, 2024 17:13

cielf requested changes Nov 28, 2024

View reviewed changes

jadekstewart3 added 2 commits December 11, 2024 14:20

Modify calculation for adults served to ensure accurate values

fb68000

Evaluate how monthly supplies is calculated and modify to produce mor…

28aa472

…e accurate values

jadekstewart3 requested a review from cielf December 11, 2024 22:03

cielf reviewed Dec 12, 2024

View reviewed changes

jadekstewart3 added 5 commits December 12, 2024 14:59

Merge branch 'main' of github.com:jadekstewart3/human-essentials into…

062d5a6

… 4513_incontinence_supplies

Update spec to passing, still working on identifying where service is…

203730e

… failing

rubocop

a8816a0

Modify total_people_served_with_supplies_from_kits_per_month and tota…

ac49fe5

…l_people_served_with_loose_supplies_per_month

Modify kit item test set up, and add kits to endure calculations are …

fca526d

…increasing in value

jadekstewart3 added 3 commits December 16, 2024 10:57

Re-work kit test set up

a3b1155

Remove trailing whitespace

ac542f8

rubocop

8a61604

cielf reviewed Dec 18, 2024

View reviewed changes

cielf reviewed Dec 19, 2024

View reviewed changes

cielf self-requested a review December 19, 2024 21:28

cielf requested changes Dec 19, 2024

View reviewed changes

jadekstewart3 added 3 commits December 19, 2024 15:54

Fix oversight in distributed_adult_incontinence_items_from_kits, and …

a0270f9

…fiddle with total_people_served_with_supplies_from_kits_per_month to no avail, yet.

Modify how we calculate total_people_served_with_supplies_from_kits_p…

c2f90ad

…er_month using sql

rubocop

1fac9db

cielf requested a review from dorner December 20, 2024 21:01

cielf requested changes Dec 21, 2024

View reviewed changes

jadekstewart3 added 4 commits January 2, 2025 15:06

Create additional test to confirm functionality of distributed_adult_…

b55672e

…incontinence_items_from_kits still noodling total_kits_with_adult_incontinence_items_distributed

Fixed test set up including kit containing wipes, correct amount of d…

e2c41a6

…istributed kits being returned. Taking another look at report calculations to ensure accuracy

Fix spacing per rubocop

15c7c84

Adjust methods to calculate monthly values, and correct test expectat…

91b7f16

…ions accordingly

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

4513 incontinence supplies #4794

4513 incontinence supplies #4794

jadekstewart3 commented Nov 20, 2024

cielf left a comment •

edited

Loading

cielf Nov 21, 2024

jadekstewart3 Nov 25, 2024

cielf Nov 25, 2024

cielf left a comment •

edited

Loading

jadekstewart3 commented Dec 11, 2024

cielf commented Dec 12, 2024

cielf Dec 12, 2024 •

edited

Loading

cielf commented Dec 12, 2024

cielf commented Dec 12, 2024

cielf commented Dec 16, 2024

cielf commented Dec 18, 2024 •

edited

Loading

cielf Dec 18, 2024 •

edited

Loading

cielf Dec 19, 2024

cielf Dec 19, 2024

cielf left a comment

cielf commented Dec 20, 2024

cielf left a comment

cielf Dec 21, 2024

cielf Dec 21, 2024

cielf Dec 21, 2024

cielf Dec 21, 2024

cielf Dec 21, 2024

cielf Dec 21, 2024 •

edited

Loading

cielf Dec 23, 2024

dorner Dec 23, 2024

4513 incontinence supplies #4794

Are you sure you want to change the base?

4513 incontinence supplies #4794

Conversation

jadekstewart3 commented Nov 20, 2024

Checklist:

Description

Type of change

How Has This Been Tested?

cielf left a comment • edited Loading

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

cielf left a comment • edited Loading

Choose a reason for hiding this comment

jadekstewart3 commented Dec 11, 2024

cielf commented Dec 12, 2024

cielf Dec 12, 2024 • edited Loading

Choose a reason for hiding this comment

cielf commented Dec 12, 2024

cielf commented Dec 12, 2024

cielf commented Dec 16, 2024

cielf commented Dec 18, 2024 • edited Loading

cielf Dec 18, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cielf left a comment

Choose a reason for hiding this comment

cielf commented Dec 20, 2024

cielf left a 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

cielf Dec 21, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cielf left a comment •

edited

Loading

cielf left a comment •

edited

Loading

cielf Dec 12, 2024 •

edited

Loading

cielf commented Dec 18, 2024 •

edited

Loading

cielf Dec 18, 2024 •

edited

Loading

cielf Dec 21, 2024 •

edited

Loading