@ -14,7 +14,7 @@ from pyramid.renderers import render_to_response
from pyramid.request import Request
from pyramid.response import Response
from pyramid.view import view_config
from sqlalchemy import cast , or_
from sqlalchemy import cast
from sqlalchemy.sql.expression import any_ , desc , text
from sqlalchemy_utils import Ltree
from webargs.pyramidparser import use_kwargs
@ -140,7 +140,6 @@ def post_group_topics(
@view_config ( route_name = " home " , renderer = " home.jinja2 " )
@view_config ( route_name = " group " , renderer = " topic_listing.jinja2 " )
@use_kwargs ( TopicListingSchema ( ) )
@use_kwargs ( { " view " : String ( missing = None ) } )
def get_group_topics ( # noqa
request : Request ,
after : Optional [ str ] ,
@ -150,7 +149,6 @@ def get_group_topics( # noqa
rank_start : Optional [ int ] ,
tag : Optional [ Ltree ] ,
unfiltered : bool ,
view : Optional [ str ] ,
* * kwargs : Any
) - > dict :
""" Get a listing of topics in the group. """
@ -159,31 +157,11 @@ def get_group_topics( # noqa
is_home_page = request . matched_route . name == " home "
# only allow the special coronavirus views on the home page
if not is_home_page :
view = None
if view :
coronavirus_group = (
request . query ( Group )
. filter ( Group . path == Ltree ( " health.coronavirus " ) )
. one_or_none ( )
)
else :
coronavirus_group = None
if is_home_page :
# on the home page, include topics from the user's subscribed groups
# (or all groups, if logged-out)
if request . user :
groups = [ sub . group for sub in request . user . subscriptions ]
if (
view == " coronavirus-only "
and coronavirus_group
and coronavirus_group not in groups
) :
groups . append ( coronavirus_group )
else :
groups = [
group for group in request . query ( Group ) . all ( ) if group . path != " test "
@ -219,20 +197,6 @@ def get_group_topics( # noqa
. apply_sort_option ( order )
)
if view and coronavirus_group :
if view == " coronavirus-only " :
query = query . filter ( # noqa
or_ (
Topic . group_id == coronavirus_group . group_id ,
Topic . tags . contains ( [ " coronaviruses.covid19 " ] ) , # type: ignore
)
)
elif view == " coronavirus-filtered " :
query = query . filter (
Topic . group_id != coronavirus_group . group_id ,
~ Topic . tags . contains ( [ " coronaviruses.covid19 " ] ) , # type: ignore
)
# restrict the time period, if not set to "all time"
if period :
query = query . inside_time_period ( period )
@ -331,7 +295,6 @@ def get_group_topics( # noqa
" most_recent_scheduled_topics " : most_recent_scheduled_topics ,
" financial_data " : financial_data ,
" current_time " : utc_now ( ) ,
" view " : view ,
}