Добавлено поле ruled_team в ответ users (#48)

Reagent992 · Feb 1, 2024 · 42cedd6 · 42cedd6
1 parent fac298b
commit 42cedd6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/api/v1/serializers/api/users_serializer.py b/api/v1/serializers/api/users_serializer.py
@@ -20,6 +20,9 @@ class CustomUserSerializer(UserSerializer):
     """Сериализатор пользователей."""
 
     position = serializers.CharField(source="position.name", read_only=True)
+    ruled_team = serializers.IntegerField(
+        source="managed_team.id", read_only=True
+    )
 
     class Meta:
         model = User
@@ -35,5 +38,6 @@ class Meta:
             "date_joined",
             "last_login",
             "userpic",
+            "ruled_team",
             "team",
         )
diff --git a/nginx/default.conf b/nginx/default.conf
@@ -2,17 +2,18 @@ server {
     listen 80;
     server_name  _;
 
+    proxy_set_header Host $http_host;
+    proxy_redirect off;
+    proxy_set_header X-Forwarded-For $remote_addr;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    client_max_body_size 10m;
+
     location /static/ {
-    alias /static/;
+        alias /static/;
     }
 
     location / {
         proxy_pass http://backend:8000;
-        proxy_set_header Host $http_host;
-        proxy_redirect off;
-        proxy_set_header X-Forwarded-For $remote_addr;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        client_max_body_size 10m;
         alias /static/;
     }
 }