gitrusprus/social-graph
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add settings page and configurable network map types.

Browse Source 
Let users define sector/circle labels and geometry per map type, choose a type when creating maps, and sync types through local backup and API migrations.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
gitrusprus
2026-06-25 10:45:34 +03:00
co-authored by Cursor
parent cafc7335ad
commit e80d0d0e88
29 changed files with 1370 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/contacts/map_type_validation.py
+39
View File
@@ -0,0 +1,39 @@
def validate_map_type_payload(sectors, circles):
errors = {}
if not sectors or not isinstance(sectors, list):
errors['sectors'] = 'Нужен хотя бы один сектор.'
if not circles or not isinstance(circles, list):
errors['circles'] = 'Нужен хотя бы один круг.'
if errors:
return errors
sector_keys = []
for i, item in enumerate(sectors):
if not isinstance(item, dict):
errors['sectors'] = f'Сектор {i + 1}: неверный формат.'
break
key = str(item.get('key', '')).strip()
label = str(item.get('label', '')).strip()
if not key or not label:
errors['sectors'] = f'Сектор {i + 1}: укажите ключ и подпись.'
break
sector_keys.append(key)
circle_keys = []
for i, item in enumerate(circles):
if not isinstance(item, dict):
errors['circles'] = f'Круг {i + 1}: неверный формат.'
break
key = str(item.get('key', '')).strip()
label = str(item.get('label', '')).strip()
if not key or not label:
errors['circles'] = f'Круг {i + 1}: укажите ключ и подпись.'
break
circle_keys.append(key)
if len(set(sector_keys)) != len(sector_keys):
errors['sectors'] = 'Ключи секторов должны быть уникальными.'
if len(set(circle_keys)) != len(circle_keys):
errors['circles'] = 'Ключи кругов должны быть уникальными.'
return errors
backend/contacts/migrations/0007_network_map_types.py
+92
View File
@@ -0,0 +1,92 @@
from django.db import migrations, models
import django.db.models.deletion
DEFAULT_SECTORS = [
{'key': 'work', 'label': 'Работа'},
{'key': 'study', 'label': 'Учёба'},
{'key': 'hobby', 'label': 'Хобби'},
{'key': 'family', 'label': 'Семья'},
{'key': 'health', 'label': 'Здоровье'},
{'key': 'other', 'label': 'Другое'},
]
DEFAULT_CIRCLES = [
{'key': 'support', 'label': 'Круг поддержки'},
{'key': 'productivity', 'label': 'Круг продуктивности'},
{'key': 'development', 'label': 'Круг развития'},
]
def seed_default_map_type(apps, schema_editor):
NetworkMapType = apps.get_model('contacts', 'NetworkMapType')
NetworkMap = apps.get_model('contacts', 'NetworkMap')
default_type, _ = NetworkMapType.objects.get_or_create(
is_default=True,
defaults={
'name': 'Стандартная',
'sectors': DEFAULT_SECTORS,
'circles': DEFAULT_CIRCLES,
},
)
NetworkMap.objects.filter(map_type__isnull=True).update(map_type=default_type)
class Migration(migrations.Migration):
dependencies = [
('contacts', '0006_network_maps'),
]
operations = [
migrations.CreateModel(
name='NetworkMapType',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=255, verbose_name='Название типа')),
('sectors', models.JSONField(default=list, verbose_name='Секторы')),
('circles', models.JSONField(default=list, verbose_name='Круги')),
('is_default', models.BooleanField(default=False, verbose_name='Тип по умолчанию')),
('created_at', models.DateTimeField(auto_now_add=True)),
('updated_at', models.DateTimeField(auto_now=True)),
],
options={
'verbose_name': 'Тип карты сети',
'verbose_name_plural': 'Типы карт сети',
'ordering': ['name'],
},
),
migrations.AddField(
model_name='networkmap',
name='map_type',
field=models.ForeignKey(
null=True,
on_delete=django.db.models.deletion.PROTECT,
related_name='maps',
to='contacts.networkmaptype',
verbose_name='Тип карты',
),
),
migrations.RunPython(seed_default_map_type, migrations.RunPython.noop),
migrations.AlterField(
model_name='networkmap',
name='map_type',
field=models.ForeignKey(
on_delete=django.db.models.deletion.PROTECT,
related_name='maps',
to='contacts.networkmaptype',
verbose_name='Тип карты',
),
),
migrations.AlterField(
model_name='networkmapmembership',
name='life_sphere',
field=models.CharField(default='other', max_length=32, verbose_name='Сфера жизни'),
),
migrations.AlterField(
model_name='networkmapmembership',
name='network_circle',
field=models.CharField(default='productivity', max_length=32, verbose_name='Круг сети'),
),
]
backend/contacts/migrations/0008_alter_relation_interaction_intensity.py
+18
View File
@@ -0,0 +1,18 @@
# Generated by Django 4.2.9 on 2026-06-25 02:21
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('contacts', '0007_network_map_types'),
]
operations = [
migrations.AlterField(
model_name='relation',
name='interaction_intensity',
field=models.CharField(choices=[('intense', 'Интенсивные контакты'), ('periodic', 'Периодические контакты'), ('sparse', 'Редкие контакты')], default='intense', max_length=32, verbose_name='Интенсивность общения'),
),
]
backend/contacts/models.py
+25 -4
View File
@@ -2,8 +2,6 @@ from django.core.validators import MaxValueValidator, MinValueValidator
from django.db import models
from core.choices import (
LIFE_SPHERES,
NETWORK_CIRCLES,
INTERACTION_INTENSITY,
RELATION_TYPES,
)
@@ -30,11 +28,36 @@ class Contact(models.Model):
return self.name
class NetworkMapType(models.Model):
"""Тип карты сети: настраиваемые секторы и концентрические круги."""
name = models.CharField(max_length=255, verbose_name='Название типа')
sectors = models.JSONField(default=list, verbose_name='Секторы')
circles = models.JSONField(default=list, verbose_name='Круги')
is_default = models.BooleanField(default=False, verbose_name='Тип по умолчанию')
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
class Meta:
ordering = ['name']
verbose_name = 'Тип карты сети'
verbose_name_plural = 'Типы карт сети'
def __str__(self):
return self.name
class NetworkMap(models.Model):
"""Карта сети — отдельный контекст для визуализации подмножества контактов."""
name = models.CharField(max_length=255, verbose_name='Название')
description = models.TextField(blank=True, verbose_name='Описание')
map_type = models.ForeignKey(
NetworkMapType,
on_delete=models.PROTECT,
related_name='maps',
verbose_name='Тип карты',
)
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
@@ -64,13 +87,11 @@ class NetworkMapMembership(models.Model):
)
life_sphere = models.CharField(
max_length=32,
choices=LIFE_SPHERES,
default='other',
verbose_name='Сфера жизни',
)
network_circle = models.CharField(
max_length=32,
choices=NETWORK_CIRCLES,
default='productivity',
verbose_name='Круг сети',
)
backend/contacts/serializers.py
+38 -2
View File
@@ -1,5 +1,6 @@
from rest_framework import serializers
from .models import Contact, Relation, NetworkMap, NetworkMapMembership
from .models import Contact, Relation, NetworkMap, NetworkMapMembership, NetworkMapType
from .map_type_validation import validate_map_type_payload
class ContactSerializer(serializers.ModelSerializer):
@@ -43,17 +44,52 @@ class RelationSerializer(serializers.ModelSerializer):
return data
class NetworkMapTypeSerializer(serializers.ModelSerializer):
class Meta:
model = NetworkMapType
fields = [
'id', 'name', 'sectors', 'circles', 'is_default',
'created_at', 'updated_at',
]
read_only_fields = ['id', 'is_default', 'created_at', 'updated_at']
def validate(self, data):
sectors = data.get('sectors', getattr(self.instance, 'sectors', None))
circles = data.get('circles', getattr(self.instance, 'circles', None))
errors = validate_map_type_payload(sectors, circles)
if errors:
raise serializers.ValidationError(errors)
return data
def create(self, validated_data):
if NetworkMapType.objects.filter(is_default=True).exists():
validated_data['is_default'] = False
return super().create(validated_data)
class NetworkMapSerializer(serializers.ModelSerializer):
memberships_count = serializers.SerializerMethodField()
map_type = serializers.PrimaryKeyRelatedField(
queryset=NetworkMapType.objects.all(),
required=False,
)
class Meta:
model = NetworkMap
fields = [
'id', 'name', 'description',
'id', 'name', 'description', 'map_type',
'created_at', 'updated_at', 'memberships_count',
]
read_only_fields = ['id', 'created_at', 'updated_at', 'memberships_count']
def validate(self, data):
if not data.get('map_type') and not getattr(self.instance, 'map_type_id', None):
default_type = NetworkMapType.objects.filter(is_default=True).first()
if not default_type:
raise serializers.ValidationError({'map_type': 'Нет типа карты по умолчанию.'})
data['map_type'] = default_type
return data
def get_memberships_count(self, obj):
return obj.memberships.count()
backend/contacts/views.py
+16 -2
View File
@@ -1,11 +1,13 @@
from rest_framework import viewsets
from rest_framework.exceptions import ValidationError
from .models import Contact, Relation, NetworkMap, NetworkMapMembership
from .models import Contact, Relation, NetworkMap, NetworkMapMembership, NetworkMapType
from .serializers import (
ContactSerializer,
RelationSerializer,
NetworkMapSerializer,
NetworkMapMembershipSerializer,
NetworkMapTypeSerializer,
)
@@ -27,10 +29,22 @@ class RelationViewSet(viewsets.ModelViewSet):
class NetworkMapViewSet(viewsets.ModelViewSet):
queryset = NetworkMap.objects.all()
queryset = NetworkMap.objects.select_related('map_type').all()
serializer_class = NetworkMapSerializer
class NetworkMapTypeViewSet(viewsets.ModelViewSet):
queryset = NetworkMapType.objects.all()
serializer_class = NetworkMapTypeSerializer
def perform_destroy(self, instance):
if instance.is_default:
raise ValidationError({'detail': 'Нельзя удалить тип карты по умолчанию.'})
if instance.maps.exists():
raise ValidationError({'detail': 'Тип используется картами сети. Сначала смените тип у карт.'})
instance.delete()
class NetworkMapMembershipViewSet(viewsets.ModelViewSet):
serializer_class = NetworkMapMembershipSerializer