- Item page
{% if spc.page.iiif_baseimage_url %}
diff --git a/api/document/urls.py b/api/document/urls.py
index 9629b50..2e0bf3a 100644
--- a/api/document/urls.py
+++ b/api/document/urls.py
@@ -3,8 +3,15 @@
urlpatterns = [
path('',views.SourceList.as_view()),
- path('RUD/',views.SourceRUD.as_view()),
+ path('GENERIC/',views.SourceListGENERIC.as_view()),
+ path('shortref/CREATE/',views.ShortRefCREATE.as_view()),
+ path('shortref/RETRIEVE/',views.ShortRefRETRIEVE.as_view()),
+ path('shortref/UPDATE/',views.ShortRefUPDATE.as_view()),
+ path('shortref/DESTROY/',views.ShortRefDESTROY.as_view()),
path('CREATE/',views.SourceCREATE.as_view()),
+ path('RETRIEVE/',views.SourceRETRIEVE.as_view()),
+ path('UPDATE/',views.SourceUPDATE.as_view()),
+ path('DESTROY/',views.SourceDESTROY.as_view()),
# path('page/CREATE/',views.PageCREATE.as_view()),
# path('SHORTREF/GET/',views.ShortRefGET.as_view()),
path('gallery',views.Gallery),
diff --git a/api/document/views.py b/api/document/views.py
index 9443c27..0ef1310 100644
--- a/api/document/views.py
+++ b/api/document/views.py
@@ -8,6 +8,7 @@
from rest_framework import generics
from rest_framework.metadata import SimpleMetadata
from rest_framework.response import Response
+from rest_framework.pagination import PageNumberPagination
from rest_framework.authentication import TokenAuthentication
from rest_framework.permissions import IsAuthenticated,IsAdminUser
from django.views.generic.list import ListView
@@ -22,12 +23,14 @@
import collections
import gc
from .serializers import *
+from .serializers_READONLY import *
from voyages3.localsettings import *
import re
from django.db.models import Q
from drf_spectacular.utils import extend_schema, OpenApiParameter, OpenApiExample
from drf_spectacular.types import OpenApiTypes
from common.static.Source_options import Source_options
+from rest_framework import filters
class SourceList(generics.GenericAPIView):
authentication_classes=[TokenAuthentication]
@@ -41,7 +44,7 @@ def post(self,request):
These changes necessitated that we create Docs as its own django app and endpoint. Now, each "Source" points at one or more Voyages, Enslaved People, or Enslavers. In turn, some of these Sources also have page-level metadata and links to IIIF images. For more information on the IIIF specification, visit https://iiif.io/api/index.html
'''
- print("VOYAGE LIST+++++++\nusername:",request.auth.user)
+ print("SOURCE LIST+++++++\nusername:",request.auth.user)
queryset=Source.objects.all()
queryset=queryset.order_by('id')
source_options=getJSONschema('Source',hierarchical=False)
@@ -66,11 +69,45 @@ def post(self,request):
print("failed\n+++++++")
return JsonResponse({'status':'false','message':' | '.join(error_messages)}, status=400)
+class SourceListGENERIC(generics.ListAPIView):
+ '''
+ TESTING A GENERIC, EASY-TO-SEARCH, PAGINATED LIST OF SOURCES FOR DELLAMONICA & SSC
+
+ GET queries to this endpoint with the param "search" will search the following:
+
+ A. EXACT on
+ 1. "short_ref__name", e.g. 1713Poll
+ 2. "date__year", e.g. 1982
+ 3. "zotero_item_id", e.g. FPGTSQXM
+ B. ICOMPLETE on "title"
+
+ Because sources have massively nested data in some cases, I have had to restrict us to a maximum of 5 results per page.
+
+ DON'T search OMNO in Swagger. My server can take Daniel Domingues Texas data, but your browser cannot :)
+ '''
+ queryset=Source.objects.all()
+ queryset.prefetch_related(
+ 'page_connections',
+ 'source_enslaver_connections',
+ 'source_voyage_connections',
+ 'source_enslaved_connections',
+ 'source_enslavement_relation_connections'
+ )
+ queryset.select_related(
+ 'short_ref',
+ 'date'
+ )
+ authentication_classes=[TokenAuthentication]
+ permission_classes=[IsAuthenticated]
+ serializer_class=SourceSerializer
+ filter_backends = [filters.SearchFilter]
+ search_fields = ['title','=date__year','short_ref__name','=zotero_item_id']
+
#######################
# default view will be a paginated gallery
@extend_schema(
- exclude=True
- )
+ exclude=True
+ )
def Gallery(request,collection_id=None,pagenumber=1):
if request.user.is_authenticated:
@@ -119,40 +156,76 @@ def Gallery(request,collection_id=None,pagenumber=1):
#######################
# then the individual page view
@extend_schema(
- exclude=True
- )
+ exclude=True
+ )
def source_page(request,source_id=1):
-
if request.user.is_authenticated:
source=Source.objects.get(id=source_id)
return render(request, "single_doc.html", {'source':source})
else:
return HttpResponseForbidden("Forbidden")
-class ShortRefGET(generics.RetrieveAPIView):
+@extend_schema(
+ exclude=True
+ )
+class ShortRefCREATE(generics.CreateAPIView):
+ '''
+ Shortrefs by canonical name, like "OMNO", "IMNO", or "DOCP Huntington 57 21"
'''
- GET Short Ref using PK
+ queryset=ShortRef.objects.all()
+ serializer_class=CRUDShortRefSerializer
+ lookup_field='name'
+ authentication_classes=[TokenAuthentication]
+ permission_classes=[IsAdminUser]
+
+@extend_schema(
+ exclude=True
+ )
+class ShortRefRETRIEVE(generics.RetrieveAPIView):
+ '''
+ Shortrefs by canonical name, like "OMNO", "IMNO", or "DOCP Huntington 57 21"
These used to be unique values on the sources table in Voyages. In that legacy model, we had a short_ref and a full_ref for each source, and then, in our union table with voyages, we had a text_ref field where we would put page numbers, or box and folder numbers, etc. However, this led to a good deal of schema abuse (duplication, inconsistent use of fields, etc.)
In the new model, we maintain the uniqueness of Short Ref's but we allow many Source objects to connect to these short ref's. The new source objects have much more, and much more structured data, being managed remotely in Zotero. Each source therefore now has an additional unique identifier: its Zotero Item ID.
+
+ It could make sense to give these short refs their own Zotero listings.
'''
queryset=ShortRef.objects.all()
serializer_class=ShortRefSerializer
lookup_field='name'
authentication_classes=[TokenAuthentication]
+ permission_classes=[IsAuthenticated]
+
+@extend_schema(
+ exclude=True
+ )
+class ShortRefUPDATE(generics.UpdateAPIView):
+ '''
+ Shortrefs by canonical name, like "OMNO", "IMNO", or "DOCP Huntington 57 21"
+ '''
+ queryset=ShortRef.objects.all()
+ serializer_class=CRUDShortRefSerializer
+ lookup_field='name'
+ authentication_classes=[TokenAuthentication]
permission_classes=[IsAdminUser]
-# class PageCREATE(generics.CreateAPIView):
-# '''
-# CREATE Page without a pk
-# '''
-# queryset=Page.objects.all()
-# serializer_class=PageSerializer
-# authentication_classes=[TokenAuthentication]
-# permission_classes=[IsAdminUser]
+@extend_schema(
+ exclude=True
+ )
+class ShortRefDESTROY(generics.DestroyAPIView):
+ '''
+ Shortrefs by canonical name, like "OMNO", "IMNO", or "DOCP Huntington 57 21"
+ '''
+ queryset=ShortRef.objects.all()
+ serializer_class=CRUDShortRefSerializer
+ lookup_field='name'
+ authentication_classes=[TokenAuthentication]
+ permission_classes=[IsAdminUser]
-
+@extend_schema(
+ exclude=True
+ )
class SourceCREATE(generics.CreateAPIView):
'''
CREATE Source without a pk
@@ -166,11 +239,37 @@ class SourceCREATE(generics.CreateAPIView):
authentication_classes=[TokenAuthentication]
permission_classes=[IsAdminUser]
-class SourceRUD(generics.RetrieveUpdateDestroyAPIView):
+class SourceRETRIEVE(generics.RetrieveAPIView):
'''
- RETRIEVE, UPDATE, OR DELETE SOURCE.
+ The lookup field for sources is the pk (id)
+ '''
+ queryset=Source.objects.all()
+ serializer_class=SourceSerializer
+ lookup_field='id'
+ authentication_classes=[TokenAuthentication]
+ permission_classes=[IsAuthenticated]
+
+@extend_schema(
+ exclude=True
+ )
+class SourceUPDATE(generics.UpdateAPIView):
+ '''
+ The lookup field for sources is the pk (id)
- The lookup field for sources is "id".
+ Voyages, Enslaved, and Enslavers are presented in this model, but are set to read-only.
+ '''
+ queryset=Source.objects.all()
+ serializer_class=SourceCRUDSerializer
+ lookup_field='id'
+ authentication_classes=[TokenAuthentication]
+ permission_classes=[IsAdminUser]
+
+@extend_schema(
+ exclude=True
+ )
+class SourceDESTROY(generics.DestroyAPIView):
+ '''
+ The lookup field for sources is the pk (id)
Voyages, Enslaved, and Enslavers are presented in this model, but are set to read-only.
'''
diff --git a/api/geo/serializers.py b/api/geo/serializers.py
index 3f35ca3..3998849 100644
--- a/api/geo/serializers.py
+++ b/api/geo/serializers.py
@@ -7,7 +7,7 @@
from drf_writable_nested.serializers import WritableNestedModelSerializer
from drf_writable_nested.mixins import UniqueFieldsMixin
-class LocationTypeSerializer(UniqueFieldsMixin, serializers.ModelSerializer):
+class CRUDLocationTypeSerializer(UniqueFieldsMixin, serializers.ModelSerializer):
class Meta:
model=LocationType
fields='__all__'
@@ -23,34 +23,14 @@ def create(self, validated_data):
return super(LocationTypeSerializer, self).create(validated_data)
-class PolygonSerializer(serializers.ModelSerializer):
+class CRUDPolygonSerializer(serializers.ModelSerializer):
class Meta:
model=Polygon
fields='__all__'
-class LocationParentSerializer(serializers.ModelSerializer):
- class Meta:
- model=Location
- fields='__all__'
-
-class LocationChildSerializer(serializers.ModelSerializer):
- class Meta:
- model=Location
- fields='__all__'
-
-
-class LocationSerializerDeep(serializers.ModelSerializer):
- parents=LocationParentSerializer(many=False)
- children=LocationChildSerializer(many=True)
- spatial_extent=PolygonSerializer(many=False)
- location_type=LocationTypeSerializer(many=False)
- class Meta:
- model=Location
- fields='__all__'
-
-class LocationSerializer(WritableNestedModelSerializer):
- spatial_extent=PolygonSerializer(many=False,allow_null=True)
- location_type=LocationTypeSerializer(many=False)
+class CRUDLocationSerializer(WritableNestedModelSerializer):
+ spatial_extent=CRUDPolygonSerializer(many=False,allow_null=True)
+ location_type=CRUDLocationTypeSerializer(many=False)
latitude=serializers.DecimalField(allow_null=True,max_digits=10,decimal_places=7)
longitude=serializers.DecimalField(allow_null=True,max_digits=10,decimal_places=7)
class Meta:
diff --git a/api/geo/serializers_READONLY.py b/api/geo/serializers_READONLY.py
new file mode 100644
index 0000000..ed7b8b0
--- /dev/null
+++ b/api/geo/serializers_READONLY.py
@@ -0,0 +1,46 @@
+from rest_framework import serializers
+from rest_framework.fields import SerializerMethodField,IntegerField,CharField
+import re
+from .models import *
+from drf_spectacular.utils import extend_schema_serializer, OpenApiExample
+from django.core.exceptions import ObjectDoesNotExist
+
+class LocationTypeSerializer(serializers.ModelSerializer):
+ class Meta:
+ model=LocationType
+ fields='__all__'
+
+
+class PolygonSerializer(serializers.ModelSerializer):
+ class Meta:
+ model=Polygon
+ fields='__all__'
+
+class LocationParentSerializer(serializers.ModelSerializer):
+ class Meta:
+ model=Location
+ fields='__all__'
+
+class LocationChildSerializer(serializers.ModelSerializer):
+ class Meta:
+ model=Location
+ fields='__all__'
+
+
+class LocationSerializerDeep(serializers.ModelSerializer):
+ parents=LocationParentSerializer(many=False)
+ children=LocationChildSerializer(many=True)
+ spatial_extent=PolygonSerializer(many=False)
+ location_type=LocationTypeSerializer(many=False)
+ class Meta:
+ model=Location
+ fields='__all__'
+
+class LocationSerializer(serializers.ModelSerializer):
+ spatial_extent=PolygonSerializer(many=False,allow_null=True)
+ location_type=LocationTypeSerializer(many=False)
+ latitude=serializers.DecimalField(allow_null=True,max_digits=10,decimal_places=7)
+ longitude=serializers.DecimalField(allow_null=True,max_digits=10,decimal_places=7)
+ class Meta:
+ model=Location
+ fields='__all__'
\ No newline at end of file
diff --git a/api/geo/urls.py b/api/geo/urls.py
index acb8090..68cacaf 100644
--- a/api/geo/urls.py
+++ b/api/geo/urls.py
@@ -5,7 +5,9 @@
urlpatterns = [
path('', views.GeoTree.as_view()),
path('CREATE/',views.LocationCREATE.as_view()),
- path('RUD/',views.LocationRUD.as_view()),
+ path('RETRIEVE/',views.LocationRETRIEVE.as_view()),
+ path('UPDATE/',views.LocationUPDATE.as_view()),
+ path('DESTROY/',views.LocationDESTROY.as_view())
]
\ No newline at end of file
diff --git a/api/geo/views.py b/api/geo/views.py
index e9cc582..ab367e1 100644
--- a/api/geo/views.py
+++ b/api/geo/views.py
@@ -11,7 +11,8 @@
from .models import *
from .common import GeoTreeFilter
from drf_spectacular.utils import extend_schema
-from .serializers import LocationSerializer
+from .serializers import CRUDLocationSerializer
+from .serializers_READONLY import LocationSerializer,LocationSerializerDeep
@extend_schema(
@@ -28,6 +29,9 @@ def post(self,request):
print("Internal Response Time:",time.time()-st,"\n+++++++")
return resp
+@extend_schema(
+ exclude=True
+ )
class LocationCREATE(generics.CreateAPIView):
'''
CREATE Source without a pk
@@ -37,15 +41,32 @@ class LocationCREATE(generics.CreateAPIView):
For places and regions you *should* provide a parent in child_of field
'''
queryset=Location.objects.all()
- serializer_class=LocationSerializer
+ serializer_class=CRUDLocationSerializer
authentication_classes=[TokenAuthentication]
permission_classes=[IsAdminUser]
-class LocationRUD(generics.RetrieveUpdateDestroyAPIView):
+class LocationRETRIEVE(generics.RetrieveAPIView):
'''
- Retrieve, update, or delete a location.
+ The lookup field for contributions is "VALUE". This corresponds to the legacy SPSS codes used for geo data -- first for voyage itineraries and ship construction/registration locations, but later on for enslaved peoples\' origins and final known locations, as well as for Enslavers\' place of birth etc. In the legacy SV website db, these 'Locations' were stored as separate models, hierarchically ordered.
+
+ 1. Place
+ 2. Region
+ 3. Broad Region
+ While the SPSS codes / "value" fields in these models were supposed to be unique, this was not always the case. I therefore decided to collapse these into a single model, enforce the uniqueness of the value fields, create a location_type model to store these locations, and store the hierarchical relation through a child_of foreign key.
+ '''
+ queryset=Location.objects.all()
+ serializer_class=LocationSerializerDeep
+ lookup_field='value'
+ authentication_classes=[TokenAuthentication]
+ permission_classes=[IsAuthenticated]
+
+@extend_schema(
+ exclude=True
+ )
+class LocationUPDATE(generics.UpdateAPIView):
+ '''
The lookup field for contributions is "VALUE". This corresponds to the legacy SPSS codes used for geo data -- first for voyage itineraries and ship construction/registration locations, but later on for enslaved peoples\' origins and final known locations, as well as for Enslavers\' place of birth etc. In the legacy SV website db, these 'Locations' were stored as separate models, hierarchically ordered.
1. Place
@@ -55,8 +76,20 @@ class LocationRUD(generics.RetrieveUpdateDestroyAPIView):
While the SPSS codes / "value" fields in these models were supposed to be unique, this was not always the case. I therefore decided to collapse these into a single model, enforce the uniqueness of the value fields, create a location_type model to store these locations, and store the hierarchical relation through a child_of foreign key.
'''
queryset=Location.objects.all()
- serializer_class=LocationSerializer
+ serializer_class=CRUDLocationSerializer
+ lookup_field='value'
+ authentication_classes=[TokenAuthentication]
+ permission_classes=[IsAdminUser]
+
+@extend_schema(
+ exclude=True
+ )
+class LocationDESTROY(generics.DestroyAPIView):
+ '''
+ The lookup field for contributions is "VALUE". This corresponds to the legacy SPSS codes used for geo data -- first for voyage itineraries and ship construction/registration locations, but later on for enslaved peoples\' origins and final known locations, as well as for Enslavers\' place of birth etc. In the legacy SV website db, these 'Locations' were stored as separate models, hierarchically ordered.
+ '''
+ queryset=Location.objects.all()
+ serializer_class=CRUDLocationSerializer
lookup_field='value'
authentication_classes=[TokenAuthentication]
permission_classes=[IsAdminUser]
-
\ No newline at end of file
diff --git a/api/past/admin.py b/api/past/admin.py
index fbe8dcf..92fe5f2 100755
--- a/api/past/admin.py
+++ b/api/past/admin.py
@@ -104,4 +104,5 @@ class EnslavedAdmin(nested_admin.NestedModelAdmin):
admin.site.register(EnslavementRelation,EnslavementRelationAdmin)
admin.site.register(EnslaverIdentity,EnslaverIdentityAdmin)
admin.site.register(EnslaverAlias,EnslaverAliasAdmin)
-admin.site.register(Enslaved,EnslavedAdmin)
\ No newline at end of file
+admin.site.register(Enslaved,EnslavedAdmin)
+admin.site.register(EnslaverRole)
\ No newline at end of file
diff --git a/api/past/serializers_READONLY.py b/api/past/serializers_READONLY.py
index d3df56c..5962fd8 100644
--- a/api/past/serializers_READONLY.py
+++ b/api/past/serializers_READONLY.py
@@ -214,6 +214,17 @@ class Meta:
model=Enslaved
fields='__all__'
+class EnslavedPKSerializer(serializers.ModelSerializer):
+ post_disembark_location=PastLocationSerializer(many=False)
+ captive_fate=CaptiveFateSerializer(many=False)
+ enslaved_relations=EnslavedInRelationSerializer(many=True)
+ captive_status=CaptiveStatusSerializer(many=False)
+ language_group=LanguageGroupSerializer(many=False)
+ enslaved_source_connections=PastSourceEnslavedConnectionSerializer(many=True)
+ class Meta:
+ model=Enslaved
+ fields='__all__'
+
#######################
@@ -305,3 +316,32 @@ class EnslaverSerializer(serializers.ModelSerializer):
class Meta:
model=EnslaverIdentity
fields='__all__'
+
+
+class EnslaverPKSerializer(serializers.ModelSerializer):
+ principal_location=PastLocationSerializer(many=False)
+ enslaver_source_connections=PastSourceEnslaverConnectionSerializer(many=True)
+ aliases=EnslaverAliasSerializer(many=True)
+ birth_place=PastLocationSerializer(many=False)
+ death_place=PastLocationSerializer(many=False)
+ class Meta:
+ model=EnslaverIdentity
+ fields='__all__'
+
+
+
+class EnslavementRelationSparseDateSerializer(serializers.ModelSerializer):
+ class Meta:
+ model=VoyageSparseDate
+ fields='__all__'
+
+class EnslavementRelationPKSerializer(serializers.ModelSerializer):
+ relation_type=EnslavementRelationTypeSerializer(many=False,allow_null=True)
+ place=PastLocationSerializer(many=False,allow_null=True)
+ date=EnslavementRelationSparseDateSerializer(many=False,allow_null=True)
+ relation_enslavers=EnslaverInRelationSerializer(many=True)
+ enslaved_in_relation=EnslavedInRelationSerializer(many=True)
+ class Meta:
+ model=EnslavementRelation
+ fields='__all__'
+
diff --git a/api/past/urls.py b/api/past/urls.py
index b828a7b..7d7ea3d 100644
--- a/api/past/urls.py
+++ b/api/past/urls.py
@@ -17,9 +17,15 @@
path('enslaved/geotree/',views.EnslavedGeoTreeFilter.as_view()),
path('enslaver/geotree/',views.EnslaverGeoTreeFilter.as_view()),
path('enslavementrelation/CREATE/',views.EnslavementRelationCREATE.as_view()),
- path('enslavementrelation/RUD/',views.EnslavementRelationRUD.as_view()),
+ path('enslavementrelation/RETRIEVE/',views.EnslavementRelationRETRIEVE.as_view()),
+ path('enslavementrelation/UPDATE/',views.EnslavementRelationUPDATE.as_view()),
+ path('enslavementrelation/DESTROY/',views.EnslavementRelationDESTROY.as_view()),
path('enslaver/CREATE/',views.EnslaverCREATE.as_view()),
- path('enslaver/RUD/',views.EnslaverRUD.as_view()),
+ path('enslaver/RETRIEVE/',views.EnslaverRETRIEVE.as_view()),
+ path('enslaver/UPDATE/',views.EnslaverUPDATE.as_view()),
+ path('enslaver/DESTROY/',views.EnslaverDESTROY.as_view()),
path('enslaved/CREATE/',views.EnslavedCREATE.as_view()),
- path('enslaved/RUD/',views.EnslavedRUD.as_view())
+ path('enslaved/RETRIEVE/',views.EnslavedRETRIEVE.as_view()),
+ path('enslaved/UPDATE/',views.EnslavedUPDATE.as_view()),
+ path('enslaved/DESTROY/',views.EnslavedDESTROY.as_view())
]
diff --git a/api/past/views.py b/api/past/views.py
index ec81716..f3c79ae 100644
--- a/api/past/views.py
+++ b/api/past/views.py
@@ -20,7 +20,7 @@
from common.reqs import *
from collections import Counter
from geo.common import GeoTreeFilter
-from geo.serializers import LocationSerializer
+from geo.serializers_READONLY import LocationSerializer
from voyages3.localsettings import *
from drf_spectacular.utils import extend_schema, OpenApiParameter, OpenApiExample
from drf_spectacular.types import OpenApiTypes
@@ -513,7 +513,9 @@ def post(self,request):
#CONTRIBUTIONS
-
+@extend_schema(
+ exclude=True
+ )
class EnslavementRelationCREATE(generics.CreateAPIView):
'''
Create an enslavement relation without a pk
@@ -524,9 +526,22 @@ class EnslavementRelationCREATE(generics.CreateAPIView):
authentication_classes=[TokenAuthentication]
permission_classes=[IsAdminUser]
-class EnslavementRelationRUD(generics.RetrieveUpdateDestroyAPIView):
+class EnslavementRelationRETRIEVE(generics.RetrieveAPIView):
+ '''
+ Retrieve an enslavement relation record with their pk
+ '''
+ queryset=EnslavementRelation.objects.all()
+ serializer_class=EnslavementRelationPKSerializer
+ lookup_field='id'
+ authentication_classes=[TokenAuthentication]
+ permission_classes=[IsAuthenticated]
+
+@extend_schema(
+ exclude=True
+ )
+class EnslavementRelationUPDATE(generics.UpdateAPIView):
'''
- Fetch, update, or delete an enslavement relation record with their pk
+ Update an enslavement relation record with their pk
'''
queryset=EnslavementRelation.objects.all()
serializer_class=EnslavementRelationCRUDSerializer
@@ -534,6 +549,22 @@ class EnslavementRelationRUD(generics.RetrieveUpdateDestroyAPIView):
authentication_classes=[TokenAuthentication]
permission_classes=[IsAdminUser]
+@extend_schema(
+ exclude=True
+ )
+class EnslavementRelationDESTROY(generics.DestroyAPIView):
+ '''
+ Delete an enslavement relation record with their pk
+ '''
+ queryset=EnslavementRelation.objects.all()
+ serializer_class=EnslavementRelationCRUDSerializer
+ lookup_field='id'
+ authentication_classes=[TokenAuthentication]
+ permission_classes=[IsAdminUser]
+
+@extend_schema(
+ exclude=True
+ )
class EnslaverCREATE(generics.CreateAPIView):
'''
Create enslaver without a pk
@@ -544,9 +575,22 @@ class EnslaverCREATE(generics.CreateAPIView):
authentication_classes=[TokenAuthentication]
permission_classes=[IsAdminUser]
-class EnslaverRUD(generics.RetrieveUpdateDestroyAPIView):
+class EnslaverRETRIEVE(generics.RetrieveAPIView):
+ '''
+ Retrieve an enslaver record with their pk
+ '''
+ queryset=EnslaverIdentity.objects.all()
+ serializer_class=EnslaverPKSerializer
+ lookup_field='id'
+ authentication_classes=[TokenAuthentication]
+ permission_classes=[IsAuthenticated]
+
+@extend_schema(
+ exclude=True
+ )
+class EnslaverUPDATE(generics.UpdateAPIView):
'''
- Fetch, update, or delete an enslaver record with their pk
+ Update an enslaver record with their pk
'''
queryset=EnslaverIdentity.objects.all()
serializer_class=EnslaverCRUDSerializer
@@ -554,6 +598,22 @@ class EnslaverRUD(generics.RetrieveUpdateDestroyAPIView):
authentication_classes=[TokenAuthentication]
permission_classes=[IsAdminUser]
+@extend_schema(
+ exclude=True
+ )
+class EnslaverDESTROY(generics.DestroyAPIView):
+ '''
+ Delete an enslaver record with their pk
+ '''
+ queryset=EnslaverIdentity.objects.all()
+ serializer_class=EnslaverCRUDSerializer
+ lookup_field='id'
+ authentication_classes=[TokenAuthentication]
+ permission_classes=[IsAdminUser]
+
+@extend_schema(
+ exclude=True
+ )
class EnslavedCREATE(generics.CreateAPIView):
'''
Create enslaver without a pk
@@ -564,10 +624,35 @@ class EnslavedCREATE(generics.CreateAPIView):
authentication_classes=[TokenAuthentication]
permission_classes=[IsAdminUser]
+class EnslavedRETRIEVE(generics.RetrieveAPIView):
+ '''
+ Retrieve an enslaver record with their pk
+ '''
+ queryset=Enslaved.objects.all()
+ serializer_class=EnslavedPKSerializer
+ lookup_field='enslaved_id'
+ authentication_classes=[TokenAuthentication]
+ permission_classes=[IsAuthenticated]
+
+@extend_schema(
+ exclude=True
+ )
+class EnslavedUPDATE(generics.UpdateAPIView):
+ '''
+ Update an enslaver record with their pk
+ '''
+ queryset=Enslaved.objects.all()
+ serializer_class=EnslavedCRUDSerializer
+ lookup_field='enslaved_id'
+ authentication_classes=[TokenAuthentication]
+ permission_classes=[IsAdminUser]
-class EnslavedRUD(generics.RetrieveUpdateDestroyAPIView):
+@extend_schema(
+ exclude=True
+ )
+class EnslavedDESTROY(generics.DestroyAPIView):
'''
- Fetch, update, or delete an enslaver record with their pk
+ Delete an enslaver record with their pk
'''
queryset=Enslaved.objects.all()
serializer_class=EnslavedCRUDSerializer
diff --git a/api/voyage/admin.py b/api/voyage/admin.py
index 11675e2..5c25162 100755
--- a/api/voyage/admin.py
+++ b/api/voyage/admin.py
@@ -207,10 +207,10 @@ class CargoConnectionInline(nested_admin.NestedStackedInline):
extra=0
-class AfricanInfoInline(nested_admin.NestedStackedInline):
- model = Voyage.african_info.through
- classes = ['collapse']
- extra=0
+# class AfricanInfoInline(nested_admin.NestedStackedInline):
+# model = Voyage.african_info.through
+# classes = ['collapse']
+# extra=0
class VoyageAdmin(nested_admin.NestedModelAdmin):
inlines=(
@@ -222,13 +222,13 @@ class VoyageAdmin(nested_admin.NestedModelAdmin):
VoyageOutcomeInline,
VoyageShipInline,
VoyageSlavesNumbersInline,
- AfricanInfoInline,
+# AfricanInfoInline,
CargoConnectionInline
)
exclude=['african_info_voyages']
fields=['voyage_id','dataset','voyage_in_cd_rom']
- list_display=('voyage_id',)
- search_fields=('voyage_id',)
+ list_display=('voyage_id','get_ship','get_yearam')
+ search_fields=('voyage_id','voyage_ship__ship_name')
admin.site.register(Voyage, VoyageAdmin)
admin.site.register(VoyageSparseDate,VoyageSparseDateAdmin)
@@ -240,4 +240,4 @@ class VoyageAdmin(nested_admin.NestedModelAdmin):
admin.site.register(Nationality)
admin.site.register(CargoType,CargoTypeAdmin)
admin.site.register(CargoUnit)
-admin.site.register(AfricanInfo)
+# admin.site.register(AfricanInfo)
diff --git a/api/voyage/migrations/0002_voyagecargoconnection_is_purchasing_commmodity.py b/api/voyage/migrations/0002_voyagecargoconnection_is_purchasing_commmodity.py
new file mode 100644
index 0000000..bb8dbcb
--- /dev/null
+++ b/api/voyage/migrations/0002_voyagecargoconnection_is_purchasing_commmodity.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.1 on 2023-11-20 16:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('voyage', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='voyagecargoconnection',
+ name='is_purchasing_commmodity',
+ field=models.BooleanField(blank=True, default=False, verbose_name='Was this a commodity used to purchase enslaved people'),
+ ),
+ ]
diff --git a/api/voyage/models.py b/api/voyage/models.py
index f122021..0ea4327 100755
--- a/api/voyage/models.py
+++ b/api/voyage/models.py
@@ -255,6 +255,11 @@ class VoyageCargoConnection(models.Model):
max_digits=7,
decimal_places=2
)
+ is_purchasing_commmodity=models.BooleanField(
+ "Was this a commodity used to purchase enslaved people",
+ default=False,
+ blank=True
+ )
# class Meta:
# unique_together = ['voyage', 'cargo']
@@ -892,6 +897,7 @@ class VoyageDates(models.Model):
class Meta:
verbose_name = 'Date'
verbose_name_plural = 'Dates'
+
class VoyageCrew(models.Model):
"""
@@ -1682,6 +1688,19 @@ class Meta:
]
verbose_name = 'Voyage'
verbose_name_plural = "Voyages"
+
+ def get_ship(self):
+ return self.voyage_ship
+
+ def get_yearam(self):
+ yearam=self.voyage_dates.imp_arrival_at_port_of_dis_sparsedate
+
+ if yearam is not None:
+ yearam=yearam.year
+ else:
+ yearam=None
+
+ return yearam
def __str__(self):
return self.__unicode__()
diff --git a/api/voyage/urls.py b/api/voyage/urls.py
index 74a86d4..a2c4345 100644
--- a/api/voyage/urls.py
+++ b/api/voyage/urls.py
@@ -13,7 +13,9 @@
path('aggroutes/',views.VoyageAggRoutes.as_view()),
path('geotree/',views.VoyageGeoTreeFilter.as_view()),
path('CREATE/',views.VoyageCREATE.as_view()),
- path('RUD/',views.VoyageRUD.as_view())
+ path('RETRIEVE/',views.VoyageRETRIEVE.as_view()),
+ path('UPDATE/',views.VoyageUPDATE.as_view()),
+ path('DESTROY/',views.VoyageDESTROY.as_view())
]
\ No newline at end of file
diff --git a/api/voyage/views.py b/api/voyage/views.py
index e90a106..bbe78e5 100644
--- a/api/voyage/views.py
+++ b/api/voyage/views.py
@@ -20,7 +20,7 @@
import gc
from .serializers import *
from .serializers_READONLY import *
-from geo.serializers import LocationSerializer
+from geo.serializers_READONLY import LocationSerializer
from voyages3.localsettings import *
from drf_yasg.utils import swagger_auto_schema
import re
@@ -374,6 +374,9 @@ def post(self,request):
print("Internal Response Time:",time.time()-st,"\n+++++++")
return JsonResponse(j,safe=False)
+@extend_schema(
+ exclude=True
+ )
class VoyageCREATE(generics.CreateAPIView):
'''
Create Voyage without a pk
@@ -385,7 +388,20 @@ class VoyageCREATE(generics.CreateAPIView):
permission_classes=[IsAdminUser]
-class VoyageRUD(generics.RetrieveUpdateDestroyAPIView):
+class VoyageRETRIEVE(generics.RetrieveAPIView):
+ '''
+ The lookup field for contributions is "voyage_id". This corresponds to the legacy voyage_id unique identifiers. For create operations they should be chosen with care as they have semantic significance.
+ '''
+ queryset=Voyage.objects.all()
+ serializer_class=VoyageSerializer
+ lookup_field='voyage_id'
+ authentication_classes=[TokenAuthentication]
+ permission_classes=[IsAdminUser]
+
+@extend_schema(
+ exclude=True
+ )
+class VoyageUPDATE(generics.UpdateAPIView):
'''
The lookup field for contributions is "voyage_id". This corresponds to the legacy voyage_id unique identifiers. For create operations they should be chosen with care as they have semantic significance.
@@ -409,5 +425,17 @@ class VoyageRUD(generics.RetrieveUpdateDestroyAPIView):
authentication_classes=[TokenAuthentication]
permission_classes=[IsAdminUser]
+@extend_schema(
+ exclude=True
+ )
+class VoyageDESTROY(generics.DestroyAPIView):
+ '''
+ The lookup field for contributions is "voyage_id". This corresponds to the legacy voyage_id unique identifiers. For create operations they should be chosen with care as they have semantic significance.
+ '''
+ queryset=Voyage.objects.all()
+ serializer_class=VoyageCRUDSerializer
+ lookup_field='voyage_id'
+ authentication_classes=[TokenAuthentication]
+ permission_classes=[IsAdminUser]
diff --git a/api/voyages3/settings.py b/api/voyages3/settings.py
index cab10b1..006449f 100644
--- a/api/voyages3/settings.py
+++ b/api/voyages3/settings.py
@@ -74,7 +74,9 @@
'DEFAULT_PARSER_CLASSES': [
'rest_framework.parsers.JSONParser'
],
- 'DEFAULT_SCHEMA_CLASS': 'drf_spectacular.openapi.AutoSchema'
+ 'DEFAULT_SCHEMA_CLASS': 'drf_spectacular.openapi.AutoSchema',
+ 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination',
+ 'PAGE_SIZE': 10
}
SPECTACULAR_SETTINGS = {
|