Merge pull request #556 from OpenUpSA/feature/api-bill-tracker-update…

…-method

Feature/api bill tracker update method

pmg/api/v2.py

@@ -3,6 +3,7 @@
 from sqlalchemy import desc
 from sqlalchemy.orm import defer, noload
 from sqlalchemy.sql.expression import nullslast
+from pmg.bill_tracker import produce_bill_tracker_json
 
 from pmg import cache, cache_key, should_skip_cache
 from pmg.models import (
@@ -251,11 +252,18 @@ def daily_schedules(id=None):
         return api_list_items(DailySchedule.list(), DailyScheduleSchema)
 
 
-@api.route("/bill-tracker")
+@api.route("/bill-tracker/")
 def bill_tracker():
     # Return background-worker produced static JSON file from pmg/static/bill-tracker.json
     try:
         with open("pmg/static/bill-tracker.json", "r") as f:
-            return f.read() 
+            return f.read()
     except FileNotFoundError:
-        return abort(404)
+        return abort(500)
+
+
+@api.route("/bill-tracker/update/")
+def bill_tracker_update():
+    # Update the bill-tracker.json file
+    produce_bill_tracker_json()
+    return "/v2/bill-tracker JSON updated"

pmg/tasks.py

@@ -25,14 +25,6 @@ def sync_soundcloud():
         SoundcloudTrack.sync()
 
 
-def produce_bill_tracker_json():
-    from pmg import app
-    from pmg.bill_tracker import produce_bill_tracker_json
-
-    with app.app_context():
-        produce_bill_tracker_json()
-
-
 def schedule(scheduler):
     jobs = [
         # Schedule background task for sending saved search alerts every
@@ -45,15 +37,6 @@ def schedule(scheduler):
             coalesce=True,
             hour=3,
         ),
-        scheduler.add_job(
-            "pmg.tasks:produce_bill_tracker_json",
-            "cron",
-            id="produce-bill-tracker-json",
-            replace_existing=True,
-            coalesce=True,
-            hour=1,
-            next_run_time=datetime.datetime.now(),
-        ),
         scheduler.add_job(
             sync_soundcloud,
             "cron",