diff --git a/service/service.py b/service/service.py index 924d113..720c303 100644 --- a/service/service.py +++ b/service/service.py @@ -74,6 +74,7 @@ class PointService: is_vis=True, matching_status=MatchingStatus.Error.name, status=PointStatus.Pending.name) + problem += 1 else: models.PrePlacementPoint.objects.get_or_create(address=addr, street=response.get('street'), house_number=response.get('houseNumber'), @@ -82,7 +83,8 @@ class PointService: category=cat, geometry=wkt, sample_trn=False, is_vis=True, matching_status=MatchingStatus.New.name, - status=PointStatus.Pending.name, area=rayon, district=rayon.AO) + status=PointStatus.Pending.name, area=rayon, + district=rayon.AO) return total, matched, problem def make_enrichment(self): diff --git a/service/views.py b/service/views.py index 53de5be..251db10 100644 --- a/service/views.py +++ b/service/views.py @@ -379,7 +379,6 @@ class PrePlacementPointViewSet(PlacementPointViewSet): qs = qs.filter(matching_status=MatchingStatus.New.name) for q in qs: obj = model_to_dict(q) - print(obj) obj.pop('matching_status') obj.pop('id') ao = obj.pop('district') @@ -387,7 +386,12 @@ class PrePlacementPointViewSet(PlacementPointViewSet): obj['district']=models.AO.objects.get(id=ao) obj['area'] = models.Rayon.objects.get(id=rayon) obj['age_day'] = 1 - models.PlacementPoint.objects.create(**obj) + new_obj = models.PlacementPoint.objects.create(**obj) + dists = models.PrePlacementPointPVZDistance.objects.filter(placement_point=q).all() + for d in dists: + models.PlacementPointPVZDistance.objects.get_or_create(placement_point=new_obj, + pvz_postamates_group=d.pvz_postamates_group, + dist=d.dist) models.PrePlacementPoint.objects.all().delete() return Response(status=HTTPStatus.OK, )