afanasyev.aa/stratoflights
1
Fork 1
Code Issues Pull requests Projects Releases Activity

resolve merge conflicts

Browse source
This commit is contained in:
Vasilisk9812 2026-05-25 20:56:26 +09:00
commit 5eb8a4a4e2
5 changed files with 32 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
stratoflights_api/views.py
View file

@ -156,6 +156,7 @@ class TelemetryListCreateView(generics.ListCreateAPIView):
if not serializer.is_valid():
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
<<<<<<< HEAD
try:
satellite = Satellite.objects.get(id=pk)
except Satellite.DoesNotExist:
@ -197,6 +198,18 @@ class TelemetryListCreateView(generics.ListCreateAPIView):
pass # WS broadcast is best-effort; don't fail the REST response
return Response({'id': str(packet.id)}, status=status.HTTP_201_CREATED)
=======
validated_data = serializer.validated_data
TelemetryPacket.objects.create(timestamp=time.time(),
satellite=Satellite.objects.get(id=pk),
lat=validated_data["lat"],
lon=validated_data["lon"],
alt=validated_data["alt"],
payload=validated_data['payload'],
)
return Response(serializer.errors, status=status.HTTP_201_CREATED)
>>>>>>> origin/master
class SessionView(APIView):