psat-server-web 0.2.6__tar.gz → 0.2.7__tar.gz

{psat-server-web-0.2.6/psat_server_web.egg-info → psat-server-web-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: psat-server-web
-Version: 0.2.6
+Version: 0.2.7
 Summary: Pan-STARRS and ATLAS web interface.
 Home-page: https://github.com/genghisken/psat-server-web
 Author: genghisken

psat-server-web-0.2.7/psat_server_web/__version__.py

@@ -0,0 +1 @@
+__version__ = '0.2.7'

{psat-server-web-0.2.6 → psat-server-web-0.2.7}/psat_server_web/atlas/atlas/apiutils.py

@@ -12,6 +12,7 @@ from atlas.models import AtlasDetectionsddc
 from django.forms.models import model_to_dict
 from .lightcurvequeries import *
 from .views import followupClassList
+from .views import WebViewUserDefined
 from .views import AtlasDetectionsddcTable
 from .commonqueries import getNonDetectionsUsingATLASFootprint, ATLAS_METADATADDC, filterWhereClauseddc, LC_POINTS_QUERY_ATLAS_DDC, FILTERS, getLightcurvePoints, getLightcurvePointsDDCAPI, getNonDetectionsUsingATLASFootprintAPI
 from .dbviews import CustomLCBlanks, CustomLCPoints, CustomLCPoints2, CustomLCBlanks2
@@ -106,11 +107,22 @@ def candidateddcApi(request, atlas_diff_objects_id, mjdThreshold = None):
     return data
 
 
-def getObjectList(request, listId):
-    querySet = followupClassList[int(listId)].objects.all()
+def getObjectList(request, listId, getCustomList = False):
+
+    querySet = None
+
+    if getCustomList:
+        if listId > 0 and listId <= 100:
+            querySet = WebViewUserDefined.objects.filter(object_group_id = listId)
+    else:
+        # There are currently 11 valid lists.
+        if listId >= 0 and listId <= 11:
+            querySet = followupClassList[int(listId)].objects.all()
+
     objectList = []
 
-    for row in querySet:
-        objectList.append(model_to_dict(row))
+    if querySet is not None:
+        for row in querySet:
+            objectList.append(model_to_dict(row))
 
     return objectList

{psat-server-web-0.2.6 → psat-server-web-0.2.7}/psat_server_web/atlas/atlasapi/serializers.py

@@ -103,12 +103,14 @@ class ObjectsSerializer(serializers.Serializer):
 
 class ObjectListSerializer(serializers.Serializer):
     objectlistid = serializers.IntegerField(required=True)
+    getcustomlist = serializers.BooleanField(required=False, default = False)
 
     def save(self):
         objectlistid = self.validated_data['objectlistid']
+        getcustomlist = self.validated_data['getcustomlist']
         request = self.context.get("request")
 
-        objectList = getObjectList(request, objectlistid)
+        objectList = getObjectList(request, objectlistid, getCustomList = getcustomlist)
         return objectList
 
 

{psat-server-web-0.2.6 → psat-server-web-0.2.7/psat_server_web.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: psat-server-web
-Version: 0.2.6
+Version: 0.2.7
 Summary: Pan-STARRS and ATLAS web interface.
 Home-page: https://github.com/genghisken/psat-server-web
 Author: genghisken

psat-server-web-0.2.6/psat_server_web/__version__.py

@@ -1 +0,0 @@
-__version__ = '0.2.6'