New entities #134
New entities #134
Conversation
config/urls.py
Outdated
| @@ -5,6 +5,7 @@ | |||
| from django.urls import include, path | |||
| from django.views import defaults as default_views | |||
| from django.views.generic.base import RedirectView | |||
| from documentcloud.entities.views import EntityViewSet | |||
There was a problem hiding this comment.
This import is in the wrong section - running inv format should run black and isort - isort should properly sort imports
documentcloud/entities/admin.py
Outdated
| @@ -0,0 +1,3 @@ | |||
| from django.contrib import admin | |||
|
|
|||
| # Register your models here. | |||
There was a problem hiding this comment.
We probably want some sort of admin view for entities. Not top priority, an d I can help you configure this if needed
documentcloud/entities/models.py
Outdated
| from documentcloud.core.fields import AutoCreatedField, AutoLastModifiedField | ||
| from wikidata.client import Client | ||
| from django.utils.translation import gettext_lazy as _ | ||
| from .choices import EntityAccess |
There was a problem hiding this comment.
I prefer not to use relative imports - from documentcloud.entities.choices import EntityAccess
documentcloud/entities/models.py
Outdated
|
|
||
|
|
||
| class Entity(models.Model): | ||
| wd_entity = None |
There was a problem hiding this comment.
I think this should be an instance field instead of a class field
def __init__(self):
self.wd_entity = None
There was a problem hiding this comment.
It will probably be fine as an instance field, but it will save some memory if every Entity instance shares a single Wikidata client, which contains nothing specific to any particular instance. Let me know what you think.
documentcloud/entities/models.py
Outdated
| # A dictionary with language codes as keys. | ||
| wikipedia_url = models.JSONField() | ||
| owner = models.ForeignKey( | ||
| "users.User", related_name="entities", on_delete=models.CASCADE |
There was a problem hiding this comment.
Users should never be deleted, but I would change this to on_delete=models.PROTECT, which would prevent a user from being deleted if they have an entity
| # entities = serializers.PrimaryKeyRelatedField( | ||
| # many=True, queryset=Entity.objects.all() | ||
| # ) | ||
| # Use document's serializer |
There was a problem hiding this comment.
The serializer needs some work - lets review it together and compare to some of the other serializers we have
documentcloud/entities/views.py
Outdated
| permission_classes = [permissions.IsAuthenticatedOrReadOnly] | ||
|
|
||
| def perform_create(self, serializer): | ||
| serializer.save(owner=self.request.user) |
There was a problem hiding this comment.
I think we want to think about if public entities should have an owner at all
documentcloud/entities/views.py
Outdated
|
|
||
|
|
||
| @api_view(["GET"]) | ||
| def api_root(request, format=None): |
| _("access"), | ||
| choices=EntityAccess.choices, | ||
| help_text=_("Designates who may access this entity."), | ||
| ) |
There was a problem hiding this comment.
Maybe add a JSONField for metadata?
documentcloud/entities/views.py
Outdated
| from rest_framework.reverse import reverse | ||
|
|
||
|
|
||
| class EntityViewSet(viewsets.ModelViewSet): |
There was a problem hiding this comment.
I think we want a way to get entities by wikidata_id and name as well as by their internal ID
…uff needs to be mocked.
…with the old entity occurrences right now.
Adds the entities app and the new Entities model and corresponding serializer and view. Coming next: Tests, and permissions.