Merge pull request #226 from ohmg-dev/207_prep_sessions

207 prep sessions

ohmg/accounts/management/commands/add-users-to-newsletter.py

@@ -1,4 +1,3 @@
-
 from django.contrib.auth import get_user_model
 from django.core.management.base import BaseCommand
 

ohmg/accounts/models.py

@@ -5,11 +5,10 @@
 from django.urls import reverse
 from django.utils.functional import cached_property
 
+from ohmg.core.models import Map
 from ohmg.georeference.models import SessionBase
 from ohmg.georeference.models import GCP
 
-from ohmg.loc_insurancemaps.models import Volume
-
 class User(AbstractUser):
     class Meta:
         db_table = 'auth_user'
@@ -19,7 +18,7 @@ def __str__(self):
 
     @cached_property
     def load_ct(self):
-        return Volume.objects.filter(loaded_by=self).count()
+        return Map.objects.filter(loaded_by=self).count()
 
     @cached_property
     def psesh_ct(self):
@@ -34,8 +33,8 @@ def gcp_ct(self):
         return GCP.objects.filter(created_by=self).count()
 
     @cached_property
-    def volumes(self):
-        return Volume.objects.filter(loaded_by=self).order_by("city")
+    def maps(self):
+        return Map.objects.filter(loaded_by=self).order_by("title")
 
     @cached_property
     def profile_url(self):

ohmg/core/api/filters.py

@@ -1,5 +1,4 @@
 from typing import List, Optional
-from django.db.models import Q
 from ninja import (
     Field,
     FilterSchema,

ohmg/core/api/routes.py

@@ -1,12 +1,10 @@
-from datetime import datetime
 import logging
-from typing import List, Optional
+from typing import List
 
 from django.conf import settings
-from django.contrib.gis.geos import Polygon, MultiPolygon
+from django.contrib.gis.geos import Polygon
 from django.db.models import F
 from django.shortcuts import get_object_or_404
-from django.urls import reverse
 
 from ninja import NinjaAPI, Query
 from ninja.pagination import paginate
@@ -17,17 +15,14 @@
     APIKey,
 )
 from ohmg.core.models import (
-    MapGroup,
     Map,
     Document,
     Region,
     Layer,
 )
-from ohmg.loc_insurancemaps.models import Volume
 from ohmg.georeference.models import (
     SessionBase,
     LayerSet,
-    LayerV1,
     SessionLock,
 )
 from ohmg.places.models import Place

ohmg/core/api/schemas.py

@@ -6,10 +6,8 @@
 from natsort import natsorted
 
 from django.conf import settings
-from django.db.models import Q
 from django.urls import reverse
 from ninja import (
-    Field,
     Schema,
 )
 
@@ -20,40 +18,31 @@
     Region,
     Layer,
 )
-from ohmg.loc_insurancemaps.models import Volume
 from ohmg.georeference.models import (
     PrepSession,
     GeorefSession,
     SessionLock,
-    SessionBase,
 )
 
 logger = logging.getLogger(__name__)
 
 
+class MapListSchema(Schema):
+    identifier: str
+    title: str
+    year: str
+
+
 class UserSchema(Schema):
     username: str
     profile_url: str
     psesh_ct: int
     gsesh_ct: int
     total_ct: int = 0
     gcp_ct: int
-    volumes: list
+    maps: List[MapListSchema]
     load_ct: int
     image_url: str
-    api_keys: List[str]
-
-    @staticmethod
-    def resolve_volumes(obj):
-        """overrride the volumes property on the model in order to 
-        create a super light-weight acquisition of volume info"""
-        values = Volume.objects.filter(loaded_by=obj) \
-            .order_by('city', 'year') \
-            .values('identifier', 'city', 'year', 'volume_no')
-        for i in values:
-            i['url'] = reverse('map_summary', args=(i['identifier'], ))
-            i['title'] = f"{i['city']} {i['year']}{' vol. ' + i['volume_no'] if i['volume_no'] else ''}"
-        return values
 
     @staticmethod
     def resolve_total_ct(obj):
@@ -301,10 +290,10 @@ def resolve_image_url(obj):
     @staticmethod
     def resolve_gcps_geojson(obj):
         if not obj.region:
-            logger.warn(f"[WARNING] Layer {obj.pk} has no associated region")
+            logger.warning(f"[WARNING] Layer {obj.pk} has no associated region")
             return None
         elif not obj.region.gcp_group:
-            logger.warn(f"[WARNING] Region {obj.region.pk} attached to Layer {obj.pk} has no associated GCPGroup")
+            logger.warning(f"[WARNING] Region {obj.region.pk} attached to Layer {obj.pk} has no associated GCPGroup")
             return None
         return obj.region.gcp_group.as_geojson
 
@@ -347,10 +336,10 @@ def resolve_image_url(obj):
     @staticmethod
     def resolve_gcps_geojson(obj):
         if not obj.region:
-            logger.warn(f"[WARNING] Layer {obj.pk} has no associated region")
+            logger.warning(f"[WARNING] Layer {obj.pk} has no associated region")
             return None
         elif not obj.region.gcp_group:
-            logger.warn(f"[WARNING] Region {obj.region.pk} attached to Layer {obj.pk} has no associated GCPGroup")
+            logger.warning(f"[WARNING] Region {obj.region.pk} attached to Layer {obj.pk} has no associated GCPGroup")
             return None
         return obj.region.gcp_group.as_geojson
 
@@ -431,8 +420,7 @@ class LayerSetSchema(Schema):
 
     id: str
     name: str
-    volume_id: str
-    is_geospatial: bool
+    map_id: str
     layers: List[LayerSetLayer]
     multimask_geojson: Optional[dict]
     extent: Optional[tuple]
@@ -452,10 +440,6 @@ def resolve_layers(obj):
     def resolve_name(obj):
         return str(obj.category)
 
-    @staticmethod
-    def resolve_is_geospatial(obj):
-        return obj.category.is_geospatial
-
 
 class PlaceSchema(Schema):
     """ very lightweight serialization of a Place with its Maps"""

ohmg/core/context_processors.py

@@ -28,6 +28,7 @@ def user_info_from_request(request):
         user = None
     if user and user.is_authenticated:
         user_info = UserSchema.from_orm(user).dict()
+        user_info['api_keys'] = user.api_keys
         user_info['is_authenticated'] = True
         user_info['is_staff'] = user.is_staff
     else: