From fa05a712ed8b93b76049e74af1e3f585b09a4032 Mon Sep 17 00:00:00 2001 From: AlexP077 Date: Thu, 26 Oct 2023 21:29:08 +0300 Subject: [PATCH] enrichment_status --- service/service.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/service/service.py b/service/service.py index 99646ed..2164d24 100644 --- a/service/service.py +++ b/service/service.py @@ -141,8 +141,7 @@ class PointService: change_status('Шаг 2 из 3 (Обогащение точек).', task_name) points = models.PrePlacementPoint.objects.filter(matching_status=MatchingStatus.New.name).all() groups = models.Post_and_pvzGroup.objects.all() - - for point in points: + for _i, point in enumerate(points): origin = point.geometry qs = models.PlacementPoint.objects.filter(status=PointStatus.Working.name).annotate( dist=Dist('geometry', origin)).order_by('dist') @@ -262,7 +261,7 @@ class PointService: for group in groups: self.calculate_dist_for_group(point, group, instance_type=models.PrePlacementPointPVZDistance) change_status( - f'Шаг 2 из 3 (Обогащение точек). Обработано {points.filter(matching_status=MatchingStatus.Matched.name).count()} из {points.count()}', + f'Шаг 2 из 3 (Обогащение точек). Обработано {_i} из {points.count()}', task_name) run_psql_command()