TRUNK
/
postnet
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

postamat_id+enum_status

Browse Source
dev
AlexP077 3 years ago committed by Dmitry Titov
parent 36a7831bad
commit 8ca3c511d9
5 changed files with 261 additions and 116 deletions
Show Stats Download Patch File Download Diff File

2
.flake8
Unescape View File

@ -5,3 +5,5 @@ max-complexity = 10
per-file-ignores =
service/migrations/*:E501
service/views.py:C901
service/models.py:F403,F401
service/models.py:F401

23
service/migrations/0012_auto_20230313_1951.py
Unescape View File

@ -0,0 +1,23 @@
# Generated by Django 3.2 on 2023-03-13 16:51
from django.db import migrations
from django.db import models
class Migration(migrations.Migration):
dependencies = [
('service', '0011_remove_placementpoint_location_id'),
]
operations = [
migrations.AddField(
model_name='placementpoint',
name='postamat_id',
field=models.TextField(blank=True, null=True, verbose_name='ID постамата'),
),
migrations.AlterField(
model_name='placementpoint',
name='status',
field=models.TextField(blank=True, choices=[('К рассмотрению', 'К рассмотрению'), ('Согласование-Установка', 'Согласование-Установка'), ('Работает', 'Работает'), ('Отменено', 'Отменено')], null=True, verbose_name='Статус'),
),
]

11
service/models.py
Unescape View File

@ -1,12 +1,21 @@
from django.contrib.gis.db import models as gis_models
from django.db import models
from service.signals import *
class PlacementPoint(models.Model):
STATUS_CHOICES = (
('К рассмотрению', 'К рассмотрению'),
('Согласование-Установка', 'Согласование-Установка'),
('Работает', 'Работает'),
('Отменено', 'Отменено'),
)
address = models.TextField(null=True, blank=True, verbose_name='Адрес')
name = models.TextField(null=True, blank=True, verbose_name='Название')
postamat_id = models.TextField(null=True, blank=True, verbose_name='ID постамата')
category = models.TextField(null=True, blank=True, verbose_name='Категория')
status = models.TextField(null=True, blank=True, verbose_name='Статус')
status = models.TextField(choices=STATUS_CHOICES, null=True, blank=True, verbose_name='Статус')
start_date = models.DateTimeField(null=True, blank=True)
age_day = models.IntegerField(null=True, blank=True, verbose_name='Возраст')
prediction_first = models.IntegerField(null=True, blank=True, verbose_name='Прогноз начальный')

9
service/permissions.py
Unescape View File

@ -3,9 +3,12 @@ from rest_framework import permissions
class UserPermission(permissions.BasePermission):
def has_permission(self, request, view):
if view.action in ['update_fact', 'update_status', 'retrieve',
'update', 'partial_update', 'destroy', 'create']:
if view.action in [
'update_fact', 'update_postamat_id', 'update_status', 'retrieve',
'update', 'partial_update', 'destroy', 'create',
]:
return request.user.groups.filter(name='Редактор').exists()
else:
return request.user.groups.filter(
name__in=('Зритель', 'Редактор')).exists()
name__in=('Зритель', 'Редактор'),
).exists()

332
service/views.py
Unescape View File

@ -3,14 +3,13 @@ from io import BytesIO
import pandas as pd
from django.db.models import Q
from django.http import HttpResponse, JsonResponse
from django.http import HttpResponse
from django.http import JsonResponse
from rest_framework import status
from rest_framework import status as http_status
from rest_framework.decorators import action
from rest_framework.decorators import api_view
from rest_framework.decorators import action, api_view, permission_classes
from rest_framework.decorators import permission_classes
from rest_framework.permissions import IsAuthenticated
from rest_framework.response import Response
from rest_framework.views import APIView
@ -100,103 +99,190 @@ class PlacementPointViewSet(ReadOnlyModelViewSet):
@action(detail=False, methods=['get'])
def filters(self, request):
qs = self.get_queryset()
age_day = [x for x in list(set(qs.values_list('age_day', flat=True)))
if
x is not None]
prediction_first = [x for x in list(
set(qs.values_list('prediction_first', flat=True))) if
x is not None]
prediction_current = [x for x in list(
set(qs.values_list('prediction_current', flat=True))) if
x is not None]
plan_first = [x for x in
list(set(qs.values_list('plan_first', flat=True))) if
x is not None]
plan_current = [x for x in
list(set(qs.values_list('plan_current', flat=True))) if
x is not None]
fact = [x for x in list(set(qs.values_list('fact', flat=True))) if
x is not None]
delta_first = [x for x in
list(set(qs.values_list('delta_first', flat=True))) if
x is not None]
delta_current = [x for x in
list(set(qs.values_list('delta_current', flat=True)))
if x is not None]
flat_cnt = [x for x in list(set(qs.values_list('flat_cnt', flat=True)))
if x is not None]
year_bld = [x for x in list(set(qs.values_list('year_bld', flat=True)))
if x is not None]
levels = [x for x in list(set(qs.values_list('levels', flat=True))) if
x is not None]
doors = [x for x in list(set(qs.values_list('doors', flat=True))) if
x is not None]
flats_cnt = [x for x in
list(set(qs.values_list('flats_cnt', flat=True))) if
x is not None]
popul_home = [x for x in
list(set(qs.values_list('popul_home', flat=True))) if
x is not None]
popul_job = [x for x in
list(set(qs.values_list('popul_job', flat=True))) if
x is not None]
other_post_cnt = [x for x in
list(
set(qs.values_list('other_post_cnt', flat=True)))
if x is not None]
target_post_cnt = [x for x in list(
set(qs.values_list('target_post_cnt', flat=True))) if
x is not None]
yndxfood_cnt = [x for x in
list(set(qs.values_list('yndxfood_cnt', flat=True))) if
x is not None]
yndxfood_sum = [x for x in
list(set(qs.values_list('yndxfood_sum', flat=True))) if
x is not None]
yndxfood_cnt_cst = [x for x in list(
set(qs.values_list('yndxfood_cnt_cst', flat=True))) if
x is not None]
age_day = [
x for x in list(set(qs.values_list('age_day', flat=True)))
if
x is not None
]
prediction_first = [
x for x in list(
set(qs.values_list('prediction_first', flat=True)),
) if
x is not None
]
prediction_current = [
x for x in list(
set(qs.values_list('prediction_current', flat=True)),
) if
x is not None
]
plan_first = [
x for x in
list(set(qs.values_list('plan_first', flat=True))) if
x is not None
]
plan_current = [
x for x in
list(set(qs.values_list('plan_current', flat=True))) if
x is not None
]
fact = [
x for x in list(set(qs.values_list('fact', flat=True))) if
x is not None
]
delta_first = [
x for x in
list(set(qs.values_list('delta_first', flat=True))) if
x is not None
]
delta_current = [
x for x in
list(set(qs.values_list('delta_current', flat=True)))
if x is not None
]
flat_cnt = [
x for x in list(set(qs.values_list('flat_cnt', flat=True)))
if x is not None
]
year_bld = [
x for x in list(set(qs.values_list('year_bld', flat=True)))
if x is not None
]
levels = [
x for x in list(set(qs.values_list('levels', flat=True))) if
x is not None
]
doors = [
x for x in list(set(qs.values_list('doors', flat=True))) if
x is not None
]
flats_cnt = [
x for x in
list(set(qs.values_list('flats_cnt', flat=True))) if
x is not None
]
popul_home = [
x for x in
list(set(qs.values_list('popul_home', flat=True))) if
x is not None
]
popul_job = [
x for x in
list(set(qs.values_list('popul_job', flat=True))) if
x is not None
]
other_post_cnt = [
x for x in
list(
set(qs.values_list('other_post_cnt', flat=True)),
)
if x is not None
]
target_post_cnt = [
x for x in list(
set(qs.values_list('target_post_cnt', flat=True)),
) if
x is not None
]
yndxfood_cnt = [
x for x in
list(set(qs.values_list('yndxfood_cnt', flat=True))) if
x is not None
]
yndxfood_sum = [
x for x in
list(set(qs.values_list('yndxfood_sum', flat=True))) if
x is not None
]
yndxfood_cnt_cst = [
x for x in list(
set(qs.values_list('yndxfood_cnt_cst', flat=True)),
) if
x is not None
]
data = {
"age_day": [min(age_day), max(age_day)] if age_day else [0, 2030],
"prediction_first": [min(prediction_first), max(
prediction_first)] if prediction_first else [-22, 22],
"prediction_current": [min(prediction_current), max(
prediction_current)] if prediction_current else [-22,
22],
"plan_first": [min(plan_first),
max(plan_first)] if plan_first else [0, 100],
"plan_current": [min(plan_current),
max(plan_current)] if plan_current else [0, 100],
"fact": [min(fact), max(fact)] if fact else [0, 100],
"delta_first": [min(delta_first),
max(delta_first)] if delta_first else [0, 100],
"delta_current": [min(delta_current),
max(delta_current)] if delta_current else [0,
100],
"flat_cnt": [min(flat_cnt), max(flat_cnt)] if flat_cnt else [0,
100],
"year_bld": [min(year_bld), max(year_bld)] if year_bld else [0,
2030],
"levels": [min(levels), max(levels)] if levels else [0, 100],
"doors ": [min(doors), max(doors)] if doors else [0, 100],
"flats_cnt": [min(flats_cnt), max(flats_cnt)] if flats_cnt else [0,
100],
"popul_home": [min(popul_home),
max(popul_home)] if popul_home else [0, 100],
"popul_job": [min(popul_job), max(popul_job)] if popul_job else [0,
100],
"other_post_cnt": [min(other_post_cnt),
max(other_post_cnt)] if other_post_cnt else [0,
100],
"target_post_cnt": [min(target_post_cnt),
max(target_post_cnt)] if target_post_cnt else [
0, 100],
"yndxfood_cnt": [min(yndxfood_cnt),
max(yndxfood_cnt)] if yndxfood_cnt else [0, 100],
"yndxfood_sum": [min(yndxfood_sum),
max(yndxfood_sum)] if yndxfood_sum else [0, 100],
"yndxfood_cnt_cst": [min(yndxfood_cnt_cst), max(
yndxfood_cnt_cst)] if yndxfood_cnt_cst else [0, 100],
'age_day': [min(age_day), max(age_day)] if age_day else [0, 2030],
'prediction_first': [
min(prediction_first), max(
prediction_first,
),
] if prediction_first else [-22, 22],
'prediction_current': [
min(prediction_current), max(
prediction_current,
),
] if prediction_current else [
-22,
22,
],
'plan_first': [
min(plan_first),
max(plan_first),
] if plan_first else [0, 100],
'plan_current': [
min(plan_current),
max(plan_current),
] if plan_current else [0, 100],
'fact': [min(fact), max(fact)] if fact else [0, 100],
'delta_first': [
min(delta_first),
max(delta_first),
] if delta_first else [0, 100],
'delta_current': [
min(delta_current),
max(delta_current),
] if delta_current else [
0,
100,
],
'flat_cnt': [min(flat_cnt), max(flat_cnt)] if flat_cnt else [
0,
100,
],
'year_bld': [min(year_bld), max(year_bld)] if year_bld else [
0,
2030,
],
'levels': [min(levels), max(levels)] if levels else [0, 100],
'doors ': [min(doors), max(doors)] if doors else [0, 100],
'flats_cnt': [min(flats_cnt), max(flats_cnt)] if flats_cnt else [
0,
100,
],
'popul_home': [
min(popul_home),
max(popul_home),
] if popul_home else [0, 100],
'popul_job': [min(popul_job), max(popul_job)] if popul_job else [
0,
100,
],
'other_post_cnt': [
min(other_post_cnt),
max(other_post_cnt),
] if other_post_cnt else [
0,
100,
],
'target_post_cnt': [
min(target_post_cnt),
max(target_post_cnt),
] if target_post_cnt else [
0, 100,
],
'yndxfood_cnt': [
min(yndxfood_cnt),
max(yndxfood_cnt),
] if yndxfood_cnt else [0, 100],
'yndxfood_sum': [
min(yndxfood_sum),
max(yndxfood_sum),
] if yndxfood_sum else [0, 100],
'yndxfood_cnt_cst': [
min(yndxfood_cnt_cst), max(
yndxfood_cnt_cst,
),
] if yndxfood_cnt_cst else [0, 100],
}
return Response(data, status=status.HTTP_200_OK)
@ -221,21 +307,34 @@ class PlacementPointViewSet(ReadOnlyModelViewSet):
if not new_status:
return Response({'message': 'No status'}, 400)
qs.update(**{'status': new_status})
return Response({'message': 'status updated'},
status=http_status.HTTP_200_OK)
return Response(
{'message': 'status updated'},
status=http_status.HTTP_200_OK,
)
@action(detail=False, methods=['put'])
def update_fact(self, request):
point_id = request.GET.get('location_id')
point_id = request.GET.get('postamat_id')
fact = request.GET.get('fact')
if not point_id or not fact or not fact.isdigit():
return Response(status=http_status.HTTP_400_BAD_REQUEST)
qs = models.PlacementPoint.objects.filter(pk_id=point_id)
qs = models.PlacementPoint.objects.filter(postamat_id=point_id)
if not qs:
return Response(status=http_status.HTTP_404_NOT_FOUND)
qs.update(**{'fact': fact})
return Response({'message': 'fact updated'},
status=http_status.HTTP_200_OK)
return Response({'message': 'fact updated'}, status=http_status.HTTP_200_OK)
@action(detail=False, methods=['put'])
def update_postamat_id(self, request):
postamat_id = request.GET.get('postamat_id')
point_id = request.GET.get('id')
if not point_id or not postamat_id:
return Response(status=http_status.HTTP_400_BAD_REQUEST)
qs = models.PlacementPoint.objects.filter(pk=point_id)
if not qs:
return Response(status=http_status.HTTP_404_NOT_FOUND)
qs.update(**{'postamat_id': postamat_id})
return Response({'message': 'Postamat id updated'}, status=http_status.HTTP_200_OK)
@action(detail=False, methods=['get'])
def to_excel(self, request):
@ -245,8 +344,10 @@ class PlacementPointViewSet(ReadOnlyModelViewSet):
data['sample_trn'] = data['sample_trn'].astype(int)
with BytesIO() as b:
with pd.ExcelWriter(b) as writer:
data.to_excel(writer, sheet_name="Placement Points",
index=False)
data.to_excel(
writer, sheet_name='Placement Points',
index=False,
)
filename = 'placement_points.xlsx'
res = HttpResponse(
@ -261,13 +362,19 @@ class PlacementPointViewSet(ReadOnlyModelViewSet):
if models.PlacementPoint.objects.count() > 10000:
qs = \
models.PlacementPoint.objects.order_by(
'-prediction_current').all()[
10000]
'-prediction_current',
).all()[
10000
]
return Response({'prediction_current': qs.prediction_current}, 200)
return Response(
{'prediction_current': models.PlacementPoint.objects.order_by(
'prediction_current').first().prediction_current},
200)
{
'prediction_current': models.PlacementPoint.objects.order_by(
'prediction_current',
).first().prediction_current,
},
200,
)
class refresh_placement_points(APIView):
@ -309,4 +416,5 @@ def upload_dist(request):
@permission_classes([IsAuthenticated])
def get_current_user(request):
return JsonResponse(
{'groups': [gr.name for gr in request.user.groups.all()]})
{'groups': [gr.name for gr in request.user.groups.all()]},
)

Write Preview
Loading…
Cancel
Save