sig->activity and multiple activity changes for API v3. #143

providers/activityrefdata/activity_ref_data_provider.py

@@ -13,11 +13,10 @@ class ActivityRefDataProvider:
     """Generic activity reference data provider class. Subclasses of this query the individual URLs or files for
     data."""
 
-    def __init__(self, sig_name, provider_config):
-        """Constructor. Note the parameter and attribute are still named "sig_name" for consistency with the API's
-        "sig" field name."""
+    def __init__(self, activity_name, provider_config):
+        """Constructor"""
 
-        self.sig_name = sig_name
+        self.activity_name = activity_name
         self.enabled = provider_config["enabled"]
         self.last_update_time = datetime.min.replace(tzinfo=pytz.UTC)
         self.status = "Not Started" if self.enabled else "Disabled"
@@ -43,7 +42,7 @@ class ActivityRefDataProvider:
         # transact()s is to fail if they can't get the lock (?!). This behaviour is fixed by retry=True.
         with DATA_STORE.activity_refs.transact(retry=True):
             for d in new_data:
-                DATA_STORE.activity_refs.set(f"{self.sig_name}:{d.id}", d)
+                DATA_STORE.activity_refs.set(f"{self.activity_name}:{d.id}", d)
 
                 # For the big data sources, loading will take a few minutes. If we want to shut down the software neatly
                 # within the first few minutes of startup, we need a way to abort this expensive process of filling up the
@@ -52,4 +51,4 @@ class ActivityRefDataProvider:
                     break
 
         self.reference_count = len(new_data)
-        logger.info(f"Loaded {self.reference_count} references for {self.sig_name} into the data store.")
+        logger.info(f"Loaded {self.reference_count} references for {self.activity_name} into the data store.")