psat-server-web 0.3.11__tar.gz → 0.3.12__tar.gz

{psat-server-web-0.3.11/psat_server_web.egg-info → psat-server-web-0.3.12}/PKG-INFO

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

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

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

{psat-server-web-0.3.11 → psat-server-web-0.3.12}/psat_server_web/atlas/atlasapi/serializers.py

@@ -17,6 +17,8 @@ from django.core.exceptions import ObjectDoesNotExist
 from atlas.models import TcsVraScores
 from atlas.models import AtlasDiffObjects
 from atlas.models import TcsVraTodo
+from atlas.models import TcsObjectGroups
+from atlas.models import TcsObjectGroupDefinitions
 
 
 #CAT_ID_RA_DEC_COLS['objects'] = [['objectId', 'ramean', 'decmean'], 1018]
@@ -307,3 +309,53 @@ class VRATodoListSerializer(serializers.Serializer):
         return vraTodoList
 
 
+# 2024-02-21 KWS Changed required to False for all three prob values.
+class TcsObjectGroupsSerializer(serializers.Serializer):
+    objectid = serializers.IntegerField(required=True)
+    objectgroupid = serializers.IntegerField(required=True)
+
+    import sys
+
+    def save(self):
+
+        from django.conf import settings
+        objectid = self.validated_data['objectid']
+        objectGroupId = self.validated_data['objectGroupId']
+
+        replyMessage = 'Row created.'
+
+        if not insertDate:
+            insertDate = datetime.now()
+
+        # This is what gets inserted into the database.
+        data = {'transient_object_id_id': objectid,
+                'object_group_id': objectGroupId}
+
+        # Does the objectId actually exit - not allowed to comment on objects that don't exist!
+        # This should really return a 404 message.
+        try:
+            transient = AtlasDiffObjects.objects.get(pk=objectid)
+        except ObjectDoesNotExist as e:
+            replyMessage = 'Object does not exist.'
+            info = { "objectid": objectid, "info": replyMessage }
+            return info
+
+        try:
+            group = TcsObjectGroupDefinitions.objects.get(pk=objectGroupId)
+        except ObjectDoesNotExist as e:
+            replyMessage = 'Object group ID does not exist.'
+            info = { "objectgroupid": objectGroupId, "info": replyMessage }
+            return info
+
+        try:
+            instance = TcsObjectGroups(**data)
+            i = instance.save(force_insert=True)
+            # NOTE: Inserting an object by setting the primary key actually REPLACES the object. Do we want this behaviour??
+            #       The integrity error below never happens because I've now set the model with primary_key=True.
+            #       To fix this I've added force_insert = True above.
+        except IntegrityError as e:
+            replyMessage = 'Duplicate row. Cannot add row.'
+
+        info = { "objectgroupid": objectid, "info": replyMessage }
+        return info
+

{psat-server-web-0.3.11 → psat-server-web-0.3.12}/psat_server_web/atlas/atlasapi/urls.py

@@ -11,5 +11,6 @@ urlpatterns = [
     path('api/vrascoreslist/',         views.VRAScoresListView.as_view()),
     path('api/vratodo/',               views.VRATodoView.as_view()),
     path('api/vratodolist/',           views.VRATodoListView.as_view()),
+    path('api/objectgroups/',          views.TcsObjectGroupsView.as_view()),
     path('api/auth-token/',            obtain_auth_token, name='auth_token'),
 ]

{psat-server-web-0.3.11 → psat-server-web-0.3.12}/psat_server_web/atlas/atlasapi/views.py

@@ -2,7 +2,7 @@ from django.shortcuts import get_object_or_404, render
 from rest_framework.response import Response
 from rest_framework.views import APIView
 from rest_framework import status
-from .serializers import ConeSerializer, ObjectsSerializer, ObjectListSerializer, VRAScoresSerializer, VRAScoresListSerializer, VRATodoSerializer
+from .serializers import ConeSerializer, ObjectsSerializer, ObjectListSerializer, VRAScoresSerializer, VRAScoresListSerializer, VRATodoSerializer, VRATodoListSerializer, TcsObjectGroupsSerializer
 from rest_framework.authentication import TokenAuthentication
 from rest_framework.permissions import IsAuthenticated
 from .query_auth import QueryAuthentication
@@ -144,4 +144,18 @@ class VRATodoListView(APIView):
             return Response(message, status=retcode(message))
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
+class TcsObjectGroupsView(APIView):
+    authentication_classes = [TokenAuthentication, QueryAuthentication]
+    permission_classes = [IsAuthenticated]
+
+    def get(self, request):
+        return Response({"Error": "GET is not implemented for this service."})
 
+    def post(self, request, format=None):
+        serializer = TcsObjectGroupsSerializer(data=request.data, context={'request': request})
+    
+        if serializer.is_valid():
+            message = serializer.save()
+    
+            return Response(message, status=status.HTTP_201_CREATED)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

{psat-server-web-0.3.11 → psat-server-web-0.3.12/psat_server_web.egg-info}/PKG-INFO

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

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

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