Merge branch 'final_fixes' into 'dev'

final_fixes

See merge request spatial/postamates!212

service/models.py

@@ -1,6 +1,7 @@
 from django.contrib.auth.models import User
 from django.contrib.gis.db import models as gis_models
 from django.db import models
+
 from postamates.settings import SRID
 from service.enums import PointStatus, MatchingStatus
 
@@ -190,7 +191,8 @@ class Post_and_pvzCategory(models.Model):
 
     name = models.TextField(null=False, blank=False, verbose_name='Название слоя')
     image = models.ImageField(blank=True, null=True, default=None, upload_to='post_and_pvz_category_images/',
-                              verbose_name='Картинка')
+                              verbose_name='Картинка', help_text="""Формат .png или .jpg
+Размер 64 × 64 px (квадрат)""")
     visible = models.BooleanField(default=True)
     include_in_ml = models.BooleanField(default=True)
 
@@ -206,7 +208,9 @@ class Post_and_pvzGroup(models.Model):
     name = models.TextField(null=False, blank=False, verbose_name='Название группы')
     category = models.ForeignKey('Post_and_pvzCategory', default=None, related_name='groups',
                                  on_delete=models.CASCADE)
-    image = models.ImageField(blank=True, null=True, upload_to='post_and_pvz_group_images/', verbose_name='Картинка')
+    image = models.ImageField(blank=True, null=True, upload_to='post_and_pvz_group_images/', verbose_name='Картинка',
+                              help_text="""Формат .png или .jpg
+Размер 64 × 64 px (квадрат)""")
     visible = models.BooleanField(default=True)
     include_in_ml = models.BooleanField(default=True)
 
@@ -221,7 +225,8 @@ class OtherObjectsCategory(models.Model):
 
     name = models.TextField(null=False, blank=False, verbose_name='Название слоя')
     image = models.ImageField(blank=True, null=True, default=None, upload_to='other_objects_category_images/',
-                              verbose_name='Картинка')
+                              verbose_name='Картинка', help_text="""Формат .png или .jpg
+Размер 64 × 64 px (квадрат)""")
     visible = models.BooleanField(default=True)
 
 
@@ -236,7 +241,9 @@ class OtherObjectsGroup(models.Model):
     name = models.TextField(null=False, blank=False, verbose_name='Название группы')
     category = models.ForeignKey('OtherObjectsCategory', default=None, related_name='groups',
                                  on_delete=models.CASCADE)
-    image = models.ImageField(blank=True, null=True, upload_to='other_objects_group_images/', verbose_name='Картинка')
+    image = models.ImageField(blank=True, null=True, upload_to='other_objects_group_images/', verbose_name='Картинка',
+                              help_text="""Формат .png или .jpg
+Размер 64 × 64 px (квадрат)""")
     visible = models.BooleanField(default=True)
 
 
@@ -265,7 +272,6 @@ class TaskStatus(models.Model):
     data = models.JSONField(blank=True, null=True, verbose_name='Данные', default=dict)
 
 
-
 class LastMLCall(models.Model):
     dt = models.DateTimeField(auto_now_add=True)
 
@@ -288,11 +294,11 @@ class House(models.Model):
         verbose_name_plural = 'Дома'
         ordering = ('id',)
 
-    year_bld = models.IntegerField(blank=True,null=True)
+    year_bld = models.IntegerField(blank=True, null=True)
-    mat_nes = models.TextField(blank=True,null=True)
+    mat_nes = models.TextField(blank=True, null=True)
     flat_cnt = models.IntegerField(blank=True, null=True)
-    levels = models.TextField(blank=True,null=True)
+    levels = models.TextField(blank=True, null=True)
     doors = models.IntegerField(blank=True, null=True)
-    enrg_cls = models.TextField(blank=True,null=True)
+    enrg_cls = models.TextField(blank=True, null=True)
-    street = models.TextField(blank=True,null=True)
+    street = models.TextField(blank=True, null=True)
-    house_number = models.TextField(blank=True,null=True)
+    house_number = models.TextField(blank=True, null=True)

service/views.py

@@ -390,6 +390,17 @@ class PrePlacementPointViewSet(PlacementPointViewSet):
     @action(detail=False, methods=['post'])
     def move_points(self, request):
         qs = self.get_queryset()
+        qs_matched = qs.filter(matching_status=MatchingStatus.Matched.name)
+        for q in qs_matched:
+            if q.name:
+                pp = models.PlacementPoint.objects.filter(street=q.street,
+                                                           house_number=q.house_number,
+                                                           category=q.category,name=q.name)
+            else:
+                pp = models.PlacementPoint.objects.filter(street=q.street,
+                                                           house_number=q.house_number,
+                                                           category=q.category)
+            pp.update(status=q.status)
         qs = qs.filter(matching_status=MatchingStatus.New.name)
         for q in qs:
             obj = model_to_dict(q)