fix: fixup refactored api after rebase

api_rest.py

@@ -30,31 +30,34 @@ def get_config():
     return config
 
 
+def create_app():
+    app = Flask(__name__)
+    api = Api(app)
+    api_config = get_config()
+    logging.debug(str(api_config))
+    CORS(app, resources=api_config["cors"])
+
+    api.add_resource(ClientList, "/client")
+    api.add_resource(Client, "/client/<client_id>")
+    api.add_resource(Receive, "/receive")
+    api.add_resource(Send, "/send")
+    api.add_resource(Notify, "/notify")
+    api.add_resource(Token, "/token")
+    api.add_resource(QueueList, "/queue")
+    api.add_resource(Queue, "/queue/<queue_name>")
+    return app
+
+
 def run():
+    token = TokenModel()
+    token.setSecret()
+
+    app = create_app()
     flask_host = os.getenv(
         "FLASK_HOST", "localhost"
     )  # Sets to whatever MQ_HOST is, or defaults to localhost
     app.run(debug=True, port=8087, host=flask_host)
 
 
-token = TokenModel()
-token.setSecret()
-
-app = Flask(__name__)
-api = Api(app)
-api_config = get_config()
-logging.debug(str(api_config))
-CORS(app, resources=api_config["cors"])
-
-api.add_resource(ClientList, "/client")
-api.add_resource(Client, "/client/<client_id>")
-api.add_resource(Receive, "/receive")
-api.add_resource(Send, "/send")
-api.add_resource(Notify, "/notify")
-api.add_resource(Token, "/token")
-api.add_resource(QueueList, "/queue")
-api.add_resource(Queue, "/queue/<queue_name>")
-
-
 if __name__ == "__main__":
     run()
\ No newline at end of file

api_wrap_socket.py

@@ -31,7 +31,7 @@ from autobahn.twisted.resource import WebSocketResource
 from autobahn.twisted.websocket import WebSocketServerFactory, WebSocketServerProtocol, listenWS
 from models.client_model import ClientModel
 from models.token_model import TokenModel
-from api_rest import app
+from api_rest import create_app
 from rmq import write_to_queue, listen, stop_listening
 
 SUBSCRIPTIONS = {}
@@ -192,7 +192,8 @@ def run():
 
     factory.protocol = SubscriptionServerProtocol
     socket_resource = WebSocketResource(factory)
-
+    
+    app = create_app()
     flask_resource = WSGIResource(reactor, reactor.getThreadPool(), app)
 
     # Create the flask resource and socket resource 

tests/api_client_test.py

@@ -3,7 +3,7 @@ import json
 import pytest
 from unittest.mock import patch, mock_open, call
 from werkzeug.exceptions import HTTPException
-from api import create_app
+from api_rest import create_app
 
 
 @pytest.mark.usefixtures("mock_clients")

tests/api_notify_test.py

@@ -3,7 +3,7 @@ import json
 import pytest
 from unittest.mock import patch, mock_open, call
 from werkzeug.exceptions import HTTPException
-from api import create_app
+from api_rest import create_app
 from endpoints import notify
 from conftest import get_auth_header
 

tests/api_receive_test.py

@@ -3,7 +3,7 @@ import json
 import pytest
 from unittest.mock import patch, mock_open, call
 from werkzeug.exceptions import HTTPException
-from api import create_app
+from api_rest import create_app
 from endpoints import receive
 from conftest import get_auth_header
 

tests/api_send_test.py

@@ -3,7 +3,7 @@ import json
 import pytest
 from unittest.mock import patch, mock_open, call
 from werkzeug.exceptions import HTTPException
-from api import create_app
+from api_rest import create_app
 from endpoints import send
 from conftest import get_auth_header
 

tests/api_token_test.py

@@ -3,7 +3,7 @@ import json
 import pytest
 from unittest.mock import patch, mock_open, call
 from werkzeug.exceptions import HTTPException
-from api import create_app
+from api_rest import create_app
 
 
 @pytest.mark.usefixtures("mock_clients", "mock_client_credentials")

tests/models/client_model_test.py

 import json
-import os
 import pytest
 import re
 from unittest.mock import patch, mock_open, call