mikhailov.aa/stratoflights
1
Fork 0
forked from afanasyev.aa/stratoflights
Code Pull requests Activity

resolve merge conflicts

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

8
stratoflights/settings.py
View file

@ -103,11 +103,7 @@ ASGI_APPLICATION = 'stratoflights.asgi.application'
# Database # Database
# https://docs.djangoproject.com/en/4.2/ref/settings/#databases # https://docs.djangoproject.com/en/4.2/ref/settings/#databases
<<<<<<< HEAD
if not PRODUCTION: if not PRODUCTION:
=======
if PRODUCTION:
>>>>>>> origin/master
DATABASES = { DATABASES = {
'default': { 'default': {
'ENGINE': 'django.db.backends.sqlite3', 'ENGINE': 'django.db.backends.sqlite3',
@ -200,11 +196,7 @@ CSRF_TRUSTED_ORIGINS = os.getenv('CSRF_TRUSTED_ORIGINS', 'http://localhost:5173,
CHANNEL_LAYERS = { CHANNEL_LAYERS = {
"default": { "default": {
<<<<<<< HEAD
"BACKEND": "channels.layers.InMemoryChannelLayer", "BACKEND": "channels.layers.InMemoryChannelLayer",
=======
"BACKEND": "channels_redis.core.RedisChannelLayer",
>>>>>>> origin/master
"CONFIG": { "CONFIG": {
"hosts": [("redis", 6379)], "hosts": [("redis", 6379)],
}, },

4
stratoflights_api/models.py
View file

@ -39,11 +39,7 @@ class Satellite(models.Model):
class TelemetryPacket(models.Model): class TelemetryPacket(models.Model):
user = models.ForeignKey( user = models.ForeignKey(
<<<<<<< HEAD
get_user_model(), on_delete=models.SET_NULL, null=True, blank=True) get_user_model(), on_delete=models.SET_NULL, null=True, blank=True)
=======
get_user_model(), on_delete=models.CASCADE, default=0)
>>>>>>> origin/master
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
satellite = models.ForeignKey( satellite = models.ForeignKey(
Satellite, on_delete=models.CASCADE, related_name="telemetry") Satellite, on_delete=models.CASCADE, related_name="telemetry")

3
stratoflights_api/serializers.py
View file

@ -124,10 +124,7 @@ class TelemetryPacketSerializer(serializers.ModelSerializer):
model = TelemetryPacket model = TelemetryPacket
fields = ['id', 'timestamp', 'lat', 'lon', 'alt', 'payload'] fields = ['id', 'timestamp', 'lat', 'lon', 'alt', 'payload']
read_only_fields = ['id'] read_only_fields = ['id']
<<<<<<< HEAD
extra_kwargs = {'timestamp': {'required': False}} extra_kwargs = {'timestamp': {'required': False}}
=======
>>>>>>> origin/master
class SavedPointSerializer(serializers.ModelSerializer): class SavedPointSerializer(serializers.ModelSerializer):

4
stratoflights_api/services/tawhiri.py
View file

@ -6,11 +6,7 @@ from zoneinfo import ZoneInfo
from collections import OrderedDict from collections import OrderedDict
class TawhiriClient: class TawhiriClient:
<<<<<<< HEAD
BASE_URL = "https://api.v2.sondehub.org/tawhiri" BASE_URL = "https://api.v2.sondehub.org/tawhiri"
=======
BASE_URL = "https://fly.stratonautica.ru/api/v2/"
>>>>>>> origin/master
TIMEOUT = 15 TIMEOUT = 15
@staticmethod @staticmethod

13
stratoflights_api/views.py
View file

@ -156,7 +156,6 @@ class TelemetryListCreateView(generics.ListCreateAPIView):
if not serializer.is_valid(): if not serializer.is_valid():
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
<<<<<<< HEAD
try: try:
satellite = Satellite.objects.get(id=pk) satellite = Satellite.objects.get(id=pk)
except Satellite.DoesNotExist: except Satellite.DoesNotExist:
@ -198,18 +197,6 @@ class TelemetryListCreateView(generics.ListCreateAPIView):
pass # WS broadcast is best-effort; don't fail the REST response pass # WS broadcast is best-effort; don't fail the REST response
return Response({'id': str(packet.id)}, status=status.HTTP_201_CREATED) 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): class SessionView(APIView):