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.

Sign up for GitHub

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

Api endpoint url based indexing #604

Merged
merged 2 commits into from
Feb 14, 2024
+20 −45
Merged

Api endpoint url based indexing #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbfbb0d
added excluded field to the serializer
bishwaspraveen Feb 14, 2024
cf1ebf8
changed view to add exclusion status to the query set
bishwaspraveen Feb 14, 2024
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
29 changes: 11 additions & 18 deletions sde_collections/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,8 @@


class CollectionSerializer(serializers.ModelSerializer):
curation_status_display = serializers.CharField(
source="get_curation_status_display", read_only=True
)
workflow_status_display = serializers.CharField(
source="get_workflow_status_display", read_only=True
)
curation_status_display = serializers.CharField(source="get_curation_status_display", read_only=True)
workflow_status_display = serializers.CharField(source="get_workflow_status_display", read_only=True)

class Meta:
model = Collection
Expand All @@ -44,9 +40,7 @@ class Meta:

class CandidateURLSerializer(serializers.ModelSerializer):
excluded = serializers.BooleanField(required=False)
document_type_display = serializers.CharField(
source="get_document_type_display", read_only=True
)
document_type_display = serializers.CharField(source="get_document_type_display", read_only=True)
url = serializers.CharField(required=False)
generated_title_id = serializers.SerializerMethodField(read_only=True)
match_pattern_type = serializers.SerializerMethodField(read_only=True)
Expand Down Expand Up @@ -95,10 +89,9 @@ class Meta:


class CandidateURLAPISerializer(serializers.ModelSerializer):
document_type = serializers.CharField(
source="get_document_type_display", read_only=True
)
document_type = serializers.CharField(source="get_document_type_display", read_only=True)
title = serializers.CharField(source="scraped_title")
excluded = serializers.SerializerMethodField()

class Meta:
model = CandidateURL
Expand All @@ -107,13 +100,15 @@ class Meta:
"title",
"document_type",
"hash",
"excluded",
)

def get_excluded(self, obj):
return getattr(obj, "excluded", False)


class BasePatternSerializer(serializers.ModelSerializer):
match_pattern_type_display = serializers.CharField(
source="get_match_pattern_type_display", read_only=True
)
match_pattern_type_display = serializers.CharField(source="get_match_pattern_type_display", read_only=True)
candidate_urls_count = serializers.SerializerMethodField(read_only=True)

def get_candidate_urls_count(self, instance):
Expand Down Expand Up @@ -161,9 +156,7 @@ def validate_match_pattern(self, value):


class DocumentTypePatternSerializer(BasePatternSerializer, serializers.ModelSerializer):
document_type_display = serializers.CharField(
source="get_document_type_display", read_only=True
)
document_type_display = serializers.CharField(source="get_document_type_display", read_only=True)
document_type = serializers.ChoiceField(
choices=DocumentTypes.choices
+ [
Expand Down
36 changes: 9 additions & 27 deletions sde_collections/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,8 @@ def post(self, request, *args, **kwargs):
collection.github_issue_number = github_issue_number
collection.save()
else:
github_form.add_error(
"github_issue_link", "Invalid GitHub issue link format"
)
return self.render_to_response(
self.get_context_data(form=form, github_form=github_form)
)
github_form.add_error("github_issue_link", "Invalid GitHub issue link format")
return self.render_to_response(self.get_context_data(form=form, github_form=github_form))
return redirect("sde_collections:detail", pk=collection.pk)

else:
Expand All @@ -132,9 +128,7 @@ def get_context_data(self, **kwargs):
context["github_form"] = CollectionGithubIssueForm(
initial={"github_issue_link": self.get_object().github_issue_link}
)
context["required_urls"] = RequiredUrls.objects.filter(
collection=self.get_object()
)
context["required_urls"] = RequiredUrls.objects.filter(collection=self.get_object())
context["segment"] = "collection-detail"
return context

Expand All @@ -143,9 +137,7 @@ class RequiredUrlsDeleteView(LoginRequiredMixin, DeleteView):
model = RequiredUrls

def get_success_url(self, *args, **kwargs):
return reverse(
"sde_collections:detail", kwargs={"pk": self.object.collection.pk}
)
return reverse("sde_collections:detail", kwargs={"pk": self.object.collection.pk})


class CandidateURLsListView(LoginRequiredMixin, ListView):
Expand Down Expand Up @@ -254,9 +246,7 @@ def get(self, request, *args, **kwargs):
return super().get(request, *args, **kwargs)

def get_queryset(self):
queryset = CandidateURL.objects.filter(
collection__config_folder=self.config_folder
)
queryset = CandidateURL.objects.filter(collection__config_folder=self.config_folder).with_exclusion_status()
return queryset


Expand Down Expand Up @@ -347,9 +337,7 @@ class PushToGithubView(APIView):
def post(self, request):
collection_ids = request.POST.getlist("collection_ids[]", [])
if len(collection_ids) == 0:
return Response(
"collection_ids can't be empty.", status=status.HTTP_400_BAD_REQUEST
)
return Response("collection_ids can't be empty.", status=status.HTTP_400_BAD_REQUEST)

push_to_github_task.delay(collection_ids)

Expand All @@ -371,9 +359,7 @@ def get(self, request, *args, **kwargs):
self.data = generate_db_github_metadata_differences()
else:
# this needs to be a celery task eventually
self.data = generate_db_github_metadata_differences(
reindex_configs_from_github=True
)
self.data = generate_db_github_metadata_differences(reindex_configs_from_github=True)

return super().get(request, *args, **kwargs)

Expand All @@ -391,12 +377,8 @@ def post(self, request, *args, **kwargs):
elif field == "connector":
new_value = ConnectorChoices.lookup_by_text(new_value)

Collection.objects.filter(config_folder=config_folder).update(
**{field: new_value}
)
messages.success(
request, f"Successfully updated {field} of {config_folder}."
)
Collection.objects.filter(config_folder=config_folder).update(**{field: new_value})
messages.success(request, f"Successfully updated {field} of {config_folder}.")
else:
messages.error(
request,
Expand Down