Fix invoke script using dev DB in non-dev

usaon_vta_survey/__init__.py

@@ -63,10 +63,14 @@ def before_request():
             if time.time() >= token['expires_at']:
                 del s['google_oauth_token']
 
-    from usaon_vta_survey.routes import response
     from usaon_vta_survey.routes.google import blueprint
     from usaon_vta_survey.routes.login import login_bp
     from usaon_vta_survey.routes.logout import logout_bp
+    from usaon_vta_survey.routes.response import bp
+    from usaon_vta_survey.routes.response.applications import application_bp
+    from usaon_vta_survey.routes.response.data_products import dp_bp
+    from usaon_vta_survey.routes.response.observing_systems import obs_bp
+    from usaon_vta_survey.routes.response.sbas import sba_bp
     from usaon_vta_survey.routes.root import root_bp
     from usaon_vta_survey.routes.survey import survey_bp
     from usaon_vta_survey.routes.surveys import surveys_bp
@@ -81,7 +85,11 @@ def before_request():
     app.register_blueprint(login_bp)
     app.register_blueprint(logout_bp)
     app.register_blueprint(blueprint, url_prefix="/google_oauth")
-    app.register_blueprint(response.bp)
+    app.register_blueprint(bp)
+    app.register_blueprint(obs_bp)
+    app.register_blueprint(sba_bp)
+    app.register_blueprint(application_bp)
+    app.register_blueprint(dp_bp)
 
     app.jinja_env.globals.update(sqla_inspect=sqla_inspect, __version__=__version__)
 

usaon_vta_survey/routes/response/applications.py

@@ -1,14 +1,17 @@
-from flask import redirect, render_template, request, url_for
+from flask import Blueprint, redirect, render_template, request, url_for
 
 from usaon_vta_survey import db
 from usaon_vta_survey.forms import FORMS_BY_MODEL
 from usaon_vta_survey.models.tables import ResponseApplication, Survey
-from usaon_vta_survey.routes.response import bp
 from usaon_vta_survey.util.authorization import limit_response_editors
 from usaon_vta_survey.util.sankey import applications_sankey
 
+application_bp = Blueprint(
+    'application', __name__, url_prefix='/response/<string:survey_id>/applications'
+)
 
-@bp.route('/<string:survey_id>/applications', methods=['GET', 'POST'])
+
+@application_bp.route('', methods=['GET', 'POST'])
 def view_response_applications(survey_id: str):
     """View and add to applications associated with a response."""
     Form = FORMS_BY_MODEL[ResponseApplication]

usaon_vta_survey/routes/response/data_products.py

@@ -1,13 +1,16 @@
-from flask import redirect, render_template, request, url_for
+from flask import Blueprint, redirect, render_template, request, url_for
 
 from usaon_vta_survey import db
 from usaon_vta_survey.forms import FORMS_BY_MODEL
 from usaon_vta_survey.models.tables import ResponseDataProduct, Survey
-from usaon_vta_survey.routes.response import bp
 from usaon_vta_survey.util.authorization import limit_response_editors
 
+dp_bp = Blueprint(
+    'data_product', __name__, url_prefix='/response/<string:survey_id>/data_products'
+)
 
-@bp.route('/<string:survey_id>/data_products', methods=['GET', 'POST'])
+
+@dp_bp.route('', methods=['GET', 'POST'])
 def view_response_data_products(survey_id: str):
     """View and add to data products associated with a response."""
     Form = FORMS_BY_MODEL[ResponseDataProduct]

usaon_vta_survey/routes/response/observing_systems.py

@@ -1,14 +1,17 @@
-from flask import redirect, render_template, request, url_for
+from flask import Blueprint, redirect, render_template, request, url_for
 
 from usaon_vta_survey import db
 from usaon_vta_survey._types import ObservingSystemType
 from usaon_vta_survey.forms import FORMS_BY_MODEL
 from usaon_vta_survey.models.tables import ResponseObservingSystem, Survey
-from usaon_vta_survey.routes.response import bp
 from usaon_vta_survey.util.authorization import limit_response_editors
 
+obs_bp = Blueprint(
+    'obs', __name__, url_prefix='/response/<string:survey_id>/observing_systems'
+)
 
-@bp.route('/<string:survey_id>/observing_systems', methods=['GET', 'POST'])
+
+@obs_bp.route('', methods=['GET', 'POST'])
 def view_response_observing_systems(survey_id: str):
     """View and add to observing systems associated with a response."""
     Form = FORMS_BY_MODEL[ResponseObservingSystem]

usaon_vta_survey/routes/response/sbas.py

@@ -1,4 +1,4 @@
-from flask import redirect, render_template, request, url_for
+from flask import Blueprint, redirect, render_template, request, url_for
 
 from usaon_vta_survey import db
 from usaon_vta_survey.forms import FORMS_BY_MODEL
@@ -7,11 +7,14 @@
     SocietalBenefitArea,
     Survey,
 )
-from usaon_vta_survey.routes.response import bp
 from usaon_vta_survey.util.authorization import limit_response_editors
 
+sba_bp = Blueprint(
+    'sba', __name__, url_prefix='/response/<string:survey_id>/societal_benefit_areas'
+)
+
 
-@bp.route('/<string:survey_id>/societal_benefit_areas', methods=['GET', 'POST'])
+@sba_bp.route('', methods=['GET', 'POST'])
 def view_response_sbas(survey_id: str):
     """View and add to observing systems associated with a response."""
     sbas = SocietalBenefitArea.query.all()

usaon_vta_survey/templates/response/base.html

@@ -15,25 +15,25 @@ <h2>{% block title %}Response to: {{survey.title}}{% endblock %}</h1>
       </li>
 
       <li>
-        <a href="{{url_for('view_response_observing_systems', survey_id=survey.id)}}">
+        <a href="{{url_for('obs.view_response_observing_systems', survey_id=survey.id)}}">
           Observing systems ({{survey.response.observing_systems | length}})
         </a>
       </li>
 
       <li>
-        <a href="{{url_for('view_response_data_products', survey_id=survey.id)}}">
+        <a href="{{url_for('data_product.view_response_data_products', survey_id=survey.id)}}">
           Data products ({{survey.response.data_products | length}})
         </a>
       </li>
 
       <li>
-        <a href="{{url_for('view_response_applications', survey_id=survey.id)}}">
+        <a href="{{url_for('application.view_response_applications', survey_id=survey.id)}}">
           Applications ({{survey.response.applications | length}})
         </a>
       </li>
 
       <li>
-        <a href="{{url_for('view_response_sbas', survey_id=survey.id)}}">
+        <a href="{{url_for('sba.view_response_sbas', survey_id=survey.id)}}">
           Societal Benefit Areas ({{survey.response.societal_benefit_areas | length}})
         </a>
       </li>