Pass module name with consumables when tracking individual histories (#1786)

Co-authored-by: Asif Tamuri <tamuri@gmail.com>

Author: marghe-molaro

src/tlo/methods/consumables.py

@@ -354,16 +354,17 @@ def _request_consumables(
                     items_used=items_used,
                 )
 
-            data = {
-                "target": target,
-                "module": module,
-                "event_name": event_name,
-                "Item_Available": str(items_available),
-                "Item_NotAvailable": str(items_not_available),
-                "Item_Used": str(items_used),
-            }
-
-            notifier.dispatch("consumables.post-request_consumables", data=data)
+            if notifier.has_listeners("consumables.post-request_consumables"):
+                data = {
+                    "target": target,
+                    "module": module.name,
+                    "event_name": event_name,
+                    "Item_Available": str(items_available),
+                    "Item_NotAvailable": str(items_not_available),
+                    "Item_Used": str(items_used),
+                }
+
+                notifier.dispatch("consumables.post-request_consumables", data=data)
 
         # Return the result of the check on availability
         return available

src/tlo/methods/individual_history_tracker.py

@@ -192,10 +192,14 @@ def on_consumable_request(self,data):
             return
 
         # Copy this info for individual
-        self.consumable_access[data['target']] = {
-            ('ConsCall' + str(self.cons_call_number_within_event) + '_' + k): v
-            for k, v in data.items() if k != 'target'}
-            
+        if data['target'] not in self.consumable_access:
+            self.consumable_access[data['target']] = {}
+        
+        self.consumable_access[data['target']][f'ConsCall{self.cons_call_number_within_event}'] = {
+            (k): v
+            for k, v in data.items() if k not in ['target', 'module', 'event_name']
+        }
+
         self.cons_call_number_within_event += 1
         return