Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add agency news api #18

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions news/api/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
path('search/<str:keyword>', views.NewsSearchView.as_view()),
path('suggestion/<str:token>', views.NewsSuggestionView.as_view()),
path('subscription/', views.NewsSubscriptionView.as_view()),
path('agency/<str:agency_name>', views.AgencyDetailView.as_view()),
path('<str:token>/', views.NewsDetailView.as_view()),
]
13 changes: 13 additions & 0 deletions news/api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
create_news_suggestion,
get_user_subscriptions_service,
subscribe_news_service,
get_agency_service,
get_agency_news_service,
)
from response.rest import (
OkResponse,
Expand Down Expand Up @@ -113,6 +115,17 @@ def post(self, request):
return NotFoundResponse(message=message)


class AgencyDetailView(APIView):

def get(self, request, agency_name):
is_successful, message = get_agency_service(agency_name)
if is_successful:
news = get_agency_news_service(agency_name)
return OkResponse(agency=message, news=news)
else:
return NotFoundResponse(message=message)


# Get news by Category title
class CategoryDetailView(APIView):
def get(self, request, category_name):
Expand Down
18 changes: 17 additions & 1 deletion news/services/news.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@
get_news_by_description_detail,
get_random_news,
get_subscriptions_by_subscriber,
get_agency_news,
)
from news.utils.news_cache import NewsCache
from news.models import News, Agency, Reporter, Subscription
from news.api.serializers import NewsSerializer
from news.api.serializers import NewsSerializer, AgencySerializer


def login_by_username_password(username: str, password: str) -> Tuple[bool, str]:
Expand Down Expand Up @@ -68,6 +69,21 @@ def get_detail_view_service(token: str):
return True, resp


def get_agency_service(agency_name: str):
# todo add cache
try:
agency = get_agency_by_name(agency_name)
except Agency.DoesNotExist:
return False, 'there is no agency with this token'
resp = AgencySerializer(agency).data
return True, resp


def get_agency_news_service(agency_name: str):
news = get_agency_news(agency_name)
resp = NewsSerializer(news, many=True).data
return resp

def is_user_reporter(username):
reporter = get_reporter_by_username(username)
if reporter is None:
Expand Down
7 changes: 7 additions & 0 deletions news/utils/news.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@ def get_agency_by_name(name):
return None


def get_agency_news(agency_name):
agency = Agency.objects.get(name=agency_name)
news = News.objects.filter(agency=agency)
return news



def get_category_id(category_name):
category = Category.objects.get(title=category_name)
return category.id
Expand Down