From e2e0c991326983b57f15d13967a7274f2c731117 Mon Sep 17 00:00:00 2001
From: Lucas Oskorep <lucas.oskorep@gmail.com>
Date: Tue, 15 Jun 2021 19:42:26 -0400
Subject: [PATCH] Moving mta_manager logic into its own package - will most
 likely mvoe to its own repo shortly

---
 .../mta_status_alerts.json                    |  0
 .../subway_timing_sample.json                 |  0
 mta_manager/__init__.py                       |  3 ++
 mta.py => mta_manager/mta.py                  |  3 +-
 mta_test.py => mta_manager/mta_test.py        |  0
 route.py => mta_manager/route.py              |  2 +-
 stop.py => mta_manager/stop.py                |  0
 server.py                                     |  2 +-
 testing.py                                    | 49 -------------------
 9 files changed, 6 insertions(+), 53 deletions(-)
 rename mta_status_alerts.json => example-json-outputs/mta_status_alerts.json (100%)
 rename subway_timing_sample.json => example-json-outputs/subway_timing_sample.json (100%)
 create mode 100644 mta_manager/__init__.py
 rename mta.py => mta_manager/mta.py (97%)
 rename mta_test.py => mta_manager/mta_test.py (100%)
 rename route.py => mta_manager/route.py (96%)
 rename stop.py => mta_manager/stop.py (100%)
 delete mode 100644 testing.py

diff --git a/mta_status_alerts.json b/example-json-outputs/mta_status_alerts.json
similarity index 100%
rename from mta_status_alerts.json
rename to example-json-outputs/mta_status_alerts.json
diff --git a/subway_timing_sample.json b/example-json-outputs/subway_timing_sample.json
similarity index 100%
rename from subway_timing_sample.json
rename to example-json-outputs/subway_timing_sample.json
diff --git a/mta_manager/__init__.py b/mta_manager/__init__.py
new file mode 100644
index 0000000..1e01856
--- /dev/null
+++ b/mta_manager/__init__.py
@@ -0,0 +1,3 @@
+from .mta import *
+from .route import *
+from .stop import *
diff --git a/mta.py b/mta_manager/mta.py
similarity index 97%
rename from mta.py
rename to mta_manager/mta.py
index 38e703c..1d5364a 100644
--- a/mta.py
+++ b/mta_manager/mta.py
@@ -4,7 +4,7 @@ import json
 
 from google.transit import gtfs_realtime_pb2
 from protobuf_to_dict import protobuf_to_dict
-from route import get_route_from_dict
+from .route import get_route_from_dict
 from time import time
 
 
@@ -24,7 +24,6 @@ class MTA(object):
         with open(endpoints_file, "r") as f:
             self.endpoints = json.load(f)
         self.set_valid_endpoints()
-        # TODO: filter out anything from a train line we are not searching for
 
     def set_valid_endpoints(self):
         self.valid_endpoints = {}
diff --git a/mta_test.py b/mta_manager/mta_test.py
similarity index 100%
rename from mta_test.py
rename to mta_manager/mta_test.py
diff --git a/route.py b/mta_manager/route.py
similarity index 96%
rename from route.py
rename to mta_manager/route.py
index 5363964..8e0cbba 100644
--- a/route.py
+++ b/mta_manager/route.py
@@ -1,4 +1,4 @@
-from stop import get_stop_from_dict
+from .stop import get_stop_from_dict
 
 
 def get_route_from_dict(obj):
diff --git a/stop.py b/mta_manager/stop.py
similarity index 100%
rename from stop.py
rename to mta_manager/stop.py
diff --git a/server.py b/server.py
index da1f07e..ac49695 100644
--- a/server.py
+++ b/server.py
@@ -1,7 +1,7 @@
 import os
 import threading
 from flask import Flask, jsonify, render_template, request
-from mta import MTA
+from mta_manager import MTA
 from pprint import pprint
 
 app = Flask(__name__)
diff --git a/testing.py b/testing.py
deleted file mode 100644
index 08dcf25..0000000
--- a/testing.py
+++ /dev/null
@@ -1,49 +0,0 @@
-import requests
-import os
-import json
-
-from dotenv import load_dotenv
-from pprint import pprint
-
-load_dotenv()
-
-#endpoint definitions - should be loaded form the env if possible, woudl make it easily maintaine from docker
-ACE_ENDPOINT = "https://api-endpoint.mta.info/Dataservice/mtagtfsfeeds/nyct%2Fgtfs-ace"
-SUBWAY_ALERTS = "https://api-endpoint.mta.info/Dataservice/mtagtfsfeeds/camsys%2Fsubway-alerts"
-SUBWAY_ALERTS_JSON = "https://api-endpoint.mta.info/Dataservice/mtagtfsfeeds/camsys%2Fsubway-status.json"
-
-
-def create_api_call_header(api_key):
-    return {
-        "x-api-key":api_key
-    }
-
-
-def test_api_calls():
-    print("Testing the api")
-    api_key = os.getenv('MTA_API_KEY', '')
-    r = requests.get(
-        SUBWAY_ALERTS_JSON,
-        headers=create_api_call_header(api_key)
-    )
-    print(r)
-    print(r.status_code)
-    pprint(r.json())
-    with open("mta_status_alerts.json", "w+") as f:
-        f.write(json.dumps(r.json()))
-
-
-
-    r = requests.get(
-        ACE_ENDPOINT,
-        headers=create_api_call_header(api_key)
-    )
-    print(r)
-    print(r.status_code)
-    print(r.content)
-
-    # alerts_data = json.loads()
-
-
-if __name__ == '__main__':
-    test_api_calls()