genotypes: Remove obsolete endpoints.

1 files changed, 8 insertions, 48 deletions

diff --git a/uploader/genotypes/views.py b/uploader/genotypes/views.py
index d991614..0d8f983 100644
--- a/uploader/genotypes/views.py
+++ b/uploader/genotypes/views.py
@@ -28,53 +28,13 @@ from .models import (genotype_markers,
 genotypesbp = Blueprint("genotypes", __name__)
 render_template = make_template_renderer("genotypes")
 
-@genotypesbp.route("populations/genotypes", methods=["GET"])
-@require_login
-def index():
-    """Direct entry-point for genotypes."""
-    with database_connection(app.config["SQL_URI"]) as conn:
-        if not bool(request.args.get("species_id")):
-            return render_template("genotypes/index.html",
-                                   species=all_species(conn),
-                                   activelink="genotypes")
-
-        species_id = request.args.get("species_id")
-        if species_id == "CREATE-SPECIES":
-            return redirect(url_for(
-                "species.create_species",
-                return_to="species.populations.genotypes.select_population"))
-
-        species = species_by_id(conn, request.args.get("species_id"))
-        if not bool(species):
-            flash(f"Could not find species with ID '{request.args.get('species_id')}'!",
-                  "alert-danger")
-            return redirect(url_for("species.populations.genotypes.index"))
-        return redirect(url_for("species.populations.genotypes.select_population",
-                                species_id=species["SpeciesId"]))
-
-
-@genotypesbp.route("/<int:species_id>/populations/genotypes/select-population",
-                   methods=["GET"])
-@require_login
-@with_species(redirect_uri="species.populations.genotypes.index")
-def select_population(species: dict, species_id: int):# pylint: disable=[unused-argument]
-    """Select the population under which the genotypes go."""
-    return generic_select_population(
-        species,
-        "genotypes/select-population.html",
-        request.args.get("population_id") or "",
-        "species.populations.genotypes.select_population",
-        "species.populations.genotypes.list_genotypes",
-        "genotypes",
-        "Invalid population selected!")
-
 
 @genotypesbp.route(
     "/<int:species_id>/populations/<int:population_id>/genotypes",
     methods=["GET"])
 @require_login
-@with_population(species_redirect_uri="species.populations.genotypes.index",
-                 redirect_uri="species.populations.genotypes.select_population")
+@with_population(species_redirect_uri="species.list_species",
+                 redirect_uri="species.populations.list_species_populations")
 def list_genotypes(species: dict, population: dict, **kwargs):# pylint: disable=[unused-argument]
     """List genotype details for species and population."""
     with database_connection(app.config["SQL_URI"]) as conn:
@@ -95,8 +55,8 @@ def list_genotypes(species: dict, population: dict, **kwargs):# pylint: disable=
     "/<int:species_id>/populations/<int:population_id>/genotypes/list-markers",
     methods=["GET"])
 @require_login
-@with_population(species_redirect_uri="species.populations.genotypes.index",
-                 redirect_uri="species.populations.genotypes.select_population")
+@with_population(species_redirect_uri="species.list_species",
+                 redirect_uri="species.populations.list_species_populations")
 def list_markers(
         species: dict,
         population: dict,
@@ -132,14 +92,14 @@ def view_dataset(species_id: int, population_id: int, dataset_id: int):
         species = species_by_id(conn, species_id)
         if not bool(species):
             flash("Invalid species provided!", "alert-danger")
-            return redirect(url_for("species.populations.genotypes.index"))
+            return redirect(url_for("species.list_species"))
 
         population = population_by_species_and_id(
             conn, species_id, population_id)
         if not bool(population):
             flash("Invalid population selected!", "alert-danger")
             return redirect(url_for(
-                "species.populations.genotypes.select_population",
+                "species.populations.list_species_populations",
                 species_id=species_id))
 
         dataset = genotype_dataset(conn, species_id, population_id, dataset_id)
@@ -162,8 +122,8 @@ def view_dataset(species_id: int, population_id: int, dataset_id: int):
     "create",
     methods=["GET", "POST"])
 @require_login
-@with_population(species_redirect_uri="species.populations.genotypes.index",
-                 redirect_uri="species.populations.genotypes.select_population")
+@with_population(species_redirect_uri="species.list_species",
+                 redirect_uri="species.populations.list_species_populations")
 def create_dataset(species: dict, population: dict, **kwargs):# pylint: disable=[unused-argument]
     """Create a genotype dataset."""
     with (database_connection(app.config["SQL_URI"]) as conn,